Changes in [1372:2217126c53a5:1373:eca0ffa617ed]

Files:

• .hgtags (modified) (1 diff)
• CHANGELOG (modified) (1 diff)
• admin/js/_users_actions.js (modified) (1 diff)
• admin/posts_actions.php (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• locales/en/main.po (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.iplookup.php (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.linkslookup.php (modified) (1 diff)

.hgtags

@@ -13 +13 @@
 514d5121a12586b7ff320924d44028b677a01020 2.4.4
 baf879af43beea9764d920c2facd7226e90c5cf3 2.5.1
+cfad9f2a9f6ec03206ff5db91985208e833a7528 2.5.2

CHANGELOG

@@ +1 @@
+Dotclear 2.5.2 - 2013-08-14
+===========================================================
+* Security fix: Fixed potential XSS
+* Bugfix: l10n Clearbricks library
+* <tpl:LoopPosition> now works <tpl:Attachments>
+* Dotclear update check may now be forced (ignoring cache)
+* Enforce integration of daInstaller plugin
+* Tags link button is now available on page editor
+* Default cache age is now 1 week instead of 2 hours
+* Quick entry dashboard module is not activated by default on new installation
+* New template {{tpl:BlogParentThemeURL}} (return URL of parent theme of blog's theme if any, URL of blog's theme otherwise)
+* Fix post comments number on comments deletion
+* Fix order of backup files
+* Minor enhancements
+* Various bug fixes
+* Various cosmetic adjustments
+
 Dotclear 2.5.1 - 2013-07-20
 ===========================================================

admin/js/_users_actions.js

@@ -30 +30 @@
                     
                     if (perm == 'admin' && !E.disabled) {
+                         perms[blog]['usage'].checked = E.checked;
+                         perms[blog]['publish'].checked = E.checked;
+                         perms[blog]['delete'].checked = E.checked;
+                         perms[blog]['contentadmin'].checked = E.checked;
+                         perms[blog]['categories'].checked = E.checked;
+                         perms[blog]['media'].checked = E.checked;
+                         perms[blog]['media_admin'].checked = E.checked;
                          perms[blog]['usage'].disabled = E.checked;
                          perms[blog]['publish'].disabled = E.checked;

admin/posts_actions.php

@@ -16 +16 @@
 
 $params = array();
+$action = '';
 
 /* Actions

inc/admin/lib.pager.php

@@ -87 +87 @@
                html::escapeHTML($this->rs->cat_title));
           } else {
-               $cat_title = __('None');
+               $cat_title = __('(No cat)');
           }
           

inc/prepend.php

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

locales/en/main.po

@@ -2790 +2790 @@
 msgid "The following error was encountered while trying to read the database:"
 msgstr ""
+
+msgid "(No cat)"
+msgstr "(none)"

locales/fr/main.po

@@ -2940 +2940 @@
 msgid "Invalid publication date"
 msgstr "Date de publication invalide"
+
+msgid "(No cat)"
+msgstr "(aucune)"

plugins/antispam/filters/class.dc.filter.iplookup.php

@@ -44 +44 @@
           }
 
-          $match = array();
-
           $bls = $this->getServers();
           $bls = preg_split('/\s*,\s*/',$bls);
 
-          foreach ($bls as $bl)
-          {
+          foreach ($bls as $bl) {
                if ($this->dnsblLookup($ip,$bl)) {
-                    $match[] = $bl;
+                    // Pass by reference $status to contain matching DNSBL
+                    $status = $bl;
+                    return true;
                }
-          }
-
-          if (!empty($match)) {
-               $status = substr(implode(', ',$match),0,128);
-               return true;
           }
      }

plugins/antispam/filters/class.dc.filter.linkslookup.php

@@ -64 +64 @@
      private function getLinks($text)
      {
-          $res = array();
-          
-          # href attribute on "a" tags
-          if (preg_match_all('/<a ([^>]+)>/ms', $text, $match, PREG_SET_ORDER))
-          {
-               for ($i = 0; $i<count($match); $i++)
-               {
-                    if (preg_match('/href="(http:\/\/[^"]+)"/ms', $match[$i][1], $matches)) {
-                         $res[] = $matches[1];
-                    }
-               }
-          }
-          
-          return $res;
+          // href attribute on "a" tags is second match
+          preg_match_all('|<a.*?href="(http.*?)"|', $text, $parts);
+
+          return $parts[1];
      }
 }