Changeset 3730:5c45a5df9a59 for plugins/dcCKEditor

Timestamp:

03/08/18 17:58:39 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Code formatting (PSR-2)

Location:

plugins/dcCKEditor

Files:

• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _post_config.php (modified) (2 diffs)
• _prepend.php (modified) (1 diff)
• inc/_config.php (modified) (1 diff)
• inc/dc.ckeditor.behaviors.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• tpl/index.tpl (modified) (7 diffs)

plugins/dcCKEditor/_define.php

@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) {return;}
 
 $this->registerModule(
-     /* Name */                   "dcCKEditor",
-     /* Description*/         "dotclear CKEditor integration",
-     /* Author */             "dotclear Team",
-     /* Version */            "1.1.0",
-     array(
-          'permissions' =>    'usage,contentadmin',
-          'type'         =>        'plugin',
-          'settings'     =>        array(
-                                        'self' => '',
-                                        'pref' => '#user-options.user_options_edition'
-                                   )
-     )
+    "dcCKEditor",                    // Name
+    "dotclear CKEditor integration", // Description
+    "dotclear Team",                 // Author
+    "1.1.0",                         // Version
+    array(
+        'permissions' => 'usage,contentadmin',
+        'type'        => 'plugin',
+        'settings'    => array(
+            'self' => '',
+            'pref' => '#user-options.user_options_edition'
+        )
+    )
 );

