Changes in [144:c7ce5ceade9a:145:a3e1dd53fa0a]

Files:

• .hgsubstate (modified) (1 diff)
• admin/auth.php (modified) (1 diff)
• admin/blog.php (modified) (1 diff)
• admin/blog_pref.php (modified) (1 diff)
• admin/index.php (modified) (1 diff)
• admin/media.php (modified) (2 diffs)
• admin/preferences.php (modified) (1 diff)
• admin/style/default.css (modified) (4 diffs)
• admin/style/warning.png (added)
• inc/admin/prepend.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.prefs.php (modified) (3 diffs)
• inc/core/class.dc.workspace.php (modified) (2 diffs)
• locales/es/date.po (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• themes/blueSilence/_define.php (modified) (1 diff)
• themes/default/_define.php (modified) (1 diff)

.hgsubstate

@@ -1 @@
-8859cc5a74a0a4e2cf71307786b69f35126c6b2c inc/libs/clearbricks
+43d339c0455203dfc0cc82601c43c2d2cb57e09b inc/libs/clearbricks

admin/auth.php

@@ -365 +365 @@
                echo '<legend>'.__('Safe mode login').'</legend>';
                echo 
-                    '<p class="form-note">'.
-                    __('This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems').'&nbsp;'.
+                    '<p class="form-note info">'.
+                    __('This mode allows you to login without activating any of your plugins. This may be useful to solve compatibility problems').'&nbsp;<br />'.
                     __('Disable or delete any plugin suspected to cause trouble, then log out and log back in normally.').
                     '</p>';

admin/blog.php

@@ -78 +78 @@
      '<p><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog ID:').' '.
      form::field('blog_id',30,32,html::escapeHTML($blog_id)).'</label></p>'.
-     '<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').' '.
-     __('Please note that changing your blog ID may require changes in your public index.php file.').'</p>'.
+     '<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').'</p> '.
+     '<p class="form-note warn">'.__('Please note that changing your blog ID may require changes in your public index.php file.').'</p>'.
      
      '<p><label class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog name:').' '.

admin/blog_pref.php

@@ -268 +268 @@
           '<p><label for="blog_id" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Blog ID:').
           form::field('blog_id',30,32,html::escapeHTML($blog_id)).'</label></p>'.
-          '<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').' '.
-          __('Please note that changing your blog ID may require changes in your public index.php file.').'</p>';
+          '<p class="form-note">'.__('At least 2 characters using letters, numbers or symbols.').'</p> '.
+          '<p class="form-note warn">'.__('Please note that changing your blog ID may require changes in your public index.php file.').'</p>';
      }
      

admin/index.php

@@ -44 +44 @@
 
 # Check dashboard module prefs
