Changes in [1154:e85c1417b8a4:1155:49ba58cbf593]

Files:

• CHANGELOG (modified) (1 diff)
• admin/comments.php (modified) (2 diffs)
• admin/js/_blog_pref.js (modified) (1 diff)
• admin/js/_index.js (modified) (1 diff)
• admin/js/_media.js (modified) (1 diff)
• admin/js/_post.js (modified) (1 diff)
• admin/js/common.js (modified) (4 diffs)
• admin/js/jquery/jquery.constantfooter.js (deleted)
• admin/js/jquery/jquery.pageTabs.js (modified) (1 diff)
• admin/media_item.php (modified) (1 diff)
• admin/style/dc_logo_footer.png (added)
• admin/style/dc_logo_small.png (deleted)
• admin/style/default.css (modified) (26 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (2 diffs)
• inc/load_plugin_file.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (2 diffs)
• inc/public/lib.tpl.context.php (modified) (1 diff)
• inc/swf/swfupload.swf (modified) (previous)
• locales/bn/plugins.po (modified) (1 diff)
• locales/ca/plugins.po (modified) (1 diff)
• locales/cs/plugins.po (modified) (1 diff)
• locales/da/plugins.po (modified) (1 diff)
• locales/de/plugins.po (modified) (1 diff)
• locales/en/plugins.po (modified) (1 diff)
• locales/eo/plugins.po (modified) (1 diff)
• locales/es-ar/plugins.po (modified) (1 diff)
• locales/es/plugins.po (modified) (1 diff)
• locales/eu/plugins.po (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• locales/hu/plugins.po (modified) (1 diff)
• locales/it/plugins.po (modified) (1 diff)
• locales/ja/plugins.po (modified) (1 diff)
• locales/ko/plugins.po (modified) (1 diff)
• locales/lt/plugins.po (modified) (1 diff)
• locales/nl/plugins.po (modified) (1 diff)
• locales/oc/plugins.po (modified) (1 diff)
• locales/pl/plugins.po (modified) (1 diff)
• locales/pt-br/plugins.po (modified) (1 diff)
• locales/pt/plugins.po (modified) (1 diff)
• locales/ro/plugins.po (modified) (1 diff)
• locales/ru/plugins.po (modified) (1 diff)
• locales/sr/plugins.po (modified) (1 diff)
• locales/sv/plugins.po (modified) (1 diff)
• locales/te/plugins.po (modified) (1 diff)
• locales/tr/plugins.po (modified) (1 diff)
• locales/zh-cn/plugins.po (modified) (1 diff)
• plugins/antispam/_define.php (modified) (1 diff)
• plugins/antispam/antispam.js (modified) (1 diff)
• plugins/antispam/index.php (modified) (4 diffs)
• plugins/blogroll/_define.php (modified) (1 diff)
• plugins/blogroll/blogroll.js (added)
• plugins/blogroll/index.php (modified) (2 diffs)
• plugins/pages/page.php (modified) (1 diff)
• plugins/simpleMenu/_define.php (modified) (1 diff)
• plugins/simpleMenu/index.php (modified) (1 diff)
• plugins/simpleMenu/simplemenu.js (added)
• plugins/tags/_public.php (modified) (2 diffs)
• plugins/tags/js/post.js (modified) (1 diff)
• plugins/tags/js/posts_actions.js (modified) (1 diff)
• plugins/themeEditor/class.themeEditor.php (modified) (1 diff)
• plugins/userPref/index.php (modified) (1 diff)
• themes/ductile/_define.php (modified) (1 diff)
• themes/ductile/_prepend.php (modified) (1 diff)

CHANGELOG

@@ -1 @@
-Dotclear 2.5.0 - 2013-02-24
-===========================================================
+Dotclear 2.5.0 - 2013-03-12
+===========================================================
+* Security fix: XSS vulnerabilities in swfupload.swf (media enhanced uploader)
 * Ductile theme may now use webfont (from Google, Adobe and similar providers)
 * daInstaller plugin is now included in the official distribution

admin/comments.php

@@ -225 +225 @@
      '</form>';
      
-     if (!$with_spam) {
-
-          $spam_count = $core->blog->getComments(array('comment_status'=>-2),true)->f(0);
+     $spam_count = $core->blog->getComments(array('comment_status'=>-2),true)->f(0);
+     if ($spam_count > 0) {
           
-          if ($spam_count > 0) {
-               
-               echo 
-                    '<form action="comments.php" method="post" class="fieldset">';
-
+          echo 
+               '<form action="comments.php" method="post" class="fieldset">';
+
+          if (!$with_spam || ($status != -2)) {
                if ($spam_count == 1) {
                     echo '<p>'.sprintf(__('You have one spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
@@ -241 +239 @@
                     '<a href="comments.php?status=-2">'.__('Show them.').'</a></p>';
                }
-               
-               echo
-                    $core->formNonce().
-                    '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
-
-               # --BEHAVIOR-- adminCommentsSpamForm
-               $core->callBehavior('adminCommentsSpamForm',$core);
-
-               echo '</form>';
           }
+          
+          echo
+               $core->formNonce().
+               '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
+
+          # --BEHAVIOR-- adminCommentsSpamForm
+          $core->callBehavior('adminCommentsSpamForm',$core);
+
+          echo '</form>';
      }
      

admin/js/_blog_pref.js

@@ -10 +10 @@
      $("p#urlwarning").remove();
      if (errorMsg != '') {
-          $("#blog_url").parents('p').before('<p id="urlwarning" class="error">'+errorMsg+'</p>');
+          $("#blog_url").parents('p').after('<p id="urlwarning" class="warning">'+errorMsg+'</p>');
      }
 }

admin/js/_index.js

@@ -66 +66 @@
      $('#quick h3').toggleWithLegend($('#quick').children().not('h3'),{
           cookie: 'dcx_quick_entry'
-     }, positionFooter);
+     });
 });

admin/js/_media.js

@@ -84 +84 @@
                     },
                     fileQueued: function() {
-                         positionFooter();
+                         ;
                     }
                }

