MDL-19211 back to the old text format preferences logic + minor refactoring and improvements

admin/editors.php

@@ -17,7 +17,7 @@ $action = optional_param('action', '', PARAM_ACTION);
 $editor = optional_param('editor', '', PARAM_SAFEDIR);
 
 // get currently installed and enabled auth plugins
-$available_editors = get_available_editors();
+$available_editors = editors_get_available();
 if (!empty($editor) and empty($available_editors[$editor])) {
     redirect ($returnurl);
 }

admin/settings/plugins.php

@@ -133,12 +133,10 @@ if ($hassiteconfig) {
     $ADMIN->add('modules', new admin_category('editorsettings', get_string('editors', 'editor')));
     $temp = new admin_settingpage('manageeditors', get_string('editorsettings', 'editor'));
     $temp->add(new admin_setting_manageeditors());
-    $htmleditors = get_available_editors();
-    $temp->add(new admin_setting_configselect('defaulthtmleditor', get_string('defaulthtmleditor', 'admin'), null, 'tinymce', $htmleditors));
-    $temp->add(new admin_setting_configcheckbox('htmleditor', get_string('usehtmleditor', 'admin'), get_string('confightmleditor','admin'), 1));
+    $htmleditors = editors_get_available();
     $ADMIN->add('editorsettings', $temp);
 
-    $editors_available = get_available_editors();
+    $editors_available = editors_get_available();
     foreach ($editors_available as $editor=>$editorstr) {
         if (file_exists($CFG->dirroot . '/lib/editor/'.$editor.'/settings.php')) {
             $settings = new admin_settingpage('editorsettings'.$editor, get_string('pluginname', 'editor_'.$editor), 'moodle/site:config');

admin/uploaduser_form.php

@@ -50,9 +50,6 @@ class admin_uploaduser_form2 extends moodleform {
     function definition (){
         global $CFG, $USER;
 
-        //no editors here - we need proper empty fields
-        $CFG->htmleditor = null;
-
         $mform   =& $this->_form;
         $columns =& $this->_customdata;
 
@@ -188,16 +185,18 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices);
         $mform->setDefault('autosubscribe', 1);
 
-/* TODO: reimplement editor preferences
-        if ($CFG->htmleditor) {
-            $choices = array(0 => get_string('texteditor'), 1 => get_string('htmleditor'));
+        $editors = editors_get_enabled();
+        if (count($editors) > 1) {
+            $choices = array();
+            $choices['0'] = get_string('texteditor');
+            $choices['1'] = get_string('htmleditor');
             $mform->addElement('select', 'htmleditor', get_string('textediting'), $choices);
             $mform->setDefault('htmleditor', 1);
         } else {
-            $mform->addElement('static', 'htmleditor', get_string('textediting'), get_string('texteditor'));
+            $mform->addElement('hidden', 'htmleditor');
+            $mform->setDefault('htmleditor', 1);
+            $mform->setType('htmleditor', PARAM_INT);
         }
-        $mform->setAdvanced('htmleditor');
-*/
 
         if (empty($CFG->enableajax)) {
             $mform->addElement('static', 'ajax', get_string('ajaxuse'), get_string('ajaxno'));

admin/user/user_bulk_message.php

@@ -34,11 +34,6 @@ if ($confirm and !empty($msg) and confirm_sesskey()) {
     redirect($return);
 }
 
-// disable html editor if not enabled in preferences
-if (!get_user_preferences('message_usehtmleditor', 0)) {
-    $CFG->htmleditor = '';
-}
-
 $msgform = new user_message_form('user_bulk_message.php');
 
 if ($msgform->is_cancelled()) {