Changeset 1793:a25f8d0fd400 for inc/admin/prepend.php

Timestamp:

09/11/13 17:10:01 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1795:5c5c52124ab4, 1796:ef72fa20ed9d

Parents:

1792:3ad2e47ed52d (diff), 514:5cacbd2e1fa9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge globalhelp into default

Files:

• inc/admin/prepend.php (modified) (12 diffs)
• inc/admin/prepend.php (modified) (1 diff)

inc/admin/prepend.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
+define('DC_CONTEXT_ADMIN',true);
+
 require_once dirname(__FILE__).'/../prepend.php';
 
@@ -19 +21 @@
 // HTTP/1.0
 header("Pragma: no-cache");
-
-define('DC_CONTEXT_ADMIN',true);
 
 function dc_valid_fav($url) {
@@ -37 +37 @@
 function dc_prepare_url($url) {
 
-     $u = str_replace(array('?','&'),array('\?','&'),$url);
+     $u = str_replace(array('?','&','/'),array('\?','&','\\/'),$url);
      return (!strpos($u,'\?') ? 
           '/'.$u.'$/' :
@@ -55 +55 @@
      }
      l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/main');
+     l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/public');
      l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/plugins');
+}
+
+function dc_admin_icon_url($img)
+{
+     global $core;
+     
+     $core->auth->user_prefs->addWorkspace('interface');
+     $user_ui_iconset = @$core->auth->user_prefs->interface->iconset;
+     if (($user_ui_iconset) && ($img)) {
+          $icon = false;
+          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 
+               (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) {
+               if ($m[1]) {
+                    $icon = path::real(dirname(__FILE__).'/../../admin/images/iconset/'.$user_ui_iconset.'/'.$m[1],false);
+                    if ($icon !== false) {
+                         $allow_types = array('png','jpg','jpeg','gif');
+                         if (is_file($icon) && is_readable($icon) && in_array(files::getExtension($icon),$allow_types)) {
+                              return DC_ADMIN_URL.'images/iconset/'.$user_ui_iconset.'/'.$m[1];
+                         }
+                    }
+               }
+          }
+     }
+     return $img;
 }
 
@@ -191 +216 @@
      }
      unset($hfiles,$locales_root);
+
+     $core->auth->user_prefs->addWorkspace('interface');
+     $user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
      # Standard favorites
@@ -233 +261 @@
           'images/menu/users.png','images/menu/users-b.png',
           null,null,null));
-     $_fav['plugins'] = new ArrayObject(array('plugins','Plugins','plugins.php',
+     $_fav['plugins'] = new ArrayObject(array('plugins','Plugins management','plugins.php',
           'images/menu/plugins.png','images/menu/plugins-b.png',
           null,null,null));
@@ -246 +274 @@
      # Menus creation
      $_menu['Dashboard'] = new dcMenu('dashboard-menu',null);
-     $_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
+     if (!$user_ui_nofavmenu)
+          $_menu['Favorites'] = new dcMenu('favorites-menu','My favorites');
      $_menu['Blog'] = new dcMenu('blog-menu','Blog');
      $_menu['System'] = new dcMenu('system-menu','System');
@@ -259 +288 @@
      # Set menu titles
      
-     $_menu['System']->title = __('System');
+     $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
      $_menu['Plugins']->title = __('Plugins');
-     $_menu['Favorites']->title = __('My favorites');
+     if (!$user_ui_nofavmenu)
+          $_menu['Favorites']->title = __('My favorites');
 
 /*   
@@ -296 +326 @@
           $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post');
      
-     $_menu['System']->prependItem(__('Updates'),'update.php','images/menu/update.png',
+     $_menu['System']->prependItem(__('Update'),'update.php','images/menu/update.png',
           preg_match('/update.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin() && is_readable(DC_DIGESTS));
@@ -302 +332 @@
           preg_match('/langs.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin());
-     $_menu['System']->prependItem(__('Plugins'),'plugins.php','images/menu/plugins.png',
+     $_menu['System']->prependItem(__('Plugins management'),'plugins.php','images/menu/plugins.png',
           preg_match('/plugins.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin());
@@ -313 +343 @@
           $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']) {
-               $fav = unserialize($v['value']);
-               if (dc_valid_fav($fav['url'])) {
-                    $count++;
-                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                         preg_match(dc_prepare_url($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
+     if (!$user_ui_nofavmenu) {
+          // Set favorites menu
+          $ws = $core->auth->user_prefs->addWorkspace('favorites');
+          $count = 0;
           foreach ($ws->dumpPrefs() as $k => $v) {
-               $fav = unserialize($v['value']);
-               if (dc_valid_fav($fav['url'])) {
-                    $count++;
-                    $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
-                         preg_match(dc_prepare_url($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);
+               // User favorites only
+               if (!$v['global']) {
+                    $fav = unserialize($v['value']);
+                    if (dc_valid_fav($fav['url'])) {
+                         $count++;
+                         $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                              preg_match(dc_prepare_url($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) {
+                    $fav = unserialize($v['value']);
+                    if (dc_valid_fav($fav['url'])) {
+                         $count++;
+                         $_menu['Favorites']->addItem(__($fav['title']),$fav['url'],$fav['small-icon'],
+                              preg_match(dc_prepare_url($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);
+          }
+     }
+     
+     if (empty($core->blog->settings->system->jquery_migrate_mute)) {
+          $core->blog->settings->system->put('jquery_migrate_mute', true, 'boolean', 'Mute warnings for jquery migrate plugin ?', false);
      }
 }

inc/admin/prepend.php

@@ -267 +267 @@
           'images/menu/langs.png','images/menu/langs-b.png',
           null,null,null));
+
+     $_fav['help'] = new ArrayObject(array('help','Global help','help.php',
+          'images/menu/help.png','images/menu/help-b.png',
+          '*',null,null));
      
      # Menus creation