Changes in [2899:ef2042333d48:2903:0d4d248059af]

Files:

• CHANGELOG (modified) (1 diff)
• admin/category.php (modified) (1 diff)
• admin/js/_category.js (modified) (1 diff)
• admin/js/confirm-close.js (modified) (1 diff)
• admin/media.php (modified) (3 diffs)
• admin/media_item.php (modified) (2 diffs)
• inc/admin/actions/class.dcaction.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (2 diffs)
• plugins/dcCKEditor/_define.php (modified) (1 diff)
• plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• plugins/dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js (modified) (1 diff)
• plugins/dcCKEditor/js/popup_posts.js (modified) (1 diff)
• plugins/dcLegacyEditor/_define.php (modified) (1 diff)
• plugins/themeEditor/script.js (modified) (1 diff)
• themes/ductile/_prepend.php (modified) (1 diff)

CHANGELOG

@@ +1 @@
+Dotclear 2.7.3 - 2015-01-06
+===========================================================
+* Restore advanced edition of category description (as in 2.6)
+* Various bug fixes
+* Some cosmetic adjustments
+
 Dotclear 2.7.2 - 2014-12-25
 ===========================================================

admin/category.php

@@ -174 +174 @@
 $elements[$title] = '';
 
+$category_editor = $core->auth->getOption('editor');
+
 dcPage::open($title,
      dcPage::jsConfirmClose('category-form').
-     dcPage::jsLoad('js/_category.js'),
-     $core->callBehavior('adminPostEditor').
+     dcPage::jsLoad('js/_category.js').
+     $core->callBehavior('adminPostEditor',$category_editor['xhtml'],'category',array('#cat_desc')),
      dcPage::breadcrumb($elements)
 );

admin/js/_category.js

@@ -2 +2 @@
      dotclear.hideLockable();
 
