Changeset 25618

Timestamp:

Nov 21, 2013, 6:03:42 PM (10 years ago)

Author:

mistic100

Message:

fix parameters overlapping when changing user

Location:

extensions/AdminTools

Files:

• include/MultiView.class.php (modified) (12 diffs)
• template/fontello/css/fontello-puba-embedded.css (deleted)
• template/fontello/css/fontello-puba-ie7-codes.css (deleted)
• template/fontello/css/fontello-puba-ie7.css (deleted)

extensions/AdminTools/include/MultiView.class.php

@@ -2 +2 @@
 defined('ADMINTOOLS_ID') or die('Hacking attempt!');
 
+/**
+ * Class managing multi views system
+ */
 class MultiView
 {
+  /** @var bool $is_admin */
   private $is_admin;
 
+  /** @var array $data */
   private $data = array();
 
+  /**
+   * Constructor, load $data from session
+   */
   function __construct()
   {
@@ -22 +30 @@
         'template_combine_files' => $conf['template_combine_files'],
         'no_history' => false,
-        'purge_template' => false,
         ),
       pwg_get_session_var('multiview', array())
@@ -28 +35 @@
   }
 
+  /**
+   * @return bool
+   */
   public function is_admin()
   {
@@ -33 +43 @@
   }
 
+  /**
+   * @return array
+   */
   public function get_data()
   {
@@ -38 +51 @@
   }
 
+  /**
+   * Save $data in session
+   */
   private function save()
   {
@@ -43 +59 @@
   }
 
+  /**
+   * Returns the current url minus MultiView params
+   *
+   * @param bool $with_amp - adds ? or & at the end of the url
+   * @return string
+   */
   public function get_clean_url($with_amp=false)
   {
@@ -66 +88 @@
   }
 
+  /**
+   * Triggered on "user_init", change current view depending of URL params.
+   */
   public function user_init()
   {
@@ -74 +99 @@
       global $user, $conf;
 
-      $this->data['view_as'] = $user['id'];
-      $this->data['theme'] = $user['theme'];
-      $this->data['lang'] = $user['language'];
-
-      $refresh = false;
-
       // view_as
       if (isset($_GET['view_as']))
@@ -85 +104 @@
         $this->data['view_as'] = (int)$_GET['view_as'];
       }
-      if ($this->data['view_as'] != $user['id'])
+      if ($this->data['view_as'] != $user['id'] and $this->data['view_as'] != 0)
       {
         $user = build_user($this->data['view_as'], true);
@@ -97 +116 @@
         $this->data['theme'] = $_GET['theme'];
       }
-      $user['theme'] = $this->data['theme'];
+      if ($this->data['theme'] != '')
+      {
+        $user['theme'] = $this->data['theme'];
+      }
 
       // lang
@@ -104 +126 @@
         $this->data['lang'] = $_GET['lang'];
       }
-      $user['language'] = $this->data['lang'];
+      if ($this->data['lang'] != '')
+      {
+        $user['language'] = $this->data['lang'];
+      }
 
       // show_queries
@@ -144 +169 @@
       }
 
-      // purge_template
-      if (isset($_GET['purge_template']))
-      {
-        $this->data['purge_template'] = true;
-        $refresh = true;
-      }
-
       $this->save();
-
-      if ($refresh)
-      {
-        redirect($this->get_clean_url());
-      }
     }
   }
 
+  /**
+   * Triggered on "init", in order to clean template files (not initialized on "user_init")
+   */
   public function init()
   {
-    // can't know if user is admin, not build yet
-    // so only do non-critical tasks only
-
-    if ($this->data['purge_template'])
+    if (isset($_GET['purge_template']))
     {
       global $template;
       $template->delete_compiled_templates();
       FileCombiner::clear_combined_files();
-
-      $this->data['purge_template'] = false;
-      $this->save();
     }
   }