From 02f235669661a07651ff2065af29c45bcb169604 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Fri, 26 Aug 2011 15:52:42 +0000 Subject: [PATCH] // Merge -> revision 8206 --- admin-dev/tabs/AdminImport.php | 2 + classes/Cart.php | 4 +- docs/CHANGELOG | 11 ++++++ install-dev/sql/db_settings_lite.sql | 53 ++++++++++++++++++++++++++- modules/importerosc/importerosc.php | 1 + modules/shopimporter/shopimporter.php | 3 ++ 6 files changed, 70 insertions(+), 4 deletions(-) diff --git a/admin-dev/tabs/AdminImport.php b/admin-dev/tabs/AdminImport.php index d683e1b40..4caaaf2ae 100644 --- a/admin-dev/tabs/AdminImport.php +++ b/admin-dev/tabs/AdminImport.php @@ -955,6 +955,7 @@ class AdminImport extends AdminTab } elseif (isset($info['image_position']) && $info['image_position']) { $images = $product->getImages($defaultLanguage); + if ($images) foreach ($images as $row) if($row['position'] == (int)$info['image_position']) @@ -1687,6 +1688,7 @@ class AdminImport extends AdminTab Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_impact'); Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute`'); Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination`'); + Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_image`'); Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group`'); Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang`'); Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute`'); diff --git a/classes/Cart.php b/classes/Cart.php index 14587ef2b..89debb89e 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1637,8 +1637,8 @@ class CartCore extends ObjectModel foreach($customsById as $customizationId => $val) { Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' - INSERT INTO '._DB_PREFIX_.'customization (id_customization, id_cart, id_product_attribute, id_product, quantity) - VALUES(\'\', '.(int)$cart->id.', '.(int)$custom['id_product_attribute'].', '.(int)$custom['id_product'].', '.(int)$custom['quantity'].')'); + INSERT INTO `'._DB_PREFIX_.'customization` (id_cart, id_product_attribute, id_product, quantity) + VALUES('.(int)$cart->id.', '.(int)$custom['id_product_attribute'].', '.(int)$custom['id_product'].', '.(int)$custom['quantity'].')'); $custom_ids[$custom['id_customization']] = Db::getInstance(_PS_USE_SQL_SLAVE_)->Insert_ID(); } diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 0d4d14410..a686c1e06 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -24,6 +24,7 @@ International Registred Trademark & Property of PrestaShop SA Release Notes for PrestaShop 1.5 -------------------------------- #################################### +<<<<<<< .working # v1.5.0.0 - 7536 (2011-07-06) # #################################### @@ -35,6 +36,16 @@ Release Notes for PrestaShop 1.5 #################################### +======= +# v1.4.4.1 - NONE (2011-08-25) # +#################################### + + Fixed bugs: + + [-] Security: security fix on AdminHome file + +#################################### +>>>>>>> .merge-right.r8206 # v1.4.4.0 - 7803 (2011-07-28) # #################################### diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index ec866afc2..346adf58a 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -300,7 +300,7 @@ INSERT INTO `PREFIX_zone_group_shop` (`id_zone`, `id_group_shop`) (SELECT `id_zo INSERT INTO `PREFIX_country` (`id_country`, `id_zone`, `iso_code`, `call_prefix`, `active`, `contains_states`, `need_identification_number`, `need_zip_code`, `zip_code_format`, `display_tax_label`) VALUES (1, 1, 'DE', 49, 1, 0, 0, 1, 'NNNNN', 1),(2, 1, 'AT', 43, 1, 0, 0, 1, 'NNNN', 1),(3, 1, 'BE', 32, 1, 0, 0, 1, 'NNNN', 1),(4, 2, 'CA', 1, 1, 1, 0, 1, 'LNL NLN', 0),(5, 3, 'CN', 86, 1, 0, 0, 1, 'NNNNNN', 1), (6, 1, 'ES', 34, 1, 0, 1, 1, 'NNNNN', 1),(7, 1, 'FI', 358, 1, 0, 0, 1, 'NNNNN', 1),(8, 1, 'FR', 33, 1, 0, 0, 1, 'NNNNN', 1),(9, 1, 'GR', 30, 1, 0, 0, 1, 'NNNNN', 1),(10, 1, 'IT', 39, 1, 1, 0, 1, 'NNNNN', 1), -(11, 3, 'JP', 81, 1, 0, 0, 1, 'NNN-NNNN', 1),(12, 1, 'LU', 352, 1, 0, 0, 1, 'NNNN', 1),(13, 1, 'NL', 31, 1, 0, 0, 1, 'NNNN LL', 1),(14, 1, 'PL', 48, 1, 0, 0, 1, 'NN-NNN', 1), +(11, 3, 'JP', 81, 1, 1, 0, 1, 'NNN-NNNN', 1),(12, 1, 'LU', 352, 1, 0, 0, 1, 'NNNN', 1),(13, 1, 'NL', 31, 1, 0, 0, 1, 'NNNN LL', 1),(14, 1, 'PL', 48, 1, 0, 0, 1, 'NN-NNN', 1), (15, 1, 'PT', 351, 1, 0, 0, 1, 'NNNN NNN', 1),(16, 1, 'CZ', 420, 1, 0, 0, 1, 'NNN NN', 1),(17, 1, 'GB', 44, 1, 0, 0, 1, '', 1),(18, 1, 'SE', 46, 1, 0, 0, 1, 'NNN NN', 1), (19, 7, 'CH', 41, 1, 0, 0, 1, 'NNNN', 1),(20, 1, 'DK', 45, 1, 0, 0, 1, 'NNNN', 1),(21, 2, 'US', 1, 1, 1, 0, 1, 'NNNNN', 1),(22, 3, 'HK', 852, 1, 0, 0, 0, '', 1),(23, 1, 'NO', 47, 1, 0, 0, 1, 'NNNN', 1), (24, 5, 'AU', 61, 1, 0, 0, 1, 'NNNN', 1),(25, 3, 'SG', 65, 1, 0, 0, 1, 'NNNNNN', 1),(26, 1, 'IE', 353, 1, 0, 0, 1, '', 1),(27, 5, 'NZ', 64, 1, 0, 0, 1, 'NNNN', 1),(28, 3, 'KR', 82, 1, 0, 0, 1, 'NNN-NNN', 1), @@ -597,7 +597,7 @@ INSERT INTO `PREFIX_state` (`id_country`, `id_zone`, `name`, `iso_code`, `tax_be (10, 1, 'Grosseto', 'GR', 0, 1), (10, 1, 'Imperia', 'IM', 0, 1), (10, 1, 'Isernia', 'IS', 0, 1), -(10, 1, 'L''Aquila', 'AQ', 0, 1), +(10, 1, 'L\'Aquila', 'AQ', 0, 1), (10, 1, 'La Spezia', 'SP', 0, 1), (10, 1, 'Latina', 'LT', 0, 1), (10, 1, 'Lecce', 'LE', 0, 1), @@ -700,6 +700,55 @@ INSERT INTO `PREFIX_state` (`id_country`, `id_zone`, `name`, `iso_code`, `active (111, 3, 'West Sumatra', 'SB', 1), (111, 3, 'Yogyakarta', 'YO', 1); +INSERT INTO `PREFIX_state` (`id_country`, `id_zone`, `name`, `iso_code`, `active`) VALUES +(11, 3, "Aichi", "23", 1), +(11, 3, "Akita", "05", 1), +(11, 3, "Aomori", "02", 1), +(11, 3, "Chiba", "12", 1), +(11, 3, "Ehime", "38", 1), +(11, 3, "Fukui", "18", 1), +(11, 3, "Fukuoka", "40", 1), +(11, 3, "Fukushima", "07", 1), +(11, 3, "Gifu", "21", 1), +(11, 3, "Gunma", "10", 1), +(11, 3, "Hiroshima", "34", 1), +(11, 3, "Hokkaido", "01", 1), +(11, 3, "Hyogo", "28", 1), +(11, 3, "Ibaraki", "08", 1), +(11, 3, "Ishikawa", "17", 1), +(11, 3, "Iwate", "03", 1), +(11, 3, "Kagawa", "37", 1), +(11, 3, "Kagoshima", "46", 1), +(11, 3, "Kanagawa", "14", 1), +(11, 3, "Kochi", "39", 1), +(11, 3, "Kumamoto", "43", 1), +(11, 3, "Kyoto", "26", 1), +(11, 3, "Mie", "24", 1), +(11, 3, "Miyagi", "04", 1), +(11, 3, "Miyazaki", "45", 1), +(11, 3, "Nagano", "20", 1), +(11, 3, "Nagasaki", "42", 1), +(11, 3, "Nara", "29", 1), +(11, 3, "Niigata", "15", 1), +(11, 3, "Oita", "44", 1), +(11, 3, "Okayama", "33", 1), +(11, 3, "Okinawa", "47", 1), +(11, 3, "Osaka", "27", 1), +(11, 3, "Saga", "41", 1), +(11, 3, "Saitama", "11", 1), +(11, 3, "Shiga", "25", 1), +(11, 3, "Shimane", "32", 1), +(11, 3, "Shizuoka", "22", 1), +(11, 3, "Tochigi", "09", 1), +(11, 3, "Tokushima", "36", 1), +(11, 3, "Tokyo", "13", 1), +(11, 3, "Tottori", "31", 1), +(11, 3, "Toyama", "16", 1), +(11, 3, "Wakayama", "30", 1), +(11, 3, "Yamagata", "06", 1), +(11, 3, "Yamaguchi", "35", 1), +(11, 3, "Yamanashi", "19", 1); + INSERT INTO `PREFIX_currency` (`name`, `iso_code`, `iso_code_num`, `sign`, `blank`, `conversion_rate`, `format`, `deleted`, `active`) VALUES ('Euro', 'EUR', '978', '€', 1, 1, 2, 0, 1), ('Dollar', 'USD', '840', '$', 0, 1.32, 1, 0, 1), ('Pound', 'GBP', '826', '£', 0, 0.8, 1, 0, 1); /*('Yen', 'JPY', '392', '¥', 0, 113.14, 2, 0, 0), diff --git a/modules/importerosc/importerosc.php b/modules/importerosc/importerosc.php index bea3ecf98..2743f5e7a 100644 --- a/modules/importerosc/importerosc.php +++ b/modules/importerosc/importerosc.php @@ -307,6 +307,7 @@ class importerosc extends ImportModule { $combination['association'] = array('product_attribute_combination' => array($combination['options_values_id'] => $combination['id_product_attribute'])); unset($combination['options_values_price']); + unset($combination['options_values_id']); } return $this->autoFormat($combinations, $identifier); } diff --git a/modules/shopimporter/shopimporter.php b/modules/shopimporter/shopimporter.php index a1f72d866..c2a11d922 100644 --- a/modules/shopimporter/shopimporter.php +++ b/modules/shopimporter/shopimporter.php @@ -578,7 +578,10 @@ class shopimporter extends ImportModule foreach($item as $key => $val) { if ($key == 'passwd') + { + $password = $val; $val = '------'; + } if (is_array($val) AND $key != 'images') {