MDL-22544 html purifier now default cleaning engine - die kses die

moodle · May 21, 2010 · 39668e9 · 39668e9
1 parent 74c6a62
commit 39668e9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/admin/settings/development.php b/admin/settings/development.php
@@ -9,9 +9,6 @@
 
     $temp = new admin_settingpage('experimentalsettings', get_string('experimentalsettings', 'admin'));
     $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
-    $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0);
-    $item->set_updatedcallback('reset_text_filters_cache');
-    $temp->add($item);
     $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
     $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', get_string('enablesafebrowserintegration', 'admin'), get_string('configenablesafebrowserintegration', 'admin'), 0));

diff --git a/admin/settings/security.php b/admin/settings/security.php
@@ -33,6 +33,9 @@
     $params->displaysize = display_size($defaultuserquota);
     $temp->add(new admin_setting_configtext('userquota', get_string('userquota', 'admin'), get_string('configuserquota', 'admin', $params), $defaultuserquota));
 
+    $item = new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 1);
+    $item->set_updatedcallback('reset_text_filters_cache');
+    $temp->add($item);
     $temp->add(new admin_setting_configcheckbox('allowobjectembed', get_string('allowobjectembed', 'admin'), get_string('configallowobjectembed', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enabletrusttext', get_string('enabletrusttext', 'admin'), get_string('configenabletrusttext', 'admin'), 0));
     $temp->add(new admin_setting_configselect('maxeditingtime', get_string('maxeditingtime','admin'), get_string('configmaxeditingtime','admin'), 1800,

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -4075,6 +4075,14 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint($result, 2010051801);
     }
 
+    if ($result && $oldversion < 2010052100) {
+        // Switch to html purifier as default cleaning engine - KSES is really very bad
+        if (empty($CFG->enablehtmlpurifier)) {
+            unset_config('enablehtmlpurifier');
+        }
+        upgrade_main_savepoint($result, 2010052100);
+    }
+
 
     return $result;
 }

diff --git a/version.php b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2010051801;  // YYYYMMDD   = date of the last version bump
+    $version = 2010052100;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 Preview 2 (Build: 20100521)';  // Human-friendly version name