-$core->auth->user_prefs->loadPrefs();
-     
-     // Set favorites menu
-     $ws = $core->auth->user_prefs->addWorkspace('favorites');
-     $count = 0;
-     foreach ($ws->dumpPrefs() as $k => $v) {
-          // User favorites only
-          if (!$v['global']) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }    
-     if (!$count) {
-          // Global favorites if any
-          foreach ($ws->dumpPrefs() as $k => $v) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }
-     if (!$count) {
-          // No user or global favorites, add "new entry" fav
-          $_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
-               preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
-               $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
-     }
-$core->auth->user_prefs->addWorkspace('dashboard');
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('doclinks',true)) {

admin/media.php

@@ -328 +328 @@
      echo
      '<div class="col"><h3 id="add-file">'.__('Add files').'</h3>'.
+     '<p class="form-note info">'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
      '<form id="media-upload" class="clear" action="'.html::escapeURL($page_url).'" method="post" enctype="multipart/form-data">'.
      '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
@@ -343 +344 @@
      '</fieldset>'.
      '</form>'.
-     '<p class="form-note">'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
      '</div>';
      

admin/preferences.php

@@ -487 +487 @@
 
 echo '<div id="default-favs"><h3>'.__('Default favorites').'</h3>';
-echo '<p class="form-note clear">'.__('Those favorites are displayed when My Favorites list is empty.').'</p>';
+echo '<p class="form-note info clear">'.__('Those favorites are displayed when My Favorites list is empty.').'</p>';
 $count = 0;
 foreach ($ws->dumpPrefs() as $k => $v) {

admin/style/default.css

@@ -272 +272 @@
      float: left;
      overflow: hidden;
-     padding: 1em 1%;
-     width: 66%;
+     padding: 1em 2% 1em 0;
+     width: 70%;
 }
 #dashboard-main.fullwidth {
@@ -319 +319 @@
 #dashboard-items {
      float: left;
-     width: 29%;
+     width: 27%;
      overflow: hidden;
-     margin-left: 2%;
      padding-bottom: 1em;
      padding-top: 3em;
@@ -1075 +1074 @@
 }
 p.form-note {
-     font-style:normal;
+     font-style:italic;
+     margin-top: -.7em;
+     color: #666;
+}
+p.form-note.warn, p.form-note.info {
+     font-style: normal;
+     padding: .2em 1em .1em 24px;
+}
+p.form-note.warn {
+     background: #ffd url(warning.png) no-repeat .2em .2em;
+     border: 1px solid #f0c020;
+}
+p.form-note.info {
      background: #eef url(info.png) no-repeat .2em .2em;
      border: 1px solid #99f;
-     padding: .2em 1em .1em 24px;
-     margin-top: -.7em;
-     color: #666;
 }
 .form-note a {border-bottom: 1px solid #99f;}
@@ -1188 +1196 @@
      text-align: center;
      text-decoration: none;
-     padding: .1em .75em .1em;
+     padding: .1em .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
      -webkit-border-radius: .2em;

inc/admin/prepend.php

@@ -292 +292 @@
           $core->auth->isSuperAdmin() ||
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
-     }
+
+          // Set favorites menu
+          $ws = $core->auth->user_prefs->addWorkspace('favorites');
+          $count = 0;
+          foreach ($ws->dumpPrefs() as $k => $v) {
+               // User favorites only
+               if (!$v['global']) {
+                    $count++;
+                    $fav = unserialize($v['value']);
+                    $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
+                         preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
+          }    
+          if (!$count) {
+               // Global favorites if any
+               foreach ($ws->dumpPrefs() as $k => $v) {
+                    $count++;
+                    $fav = unserialize($v['value']);
+                    $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
+                         preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
+          }
+          if (!$count) {
+               // No user or global favorites, add "new entry" fav
+               $_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
+                    preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
+                    $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
+          }
+}
 ?>

inc/core/class.dc.core.php

@@ -1424 +1424 @@
      public function countAllComments()
      {
-          $strReq = 'SELECT COUNT(comment_id) AS nb, post_id '.
-                    'FROM '.$this->prefix.'comment '.
-                    'WHERE comment_trackback %s 1 '.
-                    'AND comment_status = 1 '.
-                    'GROUP BY post_id ';
-          
-          $rsC = $this->con->select(sprintf($strReq,'<>'));
-          $rsT = $this->con->select(sprintf($strReq,'='));
-          
-          $cur = $this->con->openCursor($this->prefix.'post');
-          while ($rsC->fetch()) {
-               $cur->nb_comment = (integer) $rsC->nb;
-               $cur->update('WHERE post_id = '.(integer) $rsC->post_id);
-               $cur->clean();
-          }
-          
-          while ($rsT->fetch()) {
-               $cur->nb_trackback = (integer) $rsT->nb;
-               $cur->update('WHERE post_id = '.(integer) $rsT->post_id);
-               $cur->clean();
-          }
+     
+          $updCommentReq = 'UPDATE '.$this->prefix.'post P '.
+               'SET nb_comment = ('.
+                    'SELECT COUNT(C.comment_id) from '.$this->prefix.'comment C '.
+                    'WHERE C.post_id = P.post_id AND C.comment_trackback <> 1 '.
+                    'AND C.comment_status = 1 '.
+               ')';
+          $updTrackbackReq = 'UPDATE '.$this->prefix.'post P '.
+               'SET nb_trackback = ('.
+                    'SELECT COUNT(C.comment_id) from '.$this->prefix.'comment C '.
+                    'WHERE C.post_id = P.post_id AND C.comment_trackback = 1 '.
+                    'AND C.comment_status = 1 '.
+               ')';
+          $this->con->execute($updCommentReq);
+          $this->con->execute($updTrackbackReq);
      }
      

inc/core/class.dc.prefs.php

@@ -42 +42 @@
           $this->table = $core->prefix.'pref';
           $this->user_id =& $user_id;
-          //~ $this->loadPrefs();
+          try {$this->loadPrefs();} catch (Exception $e) {
+               if (version_compare($core->getVersion('core'),'2.3','>')) {
+                    trigger_error($e->getMessage());
+               }
+          }
      }
      
@@ -48 +52 @@
      Retrieves all workspaces (and their prefs) from database, with one query. 
      */
-     public function loadPrefs()
+     private function loadPrefs()
      {
           $strReq = 'SELECT user_id, pref_id, pref_value, '.
@@ -59 +63 @@
                $rs = $this->con->select($strReq);
           } catch (Exception $e) {
-               trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
+               //~ trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
+               //~ throw new Exception(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
                throw $e;
           }

inc/core/class.dc.workspace.php

@@ -46 +46 @@
           $this->user_id =& $user_id;
           
-          $this->getPrefs($rs);
+          try {$this->getPrefs($rs);} catch (Exception $e) {
+               if (version_compare($core->getVersion('core'),'2.3','>')) {
+                    trigger_error($e->getMessage());
+               }
+          }
      }
      
@@ -63 +67 @@
                     $rs = $this->con->select($strReq);
                } catch (Exception $e) {
-                    trigger_error(__('Unable to retrieve prefs:').' '.$this->con->error(), E_USER_ERROR);
+                    //~ trigger_error(__('Unable to retrieve prefs:').' '.$this->con->error(), E_USER_ERROR);
+                    throw $e;
                }
           }

locales/es/date.po

@@ -21 +21 @@
 msgid "%Y-%m-%d %H:%M"
 msgstr "%d/%m/%Y %H:%M"
+
+msgid "%A %e %B %Y"
+msgstr "%A %e de %B de %Y"
 
 msgid "_Jan"

locales/fr/main.po

@@ -956 +956 @@
 
 msgid "Last Name:"
-msgstr "Nom"
+msgstr "Nom :"
 
 msgid "Username and password"

themes/blueSilence/_define.php

@@ -14 +14 @@
 $this->registerModule(
      /* Name */               "Blue Silence",
-     /* Description*/         "Default Dotclear Theme",
+     /* Description*/         "Dotclear Theme",
      /* Author */             "Marco / marcarea.com",
      /* Version */            '1.0'

themes/default/_define.php

@@ -14 +14 @@
 $this->registerModule(
      /* Name */               "Blowup",
-     /* Description*/         "Fully customizable theme",
+     /* Description*/         "Default Dotclear theme, fully customizable",
      /* Author */             "Marco & Olivier",
      /* Version */            '1.0'