Changeset 106:cca7b21765d2 for admin

Timestamp:

05/02/11 13:50:51 (14 years ago)

Author:

xpla@…

Branch:

userprefs

Message:

Bugfix for userprefs load.

File:

• admin/index.php (modified) (2 diffs)

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)
 {