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

// Try to fix regexp issues with some PHP configurations

Browse Source
This commit is contained in:
Damien Metzger committed 2013-10-10 18:41:50 +02:00
1 parent 286084c42d
commit 4505387046
1 file changed
+18 -5
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+18 -5
View File
@@ -1073,7 +1073,7 @@ class AdminTranslationsControllerCore extends AdminController
{ {
case 'front': case 'front':
// Parsing file in Front office // Parsing file in Front office
$regex = '/\{l\s*s=(?|\'('._PS_TRANS_PATTERN_.')\'|"('._PS_TRANS_PATTERN_.')")(\s*sprintf=.*)?(\s*js=1)?\s*\}/U'; $regex = '/\{l\s*s=[\'\"]'._PS_TRANS_PATTERN_.'[\'\"](\s*sprintf=.*)?(\s*js=1)?\s*\}/U';
break; break;
case 'back': case 'back':
@@ -1083,7 +1083,7 @@ class AdminTranslationsControllerCore extends AdminController
else if ($type_file == 'specific') else if ($type_file == 'specific')
$regex = '/Translate::getAdminTranslation\(\''._PS_TRANS_PATTERN_.'\'\)/U'; $regex = '/Translate::getAdminTranslation\(\''._PS_TRANS_PATTERN_.'\'\)/U';
else else
$regex = '/\{l\s*s\s*=(?|\''._PS_TRANS_PATTERN_.'\'|"'._PS_TRANS_PATTERN_.'")(\s*sprintf=.*)?(\s*js=1)?(\s*slashes=1)?\s*\}/U'; $regex = '/\{l\s*s\s*=[\'\"]'._PS_TRANS_PATTERN_.'[\'\"](\s*sprintf=.*)?(\s*js=1)?(\s*slashes=1)?\s*\}/U';
break; break;
case 'errors': case 'errors':
@@ -1097,7 +1097,10 @@ class AdminTranslationsControllerCore extends AdminController
$regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; $regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U';
else else
// In tpl file look for something that should contain mod='module_name' according to the documentation // In tpl file look for something that should contain mod='module_name' according to the documentation
$regex = '/\{l\s*s=(?|\''._PS_TRANS_PATTERN_.'\'|"'._PS_TRANS_PATTERN_.'").*\s+mod=\''.$module_name.'\'.*\}/U'; $regex = array(
'/\{l\s*s=\''._PS_TRANS_PATTERN_.'\'.*\s+mod=\''.$module_name.'\'.*\}/U',
'/\{l\s*s=\"'._PS_TRANS_PATTERN_.'\".*\s+mod=\''.$module_name.'\'.*\}/U'
);
break; break;
case 'pdf': case 'pdf':
@@ -1105,11 +1108,21 @@ class AdminTranslationsControllerCore extends AdminController
if ($type_file == 'php') if ($type_file == 'php')
$regex = '/HTMLTemplate.*::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U'; $regex = '/HTMLTemplate.*::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U';
else else
$regex = '/\{l\s*s=(?|\''._PS_TRANS_PATTERN_.'\'|"'._PS_TRANS_PATTERN_.'")(\s*sprintf=.*)?(\s*js=1)?(\s*pdf=\'true\')?\s*\}/U'; $regex = '/\{l\s*s=[\'\"]'._PS_TRANS_PATTERN_.'[\'\"](\s*sprintf=.*)?(\s*js=1)?(\s*pdf=\'true\')?\s*\}/U';
break; break;
} }
preg_match_all($regex, $content, $matches); if (is_array($regex))
{
$matches = array(1 => array());
foreach ($regex as $regex_row)
{
preg_match_all($regex_row, $content, $matches2);
$matches[1] = array_merge($matches[1], $matches2[1]);
}
}
else
preg_match_all($regex, $content, $matches);
return $matches[1]; return $matches[1];
} }