Changeset 1087:0e5529e90076 for inc

Timestamp:

12/19/12 00:51:19 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

• Current user is more verbose

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (1 diff)
• default-templates/index.html.twig (modified) (1 diff)
• default-templates/layout.html.twig (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -315 +315 @@
      protected function getCurrentUser()
      {
-          $this->protected_globals['current_user'] = $this->core->auth->userID() ?
-               array(
-                    'id'      => $this->core->auth->userID(),
-                    'admin'   => $this->core->auth->getInfo('user_admin'),
-                    'name'    => $this->core->auth->getInfo('user_name'),
-                    'firstname'    => $this->core->auth->getInfo('user_firstname'),
-                    'displayname'  => $this->core->auth->getInfo('user_displayname'),
-                    'url'     => $this->core->auth->getInfo('user_url'),
-                    'blog'    => $this->core->auth->getInfo('user_default_blog'),
-                    'lang'    => $this->core->auth->getInfo('user_lang'),
-                    'tz'      => $this->core->auth->getInfo('user_tz'),
-                    'creadt'  => $this->core->auth->getInfo('user_creadt'),
-                    'cn'      => $this->core->auth->getInfo('user_cn')
-               ) :
-               array(
-                    'id'      => '',
-                    'admin'   => '',
-                    'name'    => '',
-                    'firstname'    => '',
-                    'displayname'  => '',
-                    'url'     => '',
-                    'blog'    => '',
-                    'lang'    => 'en',
-                    'tz'      => '',
-                    'creadt'  => '',
-                    'cn'      => '',
+          $infos = array(
+               'pwd','name','firstname','displayname',
+               'email','url','default_blog','lang','tz',
+               'post_status','creadt','upddt','cn'
+          );
+          
+          $user = array(
+               'id' => '',
+               'super' => false,
+               'options' => array(),
+               'prefs' => array()
+          );
+          
+          foreach($infos as $i) {
+               $user[$i] = '';
+          }
+          
+          if ($this->core->auth->userID()) {
+          
+               $user = array(
+                    'id' => $this->core->auth->userID(),
+                    'super' => $this->core->auth->isSuperAdmin(),
+                    'options' => $this->core->auth->getOptions()
                );
+               
+               foreach($infos as $i) {
+                    $user[$i] = $this->core->auth->getInfo('user_'.$i);
+               }
+               
+               foreach($this->core->auth->user_prefs->dumpWorkspaces() as $ws => $prefs) {
+                    $user['prefs'][$ws] = $prefs->dumpPrefs();
+               }
+          }
+          
+          $this->protected_globals['current_user'] = $user;
      }
      

inc/admin/default-templates/index.html.twig

@@ -10 +10 @@
 {{ parent() }}
 
-{% if current_user.blog != current_blog.id and blog_count > 1 %}
+{% if current_user.default_blog != current_blog.id and blog_count > 1 %}
      <p><a href="index.php?default_blog=1" class="button">{{__('Make this blog my default blog')}}</a></p>
 {% endif %}

inc/admin/default-templates/layout.html.twig

@@ -40 +40 @@
                     <a {%if current_page == 'index' %}class="active" {% endif %}href="index.php">{{__('My dashboard')}}</a><span> | </span>
                     <a {%if current_page == 'preferences' %}class="active" {% endif %}href="preferences.php">{{__('My preferences')}}</a><span> | </span>
-                    <a href="index.php?logout=1" class="logout">{{__('Logout %s')|format(current_user.id)}} <img src="images/logout.png" alt="" /></a>
+                    <a href="index.php?logout=1" class="logout">{{__('Logout %s')|format(current_user.id)}} <img src="{{theme_url}}images/logout.png" alt="" /></a>
                </div>
           </div>