Changeset 2682:cac55fdd7178

Timestamp:

03/11/14 20:46:03 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Children:

2683:fb8aa74332f1, 2684:599c0d392db2

Message:

Addresses #1896. Multiple editors.
Fix issue when no editor is activated or when choosen editor has been deactivated.

Files:

• admin/post.php (modified) (3 diffs)
• admin/preferences.php (modified) (3 diffs)
• inc/core/class.dc.core.php (modified) (3 diffs)

admin/post.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -449 +449 @@
 if ($can_edit_post)
 {
+     if (count($formaters_combo)>0) {
+          $post_format_field = form::combo('post_format',$formaters_combo,$post_format,'maximal');
+     } else {
+          $post_format_field = '<a href="preferences.php#user-options">'.__('Choose an activated editor').'</a>';
+     }
+
      $sidebar_items = new ArrayObject(array(
           'status-box' => array(
@@ -468 +474 @@
                          '<div>'.
                          '<h5 id="label_format"><label for="post_format" class="classic">'.__('Text formatting').'</label></h5>'.
-                         '<p>'.form::combo('post_format',$formaters_combo,$post_format,'maximal').
-                         '</p>'.
+                         '<p>'.$post_format_field.'</p>'.
                          '<p class="format_control control_no_xhtml">'.
                          '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="post.php?id='.$post_id.'&amp;xconv=1">'.

admin/preferences.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -68 +68 @@
 $formaters_combo = dcAdminCombos::getFormatersCombo();
 
-if (!empty($user_options['editor'])) {
+if (!empty($user_options['editor']) && !empty($formaters_combo[$user_options['editor']])) {
     $formaters_combo_editor = $formaters_combo[$user_options['editor']];
 } elseif (count($editors)!=0) {
@@ -468 +468 @@
 '</div>';
 
+// hide editor selector if less than 2 editors
+if (count($editors)<2) {
+    $editor_class = ' hidden';    
+} else {
+    $editor_class = '';
+}
+
 echo
 '<div class="fieldset">'.
 '<h4>'.__('Edition').'</h4>'.
 
-'<p class="field"><label for="user_editor">'.__('Preferred editor:').'</label>'.
+'<p class="field'.$editor_class.'"><label for="user_editor">'.__('Preferred editor:').'</label>'.
 form::combo('user_editor',$editors_combo,$user_options['editor']).'</p>'.
 

inc/core/class.dc.core.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -262 +262 @@
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @return   <b>array</b> An array of formaters names in values.
+
+    /**
+    if @param editor_id is empty:
+    return all formaters sorted by actives editors
+    
+    if @param editor_id is not empty
+    return formaters for an editor if editor is active
+    return empty() array if editor is not active. 
+    It can happens when a user choose an editor and admin deactivate that editor later
      */
      public function getFormaters($editor_id='')
@@ -267 +276 @@
           $formaters_list = array();
 
-          if (!empty($editor_id) && isset($this->formaters[$editor_id])) {
-               $formaters_list = array_keys($this->formaters[$editor_id]);
+          if (!empty($editor_id)) {
+            if (isset($this->formaters[$editor_id])) {
+                $formaters_list = array_keys($this->formaters[$editor_id]);
+            }
           } else {
                foreach ($this->formaters as $editor => $formaters) {