admin/js/_post.js

@@ -8 +8 @@
      $(img).css('cursor','pointer');
      img.line = line;
-     img.onclick = function() { dotclear.viewCommentContent(this,this.line); positionFooter(); };
+     img.onclick = function() { dotclear.viewCommentContent(this,this.line); };
      
      td.insertBefore(img,td.firstChild);

admin/js/common.js

@@ -84 +84 @@
                $(i).get(0).src = p.img_on_src;
                $(i).get(0).alt = p.img_on_alt;
-               target.hide(speed, positionFooter);
+               target.hide(speed);
           } else {
                $(i).get(0).src = p.img_off_src;
                $(i).get(0).alt = p.img_off_alt;
-               target.show(speed, positionFooter);
+               target.show(speed);
                if (p.fn) {
                     p.fn.apply(target);
@@ -122 +122 @@
           $(ctarget).css('cursor','pointer');
           $(ctarget).click(function() {
-               toggle(i,p.speed, positionFooter);
+               toggle(i,p.speed);
                return false;
           });
@@ -315 +315 @@
      }
 };
-
-/* Sticky footer
--------------------------------------------------------- */
-function positionFooter() {
-     $('#footer').constantfooter();
-}
 
 /* On document ready
@@ -365 +359 @@
           return true;
      });
-
-     // Sticky footer
-     positionFooter();
-     $(window).resize(positionFooter);
 });
 

admin/js/jquery/jquery.pageTabs.js

@@ -72 +72 @@
           this.divs.each(function() {
                if ((this.id != '' && this.id == index) || i == index) {
-                    jQuery(this).show(0, positionFooter);
+                    jQuery(this).show(0);
                     This.items[i].className = This.params.listClassName+'-active';
                     to_trigger = i;
                } else {
-                    jQuery(this).hide(0, positionFooter);
+                    jQuery(this).hide(0);
                     This.items[i].className = '';
                }

admin/media_item.php

@@ -145 +145 @@
                $res[] = (string) $file->media_meta->{$v};
           } elseif (preg_match('/^Date\((.+?)\)$/u',$v,$m)) {
-               if ($dto_first && $file->media_meta->DateTimeOriginal) {
+               if ($dto_first && ($file->media_meta->DateTimeOriginal != 0)) {
                     $res[] = dt::dt2str($m[1],(string) $file->media_meta->DateTimeOriginal);
                } else {

admin/style/default.css

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 */
+
+/* ------------------------------------------------------------------ html */
 body {
      font: 75%/1.5em Helvetica,Arial,sans-serif;
@@ -151 +153 @@
      height: 2em;
 }
+#info-box1 p {
+     margin: 0;
+     display: inline;
+}
 #info-box1 select {
      width: 15em;
@@ -193 +199 @@
 }
 #content {
-     margin: 1.5em 1.5em 4em 13em;
+     margin: 1.5em 1.5em .5em 13em;
      padding: 1em;
      background: #fff;
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      border: 1px solid #ddd;
@@ -255 +259 @@
      background: #dfdfdf;
      text-decoration: none;
