Changeset 25979 for extensions/AdminTools

Timestamp:

Dec 17, 2013, 12:14:08 PM (10 years ago)

Author:

mistic100

Message:

remove useless SQL queries, don't change user on admin pages, fix theme and language overwrites, fix toolbar overlap, colorbox max width

Location:

extensions/AdminTools

Files:

• include/MultiView.class.php (modified) (6 diffs)
• include/events.inc.php (modified) (3 diffs)
• template/public_controller.js (modified) (4 diffs)
• template/style.css (modified) (1 diff)

extensions/AdminTools/include/MultiView.class.php

@@ -12 +12 @@
   /** @var array $data */
   private $data = array();
+  private $data_url_params = array();
 
   /** @var array $user */
@@ -36 +37 @@
       pwg_get_session_var('multiview', array())
       );
+
+    $this->data_url_params = array_keys($this->data);
+    $this->data_url_params = array_map(create_function('$d', 'return "ato_".$d;'), $this->data_url_params);
   }
 
@@ -80 +84 @@
     if (script_basename() == 'picture')
     {
-      $url = duplicate_picture_url(array(), array_keys($this->data));
+      $url = duplicate_picture_url(array(), $this->data_url_params);
     }
     else if (script_basename() == 'index')
     {
-      $url = duplicate_index_url(array(), array_keys($this->data));
+      $url = duplicate_index_url(array(), $this->data_url_params);
     }
     else
     {
-      $url = get_query_string_diff(array_keys($this->data));
+      $url = get_query_string_diff($this->data_url_params);
     }
 
@@ -111 +115 @@
       'id' => $user['id'],
       'username' => $user['username'],
+      'language' => $user['language'],
+      'theme' => $user['theme'],
       );
 
@@ -130 +136 @@
 
       // view_as
-      if (isset($_GET['ato_view_as']))
-      {
-        $this->data['view_as'] = (int)$_GET['ato_view_as'];
-      }
-      if ($this->data['view_as'] != $user['id'])
-      {
-        $user = build_user($this->data['view_as'], true);
-        $this->data['theme'] = $user['theme'];
-        $this->data['lang'] = $user['language'];
+      if (!defined('IN_ADMIN'))
+      {
+        if (isset($_GET['ato_view_as']))
+        {
+          $this->data['view_as'] = (int)$_GET['ato_view_as'];
+        }
+        if ($this->data['view_as'] != $user['id'])
+        {
+          $user = build_user($this->data['view_as'], true);
+          if (isset($_GET['ato_view_as']))
+          {
+            $this->data['theme'] = $user['theme'];
+            $this->data['lang'] = $user['language'];
+          }
+        }
       }
 
@@ -195 +207 @@
       $this->save();
     }
+  }
+
+  /**
+   * Returns the language of the current user if different from the current language
+   * false otherwise
+   */
+  function get_user_language()
+  {
+    if (isset($this->user['language']) && isset($this->data['lang'])
+        && $this->user['language'] != $this->data['lang']
+      )
+    {
+      return $this->user['language'];
+    }
+    return false;
   }
 

extensions/AdminTools/include/events.inc.php

@@ -26 +26 @@
     $tpl_vars['DELETE_CACHE'] =     isset($conf['multiview_invalidate_cache']);
 
-    include_once(PHPWG_ROOT_PATH . 'include/functions_mail.inc.php');
-    switch_lang_to(get_default_language());
+    if (($admin_lang = $MultiView->get_user_language()) !== false)
+    {
+      include_once(PHPWG_ROOT_PATH . 'include/functions_mail.inc.php');
+      switch_lang_to($admin_lang);
+    }
   }
   else if (script_basename() == 'picture' and $picture['current']['added_by'] == $user['id'])
@@ -76 +79 @@
           );
 
-        $query = '
-SELECT id FROM ' . CATEGORIES_TABLE.'
-  WHERE id = ' . $page['category']['id'] .'
-    AND representative_picture_id = ' . $page['image_id'] .'
-;';
-        $tpl_vars['IS_REPRESENTATIVE'] = pwg_db_num_rows(pwg_query($query)) > 0;
+        $tpl_vars['IS_REPRESENTATIVE'] = $page['category']['representative_picture_id'] == $page['image_id'];
       }
 
@@ -167 +165 @@
   $template->parse('ato_public_controller');
 
-  if ($MultiView->is_admin())
+  if ($MultiView->is_admin() && @$admin_lang !== false)
   {
     switch_lang_back();

extensions/AdminTools/template/public_controller.js

@@ -6 +6 @@
 
   var $ato = $('#ato_header'),
-      $ato_closed = $('#ato_header_closed');
+      $ato_closed = $('#ato_header_closed'),
+      ato_height = 28; // normal height, real height conputed on init()
 
   // move to whole page down or up
   function moveBody(dir, anim) {
-    var operator = dir=='show' ? '+=' : '-=',
-        ato_height = $ato.height();
+    var operator = dir=='show' ? '+=' : '-=';
 
     if (anim) {
@@ -103 +103 @@
   this.init = function(urlSelf) {
     $('body').prepend($ato); // ensure the bar is at the begining
+    
+    $ato.show();
+    ato_height = $ato.height();
 
     if ('localStorage' in window) {
@@ -110 +113 @@
 
       if (window.localStorage.ato_panel_open == "true") {
-        $ato.show();
         moveBody('show', false);
       }
       else {
+        $ato.hide();
         $ato_closed.show();
       }
@@ -264 +267 @@
       transition: 'none',
       width: 500,
+      maxWidth: '100%',
       top: 50,
       title: $ato_edit.attr('title'),

extensions/AdminTools/template/style.css

@@ -48 +48 @@
   overflow:visible;
 }
+  #ato_header>ul>li a {
+    color:white;
+  }
   #ato_header>ul>li.right {
     float:right;