Changeset 2566:9bf417837888 for inc/admin/prepend.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

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

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'])) {
@@ -184 +184 @@
      }
      unset($f);
-     
+
      if (($hfiles = @scandir($locales_root.$_lang.'/help')) !== false)
      {
@@ -205 +205 @@
      # [] : Title, URL, small icon, large icon, permissions, id, class
      # NB : '*' in permissions means any, null means super admin only
-     
-     
+
+
      # Menus creation
      $_menu = new ArrayObject();
@@ -219 +219 @@
      $core->plugins->loadModules(DC_PLUGINS_ROOT,'admin',$_lang);
      $core->favs->setup();
-     
+
      if (!$user_ui_nofavmenu) {
           $core->favs->appendMenu($_menu);
      }
 
-     
+
      # Set menu titles
-     
+
      $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
@@ -256 +256 @@
           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']),
@@ -273 +273 @@
           $core->auth->isSuperAdmin() ||
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->getBlogCount() > 1);
-     
+
      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);
      }
 }
-?>