-     -webkit-border-top-left-radius: .3em;
-     -webkit-border-top-right-radius: .3em;
-     -moz-border-radius-topleft: .3em;
-     -moz-border-radius-topright: .3em;
      border-top-left-radius: .3em;
      border-top-right-radius: .3em;
@@ -282 +282 @@
      float: left;
      margin-top: 1.2em;
-     margin-bottom: 1em;
+     margin-bottom: .5em;
 }
 #main-menu h3 {
@@ -302 +302 @@
      padding: .2em 0 0 32px;
      background-repeat: no-repeat;
-     background-position: 12px .2em;
+     background-position: 12px .4em;
 }
 #main-menu a {
@@ -340 +340 @@
 #footer {
      clear: both;
-     padding: .75em 2em;
-     margin: 6em 15px .5em 15px;
-     -webkit-border-radius: .3em;
-     -moz-border-radius: .3em;
-     border-radius: .3em;
-     background: #575859 url(dc_logo_small.png) no-repeat right bottom;
-     color: #fff;
+     padding: .75em .75em 0 0;
+     text-align: right;
 }
 #footer p {
@@ -355 +350 @@
 }
 #footer a {
-     color: #f5f5f5;
 }
 #footer p span.credit {
@@ -378 +372 @@
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -513 +505 @@
      border: 1px solid #ccc;
      border-left: 1em solid #E5E3DA;
-     -moz-border-radius: .3em;
-     -webkit-border-radius: .3em;
      border-radius: .3em;
 }
@@ -668 +658 @@
      border: 1px solid #ddd;
      padding: .2em;
-     -moz-border-radius: .5em;
-     -webkit-border-radius: .5em;
      border-radius: .5em;
 }
@@ -764 +752 @@
      border: 1px solid #f3f3f3;
      cursor: pointer;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -804 +790 @@
 }
 #help-button {
-     position: absolute;
-     top: 6.2em;
+     position: fixed;
+     top: 3.2em;
      right: 0px;
      cursor: pointer;
@@ -815 +801 @@
      text-transform: capitalize;
      padding: .33em .75em .33em 1em;
-     -moz-border-radius: 1em 0 0 1em;
-     -webkit-border-top-left-radius: 1em;
-     -webkit-border-bottom-left-radius: 1em;
+     border-radius: 1em 0 0 1em;
      color: #444;
 }
@@ -879 +863 @@
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     padding: 0.5em 0.5em 0.5em 40px;
+     padding: 0.5em 0.5em 0.5em 48px;
      margin-bottom: 1em;
-     -moz-border-radius: 8px;
-     -webkit-border-radius: 8px;
      border-radius: 8px;
 }
@@ -890 +872 @@
 }
 div.error, p.error {
-     background: #e5bfbf url(msg-error.png) no-repeat 5px 5px;
-     color: #600;
+     background: #ffdec8 url(msg-error.png) no-repeat .7em .7em;
+     color: #000;
 }
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     background: #666 url(msg-std.png) no-repeat 5px 5px;
+     background: #666 url(msg-std.png) no-repeat .7em .7em;
      color: #fff;
 }
@@ -1015 +997 @@
      right: 0;
 }
+.distrib img {
+     display: block;
+     float: right;
+     margin-top: -1em;
+}
 /* TABLES
 -------------------------------------------------------- */
@@ -1041 +1028 @@
 th {
      text-align: left;
+     border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
@@ -1056 +1044 @@
      white-space: nowrap;
      vertical-align: top;
+}
+table.settings, table.prefs {
+     width: 80%;
+}
+table.settings th:first-child, table.prefs th:first-child {
+     width: 20%;
+}
+table.settings th + th, table.prefs th + th {
+     width: 30%;
+}
+table.settings th + th + th, table.prefs th + th + th {
+     width: 10%;
+}
+table.settings th:last-child, table.prefs th:last-child {
+     width: 40%;
 }
 
@@ -1136 +1139 @@
      border-color: #000 #ccc #ccc #000;
 }
+input.invalid, textarea.invalid, select.invalid {
+     border: 1px solid red;
+     background: #fff; 
+     color: red;
+     box-shadow: 0 0 0 1px rgba(218, 62, 90, 0.3)
+}
 input, textarea, select, option {
      font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
@@ -1167 +1176 @@
      color: #666;
 }
+span.form-note {
+     font-style:italic;
+     font-weight: normal;
+     color: #666;
+}
 p.form-note.warn, p.form-note.info, p.warning {
      font-style: normal;
@@ -1172 +1186 @@
 }
 p.form-note.warn, p.warning {
-     background: #ffd url(warning.png) no-repeat .2em .2em;
+     background: #ffd url(warning.png) no-repeat .3em .3em;
      border: 1px solid #f0c020;
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .2em .2em;
+     background: #eef url(info.png) no-repeat .3em .2em;
      border: 1px solid #99f;
 }
