From 1b1858d260b35e5e1610ee2d3f731e53f5736624 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Tue, 11 Apr 2006 16:09:52 +0000 Subject: [PATCH] htmlentities() to s() --- lib/weblib.php | 2 +- mod/assignment/restorelib.php | 2 +- mod/chat/restorelib.php | 2 +- mod/choice/restorelib.php | 2 +- mod/forum/restorelib.php | 4 ++-- mod/glossary/restorelib.php | 4 ++-- mod/label/restorelib.php | 2 +- mod/lesson/importppt.php | 4 ++-- mod/lesson/restorelib.php | 2 +- mod/quiz/restorelib.php | 2 +- mod/resource/restorelib.php | 6 +++--- mod/scorm/restorelib.php | 2 +- mod/survey/restorelib.php | 2 +- mod/wiki/restorelib.php | 4 ++-- mod/workshop/restorelib.php | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/weblib.php b/lib/weblib.php index 0aac8106c0..b88019fc9e 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -4091,7 +4091,7 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext= $linkobject .= ''; if ($text) { - $url = '/help.php?module='. $module .'&text='. htmlentities(urlencode($text)); + $url = '/help.php?module='. $module .'&text='. s(urlencode($text)); } else { $url = '/help.php?module='. $module .'&file='. $page .'.html'; } diff --git a/mod/assignment/restorelib.php b/mod/assignment/restorelib.php index e78521f47e..ee255e0ec1 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/chat/restorelib.php b/mod/chat/restorelib.php index 2762199b68..dddf7fec5a 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/choice/restorelib.php b/mod/choice/restorelib.php index bfe26dc031..3aca867a64 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php index a3f81baca3..9ab55de526 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } @@ -1078,7 +1078,7 @@ $status = update_record("forum",$forum); if ($CFG->debug>7) { if (!defined('RESTORE_SILENTLY')) { - echo '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php index 6f20b23c9c..fdb6925ca6 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } @@ -648,7 +648,7 @@ $status = update_record("glossary",$glossary); if ($CFG->debug>7) { if (!defined('RESTORE_SILENTLY')) { - echo '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/label/restorelib.php b/mod/label/restorelib.php index f3792c31a8..9b3aa6f6a4 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php index 8620bfa9e7..db29074827 100644 --- a/mod/lesson/importppt.php +++ b/mod/lesson/importppt.php @@ -218,7 +218,7 @@ function extract_data($pages, $courseid, $lessonname, $modname) { $tags = '
'; // should also allow $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 bf8814319f..cac89b5732 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php index 7a5157c116..9a895808cd 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/resource/restorelib.php b/mod/resource/restorelib.php index 0cb24e78a2..2d5cd21d8f 100644 --- 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 '
'.htmlentities($content1).'
changed to
'.htmlentities($result1).'

'; - echo '
'.htmlentities($content2).'
changed to
'.htmlentities($result2).'

'; - echo '
'.htmlentities($content3).'
changed to
'.htmlentities($result3).'

'; + echo '
'.s($content1).'
changed to
'.s($result1).'

'; + echo '
'.s($content2).'
changed to
'.s($result2).'

'; + echo '
'.s($content3).'
changed to
'.s($result3).'

'; } } } diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php index 748d648569..2e9b014225 100755 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/survey/restorelib.php b/mod/survey/restorelib.php index 6dac48b27a..53c658518b 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php index 39352fdfa7..8a016b0e59 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } @@ -391,7 +391,7 @@ $status = update_record("wiki",$wiki); if ($CFG->debug>7) { if (!defined('RESTORE_SILENTLY')) { - echo '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } diff --git a/mod/workshop/restorelib.php b/mod/workshop/restorelib.php index e8bf1cc151..1bd107e83a 100644 --- 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 '
'.htmlentities($content).'
changed to
'.htmlentities($result).'

'; + echo '
'.s($content).'
changed to
'.s($result).'

'; } } } -- 2.39.5