dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : Could not redirect back to url in adress.php

Browse Source
This commit is contained in:
gRoussac committed 2013-10-17 14:16:54 +02:00
1 parent 6b1d69dd7d
commit 3a38af9982
2 files changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/AddressController.php
+2
View File
@@ -245,6 +245,8 @@ class AddressControllerCore extends FrontController
// Redirect to old page or current page // Redirect to old page or current page
if ($back = Tools::getValue('back')) if ($back = Tools::getValue('back'))
{ {
if ($back == Tools::secureReferrer(Tools::getValue('back')))
Tools::redirect(html_entity_decode($back));
$mod = Tools::getValue('mod'); $mod = Tools::getValue('mod');
Tools::redirect('index.php?controller='.$back.($mod ? '&back='.$mod : '')); Tools::redirect('index.php?controller='.$back.($mod ? '&back='.$mod : ''));
} }
controllers/front/AuthController.php
+4 -4
View File
@@ -92,7 +92,7 @@ class AuthControllerCore extends FrontController
if (!empty($key)) if (!empty($key))
$back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key; $back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key;
if (!empty($back)) if (!empty($back))
$this->context->smarty->assign('back', Tools::safeOutput($back)); $this->context->smarty->assign('back', Tools::safeOutput(Tools::secureReferrer($back)));
if (Tools::getValue('display_guest_checkout')) if (Tools::getValue('display_guest_checkout'))
{ {
@@ -327,7 +327,7 @@ class AuthControllerCore extends FrontController
if (!$this->ajax) if (!$this->ajax)
{ {
if ($back = Tools::getValue('back')) if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer(Tools::getValue('back')))
Tools::redirect(html_entity_decode($back)); Tools::redirect(html_entity_decode($back));
Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account')); Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account'));
} }
@@ -463,7 +463,7 @@ class AuthControllerCore extends FrontController
die(Tools::jsonEncode($return)); die(Tools::jsonEncode($return));
} }
if ($back = Tools::getValue('back')) if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer(Tools::getValue('back')))
Tools::redirect(html_entity_decode($back)); Tools::redirect(html_entity_decode($back));
// redirection: if cart is not empty : redirection to the cart // redirection: if cart is not empty : redirection to the cart
if (count($this->context->cart->getProducts(true)) > 0) if (count($this->context->cart->getProducts(true)) > 0)
@@ -601,7 +601,7 @@ class AuthControllerCore extends FrontController
if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount'))
Tools::redirect('index.php?controller=address'); Tools::redirect('index.php?controller=address');
if ($back = Tools::getValue('back')) if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer(Tools::getValue('back')))
Tools::redirect(html_entity_decode($back)); Tools::redirect(html_entity_decode($back));
// redirection: if cart is not empty : redirection to the cart // redirection: if cart is not empty : redirection to the cart