plugins/dcCKEditor/_install.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 $version = $core->plugins->moduleInfo('dcCKEditor', 'version');
-if (version_compare($core->getVersion('dcCKEditor'), $version,'>=')) {
+if (version_compare($core->getVersion('dcCKEditor'), $version, '>=')) {
     return;
 }

plugins/dcCKEditor/_post_config.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 header('Content-type: text/javascript');
 
 if (!empty($_GET['context'])) {
-     $context = $_GET['context'];
+    $context = $_GET['context'];
 } else {
-     $context = '';
+    $context = '';
 }
 
 $__extraPlugins = new ArrayObject();
-$core->callBehavior('ckeditorExtraPlugins',$__extraPlugins,$context);
+$core->callBehavior('ckeditorExtraPlugins', $__extraPlugins, $context);
 $extraPlugins = $__extraPlugins->getArrayCopy();
 
@@ -28 +28 @@
 
 (function($) {
-     $.toolbarPopup = function toolbarPopup(url) {
-          if (dotclear.admin_base_url != '') {
-               var pos = url.indexOf(dotclear.admin_base_url);
-               if (pos == -1) {
-                    url = dotclear.admin_base_url + url;
-               }
-          }
-
-          var args = Array.prototype.slice.call(arguments);
-          var width = 520, height = 420;
-          if (args[1]!==undefined) {
-               width = args[1].width || width;
-               height = args[1].height || height;
-          }
-
-          var popup_params = 'alwaysRaised=yes,dependent=yes,toolbar=yes,';
-          popup_params += 'height='+height+',width='+width+',menubar=no,resizable=yes,scrollbars=yes,status=no';
-          var popup_link = window.open(url,'dc_popup', popup_params);
-     };
-
-     $.stripBaseURL = function stripBaseURL(url) {
-          if (dotclear.base_url != '') {
-               var pos = url.indexOf(dotclear.base_url);
-               if (pos == 0) {
-                    url = url.substr(dotclear.base_url.length);
-               }
-          }
-
-          return url;
-     };
-
-     /* Retrieve editor from popup */
-     $.active_editor = null;
-     $.getEditorName = function getEditorName() {
-          return $.active_editor;
-     }
-     chainHandler(window,'onbeforeunload',function(e) {
-          if (e == undefined && window.event) {
-               e = window.event;
-          }
-
-          var editor = CKEDITOR.instances[$.getEditorName()];
-          if (editor !== undefined && !confirmClosePage.formSubmit && editor.checkDirty()) {
-               e.returnValue = confirmClosePage.prompt;
-               return confirmClosePage.prompt;
-          }
-          return false;
-     });
+    $.toolbarPopup = function toolbarPopup(url) {
+        if (dotclear.admin_base_url != '') {
+            var pos = url.indexOf(dotclear.admin_base_url);
+            if (pos == -1) {
+                url = dotclear.admin_base_url + url;
+            }
+        }
+
+        var args = Array.prototype.slice.call(arguments);
+        var width = 520, height = 420;
+        if (args[1]!==undefined) {
+            width = args[1].width || width;
+            height = args[1].height || height;
+        }
+
+        var popup_params = 'alwaysRaised=yes,dependent=yes,toolbar=yes,';
+        popup_params += 'height='+height+',width='+width+',menubar=no,resizable=yes,scrollbars=yes,status=no';
+        var popup_link = window.open(url,'dc_popup', popup_params);
+    };
+
+    $.stripBaseURL = function stripBaseURL(url) {
+        if (dotclear.base_url != '') {
+            var pos = url.indexOf(dotclear.base_url);
+            if (pos == 0) {
+                url = url.substr(dotclear.base_url.length);
+            }
+        }
+
+        return url;
+    };
+
+    /* Retrieve editor from popup */
+    $.active_editor = null;
+    $.getEditorName = function getEditorName() {
+        return $.active_editor;
+    }
+    chainHandler(window,'onbeforeunload',function(e) {
+        if (e == undefined && window.event) {
+            e = window.event;
+        }
+
+        var editor = CKEDITOR.instances[$.getEditorName()];
+        if (editor !== undefined && !confirmClosePage.formSubmit && editor.checkDirty()) {
+            e.returnValue = confirmClosePage.prompt;
+            return confirmClosePage.prompt;
+        }
+        return false;
+    });
 })(jQuery);
 
 $(function() {
-     /* By default ckeditor load related resources with a timestamp to avoid cache problem when upgrading itself
-      * load_plugin_file.php does not allow other param that file to load (pf param), so remove timestamp
-      */
-
-     CKEDITOR.timestamp = '';
+    /* By default ckeditor load related resources with a timestamp to avoid cache problem when upgrading itself
+     * load_plugin_file.php does not allow other param that file to load (pf param), so remove timestamp
+     */
+
+    CKEDITOR.timestamp = '';
 
 <?php if (!isset($dcckeditor_disable_native_spellchecker) || $dcckeditor_disable_native_spellchecker): ?>
-     CKEDITOR.config.disableNativeSpellChecker = true;
+    CKEDITOR.config.disableNativeSpellChecker = true;
 <?php else: ?>
-     CKEDITOR.config.disableNativeSpellChecker = false;
-<?php endif; ?>
-
-     CKEDITOR.config.skin = 'dotclear,'+dotclear.dcckeditor_plugin_url+'/js/ckeditor-skins/dotclear/';
-     CKEDITOR.config.baseHref = dotclear.base_url;
-     CKEDITOR.config.height = '<?php echo $core->auth->getOption('edit_size') * 14; ?>px';
+    CKEDITOR.config.disableNativeSpellChecker = false;
+<?php endif;?>
+
+    CKEDITOR.config.skin = 'dotclear,'+dotclear.dcckeditor_plugin_url+'/js/ckeditor-skins/dotclear/';
+    CKEDITOR.config.baseHref = dotclear.base_url;
+    CKEDITOR.config.height = '<?php echo $core->auth->getOption('edit_size') * 14; ?>px';
 
 <?php if (!empty($dcckeditor_cancollapse_button)): ?>
-     CKEDITOR.config.toolbarCanCollapse = true;
-<?php endif; ?>
-
-     CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/');
-     CKEDITOR.plugins.addExternal('dclink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/dclink/');
-     CKEDITOR.plugins.addExternal('media',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/media/');
-     CKEDITOR.plugins.addExternal('img',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/img/');
+    CKEDITOR.config.toolbarCanCollapse = true;
+<?php endif;?>
+
+    CKEDITOR.plugins.addExternal('entrylink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/entrylink/');
+    CKEDITOR.plugins.addExternal('dclink',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/dclink/');
+    CKEDITOR.plugins.addExternal('media',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/media/');
+    CKEDITOR.plugins.addExternal('img',dotclear.dcckeditor_plugin_url+'/js/ckeditor-plugins/img/');
 
 <?php if (!empty($dcckeditor_textcolor_button) || !empty($dcckeditor_background_textcolor_button)): ?>
-     // button add "More Colors..." can be added if colordialog plugin is enabled
-     CKEDITOR.config.colorButton_enableMore = true;
-<?php endif; ?>
+    // button add "More Colors..." can be added if colordialog plugin is enabled
+    CKEDITOR.config.colorButton_enableMore = true;
+<?php endif;?>
 
 <?php
-     if (!empty($extraPlugins) && count($extraPlugins) > 0) {
-          foreach ($extraPlugins as $plugin) {
-               printf("\tCKEDITOR.plugins.addExternal('%s','%s');\n",$plugin['name'],$plugin['url']);
-          }
-     }
-?>
-     if (dotclear.ckeditor_context === undefined || dotclear.ckeditor_tags_context[dotclear.ckeditor_context] === undefined) {
-          return;
-     }
-     $(dotclear.ckeditor_tags_context[dotclear.ckeditor_context].join(',')).ckeditor({
+if (!empty($extraPlugins) && count($extraPlugins) > 0) {
+    foreach ($extraPlugins as $plugin) {
+        printf("\tCKEDITOR.plugins.addExternal('%s','%s');\n", $plugin['name'], $plugin['url']);
+    }
+}
+?>
+    if (dotclear.ckeditor_context === undefined || dotclear.ckeditor_tags_context[dotclear.ckeditor_context] === undefined) {
+        return;
+    }
+    $(dotclear.ckeditor_tags_context[dotclear.ckeditor_context].join(',')).ckeditor({
 
 <?php
-     $defautExtraPlugins = 'entrylink,dclink,media,justify,colorbutton,format,img';
-     if (!empty($extraPlugins) && count($extraPlugins)>0) {
-          foreach ($extraPlugins as $plugin) {
-               $defautExtraPlugins .= ','. $plugin['name'];
-          }
-     }
-?>
-          extraPlugins: '<?php echo $defautExtraPlugins; ?>',
-
-          keystrokes: [
-               [ CKEDITOR.CTRL + (CKEDITOR.env.mac ? CKEDITOR.ALT : CKEDITOR.SHIFT) +
-                    dotclear.msg.link_accesskey.toUpperCase().charCodeAt(0),'dcLinkCommand' ],    // Ctrl+Alt+l
-               [ CKEDITOR.CTRL + (CKEDITOR.env.mac ? CKEDITOR.ALT : CKEDITOR.SHIFT) +
-                    dotclear.msg.img_select_accesskey.toUpperCase().charCodeAt(0),'mediaCommand' ],    // Ctrl+Alt+m
-          ],
+$defautExtraPlugins = 'entrylink,dclink,media,justify,colorbutton,format,img';
+if (!empty($extraPlugins) && count($extraPlugins) > 0) {
+    foreach ($extraPlugins as $plugin) {
+        $defautExtraPlugins .= ',' . $plugin['name'];
+    }
+}
+?>
+        extraPlugins: '<?php echo $defautExtraPlugins; ?>',
+
+        keystrokes: [
+            [ CKEDITOR.CTRL + (CKEDITOR.env.mac ? CKEDITOR.ALT : CKEDITOR.SHIFT) +
+                dotclear.msg.link_accesskey.toUpperCase().charCodeAt(0),'dcLinkCommand' ],    // Ctrl+Alt+l
+            [ CKEDITOR.CTRL + (CKEDITOR.env.mac ? CKEDITOR.ALT : CKEDITOR.SHIFT) +
+                dotclear.msg.img_select_accesskey.toUpperCase().charCodeAt(0),'mediaCommand' ],    // Ctrl+Alt+m
+        ],
 
 <?php if (!empty($dcckeditor_format_select)): ?>
-          // format tags
-
-     <?php if (!empty($dcckeditor_format_tags)): ?>
-          format_tags: '<?php echo $dcckeditor_format_tags; ?>',
-     <?php else: ?>
-          format_tags: 'p;h1;h2;h3;h4;h5;h6;pre;address',
-     <?php endif; ?>
-
-          // following definition are needed to be specialized
-          format_p: { element: 'p' },
-          format_h1: { element: 'h1' },
-          format_h2: { element: 'h2' },
-          format_h3: { element: 'h3' },
-          format_h4: { element: 'h4' },
-          format_h5: { element: 'h5' },
-          format_h6: { element: 'h6' },
-          format_pre: { element: 'pre' },
-          format_address: { element: 'address' },
-<?php endif; ?>
-
-          entities: false,
-          removeButtons: '',
-          allowedContent: true,
-          toolbar: [
-               {
-                    name: 'basicstyles',
-                    items: [
+        // format tags
+
+    <?php if (!empty($dcckeditor_format_tags)): ?>
+        format_tags: '<?php echo $dcckeditor_format_tags; ?>',
+    <?php else: ?>
+        format_tags: 'p;h1;h2;h3;h4;h5;h6;pre;address',
+    <?php endif;?>
+
+        // following definition are needed to be specialized
+        format_p: { element: 'p' },
+        format_h1: { element: 'h1' },
+        format_h2: { element: 'h2' },
+        format_h3: { element: 'h3' },
+        format_h4: { element: 'h4' },
+        format_h5: { element: 'h5' },
+        format_h6: { element: 'h6' },
+        format_pre: { element: 'pre' },
+        format_address: { element: 'address' },
+<?php endif;?>
+
+        entities: false,
+        removeButtons: '',
+        allowedContent: true,
+        toolbar: [
+            {
+                name: 'basicstyles',
+                items: [
 
 <?php if (!empty($dcckeditor_format_select)): ?>
-                         'Format',
-<?php endif;?>
-
-                         'Bold','Italic','Underline','Strike','Subscript','Superscript','Code','Blockquote',
+                    'Format',
+<?php endif;?>
+
+                    'Bold','Italic','Underline','Strike','Subscript','Superscript','Code','Blockquote',
 
 <?php if (!empty($dcckeditor_list_buttons)): ?>
-                         'NumberedList','BulletedList',
-<?php endif; ?>
-
-                         'RemoveFormat'
-                    ]
-               },
+                    'NumberedList','BulletedList',
+<?php endif;?>
+
+                    'RemoveFormat'
+                ]
+            },
 
 <?php if (!empty($dcckeditor_clipboard_buttons)): ?>
-               {
-                    name: 'clipoard',
-                    items: ['Cut','Copy','Paste','PasteText','PasteFromWord']
-               },
-<?php endif; ?>
+            {
+                name: 'clipoard',
+                items: ['Cut','Copy','Paste','PasteText','PasteFromWord']
+            },
+<?php endif;?>
 
 <?php if (!empty($dcckeditor_alignment_buttons)): ?>
-               {
-                    name: 'paragraph',
-                    items: ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock']
-               },
-<?php endif; ?>
+            {
+                name: 'paragraph',
+                items: ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock']
+            },
+<?php endif;?>
 
 <?php if (!empty($dcckeditor_table_button)): ?>
-               {
-                    name: 'table',
-                    items: ['Table']
-               },
-<?php endif; ?>
-
-               {
-                    name: 'custom',
-                    items: [
-                         'EntryLink','dcLink','Media','img','-',
-                         'Source'
+            {
+                name: 'table',
+                items: ['Table']
+            },
+<?php endif;?>
+
+            {
+                name: 'custom',
+                items: [
+                    'EntryLink','dcLink','Media','img','-',
+                    'Source'
 
 <?php if (!empty($dcckeditor_textcolor_button)): ?>
-                         ,'TextColor'
-<?php endif; ?>
+                    ,'TextColor'
+<?php endif;?>
 
 <?php if (!empty($dcckeditor_background_textcolor_button)): ?>
-                         ,'BGColor'
-<?php endif; ?>
-                    ]
-               },
-               {
-                    name: 'special',
-                    items: [
-                         'Maximize'
-                    ]
-               },
+                    ,'BGColor'
+<?php endif;?>
+                ]
+            },
+            {
+                name: 'special',
+                items: [
+                    'Maximize'
+                ]
+            },
 
 <?php // add extra buttons comming from dotclear plugins
-     if (!empty($extraPlugins) && count($extraPlugins)>0) {
-          $extraPlugins_str = "{name: 'extra', items: [%s]},\n";
-          $extra_icons = '';
-          foreach ($extraPlugins as $plugin) {
-               $extra_icons .= sprintf("'%s',",$plugin['button']);
-          }
-          printf($extraPlugins_str,$extra_icons);
-     }
-?>
-          ]
-     });
-
-     CKEDITOR.on('instanceLoaded',function(e) {
-
-          // Retrieve textarea element of the instance, then its line-height (in px) and rows values,
-          // then apply line-height * rows (min = 6) to the inner height of the instance.
-
-          var ta = document.getElementById(e.editor.name);
-          if (ta !== undefined) {
-               var ta_rows = ta.rows;
-               var ta_line_height = parseFloat(window.getComputedStyle(ta,null).getPropertyValue('line-height'));
-               if (ta_rows > 0 && ta_line_height > 0) {
-                    var ta_height = String(Math.max(ta_rows,6) * ta_line_height);
-                    e.editor.resize('100%',ta_height,true);
-               }
-          }
-
-     });
-
-     CKEDITOR.on('instanceReady',function(e) {
-          if (typeof dotclear_htmlFontSize !== 'undefined') {
-               e.editor.document.$.documentElement.style.setProperty('--html-font-size',dotclear_htmlFontSize);
-          }
-
-          if ($('label[for="post_excerpt"] a img').attr('src') == dotclear.img_minus_src) {
-               $('#cke_post_excerpt').removeClass('hide');
-          } else {
-               $('#cke_post_excerpt').addClass('hide');
-          }
-
-          $('#excerpt-area label').click(function() {
-               $('#cke_post_excerpt').toggleClass('hide',$('#post_excerpt').hasClass('hide'));
-          });
-
-     });
-
-     // @TODO: find a better way to retrieve active editor
-     for (var id in CKEDITOR.instances) {
-          CKEDITOR.instances[id].on('focus',function(e) {
-               $.active_editor = e.editor.name;
-          });
-     }
+if (!empty($extraPlugins) && count($extraPlugins) > 0) {
+    $extraPlugins_str = "{name: 'extra', items: [%s]},\n";
+    $extra_icons      = '';
+    foreach ($extraPlugins as $plugin) {
+        $extra_icons .= sprintf("'%s',", $plugin['button']);
+    }
+    printf($extraPlugins_str, $extra_icons);
+}
+?>
+        ]
+    });
+
+    CKEDITOR.on('instanceLoaded',function(e) {
+
+        // Retrieve textarea element of the instance, then its line-height (in px) and rows values,
+        // then apply line-height * rows (min = 6) to the inner height of the instance.
+
+        var ta = document.getElementById(e.editor.name);
+        if (ta !== undefined) {
+            var ta_rows = ta.rows;
+            var ta_line_height = parseFloat(window.getComputedStyle(ta,null).getPropertyValue('line-height'));
+            if (ta_rows > 0 && ta_line_height > 0) {
+                var ta_height = String(Math.max(ta_rows,6) * ta_line_height);
+                e.editor.resize('100%',ta_height,true);
+            }
+        }
+
+    });
+
+    CKEDITOR.on('instanceReady',function(e) {
+        if (typeof dotclear_htmlFontSize !== 'undefined') {
+            e.editor.document.$.documentElement.style.setProperty('--html-font-size',dotclear_htmlFontSize);
+        }
+
+        if ($('label[for="post_excerpt"] a img').attr('src') == dotclear.img_minus_src) {
+            $('#cke_post_excerpt').removeClass('hide');
+        } else {
+            $('#cke_post_excerpt').addClass('hide');
+        }
+
+        $('#excerpt-area label').click(function() {
+            $('#cke_post_excerpt').toggleClass('hide',$('#post_excerpt').hasClass('hide'));
+        });
+
+    });
+
+    // @TODO: find a better way to retrieve active editor
+    for (var id in CKEDITOR.instances) {
+        CKEDITOR.instances[id].on('focus',function(e) {
+            $.active_editor = e.editor.name;
+        });
+    }
 });

plugins/dcCKEditor/_prepend.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_RC_PATH')) { return; }
+if (!defined('DC_RC_PATH')) {return;}
 
-$__autoload['dcCKEditorBehaviors'] = dirname(__FILE__).'/inc/dc.ckeditor.behaviors.php';
+$__autoload['dcCKEditorBehaviors'] = dirname(__FILE__) . '/inc/dc.ckeditor.behaviors.php';

plugins/dcCKEditor/inc/_config.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 $dcckeditor_was_actived = $dcckeditor_active;
 
 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_background_textcolor_button = (empty($_POST['dcckeditor_background_textcolor_button']))?false:true;
-               $core->blog->settings->dcckeditor->put('background_textcolor_button', $dcckeditor_background_textcolor_button, 'boolean');
+            $dcckeditor_background_textcolor_button = (empty($_POST['dcckeditor_background_textcolor_button'])) ? false : true;
+            $core->blog->settings->dcckeditor->put('background_textcolor_button', $dcckeditor_background_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');
 
-               // 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');
+            // 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_table_button = (empty($_POST['dcckeditor_table_button'])) ? false : true;
+            $core->blog->settings->dcckeditor->put('table_button', $dcckeditor_table_button, 'boolean');
 
-               $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');
 
-               $dcckeditor_clipboard_buttons = (empty($_POST['dcckeditor_clipboard_buttons']))?false:true;
-               $core->blog->settings->dcckeditor->put('clipboard_buttons', $dcckeditor_clipboard_buttons, 'boolean');
+            $dcckeditor_disable_native_spellchecker = (empty($_POST['dcckeditor_disable_native_spellchecker'])) ? false : true;
+            $core->blog->settings->dcckeditor->put('disable_native_spellchecker', $dcckeditor_disable_native_spellchecker, 'boolean');
+        }
 
-               $dcckeditor_disable_native_spellchecker = (empty($_POST['dcckeditor_disable_native_spellchecker']))?false:true;
-               $core->blog->settings->dcckeditor->put('disable_native_spellchecker', $dcckeditor_disable_native_spellchecker, 'boolean');
-          }
-
-          dcPage::addSuccessNotice(__('The configuration has been updated.'));
-          http::redirect($p_url);
-     } catch(Exception $e) {
-          $core->error->add($e->getMessage());
-     }
+        dcPage::addSuccessNotice(__('The configuration has been updated.'));
+        http::redirect($p_url);
+    } catch (Exception $e) {
+        $core->error->add($e->getMessage());
+    }
 }
 
-include dirname(__FILE__).'/../tpl/index.tpl';
+include dirname(__FILE__) . '/../tpl/index.tpl';

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -13 +13 @@
 class dcCKEditorBehaviors
 {
-    protected static $p_url = 'index.php?pf=dcCKEditor';
+    protected static $p_url      = 'index.php?pf=dcCKEditor';
     protected static $config_url = 'plugin.php?p=dcCKEditor&config=1';
 
@@ -24 +24 @@
      * @param syntax   <b>string</b> wanted syntax (xhtml)
      */
-    public static function adminPostEditor($editor='',$context='',array $tags=array(),$syntax='xhtml') {
-        if (empty($editor) || $editor != 'dcCKEditor' || $syntax != 'xhtml') { return;}
+    public static function adminPostEditor($editor = '', $context = '', array $tags = array(), $syntax = 'xhtml')
+    {
+        if (empty($editor) || $editor != 'dcCKEditor' || $syntax != 'xhtml') {return;}
 
         $config_js = self::$config_url;
         if (!empty($context)) {
-            $config_js .= '&context='.$context;
+            $config_js .= '&context=' . $context;
         }
 
         $res =
-            '<script type="text/javascript">'."\n".
-            dcPage::jsVar('dotclear.ckeditor_context', $context).
-            'dotclear.ckeditor_tags_context = '.sprintf('{%s:["%s"]};'."\n", $context, implode('","', $tags)).
-            'var CKEDITOR_BASEPATH = "'.DC_ADMIN_URL.self::$p_url.'/js/ckeditor/";'."\n".
-            dcPage::jsVar('dotclear.admin_base_url', DC_ADMIN_URL).
-            dcPage::jsVar('dotclear.base_url', $GLOBALS['core']->blog->host).
-            dcPage::jsVar('dotclear.dcckeditor_plugin_url',DC_ADMIN_URL.self::$p_url).
-            'CKEDITOR_GETURL = function(resource) {
-                 // If this is not a full or absolute path.
-                 if ( resource.indexOf(":/") == -1 && resource.indexOf("/") !== 0 ) {
-                      resource = this.basePath + resource;
-                 }
-                 return resource;
-             };'."\n".
-            "dotclear.msg.img_select_title = '".html::escapeJS(__('Media chooser'))."'; "."\n".
-            "dotclear.msg.img_select_accesskey = '".html::escapeJS(__('m'))."'; "."\n".
-            "dotclear.msg.post_link_title = '".html::escapeJS(__('Link to an entry'))."'; "."\n".
-            "dotclear.msg.link_title = '".html::escapeJS(__('Link'))."'; "."\n".
-            "dotclear.msg.link_accesskey = '".html::escapeJS(__('l'))."'; "."\n".
-            "dotclear.msg.img_title = '".html::escapeJS(__('External image'))."'; "."\n".
-            "dotclear.msg.url_cannot_be_empty = '".html::escapeJS(__('URL field cannot be empty.'))."';"."\n".
-            "</script>\n".
-            dcPage::jsLoad(self::$p_url.'/js/ckeditor/ckeditor.js').
-            dcPage::jsLoad(self::$p_url.'/js/ckeditor/adapters/jquery.js').
-            dcPage::jsLoad($config_js);
+        '<script type="text/javascript">' . "\n" .
+        dcPage::jsVar('dotclear.ckeditor_context', $context) .
+        'dotclear.ckeditor_tags_context = ' . sprintf('{%s:["%s"]};' . "\n", $context, implode('","', $tags)) .
+        'var CKEDITOR_BASEPATH = "' . DC_ADMIN_URL . self::$p_url . '/js/ckeditor/";' . "\n" .
+        dcPage::jsVar('dotclear.admin_base_url', DC_ADMIN_URL) .
+        dcPage::jsVar('dotclear.base_url', $GLOBALS['core']->blog->host) .
+        dcPage::jsVar('dotclear.dcckeditor_plugin_url', DC_ADMIN_URL . self::$p_url) .
+        'CKEDITOR_GETURL = function(resource) {
+                // If this is not a full or absolute path.
+                if ( resource.indexOf(":/") == -1 && resource.indexOf("/") !== 0 ) {
+                    resource = this.basePath + resource;
+                }
+                return resource;
+             };' . "\n" .
+        "dotclear.msg.img_select_title = '" . html::escapeJS(__('Media chooser')) . "'; " . "\n" .
+        "dotclear.msg.img_select_accesskey = '" . html::escapeJS(__('m')) . "'; " . "\n" .
+        "dotclear.msg.post_link_title = '" . html::escapeJS(__('Link to an entry')) . "'; " . "\n" .
+        "dotclear.msg.link_title = '" . html::escapeJS(__('Link')) . "'; " . "\n" .
+        "dotclear.msg.link_accesskey = '" . html::escapeJS(__('l')) . "'; " . "\n" .
+        "dotclear.msg.img_title = '" . html::escapeJS(__('External image')) . "'; " . "\n" .
+        "dotclear.msg.url_cannot_be_empty = '" . html::escapeJS(__('URL field cannot be empty.')) . "';" . "\n" .
+        "</script>\n" .
+        dcPage::jsLoad(self::$p_url . '/js/ckeditor/ckeditor.js') .
+        dcPage::jsLoad(self::$p_url . '/js/ckeditor/adapters/jquery.js') .
+        dcPage::jsLoad($config_js);
 
-          if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
-               $res .=
-               '<script type="text/javascript">'."\n".
-               dcPage::jsVar('dotclear_htmlFontSize',$GLOBALS['core']->auth->user_prefs->interface->htmlfontsize)."\n".
-               "</script>\n";
-          }
+        if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
+            $res .=
+            '<script type="text/javascript">' . "\n" .
+            dcPage::jsVar('dotclear_htmlFontSize', $GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) . "\n" .
+                "</script>\n";
+        }
 
