Allow redirection after login (#4654)

Before, if you've tried to reach a page without being logged, you'll be
automatically redirected to the index page after login.
Now, the original page is used after login.

Fix #3663

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 2ad02014f..62d042f28 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -15,6 +15,8 @@ class Minz_Request {
 	private static $default_controller_name = 'index';
 	private static $default_action_name = 'index';
 
+	private static $originalRequest;
+
 	/**
 	 * Getteurs
 	 */
@@ -92,6 +94,9 @@ class Minz_Request {
 			'params' => self::$params,
 		);
 	}
+	public static function originalRequest() {
+		return self::$originalRequest;
+	}
 	public static function modifiedCurrentRequest(array $extraParams = null) {
 		$currentRequest = self::currentRequest();
 		if (null !== $extraParams) {
@@ -327,6 +332,10 @@ class Minz_Request {
 	 *                > sinon, le dispatcher recharge en interne
 	 */
 	public static function forward($url = array(), $redirect = false) {
+		if (Minz_Request::originalRequest() === null && strpos('auth', json_encode($url)) !== false) {
+			self::$originalRequest = $url;
+		}
+
 		if (!is_array($url)) {
 			header('Location: ' . $url);
 			exit();