Refs PR #241 Manually close session when redirecting to another page

core/Plugin/Controller.php

@@ -771,13 +771,13 @@ public function redirectToIndex($moduleToRedirect, $actionToRedirect, $websiteId
         }
 
         if ($websiteId) {
-            $url = "Location: index.php?module=" . $moduleToRedirect
+            $url = "index.php?module=" . $moduleToRedirect
                 . "&action=" . $actionToRedirect
                 . "&idSite=" . $websiteId
                 . "&period=" . $defaultPeriod
                 . "&date=" . $defaultDate
                 . $parametersString;
-            header($url);
+            Url::redirectToUrl($url);
             exit;
         }
 

core/Session.php

@@ -109,7 +109,7 @@ public static function start($options = false)
         }
 
         try {
-            Zend_Session::start();
+            parent::start();
             register_shutdown_function(array('Zend_Session', 'writeClose'), true);
         } catch (Exception $e) {
             Log::warning('Unable to start session: ' . $e->getMessage());
@@ -143,4 +143,9 @@ public static function getSessionsDirectory()
         $path = PIWIK_USER_PATH . '/tmp/sessions';
         return SettingsPiwik::rewriteTmpPathWithHostname($path);
     }
+
+    public static function close()
+    {
+        parent::writeClose($readonly);
+    }
 }

core/Url.php

@@ -460,6 +460,11 @@ static public function redirectToReferrer()
      */
     static public function redirectToUrl($url)
     {
+        // Close the session manually.
+        // We should not have to call this because it was registered via register_shutdown_function,
+        // but it is not always called fast enough
+        Session::close();
+
         if (UrlHelper::isLookLikeUrl($url)
             || strpos($url, 'index.php') === 0
         ) {

plugins/CoreHome/Controller.php

@@ -226,7 +226,7 @@ public function redirectToPaypal()
 
         $url = "https://www.paypal.com/cgi-bin/webscr?" . Url::getQueryStringFromParameters($parameters);
 
-        header("Location: $url");
+        Url::redirectToUrl($url);
         exit;
     }