Changeset 2736:09dd799a19bd for admin/preferences.php

Timestamp:

08/25/14 09:20:20 (11 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Addresses #1896
Preferences: one editor for each available formats.

File:

• admin/preferences.php (modified) (5 diffs)

admin/preferences.php

@@ -27 +27 @@
 
 $user_options = $core->auth->getOptions();
-if (empty($user_options['editor'])) {
-    $user_options['editor'] = '';
+if (empty($user_options['editor']) || !is_array($user_options['editor'])) {
+     $user_options['editor'] = array();
 }
 
@@ -65 +65 @@
 $editors = array_keys($editors_combo);
 
-# Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo();
-$formaters_combo_editor = array();
-
-if (!empty($user_options['editor']) && !empty($formaters_combo[$user_options['editor']])) {
-    $formaters_combo_editor = $formaters_combo[$user_options['editor']];
-} elseif (count($editors)!=0) {
-    $formaters_combo_editor = $formaters_combo[$editors[0]];
-} else {
-    $formaters_combo = array();
-}
-
+# Format by editors
+$formaters = $core->getFormaters();
+$format_by_editors = array();
+foreach ($formaters as $editor => $formats) {
+     foreach ($formats as $format) {
+          $format_by_editors[$format][$editor] = $editor;
+     }
+}
+$available_formats = array('' => '');
+foreach (array_keys($format_by_editors) as $format) {
+     $available_formats[$format] = $format;
+     if (!isset($user_options['editor'][$format])) {
+          $user_options['editor'][$format] = '';
+     }
+}
 $status_combo = dcAdminCombos::getPostStatusescombo();
 
@@ -150 +153 @@
 
 # Update user options
-if (isset($_POST['user_post_format']))
+if (isset($_POST['user_editor']))
 {
      try
@@ -333 +336 @@
                     sprintf(__('Password strength: %s'),__('strong'))."', '".
                     sprintf(__('Password strength: %s'),__('very strong'))."']});\n".
-          "});\n".
-        'var formats_by_editor = \''.json_encode($formaters_combo).'\';'.
+          "});".
           "\n//]]>\n".
           "</script>\n".
@@ -471 +473 @@
 echo
 '<div class="fieldset">'.
-'<h4>'.__('Edition').'</h4>'.
-
-'<p class="field"><label for="user_editor">'.__('Preferred editor:').'</label>'.
-form::combo('user_editor',array_merge(array(__('Choose an editor') => ''),$editors_combo),$user_options['editor']).'</p>'.
-
+'<h4>'.__('Edition').'</h4>';
+
+foreach ($format_by_editors as $format => $editors) {
+     echo
+     '<p class="field"><label for="user_editor">'.sprintf(__('Preferred editor for %s:'),$format).'</label>'.
+     form::combo(
+          'user_editor['.$format.']',
+          array_merge(array(__('Choose an editor') => ''),$editors),$user_options['editor'][$format]
+     ).'</p>';
+}
+echo
 '<p class="field"><label for="user_post_format">'.__('Preferred format:').'</label>'.
-form::combo('user_post_format',array_merge(array('' => ''), $formaters_combo_editor),$user_options['post_format']).'</p>'.
-
+form::combo('user_post_format',$available_formats,$user_options['post_format']).'</p>';
+
+echo
 '<p class="field"><label for="user_post_status">'.__('Default entry status:').'</label>'.
 form::combo('user_post_status',$status_combo,$user_post_status).'</p>'.