From 02d1f7aa6a55a689efe446779770167e8d32428b Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 28 Apr 2011 11:32:07 +0000 Subject: [PATCH] // merge 6036 6069 6071 6093 --- classes/Tools.php | 50 +++++++++++++--------- install-dev/php/regenerate_level_depth.php | 10 +++-- install-dev/sql/db_settings_extends.sql | 14 ++++++ 3 files changed, 50 insertions(+), 24 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index eff5e6527..944af5bf9 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -612,15 +612,17 @@ class ToolsCore elseif ($id_manufacturer = self::getValue('id_manufacturer')) { $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' - SELECT `meta_title`, `meta_description`, `meta_keywords` - FROM `'._DB_PREFIX_.'manufacturer_lang` - WHERE id_lang = '.(int)($id_lang).' AND id_manufacturer = '.(int)($id_manufacturer)); + SELECT `name`, `meta_title`, `meta_description`, `meta_keywords` + FROM `'._DB_PREFIX_.'manufacturer_lang` ml + LEFT JOIN `'._DB_PREFIX_.'manufacturer` m ON (ml.`id_manufacturer` = m.`id_manufacturer`) + WHERE ml.id_lang = '.(int)($id_lang).' AND ml.id_manufacturer = '.(int)($id_manufacturer)); if ($row) { if (empty($row['meta_description'])) $row['meta_description'] = strip_tags($row['meta_description']); - $row['meta_title'] = $row['meta_title'].' - '.Configuration::get('PS_SHOP_NAME'); - return self::completeMetaTags($row, $row['meta_title']); + if (!empty($row['meta_title'])) + $row['meta_title'] = $row['meta_title'].' - '.Configuration::get('PS_SHOP_NAME'); + return self::completeMetaTags($row, $row['name']); } } @@ -628,15 +630,18 @@ class ToolsCore elseif ($id_supplier = self::getValue('id_supplier')) { $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' - SELECT `meta_title`, `meta_description`, `meta_keywords` - FROM `'._DB_PREFIX_.'supplier_lang` - WHERE id_lang = '.(int)($id_lang).' AND id_supplier = '.(int)($id_supplier)); + SELECT `name`, `meta_title`, `meta_description`, `meta_keywords` + FROM `'._DB_PREFIX_.'supplier_lang` sl + LEFT JOIN `'._DB_PREFIX_.'supplier` s ON (sl.`id_supplier` = s.`id_supplier`) + WHERE sl.id_lang = '.(int)($id_lang).' AND sl.id_supplier = '.(int)($id_supplier)); + if ($row) { if (empty($row['meta_description'])) $row['meta_description'] = strip_tags($row['meta_description']); - $row['meta_title'] = $row['meta_title'].' - '.Configuration::get('PS_SHOP_NAME'); - return self::completeMetaTags($row, $row['meta_title']); + if (!empty($row['meta_title'])) + $row['meta_title'] = $row['meta_title'].' - '.Configuration::get('PS_SHOP_NAME'); + return self::completeMetaTags($row, $row['name']); } } @@ -1256,18 +1261,21 @@ class ToolsCore //overriding of modules js files foreach ($js_uri AS $key => &$file) { - $different = 0; - $override_path = str_replace(__PS_BASE_URI__.'modules/', _PS_ROOT_DIR_.'/themes/'._THEME_NAME_.'/js/modules/', $file, $different); - if ($different && file_exists($override_path)) - $file = str_replace(__PS_BASE_URI__.'modules/', __PS_BASE_URI__.'themes/'._THEME_NAME_.'/js/modules/', $file, $different); - else + if (!preg_match('/^http(s?):\/\//i', $file)) { - // remove PS_BASE_URI on _PS_ROOT_DIR_ for the following - $url_data = parse_url($file); - $file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']); - // check if js files exists - if (!file_exists($file_uri)) - unset($js_uri[$key]); + $different = 0; + $override_path = str_replace(__PS_BASE_URI__.'modules/', _PS_ROOT_DIR_.'/themes/'._THEME_NAME_.'/js/modules/', $file, $different); + if ($different && file_exists($override_path)) + $file = str_replace(__PS_BASE_URI__.'modules/', __PS_BASE_URI__.'themes/'._THEME_NAME_.'/js/modules/', $file, $different); + else + { + // remove PS_BASE_URI on _PS_ROOT_DIR_ for the following + $url_data = parse_url($file); + $file_uri = _PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, DIRECTORY_SEPARATOR, $url_data['path']); + // check if js files exists + if (!file_exists($file_uri)) + unset($js_uri[$key]); + } } } diff --git a/install-dev/php/regenerate_level_depth.php b/install-dev/php/regenerate_level_depth.php index ab16f192b..d31abe4ac 100644 --- a/install-dev/php/regenerate_level_depth.php +++ b/install-dev/php/regenerate_level_depth.php @@ -32,9 +32,13 @@ function regenerate_level_depth() foreach($cats as $cat) { $category = new Category((int)$cat['id_category']); - $catParent = new Category((int)$category->id_parent); - $category->level_depth = $catParent->level_depth +1; - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = '.(int)$category->level_depth.' WHERE `id_category` = '.(int)$category->id); + // if the category has no parent, it's the home + if ((int)$category->id_parent != 0) + { + $catParent = new Category((int)$category->id_parent); + $category->level_depth = $catParent->level_depth +1; + Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = '.(int)$category->level_depth.' WHERE `id_category` = '.(int)$category->id); + } } Category::regenerateEntireNtree(); diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql index 342231116..757c34a61 100644 --- a/install-dev/sql/db_settings_extends.sql +++ b/install-dev/sql/db_settings_extends.sql @@ -172,6 +172,13 @@ INSERT INTO `PREFIX_order_history` (`id_order_history`, `id_employee`, `id_order INSERT INTO `PREFIX_manufacturer` (`id_manufacturer`, `name`, `date_add`, `date_upd`, `active`) VALUES (1, 'Apple Computer, Inc', NOW(), NOW(), 1); INSERT INTO `PREFIX_manufacturer` (`id_manufacturer`, `name`, `date_add`, `date_upd`, `active`) VALUES(2, 'Shure Incorporated', NOW(), NOW(), 1); +INSERT INTO `PREFIX_manufacturer_lang` (`id_manufacturer`, `id_lang`, `description`, `short_description`, `meta_title`, `meta_keywords`, `meta_description`) VALUES +(1, 1, '', '', '', '', ''), +(1, 2, '', '', '', '', ''), +(1, 3, '', '', '', '', ''), +(1, 4, '', '', '', '', ''), +(1, 5, '', '', '', '', ''); + INSERT INTO `PREFIX_address` (`id_address`, `id_country`, `id_state`, `id_customer`, `id_manufacturer`, `id_supplier`, `alias`, `lastname`, `firstname`, `address1`, `postcode`, `city`, `phone`, `date_add`, `date_upd`, `active`, `deleted`) VALUES (1, 21, 5, 0, 1, 0, 'manufacturer', 'JOBS', 'STEVE', '1 Infinite Loop', '95014', 'Cupertino', '(800) 275-2273', NOW(), NOW(), 1, 0); INSERT INTO `PREFIX_address` (`id_address`, `id_country`, `id_state`, `id_customer`, `id_manufacturer`, `id_supplier`, `alias`, `company`, `lastname`, `firstname`, `address1`, `address2`, `postcode`, `city`, `phone`, `date_add`, `date_upd`, `active`, `deleted`) @@ -180,6 +187,13 @@ INSERT INTO `PREFIX_address` (`id_address`, `id_country`, `id_state`, `id_custom INSERT INTO `PREFIX_supplier` (`id_supplier`, `name`, `date_add`, `date_upd`, `active`) VALUES (1, 'AppleStore', NOW(), NOW(), 1); INSERT INTO `PREFIX_supplier` (`id_supplier`, `name`, `date_add`, `date_upd`, `active`) VALUES (2, 'Shure Online Store', NOW(), NOW(), 1); +INSERT INTO `PREFIX_supplier_lang` (`id_supplier`, `id_lang`, `description`, `meta_title`, `meta_keywords`, `meta_description`) VALUES +(1, 1, '', '', '', ''), +(1, 2, '', '', '', ''), +(1, 3, '', '', '', ''), +(1, 4, '', '', '', ''), +(1, 5, '', '', '', ''); + INSERT INTO `PREFIX_product` (`id_product`, `indexed`, `id_supplier`, `id_manufacturer`, `id_tax_rules_group`, `id_category_default`, `id_color_default`, `on_sale`, `online_only`, `ean13`, `ecotax`, `quantity`, `price`, `wholesale_price`, `reference`, `supplier_reference`, `weight`, `out_of_stock`, `quantity_discount`, `customizable`, `uploadable_files`, `text_fields`, `active`, `date_add`, `date_upd`) VALUES (1, 1, 1, 1, 1, 2, 2, 0, 0, '0', 0.00, 800, 124.581940, 70.000000, '', '', 0.5, 2, 0, 0, 0, 0, 1, NOW(), NOW()), (2, 1, 1, 1, 1, 2, 0, 0, 0, '0', 0.00, 100, 66.053500, 33.000000, '', '', 0, 2, 0, 0, 0, 0, 1, NOW(), NOW()),