-     if ($.isFunction('jsToolBar')) {
+     if ($.isFunction(jsToolBar)) {
           var tbCategory = new jsToolBar(document.getElementById('cat_desc'));
           tbCategory.draw('xhtml');

admin/js/confirm-close.js

@@ -18 +18 @@
           var f;
           var This = this;
+          this.forms=new Array();
           for (var i=0; i<formsInPage.length; i++) {
                f = formsInPage[i];

admin/media.php

@@ -17 +17 @@
 dcPage::check('media,media_admin');
 
-$post_id = !empty($_GET['post_id']) ? (integer) $_GET['post_id'] : null;
+$post_id = !empty($_REQUEST['post_id']) ? (integer) $_REQUEST['post_id'] : null;
 if ($post_id) {
      $post = $core->blog->getPosts(array('post_id'=>$post_id,'post_type'=>''));
@@ -73 +73 @@
 }
 
-$popup = (integer) !empty($_GET['popup']);
+$popup = (integer) !empty($_REQUEST['popup']);
 
 $page_url_params = new ArrayObject(array('popup' => $popup,'post_id' => $post_id));
@@ -616 +616 @@
      }
      $res =
-     '<div class="'.$class.'"><p><a class="media-icon media-link" href="'.$link.'">'.
+     '<div class="'.$class.'"><p><a class="media-icon media-link" href="'.rawurldecode($link).'">'.
      '<img src="'.$f->media_icon.'" alt="" />'.$fname.'</a></p>';
 

admin/media_item.php

@@ -17 +17 @@
 $tab = empty($_REQUEST['tab']) ? '' : $_REQUEST['tab'];
 
-$post_id = !empty($_GET['post_id']) ? (integer) $_GET['post_id'] : null;
+$post_id = !empty($_REQUEST['post_id']) ? (integer) $_REQUEST['post_id'] : null;
 if ($post_id) {
      $post = $core->blog->getPosts(array('post_id'=>$post_id));
@@ -28 +28 @@
 
 $file = null;
-$popup = (integer) !empty($_GET['popup']);
+$popup = (integer) !empty($_REQUEST['popup']);
 $plugin_id = isset($_REQUEST['plugin_id']) ? html::sanitizeURL($_REQUEST['plugin_id']) : '';
 $page_url_params = array('popup' => $popup,'post_id' => $post_id);

inc/admin/actions/class.dcaction.php

@@ -223 +223 @@
           foreach ($this->redirect_fields as $p) {
                if (isset($from[$p])) {
-                    $redir_args[$p] = $from[$p];
+                    $this->redir_args[$p] = $from[$p];
                }
           }

inc/public/class.dc.template.php

@@ -1118 +1118 @@
                     // nb of entries per page specified in template -> regular pagination
                     $p .= "\$params['limit'] = ".$lastn.";\n";
-                    $p .= "\$_ctx->nb_entry_first_page = \$_ctx->nb_entry_per_page = ".$lastn.";\n";
+                    $p .= "\$nb_entry_first_page = \$nb_entry_per_page = ".$lastn.";\n";
                } else {
                     // nb of entries per page not specified -> use ctx settings
+                    $p .= "\$nb_entry_first_page=\$_ctx->nb_entry_first_page; \$nb_entry_per_page = \$_ctx->nb_entry_per_page;\n";
                     $p .= "if ((\$core->url->type == 'default') || (\$core->url->type == 'default-page')) {\n";
-                    $p .= "    \$params['limit'] = (\$_page_number == 1 ? \$_ctx->nb_entry_first_page : \$_ctx->nb_entry_per_page);\n";
+                    $p .= "    \$params['limit'] = (\$_page_number == 1 ? \$nb_entry_first_page : \$nb_entry_per_page);\n";
                     $p .= "} else {\n";
-                    $p .= "    \$params['limit'] = \$_ctx->nb_entry_per_page;\n";
+                    $p .= "    \$params['limit'] = \$nb_entry_per_page;\n";
                     $p .= "}\n";
                }
@@ -1131 +1132 @@
                     // standard pagination, set offset
                     $p .= "if ((\$core->url->type == 'default') || (\$core->url->type == 'default-page')) {\n";
-                    $p .= "    \$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$_ctx->nb_entry_per_page + \$_ctx->nb_entry_first_page),\$params['limit']);\n";
+                    $p .= "    \$params['limit'] = array((\$_page_number == 1 ? 0 : (\$_page_number - 2) * \$nb_entry_per_page + \$nb_entry_first_page),\$params['limit']);\n";
                     $p .= "} else {\n";
-                    $p .= "    \$params['limit'] = array((\$_page_number - 1) * \$_ctx->nb_entry_per_page,\$params['limit']);\n";
+                    $p .= "    \$params['limit'] = array((\$_page_number - 1) * \$nb_entry_per_page,\$params['limit']);\n";
                     $p .= "}\n";
                } else {

plugins/dcCKEditor/_define.php

@@ -17 +17 @@
      /* Author */             "dotclear Team",
      /* Version */            "0.9.0",
-     /* Permissions */       "usage,contentadmin",
-     /* Properties */        array('type' => 'plugin')
+     array(
+          'permissions' =>    'usage,contentadmin',
+          'type'         =>        'plugin'
+     )
 );

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

@@ -78 +78 @@
     public static function adminMediaURLParams($p) {
         if (!empty($_GET['editor'])) {
-            $p['editor']=html::sanitiseURL($_GET['editor']);
+            $p['editor'] = html::sanitizeURL($_GET['editor']);
         }
     }

plugins/dcCKEditor/js/ckeditor-plugins/entrylink/plugin.js

@@ -24 +24 @@
                          if (element.is('a')
                              && !element.hasClass('media-link')
-                             && element.hasClass('post')) { // link to original media @see js/popup_media.js
+                             && element.hasClass('ref-post')) { // link to original media @see js/popup_media.js
                               editor.getSelection().selectElement(element);
 

plugins/dcCKEditor/js/popup_posts.js

@@ -12 +12 @@
 
           if (editor.mode=='wysiwyg') {
-               link = '<a class="post" href="'+window.opener.$.stripBaseURL($(this).attr('title'))+'">'+selected_text+'</a>';
+               link = '<a class="ref-post" href="'+window.opener.$.stripBaseURL($(this).attr('title'))+'">'+selected_text+'</a>';
                var element = window.opener.CKEDITOR.dom.element.createFromHtml(link);
                editor.insertElement(element);

plugins/dcLegacyEditor/_define.php

@@ -17 +17 @@
      /* Author */             "dotclear Team",
      /* Version */            '0.1.2',
-     /* Permissions */       "usage,contentadmin",
-     /* Properties */        array('type' => 'plugin')
+     array(
+          'permissions' =>    'usage,contentadmin',
+          'type'         =>        'plugin'
+     )
 );

plugins/themeEditor/script.js

@@ -27 +27 @@
                     $('#file-chooser').empty();
                     $(res).find('#file-chooser').children().appendTo('#file-chooser');
+                    confirmClosePage.getCurrentForms();
+
                }
           });

themes/ductile/_prepend.php

@@ -11 +11 @@
 
 if (!defined('DC_RC_PATH')) { return; }
+// public part below
+
+if (!defined('DC_CONTEXT_ADMIN')) { return false; }
+// admin part below
 
 # Behaviors