htmlentities() to s()

diff --git a/lib/weblib.php b/lib/weblib.php
index 0aac8106c0b2d103d9f9d31def93b4f0e2782b24..b88019fc9e83b4953efd05a75a644613665a018c 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4091,7 +4091,7 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext=
     $linkobject .= '</span>';
 
     if ($text) {
-        $url = '/help.php?module='. $module .'&amp;text='. htmlentities(urlencode($text));
+        $url = '/help.php?module='. $module .'&amp;text='. s(urlencode($text));
     } else {
         $url = '/help.php?module='. $module .'&amp;file='. $page .'.html';
     }

diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php
index e78521f47e7678e70c7142ebb38b96895ac82127..ee255e0ec164856a9a766d8b1eccfa5edb8f66a4 100644 (file)
--- a/mod/assignment/restorelib.php
+++ b/mod/assignment/restorelib.php
@@ -324,7 +324,7 @@
                     $status = update_record("assignment",$assignment);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php
index 2762199b68edfd79e85219555663d761efc9f781..dddf7fec5a6fe409d8f191afb2c4579204c378df 100644 (file)
--- a/mod/chat/restorelib.php
+++ b/mod/chat/restorelib.php
@@ -222,7 +222,7 @@
                     $status = update_record("chat",$chat);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php
index bfe26dc0311a4f2ebd75cc550893ade61e89639a..3aca867a64b0f299f380318c31b62f1afd43f60a 100644 (file)
--- a/mod/choice/restorelib.php
+++ b/mod/choice/restorelib.php
@@ -349,7 +349,7 @@ function choice_options_restore_mods($choiceid,$info,$restore) {
                     $status = update_record("choice",$choice);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index a3f81baca3edec076aaaff54a53013469da56d73..9ab55de52666dd386f268b33e2e350836adc3da3 100644 (file)
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -1044,7 +1044,7 @@
                     $status = update_record("forum_posts",$post);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -1078,7 +1078,7 @@
                     $status = update_record("forum",$forum);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php
index 6f20b23c9c3cff15bc645648de71c8750956367b..fdb6925ca633d23f8c0adfa194eca2536037cf61 100644 (file)
--- a/mod/glossary/restorelib.php
+++ b/mod/glossary/restorelib.php
@@ -614,7 +614,7 @@
                     $status = update_record("glossary_entries",$entry);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -648,7 +648,7 @@
                     $status = update_record("glossary",$glossary);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php
index f3792c31a8296ebfa93c3a393ff4d997ea946f18..9b3aa6f6a43360bf9e0e6b225fb5ed8a246a9379 100644 (file)
--- a/mod/label/restorelib.php
+++ b/mod/label/restorelib.php
@@ -83,7 +83,7 @@
                     $status = update_record("label", $label);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php
index 8620bfa9e7cd4b7943cf9b9ca3e53d8ac5772509..db29074827e7ae8dc9d258327b10298020919799 100644 (file)
--- a/mod/lesson/importppt.php
+++ b/mod/lesson/importppt.php
@@ -218,7 +218,7 @@ function extract_data($pages, $courseid, $lessonname, $modname) {
         
         $tags = '<div><img>'; // should also allow <b><i>
         $string = strip_tags($content,$tags);
-        //echo htmlentities($string);
+        //echo s($string);
 
         $matches = array();
         // this will look for a non nested tag that is closed
@@ -584,4 +584,4 @@ function book_save_objects($chapters, $bookid, $pageid='0') {
     return true;
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/lesson/restorelib.php b/mod/lesson/restorelib.php
index bf8814319f3499e4b86aa06feae7dab5108b46e1..cac89b57321fb14272f9e7f7cccc3cf2b2b70e6b 100644 (file)
--- a/mod/lesson/restorelib.php
+++ b/mod/lesson/restorelib.php
@@ -765,7 +765,7 @@
                     $status = update_record("lesson_pages",$page);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 7a5157c1161fed288e904a465f64017f73db7f85..9a895808cd2f6d6948abc27a106a0628b2896c64 100644 (file)
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -481,7 +481,7 @@
                     $status = update_record("quiz",$quiz);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php
index 0cb24e78a2b8ea673d6f01a5a2b866c171fe184e..2d5cd21d8f6534ab5ec4780c28ba4aff945ea02c 100644 (file)
--- a/mod/resource/restorelib.php
+++ b/mod/resource/restorelib.php
@@ -202,9 +202,9 @@
                     $status = update_record("resource",$resource);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content1).'<br />changed to<br />'.htmlentities($result1).'<hr /><br />';
-                            echo '<br /><hr />'.htmlentities($content2).'<br />changed to<br />'.htmlentities($result2).'<hr /><br />';
-                            echo '<br /><hr />'.htmlentities($content3).'<br />changed to<br />'.htmlentities($result3).'<hr /><br />';
+                            echo '<br /><hr />'.s($content1).'<br />changed to<br />'.s($result1).'<hr /><br />';
+                            echo '<br /><hr />'.s($content2).'<br />changed to<br />'.s($result2).'<hr /><br />';
+                            echo '<br /><hr />'.s($content3).'<br />changed to<br />'.s($result3).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php
index 748d64856973d4f20e74d2718550b97e53ce1f01..2e9b01422520ccca6f74a97b52688f723ce12bf2 100755 (executable)
--- a/mod/scorm/restorelib.php
+++ b/mod/scorm/restorelib.php
@@ -484,7 +484,7 @@
                     $status = update_record("scorm",$scorm);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php
index 6dac48b27adc01f4daafd7b0ac098ff4f282165e..53c658518b7c95b9846e84452f82478438a0e663 100644 (file)
--- a/mod/survey/restorelib.php
+++ b/mod/survey/restorelib.php
@@ -288,7 +288,7 @@
                     $status = update_record("survey",$survey);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php
index 39352fdfa7a959822c4be9db787645a2adc9fa4a..8a016b0e5941e56ae75e2bca897c6b2d292d5bbd 100644 (file)
--- a/mod/wiki/restorelib.php
+++ b/mod/wiki/restorelib.php
@@ -357,7 +357,7 @@
                     $status = update_record("wiki_pages",$page);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }
@@ -391,7 +391,7 @@
                     $status = update_record("wiki",$wiki);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }

diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php
index e8bf1cc151f96c4258ea71497e5a4c28e9eeef19..1bd107e83aef67751f229b8fa1a82acf0239d262 100644 (file)
--- a/mod/workshop/restorelib.php
+++ b/mod/workshop/restorelib.php
@@ -752,7 +752,7 @@
                     $status = update_record("workshop",$workshop);
                     if ($CFG->debug>7) {
                         if (!defined('RESTORE_SILENTLY')) {
-                            echo '<br /><hr />'.htmlentities($content).'<br />changed to<br />'.htmlentities($result).'<hr /><br />';
+                            echo '<br /><hr />'.s($content).'<br />changed to<br />'.s($result).'<hr /><br />';
                         }
                     }
                 }