Changeset 2972:8099686135fe for plugins/dcCKEditor/inc/_config.php

Timestamp:

03/22/15 15:10:20 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Allow customizing CKEditor formats
Fixes #2070

File:

• plugins/dcCKEditor/inc/_config.php (modified) (2 diffs)

plugins/dcCKEditor/inc/_config.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2014 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2015 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -16 +16 @@
 
 if (!empty($_POST['saveconfig'])) {
-    try {
-        $dcckeditor_active = (empty($_POST['dcckeditor_active']))?false:true;
-        $core->blog->settings->dcckeditor->put('active', $dcckeditor_active, 'boolean');
+     try {
+          $dcckeditor_active = (empty($_POST['dcckeditor_active']))?false:true;
+          $core->blog->settings->dcckeditor->put('active', $dcckeditor_active, 'boolean');
 
-        // change other settings only if they were in html page
-        if ($dcckeditor_was_actived) {
-            $dcckeditor_alignement_buttons = (empty($_POST['dcckeditor_alignment_buttons']))?false:true;
-            $core->blog->settings->dcckeditor->put('alignment_buttons', $dcckeditor_alignement_buttons, 'boolean');
+          // change other settings only if they were in html page
+          if ($dcckeditor_was_actived) {
+               $dcckeditor_alignement_buttons = (empty($_POST['dcckeditor_alignment_buttons']))?false:true;
+               $core->blog->settings->dcckeditor->put('alignment_buttons', $dcckeditor_alignement_buttons, 'boolean');
 
-            $dcckeditor_list_buttons = (empty($_POST['dcckeditor_list_buttons']))?false:true;
-            $core->blog->settings->dcckeditor->put('list_buttons', $dcckeditor_list_buttons, 'boolean');
+               $dcckeditor_list_buttons = (empty($_POST['dcckeditor_list_buttons']))?false:true;
+               $core->blog->settings->dcckeditor->put('list_buttons', $dcckeditor_list_buttons, 'boolean');
 
-            $dcckeditor_textcolor_button = (empty($_POST['dcckeditor_textcolor_button']))?false:true;
-            $core->blog->settings->dcckeditor->put('textcolor_button', $dcckeditor_textcolor_button, 'boolean');
+               $dcckeditor_textcolor_button = (empty($_POST['dcckeditor_textcolor_button']))?false:true;
+               $core->blog->settings->dcckeditor->put('textcolor_button', $dcckeditor_textcolor_button, 'boolean');
 
-            $dcckeditor_cancollapse_button = (empty($_POST['dcckeditor_cancollapse_button']))?false:true;
-            $core->blog->settings->dcckeditor->put('cancollapse_button', $dcckeditor_cancollapse_button, 'boolean');
+               $dcckeditor_cancollapse_button = (empty($_POST['dcckeditor_cancollapse_button']))?false:true;
+               $core->blog->settings->dcckeditor->put('cancollapse_button', $dcckeditor_cancollapse_button, 'boolean');
 
-            $dcckeditor_format_select = (empty($_POST['dcckeditor_format_select']))?false:true;
-            $core->blog->settings->dcckeditor->put('format_select', $dcckeditor_format_select, 'boolean');
+               $dcckeditor_format_select = (empty($_POST['dcckeditor_format_select']))?false:true;
+               $core->blog->settings->dcckeditor->put('format_select', $dcckeditor_format_select, 'boolean');
 
-            $dcckeditor_table_button = (empty($_POST['dcckeditor_table_button']))?false:true;
-            $core->blog->settings->dcckeditor->put('table_button', $dcckeditor_table_button, 'boolean');
+               // default tags : p;h1;h2;h3;h4;h5;h6;pre;address
+               $allowed_tags = array('p','h1','h2','h3','h4','h5','h6','pre','address');
+               if (!empty($_POST['dcckeditor_format_tags'])) {
+                    $tags = explode(';', $_POST['dcckeditor_format_tags']);
+                    $new_tags = true;
+                    foreach ($tags as $tag) {
+                         if (!in_array($tag, $allowed_tags)) {
+                              $new_tags = false;
+                              break;
+                         }
+                    }
+                    if ($new_tags) {
+                         $dcckeditor_format_tags = $_POST['dcckeditor_format_tags'];
+                    }
+               } else {
+                    $dcckeditor_format_tags = 'p;h1;h2;h3;h4;h5;h6;pre;address';
+               }
+               $core->blog->settings->dcckeditor->put('format_tags', $dcckeditor_format_tags, 'string');
 
-            $dcckeditor_clipboard_buttons = (empty($_POST['dcckeditor_clipboard_buttons']))?false:true;
-            $core->blog->settings->dcckeditor->put('clipboard_buttons', $dcckeditor_clipboard_buttons, 'boolean');
-        }
 
-        dcPage::addSuccessNotice(__('The configuration has been updated.'));
-        http::redirect($p_url);
-    } catch(Exception $e) {
+               $dcckeditor_table_button = (empty($_POST['dcckeditor_table_button']))?false:true;
+               $core->blog->settings->dcckeditor->put('table_button', $dcckeditor_table_button, 'boolean');
+
+               $dcckeditor_clipboard_buttons = (empty($_POST['dcckeditor_clipboard_buttons']))?false:true;
+               $core->blog->settings->dcckeditor->put('clipboard_buttons', $dcckeditor_clipboard_buttons, 'boolean');
+          }
+
+          dcPage::addSuccessNotice(__('The configuration has been updated.'));
+          http::redirect($p_url);
+     } catch(Exception $e) {
           $core->error->add($e->getMessage());
-    }
+     }
 }