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

// Updated isTokenValid(). Thanks Olea.

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14296 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-03-27 13:05:51 +00:00
parent a08e3fb871
commit 42385b2cbc
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+4 -1
View File
@@ -881,7 +881,10 @@ class FrontControllerCore extends Controller
*/
public function isTokenValid()
{
return Configuration::get('PS_TOKEN_ENABLE') && strcasecmp(Tools::getToken(false), Tools::getValue('token')) && $this->context->customer->isLogged();
if (!Configuration::get('PS_TOKEN_ENABLE'))
return true;
return strcasecmp(Tools::getToken(false), Tools::getValue('token'));
}
/**
controllers/front/AddressController.php
+2 -2
View File
@@ -122,7 +122,7 @@ class AddressControllerCore extends FrontController
$address->id_customer = (int)$this->context->customer->id;
// Check page token
if ($this->isTokenValid())
if ($this->context->customer->isLogged() && !$this->isTokenValid())
$this->errors[] = Tools::displayError('Invalid token');
// Check phone
@@ -175,7 +175,7 @@ class AddressControllerCore extends FrontController
$this->errors[] = Tools::displayError('Identification number is incorrect or has already been used.');
else if (!$country->isNeedDni())
$address->dni = null;
// Check if the alias exists
if (!empty($_POST['alias'])
&& (int)$this->context->customer->id > 0
controllers/front/CartController.php
+8 -8
View File
@@ -34,7 +34,7 @@ class CartControllerCore extends FrontController
protected $id_address_delivery;
protected $customization_id;
protected $qty;
protected $ajax_refresh = false;
/**
@@ -62,7 +62,7 @@ class CartControllerCore extends FrontController
public function postProcess()
{
if ($this->isTokenValid())
if ($this->context->customer->isLogged() && !$this->isTokenValid())
$this->errors[] = Tools::displayError('Invalid token');
// Update the cart ONLY if $this->cookies are available, in order to avoid ghost carts created by bots
@@ -122,7 +122,7 @@ class CartControllerCore extends FrontController
{
if (!Configuration::get('PS_ALLOW_MULTISHIPPING'))
return;
$old_id_address_delivery = (int)Tools::getValue('old_id_address_delivery');
$new_id_address_delivery = (int)Tools::getValue('new_id_address_delivery');
@@ -132,15 +132,15 @@ class CartControllerCore extends FrontController
$old_id_address_delivery,
$new_id_address_delivery);
}
protected function processAllowSeperatedPackage()
{
if (!Configuration::get('PS_SHIP_WHEN_AVAILABLE'))
return;
if (Tools::getValue('value') === false)
die('{"error":true, "error_message": "No value setted"}');
$this->context->cart->allow_seperated_package = (boolean)Tools::getValue('value');
$this->context->cart->update();
die('{"error":false}');
@@ -150,7 +150,7 @@ class CartControllerCore extends FrontController
{
if (!Configuration::get('PS_ALLOW_MULTISHIPPING'))
return;
if (!$this->context->cart->duplicateProduct(
$this->id_product,
$this->id_product_attribute,
@@ -237,7 +237,7 @@ class CartControllerCore extends FrontController
}
}
}
$removed = CartRule::autoRemoveFromCart();
if (count($removed) && (int)Tools::getValue('allow_refresh'))
$this->ajax_refresh = true;