@@ -1209 +1223 @@
 p.field {
      position: relative;
-
+     
 }
 p.field label {
@@ -1275 +1289 @@
      padding: .1em .5em 0 .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
-     -webkit-border-radius: .2em;
-     -moz-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;
@@ -1358 +1370 @@
 }
 a.button.add {
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      margin-bottom: .1em;     
-     background: #2C8FD1 url(add.png) no-repeat 6px center;
+     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
      color: #fff;
      padding: .2em 16px .2em 30px;
@@ -1369 +1379 @@
 a.button.add:hover, a.button.add:focus {
      background-color: #2373A8;
+}
+/* jQuery Autocomplete plugin */
+.ac_results {
+     padding: 0px;
+     border: 1px dotted #f90;
+     background-color: white;
+     overflow: hidden;
+     z-index: 99999;
+}
+.ac_results ul {
+     width: 100%;
+     list-style-position: outside;
+     list-style: none;
+     padding: 0;
+     margin: 0;
+}
+.ac_results li {
+     margin: 0px;
+     padding: 2px 5px;
+     cursor: default;
+     display: block;
+     font: menu;
+     font-size: 1em;
+     line-height: 16px;
+     overflow: hidden;
+}
+.ac_loading {
+     background: transparent url('loader.gif') right center no-repeat;
+}
+.ac_over {
+     background-color: #06c;
+     color: white;
 }
 

inc/admin/lib.dc.page.php

@@ -173 +173 @@
           self::jsLoad('js/jquery/jquery.biscuit.js').
           self::jsLoad('js/jquery/jquery.bgFade.js').
-          self::jsLoad('js/jquery/jquery.constantfooter.js').
           self::jsLoad('js/common.js').
           self::jsLoad('js/prelude.js').

inc/core/class.dc.blog.php

@@ -228 +228 @@
                'SELECT post_id, COUNT(post_id) AS nb_comment,comment_trackback '.
                'FROM '.$this->prefix.'comment '.
-               'WHERE post_id'.$this->con->in($a_ids).
-               'AND comment_status = 1 ';
+               'WHERE comment_status = 1 '.
+               (count($a_ids) > 0 ? 'AND post_id'.$this->con->in($a_ids) : ' ');
           
           if ($del) {

inc/core/class.dc.media.php

@@ -841 +841 @@
           while ($rs->fetch()) {
                if (is_dir($this->root.'/'.$rs->media_dir))
-                    $dir[] = $rs->media_dir;
+                    $dir[] = ($rs->media_dir == '.' ? '' : $rs->media_dir);
           }
           
@@ -940 +940 @@
                          $img->resize($s[0],$s[0],$s[1]);
                          $img->output('jpeg',$thumb_file,$rate);
+                         $img->loadImage($file);
                     }
                }

inc/load_plugin_file.php

@@ -47 +47 @@
 }
 
+// Only $_GET['pf'] is allowed in URL
+if (count($_GET) > 1)
+{
+    header('Content-Type: text/plain');
+    http::head(403,'Forbidden');
+    exit;
+}
+
 $allow_types = array('png','jpg','jpeg','gif','css','js','swf');
 

inc/prepend.php

@@ -149 +149 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5-dev');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

inc/public/class.dc.template.php

@@ -42 +42 @@
           # Loops test tags
           $this->addBlock('LoopPosition',array($this,'LoopPosition'));
+          $this->addValue('LoopIndex',array($this,'LoopIndex'));
           
           # Archives
@@ -528 +529 @@
           "<?php endif; ?>";
      }
+
+     public function LoopIndex($attr)
+     {
+          $f = $this->getFilters($attr);
+          return '<?php '.sprintf($f,'(!$_ctx->cur_loop ? 0 : $_ctx->cur_loop->index() + 1)').' ?>';
+     }
      
      

inc/public/lib.tpl.context.php

@@ -451 +451 @@
           
           # No src, look in category description if available
