Changes in [105:f6a361c6f554:108:e7e712a031cc]

Files:

• admin/index.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• inc/core/class.dc.prefs.php (modified) (3 diffs)
• inc/dbschema/upgrade.php (modified) (1 diff)

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')) {
@@ -221 +252 @@
 
 # Dashboard icons
-echo '<div id="dashboard-main"><div id="icons" class="clear">';
+echo '<div id="dashboard-main"><div id="icons">';
 foreach ($__dashboard_icons as $i)
 {

inc/admin/prepend.php

@@ -292 +292 @@
           $core->auth->isSuperAdmin() ||
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
-
-     try {
-          // 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);
-          }
-     } catch (Exception $e) {
-          $version = $core->getVersion('core');
-          if (version_compare($version,'2.3','<')) {
-               ;    // Ignore lack of dc_pref table before the logout following an auto-update
-          } else {
-               $core->error->add($e->getMessage());
-          }
-     }
-}
+     }
 ?>

inc/core/class.dc.prefs.php

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

inc/dbschema/upgrade.php

@@ -184 +184 @@
                          $count++;
                     }
+                    
+                    # A bit of housecleaning for no longer needed files
+                    $remfiles = array (
+                         'admin/style/cat-bg.png',
+                         'admin/style/footer-bg.png',
+                         'admin/style/head-logo.png',
+                         'admin/style/tab-bg.png',
+                         'admin/style/tab-c-l.png',
+                         'admin/style/tab-c-r.png',
+                         'admin/style/tab-l-l.png',
+                         'admin/style/tab-l-r.png',
+                         'admin/style/tab-n-l.png',
+                         'admin/style/tab-n-r.png',
+                         'inc/clearbricks/_common.php',
+                         'inc/clearbricks/common/lib.crypt.php',
+                         'inc/clearbricks/common/lib.date.php',
+                         'inc/clearbricks/common/lib.files.php',
+                         'inc/clearbricks/common/lib.form.php',
+                         'inc/clearbricks/common/lib.html.php',
+                         'inc/clearbricks/common/lib.http.php',
+                         'inc/clearbricks/common/lib.l10n.php',
+                         'inc/clearbricks/common/lib.text.php',
+                         'inc/clearbricks/common/tz.dat',
+                         'inc/clearbricks/common/_main.php',
+                         'inc/clearbricks/dblayer/class.cursor.php',
+                         'inc/clearbricks/dblayer/class.mysql.php',
+                         'inc/clearbricks/dblayer/class.pgsql.php',
+                         'inc/clearbricks/dblayer/class.sqlite.php',
+                         'inc/clearbricks/dblayer/dblayer.php',
+                         'inc/clearbricks/dbschema/class.dbschema.php',
+                         'inc/clearbricks/dbschema/class.dbstruct.php',
+                         'inc/clearbricks/dbschema/class.mysql.dbschema.php',
+                         'inc/clearbricks/dbschema/class.pgsql.dbschema.php',
+                         'inc/clearbricks/dbschema/class.sqlite.dbschema.php',
+                         'inc/clearbricks/diff/lib.diff.php',
+                         'inc/clearbricks/diff/lib.unified.diff.php',
+                         'inc/clearbricks/filemanager/class.filemanager.php',
+                         'inc/clearbricks/html.filter/class.html.filter.php',
+                         'inc/clearbricks/html.validator/class.html.validator.php',
+                         'inc/clearbricks/image/class.image.meta.php',
+                         'inc/clearbricks/image/class.image.tools.php',
+                         'inc/clearbricks/mail/class.mail.php',
+                         'inc/clearbricks/mail/class.socket.mail.php',
+                         'inc/clearbricks/net/class.net.socket.php',
+                         'inc/clearbricks/net.http/class.net.http.php',
+                         'inc/clearbricks/net.http.feed/class.feed.parser.php',
+                         'inc/clearbricks/net.http.feed/class.feed.reader.php',
+                         'inc/clearbricks/net.xmlrpc/class.net.xmlrpc.php',
+                         'inc/clearbricks/pager/class.pager.php',
+                         'inc/clearbricks/rest/class.rest.php',
+                         'inc/clearbricks/session.db/class.session.db.php',
+                         'inc/clearbricks/template/class.template.php',
+                         'inc/clearbricks/text.wiki2xhtml/class.wiki2xhtml.php',
+                         'inc/clearbricks/url.handler/class.url.handler.php',
+                         'inc/clearbricks/zip/class.unzip.php',
+                         'inc/clearbricks/zip/class.zip.php',
+                         'themes/default/tpl/.htaccess',
+                         'themes/default/tpl/404.html',
+                         'themes/default/tpl/archive.html',
+                         'themes/default/tpl/archive_month.html',
+                         'themes/default/tpl/category.html',
+                         'themes/default/tpl/home.html',
+                         'themes/default/tpl/post.html',
+                         'themes/default/tpl/search.html',
+                         'themes/default/tpl/tag.html',
+                         'themes/default/tpl/tags.html',
+                         'themes/default/tpl/user_head.html',
+                         'themes/default/tpl/_flv_player.html',
+                         'themes/default/tpl/_footer.html',
+                         'themes/default/tpl/_head.html',
+                         'themes/default/tpl/_mp3_player.html',
+                         'themes/default/tpl/_top.html'
+                    );
+                    $remfolders = array (
+                         'inc/clearbricks/common',
+                         'inc/clearbricks/dblayer',
+                         'inc/clearbricks/dbschema',
+                         'inc/clearbricks/diff',
+                         'inc/clearbricks/filemanager',
+                         'inc/clearbricks/html.filter',
+                         'inc/clearbricks/html.validator',
+                         'inc/clearbricks/image',
+                         'inc/clearbricks/mail',
+                         'inc/clearbricks/net',
+                         'inc/clearbricks/net.http',
+                         'inc/clearbricks/net.http.feed',
+                         'inc/clearbricks/net.xmlrpc',
+                         'inc/clearbricks/pager',
+                         'inc/clearbricks/rest',
+                         'inc/clearbricks/session.db',
+                         'inc/clearbricks/template',
+                         'inc/clearbricks/text.wiki2xhtml',
+                         'inc/clearbricks/url.handler',
+                         'inc/clearbricks/zip',
+                         'inc/clearbricks',
+                         'themes/default/tpl'
+                    );
+                    
+                    foreach ($remfiles as $f) {
+                         @unlink(DC_ROOT.'/'.$f);
+                    }
+                    foreach ($remfolders as $f) {
+                         @rmdir(DC_ROOT.'/'.$f);
+                    }
                }