Changeset 2715:a87ddf7dbfb5 for inc/admin

Timestamp:

05/20/14 08:39:33 (11 years ago)

Author:

Dsls

Branch:

twig

Parents:

2683:fb8aa74332f1 (diff), 2714:eed2e5727277 (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 with default (admin/post.php still to update with editor preferences, in twig template)

Files:

• inc/admin/prepend.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (16 diffs)

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
@@ -174 +174 @@
 */
 }
+
+$core->adminurl = new dcAdminURL($core);
+
+$core->adminurl->register('admin.posts','posts.php');
+$core->adminurl->register('admin.post','post.php');
+$core->adminurl->register('admin.blog.theme','blog_theme.php');
+$core->adminurl->register('admin.blog.pref','blog_pref.php');
+$core->adminurl->register('admin.blogs','blogs.php');
+$core->adminurl->register('admin.categories','categories.php');
+$core->adminurl->register('admin.category','category.php');
+$core->adminurl->register('admin.comments','comments.php');
+$core->adminurl->register('admin.comments','comment.php');
+$core->adminurl->register('admin.help','help.php');
+$core->adminurl->register('admin.home','index.php');
+$core->adminurl->register('admin.langs','langs.php');
+$core->adminurl->register('admin.media','media.php');
+$core->adminurl->register('admin.media_item','media_item.php');
+$core->adminurl->register('admin.plugins','plugins.php');
+$core->adminurl->register('admin.plugin','plugin.php');
+$core->adminurl->register('admin.user.preferences','preferences.php');
+$core->adminurl->register('admin.user','user.php');
+$core->adminurl->register('admin.users','users.php');
 
 if ($core->auth->userID() && $core->blog !== null)

inc/admin/prepend.php

@@ -24 +24 @@
 function dc_load_locales() {
      global $_lang, $core;
-
+     
      $_lang = $core->auth->getInfo('user_lang');
      $_lang = preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_lang) ? $_lang : 'en';
-
+     
      l10n::lang($_lang);
      if (l10n::set(dirname(__FILE__).'/../../locales/'.$_lang.'/date') === false && $_lang != 'en') {
@@ -40 +40 @@
 {
      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)) ||
+          if ((preg_match('/^images\/menu\/(.+)$/',$img,$m)) || 
                (preg_match('/^index\.php\?pf=(.+)$/',$img,$m))) {
                if ($m[1]) {
@@ -65 +65 @@
      # We have session information in constants
      $_COOKIE[DC_SESSION_NAME] = DC_AUTH_SESS_ID;
-
+     
      if (!$core->auth->checkSession(DC_AUTH_SESS_UID)) {
           throw new Exception('Invalid session data.');
      }
-
+     
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -77 +77 @@
           }
      }
-
+     
      if (empty($_SESSION['sess_blog_id'])) {
           throw new Exception('Permission denied.');
      }
-
+     
      # Loading locales
      dc_load_locales();
-
+     
      $core->setBlog($_SESSION['sess_blog_id']);
      if (!$core->blog->id) {
@@ -100 +100 @@
                $p[3] = '/';
                call_user_func_array('setcookie',$p);
-
+               
                http::redirect('auth.php');
           }
@@ -108 +108 @@
                ,20);
      }
-
+     
      # Check nonce from POST requests
      if (!empty($_POST))
@@ -119 +119 @@
           }
      }
-
-
+     
+     
      if (!empty($_REQUEST['switchblog'])
      && $core->auth->getPermissions($_REQUEST['switchblog']) !== false)
@@ -131 +131 @@
                unset($_SESSION['media_manager_page']);
           }
-
+          
           # Removing switchblog from URL
           $redir = $_SERVER['REQUEST_URI'];
@@ -139 +139 @@
           exit;
      }
-
+     
      # Check blog to use and log out if no result
      if (isset($_SESSION['sess_blog_id']))
@@ -154 +154 @@
           }
      }
-
+     
      # Loading locales
      dc_load_locales();
-
+     
      if (isset($_SESSION['sess_blog_id'])) {
           $core->setBlog($_SESSION['sess_blog_id']);
@@ -165 +165 @@
      }
 
-/*
+/*   
      # Check add to my fav fired
      if (!empty($_REQUEST['add-favorite'])) {
@@ -206 +206 @@
      }
      unset($f);
-
+     
      if (($hfiles = @scandir($locales_root.$_lang.'/help')) !== false)
      {
@@ -227 +227 @@
      # [] : Title, URL, small icon, large icon, permissions, id, class
      # NB : '*' in permissions means any, null means super admin only
-
-
+     
+     
      # Menus creation
      $_menu = new ArrayObject();
@@ -246 +246 @@
      }
 
-
+     
      # Set menu titles
-
+     
      $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
@@ -278 +278 @@
           preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('usage,contentadmin',$core->blog->id));
-
+     
      $_menu['System']->prependItem(__('Update'),'update.php','images/menu/update.png',
           preg_match('/update.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
@@ -301 +301 @@
 }
 
+# Add admin default templates path
+$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
+# Set admin context
+$_ctx = new dcAdminContext($core);
+$core->tpl->addExtension($_ctx);
+
+# --BEHAVIOR-- adminPrepend
+$core->callBehavior('adminPrepend',$core,$_ctx);
+?>