refs #7104 Rename vars and put logic into method

1 files changed, 21 insertions, 13 deletions

diff --git a/core/FrontController.php b/core/FrontController.php
index a077820e5c..bd473bba8f 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -467,19 +467,7 @@ class FrontController extends Singleton
         ) {
             Session::start();
 
-            $isDashboardReferer   = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=CoreHome&action=index') !== false;
-            $isAllWebsitesReferer = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=MultiSites&action=index') !== false;
-
-            if ($isDashboardReferer
-                && !empty($_POST['token_auth'])
-                && Common::getRequestVar('widget', 0, 'int') === 1) {
-                Session::close();
-            }
-
-            if (($isDashboardReferer || $isAllWebsitesReferer)
-                && Common::getRequestVar('viewDataTable', '', 'string') === 'sparkline') {
-                Session::close();
-            }
+            $this->closeSessionEarlyForFasterUI();
         }
 
         if (is_null($parameters)) {
@@ -549,6 +537,25 @@ class FrontController extends Singleton
         Url::redirectToHttps();
     }
 
+    private function closeSessionEarlyForFasterUI()
+    {
+        $isDashboardReferrer = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=CoreHome&action=index') !== false;
+        $isAllWebsitesReferrer = !empty($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'module=MultiSites&action=index') !== false;
+
+        if ($isDashboardReferrer
+            && !empty($_POST['token_auth'])
+            && Common::getRequestVar('widget', 0, 'int') === 1
+        ) {
+            Session::close();
+        }
+
+        if (($isDashboardReferrer || $isAllWebsitesReferrer)
+            && Common::getRequestVar('viewDataTable', '', 'string') === 'sparkline'
+        ) {
+            Session::close();
+        }
+    }
+
     private function handleProfiler()
     {
         if (!empty($_GET['xhprof'])) {
@@ -622,4 +629,5 @@ class FrontController extends Singleton
         Piwik::postEvent('Request.dispatch.end', array(&$result, $module, $action, $parameters));
         return $result;
     }
+
 }