Changeset 2230:e63e48e1c53b for inc

Timestamp:

10/03/13 16:00:46 (12 years ago)

Author:

Dsls

Branch:

default

Message:

• New adminDashboardFavorites behavior introduced, adapted several plugins to it
• Added ability to move the whole favorite with title_cb, now renamed dashboard_cb
• new pages and pages shortcuts are now functional, closes #1727
• Moved preferences.php to new notifications system

File:

• inc/admin/class.dc.favorites.php (modified) (7 diffs)

inc/admin/class.dc.favorites.php

@@ -78 +78 @@
       public function setup() {
           $this->legacyFavorites();
+          $this->core->callBehavior('adminDashboardFavorites', $this->core, $this);
           $this->setUserPrefs();
      }
@@ -151 +152 @@
                $this->user_prefs = $this->getFavorites(array('new_post'));
           }
-
+          $u = explode('?',$_SERVER['REQUEST_URI']);
           // Loop over prefs to enable active favorites
           foreach ($this->user_prefs as $k=>&$v) {
                if (isset($v['active_cb']) && is_callable($v['active_cb'])) {
                     // Use callback if defined to match whether favorite is active or not
-                    $v['active'] = call_user_func($v['active_cb'],$_SERVER['REQUEST_URI'],$_REQUEST);
+                    $v['active'] = call_user_func($v['active_cb'],$u[0],$_REQUEST);
                } else {
                     // Failback active detection. We test against URI name & parameters
@@ -324 +325 @@
      public function appendDashboardIcons($icons) {
           foreach ($this->user_prefs as $k=>$v) {
-               if (isset($v['title_cb']) && is_callable($v['title_cb'])) {
-                    $title = call_user_func($v['title_cb'],$this->core);
-               } else {
-                    $title = $v['title'];
-               }
-               $icons[$k]=new ArrayObject(array($title,$v['url'],$v['large-icon']));
+               if (isset($v['dashboard_cb']) && is_callable($v['dashboard_cb'])) {
+                    $v = new ArrayObject($v);
+                    call_user_func($v['dashboard_cb'],$this->core,$v);
+               }
+               $icons[$k]=new ArrayObject(array($v['title'],$v['url'],$v['large-icon']));
                $this->core->callBehavior('adminDashboardFavsIcon',$this->core,$k,$icons[$k]);
           }         
@@ -344 +344 @@
       *   'large-icon' => favorite large icon (for dashboard)
       *   'permissions' => (optional) comma-separated list of permissions for thie fav, if not set : no restriction
-      *   'title_cb' => (optional) callback to modify title if dynamic, if not set : title is taken as is
+      *   'dashboard_cb' => (optional) callback to modify title if dynamic, if not set : title is taken as is
       *   'active_cb' => (optional) callback to tell whether current page matches favorite or not, for complex pages
       *
@@ -410 +410 @@
                     'large-icon' => 'images/menu/entries-b.png',
                     'permissions' => 'usage,contentadmin',
-                    'title_cb' => array('defaultFavorites','postsTitle')),
+                    'dashboard_cb' => array('defaultFavorites','postsDashboard')),
                'comments' => array(
                     'title' => __('Comments'),
@@ -417 +417 @@
                     'large-icon' => 'images/menu/comments-b.png',
                     'permissions' => 'usage,contentadmin',
-                    'title_cb' => array('defaultFavorites','commentsTitle')),
+                    'dashboard_cb' => array('defaultFavorites','commentsDashboard')),
                'search' => array(
                     'title' => __('Search'),
@@ -477 +477 @@
      }
      
-     public static function postsTitle($core) {
+     public static function postsDashboard($core,$v) {
           $post_count = $core->blog->getPosts(array(),true)->f(0);
           $str_entries = __('%d entry', '%d entries',$post_count);
-          return sprintf($str_entries,$post_count);
-     }
-     
-     public static function commentsTitle($core) {
+          $v['title'] = sprintf($str_entries,$post_count);
+     }
+     
+     public static function commentsDashboard($core,$v) {
           $comment_count = $core->blog->getComments(array(),true)->f(0);
           $str_comments = __('%d comments', '%d comments',$comment_count);
-          return sprintf($str_comments,$comment_count);
+          $v['title']= sprintf($str_comments,$comment_count);
      }