MDL-23818, MDL-18900 fixed trusttext upgrade + coding style improvements and cleanup

diff --git a/lib/weblib.php b/lib/weblib.php
index 0363501..762d4a9 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -64,11 +64,6 @@ define('FORMAT_WIKI',     '3');   // Wiki-formatted text
  */
 define('FORMAT_MARKDOWN', '4');   // Markdown-formatted text http://daringfireball.net/projects/markdown/
 
-/**
- * TRUSTTEXT marker - if present in text, text cleaning should be bypassed
- */
-define('TRUSTTEXT', '#####TRUSTTEXT#####');
-
 /**
  * A moodle_url comparison using this flag will return true if the base URLs match, params are ignored
  */
@@ -1371,12 +1366,10 @@ function format_module_intro($module, $activity, $cmid, $filter=true) {
  * Legacy function, used for cleaning of old forum and glossary text only.
  *
  * @global object
- * @param string $text text that may contain TRUSTTEXT marker
- * @return text without any TRUSTTEXT marker
+ * @param string $text text that may contain legacy TRUSTTEXT marker
+ * @return text without legacy TRUSTTEXT marker
  */
 function trusttext_strip($text) {
-    global $CFG;
-
     while (true) { //removing nested TRUSTTEXT
         $orig = $text;
         $text = str_replace('#####TRUSTTEXT#####', '', $text);

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index 0f0f3e7..a4f3106 100644 (file)
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -195,13 +195,13 @@ function xmldb_forum_upgrade($oldversion) {
 
     if ($oldversion < 2009042002) {
         $trustmark = '#####TRUSTTEXT#####';
-        $rs = $DB->get_recordset_sql("SELECT * FROM {forum_posts} WHERE message LIKE '$trustmark%'");
+        $rs = $DB->get_recordset_sql("SELECT * FROM {forum_posts} WHERE message LIKE ?", array($trustmark.'%'));
         foreach ($rs as $post) {
-            if (strpos($post->entrycomment, $trustmark) !== 0) {
-                // probably lowercase in some DBs
+            if (strpos($post->message, $trustmark) !== 0) {
+                // probably lowercase in some DBs?
                 continue;
             }
-            $post->message      = trusttext_strip($post->message);
+            $post->message      = str_replace($trustmark, '', $post->message);
             $post->messagetrust = 1;
             $DB->update_record('forum_posts', $post);
         }

diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index 0ebe94f..fd76e86 100644 (file)
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -154,13 +154,13 @@ function xmldb_glossary_upgrade($oldversion) {
 
     if ($oldversion < 2009042004) {
         $trustmark = '#####TRUSTTEXT#####';
-        $rs = $DB->get_recordset_sql("SELECT * FROM {glossary_entries} WHERE definition LIKE '$trustmark%'");
+        $rs = $DB->get_recordset_sql("SELECT * FROM {glossary_entries} WHERE definition LIKE ?", array($trustmark.'%'));
         foreach ($rs as $entry) {
             if (strpos($entry->definition, $trustmark) !== 0) {
                 // probably lowercase in some DBs
                 continue;
             }
-            $entry->definition      = trusttext_strip($entry->definition);
+            $entry->definition      = str_replace($trustmark, '', $entry->definition);
             $entry->definitiontrust = 1;
             $DB->update_record('glossary_entries', $entry);
         }
@@ -172,13 +172,13 @@ function xmldb_glossary_upgrade($oldversion) {
 
     if ($oldversion < 2009042005) {
         $trustmark = '#####TRUSTTEXT#####';
-        $rs = $DB->get_recordset_sql("SELECT * FROM {glossary_comments} WHERE entrycomment LIKE '$trustmark%'");
+        $rs = $DB->get_recordset_sql("SELECT * FROM {glossary_comments} WHERE entrycomment LIKE ?", array($trustmark.'%'));
         foreach ($rs as $comment) {
             if (strpos($comment->entrycomment, $trustmark) !== 0) {
                 // probably lowercase in some DBs
                 continue;
             }
-            $comment->entrycomment      = trusttext_strip($comment->entrycomment);
+            $comment->entrycomment      = str_replace($trustmark, '', $comment->entrycomment);
             $comment->entrycommenttrust = 1;
             $DB->update_record('glossary_comments', $comment);
         }