-          if (!$src && $with_category && $_ctx->categories)
-          {
-               if (preg_match_all($pattern,$_ctx->categories->cat_desc,$m) > 0)
+        if (!$src && $with_category && $_ctx->posts->cat_desc)
+        {
+               if (preg_match_all($pattern,$_ctx->posts->cat_desc,$m) > 0)
                {
                     foreach ($m[1] as $i => $img) {

locales/bn/plugins.po

@@ -222 +222 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/ca/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/cs/plugins.po

@@ -224 +224 @@
 msgstr "Všechny spam komentáře starší než %s dnů(y) budou automaticky smazány."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/da/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/de/plugins.po

@@ -224 +224 @@
 msgstr "Alle Spam-Kommentare, die älter als %s Tag(e) sind, werden automatisch gelöscht."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/en/plugins.po

@@ -238 +238 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/eo/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/es-ar/plugins.po

@@ -223 +223 @@
 msgstr "Todos los comentarios no deseados mas antiguos que %s día(s) serán automáticamente eliminados."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/es/plugins.po

@@ -228 +228 @@
 msgstr "Todos los comentarios basura de más de %s día(s) serán borrados automáticamente."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/eu/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/fr/plugins.po

@@ -262 +262 @@
 "supprimés automatiquement."
 
-msgid "You can modify this duration in "
-msgstr "Vous pouvez modifier cet intervalle dans"
-
 msgid "Blog preferences"
 msgstr "Préférences du blog"

locales/hu/plugins.po

@@ -223 +223 @@
 msgstr "Az összes %s napnál öregebb spam automatikusan törlődni fog."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/it/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/ja/plugins.po

@@ -225 +225 @@
 msgstr "%s 日を経過したすべてのスパムコメントは自動的に削除されます。"
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/ko/plugins.po

@@ -224 +224 @@
 msgstr "%s 일이 지난 스팸은 모두 자동으로 삭제됩니다."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/lt/plugins.po

@@ -215 +215 @@
 msgstr "Senesni nei %s dienų spamo komentarai bus automatiškai ištrinami."
 
+msgid "You can modify this duration in the %s"
+msgstr ""
+
 msgid "Available spam filters"
 msgstr "Galimi spam filtrai"

locales/nl/plugins.po

@@ -220 +220 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/oc/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/pl/plugins.po

@@ -224 +224 @@
 msgstr "Wszystkie niechciane komentarze starsze niż %s dni będą automatycznie usuwane."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/pt-br/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/pt/plugins.po

@@ -228 +228 @@
 msgstr "Todos os comentários spam com mais de %s dia(s) serão suprimidos automaticamente."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/ro/plugins.po

@@ -225 +225 @@
 msgstr "Toate comentariile spam mai vechi de %s zile vor fi șterse automat."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/ru/plugins.po

@@ -222 +222 @@
 msgstr "Все спам комментарии старше чем %s дней будут удалены автоматически."
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/sr/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/sv/plugins.po

@@ -221 +221 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/te/plugins.po

@@ -220 +220 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/tr/plugins.po

@@ -223 +223 @@
 msgstr ""
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

locales/zh-cn/plugins.po

@@ -225 +225 @@
 msgstr "所有早于 %s 天的垃圾评论都会被自动删除。"
 
-msgid "You can modify this duration in "
+msgid "You can modify this duration in the %s"
 msgstr ""
 

plugins/antispam/_define.php

@@ -16 +16 @@
      /* Description*/         "Generic antispam plugin for Dotclear",
      /* Author */             "Alain Vagner",
-     /* Version */            '1.4',
+     /* Version */            '1.4.1',
      array(
           'permissions' =>    'usage,contentadmin',

plugins/antispam/antispam.js

@@ -1 @@
-var dragsort = ToolMan.dragsort();
 $(function() {
-     $("#filters-list").each(function() {
-          dragsort.makeTableSortable(this,dotclear.sortable.setHandle, dotclear.sortable.saveOrder);
+     $("#filters-list").sortable({'cursor':'move'});
+     $("#filters-list tr").hover(function () {
+          $(this).css({'cursor':'move'});
+     }, function () {
+          $(this).css({'cursor':'auto'});
      });
-     $('form input[type=submit][name=delete_all]').click(function(){
-          return window.confirm(dotclear.msg.confirm_spam_delete);
+     $('#filters-form').submit(function() {
+          var order=[];
+          $("#filters-list tr td input.position").each(function() {
+               order.push(this.name.replace(/^f_order\[([^\]]+)\]$/,'$1'));
+          });
+          $("input[name=filters_order]")[0].value = order.join(',');
+          return true;
      });
+     $("#filters-list tr td input.position").hide();
+     $("#filters-list tr td.handle").addClass('handler');
 });
-
-dotclear.sortable = {
-     setHandle: function(item) {
-          var handle = $(item).find('td.handle').get(0);
-          while (handle.firstChild) {
-               handle.removeChild(handle.firstChild);
-          }
-          
-          item.toolManDragGroup.setHandle(handle);
-          $(handle).addClass('handler');
-     },
-     
-     saveOrder: function(item) {
-          var group = item.toolManDragGroup;
-          var order = $('#filters_order').get(0);
-          group.register('dragend', function() {
-               order.value = '';
-               items = item.parentNode.getElementsByTagName('tr');
-               
-               for (var i=0; i<items.length; i++) {
-                    order.value += items[i].id.substr(2)+',';
-               }
-          });
-     }
-};

plugins/antispam/index.php

@@ -108 +108 @@
   </script>
   <?php
-  echo
-  dcPage::jsToolMan().
-  dcPage::jsPageTabs($default_tab).
-  dcPage::jsLoad('index.php?pf=antispam/antispam.js');
+  echo dcPage::jsPageTabs($default_tab);
+  $core->auth->user_prefs->addWorkspace('accessibility');
+  if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+     echo
+          dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+          dcPage::jsLoad('index.php?pf=antispam/antispam.js');
+  }
   ?>
   <link rel="stylesheet" type="text/css" href="index.php?pf=antispam/style.css" />
@@ -159 +162 @@
      if ($moderationTTL != null && $moderationTTL >=0) {
           echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $moderationTTL).' '.
-          __('You can modify this duration in ').
-          '<a href="blog_pref.php"> '.__('Blog preferences').'</a></p>';
+          sprintf(__('You can modify this duration in the %s'),'<a href="blog_pref.php"> '.__('Blog preferences').'</a>').
+               '</p>';
      }
      echo '</form>';
@@ -167 +170 @@
      # Filters
      echo
-     '<form action="'.$p_url.'" method="post" class="fieldset">';
+     '<form action="'.$p_url.'" method="post" class="fieldset" id="filters-form">';
 
      if (!empty($_GET['upd'])) {
@@ -198 +201 @@
           echo
           '<tr class="line'.($f->active ? '' : ' offline').'" id="f_'.$fid.'">'.
-          '<td class="handle">'.form::field(array('f_order['.$fid.']'),2,5,(string) $i, '', '', false, 'title="'.__('position').'"').'</td>'.
+          '<td class="handle">'.form::field(array('f_order['.$fid.']'),2,5,(string) $i, 'position', '', false, 'title="'.__('position').'"').'</td>'.
           '<td class="nowrap">'.form::checkbox(array('filters_active[]'),$fid,$f->active, '', '', false, 'title="'.__('Active').'"').'</td>'.
           '<td class="nowrap">'.form::checkbox(array('filters_auto_del[]'),$fid,$f->auto_delete, '', '', false, 'title="'.__('Auto Del.').'"').'</td>'.

plugins/blogroll/_define.php

@@ -16 +16 @@
      /* Description*/         "Manage your blogroll",
      /* Author */             "Olivier Meunier",
-     /* Version */            '1.3',
+     /* Version */            '1.3.1',
      array(
           'permissions' =>    'blogroll'

plugins/blogroll/index.php

@@ -164 +164 @@
 <head>
   <title><?php echo __('Blogroll'); ?></title>
-  <?php echo dcPage::jsToolMan(); ?>
   <?php echo dcPage::jsConfirmClose('links-form','add-link-form','add-category-form'); ?>
   <?php 
-     $core->auth->user_prefs->addWorkspace('accessibility'); 
-     $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
+     $core->auth->user_prefs->addWorkspace('accessibility');
+     if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+     echo
+          dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+          dcPage::jsLoad('index.php?pf=blogroll/blogroll.js');
+     }
   ?>
-  <?php if (!$user_dm_nodragdrop) : ?>
-  <script type="text/javascript">
-  //<![CDATA[
-  
-  var dragsort = ToolMan.dragsort();
-  $(function() {
-     dragsort.makeTableSortable($("#links-list").get(0),
-     dotclear.sortable.setHandle,dotclear.sortable.saveOrder);
-     
-     $('.checkboxes-helpers').each(function() {
-          dotclear.checkboxesHelpers(this);
-     });
-  });
-  
-  dotclear.sortable = {
-       setHandle: function(item) {
-          var handle = $(item).find('td.handle').get(0);
-          while (handle.firstChild) {
-               handle.removeChild(handle.firstChild);
-          }
-          
-          item.toolManDragGroup.setHandle(handle);
-          handle.className = handle.className+' handler';
-       },
-       
-       saveOrder: function(item) {
-          var group = item.toolManDragGroup;
-          var order = document.getElementById('links_order');
-          group.register('dragend', function() {
-               order.value = '';
-               items = item.parentNode.getElementsByTagName('tr');
-               
-               for (var i=0; i<items.length; i++) {
-                    order.value += items[i].id.substr(2)+',';
-               }
-          });
-       }
-  };
-  //]]>
-  </script>
-  <?php endif; ?>
   <?php echo dcPage::jsPageTabs($default_tab); ?>
 </head>
@@ -258 +220 @@
      echo
      '<tr class="line" id="l_'.$rs->link_id.'">'.
-     '<td class="handle minimal">'.form::field(array('order['.$rs->link_id.']'),2,5,$position,'','',false,'title="'.__('position').'"').'</td>'.
+     '<td class="handle minimal">'.form::field(array('order['.$rs->link_id.']'),2,5,$position,'position','',false,'title="'.__('position').'"').'</td>'.
      '<td class="minimal">'.form::checkbox(array('remove[]'),$rs->link_id,'','','',false,'title="'.__('select this link').'"').'</td>';
      

plugins/pages/page.php

@@ -431 +431 @@
           http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
           '/'.$post->post_url);
-          echo '<a id="post-preview" href="'.$preview_url.'" class="button">'.__('Preview').'</a>';
+          echo '<a id="post-preview" href="'.$preview_url.'" class="button" accesskey="p">'.__('Preview').' (p)'.'</a>';
      }
      

plugins/simpleMenu/_define.php

@@ -16 +16 @@
      /* Description*/         "Simple menu for Dotclear",
      /* Author */             "Franck Paul",
-     /* Version */            '1.1',
+     /* Version */            '1.1.1',
      array(
           'permissions' =>    'admin'

plugins/simpleMenu/index.php

@@ -354 +354 @@
 <head>
      <title><?php echo $page_title; ?></title>
-     <?php
-          echo
-               dcPage::jsToolMan().
-               # --BEHAVIOR-- adminPageHeaders
-               $core->callBehavior('adminPageHeaders');
+     <?php 
+          $core->auth->user_prefs->addWorkspace('accessibility');
+          if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+               echo
+                    dcPage::jsLoad('js/jquery/jquery-ui.custom.js').
+                    dcPage::jsLoad('index.php?pf=simpleMenu/simplemenu.js');
+          }
      ?>
-     <?php 
-          $core->auth->user_prefs->addWorkspace('accessibility'); 
-          $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
-     ?>
-     <?php if (!$user_dm_nodragdrop) : ?>
-     <script type="text/javascript">
-     //<![CDATA[
-
-     var dragsort = ToolMan.dragsort();
-     $(function() {
-          dragsort.makeTableSortable($("#menuitemslist").get(0),
-          dotclear.sortable.setHandle,dotclear.sortable.saveOrder);
-
-          $('.checkboxes-helpers').each(function() {
-               dotclear.checkboxesHelpers(this);
-          });
-     });
-
-     dotclear.sortable = {
-          setHandle: function(item) {
-               var handle = $(item).find('td.handle').get(0);
-               while (handle.firstChild) {
-                    handle.removeChild(handle.firstChild);
-               }
-
-               item.toolManDragGroup.setHandle(handle);
-               handle.className = handle.className+' handler';
-          },
-
-          saveOrder: function(item) {
-               var group = item.toolManDragGroup;
-               var order = document.getElementById('im_order');
-               group.register('dragend', function() {
-                    order.value = '';
-                    items = item.parentNode.getElementsByTagName('tr');
-
-                    for (var i=0; i<items.length; i++) {
-                         order.value += items[i].id.substr(2)+',';
-                    }
-               });
-          }
-     };
-     //]]>
-     </script>
-     <?php endif; ?>
 </head>
 

plugins/tags/_public.php

@@ -56 +56 @@
                return
                "<?php\n".
-               "@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-               "@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+               "if (!isset(\$params)) { \$params = array(); }\n".
+               "if (!isset(\$params['from'])) { \$params['from'] = ''; }\n".
+               "if (!isset(\$params['sql'])) { \$params['sql'] = ''; }\n".
+               "\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+               "\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
                "\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
                "\$params['sql'] .= \"AND META.meta_id = '".$core->con->escape($attr['tag'])."' \";\n".
@@ -66 +69 @@
                return
                '<?php if ($_ctx->exists("meta") && ($_ctx->meta->meta_type == "tag")) { '.
-                    "@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-                    "@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+                    "if (!isset(\$params)) { \$params = array(); }\n".
+                    "if (!isset(\$params['from'])) { \$params['from'] = ''; }\n".
+                    "if (!isset(\$params['sql'])) { \$params['sql'] = ''; }\n".
+                    "\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+                    "\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
                     "\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
                     "\$params['sql'] .= \"AND META.meta_id = '\".\$core->con->escape(\$_ctx->meta->meta_id).\"' \";\n".

plugins/tags/js/post.js

@@ -12 +12 @@
                }
                var mEdit = new metaEditor(tags_edit,meta_field,'tag');
+               mEdit.meta_url = 'plugin.php?p=tags&m=tag_posts&tag=';
                mEdit.displayMeta('tag',post_id);
                

plugins/tags/js/posts_actions.js

@@ -7 +7 @@
      var target = $('#tags_list'); 
      var mEdit = new metaEditor(target,tag_field,'tag');
+     mEdit.meta_url = 'plugin.php?p=tags&m=tag_posts&tag=';
      
      mEdit.meta_dialog = $('<input type="text" />');

plugins/themeEditor/class.themeEditor.php

@@ -243 +243 @@
           foreach ($langs as $k => $v) {
                if ($this->parent_theme) {
-                    $this->po = array_merge($this->po,$this->getFilesInDir($this->parent_theme.'/locales/'.$v,'po',$v.'/','main.po'));
-               }
-               $this->po = array_merge($this->po,$this->getFilesInDir($this->user_theme.'/locales/'.$v,'po',$v.'/','main.po'));
+                    $this->po = array_merge($this->po,$this->getFilesInDir($this->parent_theme.'/locales/'.$v,'po',$v.'/'));
+               }
+               $this->po = array_merge($this->po,$this->getFilesInDir($this->user_theme.'/locales/'.$v,'po',$v.'/'));
           }
      }

plugins/userPref/index.php

@@ -72 +72 @@
      if ($s['type'] == 'boolean') {
           $field = form::combo(array($field_name.'['.$ws.']['.$id.']',$field_name.'_'.$id),
-          array(__('yes') => 1, __('no') => 0),$s['value']);
+          array(__('yes') => 1, __('no') => 0),$s['value'] ? 1 : 0);
      } else {
           $field = form::field(array($field_name.'['.$ws.']['.$id.']',$field_name.'_'.$id),40,null,

themes/ductile/_define.php

@@ -15 +15 @@
      /* Description*/         "Mediaqueries compliant elegant theme",
      /* Author */             "Dotclear Team",
-     /* Version */            '1.3',
+     /* Version */            '1.3.1',
      /* Properties */         array(
                                         'standalone_config' => true

themes/ductile/_prepend.php

@@ -20 +20 @@
      {
           global $core;
-          
+          if ($core->blog->settings->system->theme != 'ductile') { return; }
+
           echo "\n".'<!-- Header directives for Ductile configuration -->'."\n";
-          echo dcPage::jsToolMan();
-
-          // Need some more Js
-          $core->auth->user_prefs->addWorkspace('accessibility'); 
-          $user_dm_nodragdrop = $core->auth->user_prefs->accessibility->nodragdrop;
-          if (!$user_dm_nodragdrop) {
-               echo <<<EOT
+          $core->auth->user_prefs->addWorkspace('accessibility');
+          if (!$core->auth->user_prefs->accessibility->nodragdrop) {
+               echo
+                    dcPage::jsLoad('js/jquery/jquery-ui.custom.js');
+                    echo <<<EOT
 <script type="text/javascript">
 //<![CDATA[
-
-var dragsort = ToolMan.dragsort();
 $(function() {
-     dragsort.makeTableSortable($("#stickerslist").get(0),
-     dotclear.sortable.setHandle,dotclear.sortable.saveOrder);
+     $("#stickerslist").sortable({'cursor':'move'});
+     $("#stickerslist tr").hover(function () {
+          $(this).css({'cursor':'move'});
+     }, function () {
+          $(this).css({'cursor':'auto'});
+     });
+     $('#theme_config').submit(function() {
+          var order=[];
+          $("#stickerslist tr td input.position").each(function() {
+               order.push(this.name.replace(/^order\[([^\]]+)\]$/,'$1'));
+          });
+          $("input[name=ds_order]")[0].value = order.join(',');
+          return true;
+     });
+     $("#stickerslist tr td input.position").hide();
+     $("#stickerslist tr td.handle").addClass('handler');
 });
-
-dotclear.sortable = {
-     setHandle: function(item) {
-          var handle = $(item).find('td.handle').get(0);
-          while (handle.firstChild) {
-               handle.removeChild(handle.firstChild);
-          }
-
-          item.toolManDragGroup.setHandle(handle);
-          handle.className = handle.className+' handler';
-     },
-
-     saveOrder: function(item) {
-          var group = item.toolManDragGroup;
-          var order = document.getElementById('ds_order');
-          group.register('dragend', function() {
-               order.value = '';
-               items = item.parentNode.getElementsByTagName('tr');
-
-               for (var i=0; i<items.length; i++) {
-                    order.value += items[i].id.substr(2)+',';
-               }
-          });
-     }
-};
 //]]>
 </script>
 EOT;
           }
+
      }
 }