-          return $res;
-     }
-
-    public static function adminPopupMedia($editor='') {
-        if (empty($editor) || $editor!='dcCKEditor') { return;}
-
-     return dcPage::jsLoad(self::$p_url.'/js/popup_media.js');
+        return $res;
     }
 
-    public static function adminPopupLink($editor='') {
-        if (empty($editor) || $editor!='dcCKEditor') { return;}
+    public static function adminPopupMedia($editor = '')
+    {
+        if (empty($editor) || $editor != 'dcCKEditor') {return;}
 
-     return dcPage::jsLoad(self::$p_url.'/js/popup_link.js');
+        return dcPage::jsLoad(self::$p_url . '/js/popup_media.js');
     }
 
-    public static function adminPopupPosts($editor='') {
-        if (empty($editor) || $editor!='dcCKEditor') { return;}
+    public static function adminPopupLink($editor = '')
+    {
+        if (empty($editor) || $editor != 'dcCKEditor') {return;}
 
-     return dcPage::jsLoad(self::$p_url.'/js/popup_posts.js');
+        return dcPage::jsLoad(self::$p_url . '/js/popup_link.js');
     }
 
-    public static function adminMediaURLParams($p) {
+    public static function adminPopupPosts($editor = '')
+    {
+        if (empty($editor) || $editor != 'dcCKEditor') {return;}
+
+        return dcPage::jsLoad(self::$p_url . '/js/popup_posts.js');
+    }
+
+    public static function adminMediaURLParams($p)
+    {
         if (!empty($_GET['editor'])) {
             $p['editor'] = html::sanitizeURL($_GET['editor']);
@@ -93 +98 @@
     }
 
-    public static function getTagsContext() {
+    public static function getTagsContext()
+    {
         return self::$tagsContext;
     }

plugins/dcCKEditor/index.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-if (!defined('DC_CONTEXT_ADMIN')) { return; }
+if (!defined('DC_CONTEXT_ADMIN')) {return;}
 
 $is_admin = $core->auth->check('admin,contentadmin', $core->blog->id) || $core->auth->isSuperAdmin();
 
 $core->blog->settings->addNameSpace('dcckeditor');
-$dcckeditor_active = $core->blog->settings->dcckeditor->active;
-$dcckeditor_alignment_buttons = $core->blog->settings->dcckeditor->alignment_buttons;
-$dcckeditor_list_buttons = $core->blog->settings->dcckeditor->list_buttons;
-$dcckeditor_textcolor_button = $core->blog->settings->dcckeditor->textcolor_button;
+$dcckeditor_active                      = $core->blog->settings->dcckeditor->active;
+$dcckeditor_alignment_buttons           = $core->blog->settings->dcckeditor->alignment_buttons;
+$dcckeditor_list_buttons                = $core->blog->settings->dcckeditor->list_buttons;
+$dcckeditor_textcolor_button            = $core->blog->settings->dcckeditor->textcolor_button;
 $dcckeditor_background_textcolor_button = $core->blog->settings->dcckeditor->background_textcolor_button;
-$dcckeditor_cancollapse_button = $core->blog->settings->dcckeditor->cancollapse_button;
-$dcckeditor_format_select = $core->blog->settings->dcckeditor->format_select;
-$dcckeditor_format_tags = $core->blog->settings->dcckeditor->format_tags;
-$dcckeditor_table_button = $core->blog->settings->dcckeditor->table_button;
-$dcckeditor_clipboard_buttons = $core->blog->settings->dcckeditor->clipboard_buttons;
+$dcckeditor_cancollapse_button          = $core->blog->settings->dcckeditor->cancollapse_button;
+$dcckeditor_format_select               = $core->blog->settings->dcckeditor->format_select;
+$dcckeditor_format_tags                 = $core->blog->settings->dcckeditor->format_tags;
+$dcckeditor_table_button                = $core->blog->settings->dcckeditor->table_button;
+$dcckeditor_clipboard_buttons           = $core->blog->settings->dcckeditor->clipboard_buttons;
 $dcckeditor_disable_native_spellchecker = $core->blog->settings->dcckeditor->disable_native_spellchecker;
 
 if (!empty($_GET['config'])) {
     // text/javascript response stop stream just after including file
-    include_once(dirname(__FILE__).'/_post_config.php');
+    include_once dirname(__FILE__) . '/_post_config.php';
     exit();
 } else {
-    include_once(dirname(__FILE__).'/inc/_config.php');
+    include_once dirname(__FILE__) . '/inc/_config.php';
 }

plugins/dcCKEditor/tpl/index.tpl

@@ -7 +7 @@
   <body>
     <?php echo dcPage::breadcrumb(array(__('Plugins') =>
-    '',__('dcCKEditor') => '')).dcPage::notices(); ?>
-    <?php if ($is_admin):?>
+    '', __('dcCKEditor') => '')) . dcPage::notices(); ?>
+    <?php if ($is_admin): ?>
     <h3 class="hidden-if-js">
-      <?php echo __('Settings');?>
+      <?php echo __('Settings'); ?>
     </h3>
-    <form action="<?php echo $p_url;?>" enctype="multipart/form-data" method="post">
+    <form action="<?php echo $p_url; ?>" enctype="multipart/form-data" method="post">
       <div class="fieldset">
         <h3>
-          <?php echo __('Plugin activation');?>
+          <?php echo __('Plugin activation'); ?>
         </h3>
         <p>
           <label class="classic" for="dcckeditor_active">
-            <?php echo form::checkbox('dcckeditor_active', 1, $dcckeditor_active);?>
-            <?php echo __('Enable dcCKEditor plugin');?>
+            <?php echo form::checkbox('dcckeditor_active', 1, $dcckeditor_active); ?>
+            <?php echo __('Enable dcCKEditor plugin'); ?>
           </label>
         </p>
       </div>
-      <?php if ($dcckeditor_active):?>
+      <?php if ($dcckeditor_active): ?>
       <div class="fieldset">
         <h3>
@@ -32 +32 @@
           <?php echo form::checkbox('dcckeditor_alignment_buttons', 1, $dcckeditor_alignment_buttons); ?>
           <label class="classic" for="dcckeditor_alignment_buttons">
-            <?php echo __('Add alignment buttons');?>
+            <?php echo __('Add alignment buttons'); ?>
           </label>
         </p>
@@ -38 +38 @@
           <?php echo form::checkbox('dcckeditor_list_buttons', 1, $dcckeditor_list_buttons); ?>
           <label class="classic" for="dcckeditor_list_buttons">
-            <?php echo __('Add lists buttons');?>
+            <?php echo __('Add lists buttons'); ?>
           </label>
         </p>
@@ -44 +44 @@
           <?php echo form::checkbox('dcckeditor_textcolor_button', 1, $dcckeditor_textcolor_button); ?>
           <label class="classic" for="dcckeditor_textcolor_button">
-            <?php echo __('Add text color button');?>
+            <?php echo __('Add text color button'); ?>
           </label>
         </p>
@@ -50 +50 @@
           <?php echo form::checkbox('dcckeditor_background_textcolor_button', 1, $dcckeditor_background_textcolor_button); ?>
           <label class="classic" for="dcckeditor_background_textcolor_button">
-            <?php echo __('Add background text color button');?>
+            <?php echo __('Add background text color button'); ?>
           </label>
         </p>
@@ -56 +56 @@
           <?php echo form::checkbox('dcckeditor_cancollapse_button', 1, $dcckeditor_cancollapse_button); ?>
           <label class="classic" for="dcckeditor_cancollapse_button">
-            <?php echo __('Add collapse button');?>
+            <?php echo __('Add collapse button'); ?>
           </label>
         </p>
         <p>
-          <?php echo form::checkbox('dcckeditor_format_select', 1, $dcckeditor_format_select);?>
+          <?php echo form::checkbox('dcckeditor_format_select', 1, $dcckeditor_format_select); ?>
           <label class="classic" for="dcckeditor_format_select">
-            <?php echo __('Add format selection');?>
+            <?php echo __('Add format selection'); ?>
           </label>
         </p>
         <p>
           <label class="classic" for="dcckeditor_format_tags">
-            <?php echo __('Custom formats');?>
+            <?php echo __('Custom formats'); ?>
           </label>
-          <?php echo form::field('dcckeditor_format_tags', 100, 255, $dcckeditor_format_tags);?>
+          <?php echo form::field('dcckeditor_format_tags', 100, 255, $dcckeditor_format_tags); ?>
         </p>
         <p class="clear form-note">
-          <?php echo __('Default formats are p;h1;h2;h3;h4;h5;h6;pre;address');?>
+          <?php echo __('Default formats are p;h1;h2;h3;h4;h5;h6;pre;address'); ?>
         </p>
         <p>
-          <?php echo form::checkbox('dcckeditor_table_button', 1, $dcckeditor_table_button);?>
+          <?php echo form::checkbox('dcckeditor_table_button', 1, $dcckeditor_table_button); ?>
           <label class="classic" for="dcckeditor_table_button">
-            <?php echo __('Add table button');?>
+            <?php echo __('Add table button'); ?>
           </label>
         </p>
         <p>
-          <?php echo form::checkbox('dcckeditor_clipboard_buttons', 1, $dcckeditor_clipboard_buttons);?>
+          <?php echo form::checkbox('dcckeditor_clipboard_buttons', 1, $dcckeditor_clipboard_buttons); ?>
           <label class="classic" for="dcckeditor_clipboard_buttons">
-            <?php echo __('Add clipboard buttons');?>
+            <?php echo __('Add clipboard buttons'); ?>
           </label>
         </p>
         <p class="clear form-note">
-          <?php echo __('Copy, Paste, Paste Text, Paste from Word');?>
+          <?php echo __('Copy, Paste, Paste Text, Paste from Word'); ?>
         </p>
         <p>
-          <?php echo form::checkbox('dcckeditor_disable_native_spellchecker', 1, $dcckeditor_disable_native_spellchecker);?>
+          <?php echo form::checkbox('dcckeditor_disable_native_spellchecker', 1, $dcckeditor_disable_native_spellchecker); ?>
           <label class="classic" for="dcckeditor_disable_native_spellchecker">
-            <?php echo __('Disables the built-in spell checker if the browser provides one');?>
+            <?php echo __('Disables the built-in spell checker if the browser provides one'); ?>
           </label>
         </p>
@@ -100 +100 @@
         <input name="p" type="hidden" value="dcCKEditor"/>
         <?php echo $core->
-        formNonce();?>
-        <input name="saveconfig" type="submit" value="<?php echo __('Save configuration');?>"/>
+    formNonce(); ?>
+        <input name="saveconfig" type="submit" value="<?php echo __('Save configuration'); ?>"/>
       </p>
     </form>