#NTR - Merge pull-request #17 from github.com

shopware5 · Oct 4, 2012 · 5ead4d7 · 5ead4d7
1 parent aa45c28
commit 5ead4d7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php b/engine/Shopware/Plugins/Default/Backend/Auth/Bootstrap.php
@@ -409,8 +409,7 @@ public function onInitResourceBackendSession(Enlight_Event_EventArgs $args)
 
         Enlight_Components_Session::start($options);
 
-        $referer = $this->request->getHeader('referer');
-        if($refererCheck && $referer !== null
+        if($refererCheck && ($referer = $this->request->getHeader('referer')) !== null
           && strpos($referer, 'http') === 0) {
             $referer = substr($referer, 0, strpos($referer, '/backend/'));
             $referer .= '/backend/';
@@ -421,8 +420,7 @@ public function onInitResourceBackendSession(Enlight_Event_EventArgs $args)
                 throw new Exception('Referer check for backend session failed');
             }
         }
-        $client = $this->request->getHeader('userAgent');
-        if($clientCheck && $client !== null) {
+        if($clientCheck && ($client = $this->request->getHeader('userAgent')) !== null) {
             if(!isset($_SESSION['__SW_CLIENT'])) {
                 $_SESSION['__SW_CLIENT'] = $client;
             } elseif ($client !==  $_SESSION['__SW_CLIENT']) {