From 6d3640e895924a48480ff9f52e56658e0a8621f9 Mon Sep 17 00:00:00 2001 From: Tom Panier Date: Thu, 24 Oct 2013 09:43:50 +0200 Subject: [PATCH 01/25] Conditions to hide VAT fields fail if there are no company fields "Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS. This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`). --- themes/default/order-opc-new-account.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl index c96437cc3..cd0433f5a 100644 --- a/themes/default/order-opc-new-account.tpl +++ b/themes/default/order-opc-new-account.tpl @@ -74,14 +74,14 @@ {literal} function vat_number() { - if ($('#company').val() != '') + if (($('#company').length) && ($('#company').val() != '')) $('#vat_number_block').show(); else $('#vat_number_block').hide(); } function vat_number_invoice() { - if ($('#company_invoice').val() != '') + if (($('#company_invoice').length) && ($('#company_invoice').val() != '')) $('#vat_number_block_invoice').show(); else $('#vat_number_block_invoice').hide(); @@ -405,4 +405,4 @@
- \ No newline at end of file + From 81945cef71fe56ad15b2719e3143ae490a97290f Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 24 Oct 2013 10:00:19 +0200 Subject: [PATCH 02/25] [-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879 --- themes/default/authentication.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl index de7859286..b8bdf025d 100644 --- a/themes/default/authentication.tpl +++ b/themes/default/authentication.tpl @@ -64,14 +64,14 @@ $(document).ready(function() { }); function vat_number() { - if ($('#company').val() != '') + if (($('#company').length) && ($('#company').val() != '')) $('#vat_number').show(); else $('#vat_number').hide(); } function vat_number_invoice() { - if ($('#company_invoice').val() != '') + if (($('#company_invoice').length) && ($('#company_invoice').val() != '')) $('#vat_number_block_invoice').show(); else $('#vat_number_block_invoice').hide(); From fc9b39968b9ac3fbe039c756ec85f4119c28730e Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 24 Oct 2013 11:46:09 +0200 Subject: [PATCH 03/25] // remove notice --- modules/productscategory/productscategory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl index 8b9b9f6cb..409c21e30 100644 --- a/modules/productscategory/productscategory.tpl +++ b/modules/productscategory/productscategory.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -{if count($categoryProducts) > 0 && $categoryProducts !== false} +{if isset($categoryProducts) && count($categoryProducts) > 0 && $categoryProducts !== false}

{$categoryProducts|@count} {l s='other products in the same category:' mod='productscategory'}

From 971722a13f6215ae57e4b4d635647205f90cec98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 24 Oct 2013 11:51:48 +0200 Subject: [PATCH 04/25] // note updated by ajax in admincustomers should be url encoded --- .../template/controllers/customers/helpers/view/view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 9a0b01041..a9087d5dc 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -35,7 +35,7 @@ $.ajax({ type: "POST", url: "index.php", - data: "token={getAdminToken tab='AdminCustomers'}&tab=AdminCustomers&ajax=1&action=updateCustomerNote&id_customer={$customer->id}¬e="+noteContent, + data: "token={getAdminToken tab='AdminCustomers'}&tab=AdminCustomers&ajax=1&action=updateCustomerNote&id_customer={$customer->id}¬e="+encodeURIComponent(noteContent), async : true, success: function(r) { $('#note_feedback').html('').hide(); From 2ffc2962790e8ca0c8b2c4688fdd82dec3c76382 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 24 Oct 2013 12:03:33 +0200 Subject: [PATCH 05/25] FO : https://github.com/PrestaShop/PrestaShop/pull/878 --- themes/default/order-opc-new-account.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl index cd0433f5a..4e31a068c 100644 --- a/themes/default/order-opc-new-account.tpl +++ b/themes/default/order-opc-new-account.tpl @@ -206,7 +206,7 @@ {elseif $field_name eq "address2"}

- +

{elseif $field_name eq "postcode"} {$postCodeExist = true} @@ -332,7 +332,7 @@ {$postCodeExist = true}

- +

{elseif $field_name eq "city"}

From ea8a5277f257a3d25ec5fee4d2f59309c882cccd Mon Sep 17 00:00:00 2001 From: indesign47 Date: Thu, 24 Oct 2013 15:44:11 +0200 Subject: [PATCH 06/25] [*] BO : AdminImport add img manufacturers-suppliers --- controllers/admin/AdminImportController.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index ec8c31c92..de6ef7545 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -382,6 +382,7 @@ class AdminImportControllerCore extends AdminController 'meta_title' => array('label' => $this->l('Meta title')), 'meta_keywords' => array('label' => $this->l('Meta keywords')), 'meta_description' => array('label' => $this->l('Meta description')), + 'image' => array('label' => $this->l('Image URL')), 'shop' => array( 'label' => $this->l('ID / Name of group shop'), 'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'), @@ -882,6 +883,12 @@ class AdminImportControllerCore extends AdminController case 'categories': $path = _PS_CAT_IMG_DIR_.(int)$id_entity; break; + case 'manufacturers': + $path = _PS_MANU_IMG_DIR_.(int)$id_entity; + break; + case 'suppliers': + $path = _PS_SUPP_IMG_DIR_.(int)$id_entity; + break; } $url = str_replace(' ', '%20', trim($url)); @@ -2370,6 +2377,11 @@ class AdminImportControllerCore extends AdminController if (!$res) $res = $manufacturer->add(); + //copying images of manufacturer + if (isset($manufacturer->image) && !empty($manufacturer->image)) + if (!AdminImportController::copyImg($manufacturer->id, null, $manufacturer->image, 'manufacturers', !Tools::getValue('regenerate'))) + $this->warnings[] = $manufacturer->image.' '.Tools::displayError('cannot be copied.'); + if ($res) { // Associate supplier to group shop @@ -2443,6 +2455,11 @@ class AdminImportControllerCore extends AdminController if (!$res) $res = $supplier->add(); + //copying images of suppliers + if (isset($supplier->image) && !empty($supplier->image)) + if (!AdminImportController::copyImg($supplier->id, null, $supplier->image, 'suppliers', !Tools::getValue('regenerate'))) + $this->warnings[] = $supplier->image.' '.Tools::displayError('cannot be copied.'); + if (!$res) $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( Tools::displayError('%1$s (ID: %2$s) cannot be saved'), @@ -3100,4 +3117,4 @@ class AdminImportControllerCore extends AdminController } } } -?> \ No newline at end of file +?> From 4803530eed1ff0e43b124c6f193322e9634c2ae9 Mon Sep 17 00:00:00 2001 From: indesign47 Date: Thu, 24 Oct 2013 15:47:31 +0200 Subject: [PATCH 07/25] [*] BO : AdminImport add img manufacturers --- docs/csv_import/manufacturers_import.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/csv_import/manufacturers_import.csv b/docs/csv_import/manufacturers_import.csv index 6c8ea7cd0..2e4ef5d24 100644 --- a/docs/csv_import/manufacturers_import.csv +++ b/docs/csv_import/manufacturers_import.csv @@ -1,3 +1,3 @@ -id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description -1;1;Apple Computer, Inc;;;;; -2;1;Shure Incorporated;;;;; \ No newline at end of file +id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL +1;1;Apple Computer, Inc;;;;;http://youdomain.com/img.jpg +2;1;Shure Incorporated;;;;;http://youdomain.com/img.jpg From f0ed5a303ce2acf4e156a2eb0ad4f5857c55114a Mon Sep 17 00:00:00 2001 From: indesign47 Date: Thu, 24 Oct 2013 15:49:56 +0200 Subject: [PATCH 08/25] [*] BO : AdminImport add img suppliers --- docs/csv_import/suppliers_import.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/csv_import/suppliers_import.csv b/docs/csv_import/suppliers_import.csv index db319c908..c02561686 100644 --- a/docs/csv_import/suppliers_import.csv +++ b/docs/csv_import/suppliers_import.csv @@ -1,3 +1,3 @@ -id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description -1;1;Applestore;;;;; -2;1;Shure Online Store;;;;; \ No newline at end of file +id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL +1;1;Applestore;;;;;http://youdomain.com/img.jpg +2;1;Shure Online Store;;;;;http://youdomain.com/img.jpg From 84454bbc1c7a315e232245c5e43b300b8f153473 Mon Sep 17 00:00:00 2001 From: indesign47 Date: Thu, 24 Oct 2013 16:16:29 +0200 Subject: [PATCH 09/25] [*] BO : AdminImport add img manufacturers-suppliers --- .../default/template/controllers/import/helpers/form/form.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 181508404..223545e2d 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -227,6 +227,10 @@ $(".import_products_categories, label[for=regenerate], #regenerate").show(); else $(".import_products_categories, label[for=regenerate], #regenerate").hide(); + if ($("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6) + $("label[for=regenerate], #regenerate").show() + else + $("label[for=regenerate], #regenerate").hide(); if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6 || $("#entity > option:selected").val() == 7) $("label[for=forceIDs], #forceIDs").show(); else From 3cd702da4223b9e58f95f47f7940fe33e42781f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 24 Oct 2013 16:30:02 +0200 Subject: [PATCH 10/25] [-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793 --- classes/ObjectModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 3dd0072b6..0c70cbf3c 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1139,7 +1139,7 @@ abstract class ObjectModelCore { $vars = get_class_vars($class_name); foreach ($vars['shopIDs'] as $id_shop) - $or[] = ' main.id_shop = '.(int)$id_shop.' '; + $or[] = '(main.id_shop = '.(int)$id_shop.(isset($this->def['fields']['id_shop_group']) ? ' OR (id_shop = 0 AND id_shop_group='.(int)Shop::getGroupFromShop((int)$id_shop).')' : '').')'; $prepend = ''; if (count($or)) @@ -1658,4 +1658,4 @@ abstract class ObjectModelCore { $this->update_fields = $fields; } -} \ No newline at end of file +} From c5324a653b0efc3cdb6a1706ce868578b1f83347 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 24 Oct 2013 16:31:50 +0200 Subject: [PATCH 11/25] [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x --- .../php/update_customer_default_group.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/install-dev/upgrade/php/update_customer_default_group.php b/install-dev/upgrade/php/update_customer_default_group.php index 03bb77b6c..9ce468a41 100644 --- a/install-dev/upgrade/php/update_customer_default_group.php +++ b/install-dev/upgrade/php/update_customer_default_group.php @@ -39,9 +39,27 @@ function update_customer_default_group() $str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');'; $str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');'; $content = str_replace($str_old, $str_new, $content); + + $carriers = Db::getInstance()->executeS(' + SELECT `id_carrier` + FROM `'._DB_PREFIX_.'carrier` + WHERE `deleted` = 0'); + + $groups = Db::getInstance()->executeS(' + SELECT `value` as id_group + FROM `'._DB_PREFIX_.'configuration` + WHERE `name` IN (\'PS_UNIDENTIFIED_GROUP\', \'PS_GUEST_GROUP\')'); + $result = false; + if (count($carriers) && is_array($carriers) && count($groups) && is_array($groups)) + foreach ($carriers as $carrier) + foreach ($groups as $group) + Db::getInstance()->execute(' + INSERT IGNORE INTO `'._DB_PREFIX_.'carrier_group` + VALUES ('.(int)$carrier['id_carrier'].', '.(int)$group['id_group'].')'); + if(file_exists($filename) && is_writable($filename)) - $result = (bool)@file_put_contents($filename, $content); + $result &= (bool)@file_put_contents($filename, $content); if($result === true && file_exists($filename) && file_exists($filename_old)) { @unlink($filename_old); From c516035e0e3030db0e8df98eb1c3f018cfdf0881 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Thu, 24 Oct 2013 17:19:28 +0200 Subject: [PATCH 12/25] [-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO --- .../template/controllers/orders/form.tpl | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index 6e4597092..e151b8a8a 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -715,6 +715,20 @@ $('#payment_list').html(payment_list); } + function fixPriceFormat(price) + { + if(price.indexOf(',') > 0 && price.indexOf('.') > 0) // if contains , and . + { + if(price.indexOf(',') < price.indexOf('.')) // if , is before . + { + price = price.replace(',',''); // remove , + } + } + price = price.replace(' ',''); // remove any spaces + price = price.replace(',','.'); // remove , if price did not cotain both , and . + return price; + } + function displaySummary(jsonSummary) { currency_format = jsonSummary.currency.format; @@ -750,13 +764,13 @@ if (!changed_shipping_price) $('#shipping_price').html('' + formatCurrency(parseFloat(jsonSummary.summary.total_shipping), currency_format, currency_sign, currency_blank) + ''); shipping_price_selected_carrier = jsonSummary.summary.total_shipping; - - $('#total_vouchers').html(formatCurrency(parseFloat(jsonSummary.summary.total_discounts_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank)); - $('#total_shipping').html(formatCurrency(parseFloat(jsonSummary.summary.total_shipping_tax_exc.replace(',', '.')), currency_format, currency_sign, currency_blank)); - $('#total_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_tax.replace(',', '.')), currency_format, currency_sign, currency_blank)); - $('#total_without_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price_without_tax.replace(',', '.')), currency_format, currency_sign, currency_blank)); - $('#total_with_taxes').html(formatCurrency(parseFloat(jsonSummary.summary.total_price.replace(',', '.')), currency_format, currency_sign, currency_blank)); - $('#total_products').html(formatCurrency(parseFloat(jsonSummary.summary.total_products.replace(',', '.')), currency_format, currency_sign, currency_blank)); + + $('#total_vouchers').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_discounts_tax_exc)), currency_format, currency_sign, currency_blank)); + $('#total_shipping').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_shipping_tax_exc)), currency_format, currency_sign, currency_blank)); + $('#total_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_tax)), currency_format, currency_sign, currency_blank)); + $('#total_without_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price_without_tax)), currency_format, currency_sign, currency_blank)); + $('#total_with_taxes').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_price)), currency_format, currency_sign, currency_blank)); + $('#total_products').html(formatCurrency(parseFloat(fixPriceFormat(jsonSummary.summary.total_products)), currency_format, currency_sign, currency_blank)); id_currency = jsonSummary.cart.id_currency; $('#id_currency option').removeAttr('selected'); $('#id_currency option[value="'+id_currency+'"]').attr('selected', true); From cc3363011ed3419e5bc3301281a4109f9477af97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 24 Oct 2013 17:54:44 +0200 Subject: [PATCH 13/25] // rewrited urls for feeder module --- modules/feeder/rss.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/feeder/rss.php b/modules/feeder/rss.php index caa32a3c8..046650c4e 100644 --- a/modules/feeder/rss.php +++ b/modules/feeder/rss.php @@ -26,6 +26,9 @@ include(dirname(__FILE__).'/../../config/config.inc.php'); require_once(dirname(__FILE__).'/../../init.php'); +if (!Module::getInstanceByName('feeder')->active) + exit; + // Get data $number = ((int)(Tools::getValue('n')) ? (int)(Tools::getValue('n')) : 10); $orderBy = Tools::getProductsOrder('by', Tools::getValue('orderby')); @@ -64,7 +67,7 @@ echo ''."\n"; if (is_array($image) AND sizeof($image)) { $imageObj = new Image($image[0]['id_image']); - echo "getExistingImgPath()."-small_default.jpg' title='".str_replace('&', '', $product['name'])."' alt='thumb' />"; + echo "getImageLink($product['link_rewrite'], $image[0]['id_image'], 'small_default')."' title='".str_replace('&', '', $product['name'])."' alt='thumb' />"; $cdata = false; } if ($cdata) @@ -76,4 +79,4 @@ echo ''."\n"; } ?> - + \ No newline at end of file From 759fe2f67101552df4de0a38164f391a88ea7afc Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 24 Oct 2013 18:09:21 +0200 Subject: [PATCH 14/25] // norms --- admin-dev/themes/default/template/controllers/orders/form.tpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index e151b8a8a..28759ec10 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -718,12 +718,8 @@ function fixPriceFormat(price) { if(price.indexOf(',') > 0 && price.indexOf('.') > 0) // if contains , and . - { if(price.indexOf(',') < price.indexOf('.')) // if , is before . - { price = price.replace(',',''); // remove , - } - } price = price.replace(' ',''); // remove any spaces price = price.replace(',','.'); // remove , if price did not cotain both , and . return price; From 8cb1806e49738087309a977f92279b85b95ecb40 Mon Sep 17 00:00:00 2001 From: indesign47 Date: Thu, 24 Oct 2013 18:13:05 +0200 Subject: [PATCH 15/25] // small fixes for Width Height Depth change 0,1;0,2;0,3 to 1,2,3 --- docs/csv_import/products_import.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/csv_import/products_import.csv b/docs/csv_import/products_import.csv index 2475bab46..2952a2f05 100644 --- a/docs/csv_import/products_import.csv +++ b/docs/csv_import/products_import.csv @@ -1,3 +1,3 @@ ID;Active (0/1);Name*;Categories (x,y,z,…);Price tax excl. Or Price tax excl;Tax rules id;Wholesale price;On sale (0/1);Discount amount;Discount percent;Discount from (yyy-mm-dd);Discount to (yyy-mm-dd);Reference #;Supplier reference #;Supplier;Manufacturer;EAN13;UPC;Ecotax;Width;Height;Depth;Weight;Quantity;Minimum quantity;Visibility;Additional shipping cost;Unity;Unity price ratio;Short description;Description;Tags (x,y,z,...);Meta-title;Meta-keywords;Meta-description;URL rewritten;Text when in-stock;Text if back-order allowed;Available for order (0 = No, 1 = Yes);Product available date;Product creation date;Show price (0 = No, 1 = Yes);Image URLs (x,y,z,...);Delete existing images (0 = No, 1 = Yes);Feature (Name:Value:Position);Available online only (0 = No, 1 = Yes);Condition (new,used,refurbished);Customizable;File fields;Text fields;Out of stock;Advanced stock management;ID / Name of shop -1;1;iPod Nano;Home, iPods;49;1;40;0;;;;;92458844;54778855;AppleStore;Apple Computer, Inc;5605055055056;560505505555;0;0,1;0,2;0,3;0.5;800;1;both;0.00;;0.00;New design. New features. Now i….;Curved ahead of the curve. For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass de...;apple, ipod, nano;Meta title;Meta keywords;Meta description;ipod-nano;In stock;Out stock;1;;;1;http://youdomain.com/img.jpg, http://yourdomain.com/img1.jpg;0;Music:Rock:1;0;new;0;0;0;2;0;1 -2;1;iPod shuffle;Home, iPods;66.05;1;50;0;;;;;92458845;54778855;AppleStore;Apple Computer, Inc;5605055055057;560505505556;0;0,1;0,2;0,3;0.5;800;1;both;0.00;;0.00;iPod shuffle, the world’s most wearabl….;You want listen to music;ipod, shuffle;Meta title;Meta keywords;Meta description;ipod-shuffle;In stock;Out stock;1;;;1;http://youdomain.com/img25.jpg, http://yourdomain.com/img30.jpg;0;Music:Blues:2;0;new;0;0;0;2;0;1 +1;1;iPod Nano;Home, iPods;49;1;40;0;;;;;92458844;54778855;AppleStore;Apple Computer, Inc;5605055055056;560505505555;0;1;2;3;0.5;800;1;both;0.00;;0.00;New design. New features. Now i….;Curved ahead of the curve. For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass de...;apple, ipod, nano;Meta title;Meta keywords;Meta description;ipod-nano;In stock;Out stock;1;;;1;http://youdomain.com/img.jpg, http://yourdomain.com/img1.jpg;0;Music:Rock:1;0;new;0;0;0;2;0;1 +2;1;iPod shuffle;Home, iPods;66.05;1;50;0;;;;;92458845;54778855;AppleStore;Apple Computer, Inc;5605055055057;560505505556;0;1;2;3;0.5;800;1;both;0.00;;0.00;iPod shuffle, the world’s most wearabl….;You want listen to music;ipod, shuffle;Meta title;Meta keywords;Meta description;ipod-shuffle;In stock;Out stock;1;;;1;http://youdomain.com/img25.jpg, http://yourdomain.com/img30.jpg;0;Music:Blues:2;0;new;0;0;0;2;0;1 From 6f57093f50b8a0fe783dfb226540c9c49f114929 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Thu, 24 Oct 2013 18:36:36 +0200 Subject: [PATCH 16/25] [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security --- .../default/template/controllers/modules/favorites.tpl | 4 ++-- .../template/controllers/modules_positions/list_modules.tpl | 2 +- .../template/controllers/orders/helpers/view/view.tpl | 2 +- .../default/template/controllers/products/associations.tpl | 4 ++-- .../default/template/controllers/products/combinations.tpl | 2 +- .../themes/default/template/controllers/products/prices.tpl | 2 +- .../template/controllers/referrers/helpers/view/view.tpl | 2 +- admin-dev/themes/default/template/helpers/form/form.tpl | 2 +- .../themes/default/template/helpers/list/list_header.tpl | 4 ++-- classes/AdminTab.php | 4 ++-- install-dev/dev/translate.php | 2 +- js/tiny_mce/plugins/advlink/js/advlink.js | 4 ++-- js/tiny_mce/plugins/media/js/media.js | 2 +- js/tiny_mce/themes/advanced/skins/o2k7/advlink.js | 4 ++-- js/tiny_mce/themes/advanced/skins/o2k7/media.js | 2 +- modules/importerosc/importerosc.php | 4 ++-- modules/productcomments/productcomments.php | 2 +- modules/shopimporter/shopimporter.php | 2 +- modules/statsstock/statsstock.php | 2 +- modules/watermark/config.xml | 2 +- themes/default/mobile/contact-form.tpl | 6 +++--- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index 13efe0e73..911c3dd28 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -59,14 +59,14 @@ {$module->categoryName} diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl index 623e83dde..a10cf1145 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl @@ -37,7 +37,7 @@ {l s='Show'} : - + {foreach from=$orderMessages item=orderMessage} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl index 71a1d1f53..862d779fa 100644 --- a/admin-dev/themes/default/template/controllers/products/associations.tpl +++ b/admin-dev/themes/default/template/controllers/products/associations.tpl @@ -103,11 +103,11 @@     {l s='Create new manufacturer'} diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index b6a3e450e..e571f0125 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -85,7 +85,7 @@