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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
vAugagneur
2012-12-12 18:43:15 +01:00
parent 198a48491a 35a0c7c94c
commit 35327e1792
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockwishlist/controllers/front/mywishlist.php
+8 -8
View File
@@ -34,6 +34,7 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
parent::__construct(); parent::__construct();
$this->context = Context::getContext(); $this->context = Context::getContext();
$this->ssl = true;
include_once($this->module->getLocalPath().'WishList.php'); include_once($this->module->getLocalPath().'WishList.php');
} }
@@ -65,10 +66,9 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
$id_wishlist = Tools::getValue('id_wishlist'); $id_wishlist = Tools::getValue('id_wishlist');
if (Tools::isSubmit('submitWishlist')) if (Tools::isSubmit('submitWishlist'))
{ {
if (Configuration::get('PS_TOKEN_ACTIVATED') == 1 AND if (Configuration::get('PS_TOKEN_ACTIVATED') == 1 && strcmp(Tools::getToken(), Tools::getValue('token')))
strcmp(Tools::getToken(), Tools::getValue('token')))
$errors[] = $this->module->l('Invalid token', 'mywishlist'); $errors[] = $this->module->l('Invalid token', 'mywishlist');
if (!sizeof($errors)) if (!count($errors))
{ {
$name = Tools::getValue('name'); $name = Tools::getValue('name');
if (empty($name)) if (empty($name))
@@ -76,7 +76,7 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
if (WishList::isExistsByNameForUser($name)) if (WishList::isExistsByNameForUser($name))
$errors[] = $this->module->l('This name is already used by another list.', 'mywishlist'); $errors[] = $this->module->l('This name is already used by another list.', 'mywishlist');
if(!sizeof($errors)) if (!count($errors))
{ {
$wishlist = new WishList(); $wishlist = new WishList();
$wishlist->id_shop = $this->context->shop->id; $wishlist->id_shop = $this->context->shop->id;
@@ -96,17 +96,17 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
'{message}' => Tools::getProtocol().htmlentities($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__.'modules/blockwishlist/view.php?token='.$wishlist->token), '{message}' => Tools::getProtocol().htmlentities($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__.'modules/blockwishlist/view.php?token='.$wishlist->token),
$this->context->customer->email, $this->context->customer->email,
$this->context->customer->firstname.' '.$this->context->customer->lastname, $this->context->customer->firstname.' '.$this->context->customer->lastname,
NULL, null,
strval(Configuration::get('PS_SHOP_NAME')), strval(Configuration::get('PS_SHOP_NAME')),
NULL, null,
NULL, null,
$this->module->getLocalPath().'mails/'); $this->module->getLocalPath().'mails/');
} }
} }
} }
else if ($add) else if ($add)
WishList::addCardToWishlist($this->context->customer->id, Tools::getValue('id_wishlist'), $this->context->language->id); WishList::addCardToWishlist($this->context->customer->id, Tools::getValue('id_wishlist'), $this->context->language->id);
else if ($delete AND empty($id_wishlist) === false) elseif ($delete && empty($id_wishlist) === false)
{ {
$wishlist = new WishList((int)($id_wishlist)); $wishlist = new WishList((int)($id_wishlist));
if (Validate::isLoadedObject($wishlist)) if (Validate::isLoadedObject($wishlist))