Correctly redirect to the last page visited in the login module (see #…

…569)
contao · Sep 26, 2019 · bbc83b2 · bbc83b2
1 parent 59629d6
commit bbc83b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/Resources/contao/controllers/BackendMain.php b/src/Resources/contao/controllers/BackendMain.php
@@ -233,13 +233,6 @@ protected function output()
 			$this->Template->manager = (strpos($objSession->get('filePickerRef'), 'contao/page?') !== false) ? $GLOBALS['TL_LANG']['MSC']['pagePickerHome'] : $GLOBALS['TL_LANG']['MSC']['filePickerHome'];
 		}
 
-		$referer = null;
-
-		if ($request = $container->get('request_stack')->getCurrentRequest())
-		{
-			$referer = base64_encode($request->getQueryString());
-		}
-
 		$this->Template->theme = Backend::getTheme();
 		$this->Template->base = Environment::get('base');
 		$this->Template->language = $GLOBALS['TL_LANGUAGE'];
@@ -250,7 +243,7 @@ protected function output()
 		$this->Template->preview = $GLOBALS['TL_LANG']['MSC']['fePreview'];
 		$this->Template->previewTitle = StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['fePreviewTitle']);
 		$this->Template->profile = $GLOBALS['TL_LANG']['MSC']['profile'];
-		$this->Template->referer = $referer;
+		$this->Template->referer = base64_encode(Environment::get('queryString'));
 		$this->Template->profileTitle = StringUtil::specialchars($GLOBALS['TL_LANG']['MSC']['profileTitle']);
 		$this->Template->security = $GLOBALS['TL_LANG']['MSC']['security'];
 		$this->Template->logout = $GLOBALS['TL_LANG']['MSC']['logoutBT'];

diff --git a/src/Resources/contao/modules/ModuleLogin.php b/src/Resources/contao/modules/ModuleLogin.php
@@ -59,13 +59,13 @@ public function generate()
 			return $objTemplate->parse();
 		}
 
-		if (!$_POST && $this->redirectBack && ($strReferer = $this->getReferer()) != Environment::get('request'))
+		if ($_POST)
 		{
-			$this->targetPath = $strReferer;
+			$this->targetPath = (string) Input::post('_target_path');
 		}
-		else
+		elseif ($this->redirectBack && ($referer = Input::get('referer', true)))
 		{
-			$this->targetPath = (string) Input::post('_target_path');
+			$this->targetPath = Environment::get('base') . base64_decode($referer, true);
 		}
 
 		return parent::generate();

diff --git a/src/Resources/contao/pages/PageError401.php b/src/Resources/contao/pages/PageError401.php
@@ -120,7 +120,10 @@ protected function prepare($objRootPage=null)
 				throw new ForwardPageNotFoundException('Forward page not found');
 			}
 
-			$this->redirect($objNextPage->getFrontendUrl(), (($obj401->redirect == 'temporary') ? 302 : 301));
+			// Add the referer so the login module can redirect back
+			$referer = base64_encode(Environment::get('request'));
+
+			$this->redirect($objNextPage->getFrontendUrl() . '?referer=' . $referer, (($obj401->redirect == 'temporary') ? 302 : 301));
 		}
 
 		return $obj401;