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

[-] BO : translations errors : fix regex

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15068 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-05-04 09:20:34 +00:00
parent f25d090958
commit 4cd51b9b9e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+1 -3
View File
@@ -806,15 +806,13 @@ class AdminTranslationsControllerCore extends AdminController
case 'errors': case 'errors':
// Parsing file for all errors syntax // Parsing file for all errors syntax
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U'; $regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, ?(true|false))?\)/U';
break; break;
case 'modules': case 'modules':
// Parsing modules file // Parsing modules file
if ($type_file == 'php') if ($type_file == 'php')
$regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; $regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U';
else if ($type_file == 'displayError')
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U';
else else
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U'; $regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U';
break; break;
modules/blockwishlist/sendwishlist.php
+4 -4
View File
@@ -34,21 +34,21 @@ $context = Context::getContext();
if (Configuration::get('PS_TOKEN_ENABLE') == 1 AND if (Configuration::get('PS_TOKEN_ENABLE') == 1 AND
strcmp(Tools::getToken(false), Tools::getValue('token')) AND strcmp(Tools::getToken(false), Tools::getValue('token')) AND
$context->customer->isLogged() === true) $context->customer->isLogged() === true)
exit(Tools::displayError('invalid token',false)); exit(Tools::displayError('invalid token', false));
if ($context->customer->isLogged()) if ($context->customer->isLogged())
{ {
$id_wishlist = (int)(Tools::getValue('id_wishlist')); $id_wishlist = (int)(Tools::getValue('id_wishlist'));
if (empty($id_wishlist) === true) if (empty($id_wishlist) === true)
exit(Tools::displayError('Invalid wishlist',false)); exit(Tools::displayError('Invalid wishlist', false));
for ($i = 1; empty($_POST['email'.strval($i)]) === false; ++$i) for ($i = 1; empty($_POST['email'.strval($i)]) === false; ++$i)
{ {
$to = Tools::getValue('email'.$i); $to = Tools::getValue('email'.$i);
$wishlist = WishList::exists($id_wishlist, $context->customer->id, true); $wishlist = WishList::exists($id_wishlist, $context->customer->id, true);
if ($wishlist === false) if ($wishlist === false)
exit(Tools::displayError('Invalid wishlist',false)); exit(Tools::displayError('Invalid wishlist', false));
if (WishList::addEmail($id_wishlist, $to) === false) if (WishList::addEmail($id_wishlist, $to) === false)
exit(Tools::displayError('Wishlist send error',false)); exit(Tools::displayError('Wishlist send error', false));
$toName = strval(Configuration::get('PS_SHOP_NAME')); $toName = strval(Configuration::get('PS_SHOP_NAME'));
$customer = $context->customer; $customer = $context->customer;
if (Validate::isLoadedObject($customer)) if (Validate::isLoadedObject($customer))