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

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-03-09 09:19:30 +00:00
parent 724c96fbde
commit 50a44277db
54 changed files with 297 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Carrier.php
View File

@@ -203,7 +203,7 @@ class CarrierCore extends ObjectModel
{
if (!parent::delete())
return false;
return (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) &&
return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) &&
$this->deleteTaxRulesGroup(Shop::getShops(true, null, true)));
}

2
classes/Cart.php
View File

@@ -1028,7 +1028,7 @@ class CartCore extends ObjectModel
{
Cache::clean('Cart::getCartRules'.$this->id);
$result = Db::getInstance()->Execute('
$result = Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'cart_cart_rule`
WHERE `id_cart_rule` = '.(int)$id_cart_rule.'
AND `id_cart` = '.(int)$this->id.'

54
classes/CartRule.php
View File

@@ -131,15 +131,15 @@ class CartRuleCore extends ObjectModel
Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', CartRule::isCurrentlyUsed($this->def['table'], true));
$r = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
$r = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
return $r;
}
@@ -153,26 +153,26 @@ class CartRuleCore extends ObjectModel
*/
public static function copyConditions($id_cart_rule_source, $id_cart_rule_destination)
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_shop` (`id_cart_rule`, `id_shop`)
(SELECT '.(int)$id_cart_rule_destination.', id_shop FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_carrier` (`id_cart_rule`, `id_carrier`)
(SELECT '.(int)$id_cart_rule_destination.', id_carrier FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_group` (`id_cart_rule`, `id_group`)
(SELECT '.(int)$id_cart_rule_destination.', id_group FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_country` (`id_cart_rule`, `id_country`)
(SELECT '.(int)$id_cart_rule_destination.', id_country FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`)
(SELECT '.(int)$id_cart_rule_destination.', IF(id_cart_rule_1 != '.(int)$id_cart_rule_source.', id_cart_rule_1, id_cart_rule_2) FROM `'._DB_PREFIX_.'cart_rule_combination`
WHERE `id_cart_rule_1` = '.(int)$id_cart_rule_source.' OR `id_cart_rule_2` = '.(int)$id_cart_rule_source.')');
// Todo : should be changed soon, be must be copied too
// Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id);
// Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
// Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id);
// Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
}
/**
@@ -287,7 +287,7 @@ class CartRuleCore extends ObjectModel
return array();
$productRuleGroups = array();
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT *
FROM '._DB_PREFIX_.'cart_rule_product_rule_group prg
WHERE prg.id_cart_rule = '.(int)$this->id, false);
@@ -310,7 +310,7 @@ class CartRuleCore extends ObjectModel
return array();
$productRules = array();
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT *
FROM '._DB_PREFIX_.'cart_rule_product_rule pr
LEFT JOIN '._DB_PREFIX_.'cart_rule_product_rule_value prv ON pr.id_product_rule = prv.id_product_rule
@@ -520,7 +520,7 @@ class CartRuleCore extends ObjectModel
switch ($productRule['type'])
{
case 'attributes':
$cartAttributes = Db::getInstance()->ExecuteS('
$cartAttributes = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, pac.`id_attribute`, cp.`id_product_attribute`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON cp.id_product_attribute = pac.id_product_attribute
@@ -540,7 +540,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'products':
$cartProducts = Db::getInstance()->ExecuteS('
$cartProducts = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`
FROM `'._DB_PREFIX_.'cart_product` cp
WHERE cp.`id_cart` = '.(int)$context->cart->id.'
@@ -558,7 +558,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'categories':
$cartCategories = Db::getInstance()->ExecuteS('
$cartCategories = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, catp.`id_category`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'category_product` catp ON cp.id_product = catp.id_product
@@ -577,7 +577,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'manufacturers':
$cartManufacturers = Db::getInstance()->ExecuteS('
$cartManufacturers = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, p.`id_manufacturer`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product
@@ -596,7 +596,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'suppliers':
$cartSuppliers = Db::getInstance()->ExecuteS('
$cartSuppliers = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, p.`id_supplier`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product
@@ -795,7 +795,7 @@ class CartRuleCore extends ObjectModel
protected function getCartRuleCombinations()
{
$array = array();
$array['selected'] = Db::getInstance()->ExecuteS('
$array['selected'] = Db::getInstance()->executeS('
SELECT cr.*, crl.*, 1 as selected
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
@@ -809,7 +809,7 @@ class CartRuleCore extends ObjectModel
OR '.(int)$this->id.' = id_cart_rule_2
)
)');
$array['unselected'] = Db::getInstance()->ExecuteS('
$array['unselected'] = Db::getInstance()->executeS('
SELECT cr.*, crl.*, 1 as selected
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
@@ -833,7 +833,7 @@ class CartRuleCore extends ObjectModel
if (!Validate::isLoadedObject($this) OR $this->{$type.'_restriction'} == 0)
{
$array['selected'] = Db::getInstance()->ExecuteS('
$array['selected'] = Db::getInstance()->executeS('
SELECT t.*'.($i18n ? ', tl.*' : '').', 1 as selected
FROM `'._DB_PREFIX_.$type.'` t
'.($i18n ? 'LEFT JOIN `'._DB_PREFIX_.$type.'_lang` tl ON (t.id_'.$type.' = tl.id_'.$type.' AND tl.id_lang = '.(int)Context::getContext()->language->id.')' : '').'
@@ -964,7 +964,7 @@ class CartRuleCore extends ObjectModel
*/
public static function getCartsRuleByCode($name, $id_lang)
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT cr.*, crl.*
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.')

2
classes/Country.php
View File

@@ -104,7 +104,7 @@ class CountryCore extends ObjectModel
{
if (!parent::delete())
return false;
return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id);
return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id);
}
/**

2
classes/Customer.php
View File

@@ -744,7 +744,7 @@ class CustomerCore extends ObjectModel
public function getWsGroups()
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT cg.`id_group` as id
FROM '._DB_PREFIX_.'customer_group cg
WHERE cg.`id_customer` = '.(int)$this->id);

2
classes/Image.php
View File

@@ -276,7 +276,7 @@ class ImageCore extends ObjectModel
foreach ($image_ids as $image_id)
$query .= '('.(int)$id_product_attribute.', '.(int)$image_id.'), ';
$query = rtrim($query, ', ');
return DB::getInstance()->Execute($query);
return DB::getInstance()->execute($query);
}
/**

6
classes/Notification.php
View File

@@ -58,7 +58,7 @@ class NotificationCore
public function installDb()
{
Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('ALTER TABLE `'._DB_PREFIX_.'employee`
Db::getInstance(_PS_USE_SQL_SLAVE_)->execute('ALTER TABLE `'._DB_PREFIX_.'employee`
ADD `id_last_order` INT(10) unsigned NOT NULL default "0"
ADD `id_last_customer_message` INT(10) unsigned NOT NULL default "0"
ADD `id_last_message` INT(10) unsigned NOT NULL default "0"');
@@ -87,7 +87,7 @@ class NotificationCore
ORDER BY `id_'.bqSQL($type).'` DESC';
$json = array();
foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql) as $key => $value)
foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql) as $key => $value)
{
$customer = null;
$order = null;
@@ -126,7 +126,7 @@ class NotificationCore
if (in_array($type, $this->types))
// We update the last item viewed
return Db::getInstance()->Execute('
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'employee`
SET `id_last_'.bqSQL($type).'` = (SELECT MAX(`id_'.$type.'`)
FROM `'._DB_PREFIX_.(($type == 'order') ? bqSQL($type).'s' : bqSQL($type)).'`)

193
classes/Product.php
View File

@@ -539,18 +539,18 @@ class ProductCore extends ObjectModel
$return = true;
$result = Db::getInstance()->executeS('
SELECT `id_product`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` = '.(int)$id_category.'
ORDER BY `position`');
$sizeof = count($result);
for ($i = 0; $i < $sizeof; $i++)
$return &= Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'category_product`
SET `position` = '.(int)$i.'
SELECT `id_product`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` = '.(int)$id_category.'
AND `id_product` = '.(int)$result[$i]['id_product']);
ORDER BY `position`
');
$total = count($result);
for ($i = 0; $i < $total; $i++)
$return &= Db::getInstance()->update('category_product', array(
'position' => $i,
), '`id_category` = '.(int)$id_category.' AND `id_product` = '.(int)$result[$i]['id_product']);
return $return;
}
@@ -603,23 +603,16 @@ class ProductCore extends ObjectModel
public static function updateDefaultAttribute($id_product)
{
$id_product_attribute = Product::getDefaultAttribute($id_product);
Db::getInstance()->execute(
'UPDATE '._DB_PREFIX_.'product
SET cache_default_attribute = '.(int)$id_product_attribute.'
WHERE id_product = '.(int)$id_product.'
LIMIT 1'
);
Db::getInstance()->update('product', array(
'cache_default_attribute' => (int)Product::getDefaultAttribute($id_product),
), 'id_product = '.(int)$id_product);
}
public static function updateIsVirtual($id_product)
{
Db::getInstance()->execute(
'UPDATE '._DB_PREFIX_.'product
SET is_virtual = 1
WHERE id_product = '.(int)$id_product.'
LIMIT 1'
);
Db::getInstance()->update('product', array(
'is_virtual' => (int)$id_product,
), 'id_product = '.(int)$id_product);
}
/**
@@ -706,12 +699,7 @@ class ProductCore extends ObjectModel
public function deleteFromSupplier()
{
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'product_supplier`
WHERE `id_product` = '.(int)$this->id
);
return $return;
return Db::getInstance()->delete('product_supplier', 'id_product = '.(int)$this->id);
}
/**
@@ -753,12 +741,13 @@ class ProductCore extends ObjectModel
foreach ($categories as $new_id_categ)
if (!in_array($new_id_categ, $current_categories))
$product_cats[] = '('.$new_id_categ.', '.(int)$this->id.', '.$new_categ_pos[$new_id_categ].')';
if (count($product_cats))
return Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'category_product` (`id_category`, `id_product`, `position`)
VALUES '.implode(',', $product_cats));
$product_cats[] = array(
'id_category' => (int)$new_id_categ,
'id_product' => (int)$this->id,
'position' => (int)$new_categ_pos[$new_id_categ],
);
Db::getInstance()->insert('category_product', $product_cats);
return true;
}
@@ -775,10 +764,12 @@ class ProductCore extends ObjectModel
return false;
// get max position in each categories
$result = Db::getInstance()->executeS('SELECT `id_category`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).')
AND id_product = '.$this->id.'');
$result = Db::getInstance()->executeS('
SELECT `id_category`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).')
AND id_product = '.$this->id
);
foreach ($result as $categ_to_delete)
$this->deleteCategory($categ_to_delete['id_category']);
// if none are found, it's an error
@@ -809,12 +800,8 @@ class ProductCore extends ObjectModel
WHERE `id_product` = '.(int)$this->id.'
AND id_category = '.(int)$id_category.''
);
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'category_product`
WHERE `id_product` = '.(int)$this->id.'
AND id_category = '.(int)$id_category.''
);
$return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id.' AND id_category = '.(int)$id_category);
if ($clean_positions === true)
foreach ($result as $row)
$this->cleanPositions((int)$row['id_category']);
@@ -829,11 +816,7 @@ class ProductCore extends ObjectModel
*/
public function deleteCategories($clean_positions = false)
{
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'category_product`
WHERE `id_product` = '.(int)$this->id
);
$return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id);
if ($clean_positions === true)
{
$result = Db::getInstance()->executeS(
@@ -855,18 +838,8 @@ class ProductCore extends ObjectModel
*/
public function deleteTags()
{
return (
Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'product_tag`
WHERE `id_product` = '.(int)$this->id
)
&&
Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'tag`
WHERE `id_tag` NOT IN (SELECT `id_tag`
FROM `'._DB_PREFIX_.'product_tag`)'
)
);
return Db::getInstance()->delete('product_tag', 'id_product = '.(int)$this->id)
&& Db::getInstance()->delete('tag', 'id_tag NOT IN (SELECT id_tag FROM '._DB_PREFIX_.'product_tag)');
}
/**
@@ -876,10 +849,7 @@ class ProductCore extends ObjectModel
*/
public function deleteCartProducts()
{
return Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'cart_product`
WHERE `id_product` = '.(int)$this->id
);
return Db::getInstance()->delete('cart_product', 'id_product` = '.(int)$this->id);
}
/**
@@ -908,9 +878,10 @@ class ProductCore extends ObjectModel
public static function getProductAttributePrice($id_product_attribute)
{
$rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `price`
FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` = '.(int)$id_product_attribute);
SELECT `price`
FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` = '.(int)$id_product_attribute
);
return $rq['price'];
}
@@ -1205,23 +1176,22 @@ class ProductCore extends ObjectModel
*/
public function deleteDefaultAttributes()
{
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_attribute`
SET `default_on` = 0
WHERE `id_product` = '.(int)$this->id);
return Db::getInstance()->update('product_attribute', array(
'default_on' => 0,
), 'id_product = '.(int)$this->id);
}
public function setDefaultAttribute($id_product_attribute)
{
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_attribute`
SET `default_on` = 1
WHERE `id_product` = '.(int)$this->id.'
AND `id_product_attribute` = '.(int)$id_product_attribute) &&
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product`
SET `cache_default_attribute` = '.(int)$id_product_attribute.'
WHERE `id_product` = '.(int)$this->id.' LIMIT 1');
$result = Db::getInstance()->update('product_attribute', array(
'default_on' => 1
), 'id_product` = '.(int)$this->id.' AND `id_product_attribute` = '.(int)$id_product_attribute);
$result &= Db::getInstance()->update('product', array(
'cache_default_attribute' => (int)$id_product_attribute,
), 'id_product = '.(int)$this->id);
return $result;
}
/**
@@ -1518,18 +1488,16 @@ class ProductCore extends ObjectModel
public function addAttributeCombinationMultiple($id_attributes, $combinations)
{
$attributes_list = '';
$attributes_list = array();
foreach ($id_attributes as $nb => $id_product_attribute)
if (isset($combinations[$nb]))
foreach ($combinations[$nb] as $id_attribute)
$attributes_list .= '('.(int)$id_product_attribute.','.(int)$id_attribute.'),';
$attributes_list[] = array(
'id_product_attribute' => (int)$id_product_attribute,
'id_attribute' => (int)$id_attribute,
);
$attributes_list = rtrim($attributes_list, ',');
return Db::getInstance()->execute(
'INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`)
VALUES '.$attributes_list
);
return Db::getInstance()->insert('product_attribute_combination', $attributes_list);
}
/**
@@ -3275,11 +3243,15 @@ class ProductCore extends ObjectModel
$tags = Db::getInstance()->executeS('SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$id_product_old);
if (!Db::getInstance()->NumRows())
return true;
$query = 'INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_product`, `id_tag`) VALUES';
$data = array();
foreach ($tags as $tag)
$query .= ' ('.(int)$id_product_new.', '.(int)$tag['id_tag'].'),';
$query = rtrim($query, ',');
return Db::getInstance()->execute($query);
$data[] = array(
'id_product' => (int)$id_product_new,
'id_tag' => (int)$tag['id_tag'],
);
return Db::getInstance()->insert('product_tag', $data);
}
public static function duplicateDownload($id_product_old, $id_product_new)
@@ -3291,18 +3263,19 @@ class ProductCore extends ObjectModel
if (!$results)
return true;
$query = 'INSERT INTO `'._DB_PREFIX_.'product_download`
(`id_product`, `display_filename`, `filename`, `date_add`, `date_expiration`, `nb_days_accessible`, `nb_downloadable`, `active`, `is_shareable`)
VALUES';
$data = array();
foreach ($results as $row)
$query .= ' ('.(int)$id_product_new.', \''.pSQL($row['display_filename']).'\', \''.pSQL($row['filename']).
'\', \''.pSQL($row['date_add']).'\', \''.pSQL($row['date_expiration']).'\', '.(int)$row['nb_days_accessible'].
', '.(int)$row['nb_downloadable'].', '.(int)$row['active'].'), '.(int)$row['is_shareable'].'),';
$query = rtrim($query, ',');
return Db::getInstance()->execute($query);
$data[] = array(
'id_product' => (int)$id_product_new,
'display_filename' => pSQL($row['display_filename']),
'filename' => pSQL($row['filename']),
'date_expiration' => pSQL($row['date_expiration']),
'nb_days_accessible' => (int)$row['nb_days_accessible'],
'nb_downloadable' => (int)$row['nb_downloadable'],
'active' => (int)$row['active'],
'is_shareable' => (int)$row['is_shareable']
);
return Db::getInstance()->insert('product_download', $data);
}
/**
@@ -3421,12 +3394,16 @@ class ProductCore extends ObjectModel
if (isset($customizations['labels']))
{
$query = 'INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES ';
$query = 'INSERT INTO `'._DB_PREFIX_.'` (`id_customization_field`, `id_lang`, `name`) VALUES ';
$data = array();
foreach ($customizations['labels'][$old_customization_field_id] as $customization_label)
$query .= '('.(int)$customization_field_id.', '.(int)$customization_label['id_lang'].', \''.pSQL($customization_label['name']).'\'), ';
$data = array(
'id_customization_field' => (int)$customization_field_id,
'id_lang' => (int)$customization_label['id_lang'],
'name' => pSQL($customization_label['name']),
);
$query = rtrim($query, ', ');
if (!Db::getInstance()->execute($query))
if (!Db::getInstance()->insert('customization_field_lang', $data))
return false;
}
}

10
classes/Search.php
View File

@@ -401,9 +401,9 @@ class SearchCore
if ($full)
{
$db->Execute('TRUNCATE '._DB_PREFIX_.'search_index');
$db->Execute('TRUNCATE '._DB_PREFIX_.'search_word');
$db->Execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0');
$db->execute('TRUNCATE '._DB_PREFIX_.'search_index');
$db->execute('TRUNCATE '._DB_PREFIX_.'search_word');
$db->execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0');
}
else
{
@@ -420,7 +420,7 @@ class SearchCore
foreach ($products as $product)
$ids[] = (int)$product['id_product'];
if (count($ids))
$db->Execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')');
$db->execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')');
}
// Every fields are weighted according to the configuration in the backend
@@ -516,7 +516,7 @@ class SearchCore
if (count($queryArray))
{
// The words are inserted...
$db->Execute('
$db->execute('
INSERT IGNORE INTO '._DB_PREFIX_.'search_word (id_lang, id_shop, word)
VALUES '.implode(',', $queryArray));
}

2
classes/SpecificPrice.php
View File

@@ -142,7 +142,7 @@ class SpecificPriceCore extends ObjectModel
public static function deleteByIdCart($id_cart, $id_product = false, $id_product_attribute = false)
{
return Db::getInstance()->Execute('
return Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'specific_price`
WHERE id_cart='.(int)$id_cart.
($id_product ? ' AND id_product='.(int)$id_product.' AND id_product_attribute='.(int)$id_product_attribute : ''));

2
classes/order/Order.php
View File

@@ -1395,7 +1395,7 @@ class OrderCore extends ObjectModel
*/
public function getShipping()
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`
FROM `'._DB_PREFIX_.'orders` o
LEFT JOIN `'._DB_PREFIX_.'order_history` oh

4
classes/order/OrderInvoice.php
View File

@@ -361,7 +361,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
@@ -409,7 +409,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDeliveryDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)

2
classes/order/OrderPayment.php
View File

@@ -79,7 +79,7 @@ class OrderPaymentCore extends ObjectModel
*/
public static function getByOrderId($id_order)
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'order_payment`
WHERE `id_order` = '.(int)$id_order);

38
controllers/admin/AdminCartRulesController.php
View File

@@ -81,10 +81,10 @@ class AdminCartRulesControllerCore extends AdminController
// All the associations are deleted for an update, then recreated when we call the "afterAdd" method
$id_cart_rule = Tools::getValue('id_cart_rule');
foreach (array('country', 'carrier', 'group', 'product_rule_group', 'shop') as $type)
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE `id_cart_rule` = '.(int)$id_cart_rule);
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$id_cart_rule.' OR `id_cart_rule_2` = '.(int)$id_cart_rule);
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_'.$type.'` WHERE `id_cart_rule` = '.(int)$id_cart_rule);
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$id_cart_rule.' OR `id_cart_rule_2` = '.(int)$id_cart_rule);
$this->afterAdd($current_object);
}
@@ -99,7 +99,7 @@ class AdminCartRulesControllerCore extends AdminController
$values = array();
foreach ($array as $id)
$values[] = '('.(int)$currentObject->id.','.(int)$id.')';
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_'.$type.'` (`id_cart_rule`, `id_'.$type.'`) VALUES '.implode(',', $values));
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_'.$type.'` (`id_cart_rule`, `id_'.$type.'`) VALUES '.implode(',', $values));
}
// Add cart rule restrictions
if (Tools::getValue('cart_rule_restriction') && is_array($array = Tools::getValue('cart_rule_select')) && count($array))
@@ -107,28 +107,28 @@ class AdminCartRulesControllerCore extends AdminController
$values = array();
foreach ($array as $id)
$values[] = '('.(int)$currentObject->id.','.(int)$id.')';
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) VALUES '.implode(',', $values));
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) VALUES '.implode(',', $values));
}
// Add product rule restrictions
if (Tools::getValue('product_restriction') && is_array($ruleGroupArray = Tools::getValue('product_rule_group')) && count($ruleGroupArray))
{
foreach ($ruleGroupArray as $ruleGroupId)
{
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`)
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`)
VALUES ('.(int)$currentObject->id.', '.(int)Tools::getValue('product_rule_group_'.$ruleGroupId.'_quantity').')');
$id_product_rule_group = Db::getInstance()->Insert_ID();
if (is_array($ruleArray = Tools::getValue('product_rule_'.$ruleGroupId)) && count($ruleArray))
foreach ($ruleArray as $ruleId)
{
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`)
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule` (`id_product_rule_group`, `type`)
VALUES ('.(int)$id_product_rule_group.', "'.pSQL(Tools::getValue('product_rule_'.$ruleGroupId.'_'.$ruleId.'_type')).'")');
$id_product_rule = Db::getInstance()->Insert_ID();
$values = array();
foreach (Tools::getValue('product_rule_select_'.$ruleGroupId.'_'.$ruleId) as $id)
$values[] = '('.(int)$id_product_rule.','.(int)$id.')';
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values));
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) VALUES '.implode(',', $values));
}
}
}
@@ -136,7 +136,7 @@ class AdminCartRulesControllerCore extends AdminController
// If the new rule has no cart rule restriction, then it must be added to the white list of the other cart rules that have restrictions
if ($currentObject->cart_rule_restriction == 0)
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) (
SELECT id_cart_rule, '.(int)$currentObject->id.' FROM `'._DB_PREFIX_.'cart_rule` WHERE cart_rule_restriction = 1
)');
@@ -144,7 +144,7 @@ class AdminCartRulesControllerCore extends AdminController
// And if the new cart rule has restrictions, previously unrestricted cart rules may now be restricted (a mug of coffee is strongly advised to understand this sentence)
else
{
$ruleCombinations = Db::getInstance()->ExecuteS('
$ruleCombinations = Db::getInstance()->executeS('
SELECT cr.id_cart_rule
FROM '._DB_PREFIX_.'cart_rule cr
WHERE cr.id_cart_rule != '.(int)$currentObject->id.'
@@ -156,8 +156,8 @@ class AdminCartRulesControllerCore extends AdminController
)');
foreach ($ruleCombinations as $incompatibleRule)
{
Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'cart_rule` SET cart_rule_restriction = 1 WHERE id_cart_rule = '.(int)$incompatibleRule['id_cart_rule'].' LIMIT 1');
Db::getInstance()->Execute('
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'cart_rule` SET cart_rule_restriction = 1 WHERE id_cart_rule = '.(int)$incompatibleRule['id_cart_rule'].' LIMIT 1');
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`) (
SELECT id_cart_rule, '.(int)$incompatibleRule['id_cart_rule'].' FROM `'._DB_PREFIX_.'cart_rule` WHERE active = 1 AND id_cart_rule != '.(int)$currentObject->id.'
)');
@@ -233,7 +233,7 @@ class AdminCartRulesControllerCore extends AdminController
{
case 'attributes':
$attributes = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT CONCAT(agl.name, " - ", al.name) as name, a.id_attribute as id
FROM '._DB_PREFIX_.'attribute_group_lang agl
LEFT JOIN '._DB_PREFIX_.'attribute a ON a.id_attribute_group = agl.id_attribute_group
@@ -249,7 +249,7 @@ class AdminCartRulesControllerCore extends AdminController
case 'products':
// Todo: Consider optimization
$products = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT name, id_product as id
FROM '._DB_PREFIX_.'product_lang pl
WHERE id_lang = '.(int)Context::getContext()->language->id.'
@@ -262,7 +262,7 @@ class AdminCartRulesControllerCore extends AdminController
break;
case 'manufacturers':
$products = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT name, id_manufacturer as id
FROM '._DB_PREFIX_.'manufacturer
ORDER BY name');
@@ -274,7 +274,7 @@ class AdminCartRulesControllerCore extends AdminController
break;
case 'suppliers':
$products = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT name, id_supplier as id
FROM '._DB_PREFIX_.'supplier
ORDER BY name');
@@ -287,7 +287,7 @@ class AdminCartRulesControllerCore extends AdminController
case 'categories':
// Todo: Consider optimization
$categories = array('selected' => array(), 'unselected' => array());
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT name, id_category as id
FROM '._DB_PREFIX_.'category_lang pl
WHERE id_lang = '.(int)Context::getContext()->language->id.'
@@ -313,7 +313,7 @@ class AdminCartRulesControllerCore extends AdminController
if (Tools::isSubmit('customerFilter'))
{
$q = trim(Tools::getValue('q'));
$customers = Db::getInstance()->ExecuteS('
$customers = Db::getInstance()->executeS('
SELECT `id_customer`, `email`, CONCAT(`firstname`, \' \', `lastname`) as cname
FROM `'._DB_PREFIX_.'customer`
WHERE `deleted` = 0 AND is_guest = 0 AND active = 1

2
controllers/admin/AdminProductsController.php
View File

@@ -1293,7 +1293,7 @@ class AdminProductsControllerCore extends AdminController
// if deleted image was the cover, change it to the first one
if (!Image::getCover($image->id_product))
{
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'image`
SET `cover` = 1
WHERE `id_product` = '.(int)$image->id_product.' LIMIT 1');

4
install-dev/upgrade/php/add_required_customization_field_flag.php
View File

@@ -29,14 +29,14 @@ define('_CONTAINS_REQUIRED_FIELD_', 2);
function add_required_customization_field_flag()
{
if (($result = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false)
if (($result = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'customization_field` WHERE `required` = 1')) === false)
return false;
if (Db::getInstance()->numRows())
{
$productIds = array();
foreach ($result AS $row)
$productIds[] = (int)($row['id_product']);
if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')'))
if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = '._CONTAINS_REQUIRED_FIELD_.' WHERE `id_product` IN ('.implode(', ', $productIds).')'))
return false;
}
return true;

4
install-dev/upgrade/php/alter_blocklink.php
View File

@@ -28,9 +28,9 @@
function alter_blocklink()
{
// No one will know if the table does not exist :] Thanks Damien for your solution ;)
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink_lang` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'blocklink` CHANGE `id_link` `id_blocklink` INT( 10 ) UNSIGNED NOT NULL');
}

8
install-dev/upgrade/php/alter_cms_block.php
View File

@@ -28,13 +28,13 @@
function alter_cms_block()
{
// No one will know if the table does not exist :] Thanks Damien for your solution ;)
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_lang` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms` `id_cms_block` INT( 10 ) UNSIGNED NOT NULL');
DB::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT');
DB::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'cms_block_page` CHANGE `id_block_cms_page` `id_cms_block_page` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT');
}

2
install-dev/upgrade/php/alter_productcomments_guest_index.php
View File

@@ -33,7 +33,7 @@ function alter_productcomments_guest_index()
if (!$id_productcomments)
return;
DB::getInstance()->Execute('
DB::getInstance()->execute('
ALTER TABLE `'._DB_PREFIX_.'product_comment`
DROP INDEX `id_guest`, ADD INDEX `id_guest` (`id_guest`);');
}

4
install-dev/upgrade/php/attribute_group_clean_combinations.php
View File

@@ -27,7 +27,7 @@
function attribute_group_clean_combinations()
{
$attributeCombinations = Db::getInstance()->ExecuteS('SELECT
$attributeCombinations = Db::getInstance()->executeS('SELECT
pac.`id_attribute`, pa.`id_product_attribute`
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac
@@ -39,7 +39,7 @@ function attribute_group_clean_combinations()
if (!empty($toRemove))
{
$res = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute`
$res = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')');
return $res;
}

2
install-dev/upgrade/php/blocknewsletter.php
View File

@@ -28,6 +28,6 @@
function blocknewsletter()
{
// No one will know if the table does not exist :]
DB::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL');
DB::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'newsletter ADD `http_referer` VARCHAR(255) NULL');
}

6
install-dev/upgrade/php/configuration_double_cleaner.php
View File

@@ -27,19 +27,19 @@
function configuration_double_cleaner()
{
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT name, MIN(id_configuration) AS minid
FROM '._DB_PREFIX_.'configuration
GROUP BY name
HAVING count(name) > 1');
foreach ($result as $row)
{
DB::getInstance()->Execute('
DB::getInstance()->execute('
DELETE FROM '._DB_PREFIX_.'configuration
WHERE name = \''.addslashes($row['name']).'\'
AND id_configuration != '.(int)($row['minid']));
}
DB::getInstance()->Execute('
DB::getInstance()->execute('
DELETE FROM '._DB_PREFIX_.'configuration_lang
WHERE id_configuration NOT IN (
SELECT id_configuration

4
install-dev/upgrade/php/delivery_number_set.php
View File

@@ -31,7 +31,7 @@ function delivery_number_set()
$number = 1;
// Update each order with a number
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT id_order
FROM '._DB_PREFIX_.'orders
ORDER BY id_order');
@@ -44,7 +44,7 @@ function delivery_number_set()
$oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT'));
if ($oS->delivery)
{
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id));
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET delivery_number = '.(int)($number++).', `delivery_date` = `date_add` WHERE id_order = '.(int)($order->id));
break ;
}
}

4
install-dev/upgrade/php/generate_ntree.php
View File

@@ -27,7 +27,7 @@
function generate_ntree()
{
$categories = Db::getInstance()->ExecuteS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
$categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_parent ASC, position ASC');
$categoriesArray = array();
foreach ($categories AS $category)
$categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1;
@@ -43,7 +43,7 @@ function generate_ntree_subTree(&$categories, $id_category, &$n)
generate_ntree_subTree($categories, (int)$id_subcategory, $n);
$right = (int)$n++;
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'category
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'category
SET nleft = '.(int)$left.', nright = '.(int)$right.'
WHERE id_category = '.(int)$id_category.' LIMIT 1');
}

6
install-dev/upgrade/php/generate_tax_rules.php
View File

@@ -44,7 +44,7 @@ function generate_tax_rules()
$id_tax_rules_group = Db::getInstance()->insert_id;
$countries = Db::getInstance()->ExecuteS('
$countries = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'country` c
LEFT JOIN `'._DB_PREFIX_.'zone` z ON (c.`id_zone` = z.`id_zone`)
LEFT JOIN `'._DB_PREFIX_.'tax_zone` tz ON (tz.`id_zone` = z.`id_zone`)
@@ -54,7 +54,7 @@ function generate_tax_rules()
{
foreach ($countries AS $country)
{
$res = Db::getInstance()->Execute('
$res = Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'tax_rule` (`id_tax_rules_group`, `id_country`, `id_state`, `state_behavior`, `id_tax`)
VALUES (
'.(int)$id_tax_rules_group.',
@@ -67,7 +67,7 @@ function generate_tax_rules()
}
}
$states = Db::getInstance()->ExecuteS('
$states = Db::getInstance()->executeS('
SELECT * FROM `'._DB_PREFIX_.'states s
LEFT JOIN `'._DB_PREFIX_.'tax_state ts ON (ts.`id_state` = s.`id_state`)
WHERE `id_tax` = '.(int)$id_tax

2
install-dev/upgrade/php/hook_blocksearch_on_header.php
View File

@@ -41,7 +41,7 @@ function hook_blocksearch_on_header()
WHERE `id_hook` = '.(int)$id_hook.'
');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`)
VALUES ('.(int)$id_module.', '.(int)$id_hook.', '.($position+1).')
');

4
install-dev/upgrade/php/invoice_number_set.php
View File

@@ -31,7 +31,7 @@ function invoice_number_set()
$number = 1;
// Update each order with a number
$result = Db::getInstance()->ExecuteS('
$result = Db::getInstance()->executeS('
SELECT id_order
FROM '._DB_PREFIX_.'orders
ORDER BY id_order');
@@ -44,7 +44,7 @@ function invoice_number_set()
$oS = new OrderState((int)($row2['id_order_state']), Configuration::get('PS_LANG_DEFAULT'));
if ($oS->invoice)
{
Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id));
Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET invoice_number = '.(int)($number++).', `invoice_date` = `date_add` WHERE id_order = '.(int)($order->id));
break ;
}
}

8
install-dev/upgrade/php/latin1_database_to_utf8.php
View File

@@ -88,7 +88,7 @@ function latin1_database_to_utf8()
foreach ($tables AS $table)
{
/* Latin1 datas' selection */
if (!Db::getInstance()->Execute('SET NAMES latin1'))
if (!Db::getInstance()->execute('SET NAMES latin1'))
echo 'Cannot change the sql encoding to latin1!';
$query = 'SELECT `'.$table['id'].'`';
foreach ($table['fields'] AS $field)
@@ -96,7 +96,7 @@ function latin1_database_to_utf8()
if (isset($table['lang']) AND $table['lang'])
$query .= ', `id_lang`';
$query .= ' FROM `'._DB_PREFIX_.$table['name'].'`';
$latin1Datas = Db::getInstance()->ExecuteS($query);
$latin1Datas = Db::getInstance()->executeS($query);
if ($latin1Datas === false)
{
$warningExist = true;
@@ -111,7 +111,7 @@ function latin1_database_to_utf8()
if (Db::getInstance()->NumRows())
{
/* Utf-8 datas' restitution */
if (!Db::getInstance()->Execute('SET NAMES utf8'))
if (!Db::getInstance()->execute('SET NAMES utf8'))
echo 'Cannot change the sql encoding to utf8!';
foreach ($latin1Datas AS $latin1Data)
{
@@ -122,7 +122,7 @@ function latin1_database_to_utf8()
$query .= ' WHERE `'.$table['id'].'` = '.(int)($latin1Data[$table['id']]);
if (isset($table['lang']) AND $table['lang'])
$query .= ' AND `id_lang` = '.(int)($latin1Data['id_lang']);
if (!Db::getInstance()->Execute($query))
if (!Db::getInstance()->execute($query))
{
$warningExist = true;
$requests .= '

10
install-dev/upgrade/php/migrate_block_info_to_cms_block.php
View File

@@ -60,7 +60,7 @@ function migrate_block_info_to_cms_block()
}
// module install
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block`(
`id_cms_block` int(10) unsigned NOT NULL auto_increment,
`id_cms_category` int(10) unsigned NOT NULL,
@@ -69,9 +69,9 @@ function migrate_block_info_to_cms_block()
`display_store` tinyint(1) unsigned NOT NULL default \'1\',
PRIMARY KEY (`id_cms_block`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8');
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`) VALUES(1, 0, 0)');
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_lang`(
`id_cms_block` int(10) unsigned NOT NULL,
`id_lang` int(10) unsigned NOT NULL,
@@ -83,9 +83,9 @@ function migrate_block_info_to_cms_block()
foreach ($languages AS $language)
$query_lang .= '(1, '.(int)($language['id_lang']).'),';
$query_lang = rtrim($query_lang, ',');
$res &= Db::getInstance()->Execute($query_lang);
$res &= Db::getInstance()->execute($query_lang);
$res &= Db::getInstance()->Execute('
$res &= Db::getInstance()->execute('
CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_page`(
`id_cms_block_page` int(10) unsigned NOT NULL auto_increment,
`id_cms_block` int(10) unsigned NOT NULL,

2
install-dev/upgrade/php/reorderpositions.php
View File

@@ -101,7 +101,7 @@ function reorderpositions()
SET `position` = '.(int)$i.'
WHERE `id_parent` = '.(int)$id_category_parent.'
AND `id_cms_category` = '.(int)$result[$i]['id_cms_category'];
$res &= Db::getInstance()->Execute($sql);
$res &= Db::getInstance()->execute($sql);
}
}
}

6
install-dev/upgrade/php/set_discount_category.php
View File

@@ -27,9 +27,9 @@
function set_discount_category()
{
$discounts = Db::getInstance()->ExecuteS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`');
$categories = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`');
$discounts = Db::getInstance()->executeS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount`');
$categories = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category`');
foreach ($discounts AS $discount)
foreach ($categories AS $category)
Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')');
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`,`id_category`) VALUES ('.(int)($discount['id_discount']).','.(int)($category['id_category']).')');
}

4
install-dev/upgrade/php/set_payment_module.php
View File

@@ -40,10 +40,10 @@ function set_payment_module()
$content = fread($fd, filesize($file));
if (preg_match_all('/extends PaymentModule/U', $content, $matches))
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_country` (id_module, id_country)
SELECT '.(int)($module['id_module']).', id_country FROM `'._DB_PREFIX_.'country` WHERE active = 1');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency)
SELECT '.(int)($module['id_module']).', id_currency FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0');
}

2
install-dev/upgrade/php/set_payment_module_group.php
View File

@@ -40,7 +40,7 @@ function set_payment_module_group()
$content = fread($fd, filesize($file));
if (preg_match_all('/extends PaymentModule/U', $content, $matches))
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'module_group` (id_module, id_group)
SELECT '.(int)($module['id_module']).', id_group FROM `'._DB_PREFIX_.'group`');
}

2
install-dev/upgrade/php/update_carrier_url.php
View File

@@ -36,7 +36,7 @@ function update_carrier_url()
// Check each one and erase carrier URL if not correct URL
foreach ($carriers as $carrier)
if (empty($carrier['url']) || !preg_match('/^https?:\/\/[:#%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $carrier['url']))
Db::getInstance()->Execute('
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'carrier`
SET `url` = \'\'
WHERE `id_carrier`= '.(int)($carrier['id_carrier']));

2
install-dev/upgrade/php/update_module_followup.php
View File

@@ -31,6 +31,6 @@ function update_module_followup()
if (!$id_followup)
return;
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'log_email` ADD INDEX `date_add`(`date_add`), ADD INDEX `id_cart`(`id_cart`);');
}

8
install-dev/upgrade/php/update_modules_sql.php
View File

@@ -29,12 +29,12 @@ function update_modules_sql()
{
$id_blocklink = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "blocklink"');
if ($id_blocklink)
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'blocklink_lang` ADD PRIMARY KEY (`id_link`, `id_lang`);');
$id_productcomments = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = "productcomments"');
if ($id_productcomments)
{
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_grade` ADD PRIMARY KEY (`id_product_comment`, `id_product_comment_criterion`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion` DROP PRIMARY KEY, ADD PRIMARY KEY (`id_product_comment_criterion`, `id_lang`);');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment_criterion_product` ADD PRIMARY KEY(`id_product`, `id_product_comment_criterion`);');
}
}

2
install-dev/upgrade/php/update_order_canada.php
View File

@@ -99,7 +99,7 @@ function update_order_canada()
{
$values = rtrim($values, ",");
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'order_tax` (id_order, tax_name, tax_rate, amount)
VALUES '.$values);
}

4
install-dev/upgrade/php/update_order_detail_taxes.php
View File

@@ -36,7 +36,7 @@ function update_order_detail_taxes()
{
$tax_name = (isset($order_detail_tax['tax_name']) ? $order_detail_tax['tax_name'] : $alternative_tax_name);
Db::getInstance()->Execute(
Db::getInstance()->execute(
'INSERT INTO `'._DB_PREFIX_.'tax` (`rate`, `active`, `deleted`)
VALUES (\''.(float)$order_detail_tax['tax_rate'].'\', 0, 1)'
);
@@ -44,7 +44,7 @@ function update_order_detail_taxes()
$id_tax = Db::getInstance()->Insert_ID();
foreach ($id_lang_list as $id_lang)
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'tax_lang` (`id_tax`, `id_lang`, `name`)
VALUES ('.(int)$id_tax.','.(int)$id_lang['id_lang'].',\''.pSQL($tax_name).'\')
');

6
install-dev/upgrade/php/update_order_details.php
View File

@@ -27,12 +27,12 @@
function update_order_details()
{
$res = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\'');
$res = Db::getInstance()->executeS('SHOW COLUMNS FROM `'._DB_PREFIX_.'order_detail` LIKE \'reduction_percent\'');
if (sizeof($res) == 0)
{
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`');
Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_percent` DECIMAL(10, 2) NOT NULL default \'0.00\' AFTER `product_price`');
Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'order_detail` ADD `reduction_amount` DECIMAL(20, 6) NOT NULL default \'0.000000\' AFTER `reduction_percent`');
}
}

28
install-dev/upgrade/php/updateproductcomments.php
View File

@@ -27,31 +27,31 @@
function updateproductcomments()
{
if (Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false)
if (Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'product_comment') !== false)
{
Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang (
Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_lang (
`id_product_comment_criterion` INT( 11 ) UNSIGNED NOT NULL ,
`id_lang` INT(11) UNSIGNED NOT NULL ,
`name` VARCHAR(64) NOT NULL ,
PRIMARY KEY ( `id_product_comment_criterion` , `id_lang` )
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8');
Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category (
Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'product_comment_criterion_category (
`id_product_comment_criterion` int(10) unsigned NOT NULL,
`id_category` int(10) unsigned NOT NULL,
PRIMARY KEY(`id_product_comment_criterion`, `id_category`),
KEY `id_category` (`id_category`)
) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`');
Db::getInstance()->Execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`');
Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `id_guest` INT(11) NULL AFTER `id_customer`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `customer_name` varchar(64) NULL AFTER `content`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD `deleted` tinyint(1) NOT NULL AFTER `validate`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_customer)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_guest)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment ADD INDEX (id_product)');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `id_lang`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion DROP `name`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `id_product_comment_criterion_type` tinyint(1) NOT NULL AFTER `id_product_comment_criterion`');
Db::getInstance()->execute('ALTER TABLE '._DB_PREFIX_.'product_comment_criterion ADD `active` tinyint(1) NOT NULL AFTER `id_product_comment_criterion_type`');
Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.'product_comment` ADD `title` VARCHAR(64) NULL AFTER `id_guest`;');
}
}

2
install-dev/upgrade/php/updatetabicon_from_11version.php
View File

@@ -30,7 +30,7 @@ function updatetabicon_from_11version()
if (version_compare($oldversion,'1.5.0.0','<'))
{
$rows = Db::getInstance()->ExecuteS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab');
$rows = Db::getInstance()->executeS('SELECT `id_tab`,`class_name` FROM '._DB_PREFIX_.'tab');
if (sizeof($rows))
{
$img_dir = scandir(_PS_ROOT_DIR_.'/img/t/');

20
modules/blockcategories/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockcategories</name>
<displayName><![CDATA[Categories block]]></displayName>
<version><![CDATA[2.0]]></version>
<description><![CDATA[Adds a block featuring product categories.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<module>
<name>blockcategories</name>
<displayName><![CDATA[Categories block]]></displayName>
<version><![CDATA[2.0]]></version>
<description><![CDATA[Adds a block featuring product categories.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
</module>

20
modules/blocklayered/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocklayered</name>
<displayName><![CDATA[Layered navigation block]]></displayName>
<version><![CDATA[1.8.1]]></version>
<description><![CDATA[Displays a block with layered navigation filters.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<module>
<name>blocklayered</name>
<displayName><![CDATA[Layered navigation block]]></displayName>
<version><![CDATA[1.8.1]]></version>
<description><![CDATA[Displays a block with layered navigation filters.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>
</module>

2
modules/blocklink/blocklink.php
View File

@@ -184,7 +184,7 @@ class BlockLink extends Module
}
$assos_shop = Tools::getValue('checkBoxShopAsso_blocklink');
Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'blocklink_shop WHERE id_blocklink='.(int)$id_link);
Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'blocklink_shop WHERE id_blocklink='.(int)$id_link);
foreach ($assos_shop as $asso)
foreach ($asso as $id_shop => $row)
Db::getInstance()->insert('blocklink_shop', array(

4
modules/blockmyaccountfooter/blockmyaccountfooter.php
View File

@@ -77,12 +77,12 @@ class Blockmyaccountfooter extends Module
private function addMyAccountBlockHook()
{
return Db::getInstance()->Execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)');
return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)');
}
private function removeMyAccountBlockHook()
{
return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlockfooter\'');
return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlockfooter\'');
}
public function hookHeader($params)

20
modules/blockstore/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blockstore</name>
<displayName><![CDATA[Stores block]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Displays a block with a link to the store locator.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<module>
<name>blockstore</name>
<displayName><![CDATA[Stores block]]></displayName>
<version><![CDATA[1]]></version>
<description><![CDATA[Displays a block with a link to the store locator.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>
</module>

20
modules/blocktopmenu/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName>
<version><![CDATA[1.4]]></version>
<description><![CDATA[Add a new menu on top of your shop.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<module>
<name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName>
<version><![CDATA[1.4]]></version>
<description><![CDATA[Add a new menu on top of your shop.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
</module>

6
modules/gsitemap/gsitemap.php
View File

@@ -216,7 +216,7 @@ XML;
/* Categories Generator */
if (Configuration::get('PS_REWRITING_SETTINGS'))
$categories = Db::getInstance()->ExecuteS('
$categories = Db::getInstance()->executeS('
SELECT c.id_category, c.level_depth, link_rewrite, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd, cl.id_lang
FROM '._DB_PREFIX_.'category c
LEFT JOIN '._DB_PREFIX_.'category_lang cl ON c.id_category = cl.id_category
@@ -224,7 +224,7 @@ XML;
WHERE l.`active` = 1 AND c.`active` = 1 AND c.id_category != 1
ORDER BY cl.id_category, cl.id_lang ASC');
else
$categories = Db::getInstance()->ExecuteS(
$categories = Db::getInstance()->executeS(
'SELECT c.id_category, c.level_depth, DATE_FORMAT(IF(date_upd,date_upd,date_add), \'%Y-%m-%d\') AS date_upd
FROM '._DB_PREFIX_.'category c
ORDER BY c.id_category ASC');
@@ -259,7 +259,7 @@ XML;
WHERE l.`active` = 1
ORDER BY cl.id_cms, cl.id_lang ASC';
$cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql_cms);
$cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql_cms);
foreach($cmss as $cms)
{
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ?

20
modules/homeslider/config.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>homeslider</name>
<displayName><![CDATA[Image slider for your homepage]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds an image slider to your homepage.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<module>
<name>homeslider</name>
<displayName><![CDATA[Image slider for your homepage]]></displayName>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds an image slider to your homepage.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>0</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>
</module>

14
modules/importerosc/importerosc.php
View File

@@ -120,7 +120,7 @@ class importerosc extends ImportModule
{
$identifier = 'id_lang';
$langagues = $this->ExecuteS('
$langagues = $this->executeS('
SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active, (\'m/j/Y\') as date_format_lite, (\'m/j/Y H:i:s\') as date_format_full
FROM `'.bqSQL($this->prefix).'languages`
LIMIT '.(int)$limit.' , '.(int)$nrb_import);
@@ -283,7 +283,7 @@ class importerosc extends ImportModule
ORDER BY p.`products_id`
LIMIT '.(int)($limit).' , '.(int)$nrb_import);
$this->Execute('CREATE TABLE IF NOT EXISTS`products_images` (
$this->execute('CREATE TABLE IF NOT EXISTS`products_images` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`products_id` int(11) NOT NULL,
`image` varchar(64) DEFAULT NULL,
@@ -302,7 +302,7 @@ class importerosc extends ImportModule
$product['link_rewrite'] = Tools::link_rewrite($product['name']);
$result = $this->ExecuteS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'products_to_categories` WHERE products_id = '.(int)$product['id_product']);
$result = $this->executeS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'products_to_categories` WHERE products_id = '.(int)$product['id_product']);
$category_product = array('category_product' => array($product['id_category_default'] => $product['id_product']));
foreach($result as $res)
$category_product['category_product'][$res['categories_id']] = $product['id_product'];
@@ -498,7 +498,7 @@ class importerosc extends ImportModule
public function checkCategoriesLevel()
{
$columns = $this->ExecuteS('SHOW COLUMNS FROM `'.bqSQL($this->prefix).'categories` ');
$columns = $this->executeS('SHOW COLUMNS FROM `'.bqSQL($this->prefix).'categories` ');
foreach($columns as $field)
if ($field['Field'] == 'level')
return true;
@@ -591,7 +591,7 @@ class importerosc extends ImportModule
public function createLevel()
{
return $this->Execute('ALTER TABLE `'.bqSQL($this->prefix).'categories` ADD `level` INT NOT NULL');
return $this->execute('ALTER TABLE `'.bqSQL($this->prefix).'categories` ADD `level` INT NOT NULL');
}
public function calculateLevel()
@@ -602,7 +602,7 @@ class importerosc extends ImportModule
public function updateLevel($ids_cat, $level = 1)
{
$this->Execute('
$this->execute('
UPDATE `'.bqSQL($this->prefix).'categories`
SET level = '.(int)$level.'
WHERE categories_id IN ('.implode(',', $ids_cat).')');
@@ -614,7 +614,7 @@ class importerosc extends ImportModule
public function getSubCat($id_parent)
{
$result = $this->ExecuteS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'categories` WHERE `parent_id`='.(int)$id_parent);
$result = $this->executeS('SELECT `categories_id` FROM `'.bqSQL($this->prefix).'categories` WHERE `parent_id`='.(int)$id_parent);
if (!is_array($result) OR empty($result))
return false;
return $this->formatCategoriesIds($result);

2
modules/mailalerts/MailAlert.php
View File

@@ -251,7 +251,7 @@ class MailAlert extends ObjectModel
FROM `'._DB_PREFIX_.self::$definition['table'].'`
WHERE `id_product` = '.(int)$id_product.' AND `id_product_attribute` = '.(int)$id_product_attribute;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
}
}

20
modules/mailalerts/config.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>mailalerts</name>
<displayName><![CDATA[Mail alerts]]></displayName>
<version><![CDATA[2.4]]></version>
<description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<module>
<name>mailalerts</name>
<displayName><![CDATA[Mail alerts]]></displayName>
<version><![CDATA[2.4]]></version>
<description><![CDATA[Sends e-mail notifications to customers and merchants.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[administration]]></tab>
<confirmUninstall>Are you sure you want to delete all customer notifications?</confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<is_configurable>0</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>
</module>

4
modules/mailalerts/mailalerts.php
View File

@@ -496,7 +496,7 @@ class MailAlerts extends Module
DELETE FROM `'._DB_PREFIX_.MailAlert::$definition['table'].'`
WHERE `id_product` = '.(int)$params['product']->id;
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
}
public function hookActionAttributeDelete($params)
@@ -511,7 +511,7 @@ class MailAlerts extends Module
WHERE `id_product_attribute` = '.(int)$params['id_product_attribute'].'
AND `id_product` = '.(int)$params['id_product'];
Db::getInstance()->Execute($sql);
Db::getInstance()->execute($sql);
}
public function hookActionProductCoverage($params)

6
modules/shopimporter/shopimporter.php
View File

@@ -1237,9 +1237,9 @@ class shopimporter extends ImportModule
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'country_lang');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'country');
case 'group' :
Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group');
Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'group_lang');
Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'group');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'group_lang');
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'group');
break;
case 'combination' :
Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute');