diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 08622f043..ee0a17dcd 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -106,7 +106,7 @@ if (Tools::isSubmit('ajaxProductAccessories')) AdminTab::$currentIndex = 'index.php?tab=AdminCatalog'; $jsonArray = array(); - $products = Db::getInstance()->ExecuteS(' + $products = Db::getInstance()->executeS(' SELECT p.`id_product`, pl.`name` FROM `'._DB_PREFIX_.'product` p NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl @@ -133,7 +133,7 @@ if (Tools::isSubmit('ajaxDiscountCustomers')) if (Validate::isBool_Id($filter)) $filterArray = explode('_', $filter); - $customers = Db::getInstance()->ExecuteS(' + $customers = Db::getInstance()->executeS(' SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name FROM `'._DB_PREFIX_.'customer` WHERE `deleted` = 0 AND is_guest = 0 @@ -145,7 +145,7 @@ if (Tools::isSubmit('ajaxDiscountCustomers')) ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC LIMIT 50'); - $groups = Db::getInstance()->ExecuteS(' + $groups = Db::getInstance()->executeS(' SELECT g.`id_group`, gl.`name` FROM `'._DB_PREFIX_.'group` g LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($context->language->id).') @@ -371,7 +371,7 @@ if (Tools::isSubmit('ajaxProductImagesPositions')) if (Tools::isSubmit('ajaxProductPackItems')) { $jsonArray = array(); - $products = Db::getInstance()->ExecuteS(' + $products = Db::getInstance()->executeS(' SELECT p.`id_product`, pl.`name` FROM `'._DB_PREFIX_.'product` p NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl @@ -387,7 +387,7 @@ if (Tools::isSubmit('ajaxProductPackItems')) if (Tools::isSubmit('ajaxStates') AND Tools::isSubmit('id_country')) { - $states = Db::getInstance()->ExecuteS(' + $states = Db::getInstance()->executeS(' SELECT s.id_state, s.name FROM '._DB_PREFIX_.'state s LEFT JOIN '._DB_PREFIX_.'country c ON (s.`id_country` = c.`id_country`) @@ -417,7 +417,7 @@ if (Tools::isSubmit('submitCustomerNote') AND $id_customer = (int)Tools::getValu $note = html_entity_decode(Tools::getValue('note')); if (!empty($note) AND !Validate::isCleanHtml($note)) die ('error:validation'); - if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'customer SET `note` = "'.pSQL($note, true).'" WHERE id_customer = '.(int)$id_customer.' LIMIT 1')) + if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer SET `note` = "'.pSQL($note, true).'" WHERE id_customer = '.(int)$id_customer.' LIMIT 1')) die ('error:update'); die('ok'); } @@ -509,7 +509,7 @@ if (Tools::isSubmit('submitTrackClickOnHelp')) if (Tools::isSubmit('saveImportMatchs')) { $match = implode('|', Tools::getValue('type_value')); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'import_match` ( + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'import_match` ( `id_import_match` , `name` , `match`, @@ -527,12 +527,12 @@ if (Tools::isSubmit('saveImportMatchs')) if (Tools::isSubmit('deleteImportMatchs')) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); } if (Tools::isSubmit('loadImportMatchs')) { - $return = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); + $return = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs')); die('{"id" : "'.$return[0]['id_import_match'].'", "matchs" : "'.$return[0]['match'].'", "skip" : "'.$return[0]['skip'].'"}'); } @@ -595,7 +595,7 @@ if (Tools::isSubmit('getHookableModuleList')) include('../init.php'); $hook_name = Tools::getValue('hook'); $hookableModulesList = array(); - $modules = Db::getInstance()->ExecuteS('SELECT id_module, name FROM `'._DB_PREFIX_.'module` '); + $modules = Db::getInstance()->executeS('SELECT id_module, name FROM `'._DB_PREFIX_.'module` '); foreach ($modules as $module) { if (file_exists(_PS_MODULE_DIR_.$module['name'].'/'.$module['name'].'.php')) @@ -625,7 +625,7 @@ if (Tools::isSubmit('saveHook')) $sql = 'DELETE FROM '._DB_PREFIX_.'hook_module WHERE id_hook = (SELECT id_hook FROM '._DB_PREFIX_.'hook WHERE `name` = \''.pSQL($hook).'\' LIMIT 1) AND id_shop = '.$id_shop; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $hookedModules = explode(',', Tools::getValue($hook)); $i = 1; $value = ''; @@ -636,7 +636,7 @@ if (Tools::isSubmit('saveHook')) $i++; } $value = rtrim($value, ','); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'hook_module (id_module, id_shop, id_hook, position) VALUES '.$value); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'hook_module (id_module, id_shop, id_hook, position) VALUES '.$value); } } diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php index ae1587903..89a23d5ec 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -59,7 +59,7 @@ $sql = 'SELECT p.`id_product`, `reference`, pl.name WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'. (!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' '). ($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : ''); -$items = Db::getInstance()->ExecuteS($sql); +$items = Db::getInstance()->executeS($sql); if ($items) foreach ($items AS $item) diff --git a/admin-dev/functions.php b/admin-dev/functions.php index e36835a22..0cc909d21 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -149,7 +149,7 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT GROUP BY c.id_category ORDER BY c.level_depth ASC LIMIT '.(!$home ? (int)($category['level_depth'] + 1) : 1); - $categories = Db::getInstance()->ExecuteS($sql); + $categories = Db::getInstance()->executeS($sql); $fullPath = ''; $n = 1; $nCategories = (int)sizeof($categories); diff --git a/admin-dev/requestSql.php b/admin-dev/requestSql.php index e986851b6..8c7b06722 100644 --- a/admin-dev/requestSql.php +++ b/admin-dev/requestSql.php @@ -38,7 +38,7 @@ if ($id = Tools::getValue('id_request_sql')) if ($sql) { - $results = Db::getInstance()->ExecuteS($sql[0]['sql']); + $results = Db::getInstance()->executeS($sql[0]['sql']); foreach (array_keys($results[0]) as $key) { $tab_key[] = $key; diff --git a/admin-dev/tabs/AdminAccess.php b/admin-dev/tabs/AdminAccess.php index 851a1655c..4a2975c0e 100644 --- a/admin-dev/tabs/AdminAccess.php +++ b/admin-dev/tabs/AdminAccess.php @@ -44,15 +44,15 @@ class AdminAccess extends AdminTab $res = true; if ($id_tab == -1 AND $perm == 'all' AND $enabled == 0) - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile).' AND `id_tab` != 31'); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile).' AND `id_tab` != 31'); else if ($id_tab == -1 AND $perm == 'all') - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile)); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile)); else if ($id_tab == -1) - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'access` SET `'.pSQL($perm).'` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile)); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'access` SET `'.pSQL($perm).'` = '.$enabled.' WHERE `id_profile` = '.(int)($id_profile)); else if ($perm == 'all') - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_tab` = '.(int)($id_tab).' AND `id_profile` = '.(int)($id_profile)); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'access` SET `view` = '.$enabled.', `add` = '.$enabled.', `edit` = '.$enabled.', `delete` = '.$enabled.' WHERE `id_tab` = '.(int)($id_tab).' AND `id_profile` = '.(int)($id_profile)); else - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'access` SET `'.pSQL($perm).'` = '.$enabled.' WHERE `id_tab` = '.(int)($id_tab).' AND `id_profile` = '.(int)($id_profile)); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'access` SET `'.pSQL($perm).'` = '.$enabled.' WHERE `id_tab` = '.(int)($id_tab).' AND `id_profile` = '.(int)($id_profile)); $this->return_status = $res?'ok':'error'; if ($res) @@ -73,9 +73,9 @@ class AdminAccess extends AdminTab throw new PrestashopException('permission not exists'); if ($id_module == -1) - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'module_access` SET `'.pSQL($perm).'` = '.(int)$enabled.' WHERE `id_profile` = '.(int)$id_profile); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'module_access` SET `'.pSQL($perm).'` = '.(int)$enabled.' WHERE `id_profile` = '.(int)$id_profile); else - $res &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'module_access` SET `'.pSQL($perm).'` = '.(int)$enabled.' WHERE `id_module` = '.(int)$id_module.' AND `id_profile` = '.(int)$id_profile); + $res &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'module_access` SET `'.pSQL($perm).'` = '.(int)$enabled.' WHERE `id_module` = '.(int)$id_module.' AND `id_profile` = '.(int)$id_profile); $this->return_status = $res?'ok':'error'; if ($res) @@ -324,7 +324,7 @@ class AdminAccess extends AdminTab tabAccess['edit'] == 1 ? 'class="changeModuleAccess" rel="-1||configure"' : 'disabled="disabled"').' /> '.$this->l('Configure').' '; - $modules = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $modules = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT ma.id_module, m.name, ma.`view`, ma.`configure` FROM '._DB_PREFIX_.'module_access ma LEFT JOIN '._DB_PREFIX_.'module m ON ma.id_module = m.id_module diff --git a/admin-dev/tabs/AdminAttributeGenerator.php b/admin-dev/tabs/AdminAttributeGenerator.php index 2ebd91044..58d448f4b 100644 --- a/admin-dev/tabs/AdminAttributeGenerator.php +++ b/admin-dev/tabs/AdminAttributeGenerator.php @@ -148,7 +148,7 @@ class AdminAttributeGenerator extends AdminTab foreach ($tab AS $group) foreach ($group AS $attribute) $attributes[] = '('.(int)($id_product).', '.(int)($attribute).', '.(float)($_POST['price_impact_'.(int)($attribute)]).', '.(float)($_POST['weight_impact'][(int)($attribute)]).')'; - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'INSERT INTO `'._DB_PREFIX_.'attribute_impact` (`id_product`, `id_attribute`, `price`, `weight`) VALUES '.implode(',', $attributes).' ON DUPLICATE KEY UPDATE `price`=VALUES(price), `weight`=VALUES(weight)' @@ -158,7 +158,7 @@ class AdminAttributeGenerator extends AdminTab private static function getAttributesImpacts($id_product) { $tab = array(); - $result = Db::getInstance()->ExecuteS( + $result = Db::getInstance()->executeS( 'SELECT ai.`id_attribute`, ai.`price`, ai.`weight` FROM `'._DB_PREFIX_.'attribute_impact` ai WHERE ai.`id_product` = '.(int)($id_product)); diff --git a/admin-dev/tabs/AdminCarriers.php b/admin-dev/tabs/AdminCarriers.php index c1ebf4ee3..673c92905 100644 --- a/admin-dev/tabs/AdminCarriers.php +++ b/admin-dev/tabs/AdminCarriers.php @@ -275,11 +275,11 @@ class AdminCarriers extends AdminTab private function changeGroups($id_carrier, $delete = true) { if ($delete) - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id_carrier); - $groups = Db::getInstance()->ExecuteS('SELECT id_group FROM `'._DB_PREFIX_.'group`'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id_carrier); + $groups = Db::getInstance()->executeS('SELECT id_group FROM `'._DB_PREFIX_.'group`'); foreach ($groups as $group) if (Tools::getIsset('groupBox') && in_array($group['id_group'], Tools::getValue('groupBox'))) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'carrier_group (id_group, id_carrier) VALUES('.(int)$group['id_group'].','.(int)$id_carrier.')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'carrier_group (id_group, id_carrier) VALUES('.(int)$group['id_group'].','.(int)$id_carrier.')'); } public function postProcess() @@ -300,7 +300,7 @@ class AdminCarriers extends AdminTab $object = new $this->className($id); if (Validate::isLoadedObject($object)) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_group WHERE id_carrier = '.(int)$id); $object->deleted = 1; $object->update(); $objectNew = new $this->className(); diff --git a/admin-dev/tabs/AdminCustomerThreads.php b/admin-dev/tabs/AdminCustomerThreads.php index 7b2646206..799b138f2 100644 --- a/admin-dev/tabs/AdminCustomerThreads.php +++ b/admin-dev/tabs/AdminCustomerThreads.php @@ -111,16 +111,16 @@ class AdminCustomerThreads extends AdminTab if ($id_customer_thread = (int)Tools::getValue('id_customer_thread')) { if (($id_contact = (int)Tools::getValue('id_contact'))) - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'customer_thread SET id_contact = '.(int)$id_contact.' WHERE id_customer_thread = '.(int)$id_customer_thread); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer_thread SET id_contact = '.(int)$id_contact.' WHERE id_customer_thread = '.(int)$id_customer_thread); if ($id_status = (int)Tools::getValue('setstatus')) { $statusArray = array(1 => 'open', 2 => 'closed', 3 => 'pending1', 4 => 'pending2'); - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'customer_thread SET status = "'.$statusArray[$id_status].'" WHERE id_customer_thread = '.(int)$id_customer_thread.' LIMIT 1'); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer_thread SET status = "'.$statusArray[$id_status].'" WHERE id_customer_thread = '.(int)$id_customer_thread.' LIMIT 1'); } if (isset($_POST['id_employee_forward'])) { // Todo: need to avoid doubles - $messages = Db::getInstance()->ExecuteS(' + $messages = Db::getInstance()->executeS(' SELECT ct.*, cm.*, cl.name subject, CONCAT(e.firstname, \' \', e.lastname) employee_name, CONCAT(c.firstname, \' \', c.lastname) customer_name, c.firstname FROM '._DB_PREFIX_.'customer_thread ct LEFT JOIN '._DB_PREFIX_.'customer_message cm ON (ct.id_customer_thread = cm.id_customer_thread) @@ -233,7 +233,7 @@ class AdminCustomerThreads extends AdminTab public function displayListHeader($token = NULL) { - $contacts = Db::getInstance()->ExecuteS(' + $contacts = Db::getInstance()->executeS(' SELECT cl.*, COUNT(*) as total, ( SELECT id_customer_thread FROM '._DB_PREFIX_.'customer_thread ct2 @@ -245,7 +245,7 @@ class AdminCustomerThreads extends AdminTab LEFT JOIN '._DB_PREFIX_.'contact_lang cl ON (cl.id_contact = ct.id_contact AND cl.id_lang = '.(int)$this->context->language->id.') WHERE ct.status = "open" GROUP BY ct.id_contact HAVING COUNT(*) > 0'); - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT cl.* FROM '._DB_PREFIX_.'contact ct LEFT JOIN '._DB_PREFIX_.'contact_lang cl ON (cl.id_contact = ct.id_contact AND cl.id_lang = '.(int)$this->context->language->id.') @@ -430,7 +430,7 @@ class AdminCustomerThreads extends AdminTab return; $this->context->cookie->{'customer_threadFilter_cl!id_contact'} = $thread->id_contact; - $employees = Db::getInstance()->ExecuteS(' + $employees = Db::getInstance()->executeS(' SELECT e.id_employee, e.firstname, e.lastname FROM '._DB_PREFIX_.'employee e WHERE e.active = 1 ORDER BY e.lastname ASC'); @@ -465,7 +465,7 @@ class AdminCustomerThreads extends AdminTab
 
'; - $messages = Db::getInstance()->ExecuteS(' + $messages = Db::getInstance()->executeS(' SELECT ct.*, cm.*, cl.name subject, CONCAT(e.firstname, \' \', e.lastname) employee_name, CONCAT(c.firstname, \' \', c.lastname) customer_name, c.firstname FROM '._DB_PREFIX_.'customer_thread ct LEFT JOIN '._DB_PREFIX_.'customer_message cm ON (ct.id_customer_thread = cm.id_customer_thread) diff --git a/admin-dev/tabs/AdminCustomers.php b/admin-dev/tabs/AdminCustomers.php index ffe2183f2..92f7c10d6 100644 --- a/admin-dev/tabs/AdminCustomers.php +++ b/admin-dev/tabs/AdminCustomers.php @@ -262,7 +262,7 @@ class AdminCustomers extends AdminTab $customer = new Customer($id_customer); if (!Validate::isLoadedObject($customer)) $this->_errors[] = Tools::displayError('An error occurred while updating customer.'); - $update = Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customer` SET newsletter = '.($customer->newsletter ? 0 : 1).' WHERE `id_customer` = '.(int)($customer->id)); + $update = Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customer` SET newsletter = '.($customer->newsletter ? 0 : 1).' WHERE `id_customer` = '.(int)($customer->id)); if (!$update) $this->_errors[] = Tools::displayError('An error occurred while updating customer.'); Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token); @@ -273,7 +273,7 @@ class AdminCustomers extends AdminTab $customer = new Customer($id_customer); if (!Validate::isLoadedObject($customer)) $this->_errors[] = Tools::displayError('An error occurred while updating customer.'); - $update = Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customer` SET optin = '.($customer->optin ? 0 : 1).' WHERE `id_customer` = '.(int)($customer->id)); + $update = Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customer` SET optin = '.($customer->optin ? 0 : 1).' WHERE `id_customer` = '.(int)($customer->id)); if (!$update) $this->_errors[] = Tools::displayError('An error occurred while updating customer.'); Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token); @@ -638,7 +638,7 @@ class AdminCustomers extends AdminTab JOIN '._DB_PREFIX_.'order_detail od ON (o.id_order = od.id_order) WHERE o.valid = 1 AND o.id_customer = '.(int)$customer->id.' )'; - $interested = Db::getInstance()->ExecuteS($sql); + $interested = Db::getInstance()->executeS($sql); if (count($interested)) { echo '
diff --git a/admin-dev/tabs/AdminDb.php b/admin-dev/tabs/AdminDb.php index 239f7e1b9..5517e9a58 100644 --- a/admin-dev/tabs/AdminDb.php +++ b/admin-dev/tabs/AdminDb.php @@ -114,7 +114,7 @@ class AdminDb extends AdminPreferences if ($engineType == $tables_engine[$table]) $this->_errors[] = $table.' '.$this->l('is already in').' '.$engineType; else - if (!Db::getInstance()->Execute('ALTER TABLE `'.bqSQL($table).'` ENGINE=`'.bqSQL($engineType).'`')) + if (!Db::getInstance()->execute('ALTER TABLE `'.bqSQL($table).'` ENGINE=`'.bqSQL($engineType).'`')) $this->_errors[] = $this->l('Can\'t change engine for').' '.$table; else echo '
'.$this->l('Confirmation').''.$this->l('Engine change of').' '.$table.' '.$this->l('to').' '.$engineType.'
'; @@ -155,7 +155,7 @@ class AdminDb extends AdminPreferences private function _getEngines() { - $engines = Db::getInstance()->ExecuteS('SHOW ENGINES'); + $engines = Db::getInstance()->executeS('SHOW ENGINES'); $allowed_engines = array(); foreach ($engines AS $engine) { @@ -167,7 +167,7 @@ class AdminDb extends AdminPreferences private function _getTablesStatus() { - return Db::getInstance()->ExecuteS('SHOW TABLE STATUS'); + return Db::getInstance()->executeS('SHOW TABLE STATUS'); } } diff --git a/admin-dev/tabs/AdminImages.php b/admin-dev/tabs/AdminImages.php index 79ca7a8f0..de4db8cfb 100644 --- a/admin-dev/tabs/AdminImages.php +++ b/admin-dev/tabs/AdminImages.php @@ -355,7 +355,7 @@ class AdminImages extends AdminTab // Hook watermark optimization private function _regenerateWatermark($dir) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT m.`name` FROM `'._DB_PREFIX_.'module` m LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` diff --git a/admin-dev/tabs/AdminImport.php b/admin-dev/tabs/AdminImport.php index 20a2eb636..ec5ae0352 100644 --- a/admin-dev/tabs/AdminImport.php +++ b/admin-dev/tabs/AdminImport.php @@ -1038,7 +1038,7 @@ class AdminImport extends AdminTab } } - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'product_attribute_combination (id_attribute, id_product_attribute) VALUES ('.(int)($attributes[$group.'_'.$attribute]).','.(int)$id_product_attribute.')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'product_attribute_combination (id_attribute, id_product_attribute) VALUES ('.(int)($attributes[$group.'_'.$attribute]).','.(int)$id_product_attribute.')'); } $this->closeCsvFile($handle); @@ -1615,7 +1615,7 @@ class AdminImport extends AdminTab public function displayCSV() { - $importMatchs = Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'import_match'); + $importMatchs = Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'import_match'); echo ' @@ -1714,51 +1714,51 @@ class AdminImport extends AdminTab switch ((int)($case)) { case $this->entities[$this->l('Categories')]: - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1'); - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2'); foreach (scandir(_PS_CAT_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_CAT_IMG_DIR_.$d); break; case $this->entities[$this->l('Products')]: - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'image'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority'); Image::deleteAllImages(_PS_PROD_IMG_DIR_); break; case $this->entities[$this->l('Customers')]: - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer'); break; case $this->entities[$this->l('Addresses')]: - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'address'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address'); break; case $this->entities[$this->l('Combinations')]: - 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`'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`'); + 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`'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang`'); break; case $this->entities[$this->l('Manufacturers')]: - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang'); foreach (scandir(_PS_MANU_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_MANU_IMG_DIR_.$d); break; case $this->entities[$this->l('Suppliers')]: - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang'); foreach (scandir(_PS_SUPP_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_SUPP_IMG_DIR_.$d); diff --git a/admin-dev/tabs/AdminInvoices.php b/admin-dev/tabs/AdminInvoices.php index 8a0b123c1..30f7be73e 100644 --- a/admin-dev/tabs/AdminInvoices.php +++ b/admin-dev/tabs/AdminInvoices.php @@ -48,7 +48,7 @@ class AdminInvoices extends AdminTab public function displayForm($isMainTab = true) { $statuses = OrderState::getOrderStates($this->context->language->id); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT COUNT(*) as nbOrders, ( SELECT oh.id_order_state FROM '._DB_PREFIX_.'order_history oh diff --git a/admin-dev/tabs/AdminMessages.php b/admin-dev/tabs/AdminMessages.php index 58152bd34..208d93afa 100644 --- a/admin-dev/tabs/AdminMessages.php +++ b/admin-dev/tabs/AdminMessages.php @@ -71,7 +71,7 @@ class AdminMessages extends AdminTab is_numeric($_POST['submitFilter'.$this->table])) $start = (int)($_POST['submitFilter'.$this->table] - 1) * $limit; - $this->_list = Db::getInstance()->ExecuteS(' + $this->_list = Db::getInstance()->executeS(' SELECT SQL_CALC_FOUND_ROWS m.id_message, m.id_cart, m.id_employee, IF(m.id_order > 0, m.id_order, \'--\') id_order, m.message, m.private, m.date_add, CONCAT(LEFT(c.`firstname`, 1), \'. \', c.`lastname`) AS customer, c.id_customer, count(m.id_message) nb_messages, (SELECT message FROM '._DB_PREFIX_.'message WHERE id_order = m.id_order ORDER BY date_add DESC LIMIT 1) last_message, (SELECT COUNT(m2.id_message) FROM '._DB_PREFIX_.'message m2 WHERE 1 AND m2.id_customer != 0 AND m2.id_order = m.id_order AND m2.id_message NOT IN diff --git a/admin-dev/tabs/AdminPayment.php b/admin-dev/tabs/AdminPayment.php index e6a054ef7..a0433371e 100644 --- a/admin-dev/tabs/AdminPayment.php +++ b/admin-dev/tabs/AdminPayment.php @@ -43,19 +43,19 @@ class AdminPayment extends AdminTab { if(!get_class($module) == 'SimpleXMLElement') $module->country = array(); - $countries = DB::getInstance()->ExecuteS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); + $countries = DB::getInstance()->executeS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); foreach ($countries as $country) $module->country[] = $country['id_country']; if(!get_class($module) == 'SimpleXMLElement') $module->currency = array(); - $currencies = DB::getInstance()->ExecuteS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); + $currencies = DB::getInstance()->executeS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); foreach ($currencies as $currency) $module->currency[] = $currency['id_currency']; if(!get_class($module) == 'SimpleXMLElement') $module->group = array(); - $groups = DB::getInstance()->ExecuteS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); + $groups = DB::getInstance()->executeS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)$module->id.' AND `id_shop`='.$shopID); foreach ($groups as $group) $module->group[] = $group['id_group']; } @@ -84,13 +84,13 @@ class AdminPayment extends AdminTab private function saveRestrictions($type) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'module_'.$type.' WHERE id_shop = '.Context::getContext()->shop->getID(true)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'module_'.$type.' WHERE id_shop = '.Context::getContext()->shop->getID(true)); foreach ($this->paymentModules as $module) if ($module->active AND isset($_POST[$module->name.'_'.$type.''])) foreach ($_POST[$module->name.'_'.$type.''] as $selected) $values[] = '('.(int)$module->id.', '.Context::getContext()->shop->getID(true).', '.(int)$selected.')'; if (sizeof($values)) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'module_'.$type.' (`id_module`, `id_shop`, `id_'.$type.'`) VALUES '.implode(',', $values)); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_'.$type.' (`id_module`, `id_shop`, `id_'.$type.'`) VALUES '.implode(',', $values)); Tools::redirectAdmin(self::$currentIndex.'&conf=4'.'&token='.$this->token); } diff --git a/admin-dev/tabs/AdminPreferences.php b/admin-dev/tabs/AdminPreferences.php index 3a2ea83a2..dca3c3db5 100644 --- a/admin-dev/tabs/AdminPreferences.php +++ b/admin-dev/tabs/AdminPreferences.php @@ -36,7 +36,7 @@ class AdminPreferences extends AdminTab // Prevent classes which extend AdminPreferences to load useless data if (get_class($this) == 'AdminPreferences') { - $timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT name FROM '._DB_PREFIX_.'timezone'); + $timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'); $taxes[] = array('id' => 0, 'name' => $this->l('None')); foreach (Tax::getTaxes($this->context->language->id) as $tax) $taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']); diff --git a/admin-dev/tabs/AdminProducts.php b/admin-dev/tabs/AdminProducts.php index b99219909..bdd8ec986 100644 --- a/admin-dev/tabs/AdminProducts.php +++ b/admin-dev/tabs/AdminProducts.php @@ -903,9 +903,9 @@ class AdminProducts extends AdminTab { if ($id_image = (int)Tools::getValue('id_image') && $id_shop = (int)Tools::getValue('id_shop')) if (Tools::getValue('active') == "true") - die(Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'image_shop (`id_image`, `id_shop`) VALUES('.(int)$id_image.', '.(int)$id_shop.')')); + die(Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'image_shop (`id_image`, `id_shop`) VALUES('.(int)$id_image.', '.(int)$id_shop.')')); else - die(Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'image_shop WHERE `id_image`='.(int)$id_image.' && `id_shop`='.(int)$id_shop)); + die(Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'image_shop WHERE `id_image`='.(int)$id_image.' && `id_shop`='.(int)$id_shop)); } if (Tools::getValue('deleteImage')) @@ -917,7 +917,7 @@ class AdminProducts extends AdminTab $first_img = Db::getInstance()->getRow(' SELECT `id_image` FROM `'._DB_PREFIX_.'image` WHERE `id_product` = '.(int)($image->id_product)); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `cover` = 1 WHERE `id_image` = '.(int)($first_img['id_image'])); @@ -1454,7 +1454,7 @@ class AdminProducts extends AdminTab { $tagError = true; /* Reset all tags for THIS product */ - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)($product->id))) return false; diff --git a/admin-dev/tabs/AdminReferrers.php b/admin-dev/tabs/AdminReferrers.php index e87e9274f..ac7709d08 100644 --- a/admin-dev/tabs/AdminReferrers.php +++ b/admin-dev/tabs/AdminReferrers.php @@ -36,7 +36,7 @@ if (Tools::getValue('token') == Tools::getAdminToken('AdminReferrers'.(int)(Tab: else if (Tools::isSubmit('ajaxFillProducts')) { $jsonArray = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT p.id_product, pl.name FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)(Tools::getValue('id_lang')).') diff --git a/admin-dev/tabs/AdminRequestSql.php b/admin-dev/tabs/AdminRequestSql.php index f5c664239..36af6ecba 100644 --- a/admin-dev/tabs/AdminRequestSql.php +++ b/admin-dev/tabs/AdminRequestSql.php @@ -104,7 +104,7 @@ class AdminRequestSql extends AdminTab if (!($obj = $this->loadObject(true))) return; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_request_sql` FROM `'._DB_PREFIX_.'request_sql` '); @@ -215,7 +215,7 @@ class AdminRequestSql extends AdminTab return; echo '

'.$obj->name.'

'; - if ($results = Db::getInstance()->ExecuteS($obj->sql)) + if ($results = Db::getInstance()->executeS($obj->sql)) { $tab_key = array(); foreach (array_keys($results[0]) as $key) diff --git a/admin-dev/tabs/AdminSearch.php b/admin-dev/tabs/AdminSearch.php index 91792921f..9ab30d08e 100644 --- a/admin-dev/tabs/AdminSearch.php +++ b/admin-dev/tabs/AdminSearch.php @@ -33,7 +33,7 @@ class AdminSearch extends AdminTab if (!ip2long(trim($query))) return; - $this->_list['customers'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $this->_list['customers'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT c.* FROM `'._DB_PREFIX_.'customer` c LEFT JOIN `'._DB_PREFIX_.'guest` g ON g.id_customer = c.id_customer @@ -84,7 +84,7 @@ class AdminSearch extends AdminTab { global $_LANGADM; $tabs = array(); - $result = Db::getInstance()->ExecuteS('SELECT class_name, name FROM '._DB_PREFIX_.'tab t INNER JOIN '._DB_PREFIX_.'tab_lang tl ON t.id_tab = tl.id_tab AND tl.id_lang = '.(int)$this->context->language->id); + $result = Db::getInstance()->executeS('SELECT class_name, name FROM '._DB_PREFIX_.'tab t INNER JOIN '._DB_PREFIX_.'tab_lang tl ON t.id_tab = tl.id_tab AND tl.id_lang = '.(int)$this->context->language->id); foreach ($result as $row) $tabs[$row['class_name']] = $row['name']; foreach (AdminTab::$tabParenting as $key => $value) diff --git a/admin-dev/tabs/AdminStatsTab.php b/admin-dev/tabs/AdminStatsTab.php index aaf527ae0..8d380a3a3 100644 --- a/admin-dev/tabs/AdminStatsTab.php +++ b/admin-dev/tabs/AdminStatsTab.php @@ -187,7 +187,7 @@ abstract class AdminStatsTab extends AdminPreferences AND m.`active` = 1 GROUP BY hm.id_module ORDER BY hm.`position`'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public function displayMenu() diff --git a/admin-dev/tabs/AdminSubDomains.php b/admin-dev/tabs/AdminSubDomains.php index 2bbef040a..193e808a0 100644 --- a/admin-dev/tabs/AdminSubDomains.php +++ b/admin-dev/tabs/AdminSubDomains.php @@ -73,7 +73,7 @@ class AdminSubDomains extends AdminTab public function postProcess() { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_subdomain` FROM `'._DB_PREFIX_.'subdomain` '); diff --git a/cache/class_index.php b/cache/class_index.php index acf6c90ee..f69ca50f3 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -1,10 +1,10 @@ 'classes/AbstractLogger.php', 'AbstractLogger' => 'override/classes/AbstractLogger.php', - 'AddressFormatCore' => 'classes/AddressFormat.php', - 'AddressFormat' => 'override/classes/AddressFormat.php', 'AddressCore' => 'classes/Address.php', 'Address' => 'override/classes/Address.php', + 'AddressFormatCore' => 'classes/AddressFormat.php', + 'AddressFormat' => 'override/classes/AddressFormat.php', 'AdminControllerCore' => 'classes/AdminController.php', 'AdminController' => 'override/classes/AdminController.php', 'AdminTabCore' => 'classes/AdminTab.php', @@ -13,35 +13,29 @@ 'Alias' => 'override/classes/Alias.php', 'AttachmentCore' => 'classes/Attachment.php', 'Attachment' => 'override/classes/Attachment.php', - 'AttributeGroupCore' => 'classes/AttributeGroup.php', - 'AttributeGroup' => 'override/classes/AttributeGroup.php', 'AttributeCore' => 'classes/Attribute.php', 'Attribute' => 'override/classes/Attribute.php', + 'AttributeGroupCore' => 'classes/AttributeGroup.php', + 'AttributeGroup' => 'override/classes/AttributeGroup.php', 'Autoload' => 'classes/Autoload.php', 'BackupCore' => 'classes/Backup.php', 'Backup' => 'override/classes/Backup.php', 'BlowfishCore' => 'classes/Blowfish.php', 'Blowfish' => 'override/classes/Blowfish.php', - 'CacheFsCore' => 'classes/cache/CacheFs.php', - 'CacheFs' => 'override/classes/cache/CacheFs.php', - 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', - 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', - 'CacheCore' => 'classes/cache/Cache.php', - 'Cache' => 'override/classes/cache/Cache.php', - 'CarrierModuleCore' => 'classes/CarrierModule.php', - 'CarrierModule' => 'override/classes/CarrierModule.php', + 'CMSCore' => 'classes/CMS.php', + 'CMS' => 'override/classes/CMS.php', + 'CMSCategoryCore' => 'classes/CMSCategory.php', + 'CMSCategory' => 'override/classes/CMSCategory.php', 'CarrierCore' => 'classes/Carrier.php', 'Carrier' => 'override/classes/Carrier.php', + 'CarrierModuleCore' => 'classes/CarrierModule.php', + 'CarrierModule' => 'override/classes/CarrierModule.php', 'CartCore' => 'classes/Cart.php', 'Cart' => 'override/classes/Cart.php', 'CategoryCore' => 'classes/Category.php', 'Category' => 'override/classes/Category.php', 'ChartCore' => 'classes/Chart.php', 'Chart' => 'override/classes/Chart.php', - 'CMSCategoryCore' => 'classes/CMSCategory.php', - 'CMSCategory' => 'override/classes/CMSCategory.php', - 'CMSCore' => 'classes/CMS.php', - 'CMS' => 'override/classes/CMS.php', 'CombinationCore' => 'classes/Combination.php', 'Combination' => 'override/classes/Combination.php', 'CompareProductCore' => 'classes/CompareProduct.php', @@ -58,10 +52,10 @@ 'Contact' => 'override/classes/Contact.php', 'ContextCore' => 'classes/Context.php', 'Context' => 'override/classes/Context.php', - 'ControllerFactoryCore' => 'classes/ControllerFactory.php', - 'ControllerFactory' => 'override/classes/ControllerFactory.php', 'ControllerCore' => 'classes/Controller.php', 'Controller' => 'override/classes/Controller.php', + 'ControllerFactoryCore' => 'classes/ControllerFactory.php', + 'ControllerFactory' => 'override/classes/ControllerFactory.php', 'CookieCore' => 'classes/Cookie.php', 'Cookie' => 'override/classes/Cookie.php', 'CountryCore' => 'classes/Country.php', @@ -70,26 +64,16 @@ 'County' => 'override/classes/County.php', 'CurrencyCore' => 'classes/Currency.php', 'Currency' => 'override/classes/Currency.php', - 'CustomerMessageCore' => 'classes/CustomerMessage.php', - 'CustomerMessage' => 'override/classes/CustomerMessage.php', 'CustomerCore' => 'classes/Customer.php', 'Customer' => 'override/classes/Customer.php', + 'CustomerMessageCore' => 'classes/CustomerMessage.php', + 'CustomerMessage' => 'override/classes/CustomerMessage.php', 'CustomerThreadCore' => 'classes/CustomerThread.php', 'CustomerThread' => 'override/classes/CustomerThread.php', 'CustomizationCore' => 'classes/Customization.php', 'Customization' => 'override/classes/Customization.php', 'DateRangeCore' => 'classes/DateRange.php', 'DateRange' => 'override/classes/DateRange.php', - 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', - 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', - 'DbPDOCore' => 'classes/db/DbPDO.php', - 'DbPDO' => 'override/classes/db/DbPDO.php', - 'DbCore' => 'classes/db/Db.php', - 'Db' => 'override/classes/db/Db.php', - 'DbQueryCore' => 'classes/db/DbQuery.php', - 'DbQuery' => 'override/classes/db/DbQuery.php', - 'MySQLCore' => 'classes/db/MySQL.php', - 'MySQL' => 'override/classes/db/MySQL.php', 'DeliveryCore' => 'classes/Delivery.php', 'Delivery' => 'override/classes/Delivery.php', 'DiscountCore' => 'classes/Discount.php', @@ -98,14 +82,6 @@ 'Dispatcher' => 'override/classes/Dispatcher.php', 'EmployeeCore' => 'classes/Employee.php', 'Employee' => 'override/classes/Employee.php', - 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', - 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', - 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', - 'PrestashopException' => 'override/classes/exception/PrestashopException.php', - 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', - 'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php', - 'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php', - 'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php', 'FeatureCore' => 'classes/Feature.php', 'Feature' => 'override/classes/Feature.php', 'FeatureValueCore' => 'classes/FeatureValue.php', @@ -126,10 +102,10 @@ 'Guest' => 'override/classes/Guest.php', 'HelpAccessCore' => 'classes/HelpAccess.php', 'HelpAccess' => 'override/classes/HelpAccess.php', - 'HelperListCore' => 'classes/HelperList.php', - 'HelperList' => '', 'HelperCore' => 'classes/Helper.php', 'Helper' => 'override/classes/Helper.php', + 'HelperListCore' => 'classes/HelperList.php', + 'HelperList' => '', 'HookCore' => 'classes/Hook.php', 'Hook' => 'override/classes/Hook.php', 'ImageCore' => 'classes/Image.php', @@ -156,20 +132,22 @@ 'Message' => 'override/classes/Message.php', 'MetaCore' => 'classes/Meta.php', 'Meta' => 'override/classes/Meta.php', - 'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php', - 'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', - 'ModuleGraphCore' => 'classes/ModuleGraph.php', - 'ModuleGraph' => 'override/classes/ModuleGraph.php', - 'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php', - 'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', - 'ModuleGridCore' => 'classes/ModuleGrid.php', - 'ModuleGrid' => 'override/classes/ModuleGrid.php', 'ModuleCore' => 'classes/Module.php', 'Module' => 'override/classes/Module.php', + 'ModuleGraphCore' => 'classes/ModuleGraph.php', + 'ModuleGraph' => 'override/classes/ModuleGraph.php', + 'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php', + 'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', + 'ModuleGridCore' => 'classes/ModuleGrid.php', + 'ModuleGrid' => 'override/classes/ModuleGrid.php', + 'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php', + 'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', 'NotificationCore' => 'classes/Notification.php', 'Notification' => 'override/classes/Notification.php', 'ObjectModelCore' => 'classes/ObjectModel.php', 'ObjectModel' => 'override/classes/ObjectModel.php', + 'OrderCore' => 'classes/Order.php', + 'Order' => 'override/classes/Order.php', 'OrderDetailCore' => 'classes/OrderDetail.php', 'OrderDetail' => 'override/classes/OrderDetail.php', 'OrderDiscountCore' => 'classes/OrderDiscount.php', @@ -178,8 +156,6 @@ 'OrderHistory' => 'override/classes/OrderHistory.php', 'OrderMessageCore' => 'classes/OrderMessage.php', 'OrderMessage' => 'override/classes/OrderMessage.php', - 'OrderCore' => 'classes/Order.php', - 'Order' => 'override/classes/Order.php', 'OrderReturnCore' => 'classes/OrderReturn.php', 'OrderReturn' => 'override/classes/OrderReturn.php', 'OrderReturnStateCore' => 'classes/OrderReturnState.php', @@ -188,6 +164,8 @@ 'OrderSlip' => 'override/classes/OrderSlip.php', 'OrderStateCore' => 'classes/OrderState.php', 'OrderState' => 'override/classes/OrderState.php', + 'PDFCore' => 'classes/PDF.php', + 'PDF' => 'override/classes/PDF.php', 'PackCore' => 'classes/Pack.php', 'Pack' => 'override/classes/Pack.php', 'PageCore' => 'classes/Page.php', @@ -196,12 +174,10 @@ 'PaymentCC' => 'override/classes/PaymentCC.php', 'PaymentModuleCore' => 'classes/PaymentModule.php', 'PaymentModule' => 'override/classes/PaymentModule.php', - 'PDFCore' => 'classes/PDF.php', - 'PDF' => 'override/classes/PDF.php', - 'ProductDownloadCore' => 'classes/ProductDownload.php', - 'ProductDownload' => 'override/classes/ProductDownload.php', 'ProductCore' => 'classes/Product.php', 'Product' => 'override/classes/Product.php', + 'ProductDownloadCore' => 'classes/ProductDownload.php', + 'ProductDownload' => 'override/classes/ProductDownload.php', 'ProductSaleCore' => 'classes/ProductSale.php', 'ProductSale' => 'override/classes/ProductSale.php', 'ProfileCore' => 'classes/Profile.php', @@ -220,32 +196,20 @@ 'Rijndael' => 'override/classes/Rijndael.php', 'SceneCore' => 'classes/Scene.php', 'Scene' => 'override/classes/Scene.php', - 'SearchEngineCore' => 'classes/SearchEngine.php', - 'SearchEngine' => 'override/classes/SearchEngine.php', 'SearchCore' => 'classes/Search.php', 'Search' => 'override/classes/Search.php', - 'GroupShopCore' => 'classes/shop/GroupShop.php', - 'GroupShop' => 'override/classes/shop/GroupShop.php', - 'ShopCore' => 'classes/shop/Shop.php', - 'Shop' => 'override/classes/shop/Shop.php', - 'ShopUrlCore' => 'classes/shop/ShopUrl.php', - 'ShopUrl' => 'override/classes/shop/ShopUrl.php', + 'SearchEngineCore' => 'classes/SearchEngine.php', + 'SearchEngine' => 'override/classes/SearchEngine.php', 'SpecificPriceCore' => 'classes/SpecificPrice.php', 'SpecificPrice' => 'override/classes/SpecificPrice.php', 'StateCore' => 'classes/State.php', 'State' => 'override/classes/State.php', - 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', - 'StockManagerFactory' => '', - 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', - 'StockManagerModule' => 'classes/stock/StockManagerModule.php', - 'StockMvtCore' => 'classes/StockMvt.php', - 'StockMvt' => 'override/classes/StockMvt.php', - 'StockMvtReasonCore' => 'classes/StockMvtReason.php', - 'StockMvtReason' => 'override/classes/StockMvtReason.php', - 'StockCore' => 'classes/Stock.php', + 'StockCore' => 'classes/stock/Stock.php', 'Stock' => 'override/classes/Stock.php', - 'StockWarehouseCore' => 'classes/stock/StockWarehouse.php', - 'StockWarehouse' => '', + 'StockMvtCore' => 'classes/stock/StockMvt.php', + 'StockMvt' => 'override/classes/StockMvt.php', + 'StockMvtReasonCore' => 'classes/stock/StockMvtReason.php', + 'StockMvtReason' => 'override/classes/StockMvtReason.php', 'StoreCore' => 'classes/Store.php', 'Store' => 'override/classes/Store.php', 'SubDomainCore' => 'classes/SubDomain.php', @@ -256,21 +220,6 @@ 'Tab' => 'override/classes/Tab.php', 'TagCore' => 'classes/Tag.php', 'Tag' => 'override/classes/Tag.php', - 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', - 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', - 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', - 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', - 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', - 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', - 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', - 'TaxCore' => 'classes/tax/Tax.php', - 'Tax' => 'override/classes/tax/Tax.php', - 'TaxRuleCore' => 'classes/tax/TaxRule.php', - 'TaxRule' => 'override/classes/tax/TaxRule.php', - 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', - 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', - 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', - 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'ThemeCore' => 'classes/Theme.php', 'Theme' => 'override/classes/Theme.php', 'ToolsCore' => 'classes/Tools.php', @@ -281,6 +230,61 @@ 'Upgrader' => 'override/classes/Upgrader.php', 'ValidateCore' => 'classes/Validate.php', 'Validate' => 'override/classes/Validate.php', + 'ZoneCore' => 'classes/Zone.php', + 'Zone' => 'override/classes/Zone.php', + 'CacheCore' => 'classes/cache/Cache.php', + 'Cache' => 'override/classes/cache/Cache.php', + 'CacheFsCore' => 'classes/cache/CacheFs.php', + 'CacheFs' => 'override/classes/cache/CacheFs.php', + 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', + 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', + 'DbCore' => 'classes/db/Db.php', + 'Db' => 'override/classes/db/Db.php', + 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', + 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', + 'DbPDOCore' => 'classes/db/DbPDO.php', + 'DbPDO' => 'override/classes/db/DbPDO.php', + 'DbQueryCore' => 'classes/db/DbQuery.php', + 'DbQuery' => 'override/classes/db/DbQuery.php', + 'MySQLCore' => 'classes/db/MySQL.php', + 'MySQL' => 'override/classes/db/MySQL.php', + 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', + 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', + 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', + 'PrestashopException' => 'override/classes/exception/PrestashopException.php', + 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', + 'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php', + 'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php', + 'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php', + 'GroupShopCore' => 'classes/shop/GroupShop.php', + 'GroupShop' => 'override/classes/shop/GroupShop.php', + 'ShopCore' => 'classes/shop/Shop.php', + 'Shop' => 'override/classes/shop/Shop.php', + 'ShopUrlCore' => 'classes/shop/ShopUrl.php', + 'ShopUrl' => 'override/classes/shop/ShopUrl.php', + 'StockManagerCore' => 'classes/stock/StockManager.php', + 'StockManager' => '', + 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', + 'StockManagerFactory' => '', + 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', + 'StockManagerModule' => 'classes/stock/StockManagerModule.php', + 'StockWarehouseCore' => 'classes/stock/StockWarehouse.php', + 'StockWarehouse' => '', + 'TaxCore' => 'classes/tax/Tax.php', + 'Tax' => 'override/classes/tax/Tax.php', + 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', + 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', + 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', + 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', + 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', + 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', + 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', + 'TaxRuleCore' => 'classes/tax/TaxRule.php', + 'TaxRule' => 'override/classes/tax/TaxRule.php', + 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', + 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', + 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', + 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'WebserviceExceptionCore' => 'classes/webservice/WebserviceException.php', 'WebserviceException' => 'override/classes/webservice/WebserviceException.php', 'WebserviceKeyCore' => 'classes/webservice/WebserviceKey.php', @@ -297,8 +301,6 @@ 'WebserviceSpecificManagementInterface' => 'classes/webservice/WebserviceSpecificManagementInterface.php', 'WebserviceSpecificManagementSearchCore' => 'classes/webservice/WebserviceSpecificManagementSearch.php', 'WebserviceSpecificManagementSearch' => 'override/classes/webservice/WebserviceSpecificManagementSearch.php', - 'ZoneCore' => 'classes/Zone.php', - 'Zone' => 'override/classes/Zone.php', 'FB' => 'override/classes/fb.php', 'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php', 'AdminAddressesController' => '', diff --git a/classes/AdminController.php b/classes/AdminController.php index b74bb8666..e1f5974a1 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -1277,7 +1277,7 @@ class AdminControllerCore extends Controller ORDER BY '.(($orderBy == $this->identifier) ? 'a.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').' LIMIT '.(int)$start.','.(int)$limit; - $this->_list = Db::getInstance()->ExecuteS($sql); + $this->_list = Db::getInstance()->executeS($sql); $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); } @@ -1481,9 +1481,9 @@ class AdminControllerCore extends Controller $assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$res[2]); } - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.$this->table.'_'.$type.($id_object ? ' WHERE `'.$this->identifier.'`='.(int)$id_object : '')); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.$this->table.'_'.$type.($id_object ? ' WHERE `'.$this->identifier.'`='.(int)$id_object : '')); foreach ($assos as $asso) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.$this->table.'_'.$type.' (`'.pSQL($this->identifier).'`, id_'.$type.') + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.$this->table.'_'.$type.' (`'.pSQL($this->identifier).'`, id_'.$type.') VALUES('.(int)$asso['id_object'].', '.(int)$asso['id_'.$type].')'); } diff --git a/classes/AdminTab.php b/classes/AdminTab.php index f078f4048..f3d28ba39 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -342,7 +342,7 @@ abstract class AdminTabCore $required_fields[(int)$row['id_required_field']] = $row['field_name']; - $table_fields = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table)); + $table_fields = Db::getInstance()->executeS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table)); $irow = 0; foreach ($table_fields as $field) { @@ -900,9 +900,9 @@ abstract class AdminTabCore $assos = self::getAssoShop($this->table, $id_object); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.$this->table.'_'.$assos[1].($id_object ? ' WHERE `'.$this->identifier.'`='.(int)$id_object : '')); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.$this->table.'_'.$assos[1].($id_object ? ' WHERE `'.$this->identifier.'`='.(int)$id_object : '')); foreach ($assos[0] as $asso) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.$this->table.'_'.$assos[1].' (`'.pSQL($this->identifier).'`, id_'.$assos[1].') + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.$this->table.'_'.$assos[1].' (`'.pSQL($this->identifier).'`, id_'.$assos[1].') VALUES('.(int)$asso['id_object'].', '.(int)$asso['id_'.$assos[1]].')'); } @@ -1352,7 +1352,7 @@ abstract class AdminTabCore ORDER BY '.(($orderBy == $this->identifier) ? 'a.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').' LIMIT '.(int)$start.','.(int)$limit; - $this->_list = Db::getInstance()->ExecuteS($sql); + $this->_list = Db::getInstance()->executeS($sql); $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); } @@ -2341,7 +2341,7 @@ abstract class AdminTabCore $assos = array(); $sql = 'SELECT id_'.$type.', `'.pSQL($this->identifier).'` FROM `'._DB_PREFIX_.pSQL($this->table).'_'.$type.'`'; - foreach (Db::getInstance()->ExecuteS($sql) as $row) + foreach (Db::getInstance()->executeS($sql) as $row) $assos[$row['id_'.$type]][] = $row[$this->identifier]; $html = <<ExecuteS(' + $aliases = Db::getInstance()->executeS(' SELECT a.alias FROM `'._DB_PREFIX_.'alias` a WHERE `search` = \''.pSQL($this->search).'\''); diff --git a/classes/Attachment.php b/classes/Attachment.php index 2f3c94cab..b86683add 100644 --- a/classes/Attachment.php +++ b/classes/Attachment.php @@ -65,7 +65,7 @@ class AttachmentCore extends ObjectModel public function delete() { @unlink(_PS_DOWNLOAD_DIR_.$this->file); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_attachment WHERE id_attachment = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_attachment WHERE id_attachment = '.(int)($this->id)); return parent::delete(); } @@ -82,7 +82,7 @@ class AttachmentCore extends ObjectModel public static function getAttachments($id_lang, $id_product, $include = true) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM '._DB_PREFIX_.'attachment a LEFT JOIN '._DB_PREFIX_.'attachment_lang al ON (a.id_attachment = al.id_attachment AND al.id_lang = '.(int)($id_lang).') @@ -91,14 +91,14 @@ class AttachmentCore extends ObjectModel public static function attachToProduct($id_product, $array) { - $result1 = Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_attachment WHERE id_product = '.(int)($id_product)); + $result1 = Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_attachment WHERE id_product = '.(int)($id_product)); if (is_array($array)) { $ids = array(); foreach ($array as $id_attachment) $ids[] = '('.(int)($id_product).','.(int)($id_attachment).')'; - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET cache_has_attachments = '.(count($ids) ? '1' : '0').' WHERE id_product = '.(int)($id_product).' LIMIT 1'); - return ($result1 && Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'product_attachment (id_product, id_attachment) VALUES '.implode(',',$ids))); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product SET cache_has_attachments = '.(count($ids) ? '1' : '0').' WHERE id_product = '.(int)($id_product).' LIMIT 1'); + return ($result1 && Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'product_attachment (id_product, id_attachment) VALUES '.implode(',',$ids))); } return $result1; } diff --git a/classes/Attribute.php b/classes/Attribute.php index 6d06d1118..43a776062 100644 --- a/classes/Attribute.php +++ b/classes/Attribute.php @@ -84,16 +84,16 @@ class AttributeCore extends ObjectModel public function delete() { - if (($result = Db::getInstance()->ExecuteS('SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `'.$this->identifier.'` = '.(int)$this->id)) === false) + if (($result = Db::getInstance()->executeS('SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `'.$this->identifier.'` = '.(int)$this->id)) === false) return false; $combinationIds = array(); if (Db::getInstance()->numRows()) { foreach ($result AS $row) $combinationIds[] = (int)$row['id_product_attribute']; - if (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `'.$this->identifier.'` = '.(int)$this->id) === false) + if (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `'.$this->identifier.'` = '.(int)$this->id) === false) return false; - if (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $combinationIds).')') === false) + if (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $combinationIds).')') === false) return false; } @@ -133,7 +133,7 @@ class AttributeCore extends ObjectModel { if (!Combination::isFeatureActive()) return array(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT ag.*, agl.*, a.`id_attribute`, al.`name`, agl.`name` AS `attribute_group` FROM `'._DB_PREFIX_.'attribute_group` ag LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND agl.`id_lang` = '.(int)$id_lang.') @@ -221,7 +221,7 @@ class AttributeCore extends ObjectModel SELECT `id_attribute_group` FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute` = '.(int)$this->id.') AND group_type = \'color\'')) return false; - return Db::getInstance()->NumRows(); + return Db::getInstance()->numRows(); } /** @@ -251,7 +251,7 @@ class AttributeCore extends ObjectModel */ public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT a.`id_attribute`, a.`position`, a.`id_attribute_group` FROM `'._DB_PREFIX_.'attribute` a WHERE a.`id_attribute_group` = '.(int)Tools::getValue('id_attribute_group', 1).' @@ -268,7 +268,7 @@ class AttributeCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -276,7 +276,7 @@ class AttributeCore extends ObjectModel ? '> '.(int)$movedAttribute['position'].' AND `position` <= '.(int)$position : '< '.(int)$movedAttribute['position'].' AND `position` >= '.(int)$position).' AND `id_attribute_group`='.(int)$movedAttribute['id_attribute_group']) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute` SET `position` = '.(int)$position.' WHERE `id_attribute` = '.(int)$movedAttribute['id_attribute'].' @@ -305,11 +305,11 @@ class AttributeCore extends ObjectModel AND `id_attribute` != '.(int)$this->id; $sql .= ' ORDER BY `position`'; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); $i = 0; foreach ($result as $value) - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute` SET `position` = '.(int)$i++.' WHERE `id_attribute_group` = '.(int)$id_attribute_group.' diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php index 9311b97be..0e82545c4 100644 --- a/classes/AttributeGroup.php +++ b/classes/AttributeGroup.php @@ -96,12 +96,12 @@ class AttributeGroupCore extends ObjectModel public static function cleanDeadCombinations() { - $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 ON (pa.`id_product_attribute` = pac.`id_product_attribute`)'); + $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 ON (pa.`id_product_attribute` = pac.`id_product_attribute`)'); $toRemove = array(); foreach ($attributeCombinations AS $attributeCombination) if ((int)($attributeCombination['id_attribute']) == 0) $toRemove[] = (int)($attributeCombination['id_product_attribute']); - if (!empty($toRemove) AND Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')') === false) + if (!empty($toRemove) AND Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(', ', $toRemove).')') === false) return false; return true; } @@ -109,20 +109,20 @@ class AttributeGroupCore extends ObjectModel public function delete() { /* Select children in order to find linked combinations */ - $attributeIds = Db::getInstance()->ExecuteS('SELECT `id_attribute` FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id)); + $attributeIds = Db::getInstance()->executeS('SELECT `id_attribute` FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id)); if ($attributeIds === false) return false; /* Removing attributes to the found combinations */ $toRemove = array(); foreach ($attributeIds AS $attribute) $toRemove[] = (int)($attribute['id_attribute']); - if (!empty($toRemove) AND Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_attribute` IN ('.implode(', ', $toRemove).')') === false) + if (!empty($toRemove) AND Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_attribute` IN ('.implode(', ', $toRemove).')') === false) return false; /* Remove combinations if they do not possess attributes anymore */ if (!self::cleanDeadCombinations()) return false; /* Also delete related attributes */ - if (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'attribute_lang` WHERE `id_attribute` IN (SELECT id_attribute FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id).')') === false OR Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id)) === false) + if (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute_lang` WHERE `id_attribute` IN (SELECT id_attribute FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id).')') === false OR Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)($this->id)) === false) return false; $return = parent::delete(); if($return) @@ -141,7 +141,7 @@ class AttributeGroupCore extends ObjectModel { if (!Combination::isFeatureActive()) return array(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'attribute` a LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)($id_lang).') @@ -159,7 +159,7 @@ class AttributeGroupCore extends ObjectModel { if (!Combination::isFeatureActive()) return array(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'attribute_group` ag LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND `id_lang` = '.(int)($id_lang).') @@ -188,7 +188,7 @@ class AttributeGroupCore extends ObjectModel $ids = array(); foreach ($values as $value) $ids[] = intval($value['id']); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id.' AND `id_attribute` NOT IN ('.implode(',', $ids).')' @@ -196,7 +196,7 @@ class AttributeGroupCore extends ObjectModel $ok = true; foreach ($values as $value) { - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute` SET `id_attribute_group` = '.(int)$this->id.' WHERE `id_attribute` = '.(int)$value['id'] @@ -221,7 +221,7 @@ class AttributeGroupCore extends ObjectModel */ public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT ag.`position`, ag.`id_attribute_group` FROM `'._DB_PREFIX_.'attribute_group` ag WHERE ag.`id_attribute_group` = '.(int)Tools::getValue('id_attribute_group', 1).' @@ -238,14 +238,14 @@ class AttributeGroupCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute_group` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` '.($way ? '> '.(int)$movedGroupAttribute['position'].' AND `position` <= '.(int)$position : '< '.(int)$movedGroupAttribute['position'].' AND `position` >= '.(int)$position)) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute_group` SET `position` = '.(int)$position.' WHERE `id_attribute_group`='.(int)$movedGroupAttribute['id_attribute_group'])); @@ -265,11 +265,11 @@ class AttributeGroupCore extends ObjectModel SELECT `id_attribute_group` FROM `'._DB_PREFIX_.'attribute_group` ORDER BY `position`'; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); $i = 0; foreach ($result as $value) - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute_group` SET `position` = '.(int)$i++.' WHERE `id_attribute_group` = '.(int)$value['id_attribute_group']); diff --git a/classes/Backup.php b/classes/Backup.php index e679a4d70..85d9b8496 100644 --- a/classes/Backup.php +++ b/classes/Backup.php @@ -213,7 +213,7 @@ class BackupCore fwrite($fp, "\n".'SET NAMES \'utf8\';'."\n\n"); // Find all tables - $tables = Db::getInstance()->ExecuteS('SHOW TABLES'); + $tables = Db::getInstance()->executeS('SHOW TABLES'); $found = 0; foreach ($tables AS $table) { @@ -224,7 +224,7 @@ class BackupCore continue; // Export the table schema - $schema = Db::getInstance()->ExecuteS('SHOW CREATE TABLE `' . $table . '`'); + $schema = Db::getInstance()->executeS('SHOW CREATE TABLE `' . $table . '`'); if (count($schema) != 1 || !isset($schema[0]['Table']) || !isset($schema[0]['Create Table'])) { @@ -243,7 +243,7 @@ class BackupCore if (!in_array($schema[0]['Table'], $ignore_insert_table)) { - $data = Db::getInstance()->ExecuteS('SELECT * FROM `' . $schema[0]['Table'] . '`', false); + $data = Db::getInstance()->executeS('SELECT * FROM `' . $schema[0]['Table'] . '`', false); $sizeof = DB::getInstance()->NumRows(); $lines = explode("\n", $schema[0]['Create Table']); diff --git a/classes/CMS.php b/classes/CMS.php index 83e6b3309..02c7ac83f 100644 --- a/classes/CMS.php +++ b/classes/CMS.php @@ -91,7 +91,7 @@ class CMSCore extends ObjectModel { if (!$link) $link = Context::getContext()->link; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.id_cms, cl.link_rewrite, cl.meta_title FROM '._DB_PREFIX_.'cms c LEFT JOIN '._DB_PREFIX_.'cms_lang cl ON (c.id_cms = cl.id_cms AND cl.id_lang = '.(int)($id_lang).') @@ -115,7 +115,7 @@ class CMSCore extends ObjectModel if (empty($id_lang)) $id_lang = (int)Configuration::get('PS_LANG_DEFAULT'); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.id_cms, l.meta_title FROM '._DB_PREFIX_.'cms c JOIN '._DB_PREFIX_.'cms_lang l ON (c.id_cms = l.id_cms) @@ -126,7 +126,7 @@ class CMSCore extends ObjectModel public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT cp.`id_cms`, cp.`position`, cp.`id_cms_category` FROM `'._DB_PREFIX_.'cms` cp WHERE cp.`id_cms_category` = '.(int)$this->id_cms_category.' @@ -143,7 +143,7 @@ class CMSCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -151,7 +151,7 @@ class CMSCore extends ObjectModel ? '> '.(int)($movedCms['position']).' AND `position` <= '.(int)($position) : '< '.(int)($movedCms['position']).' AND `position` >= '.(int)($position)).' AND `id_cms_category`='.(int)($movedCms['id_cms_category'])) - && Db::getInstance()->Execute(' + && Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms` SET `position` = '.(int)($position).' WHERE `id_cms` = '.(int)($movedCms['id_cms']).' @@ -160,7 +160,7 @@ class CMSCore extends ObjectModel public static function cleanPositions($id_category) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_cms` FROM `'._DB_PREFIX_.'cms` WHERE `id_cms_category` = '.(int)($id_category).' @@ -171,7 +171,7 @@ class CMSCore extends ObjectModel SET `position` = '.(int)$i.' WHERE `id_cms_category` = '.(int)$id_category.' AND `id_cms` = '.(int)$result[$i]['id_cms']; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } return true; } @@ -183,7 +183,7 @@ class CMSCore extends ObjectModel public static function getCMSPages($id_lang = null, $id_cms_category = null, $active = true) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'cms` c JOIN `'._DB_PREFIX_.'cms_lang` l ON (c.id_cms = l.id_cms)'. @@ -200,6 +200,6 @@ class CMSCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'lang` AS l ON c.`id_lang` = l.`id_lang` WHERE c.`id_cms` = '.(int)$id_cms.' AND l.`active` = 1'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } } diff --git a/classes/CMSCategory.php b/classes/CMSCategory.php index 27eaf66d5..95f41b96a 100644 --- a/classes/CMSCategory.php +++ b/classes/CMSCategory.php @@ -197,7 +197,7 @@ class CMSCategoryCore extends ObjectModel FROM `'._DB_PREFIX_.'cms_category` c WHERE c.`id_parent` = '.(int)$current. ($active ? ' AND c.`active` = 1' : ''); - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); foreach ($result as $row) $category['children'][] = self::getRecurseCategory($id_lang, $row['id_cms_category'], $active, $links); @@ -208,7 +208,7 @@ class CMSCategoryCore extends ObjectModel WHERE `id_cms_category` = '.(int)$current.' AND cl.`id_lang` = '.$id_lang.($active ? ' AND c.`active` = 1' : '').' ORDER BY c.`position`'; - $category['cms'] = Db::getInstance()->ExecuteS($sql); + $category['cms'] = Db::getInstance()->executeS($sql); if ($links == 1) { $category['link'] = $link->getCMSCategoryLink($current, $category['link_rewrite']); @@ -243,7 +243,7 @@ class CMSCategoryCore extends ObjectModel if (!is_array($toDelete) OR !$id_cms_category) die(Tools::displayError()); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_cms_category` FROM `'._DB_PREFIX_.'cms_category` WHERE `id_parent` = '.(int)($id_cms_category)); @@ -267,13 +267,13 @@ class CMSCategoryCore extends ObjectModel /* Delete CMS Category and its child from database */ $list = sizeof($toDelete) > 1 ? implode(',', $toDelete) : (int)($this->id); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cms_category` WHERE `id_cms_category` IN ('.$list.')'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cms_category_lang` WHERE `id_cms_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cms_category` WHERE `id_cms_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cms_category_lang` WHERE `id_cms_category` IN ('.$list.')'); self::cleanPositions($this->id_parent); /* Delete pages which are in categories to delete */ - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_cms` FROM `'._DB_PREFIX_.'cms` WHERE `id_cms_category` IN ('.$list.')'); @@ -327,7 +327,7 @@ class CMSCategoryCore extends ObjectModel if (!Validate::isBool($active)) die(Tools::displayError()); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'cms_category` c LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON c.`id_cms_category` = cl.`id_cms_category` @@ -346,7 +346,7 @@ class CMSCategoryCore extends ObjectModel public static function getSimpleCategories($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_cms_category`, cl.`name` FROM `'._DB_PREFIX_.'cms_category` c LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category`) @@ -366,7 +366,7 @@ class CMSCategoryCore extends ObjectModel if (!Validate::isBool($active)) die(Tools::displayError()); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.*, cl.id_lang, cl.name, cl.description, cl.link_rewrite, cl.meta_title, cl.meta_keywords, cl.meta_description FROM `'._DB_PREFIX_.'cms_category` c LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category` AND `id_lang` = '.(int)($id_lang).') @@ -411,7 +411,7 @@ class CMSCategoryCore extends ObjectModel if (!Validate::isBool($active)) die(Tools::displayError()); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_cms_category`, cl.`name`, cl.`link_rewrite` FROM `'._DB_PREFIX_.'cms_category` c LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON c.`id_cms_category` = cl.`id_cms_category` @@ -508,7 +508,7 @@ class CMSCategoryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category`) WHERE `name` LIKE \''.pSQL($query).'\''); else - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT c.*, cl.* FROM `'._DB_PREFIX_.'cms_category` c LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category` AND `id_lang` = '.(int)($id_lang).') @@ -557,7 +557,7 @@ class CMSCategoryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category` AND `id_lang` = '.(int)$id_lang.') WHERE c.`id_cms_category` = '.(int)$idCurrent.' AND c.`id_parent` != 0 '; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); $categories[] = $result[0]; if(!$result OR $result[0]['id_parent'] == 1) @@ -568,7 +568,7 @@ class CMSCategoryCore extends ObjectModel public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT cp.`id_cms_category`, cp.`position`, cp.`id_parent` FROM `'._DB_PREFIX_.'cms_category` cp WHERE cp.`id_parent` = '.(int)$this->id_parent.' @@ -583,7 +583,7 @@ class CMSCategoryCore extends ObjectModel return false; // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_category` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -591,7 +591,7 @@ class CMSCategoryCore extends ObjectModel ? '> '.(int)($movedCategory['position']).' AND `position` <= '.(int)($position) : '< '.(int)($movedCategory['position']).' AND `position` >= '.(int)($position)).' AND `id_parent`='.(int)($movedCategory['id_parent'])) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_category` SET `position` = '.(int)($position).' WHERE `id_parent` = '.(int)($movedCategory['id_parent']).' @@ -600,7 +600,7 @@ class CMSCategoryCore extends ObjectModel public static function cleanPositions($id_category_parent) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_cms_category` FROM `'._DB_PREFIX_.'cms_category` WHERE `id_parent` = '.(int)($id_category_parent).' @@ -612,7 +612,7 @@ class CMSCategoryCore extends ObjectModel SET `position` = '.(int)($i).' WHERE `id_parent` = '.(int)($id_category_parent).' AND `id_cms_category` = '.(int)($result[$i]['id_cms_category']); - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } return true; } @@ -629,7 +629,7 @@ class CMSCategoryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'lang` AS l ON c.`id_lang` = l.`id_lang` WHERE c.`id_cms_category` = '.(int)$id_category.' AND l.`active` = 1'; - $arr_return = Db::getInstance()->ExecuteS($sql); + $arr_return = Db::getInstance()->executeS($sql); return $arr_return; } } diff --git a/classes/Carrier.php b/classes/Carrier.php index abf3f9de5..7b078e198 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -153,7 +153,7 @@ class CarrierCore extends ObjectModel { if (!parent::add($autodate, $nullValues) || !Validate::isLoadedObject($this)) return false; - if (!Db::getInstance()->ExecuteS('SELECT `id_carrier` FROM `'._DB_PREFIX_.$this->table.'` WHERE `deleted` = 0')) + if (!Db::getInstance()->executeS('SELECT `id_carrier` FROM `'._DB_PREFIX_.$this->table.'` WHERE `deleted` = 0')) return false; if (!$numRows = Db::getInstance()->NumRows()) return false; @@ -161,7 +161,7 @@ class CarrierCore extends ObjectModel Configuration::updateValue('PS_CARRIER_DEFAULT', (int)($this->id)); // Register reference - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$this->table.'` SET `id_reference` = '.$this->id.' WHERE `id_carrier` = '.$this->id); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$this->table.'` SET `id_reference` = '.$this->id.' WHERE `id_carrier` = '.$this->id); return true; } @@ -173,7 +173,7 @@ class CarrierCore extends ObjectModel */ public function setConfiguration($id_old) { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'delivery` SET `id_carrier` = '.(int)($this->id).' WHERE `id_carrier` = '.(int)($id_old)); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'delivery` SET `id_carrier` = '.(int)($this->id).' WHERE `id_carrier` = '.(int)($id_old)); } /** @@ -235,7 +235,7 @@ class CarrierCore extends ObjectModel AND d.`id_carrier` = '.(int)$this->id.' '.Carrier::sqlDeliveryRangeShop('range_weight', $shop).' ORDER BY w.`delimiter2` DESC LIMIT 1'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!isset($result[0]['price'])) return false; return $result[0]['price']; @@ -315,7 +315,7 @@ class CarrierCore extends ObjectModel AND d.`id_carrier` = '.(int)$this->id.' '.Carrier::sqlDeliveryRangeShop('range_price', $shop).' ORDER BY r.`delimiter2` DESC LIMIT 1'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!isset($result[0]['price'])) return false; return $result[0]['price']; @@ -338,7 +338,7 @@ class CarrierCore extends ObjectModel AND d.id_'.$rangeTable.' != 0 '.Carrier::sqlDeliveryRangeShop($rangeTable, $shop).' ORDER BY r.delimiter1'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -399,7 +399,7 @@ class CarrierCore extends ObjectModel $sql .= ($ids_group ? ' AND c.id_carrier IN (SELECT id_carrier FROM '._DB_PREFIX_.'carrier_group WHERE id_group IN ('.$ids.')) ' : '').' GROUP BY c.`id_carrier`'; - $carriers = Db::getInstance()->ExecuteS($sql); + $carriers = Db::getInstance()->executeS($sql); if (is_array($carriers) && count($carriers)) { @@ -418,12 +418,12 @@ class CarrierCore extends ObjectModel if (!Validate::isBool($activeCountries) || !Validate::isBool($activeCarriers)) die(Tools::displayError()); - $states = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $states = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT s.* FROM `'._DB_PREFIX_.'state` s ORDER BY s.`name` ASC'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cl.*,c.*, cl.`name` AS country, zz.`name` AS zone FROM `'._DB_PREFIX_.'country` c LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = 1) INNER JOIN (`'._DB_PREFIX_.'carrier_zone` cz INNER JOIN `'._DB_PREFIX_.'carrier` cr ON ( cr.id_carrier = cz.id_carrier AND cr.deleted = 0 '.($activeCarriers ? @@ -537,7 +537,7 @@ class CarrierCore extends ObjectModel public static function checkCarrierZone($id_carrier, $id_zone) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_carrier` FROM `'._DB_PREFIX_.'carrier` c LEFT JOIN `'._DB_PREFIX_.'carrier_zone` cz ON (cz.`id_carrier` = c.`id_carrier`) @@ -557,7 +557,7 @@ class CarrierCore extends ObjectModel */ public function getZones() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'carrier_zone` cz LEFT JOIN `'._DB_PREFIX_.'zone` z ON cz.`id_zone` = z.`id_zone` @@ -571,7 +571,7 @@ class CarrierCore extends ObjectModel */ public function getZone($id_zone) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'carrier_zone` WHERE `id_carrier` = '.(int)($this->id).' @@ -583,7 +583,7 @@ class CarrierCore extends ObjectModel */ public function addZone($id_zone) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'carrier_zone` (`id_carrier` , `id_zone`) VALUES ('.(int)($this->id).', '.(int)($id_zone).')'); } @@ -593,7 +593,7 @@ class CarrierCore extends ObjectModel */ public function deleteZone($id_zone) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'carrier_zone` WHERE `id_carrier` = '.(int)($this->id).' AND `id_zone` = '.(int)($id_zone).' LIMIT 1'); @@ -667,7 +667,7 @@ class CarrierCore extends ObjectModel $sql = rtrim($sql, ', ').'), '; } $sql = rtrim($sql, ', '); - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } /** @@ -692,12 +692,12 @@ class CarrierCore extends ObjectModel { $sql = 'SELECT id_'.$range.' id_range, delimiter1, delimiter2 FROM `'._DB_PREFIX_.$range.'` WHERE id_carrier = '.(int)$oldId; - $res = Db::getInstance()->ExecuteS($sql); + $res = Db::getInstance()->executeS($sql); foreach ($res as $val) { $sql = 'INSERT INTO `'._DB_PREFIX_.$range.'` (`id_carrier`, `delimiter1`, `delimiter2`) VALUES ('.$this->id.','.(float)$val['delimiter1'].','.(float)$val['delimiter2'].')'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $rangeID = (int)Db::getInstance()->Insert_ID(); $rangePriceID = ($range == 'range_price') ? $rangeID : 'NULL'; @@ -706,15 +706,15 @@ class CarrierCore extends ObjectModel SELECT '.$this->id.', '.$rangePriceID.', '.$rangeWeightID.', id_zone, price FROM '._DB_PREFIX_.'delivery WHERE id_carrier = '.(int)$oldId.' AND '.(($range == 'range_price') ? 'id_range_price' : 'id_range_weight').' = '.$val['id_range']; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } // Copy existing zones - $res = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'carrier_zone` + $res = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'carrier_zone` WHERE id_carrier = '.(int)$oldId); foreach ($res as $val) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'carrier_zone` (`id_carrier`, `id_zone`) VALUES ('.$this->id.','.(int)$val['id_zone'].')'); @@ -724,7 +724,7 @@ class CarrierCore extends ObjectModel // Copy reference $id_reference = Db::getInstance()->getValue('SELECT `id_reference` FROM `'._DB_PREFIX_.$this->table.'` WHERE id_carrier = '.$oldId); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$this->table.'` + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$this->table.'` SET `id_reference` = '.$id_reference.' WHERE `id_carrier` = '.$this->id); } diff --git a/classes/Cart.php b/classes/Cart.php index 86170e6e5..06dbf158b 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -188,7 +188,7 @@ class CartCore extends ObjectModel if ($this->OrderExists()) //NOT delete a cart which is associated with an order return false; - $uploadedFiles = Db::getInstance()->ExecuteS(' + $uploadedFiles = Db::getInstance()->executeS(' SELECT cd.`value` FROM `'._DB_PREFIX_.'customized_data` cd INNER JOIN `'._DB_PREFIX_.'customization` c ON (cd.`id_customization`= c.`id_customization`) @@ -200,7 +200,7 @@ class CartCore extends ObjectModel unlink(_PS_UPLOAD_DIR_.$mustUnlink['value']); } - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'customized_data` WHERE `id_customization` IN ( SELECT `id_customization` @@ -208,12 +208,12 @@ class CartCore extends ObjectModel WHERE `id_cart`='.(int)$this->id.' )'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)$this->id); - if (!Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_discount` WHERE `id_cart` = '.(int)($this->id)) - OR !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = '.(int)($this->id))) + if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_discount` WHERE `id_cart` = '.(int)($this->id)) + OR !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = '.(int)($this->id))) return false; return parent::delete(); @@ -272,7 +272,7 @@ class CartCore extends ObjectModel return self::$_discountsLite[$this->id]; } - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT d.*, `id_cart` FROM `'._DB_PREFIX_.'cart_discount` c LEFT JOIN `'._DB_PREFIX_.'discount` d ON c.`id_discount` = d.`id_discount` @@ -429,7 +429,7 @@ class CartCore extends ObjectModel $sql->select('p.`reference` AS reference, p.`supplier_reference` AS supplier_reference, p.`ean13`, p.`upc` AS upc, p.`minimal_quantity` AS minimal_quantity'); - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); // Reset the cache before the following return, or else an empty cart will add dozens of queries $productsIds = array(); @@ -521,7 +521,7 @@ class CartCore extends ObjectModel if (!count($paImplode)) return; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT pac.`id_product_attribute`, agl.`public_name` AS public_group_name, al.`name` AS attribute_name FROM `'._DB_PREFIX_.'product_attribute_combination` pac LEFT JOIN `'._DB_PREFIX_.'attribute` a ON a.`id_attribute` = pac.`id_attribute` @@ -661,7 +661,7 @@ class CartCore extends ObjectModel elseif ($newQty < $minimalQuantity) return -1; else - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cart_product` SET `quantity` = `quantity` '.$qty.', `date_add` = NOW() WHERE `id_product` = '.(int)$id_product. @@ -720,7 +720,7 @@ class CartCore extends ObjectModel { if ($field['quantity'] == 0) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'customization` SET `quantity` = '.(int)($quantity).', `id_product_attribute` = '.(int)$id_product_attribute.', @@ -740,8 +740,8 @@ class CartCore extends ObjectModel if ($result AND Db::getInstance()->NumRows()) { if ($operator == 'down' AND (int)($result['quantity']) - (int)($quantity) < 1) - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization` WHERE `id_customization` = '.(int)$id_customization); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization` WHERE `id_customization` = '.(int)$id_customization); + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'customization` SET `quantity` = `quantity` '.($operator == 'up' ? '+ ' : '- ').(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization)); @@ -766,7 +766,7 @@ class CartCore extends ObjectModel */ public function _addCustomization($id_product, $id_product_attribute, $index, $type, $field, $quantity) { - $exising_customization = Db::getInstance()->ExecuteS(' + $exising_customization = Db::getInstance()->executeS(' SELECT cu.`id_customization`, cd.`index`, cd.`value`, cd.`type` FROM `'._DB_PREFIX_.'customization` cu LEFT JOIN `'._DB_PREFIX_.'customized_data` cd ON cu.`id_customization` = cd.`id_customization` @@ -781,7 +781,7 @@ class CartCore extends ObjectModel { if ($customization['type'] == $type && $customization['index'] == $index) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'customized_data` WHERE id_customization = '.(int)$customization['id_customization'].' AND type = '.(int)$customization['type'].' @@ -798,13 +798,13 @@ class CartCore extends ObjectModel } else { - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'customization` (`id_cart`, `id_product`, `id_product_attribute`, `quantity`) VALUES ('.(int)($this->id).', '.(int)($id_product).', '.(int)($id_product_attribute).', '.(int)($quantity).')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'customization` (`id_cart`, `id_product`, `id_product_attribute`, `quantity`) VALUES ('.(int)($this->id).', '.(int)($id_product).', '.(int)($id_product_attribute).', '.(int)($quantity).')'); $id_customization = Db::getInstance()->Insert_ID(); } $query = 'INSERT INTO `'._DB_PREFIX_.'customized_data` (`id_customization`, `type`, `index`, `value`) VALUES ('.(int)$id_customization.', '.(int)$type.', '.(int)$index.', \''.pSql($field).'\')'; - if (!Db::getInstance()->Execute($query)) + if (!Db::getInstance()->execute($query)) return false; return true; } @@ -831,7 +831,7 @@ class CartCore extends ObjectModel */ public function deleteDiscount($id_discount) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_discount` WHERE `id_discount` = '.(int)$id_discount.' AND `id_cart` = '.(int)$this->id.' LIMIT 1'); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_discount` WHERE `id_discount` = '.(int)$id_discount.' AND `id_cart` = '.(int)$this->id.' LIMIT 1'); } /** @@ -877,7 +877,7 @@ class CartCore extends ObjectModel /* If the product still possesses customization it does not have to be deleted */ if (Db::getInstance()->NumRows() AND (int)($result['quantity'])) - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cart_product` SET `quantity` = '.(int)($result['quantity']).' WHERE `id_cart` = '.(int)($this->id).' @@ -885,7 +885,7 @@ class CartCore extends ObjectModel ($id_product_attribute != NULL ? ' AND `id_product_attribute` = '.(int)($id_product_attribute) : '')); /* Product deletion */ - if (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_product` = '.(int)($id_product).(!is_null($id_product_attribute) ? ' AND `id_product_attribute` = '.(int)($id_product_attribute) : '').' AND `id_cart` = '.(int)($this->id))) + if (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_product` = '.(int)($id_product).(!is_null($id_product_attribute) ? ' AND `id_product_attribute` = '.(int)($id_product_attribute) : '').' AND `id_cart` = '.(int)($this->id))) { // refresh cache of self::_products $this->_products = $this->getProducts(true); @@ -924,7 +924,7 @@ class CartCore extends ObjectModel WHERE `id_customization` = '.(int)($id_customization)); if($result) - $result &= Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'cart_product` + $result &= Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'cart_product` SET `quantity` = `quantity` - '.(int)($customization['quantity']).' WHERE `id_cart` = '.(int)($this->id).' AND `id_product` = '.(int)($id_product).((int)($id_product_attribute) ? ' @@ -933,7 +933,7 @@ class CartCore extends ObjectModel if (!$result) return false; - return Db::getInstance()->Execute('DELETE + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization` WHERE `id_customization` = '.(int)($id_customization)); } @@ -1533,13 +1533,13 @@ class CartCore extends ObjectModel { if (!ProductDownload::isFeatureActive()) return false; - + if (!isset(self::$_isVirtualCart[$this->id])) { $products = $this->getProducts(); if (!sizeof($products)) return false; - + $is_virtual = 1; foreach ($products AS $product) { @@ -1548,10 +1548,10 @@ class CartCore extends ObjectModel } self::$_isVirtualCart[$this->id] = (int) $is_virtual; } - + return self::$_isVirtualCart[$this->id]; } - + public static function getCartByOrderId($id_order) { if ($id_cart = self::getCartIdByOrderId($id_order)) @@ -1634,7 +1634,7 @@ class CartCore extends ObjectModel { if (!Customization::isFeatureActive()) return array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT cu.id_customization, cd.index, cd.value, cd.type, cu.in_cart, cu.quantity FROM `'._DB_PREFIX_.'customization` cu LEFT JOIN `'._DB_PREFIX_.'customized_data` cd ON (cu.`id_customization` = cd.`id_customization`) @@ -1649,7 +1649,7 @@ class CartCore extends ObjectModel public static function getCustomerCarts($id_customer) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM '._DB_PREFIX_.'cart c WHERE c.`id_customer` = '.(int)($id_customer).' @@ -1676,13 +1676,13 @@ class CartCore extends ObjectModel if (!Validate::isLoadedObject($cart)) return false; $success = true; - $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = '.(int)$this->id); + $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT * FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = '.(int)$this->id); foreach ($products AS $product) $success &= $cart->updateQty($product['quantity'], (int)$product['id_product'], (int)$product['id_product_attribute'], NULL, 'up', new Shop($cart->id_shop)); // Customized products - $customs = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $customs = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM '._DB_PREFIX_.'customization c LEFT JOIN '._DB_PREFIX_.'customized_data cd ON cd.id_customization = c.id_customization @@ -1701,7 +1701,7 @@ class CartCore extends ObjectModel $custom_ids = array(); foreach($customsById as $customizationId => $val) { - Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'customization` (id_cart, id_product_attribute, id_product, quantity) VALUES('.(int)$cart->id.', '.(int)$val['id_product_attribute'].', '.(int)$val['id_product'].', '.(int)$val['quantity'].')'); $custom_ids[$customizationId] = Db::getInstance(_PS_USE_SQL_SLAVE_)->Insert_ID(); @@ -1720,7 +1720,7 @@ class CartCore extends ObjectModel $first = false; $sql_custom_data .= '('.(int)$custom_ids[$custom['id_customization']].', '.(int)$custom['type'].', '.(int)$custom['index'].', \''.pSQL($custom['value']).'\')'; } - Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute($sql_custom_data); + Db::getInstance()->execute($sql_custom_data); } return array('cart' => $cart, 'success' => $success); @@ -1742,14 +1742,14 @@ class CartCore extends ObjectModel $query = 'INSERT INTO `'._DB_PREFIX_.'cart_product`(`id_cart`, `id_product`, `id_product_attribute`, `quantity`, `date_add`) VALUES '; foreach ($values as $value) $query .= '('.(int)$this->id.', '.(int)$value['id_product'].', '.(isset($value['id_product_attribute']) ? (int)$value['id_product_attribute'] : 'NULL').', '.(int)$value['quantity'].', NOW()),'; - Db::getInstance()->Execute(rtrim($query, ',')); + Db::getInstance()->execute(rtrim($query, ',')); } return true; } public function deleteAssociations() { - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_cart` = '.(int)($this->id)) !== false); } diff --git a/classes/Category.php b/classes/Category.php index f5d432976..587dc0f97 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -269,7 +269,7 @@ class CategoryCore extends ObjectModel if (!is_array($toDelete) OR !$id_category) die(Tools::displayError()); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_category` FROM `'._DB_PREFIX_.'category` WHERE `id_parent` = '.(int)($id_category)); @@ -293,10 +293,10 @@ class CategoryCore extends ObjectModel /* Delete category and its child from database */ $list = sizeof($toDelete) > 1 ? implode(',', array_map('intval',$toDelete)) : (int)($this->id); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE `id_category` IN ('.$list.')'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE `id_category` IN ('.$list.')'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_product` WHERE `id_category` IN ('.$list.')'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE `id_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE `id_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_product` WHERE `id_category` IN ('.$list.')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_category` IN ('.$list.')'); self::cleanPositions($this->id_parent); @@ -309,7 +309,7 @@ class CategoryCore extends ObjectModel } /* Delete products which were not in others categories */ - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `id_product` NOT IN (SELECT `id_product` FROM `'._DB_PREFIX_.'category_product`)'); @@ -321,7 +321,7 @@ class CategoryCore extends ObjectModel } /* Set category default to 1 where categorie no more exists */ - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product` SET `id_category_default` = 1 WHERE `id_category_default` @@ -379,7 +379,7 @@ class CategoryCore extends ObjectModel */ public static function regenerateEntireNtree() { - $categories = Db::getInstance()->ExecuteS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_category ASC'); + $categories = Db::getInstance()->executeS('SELECT id_category, id_parent FROM '._DB_PREFIX_.'category ORDER BY id_category ASC'); $categoriesArray = array(); foreach ($categories AS $category) $categoriesArray[(int)$category['id_parent']]['subcategories'][(int)$category['id_category']] = 1; @@ -395,7 +395,7 @@ class CategoryCore extends ObjectModel self::_subTree($categories, (int)$id_subcategory, $n); $right = (int)$n++; - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'category SET nleft = '.(int)$left.', nright = '.(int)$right.' WHERE id_category = '.(int)$id_category.' LIMIT 1'); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'category SET nleft = '.(int)$left.', nright = '.(int)$right.' WHERE id_category = '.(int)$id_category.' LIMIT 1'); } /** @@ -406,7 +406,7 @@ class CategoryCore extends ObjectModel public function recalculateLevelDepth($id_category) { /* Gets all children */ - $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_category, id_parent, level_depth FROM '._DB_PREFIX_.'category WHERE id_parent = '.(int)$id_category); @@ -418,7 +418,7 @@ class CategoryCore extends ObjectModel /* Updates level_depth for all children */ foreach ($categories as $sub_category) { - Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + Db::getInstance()->execute(' UPDATE '._DB_PREFIX_.'category SET level_depth = '.(int)($level['level_depth'] + 1).' WHERE id_category = '.(int)$sub_category['id_category']); @@ -438,7 +438,7 @@ class CategoryCore extends ObjectModel { if (!Validate::isBool($active)) die(Tools::displayError()); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON c.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').' @@ -461,7 +461,7 @@ class CategoryCore extends ObjectModel public static function getSimpleCategories($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_category`, cl.`name` FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').') @@ -485,7 +485,7 @@ class CategoryCore extends ObjectModel $groups = FrontController::getCurrentCustomerGroups(); $sqlGroups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.*, cl.id_lang, cl.name, cl.description, cl.link_rewrite, cl.meta_title, cl.meta_keywords, cl.meta_description FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND `id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('cl').') @@ -597,7 +597,7 @@ class CategoryCore extends ObjectModel $sql .= ' ORDER BY '.(isset($orderByPrefix) ? $orderByPrefix.'.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay).' LIMIT '.(((int)($p) - 1) * (int)($n)).','.(int)($n); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($orderBy == 'orderprice') Tools::orderbyPrice($result, $orderWay); @@ -642,7 +642,7 @@ class CategoryCore extends ObjectModel if (!Validate::isBool($active)) die(Tools::displayError()); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_category`, cl.`name`, cl.`link_rewrite` FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON c.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').' @@ -659,7 +659,7 @@ class CategoryCore extends ObjectModel */ public function getAllChildren() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'category` WHERE '. $this->nleft . ' < nleft AND nright < '. $this->nright); @@ -695,7 +695,7 @@ class CategoryCore extends ObjectModel WHERE `id_lang` = '.(int)($id_lang).' AND c.`id_parent` = '.(int)($id_parent).' ORDER BY `position` ASC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } /** @@ -710,14 +710,14 @@ class CategoryCore extends ObjectModel $sql = 'SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)$id_old; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); $row = array(); if ($result) foreach ($result AS $i) $row[] = '('.implode(', ', array((int)($id_new), $i['id_category'], '(SELECT tmp.max + 1 FROM (SELECT MAX(cp.`position`) AS max FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_category`='.(int)($i['id_category']).') AS tmp)')).')'; - $flag = Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'category_product` (`id_product`, `id_category`, `position`) VALUES '.implode(',', $row)); + $flag = Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'category_product` (`id_product`, `id_category`, `position`) VALUES '.implode(',', $row)); return $flag; } @@ -799,7 +799,7 @@ class CategoryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').') WHERE `name` LIKE \''.pSQL($query).'\''); else - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT c.*, cl.* FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND `id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('cl').') @@ -840,7 +840,7 @@ class CategoryCore extends ObjectModel $idCurrent = $this->id; while (true) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.*, cl.* FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND `id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('cl').') @@ -872,7 +872,7 @@ class CategoryCore extends ObjectModel public function cleanGroups() { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_category` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_category` = '.(int)($this->id)); } public function addGroups($groups) @@ -887,7 +887,7 @@ class CategoryCore extends ObjectModel public function getGroups() { $groups = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT cg.`id_group` FROM '._DB_PREFIX_.'category_group cg WHERE cg.`id_category` = '.(int)($this->id)); @@ -948,7 +948,7 @@ class CategoryCore extends ObjectModel { if (!(int)($id_group)) return false; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'category_group` VALUES (1, '.(int)($id_group).') '); @@ -956,7 +956,7 @@ class CategoryCore extends ObjectModel public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT cp.`id_category`, cp.`position`, cp.`id_parent` FROM `'._DB_PREFIX_.'category` cp WHERE cp.`id_parent` = '.(int)$this->id_parent.' @@ -972,7 +972,7 @@ class CategoryCore extends ObjectModel return false; // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - $result = (Db::getInstance()->Execute(' + $result = (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -980,7 +980,7 @@ class CategoryCore extends ObjectModel ? '> '.(int)($movedCategory['position']).' AND `position` <= '.(int)($position) : '< '.(int)($movedCategory['position']).' AND `position` >= '.(int)($position)).' AND `id_parent`='.(int)($movedCategory['id_parent'])) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category` SET `position` = '.(int)($position).' WHERE `id_parent` = '.(int)($movedCategory['id_parent']).' @@ -1001,7 +1001,7 @@ class CategoryCore extends ObjectModel { $return = true; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_category` FROM `'._DB_PREFIX_.'category` WHERE `id_parent` = '.(int)($id_category_parent).' @@ -1013,7 +1013,7 @@ class CategoryCore extends ObjectModel SET `position` = '.(int)($i).' WHERE `id_parent` = '.(int)($id_category_parent).' AND `id_category` = '.(int)($result[$i]['id_category']); - $return &= Db::getInstance()->Execute($sql); + $return &= Db::getInstance()->execute($sql); } return $return; } @@ -1031,7 +1031,7 @@ class CategoryCore extends ObjectModel public static function getUrlRewriteInformations($id_category) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT l.`id_lang`, c.`link_rewrite` FROM `'._DB_PREFIX_.'category_lang` AS c LEFT JOIN `'._DB_PREFIX_.'lang` AS l ON c.`id_lang` = l.`id_lang` @@ -1076,7 +1076,7 @@ class CategoryCore extends ObjectModel public function getChildrenWs() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_category` as id FROM `'._DB_PREFIX_.'category` c WHERE c.`id_parent` = '.(int)($this->id).' @@ -1087,7 +1087,7 @@ class CategoryCore extends ObjectModel public function getProductsWs() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cp.`id_product` as id FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_category` = '.(int)($this->id).' @@ -1112,7 +1112,7 @@ class CategoryCore extends ObjectModel public function getWsNbProductsRecursive() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT count(distinct(id_product)) as nb_product_recursive FROM `'._DB_PREFIX_.'category_product` WHERE id_category IN (SELECT id_category FROM `'._DB_PREFIX_.'category` @@ -1138,7 +1138,7 @@ class CategoryCore extends ObjectModel return; $categories = array(); - $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.`id_category`, cl.`name`, cl.`link_rewrite`, cl.`id_lang` FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').') diff --git a/classes/Combination.php b/classes/Combination.php index e669a2e39..4bc6f19b5 100644 --- a/classes/Combination.php +++ b/classes/Combination.php @@ -125,7 +125,7 @@ class CombinationCore extends ObjectModel public function deleteAssociations() { if ( - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_product_attribute` = '.(int)($this->id)) === false ) @@ -140,7 +140,7 @@ class CombinationCore extends ObjectModel $sqlValues = array(); foreach ($values as $value) $sqlValues[] = '('.(int)$value['id'].', '.(int)$this->id.')'; - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_attribute`, `id_product_attribute`) VALUES '.implode(',', $sqlValues) ); @@ -157,7 +157,7 @@ class CombinationCore extends ObjectModel public function getWsImages() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_image` as id FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_product_attribute` = '.(int)($this->id).' @@ -166,14 +166,14 @@ class CombinationCore extends ObjectModel public function setWsImages($values) { - if (Db::getInstance()->Execute(' + if (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_product_attribute` = '.(int)($this->id)) === false) return false; $sqlValues = array(); foreach ($values as $value) $sqlValues[] = '('.(int)$this->id.', '.(int)$value['id'].')'; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_attribute_image` (`id_product_attribute`, `id_image`) VALUES '.implode(',', $sqlValues) ); diff --git a/classes/CompareProduct.php b/classes/CompareProduct.php index 345f8d0fe..ba63fef51 100644 --- a/classes/CompareProduct.php +++ b/classes/CompareProduct.php @@ -62,7 +62,7 @@ class CompareProductCore extends ObjectModel */ public static function getGuestCompareProducts($id_guest) { - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT DISTINCT `id_product` FROM `'._DB_PREFIX_.'compare_product` WHERE `id_guest` = '.(int)($id_guest)); @@ -84,7 +84,7 @@ class CompareProductCore extends ObjectModel */ public static function addGuestCompareProduct($id_guest, $id_product) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_guest`, `id_customer`, `date_add`, `date_upd`) VALUES ('.(int)($id_product).', '.(int)($id_guest).', 0, NOW(), NOW()) '); @@ -98,7 +98,7 @@ class CompareProductCore extends ObjectModel */ public static function removeGuestCompareProduct($id_guest, $id_product) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'compare_product` WHERE `id_guest` = '.(int)($id_guest).' AND `id_product` = '.(int)($id_product)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'compare_product` WHERE `id_guest` = '.(int)($id_guest).' AND `id_product` = '.(int)($id_product)); } @@ -123,7 +123,7 @@ class CompareProductCore extends ObjectModel */ public static function getCustomerCompareProducts($id_customer) { - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT DISTINCT `id_product` FROM `'._DB_PREFIX_.'compare_product` WHERE `id_customer` = '.(int)($id_customer)); @@ -145,7 +145,7 @@ class CompareProductCore extends ObjectModel */ public static function addCustomerCompareProduct($id_customer, $id_product) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'compare_product` (`id_product`, `id_guest`, `id_customer`, `date_add`, `date_upd`) VALUES ('.(int)($id_product).', 0, '.(int)($id_customer).', NOW(), NOW())'); } @@ -158,7 +158,7 @@ class CompareProductCore extends ObjectModel */ public static function removeCustomerCompareProduct($id_customer, $id_product) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'compare_product` WHERE `id_customer` = '.(int)($id_customer).' AND `id_product` = '.(int)($id_product)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'compare_product` WHERE `id_customer` = '.(int)($id_customer).' AND `id_product` = '.(int)($id_product)); } @@ -194,7 +194,7 @@ class CompareProductCore extends ObjectModel if ($interval != null) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'compare_product` WHERE date_upd < DATE_SUB(NOW(), INTERVAL '.pSQL($interval).')'); } diff --git a/classes/Configuration.php b/classes/Configuration.php index 6174f3a4b..48feb192c 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -114,7 +114,7 @@ class ConfigurationCore extends ObjectModel $sql = 'SELECT c.`name`, cl.`id_lang`, IF(cl.`id_lang` IS NULL, c.`value`, cl.`value`) AS value, c.id_group_shop, c.id_shop FROM `'._DB_PREFIX_.'configuration` c LEFT JOIN `'._DB_PREFIX_.'configuration_lang` cl ON (c.id_configuration = cl.id_configuration)'; - if (!$results = Db::getInstance()->ExecuteS($sql)) + if (!$results = Db::getInstance()->executeS($sql)) return; foreach ($results as $row) @@ -307,7 +307,7 @@ class ConfigurationCore extends ObjectModel WHERE c.name = \''.pSQL($key).'\'' .Configuration::sqlRestriction($shopGroupID, $shopID) .')'; - $result &= Db::getInstance()->Execute($sql); + $result &= Db::getInstance()->execute($sql); } } // If key does not exists, create it @@ -361,11 +361,11 @@ class ConfigurationCore extends ObjectModel FROM `'._DB_PREFIX_.'configuration` WHERE `name` = \''.pSQL($key).'\' )'; - $result = Db::getInstance()->Execute($sql); + $result = Db::getInstance()->execute($sql); $sql = 'DELETE FROM `'._DB_PREFIX_.'configuration` WHERE `name` = \''.pSQL($key).'\''; - $result2 = Db::getInstance()->Execute($sql); + $result2 = Db::getInstance()->execute($sql); return ($result && $result2); } @@ -383,11 +383,11 @@ class ConfigurationCore extends ObjectModel $id = Configuration::getIdByName($key, $shopGroupID, $shopID); $sql = 'DELETE FROM '._DB_PREFIX_.'configuration WHERE id_configuration = '.$id; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $sql = 'DELETE FROM '._DB_PREFIX_.'configuration_lang WHERE id_configuration = '.$id; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } /** @@ -495,6 +495,6 @@ class ConfigurationCore extends ObjectModel '.($sql_sort != '' ? $sql_sort : '').' '.($sql_limit != '' ? $sql_limit : '').' '; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); } } \ No newline at end of file diff --git a/classes/Connection.php b/classes/Connection.php index 80aad168c..cfc29ebe1 100644 --- a/classes/Connection.php +++ b/classes/Connection.php @@ -153,7 +153,7 @@ class ConnectionCore extends ObjectModel // Limited to 5 minutes because more than 5 minutes is considered as an error if ($time > 300000) $time = 300000; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'connections_page` SET `time_end` = `time_start` + INTERVAL '.(int)($time / 1000).' SECOND WHERE `id_connections` = '.(int)($id_connections).' @@ -177,7 +177,7 @@ class ConnectionCore extends ObjectModel if ($interval != null) { // Records of connections details older than the beginning of the specified interval are deleted - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'connections_page` WHERE time_start < LAST_DAY(DATE_SUB(NOW(), INTERVAL '.$interval.'))'); } diff --git a/classes/ConnectionsSource.php b/classes/ConnectionsSource.php index fdd08322a..9ff0a559d 100644 --- a/classes/ConnectionsSource.php +++ b/classes/ConnectionsSource.php @@ -98,7 +98,7 @@ class ConnectionsSourceCore extends ObjectModel public static function getOrderSources($id_order) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cos.http_referer, cos.request_uri, cos.keywords, cos.date_add FROM '._DB_PREFIX_.'orders o INNER JOIN '._DB_PREFIX_.'guest g ON g.id_customer = o.id_customer diff --git a/classes/Contact.php b/classes/Contact.php index 464034778..08ef56c45 100644 --- a/classes/Contact.php +++ b/classes/Contact.php @@ -87,7 +87,7 @@ class ContactCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'contact_lang` cl ON (c.`id_contact` = cl.`id_contact`) WHERE cl.`id_lang` = '.(int)$id_lang.' ORDER BY `name` ASC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } } diff --git a/classes/Country.php b/classes/Country.php index 840be3956..f42faa469 100644 --- a/classes/Country.php +++ b/classes/Country.php @@ -126,7 +126,7 @@ class CountryCore extends ObjectModel if (!$shop) $shop = Context::getContext()->shop; - $states = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $states = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT s.* FROM `'._DB_PREFIX_.'state` s ORDER BY s.`name` ASC'); @@ -140,7 +140,7 @@ class CountryCore extends ObjectModel .($active ? ' AND c.active = 1' : '') .(!is_null($containStates) ? ' AND c.`contains_states` = '.(int)($containStates) : '').' ORDER BY cl.name ASC'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $countries = array(); foreach ($result AS &$country) $countries[$country['id_country']] = $country; @@ -295,7 +295,7 @@ class CountryCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`) WHERE (c.`id_zone` = '.(int)$id_zone.' OR s.`id_zone` = '.(int)$id_zone.') AND `id_lang` = '.(int)$id_lang; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public function isNeedDni() diff --git a/classes/Currency.php b/classes/Currency.php index a85fc6ac8..579271f8a 100644 --- a/classes/Currency.php +++ b/classes/Currency.php @@ -190,7 +190,7 @@ class CurrencyCore extends ObjectModel WHERE `deleted` = 0' .($active == 1 ? ' AND c.`active` = 1' : '').' ORDER BY `name` ASC'; - $tab = Db::getInstance()->ExecuteS($sql); + $tab = Db::getInstance()->executeS($sql); if ($object) foreach ($tab as $key => $currency) $tab[$key] = Currency::getCurrencyInstance($currency['id_currency']); @@ -222,7 +222,7 @@ class CurrencyCore extends ObjectModel AND c.`active` = 1 AND mc.id_shop = '.(int)$id_shop.' ORDER BY c.`name` ASC'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } static public function checkPaymentCurrencies($id_module, $id_shop = null) @@ -234,7 +234,7 @@ class CurrencyCore extends ObjectModel FROM `'._DB_PREFIX_.'module_currency` WHERE `id_module` = '.(int)$id_module.' AND `id_shop` = '.(int)$id_shop; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } public static function getCurrency($id_currency) diff --git a/classes/Customer.php b/classes/Customer.php index 4b5baa367..b4d90ee9a 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -198,7 +198,7 @@ class CustomerCore extends ObjectModel $obj = new Address((int)($address['id_address'])); $obj->delete(); } - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id)); Discount::deleteByIdCustomer((int)($this->id)); return parent::delete(); } @@ -217,7 +217,7 @@ class CustomerCore extends ObjectModel FROM `'._DB_PREFIX_.'customer` WHERE 1 '.$shop->sqlRestriction(Shop::SHARE_CUSTOMER).' ORDER BY `id_customer` ASC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } /** @@ -344,7 +344,7 @@ class CustomerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`) LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`) WHERE `id_lang` = '.(int)($id_lang).' AND `id_customer` = '.(int)($this->id).' AND a.`deleted` = 0'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } /** @@ -399,7 +399,7 @@ class CustomerCore extends ObjectModel OR `lastname` LIKE \'%'.pSQL($query).'%\' OR `firstname` LIKE \'%'.pSQL($query).'%\' )'.$shop->sqlRestriction(Shop::SHARE_CUSTOMER); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } /** @@ -433,7 +433,7 @@ class CustomerCore extends ObjectModel public function getLastConnections() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.date_add, COUNT(cp.id_page) AS pages, TIMEDIFF(MAX(cp.time_end), c.date_add) as time, http_referer,INET_NTOA(ip_address) as ipaddress FROM `'._DB_PREFIX_.'guest` g LEFT JOIN `'._DB_PREFIX_.'connections` c ON c.id_guest = g.id_guest @@ -468,7 +468,7 @@ class CustomerCore extends ObjectModel public function cleanGroups() { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_customer` = '.(int)($this->id)); } public function addGroups($groups) @@ -488,7 +488,7 @@ class CustomerCore extends ObjectModel if (!isset(self::$_customer_groups[$id_customer])) { self::$_customer_groups[$id_customer] = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT cg.`id_group` FROM '._DB_PREFIX_.'customer_group cg WHERE cg.`id_customer` = '.(int)$id_customer); @@ -510,7 +510,7 @@ class CustomerCore extends ObjectModel public function getBoughtProducts() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.id_order = od.id_order WHERE o.valid = 1 AND o.`id_customer` = '.(int)($this->id)); @@ -543,7 +543,7 @@ class CustomerCore extends ObjectModel parent::toggleStatus(); /* Change status to active/inactive */ - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'.pSQL(_DB_PREFIX_.$this->table).'` SET `date_upd` = NOW() WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php index 755224932..7db9011d1 100644 --- a/classes/CustomerMessage.php +++ b/classes/CustomerMessage.php @@ -60,7 +60,7 @@ class CustomerMessageCore extends ObjectModel public static function getMessagesByOrderId($id_order, $private = true) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT cm.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname, (COUNT(cm.id_customer_message) = 0 AND ct.id_customer != 0) AS is_new_for_me FROM `'._DB_PREFIX_.'customer_message` cm LEFT JOIN `'._DB_PREFIX_.'customer_thread` ct ON ct.`id_customer_thread` = cm.`id_customer_thread` diff --git a/classes/CustomerThread.php b/classes/CustomerThread.php index 5093ab16c..b9941d564 100644 --- a/classes/CustomerThread.php +++ b/classes/CustomerThread.php @@ -69,13 +69,13 @@ class CustomerThreadCore extends ObjectModel { if (!Validate::isUnsignedId($this->id)) return false; - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_message` WHERE `id_customer_thread` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customer_message` WHERE `id_customer_thread` = '.(int)($this->id)); return (parent::delete()); } public static function getCustomerMessages($id_customer) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM '._DB_PREFIX_.'customer_thread ct LEFT JOIN '._DB_PREFIX_.'customer_message cm ON ct.id_customer_thread = cm.id_customer_thread WHERE id_customer = '.(int)($id_customer)); diff --git a/classes/Customization.php b/classes/Customization.php index db2565853..4bef8fa75 100644 --- a/classes/Customization.php +++ b/classes/Customization.php @@ -29,7 +29,7 @@ class CustomizationCore { public static function getReturnedCustomizations($id_order) { - if (($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + if (($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT ore.`id_order_return`, ord.`id_order_detail`, ord.`id_customization`, ord.`product_quantity` FROM `'._DB_PREFIX_.'order_return` ore INNER JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (ord.`id_order_return` = ore.`id_order_return`) @@ -43,7 +43,7 @@ class CustomizationCore public static function getOrderedCustomizations($id_cart) { - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `id_customization`, `quantity` FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)($id_cart))) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `id_customization`, `quantity` FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)($id_cart))) return false; $customizations = array(); foreach ($result AS $row) @@ -87,7 +87,7 @@ class CustomizationCore if (!empty($in_values)) { - $results = Db::getInstance()->ExecuteS( + $results = Db::getInstance()->executeS( 'SELECT `id_customization`, `id_product`, `quantity`, `quantity_refunded`, `quantity_returned` FROM `'._DB_PREFIX_.'customization` WHERE `id_customization` IN ('.$in_values.')'); @@ -103,7 +103,7 @@ class CustomizationCore { $quantity = array(); - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT `id_product`, `id_product_attribute`, SUM(`quantity`) AS quantity FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)$id_cart.' diff --git a/classes/Discount.php b/classes/Discount.php index 37e591bbe..0dab84343 100644 --- a/classes/Discount.php +++ b/classes/Discount.php @@ -187,8 +187,8 @@ class DiscountCore extends ObjectModel // Refresh cache of feature detachable Configuration::updateGlobalValue('PS_DISCOUNT_FEATURE_ACTIVE', self::isCurrentlyUsed($this->table, true)); - return (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_discount WHERE id_discount = '.(int)($this->id)) && - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'discount_category WHERE id_discount = '.(int)($this->id))); + return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_discount WHERE id_discount = '.(int)($this->id)) && + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'discount_category WHERE id_discount = '.(int)($this->id))); } public function getTranslationsFieldsChild() @@ -205,7 +205,7 @@ class DiscountCore extends ObjectModel */ public static function getDiscountTypes($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM '._DB_PREFIX_.'discount_type dt LEFT JOIN `'._DB_PREFIX_.'discount_type_lang` dtl ON (dt.`id_discount_type` = dtl.`id_discount_type` AND dtl.`id_lang` = '.(int)($id_lang).')'); @@ -279,7 +279,7 @@ class DiscountCore extends ObjectModel if ($hasStock) $sql .= ' AND d.`quantity` != 0'; - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($res as &$discount) if ($discount['quantity_per_user']) @@ -390,7 +390,7 @@ class DiscountCore extends ObjectModel public static function getCategories($id_discount) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_category` FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount` = '.(int)($id_discount)); @@ -404,24 +404,24 @@ class DiscountCore extends ObjectModel if ($categories === null) { // Compatibility for modules which create discount without setting categories (ex. fidelity, sponsorship) - $result = Db::getInstance()->ExecuteS('SELECT id_category FROM '._DB_PREFIX_.'category'); + $result = Db::getInstance()->executeS('SELECT id_category FROM '._DB_PREFIX_.'category'); $categories = array(); foreach ($result as $row) $categories[] = $row['id_category']; } elseif (!is_array($categories) OR !sizeof($categories)) return false; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount`='.(int)$this->id); foreach($categories AS $category) { - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' SELECT `id_discount` FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount`='.(int)($this->id).' AND `id_category`='.(int)($category)); if (Db::getInstance()->NumRows() == 0) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'discount_category` (`id_discount`, `id_category`) VALUES('.(int)($this->id).','.(int)($category).')'); } @@ -545,29 +545,29 @@ class DiscountCore extends ObjectModel $sql .= ')'; // close parenthesis openned above - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public static function deleteByIdCustomer($id_customer) { - $discounts = Db::getInstance()->ExecuteS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount` WHERE `id_customer` = '.(int)($id_customer)); + $discounts = Db::getInstance()->executeS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount` WHERE `id_customer` = '.(int)($id_customer)); foreach ($discounts as $discount) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount` WHERE `id_discount` = '.(int)($discount['id_discount'])); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount` = '.(int)($discount['id_discount'])); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount_lang` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount_lang` WHERE `id_discount` = '.(int)($discount['id_discount'])); } return true; } public static function deleteByIdGroup($id_group) { - $discounts = Db::getInstance()->ExecuteS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount` WHERE `id_group` = '.(int)($id_group)); + $discounts = Db::getInstance()->executeS('SELECT `id_discount` FROM `'._DB_PREFIX_.'discount` WHERE `id_group` = '.(int)($id_group)); foreach ($discounts as $discount) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount` WHERE `id_discount` = '.(int)($discount['id_discount'])); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount` = '.(int)($discount['id_discount'])); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'discount_lang` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount_category` WHERE `id_discount` = '.(int)($discount['id_discount'])); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'discount_lang` WHERE `id_discount` = '.(int)($discount['id_discount'])); } return true; } diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 662fa91f1..382452290 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -278,7 +278,7 @@ class DispatcherCore LEFT JOIN `'._DB_PREFIX_.'meta_lang` ml ON (m.id_meta = ml.id_meta'.$context->shop->sqlLang('ml').') WHERE id_lang = '.(int)$context->language->id.' ORDER BY LENGTH(ml.url_rewrite) DESC'; - if ($results = Db::getInstance()->ExecuteS($sql)) + if ($results = Db::getInstance()->executeS($sql)) foreach ($results as $row) { if ($row['url_rewrite']) diff --git a/classes/Feature.php b/classes/Feature.php index d2db181b3..ad90a077c 100644 --- a/classes/Feature.php +++ b/classes/Feature.php @@ -86,7 +86,7 @@ class FeatureCore extends ObjectModel */ public static function getFeatures($id_lang) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'feature` f LEFT JOIN `'._DB_PREFIX_.'feature_lang` fl ON (f.`id_feature` = fl.`id_feature` AND fl.`id_lang` = '.(int)($id_lang).') @@ -120,10 +120,10 @@ class FeatureCore extends ObjectModel public function delete() { /* Also delete related attributes */ - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'feature_value_lang` WHERE `id_feature_value` IN (SELECT id_feature_value FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature` = '.(int)($this->id).')'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'feature_value_lang` WHERE `id_feature_value` IN (SELECT id_feature_value FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature` = '.(int)($this->id).')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature` = '.(int)($this->id)); /* Also delete related products */ - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'feature_product` WHERE `id_feature` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'feature_product` WHERE `id_feature` = '.(int)($this->id)); $return = parent::delete(); if($return) @@ -215,7 +215,7 @@ class FeatureCore extends ObjectModel if (empty($ids)) return false; - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * , COUNT(*) as nb FROM `'._DB_PREFIX_.'feature` f LEFT JOIN `'._DB_PREFIX_.'feature_product` fp ON f.`id_feature` = fp.`id_feature` @@ -244,7 +244,7 @@ class FeatureCore extends ObjectModel */ public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT `position`, `id_feature` FROM `'._DB_PREFIX_.'feature` WHERE `id_feature` = '.(int)Tools::getValue('id_feature', 1).' @@ -261,14 +261,14 @@ class FeatureCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'feature` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` '.($way ? '> '.(int)$movedFeature['position'].' AND `position` <= '.(int)$position : '< '.(int)$movedFeature['position'].' AND `position` >= '.(int)$position)) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'feature` SET `position` = '.(int)$position.' WHERE `id_feature`='.(int)$movedFeature['id_feature'])); @@ -288,11 +288,11 @@ class FeatureCore extends ObjectModel SELECT `id_feature` FROM `'._DB_PREFIX_.'feature` ORDER BY `position`'; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); $i = 0; foreach ($result as $value) - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'feature` SET `position` = '.(int)$i++.' WHERE `id_feature` = '.(int)$value['id_feature']); diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php index e8430cf73..957b498b6 100644 --- a/classes/FeatureValue.php +++ b/classes/FeatureValue.php @@ -83,7 +83,7 @@ class FeatureValueCore extends ObjectModel */ public static function getFeatureValues($id_feature) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature` = '.(int)$id_feature); @@ -99,7 +99,7 @@ class FeatureValueCore extends ObjectModel */ public static function getFeatureValuesWithLang($id_lang, $id_feature) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'feature_value` v LEFT JOIN `'._DB_PREFIX_.'feature_value_lang` vl ON (v.`id_feature_value` = vl.`id_feature_value` AND vl.`id_lang` = '.(int)$id_lang.') @@ -116,7 +116,7 @@ class FeatureValueCore extends ObjectModel */ public static function getFeatureValueLang($id_feature_value) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'feature_value_lang` WHERE `id_feature_value` = '.(int)$id_feature_value.' @@ -140,7 +140,7 @@ class FeatureValueCore extends ObjectModel public static function addFeatureValueImport($id_feature, $name) { - $rq = Db::getInstance()->ExecuteS(' + $rq = Db::getInstance()->executeS(' SELECT fv.`id_feature_value` FROM '._DB_PREFIX_.'feature_value fv LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value`) @@ -178,7 +178,7 @@ class FeatureValueCore extends ObjectModel public function delete() { /* Also delete related products */ - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'feature_product` WHERE `id_feature_value` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'feature_product` WHERE `id_feature_value` = '.(int)$this->id); $return = parent::delete(); if ($return) diff --git a/classes/FrontController.php b/classes/FrontController.php index 952d8df6a..c454e5daf 100755 --- a/classes/FrontController.php +++ b/classes/FrontController.php @@ -641,7 +641,7 @@ class FrontControllerCore extends Controller if (!is_array(self::$currentCustomerGroups)) { self::$currentCustomerGroups = array(); - $result = Db::getInstance()->ExecuteS('SELECT id_group FROM '._DB_PREFIX_.'customer_group WHERE id_customer = '.(int)$context->customer->id); + $result = Db::getInstance()->executeS('SELECT id_group FROM '._DB_PREFIX_.'customer_group WHERE id_customer = '.(int)$context->customer->id); foreach ($result as $row) self::$currentCustomerGroups[] = $row['id_group']; } diff --git a/classes/Gender.php b/classes/Gender.php index 14e3413d9..138d05a09 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -80,7 +80,7 @@ class GenderCore extends ObjectModel $sql = 'SELECT g.*, gl.* FROM '._DB_PREFIX_.'gender g LEFT JOIN '._DB_PREFIX_.'gender_lang gl ON g.id_gender = gl.id_gender AND gl.id_lang = '.(int)$id_lang; - $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return ObjectModel::hydrateCollection('Gender', $results, $id_lang); } diff --git a/classes/Group.php b/classes/Group.php index 1ab2589e6..486b780af 100644 --- a/classes/Group.php +++ b/classes/Group.php @@ -84,7 +84,7 @@ class GroupCore extends ObjectModel public static function getGroups($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT g.`id_group`, g.`reduction`, g.`price_display_method`, gl.`name` FROM `'._DB_PREFIX_.'group` g LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($id_lang).') @@ -100,7 +100,7 @@ class GroupCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'customer` c ON (cg.`id_customer` = c.`id_customer`) WHERE cg.`id_group` = '.(int)$this->id.' AND c.`deleted` != 1'); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT cg.`id_customer`, c.* FROM `'._DB_PREFIX_.'customer_group` cg LEFT JOIN `'._DB_PREFIX_.'customer` c ON (cg.`id_customer` = c.`id_customer`) @@ -166,10 +166,10 @@ class GroupCore extends ObjectModel return false; if (parent::delete()) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_group` = '.(int)$this->id); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_group` = '.(int)$this->id); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_group` = '.(int)$this->id); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customer_group` WHERE `id_group` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_group` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_group` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)$this->id); $this->truncateRestrictionsModules($this->id); Discount::deleteByIdGroup((int)$this->id); @@ -177,7 +177,7 @@ class GroupCore extends ObjectModel Configuration::updateGlobalValue('PS_GROUP_FEATURE_ACTIVE', self::isCurrentlyUsed()); // Add default group (id 1) to customers without groups - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'customer_group` ( + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'customer_group` ( SELECT c.id_customer, 1 FROM `'._DB_PREFIX_.'customer` c LEFT JOIN `'._DB_PREFIX_.'customer_group` cg ON cg.id_customer = c.id_customer @@ -185,7 +185,7 @@ class GroupCore extends ObjectModel // Set to the customer the default group // Select the minimal id from customer_group - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customer` cg + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customer` cg SET id_default_group = IFNULL(( SELECT min(id_group) FROM `'._DB_PREFIX_.'customer_group` @@ -234,7 +234,7 @@ class GroupCore extends ObjectModel */ public static function truncateModulesRestrictions($id_group) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'group_module_restriction` WHERE `id_group` = '.(int)$id_group); } @@ -246,7 +246,7 @@ class GroupCore extends ObjectModel */ public static function truncateRestrictionsByModule($id_module) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'group_module_restriction` WHERE `id_module` = '.(int)$id_module); } @@ -268,7 +268,7 @@ class GroupCore extends ObjectModel $sql .= '("'.(int)$id_group.'", "'.(int)Module::getModuleIdByName($mod).'", "'.(int)$authorized.'"),'; // removing last comma to avoid SQL error $sql = substr($sql, 0, strlen($sql) - 1); - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } @@ -285,7 +285,7 @@ class GroupCore extends ObjectModel $sql .= '("'.(int)$g['id_group'].'", "'.(int)$id_module.'", "1"),'; // removing last comma to avoid SQL error $sql = substr($sql, 0, strlen($sql) - 1); - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php index f92ada767..9034ed32c 100644 --- a/classes/GroupReduction.php +++ b/classes/GroupReduction.php @@ -60,7 +60,7 @@ class GroupReductionCore extends ObjectModel public function delete() { - $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_product` FROM `'._DB_PREFIX_.'product` p WHERE p.`id_category_default` = '.(int)($this->id_category) @@ -69,7 +69,7 @@ class GroupReductionCore extends ObjectModel while ($row = Db::getInstance()->nextRow($resource)) { $query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)($row['id_product']); - if (Db::getInstance()->Execute($query) === false) + if (Db::getInstance()->execute($query) === false) return false; } return (parent::delete()); @@ -77,12 +77,12 @@ class GroupReductionCore extends ObjectModel protected function _clearCache() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)($this->id_group)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_group` = '.(int)($this->id_group)); } protected function _setCache() { - $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_product` FROM `'._DB_PREFIX_.'product` p WHERE p.`id_category_default` = '.(int)($this->id_category) @@ -97,13 +97,13 @@ class GroupReductionCore extends ObjectModel } if ($updated) - return (Db::getInstance()->Execute(rtrim($query, ', '))); + return (Db::getInstance()->execute(rtrim($query, ', '))); return true; } protected function _updateCache() { - $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_product` FROM `'._DB_PREFIX_.'product` p WHERE p.`id_category_default` = '.(int)($this->id_category) @@ -114,7 +114,7 @@ class GroupReductionCore extends ObjectModel $query = 'UPDATE `'._DB_PREFIX_.'product_group_reduction_cache` SET `reduction` = '.(float)($this->reduction).' WHERE `id_product` = '.(int)($row['id_product']).' AND `id_group` = '.(int)($this->id_group); - if (Db::getInstance()->Execute($query) === false) + if (Db::getInstance()->execute($query) === false) return false; } return true; @@ -122,7 +122,7 @@ class GroupReductionCore extends ObjectModel public static function getGroupReductions($id_group, $id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT gr.`id_group_reduction`, gr.`id_group`, gr.`id_category`, gr.`reduction`, cl.`name` AS category_name FROM `'._DB_PREFIX_.'group_reduction` gr LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (cl.`id_category` = gr.`id_category` AND cl.`id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('cl').') @@ -180,13 +180,13 @@ class GroupReductionCore extends ObjectModel SET `reduction` = '.(float)($reduction).' WHERE `id_product` = '.(int)($id_product).' AND `id_group` = '.(int)($id_group); - return (Db::getInstance()->Execute($query)); + return (Db::getInstance()->execute($query)); } public static function deleteProductReduction($id_product) { $query = 'DELETE FROM `'._DB_PREFIX_.'product_group_reduction_cache` WHERE `id_product` = '.(int)($id_product); - if (Db::getInstance()->Execute($query) === false) + if (Db::getInstance()->execute($query) === false) return false; return true; } @@ -203,13 +203,13 @@ class GroupReductionCore extends ObjectModel $query = 'INSERT INTO `'._DB_PREFIX_.'product_group_reduction_cache` (`id_product`, `id_group`, `reduction`) VALUES '; $query .= '('.(int)($id_product).', '.(int)($row['id_group']).', '.(float)($row['reduction']).')'; - return (Db::getInstance()->Execute($query)); + return (Db::getInstance()->execute($query)); } public static function deleteCategory($id_category) { $query = 'DELETE FROM `'._DB_PREFIX_.'group_reduction` WHERE `id_category` = '.(int)($id_category); - if (Db::getInstance()->Execute($query) === false) + if (Db::getInstance()->execute($query) === false) return false; return true; } diff --git a/classes/Guest.php b/classes/Guest.php index d0b002e87..f70ff478c 100644 --- a/classes/Guest.php +++ b/classes/Guest.php @@ -179,7 +179,7 @@ class GuestCore extends ObjectModel public function mergeWithCustomer($id_guest, $id_customer) { // Since the guests are merged, the guest id in the connections table must be changed too - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'connections` c SET c.`id_guest` = '.(int)($id_guest).' WHERE c.`id_guest` = '.(int)($this->id)); diff --git a/classes/HelpAccess.php b/classes/HelpAccess.php index ab219bef5..473320002 100644 --- a/classes/HelpAccess.php +++ b/classes/HelpAccess.php @@ -36,7 +36,7 @@ class HelpAccessCore public static function trackClick($label, $version) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'help_access` (`label`, `version`) VALUES (\''.pSQL($label).'\',\''.pSQL($version).'\') ON DUPLICATE KEY UPDATE `version` = \''.pSQL($version).'\' '); diff --git a/classes/Hook.php b/classes/Hook.php index 71f5fdb66..d39c8dd1a 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -89,7 +89,7 @@ class HookCore extends ObjectModel static public function getHooks($position = false) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'hook` h '.($position ? 'WHERE h.`position` = 1' : '')); diff --git a/classes/Image.php b/classes/Image.php index f8c6f95b3..ce45829d9 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -102,7 +102,7 @@ class ImageCore extends ObjectModel return false; // update positions - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'image` WHERE `id_product` = '.(int)$this->id_product.' @@ -127,7 +127,7 @@ class ImageCore extends ObjectModel */ public static function getImages($id_lang, $id_product) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'image` i LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image`) @@ -142,7 +142,7 @@ class ImageCore extends ObjectModel */ public static function getAllImages() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_image`, `id_product` FROM `'._DB_PREFIX_.'image` ORDER BY `id_image` ASC'); @@ -191,7 +191,7 @@ class ImageCore extends ObjectModel if (file_exists(_PS_TMP_IMG_DIR_.'product_'.$id_product.'.jpg')) unlink(_PS_TMP_IMG_DIR_.'product_'.$id_product.'.jpg'); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `cover` = 0 WHERE `id_product` = '.(int)($id_product)); @@ -220,7 +220,7 @@ class ImageCore extends ObjectModel public static function duplicateProductImages($id_product_old, $id_product_new, $combinationImages) { $imagesTypes = ImageType::getImagesTypes('products'); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_image` FROM `'._DB_PREFIX_.'image` WHERE `id_product` = '.(int)($id_product_old)); @@ -298,18 +298,18 @@ class ImageCore extends ObjectModel // temporary position $high_position = Image::getHighestPosition($this->id_product) + 1; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `position` = '.(int)($high_position).' WHERE `id_product` = '.(int)($this->id_product).' AND `position` = '.($direction ? $position - 1 : $position + 1)); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `position` = `position`'.($direction ? '-1' : '+1').' WHERE `id_image` = '.(int)($this->id)); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `position` = '.$this->position.' WHERE `id_product` = '.(int)($this->id_product).' @@ -330,7 +330,7 @@ class ImageCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - $result = (Db::getInstance()->Execute(' + $result = (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -338,7 +338,7 @@ class ImageCore extends ObjectModel ? '> '.(int)($this->position).' AND `position` <= '.(int)($position) : '< '.(int)($this->position).' AND `position` >= '.(int)($position)).' AND `id_product`='.(int)($this->id_product)) - && Db::getInstance()->Execute(' + && Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image` SET `position` = '.(int)($position).' WHERE `id_image` = '.(int)($this->id_image))); @@ -367,7 +367,7 @@ class ImageCore extends ObjectModel */ public function deleteProductAttributeImage() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_image` = '.(int)($this->id) diff --git a/classes/ImageType.php b/classes/ImageType.php index 1ccbd6c73..b1d890ac9 100644 --- a/classes/ImageType.php +++ b/classes/ImageType.php @@ -111,7 +111,7 @@ class ImageTypeCore extends ObjectModel $where = ''; $query = 'SELECT * FROM `'._DB_PREFIX_.'image_type`'.$where.'ORDER BY `name` ASC'; - self::$images_types_cache[$type] = Db::getInstance()->ExecuteS($query); + self::$images_types_cache[$type] = Db::getInstance()->executeS($query); } return self::$images_types_cache[$type]; @@ -128,7 +128,7 @@ class ImageTypeCore extends ObjectModel if (!Validate::isImageTypeName($typeName)) die(Tools::displayError()); - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' SELECT `id_image_type` FROM `'._DB_PREFIX_.'image_type` WHERE `name` = \''.pSQL($typeName).'\''); diff --git a/classes/ImportModule.php b/classes/ImportModule.php index 2b26f7d0c..0da79010d 100644 --- a/classes/ImportModule.php +++ b/classes/ImportModule.php @@ -70,7 +70,7 @@ abstract class ImportModuleCore extends Module public function getValue($query) { $this->initDatabaseConnection(); - $result = $this->ExecuteS($query); + $result = $this->executeS($query); if (!sizeof($result)) return 0; else diff --git a/classes/Language.php b/classes/Language.php index 2cb32298d..7b015a629 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -346,7 +346,7 @@ class LanguageCore extends ObjectModel */ public function loadUpdateSQL() { - $tables = Db::getInstance()->ExecuteS('SHOW TABLES LIKE \''._DB_PREFIX_.'%_lang\' '); + $tables = Db::getInstance()->executeS('SHOW TABLES LIKE \''._DB_PREFIX_.'%_lang\' '); $langTables = array(); foreach($tables as $table) @@ -354,12 +354,12 @@ class LanguageCore extends ObjectModel if ($t != _DB_PREFIX_.'configuration_lang') $langTables[] = $t; - Db::getInstance()->Execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)'); + Db::getInstance()->execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)'); $return = true; foreach($langTables as $name) { $fields = ''; - $columns = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'.$name.'`'); + $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `'.$name.'`'); foreach($columns as $column) $fields .= $column['Field'].', '; $fields = rtrim($fields, ', '); @@ -374,7 +374,7 @@ class LanguageCore extends ObjectModel } $sql = rtrim($sql, ', '); $sql .= ' FROM `'._DB_PREFIX_.'lang` CROSS JOIN `'.str_replace('_lang', '', $name).'`) ;'; - $return &= Db::getInstance()->Execute(pSQL($sql)); + $return &= Db::getInstance()->execute(pSQL($sql)); } return $return; } @@ -404,17 +404,17 @@ class LanguageCore extends ObjectModel $this->iso_code = self::getIsoById($this->id); // Database translations deletion - $result = Db::getInstance()->ExecuteS('SHOW TABLES FROM `'._DB_NAME_.'`'); + $result = Db::getInstance()->executeS('SHOW TABLES FROM `'._DB_NAME_.'`'); foreach ($result AS $row) if (preg_match('/_lang/', $row['Tables_in_'._DB_NAME_])) - if (!Db::getInstance()->Execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($this->id))) + if (!Db::getInstance()->execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($this->id))) return false; // Delete tags - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'tag WHERE id_lang = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'tag WHERE id_lang = '.(int)($this->id)); // Delete search words - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'search_word WHERE id_lang = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'search_word WHERE id_lang = '.(int)($this->id)); // Files deletion foreach (self::getFilesList($this->iso_code, _THEME_NAME_, false, false, false, true, true) as $key => $file) @@ -567,19 +567,19 @@ class LanguageCore extends ObjectModel */ public static function getIsoIds($active = true) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang` '.($active ? 'WHERE active = 1' : '')); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang` '.($active ? 'WHERE active = 1' : '')); } public static function copyLanguageData($from, $to) { - $result = Db::getInstance()->ExecuteS('SHOW TABLES FROM `'._DB_NAME_.'`'); + $result = Db::getInstance()->executeS('SHOW TABLES FROM `'._DB_NAME_.'`'); foreach ($result AS $row) if (preg_match('/_lang/', $row['Tables_in_'._DB_NAME_]) AND $row['Tables_in_'._DB_NAME_] != _DB_PREFIX_.'lang') { - $result2 = Db::getInstance()->ExecuteS('SELECT * FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($from)); + $result2 = Db::getInstance()->executeS('SELECT * FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($from)); if (!sizeof($result2)) continue; - Db::getInstance()->Execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($to)); + Db::getInstance()->execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($to)); $query = 'INSERT INTO `'.$row['Tables_in_'._DB_NAME_].'` VALUES '; foreach ($result2 AS $row2) { @@ -590,7 +590,7 @@ class LanguageCore extends ObjectModel $query = rtrim($query, ',').'),'; } $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); } return true; } @@ -605,7 +605,7 @@ class LanguageCore extends ObjectModel $sql = 'SELECT l.*, ls.`id_shop` FROM `'._DB_PREFIX_.'lang` l LEFT JOIN `'._DB_PREFIX_.'lang_shop` ls ON (l.id_lang = ls.id_lang)'; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); foreach ($result AS $row) { if (!isset(self::$_LANGUAGES[(int)$row['id_lang']])) @@ -702,7 +702,7 @@ class LanguageCore extends ObjectModel if (self::$_cache_language_installation === null) { self::$_cache_language_installation = array(); - $result = Db::getInstance()->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'); + $result = Db::getInstance()->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'); foreach ($result as $row) self::$_cache_language_installation[$row['iso_code']] = $row['id_lang']; } diff --git a/classes/Manufacturer.php b/classes/Manufacturer.php index b398ed8fb..b9a6a88d3 100644 --- a/classes/Manufacturer.php +++ b/classes/Manufacturer.php @@ -177,7 +177,7 @@ class ManufacturerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'manufacturer_lang` ml ON (m.`id_manufacturer` = ml.`id_manufacturer` AND ml.`id_lang` = '.(int)($id_lang).') WHERE mgs.id_group_shop='.(int)$id_group_shop.($active ? ' AND m.`active` = 1' : ''); $sql.= ' ORDER BY m.`name` ASC'.($p ? ' LIMIT '.(((int)($p) - 1) * (int)($n)).','.(int)($n) : ''); - $manufacturers = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $manufacturers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($manufacturers === false) return false; if ($getNbProducts) @@ -190,7 +190,7 @@ class ManufacturerCore extends ObjectModel } foreach ($manufacturers as $key => $manufacturer) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT p.`id_product` + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT p.`id_product` FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'manufacturer` as m ON (m.`id_manufacturer`= p.`id_manufacturer`) WHERE m.`id_manufacturer` = '.(int)($manufacturer['id_manufacturer']). @@ -273,7 +273,7 @@ class ManufacturerCore extends ObjectModel ($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').' WHERE cg.`id_group` '.$sqlGroups.' )'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return (int)(sizeof($result)); } @@ -303,7 +303,7 @@ class ManufacturerCore extends ObjectModel ORDER BY '.(($orderBy == 'id_product') ? 'p.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay).' LIMIT '.(((int)$p - 1) * (int)$n).','.(int)$n; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!$result) return false; if ($orderBy == 'price') @@ -317,7 +317,7 @@ class ManufacturerCore extends ObjectModel FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('pl').') WHERE p.`id_manufacturer` = '.(int)$this->id; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /* * Specify if a manufacturer already in base @@ -337,7 +337,7 @@ class ManufacturerCore extends ObjectModel public function getAddresses($id_lang) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT a.*, cl.name AS `country`, s.name AS `state` FROM `'._DB_PREFIX_.'address` AS a LEFT JOIN `'._DB_PREFIX_.'country_lang` AS cl ON (cl.`id_country` = a.`id_country` AND cl.`id_lang` = '.(int)($id_lang).') @@ -348,7 +348,7 @@ class ManufacturerCore extends ObjectModel public function getWsAddresses() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT a.id_address as id FROM `'._DB_PREFIX_.'address` AS a WHERE `id_manufacturer` = '.(int)($this->id).' @@ -360,14 +360,14 @@ class ManufacturerCore extends ObjectModel $ids = array(); foreach ($id_addresses as $id) $ids[] = (int)$id['id']; - $result1 = (Db::getInstance()->Execute(' + $result1 = (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'address` SET id_manufacturer = 0 WHERE id_manufacturer = '.(int)$this->id.' AND deleted = 0') !== false); $result2 = true; if (count($ids)) - $result2 = (Db::getInstance()->Execute(' + $result2 = (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'address` SET id_customer = 0, id_supplier = 0, id_manufacturer = '.(int)$this->id.' WHERE id_address IN('.implode(',', $ids).') diff --git a/classes/Message.php b/classes/Message.php index e435afb83..ce2eb5a3c 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -106,7 +106,7 @@ class MessageCore extends ObjectModel if (!$context) $context = Context::getContext(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname, (COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me FROM `'._DB_PREFIX_.'message` m LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer` @@ -133,7 +133,7 @@ class MessageCore extends ObjectModel if (!$context) $context = Context::getContext(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT m.*, c.`firstname` AS cfirstname, c.`lastname` AS clastname, e.`firstname` AS efirstname, e.`lastname` AS elastname, (COUNT(mr.id_message) = 0 AND m.id_customer != 0) AS is_new_for_me FROM `'._DB_PREFIX_.'message` m LEFT JOIN `'._DB_PREFIX_.'customer` c ON m.`id_customer` = c.`id_customer` @@ -156,7 +156,7 @@ class MessageCore extends ObjectModel if (!Validate::isUnsignedId($id_message) OR !Validate::isUnsignedId($id_employee)) die(Tools::displayError()); - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT INTO '._DB_PREFIX_.'message_readed (id_message , id_employee , date_add) VALUES ('.(int)($id_message).', '.(int)($id_employee).', NOW()); '); diff --git a/classes/Meta.php b/classes/Meta.php index 6570f0382..dbdc59831 100644 --- a/classes/Meta.php +++ b/classes/Meta.php @@ -89,7 +89,7 @@ class MetaCore extends ObjectModel public static function getMetas() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM '._DB_PREFIX_.'meta ORDER BY page ASC'); @@ -106,7 +106,7 @@ class MetaCore extends ObjectModel WHERE ml.`id_lang` = '.(int)$id_lang .$shop->sqlLang('ml'). 'ORDER BY page ASC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } diff --git a/classes/Module.php b/classes/Module.php index 36f248b3c..774c03dc7 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -120,7 +120,7 @@ abstract class ModuleCore ) as total FROM '._DB_PREFIX_.'module m'; self::$modulesCache = array(); - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); foreach ($result as $row) { self::$modulesCache[$row['name']] = $row; @@ -167,14 +167,14 @@ abstract class ModuleCore $this->enable(true); // Permissions management - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_access` (`id_profile`, `id_module`, `view`, `configure`) ( SELECT id_profile, '.(int)$this->id.', 1, 1 FROM '._DB_PREFIX_.'access a WHERE id_tab = (SELECT `id_tab` FROM '._DB_PREFIX_.'tab WHERE class_name = \'AdminModules\' LIMIT 1) AND a.`view` = 1 )'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_access` (`id_profile`, `id_module`, `view`, `configure`) ( SELECT id_profile, '.(int)$this->id.', 1, 0 FROM '._DB_PREFIX_.'access a @@ -200,23 +200,23 @@ abstract class ModuleCore $sql = 'SELECT id_hook FROM '._DB_PREFIX_.'hook_module hm WHERE id_module = '.(int)$this->id; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); foreach ($result AS $row) { $sql = 'DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)$this->id.' AND `id_hook` = '.(int)$row['id_hook']; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $this->cleanPositions($row['id_hook']); } $this->disable(true); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_access` WHERE `id_module` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_access` WHERE `id_module` = '.(int)$this->id); // Remove restrictions for client groups Group::truncateRestrictionsByModule($this->id); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'module` WHERE `id_module` = '.(int)$this->id); } @@ -414,7 +414,7 @@ abstract class ModuleCore WHERE `id_module` = '.(int)$this->id.' AND `id_hook` = '.(int)$hook_id .(($shopList) ? ' AND id_shop IN('.implode(', ', $shopList).')' : ''); - $result = Db::getInstance()->Execute($sql); + $result = Db::getInstance()->execute($sql); $this->cleanPositions($hook_id, $shopList); return $result; } @@ -433,7 +433,7 @@ abstract class ModuleCore WHERE `id_module` = '.(int)$this->id.' AND `id_hook` = '.(int)$hook_id .(($shopList) ? ' AND id_shop IN('.implode(', ', $shopList).')' : ''); - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } /** @@ -742,7 +742,7 @@ abstract class ModuleCore $arrNativeModules[] = '"'.pSQL($module['name']).'"'; } - return $db->ExecuteS(' + return $db->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m WHERE name NOT IN ('.implode(',',$arrNativeModules).') '); @@ -763,7 +763,7 @@ abstract class ModuleCore LEFT JOIN `'._DB_PREFIX_.'hook` k ON hm.`id_hook` = k.`id_hook` WHERE k.`position` = 1 GROUP BY m.id_module'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -812,7 +812,7 @@ abstract class ModuleCore $sql .= ' GROUP BY hm.id_hook, hm.id_module ORDER BY hm.`position`'; - $result = $db->ExecuteS($sql, false); + $result = $db->executeS($sql, false); self::$_hookModulesCache = array(); if ($result) @@ -925,7 +925,7 @@ abstract class ModuleCore $sql .= ' GROUP BY hm.id_hook, hm.id_module ORDER BY hm.`position`, m.`name` DESC'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return $result; } @@ -1016,7 +1016,7 @@ abstract class ModuleCore WHERE hm.`id_hook` = '.(int)$id_hook.' AND hm.id_shop = '.$shopID.' ORDER BY hm.`position` '.($way ? 'ASC' : 'DESC'); - if (!$res = Db::getInstance()->ExecuteS($sql)) + if (!$res = Db::getInstance()->executeS($sql)) continue; foreach ($res AS $key => $values) @@ -1038,7 +1038,7 @@ abstract class ModuleCore WHERE position between '.(int)(min(array($from['position'], $to['position']))) .' AND '.(int)(max(array($from['position'], $to['position']))).' AND `id_hook`='.(int)$from['id_hook'].' AND id_shop = '.$shopID; - if (!Db::getInstance()->Execute($sql)) + if (!Db::getInstance()->execute($sql)) return false; $sql = 'UPDATE `'._DB_PREFIX_.'hook_module` @@ -1046,7 +1046,7 @@ abstract class ModuleCore WHERE `'.pSQL($this->identifier).'` = '.(int)($from[$this->identifier]).' AND `id_hook` = '.(int)($to['id_hook']).' AND id_shop = '.$shopID; - if (!Db::getInstance()->Execute($sql)) + if (!Db::getInstance()->execute($sql)) return false; } } @@ -1064,7 +1064,7 @@ abstract class ModuleCore WHERE id_hook = '.(int)$id_hook.' '.((!is_null($shopList)) ? ' AND id_shop IN('.implode(', ', $shopList).')' : '').' ORDER BY position'; - $results = Db::getInstance()->ExecuteS($sql); + $results = Db::getInstance()->executeS($sql); $position = array(); foreach ($results as $row) { @@ -1076,7 +1076,7 @@ abstract class ModuleCore WHERE id_hook = '.(int)$id_hook.' AND id_module = '.$row['id_module'].' AND id_shop = '.$row['id_shop']; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $position[$row['id_shop']]++; } @@ -1117,7 +1117,7 @@ abstract class ModuleCore $sql = 'SELECT * FROM `'._DB_PREFIX_.'hook_module_exceptions` WHERE id_shop IN ('.implode(', ', Context::getContext()->shop->getListOfID()).')'; - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); foreach ($result as $row) { if (!$row['file_name']) @@ -1154,7 +1154,7 @@ abstract class ModuleCore public static function isInstalled($moduleName) { - Db::getInstance()->ExecuteS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); + Db::getInstance()->executeS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); return (bool)Db::getInstance()->NumRows(); } @@ -1293,7 +1293,7 @@ abstract class ModuleCore if (!isset($cache_permissions[$employee->id_profile])) { $cache_permissions[$employee->id_profile] = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT id_module, `view`, `configure` FROM '._DB_PREFIX_.'module_access WHERE id_profile = '.(int)$employee->id_profile); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_module, `view`, `configure` FROM '._DB_PREFIX_.'module_access WHERE id_profile = '.(int)$employee->id_profile); foreach ($result as $row) { $cache_permissions[$employee->id_profile][$row['id_module']]['view'] = $row['view']; @@ -1309,7 +1309,7 @@ abstract class ModuleCore */ public static function getAuthorizedModules($group_id) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT m.id_module, m.name FROM `'._DB_PREFIX_.'group_module_restriction` gmr LEFT JOIN `'._DB_PREFIX_.'module` m ON (m.`id_module` = gmr.`id_module`) WHERE gmr.`id_group` = '.(int) $group_id.' diff --git a/classes/ModuleGraphEngine.php b/classes/ModuleGraphEngine.php index 8420ee87e..274deff68 100644 --- a/classes/ModuleGraphEngine.php +++ b/classes/ModuleGraphEngine.php @@ -43,7 +43,7 @@ abstract class ModuleGraphEngineCore extends Module public static function getGraphEngines() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT m.`name` FROM `'._DB_PREFIX_.'module` m LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` diff --git a/classes/ModuleGridEngine.php b/classes/ModuleGridEngine.php index 3d3a23941..18932c0e6 100644 --- a/classes/ModuleGridEngine.php +++ b/classes/ModuleGridEngine.php @@ -43,7 +43,7 @@ abstract class ModuleGridEngineCore extends Module public static function getGridEngines() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT m.`name` FROM `'._DB_PREFIX_.'module` m LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` diff --git a/classes/Notification.php b/classes/Notification.php index 017729026..302fa8b8a 100644 --- a/classes/Notification.php +++ b/classes/Notification.php @@ -77,7 +77,7 @@ class NotificationCore ORDER BY `id_'.pSQL($type).'` DESC LIMIT 5'; $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) { if (isset($value['id_order'])) { @@ -108,7 +108,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_'.pSQL($type).'` = (SELECT MAX(`id_'.$type.'`) FROM `'._DB_PREFIX_.(($type == 'order') ? pSQL($type).'s' : pSQL($type)).'`) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 51eecb2e0..40b3999de 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -156,7 +156,7 @@ abstract class ObjectModelCore $sql = 'SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.$this->identifier.'` = '.(int)$id .(($this->id_shop) ? ' AND `id_shop` = '.$this->id_shop : ''); - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); if ($result) foreach ($result as $row) foreach ($row AS $key => $value) @@ -342,13 +342,13 @@ abstract class ObjectModelCore $this->clearCache(); /* Database deletion */ - $result = Db::getInstance()->Execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); + $result = Db::getInstance()->execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); if (!$result) return false; /* Database deletion for multilingual fields related to the object */ if (method_exists($this, 'getTranslationsFieldsChild')) - Db::getInstance()->Execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); return $result; } @@ -388,7 +388,7 @@ abstract class ObjectModelCore $this->active = (int)(!$this->active); /* Change status to active/inactive */ - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'.pSQL(_DB_PREFIX_.$this->table).'` SET `active` = !`active` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); @@ -733,12 +733,12 @@ abstract class ObjectModelCore '.($sql_sort != '' ? $sql_sort : '').' '.($sql_limit != '' ? $sql_limit : '').' '; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); } public function getFieldsRequiredDatabase($all = false) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT id_required_field, object_name, field_name FROM '._DB_PREFIX_.'required_field '.(!$all ? 'WHERE object_name = \''.pSQL(get_class($this)).'\'' : '')); @@ -749,7 +749,7 @@ abstract class ObjectModelCore if (!is_array($fields)) return false; - if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'required_field WHERE object_name = \''.pSQL(get_class($this)).'\'')) + if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'required_field WHERE object_name = \''.pSQL(get_class($this)).'\'')) return false; foreach ($fields AS $field) @@ -807,7 +807,7 @@ abstract class ObjectModelCore } if (!empty($sql)) - return Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.$this->table.'_'.$type.'` (`'.$this->identifier.'`, `id_'.$type.'`) VALUES '.rtrim($sql,',')); + return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.$this->table.'_'.$type.'` (`'.$this->identifier.'`, `id_'.$type.'`) VALUES '.rtrim($sql,',')); return true; } @@ -841,7 +841,7 @@ abstract class ObjectModelCore $sql = 'SELECT id_shop FROM '._DB_PREFIX_.$this->table.'_shop WHERE '.$this->identifier.' = '.(int)$id; - if ($results = Db::getInstance()->ExecuteS($sql)) + if ($results = Db::getInstance()->executeS($sql)) { $ids = array(); foreach ($results as $row) diff --git a/classes/Order.php b/classes/Order.php index 0cc59b521..5d8e0a944 100644 --- a/classes/Order.php +++ b/classes/Order.php @@ -355,12 +355,12 @@ class OrderCore extends ObjectModel return false; if ($this->hasBeenDelivered()) - return Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity_returned` = `quantity_returned` + '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id)); + return Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity_returned` = `quantity_returned` + '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id)); elseif ($this->hasBeenPaid()) - return Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity_refunded` = `quantity_refunded` + '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id)); - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity` = `quantity` - '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id))) + return Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity_refunded` = `quantity_refunded` + '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id)); + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customization` SET `quantity` = `quantity` - '.(int)($quantity).' WHERE `id_customization` = '.(int)($id_customization).' AND `id_cart` = '.(int)($this->id_cart).' AND `id_product` = '.(int)($orderDetail->product_id))) return false; - if (!Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization` WHERE `quantity` = 0')) + if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization` WHERE `quantity` = 0')) return false; return $this->_deleteProduct($orderDetail, (int)($quantity)); } @@ -380,7 +380,7 @@ class OrderCore extends ObjectModel if (!isset(self::$_historyCache[$id_order_state]) OR $no_hidden) { $id_lang = $id_lang ? (int)($id_lang) : 'o.`id_lang`'; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT oh.*, e.`firstname` AS employee_firstname, e.`lastname` AS employee_lastname, osl.`name` AS ostate_name FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_history` oh ON o.`id_order` = oh.`id_order` @@ -400,7 +400,7 @@ class OrderCore extends ObjectModel public function getProductsDetail() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = '.(int)($this->id)); @@ -532,7 +532,7 @@ class OrderCore extends ObjectModel FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = '.(int)($this->id).' AND `download_hash` <> \'\''; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -570,7 +570,7 @@ class OrderCore extends ObjectModel */ public function getDiscounts($details = false) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_discount` od '. ($details ? 'LEFT JOIN `'._DB_PREFIX_.'discount` d ON (d.`id_discount` = od.`id_discount`)' : '').' @@ -647,7 +647,7 @@ class OrderCore extends ObjectModel if (!$context) $context = Context::getContext(); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT o.*, (SELECT SUM(od.`product_quantity`) FROM `'._DB_PREFIX_.'order_detail` od WHERE od.`id_order` = o.`id_order`) nb_products FROM `'._DB_PREFIX_.'orders` o WHERE o.`id_customer` = '.(int)$id_customer.' @@ -658,7 +658,7 @@ class OrderCore extends ObjectModel foreach ($res AS $key => $val) { - $res2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $res2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT os.`id_order_state`, osl.`name` AS order_state, os.`invoice` FROM `'._DB_PREFIX_.'order_history` oh LEFT JOIN `'._DB_PREFIX_.'order_state` os ON (os.`id_order_state` = oh.`id_order_state`) @@ -680,7 +680,7 @@ class OrderCore extends ObjectModel '.Context::getContext()->shop->sqlRestriction() .($type ? ' AND '.pSQL(strval($type)).'_number != 0' : '') .($id_customer ? ' AND id_customer = '.(int)($id_customer) : ''); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $orders = array(); foreach ($result AS $order) @@ -708,7 +708,7 @@ class OrderCore extends ObjectModel '.Context::getContext()->shop->sqlRestriction(false, 'o').' ORDER BY o.`date_add` DESC '.((int)$limit ? 'LIMIT 0, '.(int)$limit : ''); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } public static function getOrdersIdInvoiceByDate($date_from, $date_to, $id_customer = NULL, $type = NULL) @@ -720,7 +720,7 @@ class OrderCore extends ObjectModel .($type ? ' AND '.pSQL(strval($type)).'_number != 0' : '') .($id_customer ? ' AND id_customer = '.(int)($id_customer) : ''). ' ORDER BY invoice_date ASC'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $orders = array(); foreach ($result AS $order) @@ -741,7 +741,7 @@ class OrderCore extends ObjectModel ) '.Context::getContext()->shop->sqlRestriction(false, 'o').' ORDER BY invoice_date ASC'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $orders = array(); foreach ($result AS $order) @@ -884,7 +884,7 @@ class OrderCore extends ObjectModel FROM `'._DB_PREFIX_.'orders`) tmp )'; // a way to avoid duplicate invoice number - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'orders` SET `invoice_number` = '.$number.', `invoice_date` = \''.date('Y-m-d H:i:s').'\' WHERE `id_order` = '.(int)$this->id @@ -1030,7 +1030,7 @@ class OrderCore extends ObjectModel public function deleteAssociations() { - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order` = '.(int)($this->id)) !== false); } diff --git a/classes/OrderDetail.php b/classes/OrderDetail.php index 3305f4b6b..76870d234 100644 --- a/classes/OrderDetail.php +++ b/classes/OrderDetail.php @@ -210,7 +210,7 @@ class OrderDetailCore extends ObjectModel SET `download_nb` = `download_nb` + '.(int)($increment).' WHERE `id_order_detail`= '.(int)($id_order_detail).' LIMIT 1'; - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } /** @@ -236,7 +236,7 @@ class OrderDetailCore extends ObjectModel $computation_method = 1; $taxes = array(); - if ($results = Db::getInstance()->ExecuteS($sql)) + if ($results = Db::getInstance()->executeS($sql)) { foreach ($results AS $result) @@ -267,7 +267,7 @@ class OrderDetailCore extends ObjectModel $sql = 'INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (id_order_detail, id_tax) VALUES '.$values; - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } } diff --git a/classes/OrderMessage.php b/classes/OrderMessage.php index ce8ebad91..96b0e9389 100644 --- a/classes/OrderMessage.php +++ b/classes/OrderMessage.php @@ -69,7 +69,7 @@ class OrderMessageCore extends ObjectModel public static function getOrderMessages($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT om.id_order_message, oml.name, oml.message FROM '._DB_PREFIX_.'order_message om LEFT JOIN '._DB_PREFIX_.'order_message_lang oml ON (oml.id_order_message = om.id_order_message) diff --git a/classes/OrderReturn.php b/classes/OrderReturn.php index 6a2a98c05..11e0d7de0 100644 --- a/classes/OrderReturn.php +++ b/classes/OrderReturn.php @@ -136,7 +136,7 @@ class OrderReturnCore extends ObjectModel { if (!$context) $context = Context::getContext(); - $data = Db::getInstance()->ExecuteS(' + $data = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_return` WHERE `id_customer` = '.(int)($customer_id). @@ -153,7 +153,7 @@ class OrderReturnCore extends ObjectModel public static function getOrdersReturnDetail($id_order_return) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_return_detail` WHERE `id_order_return` = '.(int)($id_order_return)); @@ -199,7 +199,7 @@ class OrderReturnCore extends ObjectModel public static function deleteOrderReturnDetail($id_order_return, $id_order_detail, $id_customization = 0) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'order_return_detail` WHERE `id_order_detail` = '.(int)($id_order_detail).' AND `id_order_return` = '.(int)($id_order_return).' AND `id_customization` = '.(int)($id_customization)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'order_return_detail` WHERE `id_order_detail` = '.(int)($id_order_detail).' AND `id_order_return` = '.(int)($id_order_return).' AND `id_customization` = '.(int)($id_customization)); } } diff --git a/classes/OrderReturnState.php b/classes/OrderReturnState.php index e8f0a19e8..aad1752a5 100644 --- a/classes/OrderReturnState.php +++ b/classes/OrderReturnState.php @@ -68,7 +68,7 @@ class OrderReturnStateCore extends ObjectModel */ public static function getOrderReturnStates($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_return_state` ors LEFT JOIN `'._DB_PREFIX_.'order_return_state_lang` orsl ON (ors.`id_order_return_state` = orsl.`id_order_return_state` AND orsl.`id_lang` = '.(int)($id_lang).') diff --git a/classes/OrderSlip.php b/classes/OrderSlip.php index 2e901cee5..1118cc748 100644 --- a/classes/OrderSlip.php +++ b/classes/OrderSlip.php @@ -80,7 +80,7 @@ class OrderSlipCore extends ObjectModel public static function getOrdersSlip($customer_id, $order_id = false) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_slip` WHERE `id_customer` = '.(int)($customer_id). @@ -90,7 +90,7 @@ class OrderSlipCore extends ObjectModel public static function getOrdersSlipDetail($id_order_slip = true, $id_order_detail = false) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS( + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS( ($id_order_detail ? 'SELECT SUM(`product_quantity`) AS `total`' : 'SELECT *'). 'FROM `'._DB_PREFIX_.'order_slip_detail`' .($id_order_slip ? ' WHERE `id_order_slip` = '.(int)($id_order_slip) : '') @@ -131,7 +131,7 @@ class OrderSlipCore extends ObjectModel public function getProducts() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT *, osd.product_quantity FROM `'._DB_PREFIX_.'order_slip_detail` osd INNER JOIN `'._DB_PREFIX_.'order_detail` od ON osd.id_order_detail = od.id_order_detail @@ -149,7 +149,7 @@ class OrderSlipCore extends ObjectModel public static function getSlipsIdByDate($dateFrom, $dateTo) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_order_slip` FROM `'._DB_PREFIX_.'order_slip` WHERE `date_add` BETWEEN \''.pSQL($dateFrom).' 00:00:00\' AND \''.pSQL($dateTo).' 23:59:59\' diff --git a/classes/OrderState.php b/classes/OrderState.php index 3ab46a1ff..16f720253 100644 --- a/classes/OrderState.php +++ b/classes/OrderState.php @@ -101,7 +101,7 @@ class OrderStateCore extends ObjectModel */ public static function getOrderStates($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'order_state` os LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)($id_lang).') diff --git a/classes/Pack.php b/classes/Pack.php index bb4c073dc..e6e3da05f 100644 --- a/classes/Pack.php +++ b/classes/Pack.php @@ -74,7 +74,7 @@ class PackCore extends Product if (array_key_exists($id_product, self::$cachePackItems)) return self::$cachePackItems[$id_product]; - $result = Db::getInstance()->ExecuteS('SELECT id_product_item, quantity FROM '._DB_PREFIX_.'pack where id_product_pack = '.(int)($id_product)); + $result = Db::getInstance()->executeS('SELECT id_product_item, quantity FROM '._DB_PREFIX_.'pack where id_product_pack = '.(int)($id_product)); $arrayResult = array(); foreach ($result AS $row) { @@ -116,7 +116,7 @@ class PackCore extends Product LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`) LEFT JOIN `'._DB_PREFIX_.'tax_lang` tl ON (t.`id_tax` = tl.`id_tax` AND tl.`id_lang` = '.(int)$id_lang.') WHERE a.`id_product_pack` = '.(int)$id_product; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!$full) return $result; @@ -156,7 +156,7 @@ class PackCore extends Product AND p.`id_product` IN ('.$packs.')'; if ($limit) $sql .= ' LIMIT '.(int)$limit; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!$full) return $result; @@ -169,8 +169,8 @@ class PackCore extends Product public static function deleteItems($id_product) { - return Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET cache_is_pack = 0 WHERE id_product = '.(int)($id_product).' LIMIT 1') && - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'pack` WHERE `id_product_pack` = '.(int)($id_product)) && + return Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product SET cache_is_pack = 0 WHERE id_product = '.(int)($id_product).' LIMIT 1') && + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'pack` WHERE `id_product_pack` = '.(int)($id_product)) && Configuration::updateGlobalValue('PS_PACK_FEATURE_ACTIVE', self::isCurrentlyUsed()); } @@ -184,14 +184,14 @@ class PackCore extends Product */ public static function addItem($id_product, $id_item, $qty) { - return Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET cache_is_pack = 1 WHERE id_product = '.(int)($id_product).' LIMIT 1') && + return Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product SET cache_is_pack = 1 WHERE id_product = '.(int)($id_product).' LIMIT 1') && Db::getInstance()->AutoExecute(_DB_PREFIX_.'pack', array('id_product_pack' => (int)($id_product), 'id_product_item' => (int)($id_item), 'quantity' => (int)($qty)), 'INSERT') && Configuration::updateGlobalValue('PS_PACK_FEATURE_ACTIVE', '1'); } public static function duplicate($id_product_old, $id_product_new) { - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'pack (id_product_pack, id_product_item, quantity) + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'pack (id_product_pack, id_product_item, quantity) (SELECT '.(int)($id_product_new).', id_product_item, quantity FROM '._DB_PREFIX_.'pack WHERE id_product_pack = '.(int)($id_product_old).')'); // If return query result, a non-pack product will return false diff --git a/classes/Page.php b/classes/Page.php index ad6be952f..9ba0e99a3 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -116,7 +116,7 @@ class PageCore extends ObjectModel WHERE `id_date_range` = '.(int)$id_date_range.' AND `id_page` = '.(int)$id_page.' AND `id_shop` = ' . $context->shop->getID(); - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); // If no one has seen the page in this date range, it is added if (Db::getInstance()->Affected_Rows() == 0) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 092398d3a..cad8fac0c 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -42,14 +42,14 @@ abstract class PaymentModuleCore extends Module // Insert currencies availability if ($this->currencies_mode == 'checkbox') { - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency) SELECT '.(int)($this->id).', id_currency FROM `'._DB_PREFIX_.'currency` WHERE deleted = 0')) return false; } elseif ($this->currencies_mode == 'radio') { - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_currency` (id_module, id_currency) VALUES ('.(int)($this->id).', -2)')) return false; @@ -58,11 +58,11 @@ abstract class PaymentModuleCore extends Module Tools::displayError('No currency mode for payment module'); // Insert countries availability - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_country` (id_module, id_country) SELECT '.(int)($this->id).', id_country FROM `'._DB_PREFIX_.'country` WHERE active = 1'); // Insert group availability - $return &= Db::getInstance()->Execute(' + $return &= Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_group` (id_module, id_group) SELECT '.(int)($this->id).', id_group FROM `'._DB_PREFIX_.'group`'); @@ -71,9 +71,9 @@ abstract class PaymentModuleCore extends Module public function uninstall() { - if (!Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)($this->id)) - OR !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)($this->id)) - OR !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)($this->id))) + if (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE id_module = '.(int)($this->id)) + OR !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_currency` WHERE id_module = '.(int)($this->id)) + OR !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE id_module = '.(int)($this->id))) return false; return parent::uninstall(); } @@ -563,7 +563,7 @@ abstract class PaymentModuleCore extends Module if (!empty($values)) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'module_currency` (`id_module`, `id_currency`) VALUES '.rtrim($values, ',') ); diff --git a/classes/Product.php b/classes/Product.php index e4234a757..42710e3f6 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -458,7 +458,7 @@ class ProductCore extends ObjectModel */ public function updatePosition($way, $position) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT cp.`id_product`, cp.`position`, cp.`id_category` FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_category` = '.(int)(Tools::getValue('id_category', 1)).' @@ -475,7 +475,7 @@ class ProductCore extends ObjectModel // < and > statements rather than BETWEEN operator // since BETWEEN is treated differently according to databases - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category_product` SET `position`= `position` '.($way ? '- 1' : '+ 1').' WHERE `position` @@ -483,7 +483,7 @@ class ProductCore extends ObjectModel ? '> '.(int)($movedProduct['position']).' AND `position` <= '.(int)($position) : '< '.(int)($movedProduct['position']).' AND `position` >= '.(int)($position)).' AND `id_category`='.(int)($movedProduct['id_category'])) - AND Db::getInstance()->Execute(' + AND Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category_product` SET `position` = '.(int)($position).' WHERE `id_product` = '.(int)($movedProduct['id_product']).' @@ -500,7 +500,7 @@ class ProductCore extends ObjectModel { $return = true; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'category_product` WHERE `id_category` = '.(int)($id_category).' @@ -508,7 +508,7 @@ class ProductCore extends ObjectModel $sizeof = count($result); for ($i = 0; $i < $sizeof; $i++) - $return &= Db::getInstance()->Execute(' + $return &= Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category_product` SET `position` = '.(int)($i).' WHERE `id_category` = '.(int)($id_category).' @@ -566,7 +566,7 @@ class ProductCore extends ObjectModel public static function updateDefaultAttribute($id_product) { $id_product_attribute = self::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()->execute('UPDATE '._DB_PREFIX_.'product SET cache_default_attribute = '.(int)($id_product_attribute).' WHERE id_product = '.(int)($id_product).' LIMIT 1'); } public function validateFieldsLang($die = true, $errorReturn = false) @@ -646,7 +646,7 @@ class ProductCore extends ObjectModel $currentCategories = $this->getCategories(); // for new categ, put product at last position - $resCategNewPos = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $resCategNewPos = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_category, MAX(position)+1 newPos FROM `'._DB_PREFIX_.'category_product` WHERE `id_category` IN('.implode(',', array_map('intval', $categories)).') @@ -664,7 +664,7 @@ class ProductCore extends ObjectModel if (!in_array($newIdCateg, $currentCategories)) $productCats[] = '('.$newIdCateg.', '.$this->id.', '.$newCategPos[$newIdCateg].')'; if (count($productCats)) - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'category_product` (`id_category`, `id_product`, `position`) VALUES '.implode(',', $productCats)); @@ -684,7 +684,7 @@ class ProductCore extends ObjectModel return false; // get max position in each categories - $result = Db::getInstance()->ExecuteS('SELECT `id_category` + $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.''); @@ -712,8 +712,8 @@ class ProductCore extends ObjectModel */ public function deleteCategory($id_category, $cleanPositions = true) { - $result = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` 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.''); + $result = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` 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.''); if ($cleanPositions === true) foreach ($result as $row) $this->cleanPositions((int)$row['id_category']); @@ -728,10 +728,10 @@ class ProductCore extends ObjectModel */ public function deleteCategories($cleanPositions = false) { - $return = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)($this->id)); + $return = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)($this->id)); if ($cleanPositions === true) { - $result = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)($this->id)); + $result = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)($this->id)); foreach ($result as $row) $this->cleanPositions((int)($row['id_category'])); } @@ -745,8 +745,8 @@ class ProductCore extends ObjectModel */ public function deleteTags() { - return (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)($this->id)) - AND Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'tag` WHERE `id_tag` NOT IN (SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag`)')); + return (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)($this->id)) + AND Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'tag` WHERE `id_tag` NOT IN (SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag`)')); } /** @@ -756,7 +756,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()->execute('DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_product` = '.(int)($this->id)); } /** @@ -766,7 +766,7 @@ class ProductCore extends ObjectModel */ public function deleteImages() { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_image` FROM `'._DB_PREFIX_.'image` WHERE `id_product` = '.(int)($this->id)); @@ -830,7 +830,7 @@ class ProductCore extends ObjectModel ($only_active ? ' AND p.`active` = 1' : '').' ORDER BY '.(isset($orderByPrefix) ? pSQL($orderByPrefix).'.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay). ($limit > 0 ? ' LIMIT '.(int)$start.','.(int)$limit : ''); - $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($orderBy == 'price') Tools::orderbyPrice($rq, $orderWay); return ($rq); @@ -847,12 +847,12 @@ class ProductCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` '.$context->shop->sqlLang('pl').') WHERE pl.`id_lang` = '.(int)($id_lang).' ORDER BY pl.`name`'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } public function isNew() { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT id_product FROM `'._DB_PREFIX_.'product` p WHERE 1 AND id_product = '.(int)($this->id).' @@ -866,7 +866,7 @@ class ProductCore extends ObjectModel { if (!Combination::isFeatureActive()) return false; - $result = Db::getInstance()->ExecuteS('SELECT pac.`id_attribute`, pac.`id_product_attribute` + $result = Db::getInstance()->executeS('SELECT pac.`id_attribute`, pac.`id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` pa LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`) WHERE pa.`id_product` = '.(int)($this->id)); @@ -944,7 +944,7 @@ class ProductCore extends ObjectModel foreach ($id_images as $id_image) $query .= '('.(int)($id_product_attribute).', '.(int)($id_image).'), '; $query = trim($query, ', '); - if (!Db::getInstance()->Execute($query)) + if (!Db::getInstance()->execute($query)) return false; return (int)($id_product_attribute); } @@ -952,7 +952,7 @@ class ProductCore extends ObjectModel public function addCombinationEntity($wholesale_price, $price, $weight, $unit_impact, $ecotax, $quantity, $id_images, $reference, $supplier_reference, $ean13, $default, $location = null, $upc = null) { $id_product_attribute = $this->addProductAttribute($price, $weight, $unit_impact, $ecotax, $quantity, $id_images, $reference, $supplier_reference, $ean13, $default, $location, $upc); - $result = Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product_attribute` SET `wholesale_price` = '.(float)$wholesale_price.' WHERE `id_product_attribute` = '.(int)$id_product_attribute); + $result = Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product_attribute` SET `wholesale_price` = '.(float)$wholesale_price.' WHERE `id_product_attribute` = '.(int)$id_product_attribute); if (!$id_product_attribute OR !$result) return false; return $id_product_attribute; @@ -990,10 +990,10 @@ class ProductCore extends ObjectModel $values[] = '('.implode(', ', $v).')'; $keys[] = implode(', ', $k); } - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_attribute` ('.$keys[0].') VALUES '.implode(', ', $values)); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_attribute` ('.$keys[0].') VALUES '.implode(', ', $values)); return (array_map(create_function('$elem', 'return $elem[\'id_product_attribute\'];'), - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` >= '.(int)(Db::getInstance()->Insert_ID()) ))); } @@ -1003,7 +1003,7 @@ class ProductCore extends ObjectModel */ public function deleteDefaultAttributes() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product_attribute` SET `default_on` = 0 WHERE `id_product` = '.(int)($this->id)); @@ -1011,12 +1011,12 @@ class ProductCore extends ObjectModel public function setDefaultAttribute($id_product_attribute) { - return Db::getInstance()->Execute(' + 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(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product` SET `cache_default_attribute` = '.(int)$id_product_attribute.' WHERE `id_product` = '.(int)$this->id.' LIMIT 1'); @@ -1039,7 +1039,7 @@ class ProductCore extends ObjectModel */ public function updateProductAttribute($id_product_attribute, $wholesale_price, $price, $weight, $unit, $ecotax, $quantity, $id_images, $reference, $supplier_reference, $ean13, $default, $location = null, $upc = null, $minimal_quantity, $available_date) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_product_attribute` = '.(int)($id_product_attribute)); @@ -1067,7 +1067,7 @@ class ProductCore extends ObjectModel $this->setStock($data['quantity'], $id_product_attribute); } - if (!Db::getInstance()->AutoExecute(_DB_PREFIX_.'product_attribute', $data, 'UPDATE', '`id_product_attribute` = '.(int)($id_product_attribute)) OR !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_product_attribute` = '.(int)($id_product_attribute))) + if (!Db::getInstance()->AutoExecute(_DB_PREFIX_.'product_attribute', $data, 'UPDATE', '`id_product_attribute` = '.(int)($id_product_attribute)) OR !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_product_attribute` = '.(int)($id_product_attribute))) return false; if ($quantity) Hook::updateProductAttribute($id_product_attribute); @@ -1078,7 +1078,7 @@ class ProductCore extends ObjectModel foreach ($id_images as $id_image) $query .= '('.(int)($id_product_attribute).', '.(int)($id_image).'), '; $query = trim($query, ', '); - return Db::getInstance()->Execute($query); + return Db::getInstance()->execute($query); } /** @@ -1086,7 +1086,7 @@ class ProductCore extends ObjectModel */ public function updateQuantityProductWithAttributeQuantity() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product` SET `quantity` = IFNULL( ( @@ -1105,11 +1105,11 @@ class ProductCore extends ObjectModel { Module::hookExec('deleteProductAttribute', array('id_product_attribute' => 0, 'id_product' => $this->id, 'deleteAllAttributes' => true)); - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_product_attribute` IN (SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id).')'); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); - $result3 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_download` WHERE `id_product` = '.(int)($this->id)); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); + $result3 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_download` WHERE `id_product` = '.(int)($this->id)); return ($result & $result2 & $result3); } @@ -1121,7 +1121,7 @@ class ProductCore extends ObjectModel */ public function deleteAttributesImpacts() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'attribute_impact` WHERE `id_product` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute_impact` WHERE `id_product` = '.(int)($this->id)); } /** @@ -1141,7 +1141,7 @@ class ProductCore extends ObjectModel */ public function deleteAttachments() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_attachment` WHERE `id_product` = '.(int)$this->id); } @@ -1154,8 +1154,8 @@ class ProductCore extends ObjectModel public function deleteCustomization() { return - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id)) && - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id)) && + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` WHERE `id_customization_field` NOT IN (SELECT id_customization_field FROM `'._DB_PREFIX_.'customization_field`)'); } @@ -1166,7 +1166,7 @@ class ProductCore extends ObjectModel */ public function deletePack() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'pack` WHERE `id_product_pack` = '.(int)($this->id).' OR `id_product_item` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'pack` WHERE `id_product_pack` = '.(int)($this->id).' OR `id_product_item` = '.(int)($this->id)); } /** @@ -1176,7 +1176,7 @@ class ProductCore extends ObjectModel */ public function deleteProductSale() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_sale` WHERE `id_product` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_sale` WHERE `id_product` = '.(int)($this->id)); } /** @@ -1186,7 +1186,7 @@ class ProductCore extends ObjectModel */ public function deleteSceneProducts() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'scene_products` WHERE `id_product` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'scene_products` WHERE `id_product` = '.(int)($this->id)); } /** @@ -1197,8 +1197,8 @@ class ProductCore extends ObjectModel public function deleteSearchIndexes() { return - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'search_index` WHERE `id_product` = '.(int)($this->id)) && - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'search_word` WHERE `id_word` NOT IN (SELECT id_word FROM `'._DB_PREFIX_.'search_index`)'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'search_index` WHERE `id_product` = '.(int)($this->id)) && + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'search_word` WHERE `id_word` NOT IN (SELECT id_word FROM `'._DB_PREFIX_.'search_index`)'); } /** @@ -1222,7 +1222,7 @@ class ProductCore extends ObjectModel if (!Validate::isValuesList($attributesList)) die(Tools::displayError()); - $result = Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`) VALUES '.$attributesList); + $result = Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`) VALUES '.$attributesList); return $result; } @@ -1234,7 +1234,7 @@ class ProductCore extends ObjectModel foreach ($combinations[$nb] as $id_attribute) $attributesList .= '('.(int)($id_product_attribute).','.(int)($id_attribute).'),'; $attributesList = rtrim($attributesList, ','); - return Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`) VALUES '.$attributesList); + return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`) VALUES '.$attributesList); } /** @@ -1253,15 +1253,15 @@ class ProductCore extends ObjectModel $sql = 'DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` = '.$id_product_attribute.' AND `id_product` = '.$this->id; - $result = Db::getInstance()->Execute($sql); + $result = Db::getInstance()->execute($sql); $sql = 'DELETE FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_product_attribute` = '.$id_product_attribute; - $result2 = Db::getInstance()->Execute($sql); + $result2 = Db::getInstance()->execute($sql); $sql = 'DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE `id_product_attribute` = '.$id_product_attribute; - $result3 = Db::getInstance()->Execute($sql); + $result3 = Db::getInstance()->execute($sql); return ($result AND $result2 AND $result3); } @@ -1272,7 +1272,7 @@ class ProductCore extends ObjectModel public function deleteFeatures() { // List products features - $features = Db::getInstance()->ExecuteS(' + $features = Db::getInstance()->executeS(' SELECT p.*, f.* FROM `'._DB_PREFIX_.'feature_product` as p LEFT JOIN `'._DB_PREFIX_.'feature_value` as f ON (f.`id_feature_value` = p.`id_feature_value`) @@ -1280,15 +1280,15 @@ class ProductCore extends ObjectModel foreach ($features as $tab) // Delete product custom features if ($tab['custom']) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'feature_value` WHERE `id_feature_value` = '.(int)($tab['id_feature_value'])); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'feature_value_lang` WHERE `id_feature_value` = '.(int)($tab['id_feature_value'])); } // Delete product features - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'feature_product` WHERE `id_product` = '.(int)($this->id)); return ($result); @@ -1314,19 +1314,19 @@ class ProductCore extends ObjectModel '.Product::sqlStock('pa', 'pa').' WHERE pa.`id_product` = '.(int)$this->id.' ORDER BY pa.`id_product_attribute`'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public function getCombinationImages($id_lang) { if (!Combination::isFeatureActive()) return false; - if (!$productAttributes = Db::getInstance()->ExecuteS('SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id))) + if (!$productAttributes = Db::getInstance()->executeS('SELECT `id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id))) return false; $ids = array(); foreach ($productAttributes as $productAttribute) $ids[] = (int)($productAttribute['id_product_attribute']); - if (!$result = Db::getInstance()->ExecuteS(' + if (!$result = Db::getInstance()->executeS(' SELECT pai.`id_image`, pai.`id_product_attribute`, il.`legend` FROM `'._DB_PREFIX_.'product_attribute_image` pai LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (il.`id_image` = pai.`id_image`) @@ -1430,7 +1430,7 @@ class ProductCore extends ObjectModel $sql->leftOuterJoin('product_attribute pa ON (p.`id_product` = pa.`id_product` AND `default_on` = 1)'); } - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($orderBy == 'price') Tools::orderbyPrice($result, $orderWay); @@ -1582,7 +1582,7 @@ class ProductCore extends ObjectModel ) ORDER BY '.(isset($orderByPrefix) ? pSQL($orderByPrefix).'.' : '').'`'.pSQL($orderBy).'`'.' '.pSQL($orderWay).' LIMIT '.(int)($pageNumber * $nbProducts).', '.(int)($nbProducts); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($orderBy == 'price') Tools::orderbyPrice($result, $orderWay); if (!$result) @@ -1599,7 +1599,7 @@ class ProductCore extends ObjectModel public static function getProductCategories($id_product = '') { $ret = array(); - if ($row = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + if ($row = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_category` FROM `'._DB_PREFIX_.'category_product` WHERE `id_product` = '.(int)$id_product)) foreach ($row as $val) @@ -1610,7 +1610,7 @@ class ProductCore extends ObjectModel public static function getProductCategoriesFull($id_product = '', $id_lang) { $ret = array(); - $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cp.`id_category`, cl.`name`, cl.`link_rewrite` FROM `'._DB_PREFIX_.'category_product` cp LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (cp.`id_category` = cl.`id_category`'.Context::getContext()->shop->sqlLang('cl').') WHERE cp.`id_product` = '.(int)$id_product.' @@ -1647,7 +1647,7 @@ class ProductCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (i.`id_image` = il.`id_image` AND il.`id_lang` = '.(int)$id_lang.') WHERE i.`id_product` = '.(int)$this->id.' ORDER BY `position`'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -2116,14 +2116,14 @@ class ProductCore extends ObjectModel SET quantity = quantity + '.(int)$quantity.' WHERE id_product = '.$this->id.' AND id_product_attribute = '.$id_product_attribute; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } else { $sql = 'UPDATE '._DB_PREFIX_.'product SET quantity = quantity + '.(int)$quantity.' WHERE id_product='.$this->id; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } @@ -2135,7 +2135,7 @@ class ProductCore extends ObjectModel $sql = 'UPDATE '._DB_PREFIX_.'stock SET quantity = '.(($update) ? 'quantity + '.$quantity : $quantity).' WHERE id_stock = '.$id_stock; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } else Db::getInstance()->autoExecute(_DB_PREFIX_.'stock', array( @@ -2152,7 +2152,7 @@ class ProductCore extends ObjectModel $sql = 'UPDATE '._DB_PREFIX_.'stock SET quantity = '.(($update) ? 'quantity + '.$quantity : $quantity).' WHERE id_stock = '.$id_stock; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } else Db::getInstance()->autoExecute(_DB_PREFIX_.'stock', array( @@ -2291,7 +2291,7 @@ class ProductCore extends ObjectModel if (!$mini) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product_attribute` SET `default_on` = 1 WHERE `id_product_attribute` = '.(int)($mini['id_attr']))) @@ -2323,7 +2323,7 @@ class ProductCore extends ObjectModel AND al.`id_lang` = '.(int)($id_lang).' AND agl.`id_lang` = '.(int)($id_lang).' ORDER BY ag.`position` ASC, a.`position` ASC'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -2333,7 +2333,7 @@ class ProductCore extends ObjectModel */ public function deleteAccessories() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'accessory` WHERE `id_product_1` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'accessory` WHERE `id_product_1` = '.(int)($this->id)); } /** @@ -2343,7 +2343,7 @@ class ProductCore extends ObjectModel */ public function deleteFromAccessories() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'accessory` WHERE `id_product_2` = '.(int)($this->id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'accessory` WHERE `id_product_2` = '.(int)($this->id)); } /** @@ -2364,7 +2364,7 @@ class ProductCore extends ObjectModel '.$context->shop->sqlAsso('product', 'p').' LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)$id_lang.$context->shop->sqlLang('pl').') WHERE `id_product_1` = '.(int)$id_product; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -2395,7 +2395,7 @@ class ProductCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`) WHERE `id_product_1` = '.(int)($this->id). ($active ? ' AND p.`active` = 1' : ''); - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql)) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) return false; return $this->getProductsProperties($id_lang, $result); @@ -2442,7 +2442,7 @@ class ProductCore extends ObjectModel public static function addFeatureProductImport($id_product, $id_feature, $id_feature_value) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'feature_product` (`id_feature`, `id_product`, `id_feature_value`) VALUES ('.(int)($id_feature).', '.(int)($id_product).', '.(int)($id_feature_value).') ON DUPLICATE KEY UPDATE `id_feature_value` = '.(int)($id_feature_value) @@ -2464,7 +2464,7 @@ class ProductCore extends ObjectModel if (!Feature::isFeatureActive()) return array(); if (!array_key_exists($id_product, self::$_cacheFeatures)) - self::$_cacheFeatures[$id_product] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + self::$_cacheFeatures[$id_product] = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_feature, id_product, id_feature_value FROM `'._DB_PREFIX_.'feature_product` WHERE `id_product` = '.(int)$id_product); @@ -2483,7 +2483,7 @@ class ProductCore extends ObjectModel if (!count($productImplode)) return; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_feature, id_product, id_feature_value FROM `'._DB_PREFIX_.'feature_product` WHERE `id_product` IN ('.implode($productImplode, ',').')'); @@ -2507,7 +2507,7 @@ class ProductCore extends ObjectModel if (!count($productImplode)) return; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_product, name, value, pf.id_feature FROM '._DB_PREFIX_.'feature_product pf LEFT JOIN '._DB_PREFIX_.'feature_lang fl ON (fl.id_feature = pf.id_feature AND fl.id_lang = '.(int)$id_lang.') @@ -2554,7 +2554,7 @@ class ProductCore extends ObjectModel $sql->where($where); Product::sqlStock('p', 'pa', false, $context->shop, $sql); - $result = Db::getInstance()->ExecuteS($sql); + $result = Db::getInstance()->executeS($sql); if (!$result) return false; @@ -2579,14 +2579,14 @@ class ProductCore extends ObjectModel $return = true; $combinationImages = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($id_product_old)); foreach ($result as $row) { $id_product_attribute_old = (int)($row['id_product_attribute']); - $result2 = Db::getInstance()->ExecuteS(' + $result2 = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'product_attribute_combination` WHERE `id_product_attribute` = '.$id_product_attribute_old); @@ -2618,7 +2618,7 @@ class ProductCore extends ObjectModel public static function _getAttributeImageAssociations($id_product_attribute) { $combinationImages = array(); - $data = Db::getInstance()->ExecuteS(' + $data = Db::getInstance()->executeS(' SELECT `id_image` FROM `'._DB_PREFIX_.'product_attribute_image` WHERE `id_product_attribute` = '.(int)($id_product_attribute)); @@ -2631,7 +2631,7 @@ class ProductCore extends ObjectModel { $return = true; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'accessory` WHERE `id_product_1` = '.(int)($id_product_old)); @@ -2647,14 +2647,14 @@ class ProductCore extends ObjectModel public static function duplicateTags($id_product_old, $id_product_new) { - $tags = Db::getInstance()->ExecuteS('SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)($id_product_old)); + $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'; foreach ($tags as $tag) $query .= ' ('.(int)($id_product_new).', '.(int)($tag['id_tag']).'),'; $query = rtrim($query, ','); - return Db::getInstance()->Execute($query); + return Db::getInstance()->execute($query); } public static function duplicateDownload($id_product_old, $id_product_new) @@ -2662,7 +2662,7 @@ class ProductCore extends ObjectModel $sql = 'SELECT `display_filename`, `filename`, `date_add`, `date_expiration`, `nb_days_accessible`, `nb_downloadable`, `active`, `is_shareable` FROM `'._DB_PREFIX_.'product_download` WHERE `id_product` = '.(int)$id_product_old; - $resource = Db::getInstance()->Execute($sql); + $resource = Db::getInstance()->execute($sql); if (!Db::getInstance()->NumRows()) return true; @@ -2670,7 +2670,7 @@ class ProductCore extends ObjectModel while ($row = Db::getInstance()->nextRow($resource)) $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); + return Db::getInstance()->execute($query); } /** @@ -2683,7 +2683,7 @@ class ProductCore extends ObjectModel { $return = true; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'feature_product` WHERE `id_product` = '.(int)($id_product_old)); @@ -2728,7 +2728,7 @@ class ProductCore extends ObjectModel return false; $customizations = array(); - if (($customizations['fields'] = Db::getInstance()->ExecuteS(' + if (($customizations['fields'] = Db::getInstance()->executeS(' SELECT `id_customization_field`, `type`, `required` FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($productId).' @@ -2739,7 +2739,7 @@ class ProductCore extends ObjectModel $customizationFieldIds = array(); foreach ($customizations['fields'] as $customizationField) $customizationFieldIds[] = (int)($customizationField['id_customization_field']); - if (($customizationLabels = Db::getInstance()->ExecuteS(' + if (($customizationLabels = Db::getInstance()->executeS(' SELECT `id_customization_field`, `id_lang`, `name` FROM `'._DB_PREFIX_.'customization_field_lang` WHERE `id_customization_field` IN ('.implode(', ', $customizationFieldIds).') @@ -2781,7 +2781,7 @@ class ProductCore extends ObjectModel foreach ($customizations['labels'][$oldCustomizationFieldId] as $customizationLabel) $query .= '('.(int)($customizationFieldId).', '.(int)($customizationLabel['id_lang']).', \''.pSQL($customizationLabel['name']).'\'), '; $query = rtrim($query, ', '); - if (!Db::getInstance()->Execute($query)) + if (!Db::getInstance()->execute($query)) return false; } } @@ -2905,7 +2905,7 @@ class ProductCore extends ObjectModel return array(); if (!array_key_exists($id_product.'-'.$id_lang, self::$_frontFeaturesCache)) { - self::$_frontFeaturesCache[$id_product.'-'.$id_lang] = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + self::$_frontFeaturesCache[$id_product.'-'.$id_lang] = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT name, value, pf.id_feature FROM '._DB_PREFIX_.'feature_product pf LEFT JOIN '._DB_PREFIX_.'feature_lang fl ON (fl.id_feature = pf.id_feature AND fl.id_lang = '.(int)$id_lang.') @@ -2924,7 +2924,7 @@ class ProductCore extends ObjectModel public static function getAttachmentsStatic($id_lang, $id_product) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM '._DB_PREFIX_.'product_attachment pa LEFT JOIN '._DB_PREFIX_.'attachment a ON a.id_attachment = pa.id_attachment @@ -2952,7 +2952,7 @@ class ProductCore extends ObjectModel if (!$id_lang) $id_lang = Context::getContext()->language->id; - if (!$result = Db::getInstance()->ExecuteS(' + if (!$result = Db::getInstance()->executeS(' SELECT cd.`id_customization`, c.`id_product`, cfl.`id_customization_field`, c.`id_product_attribute`, cd.`type`, cd.`index`, cd.`value`, cfl.`name` FROM `'._DB_PREFIX_.'customized_data` cd NATURAL JOIN `'._DB_PREFIX_.'customization` c @@ -2964,7 +2964,7 @@ class ProductCore extends ObjectModel $customizedDatas = array(); foreach ($result as $row) $customizedDatas[(int)($row['id_product'])][(int)($row['id_product_attribute'])][(int)($row['id_customization'])]['datas'][(int)($row['type'])][] = $row; - if (!$result = Db::getInstance()->ExecuteS('SELECT `id_product`, `id_product_attribute`, `id_customization`, `quantity`, `quantity_refunded`, `quantity_returned` + if (!$result = Db::getInstance()->executeS('SELECT `id_product`, `id_product_attribute`, `id_customization`, `quantity`, `quantity_refunded`, `quantity_returned` FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)($id_cart).($only_in_cart ? ' AND `in_cart` = 1' : ''))) return false; foreach ($result as $row) @@ -3036,7 +3036,7 @@ class ProductCore extends ObjectModel { $max = array(Product::CUSTOMIZE_FILE => (int)(Tools::getValue('uploadable_files')), Product::CUSTOMIZE_TEXTFIELD => (int)(Tools::getValue('text_fields'))); /* Get customization field ids */ - if (($result = Db::getInstance()->ExecuteS('SELECT `id_customization_field`, `type` FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id).' + if (($result = Db::getInstance()->executeS('SELECT `id_customization_field`, `type` FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id).' ORDER BY `id_customization_field`')) === false) return false; if (empty($result)) @@ -3049,18 +3049,18 @@ class ProductCore extends ObjectModel /* If too much inside the database, deletion */ if ($extraFile > 0 && count($customizationFields[Product::CUSTOMIZE_FILE]) - $extraFile >= 0 && - (!Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field` + (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id).' AND `type` = '.Product::CUSTOMIZE_FILE.' AND `id_customization_field` >= '.(int)($customizationFields[Product::CUSTOMIZE_FILE][count($customizationFields[Product::CUSTOMIZE_FILE]) - $extraFile])) - || !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` WHERE `id_customization_field` NOT IN (SELECT `id_customization_field` FROM `'._DB_PREFIX_.'customization_field`)'))) return false; if ($extraText > 0 && count($customizationFields[Product::CUSTOMIZE_TEXTFIELD]) - $extraText >= 0 && - (!Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field` + (!Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id).' AND `type` = '.Product::CUSTOMIZE_TEXTFIELD.' AND `id_customization_field` >= '.(int)($customizationFields[Product::CUSTOMIZE_TEXTFIELD][count($customizationFields[Product::CUSTOMIZE_TEXTFIELD]) - $extraText])) - || !Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` + || !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'customization_field_lang` WHERE `id_customization_field` NOT IN (SELECT `id_customization_field` FROM `'._DB_PREFIX_.'customization_field`)'))) return false; @@ -3073,7 +3073,7 @@ class ProductCore extends ObjectModel protected function _createLabel(&$languages, $type) { // Label insertion - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'customization_field` (`id_product`, `type`, `required`) VALUES ('.(int)$this->id.', '.(int)($type).', 0)') || !$id_customization_field = (int)(Db::getInstance()->Insert_ID())) @@ -3084,7 +3084,7 @@ class ProductCore extends ObjectModel foreach ($languages as $language) $values .= '('.(int)($id_customization_field).', '.(int)($language['id_lang']).', \'\'), '; $values = rtrim($values, ', '); - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES '.$values)) return false; @@ -3119,7 +3119,7 @@ class ProductCore extends ObjectModel if (!$tmp = $this->_checkLabelField($field, $value)) return false; /* Multilingual label name update */ - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES ('.(int)($tmp[2]).', '.(int)($tmp[3]).', \''.pSQL($value).'\') ON DUPLICATE KEY UPDATE `name` = \''.pSQL($value).'\'')) @@ -3127,10 +3127,10 @@ class ProductCore extends ObjectModel $isRequired = isset($_POST['require_'.(int)($tmp[1]).'_'.(int)($tmp[2])]) ? 1 : 0; $hasRequiredFields |= $isRequired; /* Require option update */ - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'customization_field` SET `required` = '.(int)($isRequired).' WHERE `id_customization_field` = '.(int)($tmp[2]))) + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'customization_field` SET `required` = '.(int)($isRequired).' WHERE `id_customization_field` = '.(int)($tmp[2]))) return false; } - if ($hasRequiredFields && !Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = 2 WHERE `id_product` = '.(int)($this->id))) + if ($hasRequiredFields && !Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product` SET `customizable` = 2 WHERE `id_product` = '.(int)($this->id))) return false; if (!$this->_deleteOldLabels()) return false; @@ -3141,7 +3141,7 @@ class ProductCore extends ObjectModel { if (!Customization::isFeatureActive()) return false; - if (!$result = Db::getInstance()->ExecuteS(' + if (!$result = Db::getInstance()->executeS(' SELECT cf.`id_customization_field`, cf.`type`, cf.`required`, cfl.`name`, cfl.`id_lang` FROM `'._DB_PREFIX_.'customization_field` cf NATURAL JOIN `'._DB_PREFIX_.'customization_field_lang` cfl @@ -3160,7 +3160,7 @@ class ProductCore extends ObjectModel { if (!Customization::isFeatureActive()) return array(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_customization_field`, `type` FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id)); @@ -3170,7 +3170,7 @@ class ProductCore extends ObjectModel { if (!Customization::isFeatureActive()) return array(); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_customization_field`, `type` FROM `'._DB_PREFIX_.'customization_field` WHERE `id_product` = '.(int)($this->id).' @@ -3218,7 +3218,7 @@ class ProductCore extends ObjectModel if (isset(self::$_incat[md5($sql)])) return self::$_incat[md5($sql)]; - if (!Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql)) + if (!Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) return false; self::$_incat[md5($sql)] = (Db::getInstance(_PS_USE_SQL_SLAVE_)->NumRows() > 0 ? true : false); return self::$_incat[md5($sql)]; @@ -3292,7 +3292,7 @@ class ProductCore extends ObjectModel public function getStockMvts($id_lang) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT sm.id_stock_mvt, sm.date_add, sm.quantity, sm.id_order, CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name, CONCAT(e.lastname, \' \', e.firstname) employee, mrl.name reason FROM `'._DB_PREFIX_.'stock_mvt` sm @@ -3308,7 +3308,7 @@ class ProductCore extends ObjectModel public static function getUrlRewriteInformations($id_product) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT pl.`id_lang`, pl.`link_rewrite`, p.`ean13`, cl.`link_rewrite` AS category_rewrite FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product`'.Context::getContext()->shop->sqlLang('pl').') @@ -3434,7 +3434,7 @@ class ProductCore extends ObjectModel $ids = array_map('intval', $ids); foreach ($ids as $position => $id) $sqlValues[] = '('.(int)$id.', '.(int)$this->id.', '.(int)$position.')'; - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'category_product` (`id_category`, `id_product`, `position`) VALUES '.implode(',', $sqlValues) ); @@ -3451,7 +3451,7 @@ class ProductCore extends ObjectModel */ public function getWsCombinations() { - $result = Db::getInstance()->ExecuteS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); + $result = Db::getInstance()->executeS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); return $result; } @@ -3468,13 +3468,13 @@ class ProductCore extends ObjectModel $ids_new[] = (int)$combination['id']; $ids_orig = array(); - $original = Db::getInstance()->ExecuteS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); + $original = Db::getInstance()->executeS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product` = '.(int)($this->id)); if (is_array($original)) foreach ($original as $id) $ids_orig[] = $id['id']; $all_ids = array(); - $all = Db::getInstance()->ExecuteS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute`'); + $all = Db::getInstance()->executeS('SELECT `id_product_attribute` as id FROM `'._DB_PREFIX_.'product_attribute`'); if (is_array($all)) foreach ($all as $id) $all_ids[] = $id['id']; @@ -3491,15 +3491,15 @@ class ProductCore extends ObjectModel // Delete rows if (count($toDelete) > 0) - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(',', $toDelete).')'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_attribute` WHERE `id_product_attribute` IN ('.implode(',', $toDelete).')'); foreach ($toAdd as $id) { // Update id_product if exists else create if (in_array($id, $all_ids)) - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product_attribute` SET id_product = '.(int)$this->id.' WHERE id_product_attribute='.$id); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product_attribute` SET id_product = '.(int)$this->id.' WHERE id_product_attribute='.$id); else - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_attribute` (`id_product`) VALUES ('.$this->id.')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_attribute` (`id_product`) VALUES ('.$this->id.')'); } return true; } @@ -3511,7 +3511,7 @@ class ProductCore extends ObjectModel */ public function getWsProductOptionValues() { - $result = Db::getInstance()->ExecuteS('SELECT DISTINCT pac.id_attribute as id + $result = Db::getInstance()->executeS('SELECT DISTINCT pac.id_attribute as id FROM `'._DB_PREFIX_.'product_attribute` pa LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.id_product_attribute = pa.id_product_attribute) WHERE pa.id_product = '.(int)$this->id); @@ -3525,7 +3525,7 @@ class ProductCore extends ObjectModel */ public function getWsPositionInCategory() { - $result = Db::getInstance()->ExecuteS('SELECT position + $result = Db::getInstance()->executeS('SELECT position FROM `'._DB_PREFIX_.'category_product` WHERE id_category = '.(int)($this->id_category_default).' AND id_product = '.(int)($this->id)); @@ -3552,10 +3552,10 @@ class ProductCore extends ObjectModel */ public function setCoverWs($id_image) { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'image` + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image` SET `cover` = 0 WHERE `id_product` = '.(int)($this->id).' '); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'image` + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'image` SET `cover` = 1 WHERE `id_product` = '.(int)($this->id).' AND `id_image` = '.(int)$id_image); return true; } @@ -3567,7 +3567,7 @@ class ProductCore extends ObjectModel */ public function getWsImages() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_image` as id FROM `'._DB_PREFIX_.'image` WHERE `id_product` = '.(int)($this->id).' @@ -3576,7 +3576,7 @@ class ProductCore extends ObjectModel public function getWsTags() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_tag` as id FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)($this->id)); @@ -3590,7 +3590,7 @@ class ProductCore extends ObjectModel public static function resetEcoTax() { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product` SET ecotax = 0 '); diff --git a/classes/ProductDownload.php b/classes/ProductDownload.php index 13cee5f96..8d025d02b 100644 --- a/classes/ProductDownload.php +++ b/classes/ProductDownload.php @@ -236,7 +236,7 @@ class ProductDownloadCore extends ObjectModel */ public static function getAttributeFromIdProduct($id_product) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_product_download` FROM `'._DB_PREFIX_.'product_download` WHERE `id_product` = '.(int)$id_product.' AND `active` = 1'); diff --git a/classes/ProductSale.php b/classes/ProductSale.php index a8d5ea0c1..97fe24847 100644 --- a/classes/ProductSale.php +++ b/classes/ProductSale.php @@ -37,7 +37,7 @@ class ProductSaleCore (`id_product`, `quantity`, `sale_nbr`, `date_upd`) SELECT od.product_id, COUNT(od.product_id), SUM(od.product_quantity), NOW() FROM '._DB_PREFIX_.'order_detail od GROUP BY od.product_id'; - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } /* @@ -103,7 +103,7 @@ class ProductSaleCore ) ORDER BY `'.pSQL($orderBy).'` '.pSQL($orderWay).' LIMIT '.(int)($pageNumber * $nbProducts).', '.(int)$nbProducts; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if ($orderBy == 'price') Tools::orderbyPrice($result,$orderWay); @@ -147,7 +147,7 @@ class ProductSaleCore ) ORDER BY sales DESC LIMIT '.(int)($pageNumber * $nbProducts).', '.(int)$nbProducts; - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql)) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) return false; foreach ($result AS &$row) @@ -160,7 +160,7 @@ class ProductSaleCore public static function addProductSale($product_id, $qty = 1) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO '._DB_PREFIX_.'product_sale (`id_product`, `quantity`, `sale_nbr`, `date_upd`) VALUES ('.(int)($product_id).', '.(int)($qty).', 1, NOW()) @@ -179,9 +179,9 @@ class ProductSaleCore { $nbrSales = self::getNbrSales($id_product); if ($nbrSales > 1) - return Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product_sale SET `quantity` = `quantity` - '.(int)($qty).', `sale_nbr` = `sale_nbr` - 1, `date_upd` = NOW() WHERE `id_product` = '.(int)($id_product)); + return Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product_sale SET `quantity` = `quantity` - '.(int)($qty).', `sale_nbr` = `sale_nbr` - 1, `date_upd` = NOW() WHERE `id_product` = '.(int)($id_product)); elseif ($nbrSales == 1) - return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_sale WHERE `id_product` = '.(int)($id_product)); + return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_sale WHERE `id_product` = '.(int)($id_product)); return true; } } diff --git a/classes/Profile.php b/classes/Profile.php index f595e747c..90fdcb834 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -60,7 +60,7 @@ class ProfileCore extends ObjectModel */ public static function getProfiles($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_profile`, `name` FROM `'._DB_PREFIX_.'profile` p LEFT JOIN `'._DB_PREFIX_.'profile_lang` pl ON (p.`id_profile` = pl.`id_profile` AND `id_lang` = '.(int)($id_lang).') @@ -89,8 +89,8 @@ class ProfileCore extends ObjectModel { if (parent::add($autodate, true)) return ( - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'access (SELECT '.(int)$this->id.', id_tab, 0, 0, 0, 0 FROM '._DB_PREFIX_.'tab)') - && Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'module_access (`id_profile`, `id_module`, `configure`, `view`) (SELECT '.(int)$this->id.', id_module, 0, 1 FROM '._DB_PREFIX_.'module)') + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'access (SELECT '.(int)$this->id.', id_tab, 0, 0, 0, 0 FROM '._DB_PREFIX_.'tab)') + && Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_access (`id_profile`, `id_module`, `configure`, `view`) (SELECT '.(int)$this->id.', id_module, 0, 1 FROM '._DB_PREFIX_.'module)') ); return false; } @@ -99,8 +99,8 @@ class ProfileCore extends ObjectModel { if (parent::delete()) return ( - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'access` WHERE `id_profile` = '.(int)$this->id) - && Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_access` WHERE `id_profile` = '.(int)$this->id) + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'access` WHERE `id_profile` = '.(int)$this->id) + && Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_access` WHERE `id_profile` = '.(int)$this->id) ); return false; } @@ -117,7 +117,7 @@ class ProfileCore extends ObjectModel { if (!isset(self::$_cache_accesses[$id_profile])) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'access` WHERE `id_profile` = '.(int)$id_profile); diff --git a/classes/QuickAccess.php b/classes/QuickAccess.php index 078630ca9..e91295418 100644 --- a/classes/QuickAccess.php +++ b/classes/QuickAccess.php @@ -72,7 +72,7 @@ class QuickAccessCore extends ObjectModel */ public static function getQuickAccesses($id_lang) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'quick_access` qa LEFT JOIN `'._DB_PREFIX_.'quick_access_lang` qal ON (qa.`id_quick_access` = qal.`id_quick_access` AND qal.`id_lang` = '.(int)($id_lang).') diff --git a/classes/RangePrice.php b/classes/RangePrice.php index 8c3cdd066..edccdb43a 100644 --- a/classes/RangePrice.php +++ b/classes/RangePrice.php @@ -61,7 +61,7 @@ class RangePriceCore extends ObjectModel */ public static function getRanges($id_carrier) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'range_price` WHERE `id_carrier` = '.(int)($id_carrier).' diff --git a/classes/RangeWeight.php b/classes/RangeWeight.php index 33bf22f61..bd307ec6e 100644 --- a/classes/RangeWeight.php +++ b/classes/RangeWeight.php @@ -61,7 +61,7 @@ class RangeWeightCore extends ObjectModel */ public static function getRanges($id_carrier) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'range_weight` WHERE `id_carrier` = '.(int)($id_carrier).' diff --git a/classes/Referrer.php b/classes/Referrer.php index 148af8b3c..f352a0a6c 100644 --- a/classes/Referrer.php +++ b/classes/Referrer.php @@ -108,7 +108,7 @@ class ReferrerCore extends ObjectModel LEFT JOIN '._DB_PREFIX_.'connections_source cs ON ('.self::$_join.') WHERE id_connections_source = '.(int)($id_connections_source).' )'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } /** @@ -127,7 +127,7 @@ class ReferrerCore extends ObjectModel WHERE g.id_customer = '.(int)($id_customer).' AND r.name IS NOT NULL ORDER BY c.date_add DESC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } /** @@ -266,7 +266,7 @@ class ReferrerCore extends ObjectModel public static function refreshCache($referrers = null, $employee = null) { if (!$referrers OR !is_array($referrers)) - $referrers = Db::getInstance()->ExecuteS('SELECT id_referrer FROM '._DB_PREFIX_.'referrer'); + $referrers = Db::getInstance()->executeS('SELECT id_referrer FROM '._DB_PREFIX_.'referrer'); foreach ($referrers as $row) { $referrer = new Referrer($row['id_referrer']); @@ -307,8 +307,8 @@ class ReferrerCore extends ObjectModel { if (!$referrers OR !is_array($referrers)) { - Db::getInstance()->Execute('TRUNCATE '._DB_PREFIX_.'referrer_cache'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('TRUNCATE '._DB_PREFIX_.'referrer_cache'); + Db::getInstance()->execute(' INSERT INTO '._DB_PREFIX_.'referrer_cache (id_referrer, id_connections_source) ( SELECT id_referrer, id_connections_source FROM '._DB_PREFIX_.'referrer r @@ -318,8 +318,8 @@ class ReferrerCore extends ObjectModel else foreach ($referrers as $row) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'referrer_cache WHERE id_referrer = '.(int)($row['id_referrer'])); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'referrer_cache WHERE id_referrer = '.(int)($row['id_referrer'])); + Db::getInstance()->execute(' INSERT INTO '._DB_PREFIX_.'referrer_cache (id_referrer, id_connections_source) ( SELECT id_referrer, id_connections_source FROM '._DB_PREFIX_.'referrer r diff --git a/classes/RequestSql.php b/classes/RequestSql.php index 5a720923b..430c71f77 100644 --- a/classes/RequestSql.php +++ b/classes/RequestSql.php @@ -67,7 +67,7 @@ class RequestSqlCore extends ObjectModel public static function getRequestSql() { - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'request_sql` ORDER BY `id_request_sql`')) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT * FROM `'._DB_PREFIX_.'request_sql` ORDER BY `id_request_sql`')) return false; $request_sql = array(); foreach ($result as $row) @@ -77,7 +77,7 @@ class RequestSqlCore extends ObjectModel public static function getRequestSqlById($id) { - return Db::getInstance()->ExecuteS(sprintf('SELECT `sql` FROM `'._DB_PREFIX_.'request_sql` WHERE `id_request_sql` = %d', $id)); + return Db::getInstance()->executeS(sprintf('SELECT `sql` FROM `'._DB_PREFIX_.'request_sql` WHERE `id_request_sql` = %d', $id)); } public function parsingSql($sql) @@ -140,14 +140,14 @@ class RequestSqlCore extends ObjectModel } if (empty($this->_errors)) - if (!Db::getInstance()->ExecuteS($sql)) + if (!Db::getInstance()->executeS($sql)) return false; return true; } public function showTables() { - $results = Db::getInstance()->ExecuteS('SHOW TABLES'); + $results = Db::getInstance()->executeS('SHOW TABLES'); foreach ($results as $result) { $key = array_keys($result); @@ -223,7 +223,7 @@ class RequestSqlCore extends ObjectModel { if (is_array($table) && (count($table) == 1)) $table = $table[0]; - $attributs = Db::getInstance()->ExecuteS(sprintf('DESCRIBE `%s`', $table)); + $attributs = Db::getInstance()->executeS(sprintf('DESCRIBE `%s`', $table)); foreach ($attributs as $attribut) if ($attribut['Field'] == trim($attr)) return true; diff --git a/classes/Scene.php b/classes/Scene.php index ad31b98be..d24051c69 100644 --- a/classes/Scene.php +++ b/classes/Scene.php @@ -146,7 +146,7 @@ class SceneCore extends ObjectModel $result = true; foreach ($categories AS $category) { - if (!Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'scene_category` ( `id_scene` , `id_category`) VALUES ('.(int)($this->id).', '.(int)($category).')')) + if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'scene_category` ( `id_scene` , `id_category`) VALUES ('.(int)($this->id).', '.(int)($category).')')) $result = false; } return $result; @@ -154,7 +154,7 @@ class SceneCore extends ObjectModel public function deleteCategories() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'scene_category` WHERE `id_scene` = '.(int)($this->id)); } @@ -175,7 +175,7 @@ class SceneCore extends ObjectModel { $sql = 'INSERT INTO `'._DB_PREFIX_.'scene_products` ( `id_scene` , `id_product` , `x_axis` , `y_axis` , `zone_width` , `zone_height`) VALUES ('.(int)($this->id).', '.(int)($zone['id_product']).', '.(int)($zone['x1']).', '.(int)($zone['y1']).', '.(int)($zone['width']).', '.(int)($zone['height']).')'; - if (!Db::getInstance()->Execute($sql)) + if (!Db::getInstance()->execute($sql)) $result = false; } return $result; @@ -183,7 +183,7 @@ class SceneCore extends ObjectModel public function deleteZoneProducts() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'scene_products` WHERE `id_scene` = '.(int)($this->id)); } @@ -220,7 +220,7 @@ class SceneCore extends ObjectModel AND sl.id_lang = '.(int)$id_lang .($onlyActive ? ' AND s.active = 1' : '').' ORDER BY sl.name ASC'; - $scenes = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $scenes = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!$liteResult AND $scenes) foreach($scenes AS &$scene) @@ -242,7 +242,7 @@ class SceneCore extends ObjectModel $context = Context::getContext(); $id_lang = is_null($id_lang) ? $context->language->id : $id_lang; - $products = Db::getInstance()->ExecuteS(' + $products = Db::getInstance()->executeS(' SELECT s.* FROM `'._DB_PREFIX_.'scene_products` s LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product = s.id_product) @@ -268,7 +268,7 @@ class SceneCore extends ObjectModel */ public static function getIndexedCategories($id_scene) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT `id_category` FROM `'._DB_PREFIX_.'scene_category` WHERE `id_scene` = '.(int)($id_scene)); diff --git a/classes/Search.php b/classes/Search.php index eeff42cc0..1c4832d1a 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -218,14 +218,14 @@ class SearchCore SELECT id_group FROM '._DB_PREFIX_.'customer_group WHERE id_customer = '.(int)$id_customer.' )'); - $result = $db->ExecuteS($sql, false); + $result = $db->executeS($sql, false); $eligibleProducts = array(); while ($row = $db->nextRow($result)) $eligibleProducts[] = $row['id_product']; foreach ($intersectArray as $query) { - $result = $db->ExecuteS($query, false); + $result = $db->executeS($query, false); $eligibleProducts2 = array(); while ($row = $db->nextRow($result)) $eligibleProducts2[] = $row['id_product']; @@ -253,7 +253,7 @@ class SearchCore INNER JOIN `'._DB_PREFIX_.'category_lang` cl ON (p.`id_category_default` = cl.`id_category` AND cl.`id_lang` = '.(int)$id_lang.$context->shop->sqlLang('cl').') WHERE p.`id_product` '.$productPool.' ORDER BY position DESC LIMIT 10'; - return $db->ExecuteS($sql); + return $db->executeS($sql); } $sql = 'SELECT p.*, pl.`description_short`, pl.`available_now`, pl.`available_later`, pl.`link_rewrite`, pl.`name`, @@ -270,7 +270,7 @@ class SearchCore WHERE p.`id_product` '.$productPool.' '.($orderBy ? 'ORDER BY '.$orderBy : '').($orderWay ? ' '.$orderWay : '').' LIMIT '.(int)(($pageNumber - 1) * $pageSize).','.(int)$pageSize; - $result = $db->ExecuteS($sql); + $result = $db->executeS($sql); $sql = 'SELECT COUNT(*) FROM '._DB_PREFIX_.'product p @@ -296,7 +296,7 @@ class SearchCore public static function getTags($db, $id_product, $id_lang) { $tags = ''; - $tagsArray = $db->ExecuteS(' + $tagsArray = $db->executeS(' SELECT t.name FROM '._DB_PREFIX_.'product_tag pt LEFT JOIN '._DB_PREFIX_.'tag t ON (pt.id_tag = t.id_tag AND t.id_lang = '.(int)$id_lang.') WHERE pt.id_product = '.(int)$id_product); @@ -311,7 +311,7 @@ class SearchCore return ''; $attributes = ''; - $attributesArray = $db->ExecuteS(' + $attributesArray = $db->executeS(' SELECT al.name FROM '._DB_PREFIX_.'product_attribute pa INNER JOIN '._DB_PREFIX_.'product_attribute_combination pac ON pa.id_product_attribute = pac.id_product_attribute INNER JOIN '._DB_PREFIX_.'attribute_lang al ON (pac.id_attribute = al.id_attribute AND al.id_lang = '.(int)$id_lang.') @@ -327,7 +327,7 @@ class SearchCore return ''; $features = ''; - $featuresArray = $db->ExecuteS(' + $featuresArray = $db->executeS(' SELECT fvl.value FROM '._DB_PREFIX_.'feature_product fp LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fp.id_feature_value = fvl.id_feature_value AND fvl.id_lang = '.(int)$id_lang.') WHERE fp.id_product = '.(int)$id_product); @@ -340,7 +340,7 @@ class SearchCore { // Adjust the limit to get only "whole" products, in every languages (and at least one) $limit = max(1, round($limit / $nbLanguages) * $nbLanguages); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT p.id_product, pl.id_lang, pl.name pname, p.reference, p.ean13, p.upc, pl.description_short, pl.description, cl.name cname, m.name mname FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'product_lang pl ON p.id_product = pl.id_product @@ -366,7 +366,7 @@ class SearchCore else { // Do it even if you already know the product id in order to be sure that it exists - $products = $db->ExecuteS(' + $products = $db->executeS(' SELECT id_product FROM '._DB_PREFIX_.'product WHERE '.($id_product ? 'id_product = '.(int)$id_product : 'indexed = 0')); @@ -402,7 +402,7 @@ class SearchCore // Every indexed words are cached into a PHP array $wordIdsByWord = array(); - $wordIds = Db::getInstance()->ExecuteS(' + $wordIds = Db::getInstance()->executeS(' SELECT id_word, word, id_lang, id_shop FROM '._DB_PREFIX_.'search_word', false); $wordIdsByWord = array(); @@ -458,7 +458,7 @@ class SearchCore $wordIdsByWord[$product['id_shop']][$product['id_lang']]['_'.$word] = 0; } - $existingWords = $db->ExecuteS(' + $existingWords = $db->executeS(' SELECT DISTINCT word FROM '._DB_PREFIX_.'search_word WHERE word IN ('.implode(',', $queryArray2).') AND id_lang = '.(int)$product['id_lang']); @@ -476,7 +476,7 @@ class SearchCore if (count($queryArray2)) { // ...then their IDs are retrieved and added to the cache - $addedWords = $db->ExecuteS(' + $addedWords = $db->executeS(' SELECT sw.id_word, sw.word FROM '._DB_PREFIX_.'search_word sw WHERE sw.word IN ('.implode(',', $queryArray2).') @@ -517,7 +517,7 @@ class SearchCore protected static function setProductsAsIndexed(&$products) { if (count($products)) - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET indexed = 1 WHERE id_product IN ('.implode(',', $products).') LIMIT '.(int)count($products)); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product SET indexed = 1 WHERE id_product IN ('.implode(',', $products).') LIMIT '.(int)count($products)); $productsArray = array(); } @@ -525,7 +525,7 @@ class SearchCore protected static function saveIndex(&$queryArray3) { if (count($queryArray3)) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'search_index (id_product, id_word, weight) VALUES '.implode(',', $queryArray3).' ON DUPLICATE KEY UPDATE weight = weight + VALUES(weight)'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'search_index (id_product, id_word, weight) VALUES '.implode(',', $queryArray3).' ON DUPLICATE KEY UPDATE weight = weight + VALUES(weight)'); $queryArray3 = array(); } @@ -587,7 +587,7 @@ class SearchCore AND t.`name` LIKE \'%'.pSQL($tag).'%\' ORDER BY position DESC'.($orderBy ? ', '.$orderBy : '').($orderWay ? ' '.$orderWay : '').' LIMIT '.(int)(($pageNumber - 1) * $pageSize).','.(int)$pageSize; - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql)) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql)) return false; return Product::getProductsProperties((int)$id_lang, $result); diff --git a/classes/SearchEngine.php b/classes/SearchEngine.php index 5e553a7f6..fe2957140 100644 --- a/classes/SearchEngine.php +++ b/classes/SearchEngine.php @@ -49,7 +49,7 @@ class SearchEngineCore extends ObjectModel $parsedUrl = @parse_url($url); if (!isset($parsedUrl['host']) OR !isset($parsedUrl['query'])) return false; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `server`, `getvar` FROM `'._DB_PREFIX_.'search_engine`'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `server`, `getvar` FROM `'._DB_PREFIX_.'search_engine`'); foreach ($result as $row) { $host =& $row['server']; diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index d7128b605..96c35eafd 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -89,7 +89,7 @@ class SpecificPriceCore extends ObjectModel public static function getByProductId($id_product) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product); @@ -97,7 +97,7 @@ class SpecificPriceCore extends ObjectModel public static function getIdsByProductId($id_product) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_specific_price` FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product); @@ -185,7 +185,7 @@ class SpecificPriceCore extends ObjectModel public static function deletePriorities() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' TRUNCATE `'._DB_PREFIX_.'specific_price_priority` '); } @@ -196,7 +196,7 @@ class SpecificPriceCore extends ObjectModel foreach ($priorities as $priority) $value .= pSQL($priority).';'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'specific_price_priority` (`id_product`, `priority`) VALUES ('.(int)$id_product.',\''.pSQL(rtrim($value, ';')).'\') ON DUPLICATE KEY UPDATE `priority` = \''.pSQL(rtrim($value, ';')).'\' @@ -209,7 +209,7 @@ class SpecificPriceCore extends ObjectModel return array(); $now = date('Y-m-d H:i:s'); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT *, '.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).' FROM `'._DB_PREFIX_.'specific_price` @@ -276,7 +276,7 @@ class SpecificPriceCore extends ObjectModel if (!self::isFeatureActive()) return array(); - $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'specific_price` WHERE `id_shop` IN(0, '.(int)$id_shop.') AND @@ -300,7 +300,7 @@ class SpecificPriceCore extends ObjectModel public static function deleteByProductId($id_product) { - if (Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product)) + if (Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product)) { // Refresh cache of feature detachable Configuration::updateGlobalValue('PS_SPECIFIC_PRICE_FEATURE_ACTIVE', self::isCurrentlyUsed('specific_price')); diff --git a/classes/State.php b/classes/State.php index 941674dd7..71a798bd9 100644 --- a/classes/State.php +++ b/classes/State.php @@ -69,7 +69,7 @@ class StateCore extends ObjectModel public static function getStates($id_lang = false, $active = false) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id_state`, `id_country`, `id_zone`, `iso_code`, `name`, `active` FROM `'._DB_PREFIX_.'state` '.($active ? 'WHERE active = 1' : '').' @@ -136,13 +136,13 @@ class StateCore extends ObjectModel if (!$this->isUsed()) { /* Database deletion */ - $result = Db::getInstance()->Execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); + $result = Db::getInstance()->execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); if (!$result) return false; /* Database deletion for multilingual fields related to the object */ if (method_exists($this, 'getTranslationsFieldsChild')) - Db::getInstance()->Execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.pSQL($this->identifier).'` = '.(int)($this->id)); return $result; } else @@ -178,7 +178,7 @@ class StateCore extends ObjectModel if (empty($id_country)) die(Tools::displayError()); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'state` s WHERE s.`id_country` = '.(int)$id_country diff --git a/classes/StockMvt.php b/classes/StockMvt.php index ebbd5c728..354b197c5 100755 --- a/classes/StockMvt.php +++ b/classes/StockMvt.php @@ -99,7 +99,7 @@ class StockMvtCore extends ObjectModel ) = 0 GROUP BY s.id_product, s.id_shop HAVING qty <> 0'; - $products_without_attributes = Db::getInstance()->ExecuteS($sql); + $products_without_attributes = Db::getInstance()->executeS($sql); // Search missing stock movement on products with attributes $sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty @@ -114,7 +114,7 @@ class StockMvtCore extends ObjectModel ) > 0 GROUP BY s.id_product_attribute HAVING qty <> 0'; - $products_with_attributes = Db::getInstance()->ExecuteS($sql); + $products_with_attributes = Db::getInstance()->executeS($sql); // Add missing stock movements $products = array_merge($products_without_attributes, $products_with_attributes); diff --git a/classes/StockMvtReason.php b/classes/StockMvtReason.php index a6f6e22a4..e072aca42 100755 --- a/classes/StockMvtReason.php +++ b/classes/StockMvtReason.php @@ -68,6 +68,6 @@ class StockMvtReasonCore extends ObjectModel $sql = 'SELECT smrl.name, smr.id_stock_mvt_reason, smr.sign FROM '._DB_PREFIX_.'stock_mvt_reason smr LEFT JOIN '._DB_PREFIX_.'stock_mvt_reason_lang smrl ON (smr.id_stock_mvt_reason = smrl.id_stock_mvt_reason AND smrl.id_lang='.(int)$id_lang.')'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } } diff --git a/classes/SubDomain.php b/classes/SubDomain.php index 097d118dc..3f0b22dce 100644 --- a/classes/SubDomain.php +++ b/classes/SubDomain.php @@ -45,7 +45,7 @@ class SubDomainCore extends ObjectModel public static function getSubDomains() { - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `name` FROM `'._DB_PREFIX_.'subdomain`')) + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `name` FROM `'._DB_PREFIX_.'subdomain`')) return false; $subDomains = array(); foreach ($result AS $row) diff --git a/classes/Supplier.php b/classes/Supplier.php index 0898b6706..ac4d3fe6a 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.php @@ -120,7 +120,7 @@ class SupplierCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'supplier_lang` sl ON (s.`id_supplier` = sl.`id_supplier` AND sl.`id_lang` = '.(int)($id_lang).') '.($active ? ' WHERE s.`active` = 1 ' : ''); $query .= ' ORDER BY s.`name` ASC'.($p ? ' LIMIT '.(((int)($p) - 1) * (int)($n)).','.(int)($n) : ''); - $suppliers = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + $suppliers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); if ($suppliers === false) return false; if ($getNbProducts) @@ -146,7 +146,7 @@ class SupplierCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_category` = cg.`id_category`) WHERE cg.`id_group` '.$sqlGroups.' )'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $suppliers[$key]['nb_products'] = sizeof($result); } } @@ -210,7 +210,7 @@ class SupplierCore extends ObjectModel ($active_category ? ' INNER JOIN `'._DB_PREFIX_.'category` ca ON cp.`id_category` = ca.`id_category` AND ca.`active` = 1' : '').' WHERE cg.`id_group` '.$sqlGroups.' )'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return (int)(sizeof($result)); } @@ -239,7 +239,7 @@ class SupplierCore extends ObjectModel ORDER BY '.(($orderBy == 'id_product') ? 'p.' : '').'`'.pSQL($orderBy).'` '.pSQL($orderWay).' LIMIT '.(((int)($p) - 1) * (int)($n)).','.(int)($n); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (!$result) return false; if ($orderBy == 'price') @@ -249,7 +249,7 @@ class SupplierCore extends ObjectModel public function getProductsLite($id_lang) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT p.`id_product`, pl.`name` FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int)($id_lang).') diff --git a/classes/Tab.php b/classes/Tab.php index 2dfe3d101..f73b7ec08 100644 --- a/classes/Tab.php +++ b/classes/Tab.php @@ -104,7 +104,7 @@ class TabCore extends ObjectModel if (!$context->employee->id_profile) return false; /* Profile selection */ - $profiles = Db::getInstance()->ExecuteS('SELECT `id_profile` FROM '._DB_PREFIX_.'profile where `id_profile` != 1'); + $profiles = Db::getInstance()->executeS('SELECT `id_profile` FROM '._DB_PREFIX_.'profile where `id_profile` != 1'); if (!$profiles || empty($profiles)) return false; /* Query definition */ @@ -120,12 +120,12 @@ class TabCore extends ObjectModel $query .= '('.$profile['id_profile'].', '.(int)$id_tab.', '.$rights.', '.$rights.', '.$rights.', '.$rights.'),'; } $query = trim($query, ', '); - return Db::getInstance()->Execute($query); + return Db::getInstance()->execute($query); } public function delete() { - if (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'access WHERE `id_tab` = '.(int)$this->id) && parent::delete()) + if (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'access WHERE `id_tab` = '.(int)$this->id) && parent::delete()) return $this->cleanPositions($this->id_parent); return false; } @@ -178,7 +178,7 @@ class TabCore extends ObjectModel if (!isset(self::$_cache_tabs[$id_lang])) { self::$_cache_tabs[$id_lang] = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'tab` t LEFT JOIN `'._DB_PREFIX_.'tab_lang` tl ON (t.`id_tab` = tl.`id_tab` AND tl.`id_lang` = '.(int)$id_lang.') @@ -211,7 +211,7 @@ class TabCore extends ObjectModel if (self::$_getIdFromClassName === null) { self::$_getIdFromClassName = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT id_tab, class_name FROM `'._DB_PREFIX_.'tab`'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_tab, class_name FROM `'._DB_PREFIX_.'tab`'); foreach ($result as $row) self::$_getIdFromClassName[$row['class_name']] = $row['id_tab']; } @@ -250,7 +250,7 @@ class TabCore extends ObjectModel return false; $new_position = ($direction == 'l') ? $this->position - 1 : $this->position + 1; - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'tab` t + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'tab` t SET position = '.(int)$this->position.' WHERE id_parent = '.(int)$this->id_parent.' AND position = '.(int)$new_position); $this->position = $new_position; @@ -259,14 +259,14 @@ class TabCore extends ObjectModel public function cleanPositions($id_parent) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_tab` FROM `'._DB_PREFIX_.'tab` WHERE `id_parent` = '.(int)$id_parent.' ORDER BY `position`'); $sizeof = count($result); for ($i = 0; $i < $sizeof; ++$i) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'tab` SET `position` = '.($i + 1).' WHERE `id_tab` = '.(int)$result[$i]['id_tab']); diff --git a/classes/Tag.php b/classes/Tag.php index 38ff57864..86149b722 100644 --- a/classes/Tag.php +++ b/classes/Tag.php @@ -119,7 +119,7 @@ class TagCore extends ObjectModel $data .= '('.(int)$tag.','.(int)$id_product.'),'; $data = rtrim($data, ','); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_tag`, `id_product`) VALUES '.$data); } @@ -129,7 +129,7 @@ class TagCore extends ObjectModel $groups = FrontController::getCurrentCustomerGroups(); $sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1'); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT t.name, COUNT(pt.id_tag) AS times FROM `'._DB_PREFIX_.'product_tag` pt LEFT JOIN `'._DB_PREFIX_.'tag` t ON (t.id_tag = pt.id_tag) @@ -149,7 +149,7 @@ class TagCore extends ObjectModel public static function getProductTags($id_product) { - if (!$tmp = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + if (!$tmp = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT t.`id_lang`, t.`name` FROM '._DB_PREFIX_.'tag t LEFT JOIN '._DB_PREFIX_.'product_tag pt ON (pt.id_tag = t.id_tag) @@ -171,7 +171,7 @@ class TagCore extends ObjectModel return array(); $in = $associated ? 'IN' : 'NOT IN'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT pl.name, pl.id_product FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON p.id_product = pl.id_product'.$context->shop->sqlLang('pl').' @@ -183,22 +183,22 @@ class TagCore extends ObjectModel public function setProducts($array) { - $result = Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_tag WHERE id_tag = '.(int)$this->id); + $result = Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_tag WHERE id_tag = '.(int)$this->id); if (is_array($array)) { $array = array_map('intval', $array); - $result &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0 WHERE id_product IN ('.implode(',', $array).')'); + $result &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0 WHERE id_product IN ('.implode(',', $array).')'); $ids = array(); foreach ($array as $id_product) $ids[] = '('.(int)$id_product.','.(int)$this->id.')'; - return ($result && Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'product_tag (id_product, id_tag) VALUES '.implode(',', $ids)) && Search::indexation(false)); + return ($result && Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'product_tag (id_product, id_tag) VALUES '.implode(',', $ids)) && Search::indexation(false)); } return $result; } public static function deleteTagsForProduct($id_product) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$id_product); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$id_product); } } diff --git a/classes/Theme.php b/classes/Theme.php index 6ea7fe442..352cf37ea 100644 --- a/classes/Theme.php +++ b/classes/Theme.php @@ -46,6 +46,6 @@ class ThemeCore extends ObjectModel $sql = 'SELECT * FROM '._DB_PREFIX_.'theme ORDER BY name'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } } diff --git a/classes/Tools.php b/classes/Tools.php index 162733bd8..ba58bab48 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -856,7 +856,7 @@ class ToolsCore AND cl.id_lang = '.(int)$context->language->id.' AND c.active = 1 ORDER BY c.level_depth ASC'; - $categories = Db::getInstance()->ExecuteS($sql); + $categories = Db::getInstance()->executeS($sql); $n = 1; $nCategories = (int)sizeof($categories); diff --git a/classes/TranslatedConfiguration.php b/classes/TranslatedConfiguration.php index c4c8302d6..fee763bf9 100755 --- a/classes/TranslatedConfiguration.php +++ b/classes/TranslatedConfiguration.php @@ -43,7 +43,7 @@ class TranslatedConfigurationCore extends Configuration // Otherwise configuration is not set as translated configuration. if ($id !== null) { - $id_translated = Db::getInstance()->ExecuteS('SELECT `'.$this->identifier.'` FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.$this->identifier.'`='.pSQL($id).' LIMIT 0,1'); + $id_translated = Db::getInstance()->executeS('SELECT `'.$this->identifier.'` FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.$this->identifier.'`='.pSQL($id).' LIMIT 0,1'); if (empty($id_translated)) $id = null; } @@ -90,6 +90,6 @@ class TranslatedConfigurationCore extends Configuration '.($sql_sort != '' ? $sql_sort : '').' '.($sql_limit != '' ? $sql_limit : '').' '; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); } } \ No newline at end of file diff --git a/classes/Zone.php b/classes/Zone.php index f5f50249a..1f2f06156 100644 --- a/classes/Zone.php +++ b/classes/Zone.php @@ -60,7 +60,7 @@ class ZoneCore extends ObjectModel */ public static function getZones($active = false) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'zone` '.($active ? 'WHERE active = 1' : '').' @@ -90,12 +90,12 @@ class ZoneCore extends ObjectModel if (parent::delete()) { /* Delete regarding delivery preferences */ - $result = Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'carrier_zone WHERE id_zone = '.(int)$this->id); - $result &= Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'delivery WHERE id_zone = '.(int)$this->id); + $result = Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_zone WHERE id_zone = '.(int)$this->id); + $result &= Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'delivery WHERE id_zone = '.(int)$this->id); /* Update Country & state zone with 0 */ - $result &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'country SET id_zone = 0 WHERE id_zone = '.(int)$this->id); - $result &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'state SET id_zone = 0 WHERE id_zone = '.(int)$this->id); + $result &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'country SET id_zone = 0 WHERE id_zone = '.(int)$this->id); + $result &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'state SET id_zone = 0 WHERE id_zone = '.(int)$this->id); return $result; } diff --git a/classes/db/Db.php b/classes/db/Db.php index 4d114211f..1278e1bef 100644 --- a/classes/db/Db.php +++ b/classes/db/Db.php @@ -31,25 +31,25 @@ if (file_exists(dirname(__FILE__).'/../config/settings.inc.php')) abstract class DbCore { /** @var string Server (eg. localhost) */ - protected $_server; + protected $server; /** @var string Database user (eg. root) */ - protected $_user; + protected $user; /** @var string Database password (eg. can be empty !) */ - protected $_password; + protected $password; /** @var string Database name */ - protected $_database; + protected $database; /** @var mixed Ressource link */ - protected $_link; + protected $link; /** @var mixed SQL cached result */ - protected $_result; + protected $result; /** @var array List of DB instance */ - protected static $_instance = array(); + protected static $instance = array(); /** @var array Object instance for singleton */ protected static $_servers = array( @@ -64,14 +64,14 @@ abstract class DbCore * * @var string */ - protected $_lastQuery; + protected $last_query; /** * Last cached query * * @var string */ - protected $_lastCached; + protected $last_cached; /** * Open a connection @@ -149,22 +149,27 @@ abstract class DbCore { static $id = 0; - $nServers = sizeof(self::$_servers); - if ($master || $nServers == 1) - $idServer = 0; + $total_servers = count(self::$_servers); + if ($master || $total_servers == 1) + $id_server = 0; else { $id++; - $idServer = ($nServers > 2 && ($id % $nServers) != 0) ? $id : 1; + $id_server = ($total_servers > 2 && ($id % $total_servers) != 0) ? $id : 1; } - if (!isset(self::$_instance[$idServer])) + if (!isset(self::$instance[$id_server])) { $class = Db::getClass(); - self::$_instance[$idServer] = new $class(self::$_servers[$idServer]['server'], self::$_servers[$idServer]['user'], self::$_servers[$idServer]['password'], self::$_servers[$idServer]['database']); + self::$instance[$id_server] = new $class( + self::$_servers[$id_server]['server'], + self::$_servers[$id_server]['user'], + self::$_servers[$id_server]['password'], + self::$_servers[$id_server]['database'] + ); } - return self::$_instance[$idServer]; + return self::$instance[$id_server]; } /** @@ -191,11 +196,11 @@ abstract class DbCore */ public function __construct($server, $user, $password, $database, $connect = true) { - $this->_server = $server; - $this->_user = $user; - $this->_password = $password; - $this->_type = _DB_TYPE_; - $this->_database = $database; + $this->server = $server; + $this->user = $user; + $this->password = $password; + $this->type = _DB_TYPE_; + $this->database = $database; if (!defined('_PS_DEBUG_SQL_')) define('_PS_DEBUG_SQL_', false); @@ -209,7 +214,7 @@ abstract class DbCore */ public function __destruct() { - if ($this->_link) + if ($this->link) $this->disconnect(); } @@ -221,10 +226,10 @@ abstract class DbCore * @param string $type INSERT or UPDATE * @param string $where WHERE clause, only for UPDATE (optional) * @param string $limit LIMIT clause (optional) - * @param bool $useNull If true, replace empty strings and NULL by a NULL value + * @param bool $use_null If true, replace empty strings and NULL by a NULL value * @return mixed|boolean SQL query result */ - public function autoExecute($table, $data, $type, $where = false, $limit = false, $use_cache = 1, $useNull = false) + public function autoExecute($table, $data, $type, $where = false, $limit = false, $use_cache = 1, $use_null = false) { if (!$data) return true; @@ -234,13 +239,13 @@ abstract class DbCore // Check if $data is a list of row if (!is_array(current($data))) $data = array($data); - + $keys = array(); $values_stringified = array(); foreach ($data as $row_data) { $values = array(); - foreach ($row_data AS $key => $value) + foreach ($row_data as $key => $value) { if (isset($keys_stringified)) { @@ -250,8 +255,8 @@ abstract class DbCore } else $keys[] = "`$key`"; - - $values[] = ($useNull && ($value === '' || is_null($value))) ? 'NULL' : "'$value'"; + + $values[] = ($use_null && ($value === '' || is_null($value))) ? 'NULL' : "'$value'"; } $keys_stringified = implode(', ', $keys); $values_stringified[] = '('.implode(', ', $values).')'; @@ -265,8 +270,8 @@ abstract class DbCore else if (strtoupper($type) == 'UPDATE') { $sql = 'UPDATE `'.$table.'` SET '; - foreach ($data AS $key => $value) - $sql .= ($useNull && ($value === '' || is_null($value))) ? "`$key` = NULL," : "`$key` = '$value',"; + foreach ($data as $key => $value) + $sql .= ($use_null && ($value === '' || is_null($value))) ? "`$key` = NULL," : "`$key` = '$value',"; $sql = rtrim($sql, ','); if ($where) $sql .= ' WHERE '.$where; @@ -321,10 +326,10 @@ abstract class DbCore */ public function delete($table, $where = false, $limit = false, $use_cache = 1) { - $this->_result = false; + $this->result = false; $sql = 'DELETE FROM `'.bqSQL($table).'`'.($where ? ' WHERE '.$where : '').($limit ? ' LIMIT '.(int)$limit : ''); $res = $this->query($sql); - if ($use_cache AND _PS_CACHE_ENABLED_) + if ($use_cache && _PS_CACHE_ENABLED_) Cache::getInstance()->deleteQuery($sql); return $res; } @@ -336,13 +341,13 @@ abstract class DbCore * @param bool $use_cache * @return mixed */ - public function Execute($sql, $use_cache = 1) + public function execute($sql, $use_cache = 1) { $sql = (string)$sql; - $this->_result = $this->query($sql); - if ($use_cache AND _PS_CACHE_ENABLED_) + $this->result = $this->query($sql); + if ($use_cache && _PS_CACHE_ENABLED_) Cache::getInstance()->deleteQuery($sql); - return $this->_result; + return $this->result; } /** @@ -353,32 +358,32 @@ abstract class DbCore * @param int $use_cache if query has been already executed, use its result * @return array or result object */ - public function ExecuteS($sql, $array = true, $use_cache = 1) + public function executeS($sql, $array = true, $use_cache = 1) { $sql = (string)$sql; - $this->_result = false; - $this->_lastQuery = $sql; - if ($use_cache AND _PS_CACHE_ENABLED_ && $array AND ($result = Cache::getInstance()->get(md5($sql)))) + $this->result = false; + $this->last_query = $sql; + if ($use_cache && _PS_CACHE_ENABLED_ && $array && ($result = Cache::getInstance()->get(md5($sql)))) { - $this->_lastCached = true; + $this->last_cached = true; return $result; } - $this->_result = $this->query($sql); - if (!$this->_result) + $this->result = $this->query($sql); + if (!$this->result) return false; - $this->_lastCached = false; + $this->last_cached = false; if (!$array) - return $this->_result; + return $this->result; - $resultArray = array(); - while ($row = $this->nextRow($this->_result)) - $resultArray[] = $row; + $result_array = array(); + while ($row = $this->nextRow($this->result)) + $result_array[] = $row; - if ($use_cache AND _PS_CACHE_ENABLED_) - Cache::getInstance()->setQuery($sql, $resultArray); - return $resultArray; + if ($use_cache && _PS_CACHE_ENABLED_) + Cache::getInstance()->setQuery($sql, $result_array); + return $result_array; } /** @@ -393,21 +398,21 @@ abstract class DbCore { $sql = (string)$sql; $sql .= ' LIMIT 1'; - $this->_result = false; - $this->_lastQuery = $sql; + $this->result = false; + $this->last_query = $sql; if ($use_cache && _PS_CACHE_ENABLED_ && ($result = Cache::getInstance()->get(md5($sql)))) { - $this->_lastCached = true; + $this->last_cached = true; return $result; } - $this->_result = $this->query($sql); - if (!$this->_result) + $this->result = $this->query($sql); + if (!$this->result) return false; - $this->_lastCached = false; - $result = $this->nextRow($this->_result); - if ($use_cache AND _PS_CACHE_ENABLED_) + $this->last_cached = false; + $result = $this->nextRow($this->result); + if ($use_cache && _PS_CACHE_ENABLED_) Cache::getInstance()->setQuery($sql, $result); return $result; } @@ -432,17 +437,17 @@ abstract class DbCore * * @return int */ - public function NumRows() + public function numRows() { - if (!$this->_lastCached && $this->_result) + if (!$this->last_cached && $this->result) { - $nrows = $this->_numRows($this->_result); + $nrows = $this->_numRows($this->result); if (_PS_CACHE_ENABLED_) - Cache::getInstance()->setNumRows(md5($this->_lastQuery), $nrows); + Cache::getInstance()->setNumRows(md5($this->last_query), $nrows); return $nrows; } - else if (_PS_CACHE_ENABLED_ AND $this->_lastCached) - return Cache::getInstance()->getNumRows(md5($this->_lastQuery)); + else if (_PS_CACHE_ENABLED_ && $this->last_cached) + return Cache::getInstance()->getNumRows(md5($this->last_query)); } /** @@ -457,9 +462,9 @@ abstract class DbCore global $webservice_call; $sql = (string)$sql; - $this->_result = false; + $this->result = false; $result = $this->query($sql); - if ($use_cache AND _PS_CACHE_ENABLED_) + if ($use_cache && _PS_CACHE_ENABLED_) Cache::getInstance()->deleteQuery($sql); return $result; } @@ -476,7 +481,7 @@ abstract class DbCore $errno = $this->getNumberError(); if ($webservice_call && $errno) WebserviceRequest::getInstance()->setError(500, '[SQL Error] '.$this->getMsgError().'. Query was : '.$sql, 97); - elseif (_PS_DEBUG_SQL_ AND $errno AND !defined('PS_INSTALLATION_IN_PROGRESS')) + else if (_PS_DEBUG_SQL_ && $errno && !defined('PS_INSTALLATION_IN_PROGRESS')) { if ($sql) die(Tools::displayError($this->getMsgError().'

'.$sql.'
')); @@ -488,17 +493,17 @@ abstract class DbCore * Sanitize data which will be injected into SQL query * * @param string $string SQL data which will be injected into SQL query - * @param boolean $htmlOK Does data contain HTML code ? (optional) + * @param boolean $html_ok Does data contain HTML code ? (optional) * @return string Sanitized data */ - public function escape($string, $htmlOK) + public function escape($string, $html_ok) { if (_PS_MAGIC_QUOTES_GPC_) $string = stripslashes($string); if (!is_numeric($string)) { $string = $this->_escape($string); - if (!$htmlOK) + if (!$html_ok) $string = strip_tags(Tools::nl2br($string)); } @@ -515,9 +520,9 @@ abstract class DbCore * @param bool $newDbLink * @return int */ - static public function checkConnection($server, $user, $pwd, $db, $newDbLink = true) + public static function checkConnection($server, $user, $pwd, $db, $new_db_link = true) { - return call_user_func_array(array(Db::getClass(), 'tryToConnect'), array($server, $user, $pwd, $db, $newDbLink)); + return call_user_func_array(array(Db::getClass(), 'tryToConnect'), array($server, $user, $pwd, $db, $new_db_link)); } /** @@ -528,7 +533,7 @@ abstract class DbCore * @param string $pwd Password for database connection * @return int */ - static public function checkEncoding($server, $user, $pwd) + public static function checkEncoding($server, $user, $pwd) { return call_user_func_array(array(Db::getClass(), 'tryUTF8'), array($server, $user, $pwd)); } @@ -539,19 +544,19 @@ abstract class DbCore * @acces string query The query to execute * @return array Array of line returned by MySQL */ - static public function s($sql, $use_cache = 1) + public static function s($sql, $use_cache = 1) { - return Db::getInstance()->ExecuteS($sql, true, $use_cache); + return Db::getInstance()->executeS($sql, true, $use_cache); } - static public function ps($sql, $use_cache = 1) + public static function ps($sql, $use_cache = 1) { $ret = Db::s($sql, $use_cache); p($ret); return $ret; } - static public function ds($sql, $use_cache = 1) + public static function ds($sql, $use_cache = 1) { Db::s($sql, $use_cache); die(); diff --git a/classes/db/DbMySQLi.php b/classes/db/DbMySQLi.php index eae2ed44f..94dc130a8 100644 --- a/classes/db/DbMySQLi.php +++ b/classes/db/DbMySQLi.php @@ -35,17 +35,17 @@ class DbMySQLiCore extends Db */ public function connect() { - $this->_link = new mysqli($this->_server, $this->_user, $this->_password, $this->_database); + $this->link = new mysqli($this->server, $this->user, $this->password, $this->database); // Do not use object way for error because this work bad before PHP 5.2.9 if (mysqli_connect_error()) die(Tools::displayError('Link to database cannot be established : '.mysqli_connect_error())); // UTF-8 support - if (!$this->_link->query('SET NAMES \'utf8\'')) + if (!$this->link->query('SET NAMES \'utf8\'')) die(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.')); - return $this->_link; + return $this->link; } /** @@ -53,7 +53,7 @@ class DbMySQLiCore extends Db */ public function disconnect() { - $this->_link->close(); + $this->link->close(); } /** @@ -61,7 +61,7 @@ class DbMySQLiCore extends Db */ protected function _query($sql) { - return $this->_link->query($sql); + return $this->link->query($sql); } /** @@ -70,7 +70,7 @@ class DbMySQLiCore extends Db public function nextRow($result = false) { if (!$result) - $result = $this->_result; + $result = $this->result; return $result->fetch_assoc(); } @@ -87,7 +87,7 @@ class DbMySQLiCore extends Db */ public function Insert_ID() { - return $this->_link->insert_id; + return $this->link->insert_id; } /** @@ -95,7 +95,7 @@ class DbMySQLiCore extends Db */ public function Affected_Rows() { - return $this->_link->affected_rows; + return $this->link->affected_rows; } /** @@ -103,7 +103,7 @@ class DbMySQLiCore extends Db */ public function getMsgError($query = false) { - return $this->_link->error; + return $this->link->error; } /** @@ -111,7 +111,7 @@ class DbMySQLiCore extends Db */ public function getNumberError() { - return $this->_link->errno; + return $this->link->errno; } /** @@ -127,7 +127,7 @@ class DbMySQLiCore extends Db */ public function _escape($str) { - return $this->_link->real_escape_string($str); + return $this->link->real_escape_string($str); } /** @@ -135,7 +135,7 @@ class DbMySQLiCore extends Db */ public function set_db($db_name) { - return $this->_link->query('USE '.pSQL($db_name)); + return $this->link->query('USE '.pSQL($db_name)); } static public function tryToConnect($server, $user, $pwd, $db, $newDbLink = true) diff --git a/classes/db/DbPDO.php b/classes/db/DbPDO.php index 1cefc61a3..4219670a0 100644 --- a/classes/db/DbPDO.php +++ b/classes/db/DbPDO.php @@ -39,7 +39,7 @@ class DbPDOCore extends Db { try { - $this->_link = new PDO('mysql:dbname='.$this->_database.';host='.$this->_server, $this->_user, $this->_password); + $this->link = new PDO('mysql:dbname='.$this->database.';host='.$this->server, $this->user, $this->password); } catch (PDOException $e) { @@ -47,10 +47,10 @@ class DbPDOCore extends Db } // UTF-8 support - if ($this->_link->exec('SET NAMES \'utf8\'') === false) + if ($this->link->exec('SET NAMES \'utf8\'') === false) die(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.')); - return $this->_link; + return $this->link; } /** @@ -58,7 +58,7 @@ class DbPDOCore extends Db */ public function disconnect() { - unset($this->_link); + unset($this->link); } /** @@ -66,7 +66,7 @@ class DbPDOCore extends Db */ protected function _query($sql) { - return $this->_link->query($sql); + return $this->link->query($sql); } /** @@ -75,7 +75,7 @@ class DbPDOCore extends Db public function nextRow($result = false) { if (!$result) - $result = $this->_result; + $result = $this->result; return $result->fetch(); } @@ -92,7 +92,7 @@ class DbPDOCore extends Db */ public function Insert_ID() { - return $this->_link->lastInsertId(); + return $this->link->lastInsertId(); } /** @@ -100,7 +100,7 @@ class DbPDOCore extends Db */ public function Affected_Rows() { - return $this->_result->rowCount(); + return $this->result->rowCount(); } /** @@ -108,7 +108,7 @@ class DbPDOCore extends Db */ public function getMsgError($query = false) { - $error = $this->_link->errorInfo(); + $error = $this->link->errorInfo(); return $error[2]; } @@ -117,7 +117,7 @@ class DbPDOCore extends Db */ public function getNumberError() { - $error = $this->_link->errorInfo(); + $error = $this->link->errorInfo(); return $error[1]; } @@ -145,7 +145,7 @@ class DbPDOCore extends Db */ public function set_db($db_name) { - return $this->_link->exec('USE '.pSQL($db_name)); + return $this->link->exec('USE '.pSQL($db_name)); } /** diff --git a/classes/db/MySQL.php b/classes/db/MySQL.php index 5e972f1cb..e0bb983c8 100644 --- a/classes/db/MySQL.php +++ b/classes/db/MySQL.php @@ -1,6 +1,6 @@ _link = mysql_connect($this->_server, $this->_user, $this->_password)) + + if (!$this->link = mysql_connect($this->server, $this->user, $this->password)) die(Tools::displayError('Link to database cannot be established.')); - if (!$this->set_db($this->_database)) + if (!$this->set_db($this->database)) die(Tools::displayError('The database selection cannot be made.')); // UTF-8 support - if (!mysql_query('SET NAMES \'utf8\'', $this->_link)) + if (!mysql_query('SET NAMES \'utf8\'', $this->link)) die(Tools::displayError('PrestaShop Fatal error: no utf-8 support. Please check your server configuration.')); - return $this->_link; + return $this->link; } /** @@ -53,15 +53,15 @@ class MySQLCore extends Db */ public function disconnect() { - mysql_close($this->_link); + mysql_close($this->link); } - + /** * @see DbCore::_query() */ protected function _query($sql) { - return mysql_query($sql, $this->_link); + return mysql_query($sql, $this->link); } /** @@ -69,9 +69,9 @@ class MySQLCore extends Db */ public function nextRow($result = false) { - return mysql_fetch_assoc($result ? $result : $this->_result); + return mysql_fetch_assoc($result ? $result : $this->result); } - + /** * @see DbCore::_numRows() */ @@ -79,13 +79,13 @@ class MySQLCore extends Db { return mysql_num_rows($result); } - + /** * @see DbCore::Insert_ID() */ public function Insert_ID() { - return mysql_insert_id($this->_link); + return mysql_insert_id($this->link); } /** @@ -93,7 +93,7 @@ class MySQLCore extends Db */ public function Affected_Rows() { - return mysql_affected_rows($this->_link); + return mysql_affected_rows($this->link); } /** @@ -101,7 +101,7 @@ class MySQLCore extends Db */ public function getMsgError($query = false) { - return mysql_error($this->_link); + return mysql_error($this->link); } /** @@ -109,31 +109,31 @@ class MySQLCore extends Db */ public function getNumberError() { - return mysql_errno($this->_link); + return mysql_errno($this->link); } - + /** * @see DbCore::getVersion() */ public function getVersion() { - return mysql_get_server_info($this->_link); + return mysql_get_server_info($this->link); } - + /** * @see DbCore::_escape() */ public function _escape($str) { - return _PS_MYSQL_REAL_ESCAPE_STRING_ ? mysql_real_escape_string($str, $this->_link) : addslashes($str); + return _PS_MYSQL_REAL_ESCAPE_STRING_ ? mysql_real_escape_string($str, $this->link) : addslashes($str); } - + /** * @see DbCore::set_db() */ public function set_db($db_name) { - return mysql_select_db($db_name, $this->_link); + return mysql_select_db($db_name, $this->link); } public static function tryToConnect($server, $user, $pwd, $db, $newDbLink = true) diff --git a/classes/shop/GroupShop.php b/classes/shop/GroupShop.php index 79b98efb1..f763cdf59 100644 --- a/classes/shop/GroupShop.php +++ b/classes/shop/GroupShop.php @@ -75,7 +75,7 @@ class GroupShopCore extends ObjectModel public static function getGroupShops($active = true) { - return Db::getInstance()->ExecuteS('SELECT * + return Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'group_shop WHERE `deleted`= 0 AND `active`='.(int)$active); } @@ -92,7 +92,7 @@ class GroupShopCore extends ObjectModel $id = 'id_group_shop'; else $table_name .= '_'.$row['type']; - $res &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id); + $res &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id); } return $res; @@ -164,12 +164,12 @@ class GroupShopCore extends ObjectModel $sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.$table_name.'` ('.$keys.', '.$id.') (SELECT '.$keys.', '.(int)$this->id.' FROM '._DB_PREFIX_.$table_name.' WHERE `'.$id.'` = '.(int)$old_id.')'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } else { - //Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id); + //Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id); } } } diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index d605fffda..df9a43d2a 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -175,7 +175,7 @@ class ShopCore extends ObjectModel $id = 'id_shop'; else $table_name .= '_'.$row['type']; - $res &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id); + $res &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.$table_name.'` WHERE `'.$id.'`='.(int)$this->id); } Shop::cacheShops(true); @@ -340,7 +340,7 @@ class ShopCore extends ObjectModel FROM '._DB_PREFIX.'shop_url WHERE active = 1 AND id_shop = '.(int)$this->id; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } /** @@ -399,7 +399,7 @@ class ShopCore extends ObjectModel '.$where.' ORDER BY gs.name, s.name'; - if ($results = Db::getInstance()->ExecuteS($sql)) + if ($results = Db::getInstance()->executeS($sql)) { $group_shop = new GroupShop(); foreach ($results as $row) @@ -790,12 +790,12 @@ class ShopCore extends ObjectModel $sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.$table_name.'` ('.$keys.', '.$id.') (SELECT '.$keys.', '.(int)$this->id.' FROM '._DB_PREFIX_.$table_name.' WHERE `'.$id.'` = '.(int)$old_id.')'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } /*else { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.$table_name.'` SET WHERE `'.$id.'`='.(int)$old_id); }*/ } } diff --git a/classes/shop/ShopUrl.php b/classes/shop/ShopUrl.php index 68e01d86f..ea3b4b780 100644 --- a/classes/shop/ShopUrl.php +++ b/classes/shop/ShopUrl.php @@ -84,7 +84,7 @@ class ShopUrlCore extends ObjectModel FROM '._DB_PREFIX_.'shop_url WHERE 1 '.($id_shop ? ' AND id_shop = '.(int)$id_shop : ''); - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public function setMain() diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php index 224fc276b..92382340b 100644 --- a/classes/stock/StockManager.php +++ b/classes/stock/StockManager.php @@ -335,7 +335,7 @@ class StockManagerCore implements StockManagerInterface if ($price_te != null) $query->where('price_te = '.(float)$price_te); - $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); return ObjectModel::hydrateCollection('Stock', $results); } diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php index d66870631..b402062c3 100755 --- a/classes/stock/StockMvt.php +++ b/classes/stock/StockMvt.php @@ -161,7 +161,7 @@ class StockMvtCore extends ObjectModel ) = 0 GROUP BY s.id_product, s.id_shop HAVING qty <> 0'; - $products_without_attributes = Db::getInstance()->ExecuteS($sql); + $products_without_attributes = Db::getInstance()->executeS($sql); // Search missing stock movement on products with attributes $sql = 'SELECT s.id_stock, (stock.quantity - SUM(IFNULL(sm.quantity, 0))) AS qty @@ -176,7 +176,7 @@ class StockMvtCore extends ObjectModel ) > 0 GROUP BY s.id_product_attribute HAVING qty <> 0'; - $products_with_attributes = Db::getInstance()->ExecuteS($sql); + $products_with_attributes = Db::getInstance()->executeS($sql); // Add missing stock movements $products = array_merge($products_without_attributes, $products_with_attributes); diff --git a/classes/stock/StockMvtReason.php b/classes/stock/StockMvtReason.php index 05b35cf94..13c834f96 100755 --- a/classes/stock/StockMvtReason.php +++ b/classes/stock/StockMvtReason.php @@ -65,6 +65,6 @@ class StockMvtReasonCore extends ObjectModel $query->select('smrl.name, smr.id_stock_mvt_reason, smr.sign'); $query->from('stock_mvt_reason smr'); $query->leftjoin('stock_mvt_reason_lang smrl ON (smr.id_stock_mvt_reason = smrl.id_stock_mvt_reason AND smrl.id_lang='.(int)$id_lang.')'); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); } } diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php index ea0348fe3..eb100b8e9 100644 --- a/classes/tax/Tax.php +++ b/classes/tax/Tax.php @@ -169,7 +169,7 @@ class TaxCore extends ObjectModel if ($active_only) $sql->where('t.`active` = 1'); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } public static function excludeTaxeOption() diff --git a/classes/tax/TaxRule.php b/classes/tax/TaxRule.php index 7838a1155..db8f4c72a 100644 --- a/classes/tax/TaxRule.php +++ b/classes/tax/TaxRule.php @@ -69,7 +69,7 @@ class TaxRuleCore extends ObjectModel if (empty($id_group)) die(Tools::displayError()); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'tax_rule` WHERE `id_tax_rules_group` = '.(int)$id_group ); @@ -84,7 +84,7 @@ class TaxRuleCore extends ObjectModel public static function getTaxRulesByGroupId($id_lang, $id_group) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT g.`id_tax_rule`, c.`name` AS country_name, s.`name` AS state_name, @@ -103,7 +103,7 @@ class TaxRuleCore extends ObjectModel public static function deleteTaxRuleByIdTax($id_tax) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'tax_rule` WHERE `id_tax` = '.(int)$id_tax ); @@ -171,7 +171,7 @@ class TaxRuleCore extends ObjectModel */ public static function swapTaxId($old_id, $new_id) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'tax_rule` SET `id_tax` = '.(int)$new_id.' WHERE `id_tax` = '.(int)$old_id diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php index 793f831a5..25a3718ed 100644 --- a/classes/tax/TaxRulesGroup.php +++ b/classes/tax/TaxRulesGroup.php @@ -52,7 +52,7 @@ class TaxRulesGroupCore extends ObjectModel public static function getTaxRulesGroups($only_active = true) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'tax_rules_group` g' .($only_active ? ' WHERE g.`active` = 1' : '') @@ -74,7 +74,7 @@ class TaxRulesGroupCore extends ObjectModel */ public static function getAssociatedTaxRatesByIdCountry($id_country) { - $rows = Db::getInstance()->ExecuteS(' + $rows = Db::getInstance()->executeS(' SELECT rg.`id_tax_rules_group`, t.`rate` FROM `'._DB_PREFIX_.'tax_rules_group` rg LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (tr.`id_tax_rules_group` = rg.`id_tax_rules_group`) diff --git a/classes/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php index 0ac1b142e..e4d9c11fe 100644 --- a/classes/tax/TaxRulesTaxManager.php +++ b/classes/tax/TaxRulesTaxManager.php @@ -67,7 +67,7 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface if (!isset(self::$cache_tax_calculator[$postcode])) { - $rows = Db::getInstance()->ExecuteS(' + $rows = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'tax_rule` WHERE `id_country` = '.(int)$this->address->id_country.' diff --git a/classes/webservice/WebserviceKey.php b/classes/webservice/WebserviceKey.php index 0996d6225..b55e0a421 100755 --- a/classes/webservice/WebserviceKey.php +++ b/classes/webservice/WebserviceKey.php @@ -1,6 +1,6 @@ 32); protected $fieldsValidate = array('active' => 'isBool'); @@ -43,56 +43,56 @@ class WebserviceKeyCore extends ObjectModel protected $table = 'webservice_account'; protected $identifier = 'id_webservice_account'; - + public function add($autodate = true, $nullValues = false) { if (WebserviceKey::keyExists($this->key)) return false; return parent::add($autodate = true, $nullValues = false); } - + static public function keyExists($key) { - return (!Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `key` - FROM '._DB_PREFIX_.'webservice_account + return (!Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `key` + FROM '._DB_PREFIX_.'webservice_account WHERE `key` = \''.pSQL($key).'\'') ? false : true); } - + public function getFields() { $this->validateFields(); - + $fields['key'] = pSQL($this->key); $fields['active'] = (int)($this->active); $fields['description'] = pSQL($this->description); return $fields; } - + public function delete() { if (!parent::delete() OR $this->deleteAssociations() === false) return false; return true; } - + public function deleteAssociations() { if ( - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'webservice_permission` WHERE `id_webservice_account` = '.(int)($this->id)) === false || - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'webservice_permission` WHERE `id_webservice_account` = '.(int)($this->id)) === false ) return false; return true; } - + public static function getPermissionForAccount($auth_key) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.* FROM `'._DB_PREFIX_.'webservice_permission` p LEFT JOIN `'._DB_PREFIX_.'webservice_account` a ON (a.id_webservice_account = p.id_webservice_account) @@ -104,10 +104,10 @@ class WebserviceKeyCore extends ObjectModel $permissions[$row['resource']][] = $row['method']; return $permissions; } - + public static function isKeyActive($auth_key) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT a.active FROM `'._DB_PREFIX_.'webservice_account` a WHERE a.key = \''.pSQL($auth_key).'\' @@ -119,10 +119,10 @@ class WebserviceKeyCore extends ObjectModel return isset($result[0]['active']) && $result[0]['active']; } } - + public static function getClassFromKey($auth_key) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT a.class_name as class FROM `'._DB_PREFIX_.'webservice_account` a WHERE a.key = \''.pSQL($auth_key).'\' @@ -134,12 +134,12 @@ class WebserviceKeyCore extends ObjectModel return $result[0]['class']; } } - + public static function setPermissionForAccount($idAccount, $permissionsToSet) { $ok = true; $sql = 'DELETE FROM `'._DB_PREFIX_.'webservice_permission` WHERE `id_webservice_account` = '.(int)($idAccount); - if(!Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute($sql)) + if (!Db::getInstance()->execute($sql)) $ok = false; if (isset($permissionsToSet)) { @@ -158,7 +158,7 @@ class WebserviceKeyCore extends ObjectModel foreach ($permissions as $permission) $sql .= '(NULL , \''.pSQL($permission[1]).'\', \''.pSQL($permission[0]).'\', '.(int)($idAccount).'), '; $sql = rtrim($sql, ', '); - if(!Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute($sql)) + if (!Db::getInstance()->execute($sql)) $ok = false; } } diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php index 6a901f5ae..4a4dbd9f2 100644 --- a/classes/webservice/WebserviceRequest.php +++ b/classes/webservice/WebserviceRequest.php @@ -1313,7 +1313,7 @@ class WebserviceRequestCore { $sql = 'DELETE FROM `'._DB_PREFIX_.$this->resourceConfiguration['retrieveData']['table'].'_'.$assoc[$this->resourceConfiguration['retrieveData']['table']]['type'].'` WHERE '.$this->resourceConfiguration['fields']['id']['sqlId'].' = '.$object->id; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } if (!empty($arr_avoid_id)) @@ -1499,7 +1499,7 @@ class WebserviceRequestCore $sql = 'INSERT IGNORE INTO `'._DB_PREFIX_.$this->resourceConfiguration['retrieveData']['table'].'_'.$assoc[$this->resourceConfiguration['retrieveData']['table']]['type'].'` (id_shop, '.$this->resourceConfiguration['fields']['id']['sqlId'].') VALUES '; foreach (self::$shopIDs as $id) $sql .= '('.$id.','.$object->id.')'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } else diff --git a/config/defines.inc.php b/config/defines.inc.php index 61101cdf9..0c01b111e 100755 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -151,8 +151,6 @@ define('_STOCK_MOVEMENT_MISSING_REASON_', 4); define('_PS_DEFAULT_CUSTOMER_GROUP_', 1); -define('_PS_CACHEFS_DIRECTORY_', dirname(__FILE__).'/../cache/cachefs/'); - /* Geolocation */ define('_PS_GEOLOCATION_NO_CATALOG_', 0); define('_PS_GEOLOCATION_NO_ORDER_', 1); diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 694a98309..cc9e9b240 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -154,7 +154,7 @@ class AdminAddressesControllerCore extends AdminController $address_type = ((int)(Tools::getValue('address_type')) == 2 ? 'invoice' : ((int)(Tools::getValue('address_type')) == 1 ? 'delivery' : '')); if (isset($_POST['submitAdd'.$this->table]) AND ($id_order = (int)(Tools::getValue('id_order'))) AND !sizeof($this->_errors) AND !empty($address_type)) { - if(!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'orders SET `id_address_'.$address_type.'` = '.Db::getInstance()->Insert_ID().' WHERE `id_order` = '.$id_order)) + if(!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'orders SET `id_address_'.$address_type.'` = '.Db::getInstance()->Insert_ID().' WHERE `id_order` = '.$id_order)) $this->_errors[] = Tools::displayError('An error occurred while linking this address to its order.'); else Tools::redirectAdmin(Tools::getValue('back').'&conf=4'); diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 6ba376f52..b5124765b 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -315,7 +315,7 @@ class AdminHomeControllerCore extends AdminController
'; $chart = new Chart(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT total_paid / conversion_rate as total_converted, invoice_date FROM '._DB_PREFIX_.'orders o WHERE valid = 1 diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php index 19c7e83b7..b3b52413c 100644 --- a/controllers/admin/AdminRequestSqlController.php +++ b/controllers/admin/AdminRequestSqlController.php @@ -63,7 +63,7 @@ class AdminRequestSqlControllerCore extends AdminController if (!($obj = $this->loadObject(true))) return; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_request_sql` FROM `'._DB_PREFIX_.'request_sql` '); @@ -90,7 +90,7 @@ class AdminRequestSqlControllerCore extends AdminController if ($sql) { - $results = Db::getInstance()->ExecuteS($sql[0]['sql']); + $results = Db::getInstance()->executeS($sql[0]['sql']); foreach (array_keys($results[0]) as $key) { $tab_key[] = $key; @@ -145,7 +145,7 @@ class AdminRequestSqlControllerCore extends AdminController $view = array(); - if ($results = Db::getInstance()->ExecuteS($obj->sql)) + if ($results = Db::getInstance()->executeS($obj->sql)) { foreach (array_keys($results[0]) as $key) $tab_key[] = $key; diff --git a/controllers/admin/AdminTrackingController.php b/controllers/admin/AdminTrackingController.php index 2487a55ec..19d3e9bd3 100644 --- a/controllers/admin/AdminTrackingController.php +++ b/controllers/admin/AdminTrackingController.php @@ -99,7 +99,7 @@ class AdminTrackingController extends AdminController $this->_list['message'] = $this->l('List of out of stock products with attributes:'); break ; } - $this->_list['obj'] = Db::getInstance()->ExecuteS($sql); + $this->_list['obj'] = Db::getInstance()->executeS($sql); return $this; } diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index be7a69020..908d7d5f4 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -77,7 +77,7 @@ class ContactControllerCore extends FrontController $id_customer_thread = CustomerThread::getIdCustomerThreadByEmailAndIdOrder($from, (int)Tools::getValue('id_order')) ))) { - $fields = Db::getInstance()->ExecuteS(' + $fields = Db::getInstance()->executeS(' SELECT cm.id_customer_thread, cm.id_contact, cm.id_customer, cm.id_order, cm.id_product, cm.email FROM '._DB_PREFIX_.'customer_thread cm WHERE email = \''.pSQL($from).'\' AND cm.id_shop = '.(int)$this->context->shop->getID(true).' AND ('. @@ -233,7 +233,7 @@ class ContactControllerCore extends FrontController $products = array(); $orders = array(); - $getOrders = Db::getInstance()->ExecuteS(' + $getOrders = Db::getInstance()->executeS(' SELECT id_order FROM '._DB_PREFIX_.'orders WHERE id_customer = '.(int)$this->context->customer->id.' ORDER BY date_add'); diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index 37f8a4cbf..6ae2d34c5 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -89,7 +89,7 @@ class StoresControllerCore extends FrontController */ protected function assignStoresSimplified() { - $stores = Db::getInstance()->ExecuteS(' + $stores = Db::getInstance()->executeS(' SELECT s.*, cl.name country, st.iso_code state FROM '._DB_PREFIX_.'store s '.$this->context->shop->sqlAsso('shop', 's').' @@ -115,7 +115,7 @@ class StoresControllerCore extends FrontController if (Tools::getValue('all') == 1) { - $stores = Db::getInstance()->ExecuteS(' + $stores = Db::getInstance()->executeS(' SELECT s.*, cl.name country, st.iso_code state FROM '._DB_PREFIX_.'store s '.$this->context->shop->sqlAsso('shop', 's').' @@ -128,7 +128,7 @@ class StoresControllerCore extends FrontController $distance = (int)(Tools::getValue('radius', 100)); $multiplicator = ($distanceUnit == 'km' ? 6371 : 3959); - $stores = Db::getInstance()->ExecuteS(' + $stores = Db::getInstance()->executeS(' SELECT s.*, cl.name country, st.iso_code state, ('.(int)($multiplicator).' * acos( diff --git a/install-dev/classes/Language.php b/install-dev/classes/Language.php index ebe62cd70..1645dfa79 100644 --- a/install-dev/classes/Language.php +++ b/install-dev/classes/Language.php @@ -289,19 +289,19 @@ class Language extends ObjectModel */ public function loadUpdateSQL() { - $tables = Db::getInstance()->ExecuteS('SHOW TABLES LIKE \''._DB_PREFIX_.'%_lang\' '); + $tables = Db::getInstance()->executeS('SHOW TABLES LIKE \''._DB_PREFIX_.'%_lang\' '); $langTables = array(); foreach($tables as $table) foreach($table as $t) $langTables[] = $t; - Db::getInstance()->Execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)'); + Db::getInstance()->execute('SET @id_lang_default = (SELECT c.`value` FROM `'._DB_PREFIX_.'configuration` c WHERE c.`name` = \'PS_LANG_DEFAULT\' LIMIT 1)'); $return = true; foreach($langTables as $name) { $fields = ''; - $columns = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'.$name.'`'); + $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `'.$name.'`'); foreach($columns as $column) $fields .= $column['Field'].', '; $fields = rtrim($fields, ', '); @@ -316,7 +316,7 @@ class Language extends ObjectModel } $sql = rtrim($sql, ', '); $sql .= ' FROM `'._DB_PREFIX_.'lang` CROSS JOIN `'.str_replace('_lang', '', $name).'`) ;'; - $return &= Db::getInstance()->Execute(pSQL($sql)); + $return &= Db::getInstance()->execute(pSQL($sql)); } return $return; } @@ -346,17 +346,17 @@ class Language extends ObjectModel $this->iso_code = self::getIsoById($this->id); // Database translations deletion - $result = Db::getInstance()->ExecuteS('SHOW TABLES FROM `'._DB_NAME_.'`'); + $result = Db::getInstance()->executeS('SHOW TABLES FROM `'._DB_NAME_.'`'); foreach ($result AS $row) if (preg_match('/_lang/', $row['Tables_in_'._DB_NAME_])) - if (!Db::getInstance()->Execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($this->id))) + if (!Db::getInstance()->execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($this->id))) return false; // Delete tags - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'tag WHERE id_lang = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'tag WHERE id_lang = '.(int)($this->id)); // Delete search words - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'search_word WHERE id_lang = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'search_word WHERE id_lang = '.(int)($this->id)); // Files deletion foreach (self::getFilesList($this->iso_code, _THEME_NAME_, false, false, false, true, true) as $key => $file) @@ -507,19 +507,19 @@ class Language extends ObjectModel */ public static function getIsoIds($active = true) { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang` '.($active ? 'WHERE active = 1' : '')); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang` '.($active ? 'WHERE active = 1' : '')); } public static function copyLanguageData($from, $to) { - $result = Db::getInstance()->ExecuteS('SHOW TABLES FROM `'._DB_NAME_.'`'); + $result = Db::getInstance()->executeS('SHOW TABLES FROM `'._DB_NAME_.'`'); foreach ($result AS $row) if (preg_match('/_lang/', $row['Tables_in_'._DB_NAME_]) AND $row['Tables_in_'._DB_NAME_] != _DB_PREFIX_.'lang') { - $result2 = Db::getInstance()->ExecuteS('SELECT * FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($from)); + $result2 = Db::getInstance()->executeS('SELECT * FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($from)); if (!sizeof($result2)) continue; - Db::getInstance()->Execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($to)); + Db::getInstance()->execute('DELETE FROM `'.$row['Tables_in_'._DB_NAME_].'` WHERE `id_lang` = '.(int)($to)); $query = 'INSERT INTO `'.$row['Tables_in_'._DB_NAME_].'` VALUES '; foreach ($result2 AS $row2) { @@ -530,7 +530,7 @@ class Language extends ObjectModel $query = rtrim($query, ',').'),'; } $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); } return true; } @@ -542,7 +542,7 @@ class Language extends ObjectModel { self::$_LANGUAGES = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_lang`, `name`, `iso_code`, `active` FROM `'._DB_PREFIX_.'lang`'); @@ -635,7 +635,7 @@ class Language extends ObjectModel if (self::$_cache_language_installation === null) { self::$_cache_language_installation = array(); - $result = Db::getInstance()->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'); + $result = Db::getInstance()->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`'); foreach ($result as $row) self::$_cache_language_installation[$row['iso_code']] = $row['id_lang']; } diff --git a/install-dev/classes/Module.php b/install-dev/classes/Module.php index dae4d5589..4cc1db750 100644 --- a/install-dev/classes/Module.php +++ b/install-dev/classes/Module.php @@ -105,7 +105,7 @@ abstract class Module if (self::$modulesCache == NULL AND !is_array(self::$modulesCache)) { self::$modulesCache = array(); - $result = Db::getInstance()->ExecuteS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`'); + $result = Db::getInstance()->executeS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`'); foreach ($result as $row) self::$modulesCache[$row['name']] = $row; } @@ -150,19 +150,19 @@ abstract class Module { if (!Validate::isUnsignedId($this->id)) return false; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_hook` FROM `'._DB_PREFIX_.'hook_module` hm WHERE `id_module` = '.(int)($this->id)); foreach ($result AS $row) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)($this->id).' AND `id_hook` = '.(int)($row['id_hook'])); $this->cleanPositions($row['id_hook']); } - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'module` WHERE `id_module` = '.(int)($this->id)); } @@ -183,7 +183,7 @@ abstract class Module foreach ($name as $k=>$v) $name[$k] = '"'.pSQL($v).'"'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` IN ('.implode(',',$name).')'); @@ -193,7 +193,7 @@ abstract class Module */ public function enable() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` = \''.pSQL($this->name).'\''); @@ -215,7 +215,7 @@ abstract class Module foreach ($name as $k=>$v) $name[$k] = '"'.pSQL($v).'"'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 0 WHERE `name` IN ('.implode(',',$name).')'); @@ -268,7 +268,7 @@ abstract class Module return false; // Register module in hook - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) VALUES ('.(int)($this->id).', '.(int)($result['id_hook']).', '.(int)($result2['position'] + 1).')'); @@ -313,7 +313,7 @@ abstract class Module */ public function unregisterHook($hook_id) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)($this->id).' @@ -328,7 +328,7 @@ abstract class Module */ public function unregisterExceptions($hook_id) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module_exceptions` WHERE `id_module` = '.(int)($this->id).' @@ -348,7 +348,7 @@ abstract class Module { if (!empty($except)) { - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`) VALUES ('.(int)($this->id).', '.(int)($id_hook).', \''.pSQL(strval($except)).'\')'); if (!$result) @@ -361,7 +361,7 @@ abstract class Module public function editExceptions($id_hook, $excepts) { // Cleaning... - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module_exceptions` WHERE `id_module` = '.(int)($this->id).' AND `id_hook` ='.(int)($id_hook)); return $this->registerExceptions($id_hook, $excepts); @@ -619,7 +619,7 @@ abstract class Module $arrNativeModules[] = '"'.pSQL($module['name']).'"'; } - return $db->ExecuteS(' + return $db->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m WHERE name NOT IN ('.implode(',',$arrNativeModules).') '); @@ -633,7 +633,7 @@ abstract class Module */ public static function getModulesInstalled($position = 0) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m '.($position ? ' @@ -666,7 +666,7 @@ abstract class Module if (!isset(self::$_hookModulesCache)) { $db = Db::getInstance(_PS_USE_SQL_SLAVE_); - $result = $db->ExecuteS(' + $result = $db->executeS(' SELECT h.`name` as hook, m.`id_module`, h.`id_hook`, m.`name` as module, h.`live_edit` FROM `'._DB_PREFIX_.'module` m LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` @@ -737,7 +737,7 @@ abstract class Module $billing = new Address((int)($cart->id_address_invoice)); $output = ''; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT h.`id_hook`, m.`name`, hm.`position` FROM `'._DB_PREFIX_.'module_country` mc LEFT JOIN `'._DB_PREFIX_.'module` m ON m.`id_module` = mc.`id_module` @@ -834,7 +834,7 @@ abstract class Module */ public function updatePosition($id_hook, $way, $position = NULL) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT hm.`id_module`, hm.`position`, hm.`id_hook` FROM `'._DB_PREFIX_.'hook_module` hm WHERE hm.`id_hook` = '.(int)($id_hook).' @@ -854,13 +854,13 @@ abstract class Module if (isset($position) and !empty($position)) $to['position'] = (int)($position); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position`= position '.($way ? '-1' : '+1').' WHERE position between '.(int)(min(array($from['position'], $to['position']))) .' AND '.(int)(max(array($from['position'], $to['position']))).' AND `id_hook`='.(int)($from['id_hook'])) AND - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position`='.(int)($to['position']).' WHERE `'.pSQL($this->identifier).'` = '.(int)($from[$this->identifier]).' AND `id_hook`='.(int)($to['id_hook'])) @@ -874,14 +874,14 @@ abstract class Module */ public function cleanPositions($id_hook) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_module` FROM `'._DB_PREFIX_.'hook_module` WHERE `id_hook` = '.(int)($id_hook).' ORDER BY `position`'); $sizeof = sizeof($result); for ($i = 0; $i < $sizeof; ++$i) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position` = '.(int)($i + 1).' WHERE `id_hook` = '.(int)($id_hook).' @@ -942,7 +942,7 @@ abstract class Module if (self::$exceptionsCache == NULL AND !is_array(self::$exceptionsCache)) { self::$exceptionsCache = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT CONCAT(id_hook, \'-\', id_module) as `key`, `file_name` as value FROM `'._DB_PREFIX_.'hook_module_exceptions`'); foreach ($result as $row) @@ -959,7 +959,7 @@ abstract class Module public static function isInstalled($moduleName) { - Db::getInstance()->ExecuteS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); + Db::getInstance()->executeS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); return (bool)Db::getInstance()->NumRows(); } diff --git a/install-dev/php/add_attribute_position.php b/install-dev/php/add_attribute_position.php index f23e439df..1b21c272c 100755 --- a/install-dev/php/add_attribute_position.php +++ b/install-dev/php/add_attribute_position.php @@ -27,13 +27,13 @@ function add_attribute_position() { - $groups = Db::getInstance()->ExecuteS(' + $groups = Db::getInstance()->executeS(' SELECT `id_attribute_group` FROM `'._DB_PREFIX_.'attribute`'); if (sizeof($groups) && is_array($groups)) foreach ($groups as $group) { - $attributes = Db::getInstance()->ExecuteS(' + $attributes = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '. (int)($group['id_attribute_group'])); @@ -41,7 +41,7 @@ function add_attribute_position() if (sizeof($attributes) && is_array($attributes)) foreach ($attributes as $attribute) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute` SET `position` = '.$i++.' WHERE `id_attribute` = '.(int)$attribute['id_attribute'].' diff --git a/install-dev/php/add_default_restrictions_modules_groups.php b/install-dev/php/add_default_restrictions_modules_groups.php index c37d3ae7b..60a0aac17 100644 --- a/install-dev/php/add_default_restrictions_modules_groups.php +++ b/install-dev/php/add_default_restrictions_modules_groups.php @@ -27,10 +27,10 @@ function add_default_restrictions_modules_groups() { - $groups = Db::getInstance()->ExecuteS(' + $groups = Db::getInstance()->executeS(' SELECT `id_group` FROM `'._DB_PREFIX_.'group`'); - $modules = Db::getInstance()->ExecuteS(' + $modules = Db::getInstance()->executeS(' SELECT m.* FROM `'._DB_PREFIX_.'module` m'); foreach ($groups as $group) @@ -44,7 +44,7 @@ function add_default_restrictions_modules_groups() $sql .= '("'.(int)$group['id_group'].'", "'.(int)$mod['id_module'].'", "1"),'; // removing last comma to avoid SQL error $sql = substr($sql, 0, strlen($sql) - 1); - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } } } \ No newline at end of file diff --git a/install-dev/php/add_feature_position.php b/install-dev/php/add_feature_position.php index 824185943..d105ba75d 100644 --- a/install-dev/php/add_feature_position.php +++ b/install-dev/php/add_feature_position.php @@ -27,14 +27,14 @@ function add_feature_position() { - $features = Db::getInstance()->ExecuteS(' + $features = Db::getInstance()->executeS(' SELECT `id_feature` FROM `'._DB_PREFIX_.'feature`'); $i = 0; if (sizeof($features) && is_array($features)) foreach ($features as $feature) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'feature` SET `position` = '.$i++.' WHERE `id_feature` = '.(int)$feature['id_feature']); diff --git a/install-dev/php/add_group_attribute_position.php b/install-dev/php/add_group_attribute_position.php index 585967736..3c2e25b21 100644 --- a/install-dev/php/add_group_attribute_position.php +++ b/install-dev/php/add_group_attribute_position.php @@ -27,14 +27,14 @@ function add_group_attribute_position() { - $groups = Db::getInstance()->ExecuteS(' + $groups = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'attribute_group`'); $i = 0; if (sizeof($groups) && is_array($groups)) foreach ($groups as $group) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'attribute_group` SET `position` = '.$i++.' WHERE `id_attribute_group` = '.(int)$group['id_attribute_group']); diff --git a/install-dev/php/add_missing_rewrite_value.php b/install-dev/php/add_missing_rewrite_value.php index 329d632b7..0c7eeb5bf 100644 --- a/install-dev/php/add_missing_rewrite_value.php +++ b/install-dev/php/add_missing_rewrite_value.php @@ -27,7 +27,7 @@ function add_missing_rewrite_value() { - $pages = Db::getInstance()->ExecuteS(' + $pages = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'meta` m LEFT JOIN `'._DB_PREFIX_.'meta_lang` ml ON (m.`id_meta` = ml.`id_meta`) @@ -37,7 +37,7 @@ function add_missing_rewrite_value() if (sizeof($pages) && is_array($pages)) foreach ($pages as $page) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'meta_lang` SET `url_rewrite` = "'.pSQL(Tools::str2url($page['title'])).'" WHERE `id_meta` = '.(int)$page['id_meta'].' diff --git a/install-dev/php/add_module_to_hook.php b/install-dev/php/add_module_to_hook.php index 851f828ef..078fb9952 100644 --- a/install-dev/php/add_module_to_hook.php +++ b/install-dev/php/add_module_to_hook.php @@ -42,7 +42,7 @@ function add_module_to_hook($module_name, $hook_name) if ((int)$id_hook > 0) { - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT IGNORE INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) VALUES ( '.(int)$id_module.', diff --git a/install-dev/php/add_new_tab.php b/install-dev/php/add_new_tab.php index b50d7c13c..2d8f9fe77 100644 --- a/install-dev/php/add_new_tab.php +++ b/install-dev/php/add_new_tab.php @@ -35,12 +35,12 @@ function add_new_tab($className, $name, $id_parent, $returnId = false) } if (!(int)Db::getInstance()->getValue('SELECT count(id_tab) FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($className).'\' ')) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'tab` (`id_parent`, `class_name`, `module`, `position`) VALUES ('.(int)$id_parent.', \''.pSQL($className).'\', \'\', + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'tab` (`id_parent`, `class_name`, `module`, `position`) VALUES ('.(int)$id_parent.', \''.pSQL($className).'\', \'\', (SELECT IFNULL(MAX(t.position),0)+ 1 FROM `'._DB_PREFIX_.'tab` t WHERE t.id_parent = '.(int)$id_parent.'))'); foreach (Language::getLanguages() AS $lang) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT IGNORE INTO `'._DB_PREFIX_.'tab_lang` (`id_lang`, `id_tab`, `name`) VALUES ('.(int)$lang['id_lang'].', ( SELECT `id_tab` @@ -50,7 +50,7 @@ function add_new_tab($className, $name, $id_parent, $returnId = false) '); } - Db::getInstance()->Execute('INSERT IGNORE INTO `'._DB_PREFIX_.'access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) + Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT `id_profile`, ( SELECT `id_tab` FROM `'._DB_PREFIX_.'tab` diff --git a/install-dev/php/add_order_state.php b/install-dev/php/add_order_state.php index 7118a6a29..2cf0c6a69 100644 --- a/install-dev/php/add_order_state.php +++ b/install-dev/php/add_order_state.php @@ -42,7 +42,7 @@ function add_order_state($conf_name, $name, $invoice, $send_email, $color, $unre $template_lang[$temp[0]] = $temp[1]; } - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'order_state` (`invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) VALUES ('.(int)$invoice.', '.(int)$send_email.', \''.pSQL($color).'\', '.(int)$unremovable.', '.(int)$logable.', '.(int)$delivery.')'); @@ -53,7 +53,7 @@ function add_order_state($conf_name, $name, $invoice, $send_email, $color, $unre foreach (Language::getLanguages() AS $lang) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT IGNORE INTO `'._DB_PREFIX_.'order_state_lang` (`id_lang`, `id_order_state`, `name`, `template`) VALUES ('.(int)$lang['id_lang'].', '.(int)$id_order_state.', \''.pSQL(isset($name_lang[$lang['iso_code']]) ? $name_lang[$lang['iso_code']] : $name_lang['en']).'\', \''.pSQL(isset($template_lang[$lang['iso_code']]) ? $template_lang[$lang['iso_code']] : (isset($template_lang['en']) ? $template_lang['en'] : '')).'\') '); diff --git a/install-dev/php/check_webservice_account_table.php b/install-dev/php/check_webservice_account_table.php index 74549a511..5fdf89b2e 100644 --- a/install-dev/php/check_webservice_account_table.php +++ b/install-dev/php/check_webservice_account_table.php @@ -34,11 +34,11 @@ function check_webservice_account_table() { $sql = 'SHOW COLUMNS FROM '._DB_PREFIX_.'webservice_account'; - $return = DB::getInstance()->ExecuteS($sql); + $return = DB::getInstance()->executeS($sql); if (count($return) < 7) { $sql = 'ALTER TABLE `'._DB_PREFIX_.'webservice_account` ADD `is_module` TINYINT( 2 ) NOT NULL DEFAULT \'0\' AFTER `class_name` , ADD `module_name` VARCHAR( 50 ) NULL DEFAULT NULL AFTER `is_module`'; - DB::getInstance()->ExecuteS($sql); + DB::getInstance()->executeS($sql); } } \ No newline at end of file diff --git a/install-dev/php/confcleaner.php b/install-dev/php/confcleaner.php index 5c1badab7..81cf63364 100644 --- a/install-dev/php/confcleaner.php +++ b/install-dev/php/confcleaner.php @@ -27,7 +27,7 @@ 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 diff --git a/install-dev/php/create_multistore.php b/install-dev/php/create_multistore.php index 7671ac1c5..89e9bbe91 100755 --- a/install-dev/php/create_multistore.php +++ b/install-dev/php/create_multistore.php @@ -7,8 +7,8 @@ function create_multistore() $themes = scandir(dirname(__FILE__).'/../../themes'); foreach ($themes AS $theme) if (is_dir(dirname(__FILE__).'/../../themes/'.$theme) && $theme != '.' && $theme != '..' && $theme != 'prestashop') - $res &= Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'theme (`id_theme`, `name`) VALUES(\'\', \''.pSQL($theme).'\')'); - $res &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'shop SET id_theme = (SELECT id_theme FROM '._DB_PREFIX_.'theme WHERE name=\''.pSQL(_THEME_NAME_).'\') WHERE id_shop = 1'); + $res &= Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'theme (`id_theme`, `name`) VALUES(\'\', \''.pSQL($theme).'\')'); + $res &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'shop SET id_theme = (SELECT id_theme FROM '._DB_PREFIX_.'theme WHERE name=\''.pSQL(_THEME_NAME_).'\') WHERE id_shop = 1'); $shop_domain = Db::getInstance()->getValue('SELECT `value` FROM `'._DB_PREFIX_.'_configuration` WHERE `name`=\'PS_SHOP_DOMAIN\''); @@ -23,17 +23,17 @@ function create_multistore() $_PS_DIRECTORY_ = trim(str_replace(' ', '%20', INSTALLER__PS_BASE_URI), '/'); $_PS_DIRECTORY_ = ($_PS_DIRECTORY_) ? '/'.$_PS_DIRECTORY_.'/' : '/'; - $res &= Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) + $res &= Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'shop_url` (`id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES(1, \''.pSQL($shop_domain).'\', \''.pSQL($shop_domain_ssl).'\', \''.pSQL($_PS_DIRECTORY_).'\', \'\', 1, 1)'); // Stock conversion $sql = 'INSERT INTO `'._DB_PREFIX_.'.stock` (`id_product`, `id_product_attribute`, `id_group_shop`, `id_shop`, `quantity`) VALUES (SELECT `p.id_product`, 0, 1, 1, `p.quantity` FROM `'._DB_PREFIX_.'.product` p);'; - $res &= Db::getInstance()->Execute($sql); + $res &= Db::getInstance()->execute($sql); $sql = 'INSERT INTO `'._DB_PREFIX_.'.stock` (`id_product`, `id_product_attribute`, `id_group_shop`, `id_shop`, `quantity`) VALUES (SELECT `id_product`, `id_product_attribute`, 1, 1, `quantity` FROM `'._DB_PREFIX_.'product_attribute` p);'; - $res &= Db::getInstance()->Execute($sql); + $res &= Db::getInstance()->execute($sql); // Add admin tabs $shopTabId = add_new_tab('AdminShop', 'it:Shops|es:Shops|fr:Boutiques|de:Shops|en:Shops', 0, true); diff --git a/install-dev/php/customizations.php b/install-dev/php/customizations.php index 821efd80c..0cc176c62 100644 --- a/install-dev/php/customizations.php +++ b/install-dev/php/customizations.php @@ -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; diff --git a/install-dev/php/deliverynumber.php b/install-dev/php/deliverynumber.php index 7433868c2..d4b51f315 100644 --- a/install-dev/php/deliverynumber.php +++ b/install-dev/php/deliverynumber.php @@ -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 ; } } diff --git a/install-dev/php/desactivatecustommodules.php b/install-dev/php/desactivatecustommodules.php index ee7d14aca..bdc555283 100644 --- a/install-dev/php/desactivatecustommodules.php +++ b/install-dev/php/desactivatecustommodules.php @@ -41,7 +41,7 @@ function desactivate_custom_modules() $arrNativeModules[] = '"'.pSQL($module['name']).'"'; } - $arrNonNative = $db->ExecuteS(' + $arrNonNative = $db->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m WHERE name NOT IN ('.implode(',',$arrNativeModules).') '); @@ -57,7 +57,7 @@ function desactivate_custom_modules() foreach ($uninstallMe as $k=>$v) $uninstallMe[$k] = '"'.pSQL($v).'"'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 0 WHERE `name` IN ('.implode(',',$uninstallMe).')'); diff --git a/install-dev/php/editorial_update.php b/install-dev/php/editorial_update.php index c355812fc..205c26798 100644 --- a/install-dev/php/editorial_update.php +++ b/install-dev/php/editorial_update.php @@ -31,14 +31,14 @@ function editorial_update() if (Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name`="editorial"')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial` ( `id_editorial` int(10) unsigned NOT NULL auto_increment, `body_home_logo_link` varchar(255) NOT NULL, PRIMARY KEY (`id_editorial`)) ENGINE=MyISAM DEFAULT CHARSET=utf8'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial_lang` ( `id_editorial` int(10) unsigned NOT NULL, `id_lang` int(10) unsigned NOT NULL, @@ -52,13 +52,13 @@ function editorial_update() if (file_exists(dirname(__FILE__).'/../../modules/editorial/editorial.xml')) { $xml = simplexml_load_file(dirname(__FILE__).'/../../modules/editorial/editorial.xml'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'editorial`(`id_editorial`, `body_home_logo_link`) VALUES(1, "'.(isset($xml->body->home_logo_link) ? pSQL($xml->body->home_logo_link) : '').'")'); - $languages = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'lang`'); + $languages = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'lang`'); foreach ($languages as $language) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'editorial_lang` (`id_editorial`, `id_lang`, `body_title`, `body_subheading`, `body_paragraph`, `body_logo_subheading`) VALUES (1, '.(int)($language['id_lang']).', "'.(isset($xml->body->{'title_'.$language['id_lang']}) ? pSQL($xml->body->{'title_'.$language['id_lang']}) : '').'", diff --git a/install-dev/php/generate_tax_rules.php b/install-dev/php/generate_tax_rules.php index 59f47fb69..a107d12ce 100644 --- a/install-dev/php/generate_tax_rules.php +++ b/install-dev/php/generate_tax_rules.php @@ -17,7 +17,7 @@ function generate_tax_rules() $id_tax_rules_group = $group->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`) @@ -27,7 +27,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)$group->id.', @@ -40,7 +40,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 @@ -55,7 +55,7 @@ function generate_tax_rules() else $tax_behavior = $state['tax_behavior']; - $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)$group->id.', @@ -67,13 +67,13 @@ function generate_tax_rules() } } - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product` SET `id_tax_rules_group` = '.(int)$group->id.' WHERE `id_tax` = '.(int)$id_tax ); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'carrier` SET `id_tax_rules_group` = '.(int)$group->id.' WHERE `id_tax` = '.(int)$id_tax diff --git a/install-dev/php/invoicenumber.php b/install-dev/php/invoicenumber.php index fa6156c9c..e1f3af103 100644 --- a/install-dev/php/invoicenumber.php +++ b/install-dev/php/invoicenumber.php @@ -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 ; } } diff --git a/install-dev/php/migrate_block_info_to_cms_block.php b/install-dev/php/migrate_block_info_to_cms_block.php index 1fc0f8e69..b723119ce 100644 --- a/install-dev/php/migrate_block_info_to_cms_block.php +++ b/install-dev/php/migrate_block_info_to_cms_block.php @@ -30,7 +30,7 @@ function migrate_block_info_to_cms_block() //get ids cms of block information $id_blockinfos = Db::getInstance()->getValue('SELECT id_module FROM `'._DB_PREFIX_.'module` WHERE name = \'blockinfos\''); //get ids cms of block information - $ids_cms = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'block_cms` WHERE `id_block` = '.(int)$id_blockinfos); + $ids_cms = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'block_cms` WHERE `id_block` = '.(int)$id_blockinfos); //check if block info is installed and active if (sizeof($ids_cms)) { @@ -38,16 +38,16 @@ function migrate_block_info_to_cms_block() if (Module::getInstanceByName('blockcms')->install()) { //add new block in new cms block - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `name`, `location`, `position`) VALUES( 1, \'\', 0, 0)'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `name`, `location`, `position`) VALUES( 1, \'\', 0, 0)'); $id_block = Db::getInstance()->Insert_ID(); $languages = Language::getLanguages(false); foreach($languages AS $language) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`) VALUES ('.(int)$id_block.', '.(int)$language['id_lang'].', \'Information\')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`) VALUES ('.(int)$id_block.', '.(int)$language['id_lang'].', \'Information\')'); //save ids cms of block information in new module cms bloc foreach($ids_cms AS $id_cms) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block`, `id_cms`, `is_category`) VALUES ('.(int)$id_block.', '.(int)$id_cms['id_cms'].', 0)'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block`, `id_cms`, `is_category`) VALUES ('.(int)$id_block.', '.(int)$id_cms['id_cms'].', 0)'); } else return true; diff --git a/install-dev/php/move_crossselling.php b/install-dev/php/move_crossselling.php index 44aefb5f9..53d37601d 100644 --- a/install-dev/php/move_crossselling.php +++ b/install-dev/php/move_crossselling.php @@ -3,9 +3,9 @@ function move_crossselling() { -if (Db::getInstance()->ExecuteS('SELECT FROM `'._DB_PREFIX_.'module` WHERE `name` = \'crossselling\'')) +if (Db::getInstance()->executeS('SELECT FROM `'._DB_PREFIX_.'module` WHERE `name` = \'crossselling\'')) { -Db::getInstance()->Execute(' +Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) VALUES ((SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \'crossselling\'), 9, (SELECT max_position FROM (SELECT MAX(position)+1 as max_position FROM `'._DB_PREFIX_.'hook_module` WHERE `id_hook` = 9) tmp))'); } diff --git a/install-dev/php/price_converter.php b/install-dev/php/price_converter.php index 1c24dcef1..07815e130 100644 --- a/install-dev/php/price_converter.php +++ b/install-dev/php/price_converter.php @@ -32,7 +32,7 @@ function convert_product_price() $taxRates = array(); foreach ($taxes as $data) $taxRates[$data['id_tax']] = (float)($data['rate']) / 100; - $resource = DB::getInstance()->ExecuteS('SELECT `id_product`, `price`, `id_tax` FROM `'._DB_PREFIX_.'product`', false); + $resource = DB::getInstance()->executeS('SELECT `id_product`, `price`, `id_tax` FROM `'._DB_PREFIX_.'product`', false); if (!$resource) die(Db::getInstance()->getMsgError()); while ($row = DB::getInstance()->nextRow($resource)) diff --git a/install-dev/php/regenerate_level_depth.php b/install-dev/php/regenerate_level_depth.php index 7380d01c5..bd27cbbd8 100644 --- a/install-dev/php/regenerate_level_depth.php +++ b/install-dev/php/regenerate_level_depth.php @@ -30,7 +30,7 @@ */ function regenerate_level_depth() { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = 0 WHERE `id_category` = 1'); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = 0 WHERE `id_category` = 1'); regenerate_children_categories(1, 0); } @@ -42,7 +42,7 @@ function regenerate_level_depth() */ function regenerate_children_categories($id_category, $level_depth) { - $categories = Db::getInstance()->ExecuteS('SELECT `id_category` FROM `'._DB_PREFIX_.'category` WHERE `id_parent` = '.(int)$id_category); + $categories = Db::getInstance()->executeS('SELECT `id_category` FROM `'._DB_PREFIX_.'category` WHERE `id_parent` = '.(int)$id_category); if (!$categories) return; $new_depth = (int)$level_depth + 1; @@ -54,5 +54,5 @@ function regenerate_children_categories($id_category, $level_depth) } $cat_ids = substr($cat_ids, 0, -1); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = '.(int)$new_depth.' WHERE `id_category` IN ('.$cat_ids.')'); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'category` SET `level_depth` = '.(int)$new_depth.' WHERE `id_category` IN ('.$cat_ids.')'); } diff --git a/install-dev/php/remove_duplicate_category_groups.php b/install-dev/php/remove_duplicate_category_groups.php index a2207a4a5..31c4b5085 100644 --- a/install-dev/php/remove_duplicate_category_groups.php +++ b/install-dev/php/remove_duplicate_category_groups.php @@ -30,7 +30,7 @@ */ function remove_duplicate_category_groups() { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_category`, `id_group`, COUNT(*) as `count` FROM `'._DB_PREFIX_.'category_group` GROUP BY `id_category`, `id_group` @@ -41,7 +41,7 @@ function remove_duplicate_category_groups() if ((int)$row['count'] > 1) { $limit = (int)$row['count'] - 1; - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'category_group` WHERE `id_category` = '.$row['id_category'].' AND `id_group` = '.$row['id_group'].' LIMIT '.$limit); diff --git a/install-dev/php/remove_module_from_hook.php b/install-dev/php/remove_module_from_hook.php index ae91cf98f..cfc67e9fc 100644 --- a/install-dev/php/remove_module_from_hook.php +++ b/install-dev/php/remove_module_from_hook.php @@ -42,7 +42,7 @@ function remove_module_from_hook($module_name, $hook_name) if ((int)$id_hook > 0) { - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)$id_module.' AND `id_hook` = '.(int)$id_hook); } diff --git a/install-dev/php/remove_tab.php b/install-dev/php/remove_tab.php index 69666e70e..40697d0b8 100644 --- a/install-dev/php/remove_tab.php +++ b/install-dev/php/remove_tab.php @@ -3,7 +3,7 @@ function remove_tab($tabname) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE t, l FROM `ps_tab` t LEFT JOIN `PREFIX_tab_lang` l ON (t.id_tab = l.id_tab) WHERE t.`class_name` = '.pSQL($tabname)); diff --git a/install-dev/php/reorderpositions.php b/install-dev/php/reorderpositions.php index 4c4cceee4..97ad86df1 100644 --- a/install-dev/php/reorderpositions.php +++ b/install-dev/php/reorderpositions.php @@ -35,10 +35,10 @@ function reorderpositions() //clean Category position and delete old position system Language::loadLanguages(); $language = Language::getLanguages(); - $cat_parent = Db::getInstance()->ExecuteS('SELECT DISTINCT c.id_parent FROM `'._DB_PREFIX_.'category` c WHERE id_category != 1'); + $cat_parent = Db::getInstance()->executeS('SELECT DISTINCT c.id_parent FROM `'._DB_PREFIX_.'category` c WHERE id_category != 1'); foreach($cat_parent AS $parent) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT DISTINCT c.*, cl.* FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND `id_lang` = '.(int)(Configuration::get('PS_LANG_DEFAULT')).') @@ -46,14 +46,14 @@ function reorderpositions() ORDER BY name ASC'); foreach($result AS $i => $categ) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'category` SET `position` = '.(int)($i).' WHERE `id_parent` = '.(int)($categ['id_parent']).' AND `id_category` = '.(int)($categ['id_category'])); } - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT DISTINCT c.*, cl.* FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`) @@ -62,7 +62,7 @@ function reorderpositions() // Remove number from category name foreach($result AS $i => $categ) - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'category` c + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category`) SET `name` = \''.preg_replace('/^[0-9]+\./', '',$categ['name']).'\' WHERE c.id_category = '.(int)($categ['id_category']).' AND id_lang = \''.(int)($categ['id_lang']).'\''); diff --git a/install-dev/php/setdiscountcategory.php b/install-dev/php/setdiscountcategory.php index c8b2108ce..613383ba7 100644 --- a/install-dev/php/setdiscountcategory.php +++ b/install-dev/php/setdiscountcategory.php @@ -27,11 +27,11 @@ 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']).')'); } diff --git a/install-dev/php/setpaymentmodule.php b/install-dev/php/setpaymentmodule.php index f50c4654a..0a79befbb 100644 --- a/install-dev/php/setpaymentmodule.php +++ b/install-dev/php/setpaymentmodule.php @@ -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'); } diff --git a/install-dev/php/setpaymentmodulegroup.php b/install-dev/php/setpaymentmodulegroup.php index b6b84f439..c26736612 100644 --- a/install-dev/php/setpaymentmodulegroup.php +++ b/install-dev/php/setpaymentmodulegroup.php @@ -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`'); } diff --git a/install-dev/php/update_module_followup.php b/install-dev/php/update_module_followup.php index 104660df5..0fbd65a3a 100644 --- a/install-dev/php/update_module_followup.php +++ b/install-dev/php/update_module_followup.php @@ -32,6 +32,6 @@ function update_module_followup() if (!$followup->id) 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`);'); } diff --git a/install-dev/php/update_order_detail_taxes.php b/install-dev/php/update_order_detail_taxes.php index 9c86a730f..2ae5f856f 100644 --- a/install-dev/php/update_order_detail_taxes.php +++ b/install-dev/php/update_order_detail_taxes.php @@ -2,7 +2,7 @@ function update_order_detail_taxes() { - $order_detail_taxes = Db::getInstance()->ExecuteS(' + $order_detail_taxes = Db::getInstance()->executeS(' SELECT `id_order_detail`, `tax_name`, `tax_rate` FROM `'._DB_PREFIX_.'order_detail` '); @@ -36,7 +36,7 @@ function update_order_detail_taxes() $id_tax = $tax->id; } - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'order_detail_tax` (`id_order_detail`, `id_tax`) VALUES ('.(int)$order_detail_tax['id_order_detail'].','.$id_tax.') '); diff --git a/install-dev/php/update_order_details.php b/install-dev/php/update_order_details.php index 0981d711a..8067c5a9f 100644 --- a/install-dev/php/update_order_details.php +++ b/install-dev/php/update_order_details.php @@ -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`'); } } diff --git a/install-dev/php/update_products_ecotax_v133.php b/install-dev/php/update_products_ecotax_v133.php index ef304c2c1..a307825ae 100644 --- a/install-dev/php/update_products_ecotax_v133.php +++ b/install-dev/php/update_products_ecotax_v133.php @@ -30,7 +30,7 @@ function update_products_ecotax_v133() global $oldversion; if($oldversion < '1.3.3.0') { - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'product` SET `ecotax` = \'0\' WHERE 1'); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'order_detail` SET `ecotax` = \'0\' WHERE 1;'); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'product` SET `ecotax` = \'0\' WHERE 1'); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'order_detail` SET `ecotax` = \'0\' WHERE 1;'); } } \ No newline at end of file diff --git a/install-dev/php/updatecarrierurl.php b/install-dev/php/updatecarrierurl.php index 0524888c0..3bdda144a 100644 --- a/install-dev/php/updatecarrierurl.php +++ b/install-dev/php/updatecarrierurl.php @@ -31,12 +31,12 @@ function update_carrier_url() $sql = ' SELECT c.`id_carrier`, c.`url` FROM `'._DB_PREFIX_.'carrier` c'; - $carriers = Db::getInstance()->ExecuteS($sql); + $carriers = Db::getInstance()->executeS($sql); // Check each one and erase carrier URL if not correct URL foreach ($carriers as $carrier) if (!Validate::isAbsoluteUrl($carrier['url'])) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'carrier` SET `url` = \'\' WHERE `id_carrier`= '.(int)($carrier['id_carrier'])); diff --git a/install-dev/php/updatemodulessql.php b/install-dev/php/updatemodulessql.php index 358d1689f..46ed39415 100644 --- a/install-dev/php/updatemodulessql.php +++ b/install-dev/php/updatemodulessql.php @@ -30,12 +30,12 @@ function update_modules_sql() Configuration::loadConfiguration(); $blocklink = Module::getInstanceByName('blocklink'); if ($blocklink->id) - 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`);'); $productComments = Module::getInstanceByName('productcomments'); if ($productComments->id) { - 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`);'); } } diff --git a/install-dev/php/updateproductcomments.php b/install-dev/php/updateproductcomments.php index cb27c60d1..a3f649ca4 100644 --- a/install-dev/php/updateproductcomments.php +++ b/install-dev/php/updateproductcomments.php @@ -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`;'); } } diff --git a/install-dev/php/updatetabicon_from_11version.php b/install-dev/php/updatetabicon_from_11version.php index b621a9e95..1ff7b18f9 100644 --- a/install-dev/php/updatetabicon_from_11version.php +++ b/install-dev/php/updatetabicon_from_11version.php @@ -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_IMG_DIR_.'/t/'); diff --git a/install-dev/php/utf8.php b/install-dev/php/utf8.php index 01f0111e7..09136ffe1 100644 --- a/install-dev/php/utf8.php +++ b/install-dev/php/utf8.php @@ -86,7 +86,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) @@ -94,7 +94,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; @@ -109,7 +109,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) { @@ -120,7 +120,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 .= ' diff --git a/install-dev/xml/checkShopInfos.php b/install-dev/xml/checkShopInfos.php index 760802610..06954ca02 100644 --- a/install-dev/xml/checkShopInfos.php +++ b/install-dev/xml/checkShopInfos.php @@ -149,11 +149,11 @@ if(isFormValid()) foreach ($_GET['infosWL'] AS $wl) $sqlLanguages[] = "INSERT INTO `"._DB_PREFIX_."lang` (`id_lang` ,`name` ,`active` ,`iso_code`)VALUES (NULL , '".ToolsInstall::getLangString($wl)."', '1', '".pSQL($wl)."')"; foreach($sqlLanguages AS $query) - if(!Db::getInstance()->Execute($query)) + if(!Db::getInstance()->execute($query)) $error['infosLanguages'] = '11'; // Flags copy - if(!$languagesId = Db::getInstance()->ExecuteS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`')) + if(!$languagesId = Db::getInstance()->executeS('SELECT `id_lang`, `iso_code` FROM `'._DB_PREFIX_.'lang`')) $error['infosLanguages'] = '11'; unset($dbInstance);*/ diff --git a/install-dev/xml/createDB.php b/install-dev/xml/createDB.php index 7f2012048..54acc49d3 100644 --- a/install-dev/xml/createDB.php +++ b/install-dev/xml/createDB.php @@ -131,7 +131,7 @@ switch (_DB_TYPE_) { foreach($db_structure_settings as $query){ $query = trim($query); if(!empty($query)){ - if(!Db::getInstance()->Execute($query)){ + if(!Db::getInstance()->execute($query)){ if(Db::getInstance()->getNumberError() == 1050){ $logger->logError('A Prestashop database already exists, please drop it or change the prefix.'); die(''."\n"); @@ -185,7 +185,7 @@ switch (_DB_TYPE_) { foreach($db_data_settings as $query){ $query = trim($query); if(!empty($query)){ - if(!Db::getInstance()->Execute($query)){ + if(!Db::getInstance()->execute($query)){ if(Db::getInstance()->getNumberError() == 1050){ die(''."\n"); } else { @@ -208,13 +208,13 @@ switch (_DB_TYPE_) { } $xml = ''."\n"; -$countries = Db::getInstance()->ExecuteS(' +$countries = Db::getInstance()->executeS(' SELECT c.`id_country`, cl.`name`, c.`iso_code` FROM `'.$_GET['tablePrefix'].'country` c INNER JOIN `'.$_GET['tablePrefix'].'country_lang` cl ON (c.`id_country` = cl.`id_country`) WHERE cl.`id_lang` = '.(int)($_GET['language'] + 1).' ORDER BY cl.`name`'); -$timezones = Db::getInstance()->ExecuteS(' +$timezones = Db::getInstance()->executeS(' SELECT * FROM `'.$_GET['tablePrefix'].'timezone` ORDER BY `name`'); diff --git a/install-dev/xml/doUpgrade.php b/install-dev/xml/doUpgrade.php index 4531ab0ca..65488a845 100644 --- a/install-dev/xml/doUpgrade.php +++ b/install-dev/xml/doUpgrade.php @@ -394,7 +394,7 @@ foreach($sqlContent as $query) '."\n"; } - elseif(!Db::getInstance()->Execute($query)) + elseif(!Db::getInstance()->execute($query)) { $logger->logError('SQL query: '."\r\n".$query); $logger->logError('SQL error: '."\r\n".Db::getInstance()->getMsgError()); diff --git a/modules/autoupgrade/AdminPreferences.php b/modules/autoupgrade/AdminPreferences.php index 0cda23ace..abf005a79 100644 --- a/modules/autoupgrade/AdminPreferences.php +++ b/modules/autoupgrade/AdminPreferences.php @@ -34,7 +34,7 @@ class AdminPreferences extends AdminTab $this->className = 'Configuration'; $this->table = 'configuration'; - $timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT name FROM '._DB_PREFIX_.'timezone'); + $timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone'); $taxes[] = array('id' => 0, 'name' => $this->l('None')); /* foreach (Tax::getTaxes((int)($cookie->id_lang)) as $tax) $taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']); diff --git a/modules/autoupgrade/AdminSelfTab.php b/modules/autoupgrade/AdminSelfTab.php index 2df06e7f7..d9113156d 100644 --- a/modules/autoupgrade/AdminSelfTab.php +++ b/modules/autoupgrade/AdminSelfTab.php @@ -522,7 +522,7 @@ abstract class AdminSelfTab $required_fields[(int)$row['id_required_field']] = $row['field_name']; - $table_fields = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table)); + $table_fields = Db::getInstance()->executeS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table)); $irow = 0; foreach ($table_fields AS $field) { @@ -1397,7 +1397,7 @@ abstract class AdminSelfTab ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').' LIMIT '.(int)($start).','.(int)($limit); - $this->_list = Db::getInstance()->ExecuteS($sql); + $this->_list = Db::getInstance()->executeS($sql); $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); } diff --git a/modules/autoupgrade/Backup.php b/modules/autoupgrade/Backup.php index 36de581ca..eebabdd56 100644 --- a/modules/autoupgrade/Backup.php +++ b/modules/autoupgrade/Backup.php @@ -214,7 +214,7 @@ class BackupCore fwrite($fp, "\n".'SET NAMES \'utf8\';'."\n\n"); // Find all tables - $tables = Db::getInstance()->ExecuteS('SHOW TABLES'); + $tables = Db::getInstance()->executeS('SHOW TABLES'); $found = 0; foreach ($tables AS $table) { @@ -225,7 +225,7 @@ class BackupCore continue; // Export the table schema - $schema = Db::getInstance()->ExecuteS('SHOW CREATE TABLE `' . $table . '`'); + $schema = Db::getInstance()->executeS('SHOW CREATE TABLE `' . $table . '`'); if (count($schema) != 1 || !isset($schema[0]['Table']) || !isset($schema[0]['Create Table'])) { @@ -244,7 +244,7 @@ class BackupCore if (!in_array($schema[0]['Table'], $ignore_insert_table)) { - $data = Db::getInstance()->ExecuteS('SELECT * FROM `' . $schema[0]['Table'] . '`', false); + $data = Db::getInstance()->executeS('SELECT * FROM `' . $schema[0]['Table'] . '`', false); $sizeof = DB::getInstance()->NumRows(); $lines = explode("\n", $schema[0]['Create Table']); diff --git a/modules/autoupgrade/SelfModule.php b/modules/autoupgrade/SelfModule.php index 98284e943..e9b2250e2 100644 --- a/modules/autoupgrade/SelfModule.php +++ b/modules/autoupgrade/SelfModule.php @@ -105,7 +105,7 @@ abstract class SelfModule if (self::$modulesCache == NULL AND !is_array(self::$modulesCache)) { self::$modulesCache = array(); - $result = Db::getInstance()->ExecuteS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`'); + $result = Db::getInstance()->executeS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`'); foreach ($result as $row) self::$modulesCache[$row['name']] = $row; } @@ -150,19 +150,19 @@ abstract class SelfModule { if (!Validate::isUnsignedId($this->id)) return false; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_hook` FROM `'._DB_PREFIX_.'hook_module` hm WHERE `id_module` = '.(int)($this->id)); foreach ($result AS $row) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)($this->id).' AND `id_hook` = '.(int)($row['id_hook'])); $this->cleanPositions($row['id_hook']); } - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'module` WHERE `id_module` = '.(int)($this->id)); } @@ -183,7 +183,7 @@ abstract class SelfModule foreach ($name as $k=>$v) $name[$k] = '"'.pSQL($v).'"'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` IN ('.implode(',',$name).')'); @@ -193,7 +193,7 @@ abstract class SelfModule */ public function enable() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` = \''.pSQL($this->name).'\''); @@ -215,7 +215,7 @@ abstract class SelfModule foreach ($name as $k=>$v) $name[$k] = '"'.pSQL($v).'"'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 0 WHERE `name` IN ('.implode(',',$name).')'); @@ -268,7 +268,7 @@ abstract class SelfModule return false; // Register module in hook - $return = Db::getInstance()->Execute(' + $return = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) VALUES ('.(int)($this->id).', '.(int)($result['id_hook']).', '.(int)($result2['position'] + 1).')'); @@ -313,7 +313,7 @@ abstract class SelfModule */ public function unregisterHook($hook_id) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)($this->id).' @@ -328,7 +328,7 @@ abstract class SelfModule */ public function unregisterExceptions($hook_id) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module_exceptions` WHERE `id_module` = '.(int)($this->id).' @@ -348,7 +348,7 @@ abstract class SelfModule { if (!empty($except)) { - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`) VALUES ('.(int)($this->id).', '.(int)($id_hook).', \''.pSQL(strval($except)).'\')'); if (!$result) @@ -361,7 +361,7 @@ abstract class SelfModule public function editExceptions($id_hook, $excepts) { // Cleaning... - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module_exceptions` WHERE `id_module` = '.(int)($this->id).' AND `id_hook` ='.(int)($id_hook)); return $this->registerExceptions($id_hook, $excepts); @@ -642,7 +642,7 @@ abstract class SelfModule $arrNativeModules[] = '"'.pSQL($module['name']).'"'; } - return $db->ExecuteS(' + return $db->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m WHERE name NOT IN ('.implode(',',$arrNativeModules).') '); @@ -656,7 +656,7 @@ abstract class SelfModule */ public static function getModulesInstalled($position = 0) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'module` m '.($position ? ' @@ -689,7 +689,7 @@ abstract class SelfModule if (!isset(self::$_hookModulesCache)) { $db = Db::getInstance(_PS_USE_SQL_SLAVE_); - $result = $db->ExecuteS(' + $result = $db->executeS(' SELECT h.`name` as hook, m.`id_module`, h.`id_hook`, m.`name` as module, h.`live_edit` FROM `'._DB_PREFIX_.'module` m LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module` @@ -774,7 +774,7 @@ abstract class SelfModule $id_customer = (int)($cookie->id_customer); $billing = new Address((int)($cart->id_address_invoice)); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT h.`id_hook`, m.`name`, hm.`position` FROM `'._DB_PREFIX_.'module_country` mc LEFT JOIN `'._DB_PREFIX_.'module` m ON m.`id_module` = mc.`id_module` @@ -868,7 +868,7 @@ abstract class SelfModule */ public function updatePosition($id_hook, $way, $position = NULL) { - if (!$res = Db::getInstance()->ExecuteS(' + if (!$res = Db::getInstance()->executeS(' SELECT hm.`id_module`, hm.`position`, hm.`id_hook` FROM `'._DB_PREFIX_.'hook_module` hm WHERE hm.`id_hook` = '.(int)($id_hook).' @@ -888,13 +888,13 @@ abstract class SelfModule if (isset($position) and !empty($position)) $to['position'] = (int)($position); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position`= position '.($way ? '-1' : '+1').' WHERE position between '.(int)(min(array($from['position'], $to['position']))) .' AND '.(int)(max(array($from['position'], $to['position']))).' AND `id_hook`='.(int)($from['id_hook'])) AND - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position`='.(int)($to['position']).' WHERE `'.pSQL($this->identifier).'` = '.(int)($from[$this->identifier]).' AND `id_hook`='.(int)($to['id_hook'])) @@ -908,14 +908,14 @@ abstract class SelfModule */ public function cleanPositions($id_hook) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_module` FROM `'._DB_PREFIX_.'hook_module` WHERE `id_hook` = '.(int)($id_hook).' ORDER BY `position`'); $sizeof = sizeof($result); for ($i = 0; $i < $sizeof; ++$i) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'hook_module` SET `position` = '.(int)($i + 1).' WHERE `id_hook` = '.(int)($id_hook).' @@ -976,7 +976,7 @@ abstract class SelfModule if (self::$exceptionsCache == NULL AND !is_array(self::$exceptionsCache)) { self::$exceptionsCache = array(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT CONCAT(id_hook, \'-\', id_module) as `key`, `file_name` as value FROM `'._DB_PREFIX_.'hook_module_exceptions`'); foreach ($result as $row) @@ -993,7 +993,7 @@ abstract class SelfModule public static function isInstalled($moduleName) { - Db::getInstance()->ExecuteS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); + Db::getInstance()->executeS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\''); return (bool)Db::getInstance()->NumRows(); } diff --git a/modules/autoupgrade/Tools14.php b/modules/autoupgrade/Tools14.php index d836c7120..25ff9bd6d 100644 --- a/modules/autoupgrade/Tools14.php +++ b/modules/autoupgrade/Tools14.php @@ -817,7 +817,7 @@ class Tools14Core if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category) diff --git a/modules/autoupgrade/functions.php b/modules/autoupgrade/functions.php index ed9cd7046..57417ec0f 100644 --- a/modules/autoupgrade/functions.php +++ b/modules/autoupgrade/functions.php @@ -144,7 +144,7 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category) diff --git a/modules/birthdaypresent/birthdaypresent.php b/modules/birthdaypresent/birthdaypresent.php index ef912cf2f..193141005 100644 --- a/modules/birthdaypresent/birthdaypresent.php +++ b/modules/birthdaypresent/birthdaypresent.php @@ -113,7 +113,7 @@ class BirthdayPresent extends Module public function createTodaysVouchers() { - $users = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $users = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT c.id_customer, firstname, lastname, email FROM '._DB_PREFIX_.'customer c LEFT JOIN '._DB_PREFIX_.'orders o ON (c.id_customer = o.id_customer) diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php index bd3169403..6eb483b3b 100644 --- a/modules/blockcategories/blockcategories.php +++ b/modules/blockcategories/blockcategories.php @@ -156,7 +156,7 @@ class BlockCategories extends Module if (!$this->isCached('blockcategories.tpl', $smartyCacheId)) { $maxdepth = Configuration::get('BLOCK_CATEG_MAX_DEPTH'); - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.id_parent, c.id_category, cl.name, cl.description, cl.link_rewrite FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND cl.`id_lang` = '.$id_lang.$this->context->shop->sqlLang('cl').') @@ -229,7 +229,7 @@ class BlockCategories extends Module { $maxdepth = Configuration::get('BLOCK_CATEG_MAX_DEPTH'); - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT c.id_parent, c.id_category, cl.name, cl.description, cl.link_rewrite FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (c.`id_category` = cl.`id_category` AND cl.`id_lang` = '.$id_lang.$this->context->shop->sqlLang('cl').') diff --git a/modules/blockcms/ajax_blockcms.php b/modules/blockcms/ajax_blockcms.php index 53089bed9..bcd7f82ab 100755 --- a/modules/blockcms/ajax_blockcms.php +++ b/modules/blockcms/ajax_blockcms.php @@ -39,14 +39,14 @@ if (Tools::getValue('action') == 'getCms') if (!Validate::isInt(Tools::getValue('id_cms_category')) OR !Tools::getValue('id_cms_category')) die(1); - $cms_categories = Db::getInstance()->ExecuteS(' + $cms_categories = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'cms_category` c JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (c.`id_cms_category` = cl.`id_cms_category`) WHERE c.`id_parent` = '.(int)Tools::getValue('id_cms_category').' AND cl.`id_lang` = '.(int)$context->language->id.' ORDER BY c.`id_cms_category`'); - $cms_pages = Db::getInstance()->ExecuteS(' + $cms_pages = Db::getInstance()->executeS(' SELECT cl.`meta_title`, c.`id_cms` FROM `'._DB_PREFIX_.'cms` c JOIN `'._DB_PREFIX_.'cms_lang` cl ON (c.`id_cms` = cl.`id_cms`) WHERE c.`id_cms_category` = '.(int)Tools::getValue('id_cms_category').' @@ -55,7 +55,7 @@ if (Tools::getValue('action') == 'getCms') ORDER BY c.`id_cms`'); if (Tools::getValue('id_cms_block')) - $cms_selected = Db::getInstance()->ExecuteS(' + $cms_selected = Db::getInstance()->executeS(' SELECT `is_category`, `id_cms` FROM `'._DB_PREFIX_.'cms_block_page` WHERE `id_cms_block` = '.(int)Tools::getValue('id_cms_block')); @@ -106,7 +106,7 @@ elseif (Tools::getValue('action') == 'dnd') foreach ($table as $key =>$row) { $ids = explode('_', $row); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = '.(int)$pos.' WHERE `id_cms_block` = '.(int)$ids[2]); diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index 1fd840bf5..969c13341 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -58,7 +58,7 @@ class BlockCms extends Module $queryLang .= '(1, '.(int)($language['id_lang']).'),'; if (!parent::install() OR !$this->registerHook('leftColumn') OR !$this->registerHook('rightColumn') OR !$this->registerHook('footer') OR !$this->registerHook('header') OR - !Db::getInstance()->Execute(' + !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, @@ -67,17 +67,17 @@ class BlockCms extends Module `display_store` tinyint(1) unsigned NOT NULL default \'1\', PRIMARY KEY (`id_cms_block`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8') OR - !Db::getInstance()->Execute(' + !Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`) VALUES(1, 0, 0)') OR - !Db::getInstance()->Execute(' + !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, `name` varchar(40) NOT NULL default \'\', PRIMARY KEY (`id_cms_block`, `id_lang`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8') OR - !Db::getInstance()->Execute(rtrim($queryLang, ',')) OR - !Db::getInstance()->Execute(' + !Db::getInstance()->execute(rtrim($queryLang, ',')) OR + !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, @@ -98,14 +98,14 @@ class BlockCms extends Module !Configuration::deleteByName('FOOTER_CMS') OR !Configuration::deleteByName('FOOTER_BLOCK_ACTIVATION') OR !Configuration::deleteByName('FOOTER_POWEREDBY') OR - !Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'cms_block` , `'._DB_PREFIX_.'cms_block_page`, `'._DB_PREFIX_.'cms_block_lang`')) + !Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'cms_block` , `'._DB_PREFIX_.'cms_block_page`, `'._DB_PREFIX_.'cms_block_lang`')) return false; return true; } public function getBlockCMS($id_cms_block) { - $cmsBlocks = Db::getInstance()->ExecuteS(' + $cmsBlocks = Db::getInstance()->executeS(' SELECT cb.`id_cms_category`, cb.`location`, cb.`display_store`, cbl.id_lang, cbl.name FROM `'._DB_PREFIX_.'cms_block` cb LEFT JOIN `'._DB_PREFIX_.'cms_block_lang` cbl ON (cbl.`id_cms_block` = cb.`id_cms_block`) @@ -125,7 +125,7 @@ class BlockCms extends Module private function getBlocksCMS($location) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT bc.`id_cms_block`, bcl.`name` block_name, ccl.`name` category_name, bc.`position`, bc.`id_cms_category`, bc.`display_store` FROM `'._DB_PREFIX_.'cms_block` bc INNER JOIN `'._DB_PREFIX_.'cms_category_lang` ccl ON (bc.`id_cms_category` = ccl.`id_cms_category`) @@ -185,7 +185,7 @@ class BlockCms extends Module { $context = Context::getContext(); - $cmsCategories = Db::getInstance()->ExecuteS(' + $cmsCategories = Db::getInstance()->executeS(' SELECT bc.`id_cms_block`, bc.`id_cms_category`, bc.`display_store`, ccl.`link_rewrite`, ccl.`name` category_name, bcl.`name` block_name FROM `'._DB_PREFIX_.'cms_block` bc INNER JOIN `'._DB_PREFIX_.'cms_category_lang` ccl ON (bc.`id_cms_category` = ccl.`id_cms_category`) @@ -201,7 +201,7 @@ class BlockCms extends Module $key = (int)$cmsCategory['id_cms_block']; $content[$key]['display_store'] = $cmsCategory['display_store']; - $content[$key]['cms'] = Db::getInstance()->ExecuteS(' + $content[$key]['cms'] = Db::getInstance()->executeS(' SELECT cl.`id_cms`, cl.`meta_title`, cl.`link_rewrite` FROM `'._DB_PREFIX_.'cms_block_page` bcp INNER JOIN `'._DB_PREFIX_.'cms_lang` cl ON (bcp.`id_cms` = cl.`id_cms`) @@ -219,7 +219,7 @@ class BlockCms extends Module $content[$key]['cms'] = $links; - $content[$key]['categories'] = Db::getInstance()->ExecuteS(' + $content[$key]['categories'] = Db::getInstance()->executeS(' SELECT bcp.`id_cms`, cl.`name`, cl.`link_rewrite` FROM `'._DB_PREFIX_.'cms_block_page` bcp INNER JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (bcp.`id_cms` = cl.`id_cms_category`) @@ -606,24 +606,24 @@ class BlockCms extends Module $this->_html .= 'pos change!'; if (Tools::getValue('way') == 0) { - if (Db::getInstance()->Execute(' + if (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = '.((int)Tools::getValue('position') + 1).' WHERE `position` = '.((int)Tools::getValue('position')).' AND `location` = '.(int)Tools::getValue('location'))) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = '.((int)Tools::getValue('position')).' WHERE `id_cms_block` = '.(int)Tools::getValue('id_cms_block')); } elseif (Tools::getValue('way') == 1) { - if(Db::getInstance()->Execute(' + if(Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = '.((int)Tools::getValue('position') - 1).' WHERE `position` = '.((int)Tools::getValue('position')).' AND `location` = '.(int)Tools::getValue('location'))) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = '.((int)Tools::getValue('position')).' WHERE `id_cms_block` = '.(int)Tools::getValue('id_cms_block')); @@ -642,18 +642,18 @@ class BlockCms extends Module $languages = Language::getLanguages(false); if (Tools::isSubmit('addBlockCMS')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cms_block` (`id_cms_category`, `location`, `position`, `display_store`) VALUES('.(int)Tools::getValue('id_category').', '.(int)Tools::getValue('block_location').', '.(int)$position.', '.(int)Tools::getValue('PS_STORES_DISPLAY_CMS').')'); $id_cms_block = Db::getInstance()->Insert_ID(); foreach ($languages as $language) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cms_block_lang` (`id_cms_block`, `id_lang`, `name`) VALUES('.(int)$id_cms_block.', '.(int)$language['id_lang'].', "'.pSQL(Tools::getValue('block_name_'.$language['id_lang'])).'")'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `display_store` = '.Configuration::get('PS_STORES_DISPLAY_FOOTER')); } @@ -661,23 +661,23 @@ class BlockCms extends Module { $id_cms_block = Tools::getvalue('id_cms_block'); - $old_block = Db::getInstance()->ExecuteS(' + $old_block = Db::getInstance()->executeS(' SELECT `location`, `position` FROM `'._DB_PREFIX_.'cms_block` WHERE `id_cms_block` = '.(int)$id_cms_block); $location_change = ($old_block[0]['location'] != (int)Tools::getvalue('block_location')); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cms_block_page` WHERE `id_cms_block` = '.(int)$id_cms_block); if ($location_change == true) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = (`position` - 1) WHERE `position` > '.(int)$old_block[0]['position'].' AND `location` = '.(int)$old_block[0]['location']); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `location` = '.(int)(Tools::getvalue('block_location')).', `id_cms_category` = '.(int)(Tools::getvalue('id_category')).' @@ -689,7 +689,7 @@ class BlockCms extends Module Configuration::updateValue('PS_STORES_DISPLAY_FOOTER', (int)(Tools::getValue('PS_STORES_DISPLAY_CMS'))); foreach ($languages as $language) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block_lang` SET `name` = "'.pSQL(Tools::getValue('block_name_'.$language['id_lang'])).'" WHERE `id_cms_block` = '.(int)$id_cms_block.' @@ -700,7 +700,7 @@ class BlockCms extends Module foreach ($cmsBoxes as $cmsBox) { $cms_properties = explode('_', $cmsBox); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'cms_block_page` (`id_cms_block`, `id_cms`, `is_category`) VALUES('.(int)$id_cms_block.', '.(int)$cms_properties[1].', '.(int)$cms_properties[0].')'); } @@ -711,20 +711,20 @@ class BlockCms extends Module } elseif (Tools::isSubmit('deleteBlockCMS') AND Tools::getValue('id_cms_block')) { - $old_block = Db::getInstance()->ExecuteS('SELECT `location`, `position` FROM `'._DB_PREFIX_.'cms_block` WHERE `id_cms_block` = '.Tools::getvalue('id_cms_block')); + $old_block = Db::getInstance()->executeS('SELECT `location`, `position` FROM `'._DB_PREFIX_.'cms_block` WHERE `id_cms_block` = '.Tools::getvalue('id_cms_block')); if (sizeof($old_block)) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'cms_block` SET `position` = (`position` - 1) WHERE `position` > '.(int)$old_block[0]['position'].' AND `location` = '.(int)$old_block[0]['location']); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cms_block` WHERE `id_cms_block` = '.(int)(Tools::getValue('id_cms_block'))); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cms_block_page` WHERE `id_cms_block` = '.(int)(Tools::getValue('id_cms_block'))); diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 94c78460b..e6cd68111 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -91,23 +91,23 @@ class BlockLayered extends Module Configuration::deleteByName('PS_LAYERED_SHOW_QTIES'); Configuration::deleteByName('PS_LAYERED_INDEXED'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_price_index'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_friendly_url'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_attribute_group'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_feature'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_feature_lang_value'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_category'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_filter'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_product_attribute'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_price_index'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_friendly_url'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_attribute_group'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_feature'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_indexable_feature_lang_value'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_category'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_filter'); + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_product_attribute'); return parent::uninstall(); } private static function installPriceIndexTable() { - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_price_index`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_price_index`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_price_index` ( `id_product` INT NOT NULL, `id_currency` INT NOT NULL, `price_min` INT NOT NULL, `price_max` INT NOT NULL, @@ -117,8 +117,8 @@ class BlockLayered extends Module private function installFriendlyUrlTable() { - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_friendly_url`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_friendly_url`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_friendly_url` ( `id_layered_friendly_url` INT NOT NULL AUTO_INCREMENT, `url_key` varchar(32) NOT NULL, @@ -127,24 +127,24 @@ class BlockLayered extends Module PRIMARY KEY (`id_layered_friendly_url`), INDEX `id_lang` (`id_lang`)) ENGINE = '._MYSQL_ENGINE_); - Db::getInstance()->Execute('CREATE INDEX `url_key` ON `'._DB_PREFIX_.'layered_friendly_url`(url_key(5))'); + Db::getInstance()->execute('CREATE INDEX `url_key` ON `'._DB_PREFIX_.'layered_friendly_url`(url_key(5))'); } private function installIndexableAttributeTable() { // Attributes Groups - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_group`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_group`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_attribute_group` ( `id_attribute_group` INT NOT NULL, `indexable` BOOL NOT NULL DEFAULT 0, PRIMARY KEY (`id_attribute_group`)) ENGINE = '._MYSQL_ENGINE_); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'layered_indexable_attribute_group` SELECT id_attribute_group, 1 FROM `'._DB_PREFIX_.'attribute_group`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_group_lang_value`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_group_lang_value`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_attribute_group_lang_value` ( `id_attribute_group` INT NOT NULL, `id_lang` INT NOT NULL, @@ -153,8 +153,8 @@ class BlockLayered extends Module PRIMARY KEY (`id_attribute_group`, `id_lang`)) ENGINE = '._MYSQL_ENGINE_); // Attributes - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_lang_value`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_attribute_lang_value`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` ( `id_attribute` INT NOT NULL, `id_lang` INT NOT NULL, @@ -164,19 +164,19 @@ class BlockLayered extends Module // Features - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_feature` ( `id_feature` INT NOT NULL, `indexable` BOOL NOT NULL DEFAULT 0, PRIMARY KEY (`id_feature`)) ENGINE = '._MYSQL_ENGINE_); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'layered_indexable_feature` SELECT id_feature, 1 FROM `'._DB_PREFIX_.'feature`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature_lang_value`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature_lang_value`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_feature_lang_value` ( `id_feature` INT NOT NULL, `id_lang` INT NOT NULL, @@ -185,8 +185,8 @@ class BlockLayered extends Module PRIMARY KEY (`id_feature`, `id_lang`)) ENGINE = '._MYSQL_ENGINE_); // Features values - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature_value_lang_value`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_indexable_feature_value_lang_value`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_indexable_feature_value_lang_value` ( `id_feature_value` INT NOT NULL, `id_lang` INT NOT NULL, @@ -201,8 +201,8 @@ class BlockLayered extends Module */ public function installProductAttributeTable() { - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_product_attribute`'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'layered_product_attribute`'); + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'layered_product_attribute` ( `id_attribute` int(10) unsigned NOT NULL, `id_product` int(10) unsigned NOT NULL, @@ -222,7 +222,7 @@ class BlockLayered extends Module else Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_product_attribute WHERE id_product = '.(int)$id_product); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'layered_product_attribute` (`id_attribute`, `id_product`, `id_attribute_group`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'layered_product_attribute` (`id_attribute`, `id_product`, `id_attribute_group`) SELECT pac.id_attribute, pa.id_product, ag.id_attribute_group FROM '._DB_PREFIX_.'product_attribute pa INNER JOIN '._DB_PREFIX_.'product_attribute_combination pac ON pac.id_product_attribute = pa.id_product_attribute @@ -242,7 +242,7 @@ class BlockLayered extends Module Db::getInstance()->execute('TRUNCATE '._DB_PREFIX_.'layered_friendly_url'); $attributeValuesByLang = array(); - $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT lc.*, id_lang, name, link_rewrite, cl.id_category + $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT lc.*, id_lang, name, link_rewrite, cl.id_category FROM '._DB_PREFIX_.'layered_category lc INNER JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = lc.id_category AND lc.id_category <> 1 ) GROUP BY type, id_value, id_lang'); @@ -253,7 +253,7 @@ class BlockLayered extends Module switch ($filter['type']) { case 'id_attribute_group': - $attributes = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $attributes = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT agl.public_name name, a.id_attribute_group id_name, al.name value, a.id_attribute id_value, al.id_lang, liagl.url_name name_url_name, lial.url_name value_url_name FROM '._DB_PREFIX_.'attribute_group ag @@ -284,7 +284,7 @@ class BlockLayered extends Module break; case 'id_feature': - $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT fl.name name, fl.id_feature id_name, fvl.id_feature_value id_value, fvl.value value, fl.id_lang, fl.id_lang, lifl.url_name name_url_name, lifvl.url_name value_url_name FROM '._DB_PREFIX_.'feature_lang fl @@ -314,7 +314,7 @@ class BlockLayered extends Module break; case 'category': - $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cl.name, cl.id_lang, c.id_category FROM '._DB_PREFIX_.'category c INNER JOIN '._DB_PREFIX_.'category_lang cl ON (c.id_category = cl.id_category) @@ -332,7 +332,7 @@ class BlockLayered extends Module break; case 'manufacturer': - $manufacturers = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $manufacturers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT m.name as name,l.id_lang as id_lang, id_manufacturer FROM '._DB_PREFIX_.'manufacturer m , '._DB_PREFIX_.'lang l WHERE l.id_lang = '.(int)$filter['id_lang'].' '); @@ -474,15 +474,15 @@ class BlockLayered extends Module if (!$params['id_feature'] || Tools::getValue('layered_indexable') === false) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature VALUES ('.(int)$params['id_feature'].', '.(int)Tools::getValue('layered_indexable').')'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature VALUES ('.(int)$params['id_feature'].', '.(int)Tools::getValue('layered_indexable').')'); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_lang_value WHERE id_feature = '.(int)$params['id_feature']); // don't care about the id_lang + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_lang_value WHERE id_feature = '.(int)$params['id_feature']); // don't care about the id_lang foreach (Language::getLanguages(false) as $language) { // Data are validated by method "hookPostProcessFeature" $id_lang = (int)$language['id_lang']; - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_lang_value + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_lang_value VALUES ('.(int)$params['id_feature'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\', \''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')'); } @@ -493,12 +493,12 @@ class BlockLayered extends Module if (!$params['id_feature_value']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value WHERE id_feature_value = '.(int)$params['id_feature_value']); // don't care about the id_lang + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value WHERE id_feature_value = '.(int)$params['id_feature_value']); // don't care about the id_lang foreach (Language::getLanguages(false) as $language) { // Data are validated by method "hookPostProcessFeatureValue" $id_lang = (int)$language['id_lang']; - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_value_lang_value + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_value_lang_value VALUES ('.(int)$params['id_feature_value'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\', \''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')'); } @@ -508,7 +508,7 @@ class BlockLayered extends Module { if (!$params['id_feature_value']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value WHERE id_feature_value = '.(int)$params['id_feature_value']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value WHERE id_feature_value = '.(int)$params['id_feature_value']); } public function hookPostProcessFeatureValue($params) @@ -522,7 +522,7 @@ class BlockLayered extends Module $default_form_language = (int)(Configuration::get('PS_LANG_DEFAULT')); $langValue = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS( + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS( 'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_feature_value_lang_value WHERE id_feature_value = '.(int)$params['id_feature_value']); if ($result) @@ -565,12 +565,12 @@ class BlockLayered extends Module if (!$params['id_attribute']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value WHERE id_attribute = '.(int)$params['id_attribute']); // don't care about the id_lang + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value WHERE id_attribute = '.(int)$params['id_attribute']); // don't care about the id_lang foreach (Language::getLanguages(false) as $language) { // Data are validated by method "hookPostProcessAttribute" $id_lang = (int)$language['id_lang']; - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_lang_value + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_lang_value VALUES ('.(int)$params['id_attribute'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\', \''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')'); } @@ -580,7 +580,7 @@ class BlockLayered extends Module { if (!$params['id_attribute']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value WHERE id_attribute = '.(int)$params['id_attribute']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value WHERE id_attribute = '.(int)$params['id_attribute']); } public function hookPostProcessAttribute($params) @@ -594,7 +594,7 @@ class BlockLayered extends Module $default_form_language = (int)(Configuration::get('PS_LANG_DEFAULT')); $langValue = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS( + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS( 'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_attribute_lang_value WHERE id_attribute = '.(int)$params['id_attribute']); if ($result) @@ -641,7 +641,7 @@ class BlockLayered extends Module { if (!$params['id_feature']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']); } public function hookAfterSaveAttributeGroup($params) @@ -649,15 +649,15 @@ class BlockLayered extends Module if (!$params['id_attribute_group'] || Tools::getValue('layered_indexable') === false) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group VALUES ('.(int)$params['id_attribute_group'].', '.(int)Tools::getValue('layered_indexable').')'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group VALUES ('.(int)$params['id_attribute_group'].', '.(int)Tools::getValue('layered_indexable').')'); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value WHERE id_attribute_group = '.(int)$params['id_attribute_group']); // don't care about the id_lang + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value WHERE id_attribute_group = '.(int)$params['id_attribute_group']); // don't care about the id_lang foreach (Language::getLanguages(false) as $language) { // Data are validated by method "hookPostProcessAttributeGroup" $id_lang = (int)$language['id_lang']; - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value VALUES ('.(int)$params['id_attribute_group'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\', \''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')'); } @@ -689,8 +689,8 @@ class BlockLayered extends Module if (!$params['id_attribute_group']) return; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value WHERE id_attribute_group = '.(int)$params['id_attribute_group']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group WHERE id_attribute_group = '.(int)$params['id_attribute_group']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value WHERE id_attribute_group = '.(int)$params['id_attribute_group']); } public function hookAttributeGroupForm($params) @@ -701,7 +701,7 @@ class BlockLayered extends Module WHERE id_attribute_group = '.(int)$params['id_attribute_group']); $langValue = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS( + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS( 'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value WHERE id_attribute_group = '.(int)$params['id_attribute_group']); if ($result) @@ -760,7 +760,7 @@ class BlockLayered extends Module $indexable = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT indexable FROM '._DB_PREFIX_.'layered_indexable_feature WHERE id_feature = '.(int)$params['id_feature']); $langValue = array(); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS( + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS( 'SELECT url_name, meta_title, id_lang FROM '._DB_PREFIX_.'layered_indexable_feature_lang_value WHERE id_feature = '.(int)$params['id_feature']); if ($result) @@ -900,7 +900,7 @@ class BlockLayered extends Module WHERE `active` = 1 AND psi.id_product is null ORDER by id_product LIMIT 0,'.(int)$length; - foreach (Db::getInstance()->ExecuteS($query) as $product) + foreach (Db::getInstance()->executeS($query) as $product) self::indexProductPrices((int)$product['id_product'], ($smart && $full)); return (int)($cursor + $length); @@ -912,7 +912,7 @@ class BlockLayered extends Module if (is_null($groups)) { - $groups = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT id_group FROM `'._DB_PREFIX_.'group_reduction`'); + $groups = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_group FROM `'._DB_PREFIX_.'group_reduction`'); if(!$groups) $groups = array(); } @@ -936,7 +936,7 @@ class BlockLayered extends Module WHERE id_product = '.(int)$idProduct.' GROUP BY id_product'); - $productMinPrices = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $productMinPrices = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_shop, id_currency, id_country, id_group, from_quantity FROM `'._DB_PREFIX_.'specific_price` WHERE id_product = '.(int)$idProduct); @@ -1004,7 +1004,7 @@ class BlockLayered extends Module foreach ($currencyList as $currency) $values[] = '('.(int)$idProduct.', '.(int)$currency['id_currency'].', '.(int)$minPrice[$currency['id_currency']].', '.(int)$maxPrice[$currency['id_currency']].')'; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'layered_price_index` (id_product, id_currency, price_min, price_max) VALUES '.implode(',', $values).' ON DUPLICATE KEY UPDATE id_product = id_product # avoid duplicate keys'); @@ -1088,7 +1088,7 @@ class BlockLayered extends Module public function hookCategoryDeletion($params) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$params['category']->id); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$params['category']->id); } public function getContent() @@ -1110,12 +1110,12 @@ class BlockLayered extends Module else { if (isset($_POST['id_layered_filter']) && $_POST['id_layered_filter']) - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)Tools::getValue('id_layered_filter')); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)Tools::getValue('id_layered_filter')); if (Tools::getValue('scope') == 1) { - Db::getInstance()->Execute('TRUNCATE TABLE '._DB_PREFIX_.'layered_filter'); - $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT id_category FROM '._DB_PREFIX_.'category'); + Db::getInstance()->execute('TRUNCATE TABLE '._DB_PREFIX_.'layered_filter'); + $categories = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_category FROM '._DB_PREFIX_.'category'); foreach ($categories as $category) $_POST['categoryBox'][] = (int)$category['id_category']; } @@ -1127,7 +1127,7 @@ class BlockLayered extends Module foreach ($_POST['categoryBox'] as &$categoryBoxTmp) $categoryBoxTmp = (int)$categoryBoxTmp; - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category IN ('.implode(',', array_map('intval', $_POST['categoryBox'])).')'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category IN ('.implode(',', array_map('intval', $_POST['categoryBox'])).')'); $filterValues = array(); foreach ($_POST['categoryBox'] as $idc) @@ -1161,7 +1161,7 @@ class BlockLayered extends Module } } - Db::getInstance()->Execute(rtrim($sqlToInsert, ',')); + Db::getInstance()->execute(rtrim($sqlToInsert, ',')); $valuesToInsert = array( 'name' => pSQL(Tools::getValue('layered_tpl_name')), @@ -1198,7 +1198,7 @@ class BlockLayered extends Module if ($layeredValues) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)$_GET['id_layered_filter'].' LIMIT 1'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'layered_filter WHERE id_layered_filter = '.(int)$_GET['id_layered_filter'].' LIMIT 1'); $html .= '
@@ -1236,7 +1236,7 @@ class BlockLayered extends Module '; $categoryList = array(); - foreach(Db::getInstance()->ExecuteS('SELECT id_category FROM `'._DB_PREFIX_.'category`') as $category) + foreach(Db::getInstance()->executeS('SELECT id_category FROM `'._DB_PREFIX_.'category`') as $category) if($category['id_category'] != 1) $categoryList[] = $category['id_category']; @@ -1389,7 +1389,7 @@ class BlockLayered extends Module
'.$this->l('Existing filters templates').''; - $filtersTemplates = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_filter ORDER BY date_add DESC'); + $filtersTemplates = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT * FROM '._DB_PREFIX_.'layered_filter ORDER BY date_add DESC'); if (count($filtersTemplates)) { $html .= '

'.count($filtersTemplates).' '.$this->l('filters templates are configured:').'

@@ -1942,14 +1942,14 @@ class BlockLayered extends Module AND psi.`id_currency` = '.(int)$idCurrency; } - $allProductsOut = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $allProductsOut = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_product` id_product FROM `'._DB_PREFIX_.'product` p '.$priceFilterQueryOut.' '.$queryFiltersFrom.' WHERE 1 '.$queryFiltersWhere.' GROUP BY id_product', false); - $allProductsIn = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $allProductsIn = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.`id_product` id_product FROM `'._DB_PREFIX_.'product` p '.$priceFilterQueryIn.' @@ -1976,7 +1976,7 @@ class BlockLayered extends Module else { $n = (int)Tools::getValue('n', Configuration::get('PS_PRODUCTS_PER_PAGE')); - $this->products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $this->products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT p.id_product, p.on_sale, p.out_of_stock, p.available_for_order, p.quantity, p.minimal_quantity, p.id_category_default, p.customizable, p.show_price, p.`weight`, p.ean13, pl.available_later, pl.description_short, pl.link_rewrite, pl.name, i.id_image, il.legend, m.name manufacturer_name, p.condition, p.id_manufacturer, DATEDIFF(p.`date_add`, @@ -2011,7 +2011,7 @@ class BlockLayered extends Module $parent = new Category((int)$id_parent); /* Get the filters for the current category */ - $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' + $filters = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT * FROM '._DB_PREFIX_.'layered_category WHERE id_category = '.(int)$id_parent.' GROUP BY `type`, id_value ORDER BY position ASC'); // Remove all empty selected filters foreach ($selectedFilters as $key => $value) @@ -2146,7 +2146,7 @@ class BlockLayered extends Module $products = false; if (!empty($sqlQuery['from'])) - $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sqlQuery['select']."\n".$sqlQuery['from']."\n".$sqlQuery['join']."\n".$sqlQuery['where']."\n".$sqlQuery['group']); + $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sqlQuery['select']."\n".$sqlQuery['from']."\n".$sqlQuery['join']."\n".$sqlQuery['where']."\n".$sqlQuery['group']); foreach ($filters as $filterTmp) { @@ -2336,7 +2336,7 @@ class BlockLayered extends Module $nonIndexable = array(); // Get all non indexable attribute groups - foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT public_name FROM `'._DB_PREFIX_.'attribute_group_lang` agl LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_group` liag @@ -2346,7 +2346,7 @@ class BlockLayered extends Module $nonIndexable[] = Tools::link_rewrite($attribute['public_name']); // Get all non indexable features - foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT name FROM `'._DB_PREFIX_.'feature_lang` fl LEFT JOIN `'._DB_PREFIX_.'layered_indexable_feature` lif @@ -2619,7 +2619,7 @@ class BlockLayered extends Module foreach ($categoryBox as &$value) $value = (int)$value; - $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT ag.id_attribute_group, ag.is_color_group, agl.name, COUNT(DISTINCT(a.id_attribute)) n FROM '._DB_PREFIX_.'attribute_group ag LEFT JOIN '._DB_PREFIX_.'attribute_group_lang agl ON (agl.id_attribute_group = ag.id_attribute_group) @@ -2632,7 +2632,7 @@ class BlockLayered extends Module (count($categoryBox) ? ' AND cp.id_category IN ('.implode(',', $categoryBox).')' : '').' GROUP BY ag.id_attribute_group'); - $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT fl.id_feature, fl.name, COUNT(DISTINCT(fv.id_feature_value)) n FROM '._DB_PREFIX_.'feature_lang fl LEFT JOIN '._DB_PREFIX_.'feature_value fv ON (fv.id_feature = fl.id_feature) @@ -2834,8 +2834,8 @@ class BlockLayered extends Module @ini_set('memory_limit','128M'); /* Delete and re-create the layered categories table */ - Db::getInstance()->Execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_category'); - Db::getInstance()->Execute(' + Db::getInstance()->execute('DROP TABLE IF EXISTS '._DB_PREFIX_.'layered_category'); + Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'layered_category` ( `id_layered_category` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id_category` INT(10) UNSIGNED NOT NULL, @@ -2846,7 +2846,7 @@ class BlockLayered extends Module KEY `id_category` (`id_category`,`type`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;'); /* MyISAM + latin1 = Smaller/faster */ - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'layered_filter` ( `id_layered_filter` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` VARCHAR(64) NOT NULL, @@ -2868,7 +2868,7 @@ class BlockLayered extends Module $nCategories = array(); $doneCategories = array(); - $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $attributeGroups = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT a.id_attribute, a.id_attribute_group FROM '._DB_PREFIX_.'attribute a LEFT JOIN '._DB_PREFIX_.'product_attribute_combination pac ON (pac.id_attribute = a.id_attribute) @@ -2883,7 +2883,7 @@ class BlockLayered extends Module while ($row = $db->nextRow($attributeGroups)) $attributeGroupsById[(int)$row['id_attribute']] = (int)$row['id_attribute_group']; - $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $features = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT fv.id_feature_value, fv.id_feature FROM '._DB_PREFIX_.'feature_value fv LEFT JOIN '._DB_PREFIX_.'feature_product fp ON (fp.id_feature_value = fv.id_feature_value) @@ -2897,7 +2897,7 @@ class BlockLayered extends Module while ($row = $db->nextRow($features)) $featuresById[(int)$row['id_feature_value']] = (int)$row['id_feature']; - $result = $db->ExecuteS(' + $result = $db->executeS(' SELECT p.id_product, GROUP_CONCAT(DISTINCT fv.id_feature_value) features, GROUP_CONCAT(DISTINCT cp.id_category) categories, GROUP_CONCAT(DISTINCT pac.id_attribute) attributes FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = p.id_product) @@ -2978,7 +2978,7 @@ class BlockLayered extends Module } } if ($toInsert) - Db::getInstance()->Execute(rtrim($queryCategory, ',')); + Db::getInstance()->execute(rtrim($queryCategory, ',')); } } diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php index f0e6a1e1a..d2103d7c7 100644 --- a/modules/blocklink/blocklink.php +++ b/modules/blocklink/blocklink.php @@ -52,14 +52,14 @@ class BlockLink extends Module { if (!parent::install() OR !$this->registerHook('leftColumn') OR - !Db::getInstance()->Execute(' + !Db::getInstance()->execute(' CREATE TABLE '._DB_PREFIX_.'blocklink ( `id_blocklink` int(2) NOT NULL AUTO_INCREMENT, `url` varchar(255) NOT NULL, `new_window` TINYINT(1) NOT NULL, PRIMARY KEY(`id_blocklink`)) ENGINE='._MYSQL_ENGINE_.' default CHARSET=utf8') OR - !Db::getInstance()->Execute(' + !Db::getInstance()->execute(' CREATE TABLE '._DB_PREFIX_.'blocklink_lang ( `id_blocklink` int(2) NOT NULL, `id_lang` int(2) NOT NULL, @@ -74,8 +74,8 @@ class BlockLink extends Module public function uninstall() { if (!parent::uninstall() OR - !Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'blocklink') OR - !Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'blocklink_lang') OR + !Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'blocklink') OR + !Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'blocklink_lang') OR !Configuration::deleteByName('PS_BLOCKLINK_TITLE') OR !Configuration::deleteByName('PS_BLOCKLINK_URL')) return false; @@ -106,7 +106,7 @@ class BlockLink extends Module { $result = array(); /* Get id and url */ - if (!$links = Db::getInstance()->ExecuteS('SELECT `id_blocklink`, `url`, `new_window` FROM '._DB_PREFIX_.'blocklink'.((int)(Configuration::get('PS_BLOCKLINK_ORDERWAY')) == 1 ? ' ORDER BY `id_blocklink` DESC' : ''))) + if (!$links = Db::getInstance()->executeS('SELECT `id_blocklink`, `url`, `new_window` FROM '._DB_PREFIX_.'blocklink'.((int)(Configuration::get('PS_BLOCKLINK_ORDERWAY')) == 1 ? ' ORDER BY `id_blocklink` DESC' : ''))) return false; $i = 0; foreach ($links AS $link) @@ -115,7 +115,7 @@ class BlockLink extends Module $result[$i]['url'] = $link['url']; $result[$i]['newWindow'] = $link['new_window']; /* Get multilingual text */ - if (!$texts = Db::getInstance()->ExecuteS('SELECT `id_lang`, `text` FROM '._DB_PREFIX_.'blocklink_lang WHERE `id_blocklink`='.(int)($link['id_blocklink']))) + if (!$texts = Db::getInstance()->executeS('SELECT `id_lang`, `text` FROM '._DB_PREFIX_.'blocklink_lang WHERE `id_blocklink`='.(int)($link['id_blocklink']))) return false; foreach ($texts AS $text) $result[$i]['text_'.$text['id_lang']] = $text['text']; @@ -127,7 +127,7 @@ class BlockLink extends Module public function addLink() { /* Url registration */ - if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklink VALUES (NULL, \''.pSQL($_POST['url']).'\', '.((isset($_POST['newWindow']) AND $_POST['newWindow']) == 'on' ? 1 : 0).')') OR !$lastId = Db::getInstance()->Insert_ID()) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink VALUES (NULL, \''.pSQL($_POST['url']).'\', '.((isset($_POST['newWindow']) AND $_POST['newWindow']) == 'on' ? 1 : 0).')') OR !$lastId = Db::getInstance()->Insert_ID()) return false; /* Multilingual text */ $languages = Language::getLanguages(); @@ -137,11 +137,11 @@ class BlockLink extends Module foreach ($languages AS $language) if (!empty($_POST['text_'.$language['id_lang']])) { - if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($lastId).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$language['id_lang']]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($lastId).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$language['id_lang']]).'\')')) return false; } else - if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($lastId).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($lastId).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) return false; return true; } @@ -149,30 +149,30 @@ class BlockLink extends Module public function updateLink() { /* Url registration */ - if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'blocklink SET `url`=\''.pSQL($_POST['url']).'\', `new_window`='.(isset($_POST['newWindow']) ? 1 : 0).' WHERE `id_blocklink`='.(int)($_POST['id']))) + if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'blocklink SET `url`=\''.pSQL($_POST['url']).'\', `new_window`='.(isset($_POST['newWindow']) ? 1 : 0).' WHERE `id_blocklink`='.(int)($_POST['id']))) return false; /* Multilingual text */ $languages = Language::getLanguages(); $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); if (!$languages) return false; - if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'blocklink_lang WHERE `id_blocklink` = '.(int)($_POST['id']))) + if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'blocklink_lang WHERE `id_blocklink` = '.(int)($_POST['id']))) return false ; foreach ($languages AS $language) if (!empty($_POST['text_'.$language['id_lang']])) { - if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($_POST['id']).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$language['id_lang']]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($_POST['id']).', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$language['id_lang']]).'\')')) return false; } else - if (!Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($_POST['id']).', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) + if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)($_POST['id']).', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')')) return false; return true; } public function deleteLink() { - return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'blocklink WHERE `id_blocklink`='.(int)($_GET['id'])); + return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'blocklink WHERE `id_blocklink`='.(int)($_GET['id'])); } public function updateTitle() diff --git a/modules/blockmyaccount/blockmyaccount.php b/modules/blockmyaccount/blockmyaccount.php index aea449ed4..758df4770 100644 --- a/modules/blockmyaccount/blockmyaccount.php +++ b/modules/blockmyaccount/blockmyaccount.php @@ -76,12 +76,12 @@ class BlockMyAccount extends Module private function addMyAccountBlockHook() { - return Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlock\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); + return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'myAccountBlock\', \'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` = \'myAccountBlock\''); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'myAccountBlock\''); } function hookHeader($params) { diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php index d6965b593..bb9f77409 100644 --- a/modules/blocknewsletter/blocknewsletter.php +++ b/modules/blocknewsletter/blocknewsletter.php @@ -67,7 +67,7 @@ class Blocknewsletter extends Module Configuration::updateValue('NW_SALT', Tools::passwdGen(16)); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS '._DB_PREFIX_.'newsletter ( `id` int(6) NOT NULL AUTO_INCREMENT, `id_shop` INTEGER UNSIGNED NOT NULL DEFAULT \'1\', @@ -85,7 +85,7 @@ class Blocknewsletter extends Module { if (!parent::uninstall()) return false; - return Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'newsletter'); + return Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'newsletter'); } public function getContent() @@ -199,13 +199,13 @@ class Blocknewsletter extends Module return $this->error = $this->l('E-mail address not registered'); else if ($register_status == self::GUEST_REGISTERED) { - if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'newsletter WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->getID(true))) + if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'newsletter WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->getID(true))) return $this->error = $this->l('Error during unsubscription'); return $this->valid = $this->l('Unsubscription successful'); } else if ($register_status == self::CUSTOMER_REGISTERED) { - if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'customer SET `newsletter` = 0 WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->getID(true))) + if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer SET `newsletter` = 0 WHERE `email` = \''.pSQL($_POST['email']).'\' AND id_shop = '.$this->context->shop->getID(true))) return $this->error = $this->l('Error during unsubscription'); return $this->valid = $this->l('Unsubscription successful'); } @@ -299,7 +299,7 @@ class Blocknewsletter extends Module WHERE `email` = \''.pSQL($email).'\' AND id_shop = '.$this->context->shop->getID(true); - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } /** @@ -327,13 +327,13 @@ class Blocknewsletter extends Module '.(int)$active.' )'; - return Db::getInstance()->Execute($sql); + return Db::getInstance()->execute($sql); } public function activateGuest($email) { - return Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'newsletter` + return Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'newsletter` SET `active` = 1 WHERE `email` = \''.pSQL($email).'\'' ); diff --git a/modules/blockreinsurance/blockreinsurance.php b/modules/blockreinsurance/blockreinsurance.php index 3839feb98..f41661e7c 100644 --- a/modules/blockreinsurance/blockreinsurance.php +++ b/modules/blockreinsurance/blockreinsurance.php @@ -52,7 +52,7 @@ class blockreinsurance extends Module public function installDB() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'reinsurance` ( `id_contactinfos` INT UNSIGNED NOT NULL AUTO_INCREMENT, `filename` VARCHAR(100) NOT NULL, @@ -69,7 +69,7 @@ class blockreinsurance extends Module public function uninstallDB() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DROP TABLE IF EXISTS `'._DB_PREFIX_.'reinsurance`'); } @@ -90,7 +90,7 @@ class blockreinsurance extends Module return false; unlink($tmpName); } - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'reinsurance` (`filename`,`text`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'reinsurance` (`filename`,`text`) VALUES ("'.((isset($filename[0]) AND $filename[0] != '') ? pSQL($filename[0]) : ''). '", "'.((isset($_POST['info'.$i.'_text']) AND $_POST['info'.$i.'_text'] != '') ? pSQL($_POST['info'.$i.'_text']) : '').'")'); } @@ -112,12 +112,12 @@ class blockreinsurance extends Module } closedir($dir); - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'reinsurance`'); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'reinsurance`'); } public function getAllFromDB() { - return Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'reinsurance`'); + return Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'reinsurance`'); } public function getContent() diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php index 0cd0fe57c..ace615760 100644 --- a/modules/blocktopmenu/blocktopmenu.php +++ b/modules/blocktopmenu/blocktopmenu.php @@ -28,13 +28,13 @@ class blocktopmenu extends Module public function installDb() { - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop` ( `id_link` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , `new_window` TINYINT( 1 ) NOT NULL, `link` VARCHAR( 128 ) NOT NULL ) ENGINE = MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;'); - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'linksmenutop_lang` ( `id_link` INT NOT NULL , `id_lang` INT NOT NULL , @@ -56,8 +56,8 @@ class blocktopmenu extends Module private function uninstallDb() { - Db::getInstance()->ExecuteS('DROP TABLE `'._DB_PREFIX_.'linksmenutop`'); - Db::getInstance()->ExecuteS('DROP TABLE `'._DB_PREFIX_.'linksmenutop_lang`'); + Db::getInstance()->executeS('DROP TABLE `'._DB_PREFIX_.'linksmenutop`'); + Db::getInstance()->executeS('DROP TABLE `'._DB_PREFIX_.'linksmenutop_lang`'); return true; } diff --git a/modules/blocktopmenu/menutoplinks.class.php b/modules/blocktopmenu/menutoplinks.class.php index d0727e695..8d5eb7815 100644 --- a/modules/blocktopmenu/menutoplinks.class.php +++ b/modules/blocktopmenu/menutoplinks.class.php @@ -3,7 +3,7 @@ class MenuTopLinks { public static function gets($id_lang, $id_link = null) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT l.id_link, l.new_window, l.link, ll.label FROM '._DB_PREFIX_.'linksmenutop l LEFT JOIN '._DB_PREFIX_.'linksmenutop_lang ll ON (l.id_link = ll.id_link AND ll.id_lang = "'.$id_lang.'") diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php index b5888edd0..49adf7db3 100644 --- a/modules/blockviewed/blockviewed.php +++ b/modules/blockviewed/blockviewed.php @@ -101,7 +101,7 @@ class BlockViewed extends Module $defaultCover = Language::getIsoById($params['cookie']->id_lang).'-default'; $productIds = implode(',', $productsViewed); - $productsImages = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $productsImages = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT i.id_image, p.id_product, il.legend, p.active, pl.name, pl.description_short, pl.link_rewrite, cl.link_rewrite AS category_rewrite FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (pl.id_product = p.id_product'.$this->context->shop->sqlLang('pl').') diff --git a/modules/blockwishlist/WishList.php b/modules/blockwishlist/WishList.php index 3de452463..2a0dc75d1 100644 --- a/modules/blockwishlist/WishList.php +++ b/modules/blockwishlist/WishList.php @@ -68,8 +68,8 @@ class WishList extends ObjectModel public function delete() { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'wishlist_email` WHERE `id_wishlist` = '.(int)($this->id)); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'wishlist_product` WHERE `id_wishlist` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'wishlist_email` WHERE `id_wishlist` = '.(int)($this->id)); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'wishlist_product` WHERE `id_wishlist` = '.(int)($this->id)); if (isset($this->context->cookie->id_wishlist)) unset($this->context->cookie->id_wishlist); @@ -91,7 +91,7 @@ class WishList extends ObjectModel WHERE `id_wishlist` = '.(int)($id_wishlist)); if ($result == false OR !sizeof($result) OR empty($result) === true) return (false); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist` SET `counter` = '.(int)($result['counter'] + 1).' WHERE `id_wishlist` = '.(int)($id_wishlist))); @@ -159,7 +159,7 @@ class WishList extends ObjectModel { if (!Validate::isUnsignedId($id_customer)) die (Tools::displayError()); - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT w.`id_wishlist`, w.`name`, w.`token`, w.`date_add`, w.`date_upd`, w.`counter` FROM `'._DB_PREFIX_.'wishlist` w WHERE `id_customer` = '.(int)($id_customer).' @@ -168,7 +168,7 @@ class WishList extends ObjectModel public static function refreshWishList($id_wishlist) { - $old_carts = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $old_carts = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT wp.id_product, wp.id_product_attribute, wpc.id_cart, UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(wpc.date_add) AS timecart FROM `'._DB_PREFIX_.'wishlist_product_cart` wpc JOIN `'._DB_PREFIX_.'wishlist_product` wp ON (wp.id_wishlist_product = wpc.id_wishlist_product) @@ -180,12 +180,12 @@ class WishList extends ObjectModel if(isset($old_carts) AND $old_carts != false) foreach ($old_carts AS $old_cart) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'cart_product` WHERE id_cart='.(int)($old_cart['id_cart']).' AND id_product='.(int)($old_cart['id_product']).' AND id_product_attribute='.(int)($old_cart['id_product_attribute']) ); - $freshwish = Db::getInstance()->ExecuteS(' + $freshwish = Db::getInstance()->executeS(' SELECT wpc.id_cart, wpc.id_wishlist_product FROM `'._DB_PREFIX_.'wishlist_product_cart` wpc JOIN `'._DB_PREFIX_.'wishlist_product` wp ON (wpc.id_wishlist_product = wp.id_wishlist_product) @@ -193,7 +193,7 @@ class WishList extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'cart_product` cp ON (cp.id_cart = wpc.id_cart AND cp.id_product = wp.id_product AND cp.id_product_attribute = wp.id_product_attribute) WHERE (wp.id_wishlist = '.(int)($id_wishlist).' AND ((cp.id_product IS NULL AND cp.id_product_attribute IS NULL))) '); - $res = Db::getInstance()->ExecuteS(' + $res = Db::getInstance()->executeS(' SELECT wp.id_wishlist_product, cp.quantity AS cart_quantity, wpc.quantity AS wish_quantity, wpc.id_cart FROM `'._DB_PREFIX_.'wishlist_product_cart` wpc JOIN `'._DB_PREFIX_.'wishlist_product` wp ON (wp.id_wishlist_product = wpc.id_wishlist_product) @@ -206,12 +206,12 @@ class WishList extends ObjectModel foreach ($res AS $refresh) if($refresh['wish_quantity'] > $refresh['cart_quantity']) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product` SET `quantity`= `quantity` + '.((int)($refresh['wish_quantity']) - (int)($refresh['cart_quantity'])).' WHERE id_wishlist_product='.(int)($refresh['id_wishlist_product']) ); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product_cart` SET `quantity`='.(int)($refresh['cart_quantity']).' WHERE id_wishlist_product='.(int)($refresh['id_wishlist_product']).' AND id_cart='.(int)($refresh['id_cart']) @@ -220,7 +220,7 @@ class WishList extends ObjectModel if(isset($freshwish) AND $freshwish != false) foreach ($freshwish AS $prodcustomer) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product` SET `quantity`=`quantity` + ( SELECT `quantity` FROM `'._DB_PREFIX_.'wishlist_product_cart` @@ -228,7 +228,7 @@ class WishList extends ObjectModel ) WHERE `id_wishlist_product`='.(int)($prodcustomer['id_wishlist_product']).' AND `id_wishlist`='.(int)($id_wishlist) ); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'wishlist_product_cart` WHERE `id_wishlist_product`='.(int)($prodcustomer['id_wishlist_product']).' AND `id_cart`='.(int)($prodcustomer['id_cart']) ); @@ -246,7 +246,7 @@ class WishList extends ObjectModel !Validate::isUnsignedId($id_lang) OR !Validate::isUnsignedId($id_wishlist)) die (Tools::displayError()); - $products = Db::getInstance()->ExecuteS(' + $products = Db::getInstance()->executeS(' SELECT wp.`id_product`, wp.`quantity`, p.`quantity` AS product_quantity, pl.`name`, wp.`id_product_attribute`, wp.`priority`, pl.link_rewrite, cl.link_rewrite AS category_rewrite FROM `'._DB_PREFIX_.'wishlist_product` wp JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = wp.`id_product` @@ -265,7 +265,7 @@ class WishList extends ObjectModel if (isset($products[$i]['id_product_attribute']) AND Validate::isUnsignedInt($products[$i]['id_product_attribute'])) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT al.`name` AS attribute_name, pa.`quantity` AS "attribute_quantity" FROM `'._DB_PREFIX_.'product_attribute_combination` pac LEFT JOIN `'._DB_PREFIX_.'attribute` a ON (a.`id_attribute` = pac.`id_attribute`) @@ -297,7 +297,7 @@ class WishList extends ObjectModel { if (!Validate::isUnsignedId($id_customer)) die (Tools::displayError()); - return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT SUM(wp.`quantity`) AS nbProducts, wp.`id_wishlist` FROM `'._DB_PREFIX_.'wishlist_product` wp INNER JOIN `'._DB_PREFIX_.'wishlist` w ON (w.`id_wishlist` = wp.`id_wishlist`) @@ -331,7 +331,7 @@ class WishList extends ObjectModel if (($result['quantity'] + $quantity) <= 0) return (WishList::removeProduct($id_wishlist, $id_customer, $id_product, $id_product_attribute)); else - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product` SET `quantity` = '.(int)($quantity + $result['quantity']).' WHERE `id_wishlist` = '.(int)($id_wishlist).' @@ -339,7 +339,7 @@ class WishList extends ObjectModel AND `id_product_attribute` = '.(int)($id_product_attribute))); } else - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'wishlist_product` (`id_wishlist`, `id_product`, `id_product_attribute`, `quantity`, `priority`) VALUES( '.(int)($id_wishlist).', '.(int)($id_product).', @@ -360,7 +360,7 @@ class WishList extends ObjectModel !Validate::isUnsignedId($quantity) OR $priority < 0 OR $priority > 2) die (Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product` SET `priority` = '.(int)($priority).', `quantity` = '.(int)($quantity).' @@ -392,11 +392,11 @@ class WishList extends ObjectModel $result['id_wishlist'] != $id_wishlist) return (false); // Delete product in wishlist_product_cart - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'wishlist_product_cart` WHERE `id_wishlist_product` = '.(int)($result['id_wishlist_product']) ); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'wishlist_product` WHERE `id_wishlist` = '.(int)($id_wishlist).' AND `id_product` = '.(int)($id_product).' @@ -414,7 +414,7 @@ class WishList extends ObjectModel if (!Validate::isUnsignedId($id_wishlist)) die (Tools::displayError()); - return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT wp.`id_product`, wp.`id_product_attribute`, wpc.`quantity`, wpc.`date_add`, cu.`lastname`, cu.`firstname` FROM `'._DB_PREFIX_.'wishlist_product_cart` wpc JOIN `'._DB_PREFIX_.'wishlist_product` wp ON (wp.id_wishlist_product = wpc.id_wishlist_product) @@ -446,21 +446,21 @@ class WishList extends ObjectModel $quantity > $result['quantity']) return (false); - Db::getInstance()->ExecuteS(' + Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'wishlist_product_cart` WHERE `id_wishlist_product`='.(int)($result['id_wishlist_product']).' AND `id_cart`='.(int)($id_cart) ); if (Db::getInstance()->NumRows() > 0) - $result2= Db::getInstance()->Execute(' + $result2= Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product_cart` SET `quantity`=`quantity` + '.(int)($quantity).' WHERE `id_wishlist_product`='.(int)($result['id_wishlist_product']).' AND `id_cart`='.(int)($id_cart) ); else - $result2 = Db::getInstance()->Execute(' + $result2 = Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'wishlist_product_cart` (`id_wishlist_product`, `id_cart`, `quantity`, `date_add`) VALUES( '.(int)($result['id_wishlist_product']).', @@ -470,7 +470,7 @@ class WishList extends ObjectModel if ($result2 === false) return (false); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'wishlist_product` SET `quantity` = '.(int)($result['quantity'] - $quantity).' WHERE `id_wishlist` = '.(int)($id_wishlist).' @@ -487,7 +487,7 @@ class WishList extends ObjectModel { if (!Validate::isUnsignedId($id_wishlist) OR empty($email) OR !Validate::isEmail($email)) return false; - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'wishlist_email` (`id_wishlist`, `email`, `date_add`) VALUES( '.(int)($id_wishlist).', \''.pSQL($email).'\', @@ -504,7 +504,7 @@ class WishList extends ObjectModel if (!Validate::isUnsignedId($id_wishlist) OR !Validate::isUnsignedId($id_customer)) die (Tools::displayError()); - return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT we.`email`, we.`date_add` FROM `'._DB_PREFIX_.'wishlist_email` we INNER JOIN `'._DB_PREFIX_.'wishlist` w ON w.`id_wishlist` = we.`id_wishlist` diff --git a/modules/blockwishlist/blockwishlist.php b/modules/blockwishlist/blockwishlist.php index 67eb34d08..05d39fe3a 100644 --- a/modules/blockwishlist/blockwishlist.php +++ b/modules/blockwishlist/blockwishlist.php @@ -60,7 +60,7 @@ class BlockWishList extends Module $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach ($sql AS $query) if($query) - if(!Db::getInstance()->Execute(trim($query))) + if(!Db::getInstance()->execute(trim($query))) return false; if (!parent::install() OR !$this->registerHook('rightColumn') OR @@ -79,10 +79,10 @@ class BlockWishList extends Module public function uninstall() { return ( - Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'wishlist') AND - Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'wishlist_email') AND - Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'wishlist_product') AND - Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'wishlist_product_cart') AND + Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'wishlist') AND + Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'wishlist_email') AND + Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'wishlist_product') AND + Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'wishlist_product_cart') AND parent::uninstall() ); } diff --git a/modules/canadapost/canadapost.php b/modules/canadapost/canadapost.php index 755a68fc1..d7e1866b1 100755 --- a/modules/canadapost/canadapost.php +++ b/modules/canadapost/canadapost.php @@ -130,7 +130,7 @@ class CanadaPost extends CarrierModule // Install SQL include(dirname(__FILE__).'/sql-install.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Install Carriers @@ -156,7 +156,7 @@ class CanadaPost extends CarrierModule // Uninstall SQL include(dirname(__FILE__).'/sql-uninstall.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Uninstall Module @@ -172,7 +172,7 @@ class CanadaPost extends CarrierModule Db::getInstance()->autoExecute(_DB_PREFIX_.'cp_rate_service_code', array('active' => 0), 'UPDATE'); // Get all services availables - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach ($rateServiceList as $rateService) if (!$rateService['id_carrier']) { @@ -475,7 +475,7 @@ class CanadaPost extends CarrierModule
'; $id_country_current = 0; - $statesList = Db::getInstance()->ExecuteS(' + $statesList = Db::getInstance()->executeS(' SELECT `id_state`, `id_country`, `name` FROM `'._DB_PREFIX_.'state` WHERE `active` = 1 ORDER BY `id_country`, `name` ASC'); @@ -510,7 +510,7 @@ class CanadaPost extends CarrierModule
'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= ' '.$rateService['service'].' '.($this->webserviceTest($rateService['code']) ? '('.$this->l('Available').')' : '('.$this->l('Not available').')').'
'; $html .= ' @@ -626,7 +626,7 @@ class CanadaPost extends CarrierModule if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$this->context->shop->sqlLang('cl').') @@ -694,7 +694,7 @@ class CanadaPost extends CarrierModule '; // Loading config list - $configCategoryList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_category` > 0'); + $configCategoryList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_category` > 0'); if (!$configCategoryList) $html .= ''.$this->l('There is no specific Canada Post configuration for categories at this point.').''; foreach ($configCategoryList as $k => $c) @@ -713,7 +713,7 @@ class CanadaPost extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'cp_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'cp_rate_service_code` ursc ON (ursc.`id_cp_rate_service_code` = urcs.`id_cp_rate_service_code`) @@ -770,7 +770,7 @@ class CanadaPost extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_cp_rate_service_code` FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)(Tools::getValue('id_cp_rate_config')).' AND `id_cp_rate_service_code` = '.(int)($rateService['id_cp_rate_service_code'])); @@ -797,7 +797,7 @@ class CanadaPost extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_cp_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -875,7 +875,7 @@ class CanadaPost extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'cp_rate_config', $updTab, 'UPDATE', '`id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); foreach ($services as $s) { $addTab = array('id_cp_rate_service_code' => pSQL($s), 'id_cp_rate_config' => (int)Tools::getValue('id_cp_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -892,8 +892,8 @@ class CanadaPost extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_cp_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); // Display Results if ($result1) @@ -931,7 +931,7 @@ class CanadaPost extends CarrierModule '; // Loading config list - $configProductList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_product` > 0'); + $configProductList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_product` > 0'); if (!$configProductList) $html .= ''.$this->l('There is no specific Canada Post configuration for products at this point.').''; foreach ($configProductList as $k => $c) @@ -944,7 +944,7 @@ class CanadaPost extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'cp_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'cp_rate_service_code` ursc ON (ursc.`id_cp_rate_service_code` = urcs.`id_cp_rate_service_code`) @@ -993,7 +993,7 @@ class CanadaPost extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_cp_rate_service_code` FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)(Tools::getValue('id_cp_rate_config')).' AND `id_cp_rate_service_code` = '.(int)($rateService['id_cp_rate_service_code'])); @@ -1013,7 +1013,7 @@ class CanadaPost extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_cp_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -1105,7 +1105,7 @@ class CanadaPost extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'cp_rate_config', $updTab, 'UPDATE', '`id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); foreach ($services as $s) { $addTab = array('id_cp_rate_service_code' => pSQL($s), 'id_cp_rate_config' => (int)Tools::getValue('id_cp_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1122,8 +1122,8 @@ class CanadaPost extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_cp_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cp_rate_config_service` WHERE `id_cp_rate_config` = '.(int)Tools::getValue('id_cp_rate_config')); // Display Results if ($result1) @@ -1265,7 +1265,7 @@ class CanadaPost extends CarrierModule $productConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_product` = '.(int)($product['id_product'])); if ($productConfiguration['id_cp_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'cp_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'cp_rate_service_code` ursc ON (ursc.`id_cp_rate_service_code` = urcs.`id_cp_rate_service_code`) @@ -1282,7 +1282,7 @@ class CanadaPost extends CarrierModule $categoryConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'cp_rate_config` WHERE `id_category` = '.(int)($product['id_category_default'])); if ($categoryConfiguration['id_cp_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'cp_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'cp_rate_service_code` ursc ON (ursc.`id_cp_rate_service_code` = urcs.`id_cp_rate_service_code`) @@ -1294,7 +1294,7 @@ class CanadaPost extends CarrierModule } // Return general config - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_cp_rate_service_code']] = $service; return $config; @@ -1326,7 +1326,7 @@ class CanadaPost extends CarrierModule $weight += Tools::getValue('cp_carrier_packaging_weight', Configuration::get('CP_CARRIER_PACKAGING_WEIGHT')); // Get service in adequation with carrier and check if available - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_cp_rate_service_code']] = $service; $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'cp_rate_service_code` WHERE `id_carrier` = '.(int)($this->id_carrier)); @@ -1487,7 +1487,7 @@ class CanadaPost extends CarrierModule if (!empty($service)) $servicesList = array(array('service' => $service)); else - $servicesList = Db::getInstance()->ExecuteS('SELECT `service` FROM `'._DB_PREFIX_.'cp_rate_service_code`'); + $servicesList = Db::getInstance()->executeS('SELECT `service` FROM `'._DB_PREFIX_.'cp_rate_service_code`'); // Testing Service foreach ($servicesList as $service) diff --git a/modules/cashticket/Disposition.php b/modules/cashticket/Disposition.php index 792084e59..ce04d23b2 100644 --- a/modules/cashticket/Disposition.php +++ b/modules/cashticket/Disposition.php @@ -31,19 +31,19 @@ class Disposition public static function create($id_cart, $mtid, $amount, $currency) { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'INSERT INTO `'._DB_PREFIX_.self::TABLE_NAME.'` (`id_cart`, `mtid`, `amount`, `currency`) VALUES ('.(int)($id_cart).',\''.pSQL($mtid).'\','.(float)($amount).',\''.pSQL($currency).'\')'); } public static function delete($id) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_disposition` = '.(int)($id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_disposition` = '.(int)($id)); } public static function deleteByCartId($id_cart) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_cart` = '.(int)($id_cart)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_cart` = '.(int)($id_cart)); } public static function getByCartId($id_cart) @@ -53,7 +53,7 @@ class Disposition public static function createTable() { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'` ( `id_disposition` int(11) NOT NULL AUTO_INCREMENT, `id_cart` int(11) NOT NULL, @@ -67,12 +67,12 @@ class Disposition public static function dropTable() { - return Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); } public static function updateAmount($id_disposition, $amount) { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'UPDATE `'._DB_PREFIX_.self::TABLE_NAME.'` SET `amount` = `amount` - '.(float)($amount).' WHERE `id_disposition` = '.(int)($id_disposition)); } diff --git a/modules/cashticket/PrepaidServices.php b/modules/cashticket/PrepaidServices.php index ce1c4694d..389855808 100644 --- a/modules/cashticket/PrepaidServices.php +++ b/modules/cashticket/PrepaidServices.php @@ -149,7 +149,7 @@ abstract class PrepaidServices extends PaymentModule private function _getAllowedCurrencies() { if (empty($this->allowed_currencies)) - $this->allowed_currencies = DB::getInstance()->ExecuteS( + $this->allowed_currencies = DB::getInstance()->executeS( 'SELECT c.id_currency, c.iso_code, c.name, c.sign FROM '._DB_PREFIX_.'currency c WHERE c.deleted = 0 diff --git a/modules/criteo/criteo.php b/modules/criteo/criteo.php index 7165a5860..441da44f5 100755 --- a/modules/criteo/criteo.php +++ b/modules/criteo/criteo.php @@ -141,7 +141,7 @@ class Criteo extends Module 'PS_CURRENCY_DEFAULT', 'PS_CARRIER_DEFAULT')); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT DISTINCT p.`id_product`, i.`id_image` FROM `'._DB_PREFIX_.'product` p JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.id_product = p.id_product) @@ -205,7 +205,7 @@ class Criteo extends Module 'PS_CARRIER_DEFAULT')); /* Searching for products */ - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT DISTINCT p.`id_product`, i.`id_image` FROM `'._DB_PREFIX_.'product` p JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.id_product = p.id_product) diff --git a/modules/crossselling/crossselling.php b/modules/crossselling/crossselling.php index da180be01..237cac235 100755 --- a/modules/crossselling/crossselling.php +++ b/modules/crossselling/crossselling.php @@ -127,7 +127,7 @@ class CrossSelling extends Module $pIds[] = (int)$product['id_product']; } $qOrders .= ')'; - $orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($qOrders); + $orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($qOrders); if (sizeof($orders)) { @@ -138,7 +138,7 @@ class CrossSelling extends Module $list = rtrim($list, ','); $list_product_ids = join(',', $pIds); - $orderProducts = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $orderProducts = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT od.product_id, pl.name, pl.link_rewrite, p.reference, i.id_image, p.show_price, cl.link_rewrite category, p.ean13 FROM '._DB_PREFIX_.'order_detail od LEFT JOIN '._DB_PREFIX_.'product p ON (p.id_product = od.product_id) @@ -173,7 +173,7 @@ class CrossSelling extends Module public function hookProductFooter($params) { - $orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $orders = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT o.id_order FROM '._DB_PREFIX_.'orders o LEFT JOIN '._DB_PREFIX_.'order_detail od ON (od.id_order = o.id_order) @@ -186,7 +186,7 @@ class CrossSelling extends Module $list .= (int)$order['id_order'].','; $list = rtrim($list, ','); - $orderProducts = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $orderProducts = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT od.product_id, pl.name, pl.link_rewrite, p.reference, i.id_image, p.show_price, cl.link_rewrite category, p.ean13 FROM '._DB_PREFIX_.'order_detail od LEFT JOIN '._DB_PREFIX_.'product p ON (p.id_product = od.product_id) diff --git a/modules/dateofdelivery/dateofdelivery.php b/modules/dateofdelivery/dateofdelivery.php index 34a1a15a9..77878dd4d 100644 --- a/modules/dateofdelivery/dateofdelivery.php +++ b/modules/dateofdelivery/dateofdelivery.php @@ -51,7 +51,7 @@ class DateOfDelivery extends Module if (!parent::install() OR !$this->registerHook('beforeCarrier') OR !$this->registerHook('orderDetailDisplayed')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'dateofdelivery_carrier_rule` ( `id_carrier_rule` INT NOT NULL AUTO_INCREMENT PRIMARY KEY, `id_carrier` INT NOT NULL, @@ -79,7 +79,7 @@ class DateOfDelivery extends Module Configuration::deleteByName('DOD_PREPARATION_SATURDAY'); Configuration::deleteByName('DOD_PREPARATION_SUNDAY'); Configuration::deleteByName('DOD_DATE_FORMAT'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'dateofdelivery_carrier_rule`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'dateofdelivery_carrier_rule`'); return parent::uninstall(); } @@ -174,7 +174,7 @@ class DateOfDelivery extends Module { if (Tools::isSubmit('addCarrierRule')) { - if (Db::getInstance()->Execute(' + if (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'dateofdelivery_carrier_rule`(`id_carrier`, `minimal_time`, `maximal_time`, `delivery_saturday`, `delivery_sunday`) VALUES ('.(int)($carrier->id).', '.(int)(Tools::getValue('minimal_time')).', '.(int)(Tools::getValue('maximal_time')).', '.(int)(Tools::isSubmit('delivery_saturday')).', '.(int)(Tools::isSubmit('delivery_sunday')).') ')) @@ -184,7 +184,7 @@ class DateOfDelivery extends Module } else { - if (Db::getInstance()->Execute(' + if (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'dateofdelivery_carrier_rule` SET `id_carrier` = '.(int)($carrier->id).', `minimal_time` = '.(int)(Tools::getValue('minimal_time')).', `maximal_time` = '.(int)(Tools::getValue('maximal_time')).', `delivery_saturday` = '.(int)(Tools::isSubmit('delivery_saturday')).', `delivery_sunday` = '.(int)(Tools::isSubmit('delivery_sunday')).' WHERE `id_carrier_rule` = '.(int)(Tools::getValue('id_carrier_rule')) @@ -368,7 +368,7 @@ class DateOfDelivery extends Module private function _getCarrierRulesWithCarrierName() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'dateofdelivery_carrier_rule` dcr LEFT JOIN `'._DB_PREFIX_.'carrier` c ON (c.`id_carrier` = dcr.`id_carrier`) @@ -412,7 +412,7 @@ class DateOfDelivery extends Module { if (!(int)($id_carrier_rule)) return false; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'dateofdelivery_carrier_rule` WHERE `id_carrier_rule` = '.(int)($id_carrier_rule) ); diff --git a/modules/dejala/dejala.php b/modules/dejala/dejala.php index 8253989dd..0f06f0aad 100644 --- a/modules/dejala/dejala.php +++ b/modules/dejala/dejala.php @@ -90,16 +90,16 @@ class Dejala extends CarrierModule if (!isset($this->dejalaConfig->internal_version) || $this->dejalaConfig->internal_version < $this->internal_version) { $this->unregisterHook('cart') ; - $res = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'dejala_cart` LIMIT 1') ; + $res = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'dejala_cart` LIMIT 1') ; if ($res) { if (!array_key_exists('cart_date_upd', (int)$res[0])) { - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN cart_date_upd DATETIME DEFAULT 0;'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN cart_date_upd DATETIME DEFAULT 0;'); } if (!array_key_exists('delivery_price', (int)$res[0])) { - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN delivery_price FLOAT DEFAULT NULL;'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'dejala_cart` ADD COLUMN delivery_price FLOAT DEFAULT NULL;'); } } $this->dejalaConfig->internal_version = $this->internal_version ; @@ -125,7 +125,7 @@ class Dejala extends CarrierModule foreach ($sql as $query) if (!empty($query)) { - if (!Db::getInstance()->Execute(trim($query))) + if (!Db::getInstance()->execute(trim($query))) return (false); } diff --git a/modules/dejala/dejalacarrierutils.php b/modules/dejala/dejalacarrierutils.php index 485a2412c..cb613b0a3 100644 --- a/modules/dejala/dejalacarrierutils.php +++ b/modules/dejala/dejalacarrierutils.php @@ -70,7 +70,7 @@ class DejalaCarrierUtils $carrier->addZone((int)$id_zone) ; /*$sql = 'INSERT INTO `'._DB_PREFIX_.'carrier_zone` (`id_carrier` , `id_zone`) VALUES ('.(int)($carrier->id).', ' . (int)($id_zone) . ')'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $rangeW = new RangeWeight(); $rangeW->id_carrier = $carrier->id; diff --git a/modules/dejala/dejalacart.php b/modules/dejala/dejalacart.php index 334274f31..2e85fd557 100644 --- a/modules/dejala/dejalacart.php +++ b/modules/dejala/dejalacart.php @@ -65,7 +65,7 @@ class DejalaCart extends ObjectModel parent::save($nullValues, $autodate) ; if (isset($this->wanted_cart_id)) { - Db::getInstance()->Execute('UPDATE ' . _DB_PREFIX_ . $this->table . ' SET ' . $this->identifier . ' = ' . (int)$this->wanted_cart_id . ' WHERE ' . $this->identifier . ' = ' . (int)$this->id); + Db::getInstance()->execute('UPDATE ' . _DB_PREFIX_ . $this->table . ' SET ' . $this->identifier . ' = ' . (int)$this->wanted_cart_id . ' WHERE ' . $this->identifier . ' = ' . (int)$this->id); $this->id = (int)$this->wanted_cart_id ; unset($this->wanted_cart_id) ; } diff --git a/modules/ebay/ajax/changeCategoryMatch.php b/modules/ebay/ajax/changeCategoryMatch.php index 2c0e089f7..6d075d920 100755 --- a/modules/ebay/ajax/changeCategoryMatch.php +++ b/modules/ebay/ajax/changeCategoryMatch.php @@ -12,9 +12,9 @@ if (file_exists($configPath)) if ($_GET['level'] >= $i) { if ($i == 0) - $eBayCategoryListLevel = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = 1 AND `id_category_ref` = `id_category_ref_parent`'); + $eBayCategoryListLevel = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = 1 AND `id_category_ref` = `id_category_ref_parent`'); else - $eBayCategoryListLevel = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = '.(int)($i + 1).' AND `id_category_ref_parent` IN (SELECT `id_category_ref` FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_ebay_category` = '.(int)($_GET['level'.$i]).')'); + $eBayCategoryListLevel = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = '.(int)($i + 1).' AND `id_category_ref_parent` IN (SELECT `id_category_ref` FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_ebay_category` = '.(int)($_GET['level'.$i]).')'); if ($eBayCategoryListLevel) { $levelExists[$i + 1] = true; diff --git a/modules/ebay/ajax/loadCategoryMatch.php b/modules/ebay/ajax/loadCategoryMatch.php index d642128d0..deb1c2676 100755 --- a/modules/ebay/ajax/loadCategoryMatch.php +++ b/modules/ebay/ajax/loadCategoryMatch.php @@ -34,9 +34,9 @@ if (file_exists($configPath)) if ($_GET['level'] >= $i) { if ($i == 0) - $eBayCategoryListLevel = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = 1 AND `id_category_ref` = `id_category_ref_parent`'); + $eBayCategoryListLevel = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = 1 AND `id_category_ref` = `id_category_ref_parent`'); else - $eBayCategoryListLevel = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = '.(int)($i + 1).' AND `id_category_ref_parent` IN (SELECT `id_category_ref` FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_ebay_category` = '.(int)($_GET['level'.$i]).')'); + $eBayCategoryListLevel = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `level` = '.(int)($i + 1).' AND `id_category_ref_parent` IN (SELECT `id_category_ref` FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_ebay_category` = '.(int)($_GET['level'.$i]).')'); if ($eBayCategoryListLevel) { $levelExists[$i + 1] = true; diff --git a/modules/ebay/ebay.php b/modules/ebay/ebay.php index e24554a08..41128747b 100755 --- a/modules/ebay/ebay.php +++ b/modules/ebay/ebay.php @@ -170,7 +170,7 @@ class Ebay extends Module // Install SQL include(dirname(__FILE__).'/sql-install.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Install Module @@ -210,7 +210,7 @@ class Ebay extends Module // Uninstall SQL include(dirname(__FILE__).'/sql-uninstall.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; Configuration::deleteByName('EBAY_API_SESSION'); Configuration::deleteByName('EBAY_API_USERNAME'); @@ -258,7 +258,7 @@ class Ebay extends Module // Upgrade SQL include(dirname(__FILE__).'/sql-upgrade-1-2.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; Configuration::updateValue('EBAY_VERSION', $this->version); } @@ -278,7 +278,7 @@ class Ebay extends Module if (Configuration::get('EBAY_SYNC_MODE') == 'A') { // Retrieve product list for eBay (which have matched categories) AND Send each product on eBay - $productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)'); + $productsList = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)'); foreach ($productList as $k => $v) $productList[$k]['noPriceUpdate'] = 1; if ($productsList) @@ -287,7 +287,7 @@ class Ebay extends Module else if (Configuration::get('EBAY_SYNC_MODE') == 'B') { // Select the sync Categories and Retrieve product list for eBay (which have matched and sync categories) AND Send each product on eBay - $productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)'); + $productsList = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE '.$sql.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)'); foreach ($productList as $k => $v) $productList[$k]['noPriceUpdate'] = 1; if ($productsList) @@ -307,14 +307,14 @@ class Ebay extends Module if (Configuration::get('EBAY_SYNC_MODE') == 'A') { // Retrieve product list for eBay (which have matched categories) AND Send each product on eBay - $productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)$id_product.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)'); + $productsList = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)$id_product.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)'); if ($productsList) $this->_syncProducts($productsList); } else if (Configuration::get('EBAY_SYNC_MODE') == 'B') { // Select the sync Categories and Retrieve product list for eBay (which have matched and sync categories) AND Send each product on eBay - $productsList = Db::getInstance()->ExecuteS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)$id_product.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)'); + $productsList = Db::getInstance()->executeS('SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)$id_product.' AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)'); if ($productsList) $this->_syncProducts($productsList); } @@ -930,11 +930,11 @@ class Ebay extends Module // Loading categories $categoryConfigList = array(); - $categoryConfigListTmp = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); + $categoryConfigListTmp = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); foreach ($categoryConfigListTmp as $c) $categoryConfigList[$c['id_category']] = $c; $categoryList = $this->_getChildCategories(Category::getCategories($this->context->language->id), 0); - $eBayCategoryList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_category_ref` = `id_category_ref_parent`'); + $eBayCategoryList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category` WHERE `id_category_ref` = `id_category_ref_parent`'); // Display header @@ -1041,10 +1041,10 @@ class Ebay extends Module // Loading categories $ebay = new eBayRequest(); $categoryConfigList = array(); - $categoryConfigListTmp = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); + $categoryConfigListTmp = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); foreach ($categoryConfigListTmp as $c) $categoryConfigList[$c['id_category']] = $c; - $categoryList = Db::getInstance()->ExecuteS('SELECT `id_category`, `name` FROM `'._DB_PREFIX_.'category_lang` WHERE `id_lang` = '.(int)$this->id_lang.$this->context->shop->sqlLang('cl')); + $categoryList = Db::getInstance()->executeS('SELECT `id_category`, `name` FROM `'._DB_PREFIX_.'category_lang` WHERE `id_lang` = '.(int)$this->id_lang.$this->context->shop->sqlLang('cl')); foreach ($categoryList as $k => $c) if (!isset($categoryConfigList[$c['id_category']])) @@ -1087,7 +1087,7 @@ class Ebay extends Module if ($arraySQL) Db::getInstance()->autoExecute(_DB_PREFIX_.'ebay_category_configuration', $arraySQL, 'UPDATE', '`id_category` = '.(int)$id_category); else - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` = '.(int)$id_category); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` = '.(int)$id_category); } elseif ($arraySQL) { @@ -1317,7 +1317,7 @@ class Ebay extends Module // Loading categories $categoryConfigList = array(); - $categoryConfigListTmp = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); + $categoryConfigListTmp = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ebay_category_configuration`'); foreach ($categoryConfigListTmp as $c) $categoryConfigList[$c['id_category']] = $c; $categoryList = $this->_getChildCategories(Category::getCategories($this->context->language->id), 0); @@ -1428,7 +1428,7 @@ class Ebay extends Module AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0)'); // Retrieve products list for eBay (which have matched categories) - $productsList = Db::getInstance()->ExecuteS(' + $productsList = Db::getInstance()->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `quantity` > 0 AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0) @@ -1455,7 +1455,7 @@ class Ebay extends Module AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1)'); // Retrieve products list for eBay (which have matched categories) - $productsList = Db::getInstance()->ExecuteS(' + $productsList = Db::getInstance()->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `quantity` > 0 AND `active` = 1 AND `id_category_default` IN (SELECT `id_category` FROM `'._DB_PREFIX_.'ebay_category_configuration` WHERE `id_category` > 0 AND `id_ebay_category` > 0 AND `sync` = 1) @@ -1684,7 +1684,7 @@ class Ebay extends Module if ($ebay->errorCode == 291) { // We delete from DB and Add it on eBay - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); $ebay->addFixedPriceItemMultiSku($datas); if ($ebay->itemID > 0) Db::getInstance()->autoExecute(_DB_PREFIX_.'ebay_product', array('id_country' => 8, 'id_product' => (int)$product->id, 'id_attribute' => 0, 'id_product_ref' => pSQL($ebay->itemID), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)), 'INSERT'); @@ -1754,7 +1754,7 @@ class Ebay extends Module { // Delete if ($ebay->endFixedPriceItem($datasTmp)) - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datasTmp['itemID']).'\''); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datasTmp['itemID']).'\''); } else { @@ -1766,7 +1766,7 @@ class Ebay extends Module if ($ebay->errorCode == 291) { // We delete from DB and Add it on eBay - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datasTmp['itemID']).'\''); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datasTmp['itemID']).'\''); $ebay->addFixedPriceItem($datasTmp); if ($ebay->itemID > 0) Db::getInstance()->autoExecute(_DB_PREFIX_.'ebay_product', array('id_country' => 8, 'id_product' => (int)$product->id, 'id_attribute' => (int)$datasTmp['id_attribute'], 'id_product_ref' => pSQL($ebay->itemID), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)), 'INSERT'); @@ -1814,7 +1814,7 @@ class Ebay extends Module { // Delete if ($ebay->endFixedPriceItem($datas)) - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); } else { @@ -1826,7 +1826,7 @@ class Ebay extends Module if ($ebay->errorCode == 291) { // We delete from DB and Add it on eBay - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ebay_product` WHERE `id_product_ref` = \''.pSQL($datas['itemID']).'\''); $ebay->addFixedPriceItem($datas); if ($ebay->itemID > 0) Db::getInstance()->autoExecute(_DB_PREFIX_.'ebay_product', array('id_country' => 8, 'id_product' => (int)$product->id, 'id_attribute' => 0, 'id_product_ref' => pSQL($ebay->itemID), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)), 'INSERT'); diff --git a/modules/editorial/editorial.php b/modules/editorial/editorial.php index 54cc0076b..566366386 100644 --- a/modules/editorial/editorial.php +++ b/modules/editorial/editorial.php @@ -53,7 +53,7 @@ class Editorial extends Module if (!parent::install() OR !$this->registerHook('home') OR !$this->registerHook('header')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial` ( `id_editorial` int(10) unsigned NOT NULL auto_increment, `body_home_logo_link` varchar(255) NOT NULL, @@ -61,7 +61,7 @@ class Editorial extends Module ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial_lang` ( `id_editorial` int(10) unsigned NOT NULL, `id_lang` int(10) unsigned NOT NULL, @@ -73,17 +73,17 @@ class Editorial extends Module ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'editorial`(`id_editorial`, `body_home_logo_link`) VALUES(1, "http://www.prestashop.com")')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'editorial_lang`(`id_editorial`, `id_lang`, `body_title`, `body_subheading`, `body_paragraph`, `body_logo_subheading`) VALUES(1, 1, "Lorem ipsum dolor sit amet", "Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>", "Excepteur sint prestashop cupidatat non proident")')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'editorial_lang`(`id_editorial`, `id_lang`, `body_title`, `body_subheading`, `body_paragraph`, `body_logo_subheading`) VALUES(1, 2, "Lorem ipsum dolor sit amet", "Excepteur sint occaecat cupidatat non proident", "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>", "Lorem ipsum presta shop amet")')) return false; @@ -94,8 +94,8 @@ class Editorial extends Module { if (!parent::uninstall()) return false; - return (Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'editorial`') AND - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'editorial_lang`')); + return (Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'editorial`') AND + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'editorial_lang`')); } public function putContent($xml_data, $key, $field, $forbidden, $section) diff --git a/modules/envoimoinscher/AdminEnvoiMoinsCher.php b/modules/envoimoinscher/AdminEnvoiMoinsCher.php index 79c8569c1..fced78888 100755 --- a/modules/envoimoinscher/AdminEnvoiMoinsCher.php +++ b/modules/envoimoinscher/AdminEnvoiMoinsCher.php @@ -107,7 +107,7 @@ class AdminEnvoiMoinsCher extends AdminTab AND o.id_carrier = '.pSQL($id_carrier).' GROUP BY o.`id_order`, od.`id_order` ORDER BY o.`date_add` ASC'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } private function displayOrders($orders) diff --git a/modules/envoimoinscher/envoimoinscher.php b/modules/envoimoinscher/envoimoinscher.php index 72b50212f..b3f74c468 100755 --- a/modules/envoimoinscher/envoimoinscher.php +++ b/modules/envoimoinscher/envoimoinscher.php @@ -87,7 +87,7 @@ class Envoimoinscher extends Module $sql = str_replace(array('PREFIX_', 'ENGINE_TYPE'), array(_DB_PREFIX_, _MYSQL_ENGINE_), $sql); $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach ($sql AS $query) - if ($query AND sizeof($query) AND !Db::getInstance()->Execute(trim($query))) + if ($query AND sizeof($query) AND !Db::getInstance()->execute(trim($query))) return false; if (substr(_PS_VERSION_, 2, 3) <= 3.1) { @@ -95,7 +95,7 @@ class Envoimoinscher extends Module $this->_errors[] = $this->l('Please manually copy ') .dirname(__FILE__).'/AdminEnvoiMoinsCher.gif'.' in the '._PS_IMG_DIR_.'/t/AdminEnvoiMoinsCher.gif folder located in your admin directory.'; } if (!parent::install() OR !Configuration::updateValue('EMC_EMAILS', 1) OR !$this->registerHook('AdminOrder') OR !self::adminInstall() - OR !Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'envoimoinscher` (`id_order` int(10) unsigned NOT NULL, `shipping_number` varchar(30) NOT NULL ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=latin1;')) + OR !Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'envoimoinscher` (`id_order` int(10) unsigned NOT NULL, `shipping_number` varchar(30) NOT NULL ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=latin1;')) return false; return true; } @@ -118,7 +118,7 @@ class Envoimoinscher extends Module */ public function uninstall() { - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'envoimoinscher_contenu`'); + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'envoimoinscher_contenu`'); $tab = new Tab(Tab::getIdFromClassName('AdminEnvoiMoinsCher')); if (!parent::uninstall() OR !$tab->delete() OR !$this->unregisterHook('AdminOrder')) @@ -528,7 +528,7 @@ class Envoimoinscher extends Module $order = new Order($params['id_order']); if ($order->id_carrier == Configuration::get('EMC_CARRIER')) { - $return = Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'envoimoinscher WHERE id_order = \''.(int)($order->id).'\' LIMIT 1'); + $return = Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'envoimoinscher WHERE id_order = \''.(int)($order->id).'\' LIMIT 1'); if (isset($return[0]['shipping_number'])) { $html = '

'.$this->l('Envoimoinscher').''; diff --git a/modules/envoimoinscher/tracking.php b/modules/envoimoinscher/tracking.php index ab53215b5..ec99b0fc2 100755 --- a/modules/envoimoinscher/tracking.php +++ b/modules/envoimoinscher/tracking.php @@ -58,15 +58,15 @@ if (isset($return['infoexterne']) AND isset($return['token']) AND isset($return[ $history->addWithemail(); $db = Db::getInstance(); - $db->ExecuteS('SELECT * FROM '._DB_PREFIX_.'envoimoinscher WHERE id_order = '.(int)($id_order)); + $db->executeS('SELECT * FROM '._DB_PREFIX_.'envoimoinscher WHERE id_order = '.(int)($id_order)); $numRows = (int)($db->NumRows()); if ($numRows == 0) { - if (Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'envoimoinscher VALUES (\''.(int)($id_order).'\', \''.pSQL($return['envoi']).'\');')); + if (Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'envoimoinscher VALUES (\''.(int)($id_order).'\', \''.pSQL($return['envoi']).'\');')); } else { - if (Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'envoimoinscher SET shipping_number=\''.pSQL($return['envoi']).'\' WHERE id_order=\''.(int)($id_order).'\' ')); + if (Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'envoimoinscher SET shipping_number=\''.pSQL($return['envoi']).'\' WHERE id_order=\''.(int)($id_order).'\' ')); } break; diff --git a/modules/favoriteproducts/FavoriteProduct.php b/modules/favoriteproducts/FavoriteProduct.php index be6aaa346..d4c5e16ce 100644 --- a/modules/favoriteproducts/FavoriteProduct.php +++ b/modules/favoriteproducts/FavoriteProduct.php @@ -71,7 +71,7 @@ class FavoriteProduct extends ObjectModel if (!$shop) $shop = Context::getContext()->shop; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT fp.`id_shop`, p.`id_product`, pl.`description_short`, pl.`link_rewrite`, pl.`name`, i.`id_image`, CONCAT(p.`id_product`, \'-\', i.`id_image`) as image FROM `'._DB_PREFIX_.'favorite_product` fp LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = fp.`id_product`) diff --git a/modules/favoriteproducts/favoriteproducts.php b/modules/favoriteproducts/favoriteproducts.php index 37c5b25ae..7402346e3 100644 --- a/modules/favoriteproducts/favoriteproducts.php +++ b/modules/favoriteproducts/favoriteproducts.php @@ -52,7 +52,7 @@ class FavoriteProducts extends Module OR !$this->registerHook('header')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'favorite_product` ( `id_favorite_product` int(10) unsigned NOT NULL auto_increment, `id_product` int(10) unsigned NOT NULL, @@ -69,7 +69,7 @@ class FavoriteProducts extends Module public function uninstall() { - if (!parent::uninstall() OR !Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'favorite_product`')) + if (!parent::uninstall() OR !Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'favorite_product`')) return false; return true; } diff --git a/modules/fedexcarrier/fedexcarrier.php b/modules/fedexcarrier/fedexcarrier.php index f9a92b09c..9f364ce2e 100644 --- a/modules/fedexcarrier/fedexcarrier.php +++ b/modules/fedexcarrier/fedexcarrier.php @@ -182,7 +182,7 @@ class FedexCarrier extends CarrierModule // Install SQL include(dirname(__FILE__).'/sql-install.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Install Carriers @@ -208,7 +208,7 @@ class FedexCarrier extends CarrierModule // Uninstall SQL include(dirname(__FILE__).'/sql-uninstall.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Uninstall Module @@ -224,7 +224,7 @@ class FedexCarrier extends CarrierModule Db::getInstance()->autoExecute(_DB_PREFIX_.'fedex_rate_service_code', array('active' => 0), 'UPDATE'); // Get all services availables - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach ($rateServiceList as $rateService) if (!$rateService['id_carrier']) { @@ -536,7 +536,7 @@ class FedexCarrier extends CarrierModule
'; $id_country_current = 0; - $statesList = Db::getInstance()->ExecuteS(' + $statesList = Db::getInstance()->executeS(' SELECT `id_state`, `id_country`, `name` FROM `'._DB_PREFIX_.'state` WHERE `active` = 1 ORDER BY `id_country`, `name` ASC'); @@ -586,7 +586,7 @@ class FedexCarrier extends CarrierModule
'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= ' '.$rateService['service'].' '.($this->webserviceTest($rateService['code']) ? '('.$this->l('Available').')' : '('.$this->l('Not available').')').'
'; $html .= ' @@ -722,7 +722,7 @@ class FedexCarrier extends CarrierModule if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$this->context->shop->sqlLang('cl').') @@ -792,7 +792,7 @@ class FedexCarrier extends CarrierModule '; // Loading config list - $configCategoryList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_category` > 0'); + $configCategoryList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_category` > 0'); if (!$configCategoryList) $html .= ''.$this->l('There is no specific FEDEX configuration for categories at this point.').''; foreach ($configCategoryList as $k => $c) @@ -811,7 +811,7 @@ class FedexCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'fedex_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'fedex_rate_service_code` ursc ON (ursc.`id_fedex_rate_service_code` = urcs.`id_fedex_rate_service_code`) @@ -885,7 +885,7 @@ class FedexCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_fedex_rate_service_code` FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)(Tools::getValue('id_fedex_rate_config')).' AND `id_fedex_rate_service_code` = '.(int)($rateService['id_fedex_rate_service_code'])); @@ -928,7 +928,7 @@ class FedexCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_fedex_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -1010,7 +1010,7 @@ class FedexCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'fedex_rate_config', $updTab, 'UPDATE', '`id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); foreach ($services as $s) { $addTab = array('id_fedex_rate_service_code' => pSQL($s), 'id_fedex_rate_config' => (int)Tools::getValue('id_fedex_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1027,8 +1027,8 @@ class FedexCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_fedex_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); // Display Results if ($result1) @@ -1068,7 +1068,7 @@ class FedexCarrier extends CarrierModule '; // Loading config list - $configProductList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_product` > 0'); + $configProductList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_product` > 0'); if (!$configProductList) $html .= ''.$this->l('There is no specific FEDEX configuration for products at this point.').''; foreach ($configProductList as $k => $c) @@ -1081,7 +1081,7 @@ class FedexCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'fedex_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'fedex_rate_service_code` ursc ON (ursc.`id_fedex_rate_service_code` = urcs.`id_fedex_rate_service_code`) @@ -1147,7 +1147,7 @@ class FedexCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_fedex_rate_service_code` FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)( @@ -1168,7 +1168,7 @@ class FedexCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_fedex_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -1279,7 +1279,7 @@ class FedexCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'fedex_rate_config', $updTab, 'UPDATE', '`id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); foreach ($services as $s) { $addTab = array('id_fedex_rate_service_code' => pSQL($s), 'id_fedex_rate_config' => (int)Tools::getValue('id_fedex_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1296,8 +1296,8 @@ class FedexCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_fedex_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'fedex_rate_config_service` WHERE `id_fedex_rate_config` = '.(int)Tools::getValue('id_fedex_rate_config')); // Display Results if ($result1) @@ -1440,7 +1440,7 @@ class FedexCarrier extends CarrierModule $productConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_product` = '.(int)($product['id_product'])); if ($productConfiguration['id_fedex_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'fedex_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'fedex_rate_service_code` ursc ON (ursc.`id_fedex_rate_service_code` = urcs.`id_fedex_rate_service_code`) @@ -1457,7 +1457,7 @@ class FedexCarrier extends CarrierModule $categoryConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_config` WHERE `id_category` = '.(int)($product['id_category_default'])); if ($categoryConfiguration['id_fedex_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'fedex_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'fedex_rate_service_code` ursc ON (ursc.`id_fedex_rate_service_code` = urcs.`id_fedex_rate_service_code`) @@ -1470,7 +1470,7 @@ class FedexCarrier extends CarrierModule // Return general config $config['pickup_type_code'] = Configuration::get('FEDEX_CARRIER_PICKUP_TYPE'); - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_fedex_rate_service_code']] = $service; return $config; @@ -1500,7 +1500,7 @@ class FedexCarrier extends CarrierModule $weight += Tools::getValue('fedex_carrier_packaging_weight', Configuration::get('FEDEX_CARRIER_PACKAGING_WEIGHT')); // Get service in adequation with carrier and check if available - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_fedex_rate_service_code']] = $service; $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'fedex_rate_service_code` WHERE `id_carrier` = '.(int)($this->id_carrier)); @@ -1676,7 +1676,7 @@ class FedexCarrier extends CarrierModule if (!empty($service)) $servicesList = array(array('code' => $service)); else - $servicesList = Db::getInstance()->ExecuteS('SELECT `code` FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); + $servicesList = Db::getInstance()->executeS('SELECT `code` FROM `'._DB_PREFIX_.'fedex_rate_service_code`'); // Testing Service diff --git a/modules/fianetfraud/fianetfraud.php b/modules/fianetfraud/fianetfraud.php index 21933a722..4eeacf960 100644 --- a/modules/fianetfraud/fianetfraud.php +++ b/modules/fianetfraud/fianetfraud.php @@ -101,7 +101,7 @@ class Fianetfraud extends Module $sql = str_replace('PREFIX_', _DB_PREFIX_, $sql); $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach ($sql AS $query) - if ($query AND sizeof($query) AND !Db::getInstance()->Execute(trim($query))) + if ($query AND sizeof($query) AND !Db::getInstance()->execute(trim($query))) return false; $langs = Language::getLanguages(); @@ -300,17 +300,17 @@ class Fianetfraud extends Module if($module->id) { $module->country = array(); - $countries = DB::getInstance()->ExecuteS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)($module->id)); + $countries = DB::getInstance()->executeS('SELECT id_country FROM '._DB_PREFIX_.'module_country WHERE id_module = '.(int)($module->id)); foreach ($countries as $country) $module->country[] = $country['id_country']; $module->currency = array(); - $currencies = DB::getInstance()->ExecuteS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)($module->id)); + $currencies = DB::getInstance()->executeS('SELECT id_currency FROM '._DB_PREFIX_.'module_currency WHERE id_module = '.(int)($module->id)); foreach ($currencies as $currency) $module->currency[] = $currency['id_currency']; $module->group = array(); - $groups = DB::getInstance()->ExecuteS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)($module->id)); + $groups = DB::getInstance()->executeS('SELECT id_group FROM '._DB_PREFIX_.'module_group WHERE id_module = '.(int)($module->id)); foreach ($groups as $group) $module->group[] = $group['id_group']; } @@ -351,17 +351,17 @@ class Fianetfraud extends Module { if ($_SERVER['REMOTE_ADDR'] == '0.0.0.0' OR $_SERVER['REMOTE_ADDR'] == '' OR $_SERVER['REMOTE_ADDR'] === false) return true; - $res = Db::getInstance()->ExecuteS(' + $res = Db::getInstance()->executeS(' SELECT `id_cart` FROM '._DB_PREFIX_.'fianet_fraud WHERE id_cart = '.(int)($params['cart']->id)); if (Db::getInstance()->NumRows() > 0) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'fianet_fraud` SET `ip_address` = '.ip2long($_SERVER['REMOTE_ADDR']).', `date` = \''.pSQL(date('Y-m-d H:i:s')).'\' WHERE `id_cart` = '.(int)($params['cart']->id).' LIMIT 1'); else - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'fianet_fraud` (`id_cart`, `ip_address`, `date`) VALUES ('.(int)($params['cart']->id).', '.ip2long($_SERVER['REMOTE_ADDR']).',\''.date('Y-m-d H:i:s').'\')'); return true; @@ -526,17 +526,17 @@ class Fianetfraud extends Module $sender->add_order($orderFianet); $res = $sender->send_orders_stacking(); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'fianet_fraud_orders(id_order, date_add) VALUES('.(int)($params['order']->id).', \''.pSQL(date('Y-m-d H:i:s')).'\')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'fianet_fraud_orders(id_order, date_add) VALUES('.(int)($params['order']->id).', \''.pSQL(date('Y-m-d H:i:s')).'\')'); return true; } public static function checkWaitingOrders() { - $orders = Db::getInstance()->ExecuteS('SELECT id_order FROM '._DB_PREFIX_.'fianet_fraud_orders WHERE `date_add` > \''.pSQL(strtotime('+5 minute')).'\''); + $orders = Db::getInstance()->executeS('SELECT id_order FROM '._DB_PREFIX_.'fianet_fraud_orders WHERE `date_add` > \''.pSQL(strtotime('+5 minute')).'\''); foreach ($orders AS $order) { self::updateOrderHistory((int)($order['id_order'])); - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'fianet_fraud_orders WHERE id_order='.(int)($order['id_order'])); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'fianet_fraud_orders WHERE id_order='.(int)($order['id_order'])); } } @@ -615,7 +615,7 @@ class Fianetfraud extends Module public function getSACCategories() { - $categories = Db::getInstance()->ExecuteS('SELECT id_category, id_sac FROM '._DB_PREFIX_.'sac_categories'); + $categories = Db::getInstance()->executeS('SELECT id_category, id_sac FROM '._DB_PREFIX_.'sac_categories'); $sac_cat = array(); if ($categories) foreach ($categories AS $category) diff --git a/modules/fianetsceau/fianetsceau.php b/modules/fianetsceau/fianetsceau.php index bae324411..9a839c66e 100644 --- a/modules/fianetsceau/fianetsceau.php +++ b/modules/fianetsceau/fianetsceau.php @@ -54,7 +54,7 @@ class FianetSceau extends Module return (parent::install() AND $this->registerHook('rightColumn') AND $this->registerHook('updateOrderStatus') AND - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'fianet_seal`( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_order` int(10) unsigned NOT NULL, @@ -208,7 +208,7 @@ class FianetSceau extends Module return; if ($params['newOrderStatus']->logable == 1) $upload_success = self::sendXML(); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO '._DB_PREFIX_.'fianet_seal (id_order, upload_success, valid, status, date_upd, date_add) VALUES ('.(int)$order->id.', 0,'.(int)$params['newOrderStatus']->logable.', '.(int)$params['newOrderStatus']->id.', NOW(), NOW())'); } @@ -218,7 +218,7 @@ class FianetSceau extends Module return; if ($params['newOrderStatus']->logable == 1) $upload_success = self::sendXML(); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'fianet_seal` a SET valid = '.(int)$params['newOrderStatus']->logable.', upload_success = '.(int)$upload_success.', status = '.(int)$params['newOrderStatus']->id.', date_upd = NOW() WHERE a.id = '.(int)$res['id']); diff --git a/modules/followup/followup.php b/modules/followup/followup.php index 5a1d90729..878ee8ce0 100644 --- a/modules/followup/followup.php +++ b/modules/followup/followup.php @@ -55,7 +55,7 @@ class Followup extends Module public function install() { - $logEmailTable = Db::getInstance()->Execute(' + $logEmailTable = Db::getInstance()->execute(' CREATE TABLE '._DB_PREFIX_.'log_email ( `id_log_email` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , `id_email_type` INT UNSIGNED NOT NULL , @@ -82,7 +82,7 @@ class Followup extends Module Configuration::deleteByName('PS_FOLLOWUP_SECURE_KEY'); - Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'log_email'); + Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'log_email'); return parent::uninstall(); } @@ -193,7 +193,7 @@ class Followup extends Module '.$this->l('Bad cust.').' '; - $stats = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $stats = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DATE_FORMAT(l.date_add, \'%Y-%m-%d\') date_stat, l.id_email_type, COUNT(l.id_log_email) nb, (SELECT COUNT(l2.id_discount) FROM '._DB_PREFIX_.'log_email l2 @@ -284,7 +284,7 @@ class Followup extends Module if(!empty($emailLogs)) $sql .= ' AND c.id_cart NOT IN ('.join(',', $emailLogs).')'; - $emails = Db::getInstance()->ExecuteS($sql); + $emails = Db::getInstance()->executeS($sql); if ($count OR !sizeof($emails)) return sizeof($emails); @@ -317,7 +317,7 @@ class Followup extends Module $query = ' SELECT id_cart, id_customer, id_email_type FROM '._DB_PREFIX_.'log_email WHERE id_email_type <> 4 OR date_add >= DATE_SUB(date_add,INTERVAL '.(int)(Configuration::get('PS_FOLLOW_UP_DAYS_THRESHOLD_4')).' DAY)'; - $results = Db::getInstance()->ExecuteS($query); + $results = Db::getInstance()->executeS($query); foreach ($results as $line) { switch ($line['id_email_type']) @@ -355,7 +355,7 @@ class Followup extends Module if(!empty($emailLogs)) $sql .= ' NOT IN ('.join(',', $emailLogs).')'; - $emails = Db::getInstance()->ExecuteS($sql); + $emails = Db::getInstance()->executeS($sql); if ($count OR !sizeof($emails)) return sizeof($emails); @@ -392,7 +392,7 @@ class Followup extends Module GROUP BY o.id_customer HAVING total >= '.(float)(Configuration::get('PS_FOLLOW_UP_THRESHOLD_3')); - $emails = Db::getInstance()->ExecuteS($sql); + $emails = Db::getInstance()->executeS($sql); if ($count OR !sizeof($emails)) return sizeof($emails); @@ -435,7 +435,7 @@ class Followup extends Module $sql .= 'GROUP BY cu.id_customer HAVING nb_orders >= 1'; - $emails = Db::getInstance()->ExecuteS($sql); + $emails = Db::getInstance()->executeS($sql); if ($count OR !sizeof($emails)) return sizeof($emails); @@ -497,7 +497,7 @@ class Followup extends Module /* Clean-up database by deleting all outdated discounts */ if ($conf['PS_FOLLOW_UP_CLEAN_DB'] == 1) { - $outdatedDiscounts = Db::getInstance()->ExecuteS('SELECT id_discount FROM '._DB_PREFIX_.'discount WHERE date_to < NOW()'); + $outdatedDiscounts = Db::getInstance()->executeS('SELECT id_discount FROM '._DB_PREFIX_.'discount WHERE date_to < NOW()'); foreach ($outdatedDiscounts AS $outdatedDiscount) { $discount = new Discount((int)($outdatedDiscount['id_discount'])); diff --git a/modules/gsitemap/gsitemap.php b/modules/gsitemap/gsitemap.php index 331714554..654ade135 100644 --- a/modules/gsitemap/gsitemap.php +++ b/modules/gsitemap/gsitemap.php @@ -110,7 +110,7 @@ XML; WHERE s.active = 1 AND s.deleted = 0 AND su.active = 1'; - if (!$result = Db::getInstance()->ExecuteS($sql)) + if (!$result = Db::getInstance()->executeS($sql)) return false; $res = true; @@ -181,7 +181,7 @@ XML; AND cs.id_shop = '.$shopID.' ORDER BY cl.id_cms, cl.id_lang ASC'; - $cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($cmss AS $cms) { $tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $this->context->link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang']) : $this->context->link->getCMSLink((int)$cms['id_cms']); @@ -202,7 +202,7 @@ XML; AND nleft >= '.$limits['nleft'].' AND nright <= '.$limits['nright'].' ORDER BY cl.id_category, cl.id_lang ASC'; - $categories = Db::getInstance()->ExecuteS($sql); + $categories = Db::getInstance()->executeS($sql); } else { @@ -211,7 +211,7 @@ XML; WHERE nleft >= '.$limits['nleft'].' AND nright <= '.$limits['nright'].' ORDER BY c.id_category ASC'; - $categories = Db::getInstance()->ExecuteS($sql); + $categories = Db::getInstance()->executeS($sql); } foreach($categories as $category) @@ -241,7 +241,7 @@ XML; AND ps.id_shop = '.$shopID.' '.(Configuration::get('GSITEMAP_ALL_PRODUCTS') ? '' : 'HAVING level_depth IS NOT NULL').' ORDER BY pl.id_product, pl.id_lang ASC'; - $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $tmp = null; $res = null; diff --git a/modules/hipay/hipay.php b/modules/hipay/hipay.php index 6848acdf4..6e43ca6a2 100644 --- a/modules/hipay/hipay.php +++ b/modules/hipay/hipay.php @@ -54,7 +54,7 @@ class Hipay extends PaymentModule ON z.id_zone = c.id_zone WHERE '; - $result = Db::getInstance()->ExecuteS($request.$this->getRequestZones()); + $result = Db::getInstance()->executeS($request.$this->getRequestZones()); foreach ($result as $num => $iso) $this->limited_countries[] = $iso['iso_code']; @@ -82,7 +82,7 @@ class Hipay extends PaymentModule if (!(parent::install() AND $this->registerHook('payment'))) return false; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_zone`, `name` FROM `'._DB_PREFIX_.'zone` WHERE `active` = 1 @@ -93,7 +93,7 @@ class Hipay extends PaymentModule Configuration::deleteByName('HIPAY_AZ_'.$rowValues['id_zone']); Configuration::deleteByName('HIPAY_AZ_ALL_'.$rowValues['id_zone']); } - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); return true; } @@ -107,7 +107,7 @@ class Hipay extends PaymentModule */ private function getRequestZones($searchField='z.id_zone', $defaultZone = 1) { - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_zone`, `name` FROM `'._DB_PREFIX_.'zone` WHERE `active` = 1 @@ -309,7 +309,7 @@ class Hipay extends PaymentModule { parent::uninstall(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_zone`, `name` FROM `'._DB_PREFIX_.'zone` WHERE `active` = 1 @@ -320,14 +320,14 @@ class Hipay extends PaymentModule Configuration::deleteByName('HIPAY_AZ_'.$rowValues['id_zone']); Configuration::deleteByName('HIPAY_AZ_ALL_'.$rowValues['id_zone']); } - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); return (true); } public function getContent() { - $currencies = DB::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT c.iso_code, c.name, c.sign FROM '._DB_PREFIX_.'currency c'); + $currencies = DB::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT c.iso_code, c.name, c.sign FROM '._DB_PREFIX_.'currency c'); if (Tools::isSubmit('submitHipayAZ')) { @@ -340,7 +340,7 @@ class Hipay extends PaymentModule Configuration::updateValue('HIPAY_AZ_'.$id, 'ko'); } } - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_country` WHERE `id_module` = '.(int)$this->id); // Add the new configuration zones foreach ($_POST as $key => $val) @@ -349,9 +349,9 @@ class Hipay extends PaymentModule Configuration::updateValue($key, 'ok'); } $request = 'SELECT id_country FROM '._DB_PREFIX_.'country WHERE '; - $results = Db::getInstance()->ExecuteS($request.$this->getRequestZones('id_zone')); + $results = Db::getInstance()->executeS($request.$this->getRequestZones('id_zone')); foreach ($results as $rowValues) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'module_country VALUE('.(int)$this->id.', '.(int)$rowValues['id_country'].')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'module_country VALUE('.(int)$this->id.', '.(int)$rowValues['id_country'].')'); } elseif (Tools::isSubmit('submitHipay')) @@ -544,7 +544,7 @@ class Hipay extends PaymentModule '; - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_zone`, `name` FROM '._DB_PREFIX_.'zone WHERE `active` = 1 diff --git a/modules/homeslider/HomeSlide.php b/modules/homeslider/HomeSlide.php index 07042f403..532c6dd61 100644 --- a/modules/homeslider/HomeSlide.php +++ b/modules/homeslider/HomeSlide.php @@ -95,7 +95,7 @@ class HomeSlide extends ObjectModel $id_shop = $context->shop->getID(); $res = parent::add($autodate, $nullValues); - $res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + $res &= Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'homeslider` (`id_shop`, `id_slide`) VALUES('.(int)$id_shop.', '.(int)$this->id.')' ); @@ -113,7 +113,7 @@ class HomeSlide extends ObjectModel } $res &= $this->reOrderPositions(); - $res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + $res &= Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'homeslider` WHERE `id_slide` = '.(int)$this->id ); @@ -128,7 +128,7 @@ class HomeSlide extends ObjectModel $context = Context::getContext(); $id_shop = $context->shop->getID(); - $max = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $max = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT MAX(hss.`position`) as position FROM `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider` hs WHERE hss.`id_slide` = hs.`id_slide` AND hs.`id_shop` = '.(int)$id_shop @@ -137,7 +137,7 @@ class HomeSlide extends ObjectModel if ((int)$max == (int)$id_slide) return true; - $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT hss.`position` as position, hss.`id_slide` as id_slide FROM `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider` hs WHERE hss.`id_slide` = hs.`id_slide` AND hs.`id_shop` = '.(int)$id_shop.' AND hss.`position` > '.(int)$this->position diff --git a/modules/homeslider/ajax_homeslider.php b/modules/homeslider/ajax_homeslider.php index d55997b75..5d3470318 100644 --- a/modules/homeslider/ajax_homeslider.php +++ b/modules/homeslider/ajax_homeslider.php @@ -42,7 +42,7 @@ if (Tools::getValue('action') == 'updateSlidesPosition' && Tools::getValue('slid foreach ($slides as $position => $id_slide) { - $res = Db::getInstance()->Execute(' + $res = Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'homeslider_slides` SET `position` = '.(int)($position).' WHERE `id_slide` = '.(int)($id_slide) ); diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index a0a97b962..998c18a88 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -85,7 +85,7 @@ class HomeSlider extends Module protected function createTables() { /* Slides */ - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + $res = Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider` ( `id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_shop` int(10) unsigned NOT NULL, @@ -94,7 +94,7 @@ class HomeSlider extends Module '); /* Slides configuration */ - $res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + $res &= Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider_slides` ( `id_slide` int(10) unsigned NOT NULL AUTO_INCREMENT, `position` int(10) unsigned NOT NULL DEFAULT \'0\', @@ -104,7 +104,7 @@ class HomeSlider extends Module '); /* Slides lang configuration */ - $res &= Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + $res &= Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'homeslider_slides_lang` ( `id_slide` int(10) unsigned NOT NULL, `id_lang` int(10) unsigned NOT NULL, @@ -128,7 +128,7 @@ class HomeSlider extends Module $to_del = new HomeSlide($slide['id_slide']); $to_del->delete(); } - return Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + return Db::getInstance()->execute(' DROP TABLE `'._DB_PREFIX_.'homeslider`, `'._DB_PREFIX_.'homeslider_slides`, `'._DB_PREFIX_.'homeslider_slides_lang`; '); } @@ -629,7 +629,7 @@ class HomeSlider extends Module $idShop = $this->context->shop->getID(); $idLang = $this->context->language->id; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT hs.`id_slide` AS id_slide, hssl.`image` as image, hss.`position` AS position, hss.`active` as active, hssl.`title` as title, hssl.`url` as url, hssl.`legend` as legend FROM `'._DB_PREFIX_.'homeslider` hs, `'._DB_PREFIX_.'homeslider_slides` hss, `'._DB_PREFIX_.'homeslider_slides_lang` hssl WHERE hs.`id_shop` = '.(int)$idShop.((int)$idShop != 0 ? ' OR hs.`id_shop` = 0' : '').' AND hs.`id_slide` = hss.`id_slide` AND hss.`id_slide` = hssl.`id_slide` AND hs.`id_slide` = hssl.`id_slide` diff --git a/modules/importerosc/importerosc.php b/modules/importerosc/importerosc.php index 9487942da..8ee5e51e8 100644 --- a/modules/importerosc/importerosc.php +++ b/modules/importerosc/importerosc.php @@ -61,8 +61,8 @@ class importerosc extends ImportModule public function displaySpecificOptions() { - $langagues = $this->ExecuteS('SELECT * FROM `'.bqSQL($this->prefix).'languages`'); - $curencies = $this->ExecuteS('SELECT * FROM `'.bqSQL($this->prefix).'currencies`'); + $langagues = $this->executeS('SELECT * FROM `'.bqSQL($this->prefix).'languages`'); + $curencies = $this->executeS('SELECT * FROM `'.bqSQL($this->prefix).'currencies`'); $html = '
@@ -115,14 +115,14 @@ class importerosc extends ImportModule public function getLangagues($limit = 0, $nrb_import = 100) { $identifier = 'id_lang'; - $langagues = $this->ExecuteS('SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active FROM `'.bqSQL($this->prefix).'languages` LIMIT '.(int)($limit).' , '.(int)$nrb_import); + $langagues = $this->executeS('SELECT languages_id as id_lang, name as name, code as iso_code, 1 as active FROM `'.bqSQL($this->prefix).'languages` LIMIT '.(int)($limit).' , '.(int)$nrb_import); return $this->autoFormat($langagues, $identifier); } public function getCurrencies($limit = 0, $nrb_import = 100) { $identifier = 'id_currency'; - $currencies = $this->ExecuteS(' + $currencies = $this->executeS(' SELECT currencies_id as id_currency, title as name, code as iso_code, 0 as format, 999 as iso_code_num, 1 as decimals, CONCAT(`symbol_left`, `symbol_right`) as sign, value as conversion_rate FROM `'.bqSQL($this->prefix).'currencies` LIMIT '.(int)($limit).' , '.(int)$nrb_import @@ -133,7 +133,7 @@ class importerosc extends ImportModule public function getZones($limit = 0, $nrb_import = 100) { $identifier = 'id_zone'; - $zones = $this->ExecuteS('SELECT geo_zone_id as id_zone, geo_zone_name as name, 1 as active FROM `'.bqSQL($this->prefix).'geo_zones` LIMIT '.(int)($limit).' , '.(int)$nrb_import); + $zones = $this->executeS('SELECT geo_zone_id as id_zone, geo_zone_name as name, 1 as active FROM `'.bqSQL($this->prefix).'geo_zones` LIMIT '.(int)($limit).' , '.(int)$nrb_import); return $this->autoFormat($zones, $identifier); } @@ -143,7 +143,7 @@ class importerosc extends ImportModule $keyLanguage = 'id_lang'; $identifier = 'id_country'; $defaultIdLang = $this->getDefaultIdLang(); - $countries = $this->ExecuteS(' + $countries = $this->executeS(' SELECT countries_id as id_country, countries_name as name, countries_iso_code_2 as iso_code, `'.bqSQL($defaultIdLang).'Ì€ as id_lang, 1 as id_zone, 0 as id_currency, 1 as contains_states, 1 as need_identification_number, 1 as active, 1 as display_tax_label FROM `'.bqSQL($this->prefix).'countries` as c LIMIT '.(int)($limit).' , '.(int)$nrb_import); @@ -181,7 +181,7 @@ class importerosc extends ImportModule { $genderMatch = array('m' => 1,'f' => 2); $identifier = 'id_customer'; - $customers = $this->ExecuteS(' + $customers = $this->executeS(' SELECT c.`customers_id` as id_customer, 1 as id_default_group, c.`customers_gender` as id_gender, c.`customers_firstname` as firstname, IFNULL( STRCMP(c.`customers_newsletter`, \'\') , 0 ) as newsletter, c.`customers_lastname` as lastname, DATE(c.`customers_dob`) as birthday, c.`customers_email_address` as email, c.`customers_password` as passwd, 1 as active, @@ -203,7 +203,7 @@ class importerosc extends ImportModule public function getAddresses($limit = 0, $nrb_import = 100) { $identifier = 'id_address'; - $addresses = $this->ExecuteS(' + $addresses = $this->executeS(' SELECT address_book_id as id_address, customers_id as id_customer, CONCAT(customers_id, \'_address\') as alias, entry_company as company, entry_firstname as firstname, entry_lastname as lastname, entry_street_address as address1, entry_postcode as postcode, entry_city as city, entry_country_id as id_country, 0 as id_state FROM `'.bqSQL($this->prefix).'address_book` LIMIT '.(int)($limit).' , '.(int)$nrb_import); @@ -216,7 +216,7 @@ class importerosc extends ImportModule $keyLanguage = 'id_lang'; $identifier = 'id_category'; - $categories = $this->ExecuteS(' + $categories = $this->executeS(' SELECT c.categories_id as id_category, c.parent_id as id_parent, 0 as level_depth, cd.language_id as id_lang, cd.categories_name as name , 1 as active, categories_image as images FROM `'.bqSQL($this->prefix).'categories` c LEFT JOIN `'.bqSQL($this->prefix).'categories_description` cd ON (c.categories_id = cd.categories_id) @@ -236,7 +236,7 @@ class importerosc extends ImportModule $multiLangFields = array('name', 'public_name'); $keyLanguage = 'id_lang'; $identifier = 'id_attribute_group'; - $countries = $this->ExecuteS(' + $countries = $this->executeS(' SELECT products_options_id as id_attribute_group, products_options_name as name , products_options_name as public_name, language_id as id_lang, 0 as is_color_group FROM `'.bqSQL($this->prefix).'products_options` LIMIT '.(int)($limit).' , '.(int)$nrb_import); @@ -248,7 +248,7 @@ class importerosc extends ImportModule $multiLangFields = array('name'); $keyLanguage = 'id_lang'; $identifier = 'id_attribute'; - $countries = $this->ExecuteS(' + $countries = $this->executeS(' SELECT p.`products_options_values_id` as id_attribute, p.`products_options_values_name` as name, p.`language_id` as id_lang , po.`products_options_id` as id_attribute_group FROM `'.bqSQL($this->prefix).'products_options_values` p LEFT JOIN `'.bqSQL($this->prefix).'products_options_values_to_products_options` po ON (po.products_options_values_id = p.products_options_values_id) @@ -261,7 +261,7 @@ class importerosc extends ImportModule $multiLangFields = array('name', 'link_rewrite', 'description'); $keyLanguage = 'id_lang'; $identifier = 'id_product'; - $products = $this->ExecuteS(' + $products = $this->executeS(' SELECT p.`products_id` as id_product, p.`products_quantity` as quantity, p.`products_model` as reference, p.`products_price` as price, p.`products_weight` as weight, IFNULL(STRCMP(p.`products_status`, \'\') , 0 ) as active, p.`manufacturers_id` as id_manufacturer, pd.language_id as id_lang, pd.products_name as name, pd.products_description as description, CONCAT(\''.pSQL(Tools::getProtocol()).pSQL(Tools::getValue('shop_url')).'\/images/\',p.`products_image`) as images, @@ -283,7 +283,7 @@ class importerosc extends ImportModule )'); foreach($products as& $product) { - $result = $this->ExecuteS('SELECT `image` FROM `'.bqSQL($this->prefix).'products_images` WHERE products_id = '.(int)$product['id_product']); + $result = $this->executeS('SELECT `image` FROM `'.bqSQL($this->prefix).'products_images` WHERE products_id = '.(int)$product['id_product']); $images = array(); foreach($result as $res) $images[] = Tools::getProtocol().Tools::getValue('shop_url').'/images/'.$res['image']; @@ -297,7 +297,7 @@ class importerosc extends ImportModule public function getProductsCombination($limit = 0, $nrb_import = 100) { $identifier = 'id_product_attribute'; - $combinations = $this->ExecuteS(' + $combinations = $this->executeS(' SELECT products_attributes_id as id_product_attribute, products_id as id_product, options_values_price as price, options_values_id FROM `'.bqSQL($this->prefix).'products_attributes` LIMIT '.(int)($limit).' , '.(int)$nrb_import); foreach($combinations as& $combination) @@ -311,7 +311,7 @@ class importerosc extends ImportModule public function getManufacturers($limit = 0, $nrb_import = 100) { $identifier = 'id_manufacturer'; - $manufacturers = $this->ExecuteS(' + $manufacturers = $this->executeS(' SELECT manufacturers_id as id_manufacturer, manufacturers_name as name, 1 as active, manufacturers_image as images FROM `'.bqSQL($this->prefix).'manufacturers` LIMIT '.(int)($limit).' , '.(int)$nrb_import); foreach($manufacturers as& $manufacturer) @@ -325,7 +325,7 @@ class importerosc extends ImportModule $multiLangFields = array('name'); $keyLanguage = 'id_lang'; $identifier = 'id_order_state'; - $ordersStates = $this->ExecuteS(' + $ordersStates = $this->executeS(' SELECT `orders_status_id` as id_order_state, `language_id` as id_lang, `orders_status_name` as name , 1 as hidden FROM `'.bqSQL($this->prefix).'orders_status` LIMIT '.(int)($limit).' , '.(int)$nrb_import);//IF(`public_flag` = 0, 1, 0) as hidden @@ -335,7 +335,7 @@ class importerosc extends ImportModule public function getOrders($limit = 0, $nrb_import = 100) { $orders = array(); - $addresses = $this->ExecuteS('SELECT customers_id as id_customer, address_book_id as id_address FROM `'.bqSQL($this->prefix).'address_book` GROUP BY customers_id'); + $addresses = $this->executeS('SELECT customers_id as id_customer, address_book_id as id_address FROM `'.bqSQL($this->prefix).'address_book` GROUP BY customers_id'); $matchAddresses = array(); foreach($addresses as $address) $matchAddresses[$address['id_customer']] = $address['id_address']; @@ -348,7 +348,7 @@ class importerosc extends ImportModule unset($psCurrency[$key]); } - $orders = $this->ExecuteS(' + $orders = $this->executeS(' SELECT orders_id as id_cart, '.$psCarrierDefault.' as id_carrier, 1 as id_lang, currency as id_currency, customers_id as id_customer, payment_method as payment, 1 as valid, date_purchased as date_add, last_modified as date_upd FROM `'.bqSQL($this->prefix).'orders` LIMIT '.(int)($limit).' , '.(int)$nrb_import); @@ -365,14 +365,14 @@ class importerosc extends ImportModule $orders[$key]['total_shipping'] = $this->getValue('SELECT value FROM `'.bqSQL($this->prefix).'orders_total` WHERE `orders_id` = '.(int)$order['id_cart'].' AND class=\'ot_shipping\''); $orders[$key]['total_discounts'] = 0; $orders[$key]['total_wrapping'] = 0; - $orders[$key]['cart_products'] = $this->ExecuteS(' + $orders[$key]['cart_products'] = $this->executeS(' SELECT `orders_id` as id_cart, `products_id` as id_product, 0 as id_product_attribute, `products_quantity` as quantity FROM `'.bqSQL($this->prefix).'orders_products` WHERE `orders_id` = '.(int)$order['id_cart']); - $orders[$key]['order_products'] = $this->ExecuteS(' + $orders[$key]['order_products'] = $this->executeS(' SELECT `orders_id` as id_order, `products_id` as product_id, 0 as product_attribute_id, `products_name` as product_name, `products_quantity` as product_quantity, `final_price` as product_price, 0 as product_weight FROM `'.bqSQL($this->prefix).'orders_products` WHERE `orders_id` = '.(int)$order['id_cart']); - $orders[$key]['order_history'] = $this->ExecuteS(' + $orders[$key]['order_history'] = $this->executeS(' SELECT `orders_status_history_id` as id_order_history, 0 as id_employee, `orders_id` as id_order, `orders_status_id` as id_order_state, `date_added` as date_add FROM `'.bqSQL($this->prefix).'orders_status_history` WHERE `orders_id` = '.(int)$order['id_cart']); @@ -411,7 +411,7 @@ class importerosc extends ImportModule if($this->checkPwd($passwd, $result['passwd_'.pSQL($this->name)])) { $ps_passwd = md5(pSQL(_COOKIE_KEY_.$passwd)); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'customer` SET `passwd` = \''.pSQL($ps_passwd).'\', `passwd_'.bqSQL($this->name).'` = \'\' WHERE `'._DB_PREFIX_.'customer`.`id_customer` ='.(int)$result['id_customer'].' LIMIT 1'); diff --git a/modules/loyalty/LoyaltyModule.php b/modules/loyalty/LoyaltyModule.php index 3131d3694..0c67fbb6b 100644 --- a/modules/loyalty/LoyaltyModule.php +++ b/modules/loyalty/LoyaltyModule.php @@ -169,7 +169,7 @@ class LoyaltyModule extends ObjectModel $query .= ' GROUP BY f.id_loyalty '. ($pagination ? 'LIMIT '.(((int)($page) - 1) * (int)($nb)).', '.(int)($nb) : ''); - return Db::getInstance()->ExecuteS($query); + return Db::getInstance()->executeS($query); } public static function getDiscountByIdCustomer($id_customer, $last=false) @@ -185,7 +185,7 @@ class LoyaltyModule extends ObjectModel $query.= ' ORDER BY f.id_loyalty DESC LIMIT 0,1'; $query.= ' GROUP BY f.id_discount'; - return Db::getInstance()->ExecuteS($query); + return Db::getInstance()->executeS($query); } public static function registerDiscount($discount) @@ -211,7 +211,7 @@ class LoyaltyModule extends ObjectModel public static function getOrdersByIdDiscount($id_discount) { - $items = Db::getInstance()->ExecuteS(' + $items = Db::getInstance()->executeS(' SELECT f.id_order AS id_order, f.points AS points, f.date_upd AS date FROM `'._DB_PREFIX_.'loyalty` f WHERE f.id_discount = '.(int)($id_discount).' AND f.id_loyalty_state = '.(int)(LoyaltyStateModule::getConvertId())); @@ -235,7 +235,7 @@ class LoyaltyModule extends ObjectModel /* Register all transaction in a specific history table */ private function historize() { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'loyalty_history` (`id_loyalty`, `id_loyalty_state`, `points`, `date_add`) VALUES ('.(int)($this->id).', '.(int)($this->id_loyalty_state).', '.(int)($this->points).', NOW())'); } diff --git a/modules/loyalty/loyalty.php b/modules/loyalty/loyalty.php index fb5a68cd2..ea502a79c 100644 --- a/modules/loyalty/loyalty.php +++ b/modules/loyalty/loyalty.php @@ -98,7 +98,7 @@ class Loyalty extends Module function installDB() { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'loyalty` ( `id_loyalty` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_loyalty_state` INT UNSIGNED NOT NULL DEFAULT 1, @@ -115,7 +115,7 @@ class Loyalty extends Module INDEX index_loyalty_customer (`id_customer`) ) DEFAULT CHARSET=utf8 ;'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'loyalty_history` ( `id_loyalty_history` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_loyalty` INT UNSIGNED DEFAULT NULL, @@ -127,7 +127,7 @@ class Loyalty extends Module INDEX `index_loyalty_history_loyalty_state` (`id_loyalty_state`) ) DEFAULT CHARSET=utf8 ;'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'loyalty_state` ( `id_loyalty_state` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_order_state` INT UNSIGNED DEFAULT NULL, @@ -135,7 +135,7 @@ class Loyalty extends Module INDEX index_loyalty_state_order_state (`id_order_state`) ) DEFAULT CHARSET=utf8 ;'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'loyalty_state_lang` ( `id_loyalty_state` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_lang` INT UNSIGNED NOT NULL, @@ -157,10 +157,10 @@ class Loyalty extends Module function uninstallDB() { - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'loyalty`;'); - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'loyalty_state`;'); - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'loyalty_state_lang`;'); - Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'loyalty_history`;'); + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'loyalty`;'); + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'loyalty_state`;'); + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'loyalty_state_lang`;'); + Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'loyalty_history`;'); return true; } diff --git a/modules/mailalerts/mailalerts-ajax_add.php b/modules/mailalerts/mailalerts-ajax_add.php index bfcd07c3f..93b99d8bc 100644 --- a/modules/mailalerts/mailalerts-ajax_add.php +++ b/modules/mailalerts/mailalerts-ajax_add.php @@ -42,7 +42,7 @@ if (!Context::getContext()->customer->isLogged()) $id_customer = (int)Db::getInstance()->getValue('SELECT id_customer FROM '._DB_PREFIX_.'customer WHERE email=\''.pSQL($customer_email).'\' AND is_guest=0'); // Check if already in DB - if (Db::getInstance()->ExecuteS(' + if (Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_customer` = '.(int)($id_customer).' @@ -57,7 +57,7 @@ else $customer_email = 0; } -if (Db::getInstance()->Execute(' +if (Db::getInstance()->execute(' REPLACE INTO `'._DB_PREFIX_.'mailalert_customer_oos` (`id_customer`, `customer_email`, `id_product` , `id_product_attribute`) VALUES ('.(int)($id_customer).', \''.pSQL($customer_email).'\', '.(int)($id_product).', '.(int)($id_product_attribute).')')) die ('1'); diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index d8792adf1..fe53c1a1d 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -77,7 +77,7 @@ class MailAlerts extends Module Configuration::updateValue('MA_MERCHANT_MAILS', Configuration::get('PS_SHOP_EMAIL')); Configuration::updateValue('MA_LAST_QTIES', Configuration::get('PS_LAST_QTIES')); - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'mailalert_customer_oos` ( `id_customer` int(10) unsigned NOT NULL, `customer_email` varchar(128) NOT NULL, @@ -100,7 +100,7 @@ class MailAlerts extends Module Configuration::deleteByName('MA_CUSTOMER_QTY'); Configuration::deleteByName('MA_MERCHANT_MAILS'); Configuration::deleteByName('MA_LAST_QTIES'); - if (!Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_.'mailalert_customer_oos')) + if (!Db::getInstance()->execute('DROP TABLE '._DB_PREFIX_.'mailalert_customer_oos')) return false; return parent::uninstall(); } @@ -276,7 +276,7 @@ class MailAlerts extends Module public function customerHasNotification($id_customer, $id_product, $id_product_attribute) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT * FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_customer` = '.(int)($id_customer).' @@ -336,7 +336,7 @@ class MailAlerts extends Module public function sendCustomerAlert($id_product, $id_product_attribute) { - $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT id_customer, customer_email FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_product` = '.(int)$id_product.' AND `id_product_attribute` = '.(int)$id_product_attribute); @@ -498,7 +498,7 @@ class MailAlerts extends Module '.Product::sqlStock('p', 0).' WHERE p.`active` = 1 ma.`id_customer` = '.$id_customer; - $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $products = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); if (empty($products) === true OR !sizeof($products)) return array(); @@ -511,7 +511,7 @@ class MailAlerts extends Module if (isset($products[$i]['id_product_attribute']) AND Validate::isUnsignedInt($products[$i]['id_product_attribute'])) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT al.`name` AS attribute_name FROM `'._DB_PREFIX_.'product_attribute_combination` pac LEFT JOIN `'._DB_PREFIX_.'attribute` a ON (a.`id_attribute` = pac.`id_attribute`) @@ -555,7 +555,7 @@ class MailAlerts extends Module public static function deleteAlert($id_customer, $customer_email, $id_product, $id_product_attribute) { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_customer` = '.(int)($id_customer).' AND `customer_email` = \''.pSQL($customer_email).'\' @@ -565,16 +565,16 @@ class MailAlerts extends Module public function hookDeleteProduct($params) { - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_product` = '.(int)$params['product']->id); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_product` = '.(int)$params['product']->id); } public function hookDeleteProductAttribute($params) { if ($params['deleteAllAttributes']) - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_product` = '.(int)$params['id_product']); else - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'mailalert_customer_oos` WHERE `id_product_attribute` = '.(int)$params['id_product_attribute'].' AND `id_product` = '.(int)$params['id_product']); } diff --git a/modules/mondialrelay/AdminMondialRelay.php b/modules/mondialrelay/AdminMondialRelay.php index 5dfec04d1..c0ecc5196 100755 --- a/modules/mondialrelay/AdminMondialRelay.php +++ b/modules/mondialrelay/AdminMondialRelay.php @@ -146,7 +146,7 @@ class AdminMondialRelay extends AdminTab $mondialrelay = new MondialRelay(); $_html = ''; $query = "SELECT * FROM `" . _DB_PREFIX_ ."mr_historique` ORDER BY `id` DESC ;"; - $query = Db::getInstance()->ExecuteS($query); + $query = Db::getInstance()->executeS($query); $_html.= '
diff --git a/modules/mondialrelay/classes/MRCreateTickets.php b/modules/mondialrelay/classes/MRCreateTickets.php index 4d2e04375..d0aabbd2e 100755 --- a/modules/mondialrelay/classes/MRCreateTickets.php +++ b/modules/mondialrelay/classes/MRCreateTickets.php @@ -410,7 +410,7 @@ class MRCreateTickets implements IMondialRelayWSMethod */ private function _updateTable($params, $expeditionNum, $ticketURL, $trackingURL, $id_mr_selected) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'mr_selected` SET `MR_poids` = \''.pSQL($params['Poids']).'\', `exp_number` = \''.pSQL($expeditionNum).'\', diff --git a/modules/mondialrelay/classes/MRGetTickets.php b/modules/mondialrelay/classes/MRGetTickets.php index 9af3c4121..d92c25cf5 100755 --- a/modules/mondialrelay/classes/MRGetTickets.php +++ b/modules/mondialrelay/classes/MRGetTickets.php @@ -166,7 +166,7 @@ class MRGetTickets implements IMondialRelayWSMethod \''.pSQL((string)$URLA4).'\', \''.pSQL((string)$URLA5).'\')'; } - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); $success['id_mr_history'] = isset($row['id']) ? $row['id'] : Db::getInstance()->Insert_ID(); } diff --git a/modules/mondialrelay/classes/MRManagement.php b/modules/mondialrelay/classes/MRManagement.php index cbdc0b11d..7c44984a6 100755 --- a/modules/mondialrelay/classes/MRManagement.php +++ b/modules/mondialrelay/classes/MRManagement.php @@ -92,7 +92,7 @@ class MRManagement extends MondialRelay $query .= '"'.pSQL($value).'", '; $query = rtrim($query, ', ').')'; } - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); } public function uninstallDetail() @@ -143,7 +143,7 @@ class MRManagement extends MondialRelay $query = trim($query, ', ').')'; $success['deletedListId'] = $this->_params['historyIdList']; - $totalDeleted = Db::getInstance()->Execute($query); + $totalDeleted = Db::getInstance()->execute($query); if (count($success['deletedListId']) != $totalDeleted) { $error[] = $this->l('Some items can\'t be removed, please try to remove it again'); diff --git a/modules/mondialrelay/cron.php b/modules/mondialrelay/cron.php index 0a1228002..d01013b0c 100755 --- a/modules/mondialrelay/cron.php +++ b/modules/mondialrelay/cron.php @@ -31,7 +31,7 @@ include_once('mondialrelay.php'); if (Tools::getValue('secure_key') != Configuration::get('MONDIAL_RELAY_SECURE_KEY')) exit; -$expeditions = Db::getInstance()->ExecuteS(' +$expeditions = Db::getInstance()->executeS(' SELECT ms.`exp_number`, ms.`id_cart`, o.`id_order` FROM `'._DB_PREFIX_.'mr_selected` ms LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_cart` = ms.`id_cart`) diff --git a/modules/mondialrelay/mondialrelay.php b/modules/mondialrelay/mondialrelay.php index ac151b580..7a62601b2 100755 --- a/modules/mondialrelay/mondialrelay.php +++ b/modules/mondialrelay/mondialrelay.php @@ -81,14 +81,14 @@ class MondialRelay extends Module if (!parent::install()) return false; - Db::getInstance()->ExecuteS( + Db::getInstance()->executeS( 'SELECT `name` FROM `' . _DB_PREFIX_ . 'hook` WHERE `name` = \''.$name.'\' AND `title` = \''.$title.'\''); if (!Db::getInstance()->NumRows()) - Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'hook + Db::getInstance()->execute('INSERT INTO ' . _DB_PREFIX_ . 'hook (name, title, description, position) VALUES(\''.$name.'\', \''.$title.'\', NULL, 0)'); @@ -103,7 +103,7 @@ class MondialRelay extends Module $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach($sql AS $k => $query) if (!empty($query)) - Db::getInstance()->Execute(trim($query)); + Db::getInstance()->execute(trim($query)); $result = Db::getInstance()->getRow(' SELECT id_tab @@ -121,7 +121,7 @@ class MondialRelay extends Module $pos = (isset($result['position'])) ? $result['position'] + 1 : 0; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO ' . _DB_PREFIX_ . 'tab (id_parent, class_name, position, module) VALUES(3, "AdminMondialRelay", "'.(int)($pos).'", "mondialrelay")'); @@ -130,14 +130,14 @@ class MondialRelay extends Module $languages = Language::getLanguages(); foreach ($languages as $language) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO ' . _DB_PREFIX_ . 'tab_lang (id_lang, id_tab, name) VALUES("'.(int)($language['id_lang']).'", "'.(int)($id_tab).'", "Mondial Relay")'); $profiles = Profile::getProfiles(Configuration::get('PS_LANG_DEFAULT')); foreach ($profiles as $profile) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO ' . _DB_PREFIX_ . 'access (`id_profile`,`id_tab`,`view`,`add`,`edit`,`delete`) VALUES('.$profile['id_profile'].', '.(int)($id_tab).', 1, 1, 1, 1)'); @@ -162,7 +162,7 @@ class MondialRelay extends Module else { // Reactive transport if database wasn't remove at the last uninstall - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m SET `deleted` = 0 WHERE c.id_carrier = m.id_carrier'); @@ -215,19 +215,19 @@ class MondialRelay extends Module $id_tab = $result['id_tab']; if (isset($id_tab) && !empty($id_tab)) { - Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'tab WHERE id_tab = '.(int)($id_tab)); - Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'tab_lang WHERE id_tab = '.(int)($id_tab)); - Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'access WHERE id_tab = '.(int)($id_tab)); + Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'tab WHERE id_tab = '.(int)($id_tab)); + Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'tab_lang WHERE id_tab = '.(int)($id_tab)); + Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'access WHERE id_tab = '.(int)($id_tab)); } } if (_PS_VERSION_ >= '1.4' && - !Db::getInstance()->Execute(' + !Db::getInstance()->execute(' UPDATE '._DB_PREFIX_ .'carrier SET `active` = 0, `deleted` = 1 WHERE `external_module_name` = "mondialrelay"')) return false; - else if (!Db::getInstance()->Execute(' + else if (!Db::getInstance()->execute(' UPDATE '._DB_PREFIX_ .'carrier SET `active` = 0, `deleted` = 1 WHERE `name` = "mondialrelay"')) @@ -270,13 +270,13 @@ class MondialRelay extends Module return false; // Drop databases - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' DROP TABLE '._DB_PREFIX_ .'mr_historique, '._DB_PREFIX_ .'mr_method, '._DB_PREFIX_ .'mr_selected')) return false; - else if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'carrier SET `active` = 0, `deleted` = 1 WHERE `name` = "mondialrelay"')) + else if (!Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'carrier SET `active` = 0, `deleted` = 1 WHERE `name` = "mondialrelay"')) return false; return true; @@ -313,7 +313,7 @@ class MondialRelay extends Module */ private function _update_v1_4() { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'carrier` SET `shipping_external` = 0, @@ -552,7 +552,7 @@ class MondialRelay extends Module FROM `'._DB_PREFIX_.'mr_method` WHERE `id_carrier` = '.(int)($params['id_carrier'])); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'mr_method` (mr_Name, mr_Pays_list, mr_ModeCol, mr_ModeLiv, mr_ModeAss, id_carrier) VALUES ( @@ -572,7 +572,7 @@ class MondialRelay extends Module { // Query don't use the external_module_name to keep the // 1.3 compatibility - $carriers = Db::getInstance()->ExecuteS(' + $carriers = Db::getInstance()->executeS(' SELECT c.id_carrier, c.range_behavior, @@ -707,7 +707,7 @@ class MondialRelay extends Module public function mrDelete($id) { $id = Db::getInstance()->getValue('SELECT `id_carrier` FROM `'._DB_PREFIX_ .'mr_method` WHERE `id_mr_method` = "'.(int)($id).'"'); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_ .'carrier` SET `active` = 0, `deleted` = 1 WHERE `id_carrier` = "'.(int)($id).'"'); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_ .'carrier` SET `active` = 0, `deleted` = 1 WHERE `id_carrier` = "'.(int)($id).'"'); $this->_html .= '
'.$this->l('Delete successful').'
'; } @@ -728,7 +728,7 @@ class MondialRelay extends Module { $key = explode(',', $Key); $id = Db::getInstance()->getValue('SELECT `id_carrier` FROM `'._DB_PREFIX_ .'mr_method` WHERE `id_mr_method` = "'.(int)($key[0]).'"'); - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'carrier SET active = "'.(int)($value).'" WHERE `id_carrier` = "'.(int)($id).'"'); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'carrier SET active = "'.(int)($value).'" WHERE `id_carrier` = "'.(int)($id).'"'); } } else if ($type == 'addShipping') @@ -753,11 +753,11 @@ class MondialRelay extends Module } $query .= ')'; - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); $mainInsert = Db::getInstance()->Insert_ID(); - $default = Db::getInstance()->ExecuteS("SELECT * FROM " . _DB_PREFIX_ . "configuration WHERE name = 'PS_CARRIER_DEFAULT'"); - $check = Db::getInstance()->ExecuteS("SELECT * FROM " . _DB_PREFIX_ . "carrier"); + $default = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "configuration WHERE name = 'PS_CARRIER_DEFAULT'"); + $check = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "carrier"); $checkD = array(); foreach($check AS $Key) @@ -769,40 +769,40 @@ class MondialRelay extends Module // Added for 1.3 compatibility to match with the right key if (_PS_VERSION_ >= '1.4') - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `' . _DB_PREFIX_ . 'carrier` (`id_tax_rules_group`, `url`, `name`, `active`, `is_module`, `range_behavior`, `shipping_external`, `need_range`, `external_module_name`, `shipping_method`) VALUES("0", NULL, "'.pSQL($array[0]).'", "1", "1", "1", "0", "1", "mondialrelay", "1")'); else - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `' . _DB_PREFIX_ . 'carrier` (`url`, `name`, `active`, `is_module`, `range_behavior`) VALUES(NULL, "'.pSQL('mondialrelay').'", "1", "0", "1")'); $get = Db::getInstance()->getRow('SELECT * FROM `' . _DB_PREFIX_ . 'carrier` WHERE `id_carrier` = "' . Db::getInstance()->Insert_ID() . '"'); - Db::getInstance()->Execute('UPDATE `' . _DB_PREFIX_ . 'mr_method` SET `id_carrier` = "' . (int)($get['id_carrier']) . '" WHERE `id_mr_method` = "' . pSQL($mainInsert) . '"'); + Db::getInstance()->execute('UPDATE `' . _DB_PREFIX_ . 'mr_method` SET `id_carrier` = "' . (int)($get['id_carrier']) . '" WHERE `id_mr_method` = "' . pSQL($mainInsert) . '"'); $weight_coef = Configuration::get('MR_WEIGHT_COEF'); $range_weight = array('24R' => array(0, 20000 / $weight_coef), 'DRI' => array(20000 / $weight_coef, 130000 / $weight_coef), 'LD1' => array(0, 60000 / $weight_coef), 'LDS' => array(30000 / $weight_coef, 130000 / $weight_coef)); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'range_weight` (`id_carrier`, `delimiter1`, `delimiter2`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'range_weight` (`id_carrier`, `delimiter1`, `delimiter2`) VALUES ('.(int)($get['id_carrier']).', '.$range_weight[$array[2]][0].', '.$range_weight[$array[2]][1].')'); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'range_price` (`id_carrier`, `delimiter1`, `delimiter2`) VALUES ('.(int)($get['id_carrier']).', 0.000000, 10000.000000)'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'range_price` (`id_carrier`, `delimiter1`, `delimiter2`) VALUES ('.(int)($get['id_carrier']).', 0.000000, 10000.000000)'); $groups = Group::getGroups(Configuration::get('PS_LANG_DEFAULT')); foreach ($groups as $group) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'carrier_group` (id_carrier, id_group) VALUES('.(int)($get['id_carrier']).', '.(int)($group['id_group']).')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'carrier_group` (id_carrier, id_group) VALUES('.(int)($get['id_carrier']).', '.(int)($group['id_group']).')'); $zones = Zone::getZones(); foreach ($zones as $zone) { - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'carrier_zone` (id_carrier, id_zone) VALUES('.(int)($get['id_carrier']).', '.(int)($zone['id_zone']).')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'carrier_zone` (id_carrier, id_zone) VALUES('.(int)($get['id_carrier']).', '.(int)($zone['id_zone']).')'); $range_price_id = Db::getInstance()->getValue('SELECT id_range_price FROM ' . _DB_PREFIX_ . 'range_price WHERE id_carrier = "'.(int)($get['id_carrier']).'"'); $range_weight_id = Db::getInstance()->getValue('SELECT id_range_weight FROM ' . _DB_PREFIX_ . 'range_weight WHERE id_carrier = "'.(int)($get['id_carrier']).'"'); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', '.(int)($range_price_id).', NULL,'.(int)($zone['id_zone']).', 0.00)'); - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', NULL, '.(int)($range_weight_id).','.(int)($zone['id_zone']).', 0.00)'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', '.(int)($range_price_id).', NULL,'.(int)($zone['id_zone']).', 0.00)'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'delivery` (id_carrier, id_range_price, id_range_weight, id_zone, price) VALUES('.(int)($get['id_carrier']).', NULL, '.(int)($range_weight_id).','.(int)($zone['id_zone']).', 0.00)'); } if(!in_array($default[0]['value'], $checkD)) - $default = Db::getInstance()->ExecuteS("UPDATE " . _DB_PREFIX_ . "configuration SET value = '" . (int)($get['id_carrier']) . "' WHERE name = 'PS_CARRIER_DEFAULT'"); + $default = Db::getInstance()->executeS("UPDATE " . _DB_PREFIX_ . "configuration SET value = '" . (int)($get['id_carrier']) . "' WHERE name = 'PS_CARRIER_DEFAULT'"); } else return false; @@ -813,7 +813,7 @@ class MondialRelay extends Module public function addMethodForm() { - $zones = Db::getInstance()->ExecuteS("SELECT * FROM " . _DB_PREFIX_ . "zone WHERE active = 1"); + $zones = Db::getInstance()->executeS("SELECT * FROM " . _DB_PREFIX_ . "zone WHERE active = 1"); $output = '
@@ -879,7 +879,7 @@ class MondialRelay extends Module public function shippingForm() { - $query = Db::getInstance()->ExecuteS(' + $query = Db::getInstance()->executeS(' SELECT m.* FROM `'._DB_PREFIX_.'mr_method` m JOIN `'._DB_PREFIX_.'carrier` c @@ -1077,7 +1077,7 @@ class MondialRelay extends Module public function displayInfoByCart($id_cart) { $html = '

'; - $simpleresul = Db::getInstance()->ExecuteS(' + $simpleresul = Db::getInstance()->executeS(' SELECT * FROM ' . _DB_PREFIX_ . 'mr_selected WHERE id_cart='.(int)($id_cart)); @@ -1113,7 +1113,7 @@ class MondialRelay extends Module FROM '._DB_PREFIX_ .'mr_selected WHERE id_mr_selected=\''.(int)($shipping_number).'\';'; - $settings = Db::getInstance()->ExecuteS($query); + $settings = Db::getInstance()->executeS($query); return $settings[0]['url_suivi']; } @@ -1123,7 +1123,7 @@ class MondialRelay extends Module if ($key == 'name') $key = 'mr_Name'; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' UPDATE ' . _DB_PREFIX_ . 'mr_method SET '.pSQL($key).'="'.pSQL($value).'" WHERE id_carrier=\''.(int)($id_carrier).'\' ; '); @@ -1231,7 +1231,7 @@ class MondialRelay extends Module $sql .= ' GROUP BY o.`id_order` ORDER BY o.`date_add` ASC'; - return Db::getInstance()->ExecuteS($sql); + return Db::getInstance()->executeS($sql); } public function getErrorCodeDetail($code) diff --git a/modules/newsletter/newsletter.php b/modules/newsletter/newsletter.php index a5aad58a8..7df53a135 100644 --- a/modules/newsletter/newsletter.php +++ b/modules/newsletter/newsletter.php @@ -147,7 +147,7 @@ class Newsletter extends Module AND a.`id_country` = '.(int)Tools::getValue('COUNTRY').') >= 1'); - $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($dbquery->build()); + $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build()); $header = array('id_customer', 'lastname', 'firstname', 'email', 'ip_address', 'newsletter_date_add'); $result = (is_array($rq) ? array_merge(array($header), $rq) : $header); @@ -156,7 +156,7 @@ class Newsletter extends Module private function _getBlockNewsletter() { - $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT `id`, `email`, `newsletter_date_add`, `ip_registration_newsletter` FROM `'._DB_PREFIX_.'newsletter` WHERE `active` = 1'); diff --git a/modules/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php index 7cc5b2707..22d08312a 100644 --- a/modules/pagesnotfound/pagesnotfound.php +++ b/modules/pagesnotfound/pagesnotfound.php @@ -50,7 +50,7 @@ class Pagesnotfound extends Module { if (!parent::install() OR !$this->registerHook('top') OR !$this->registerHook('AdminStatsModules')) return false; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'pagenotfound` ( id_pagenotfound INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, id_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\', @@ -65,7 +65,7 @@ class Pagesnotfound extends Module function uninstall() { - return (parent::uninstall() AND Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'pagenotfound`')); + return (parent::uninstall() AND Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'pagenotfound`')); } private function getPages() @@ -75,7 +75,7 @@ class Pagesnotfound extends Module WHERE date_add BETWEEN '.ModuleGraph::getDateBetween() .$this->sqlShopRestriction(). 'GROUP BY http_referer, request_uri'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $pages = array(); foreach ($result as $row) @@ -96,12 +96,12 @@ class Pagesnotfound extends Module { if (Tools::isSubmit('submitTruncatePNF')) { - Db::getInstance()->Execute('TRUNCATE `'._DB_PREFIX_.'pagenotfound`'); + Db::getInstance()->execute('TRUNCATE `'._DB_PREFIX_.'pagenotfound`'); $this->_html .= '

'.$this->l('Pages not found has been emptied.').'
'; } elseif (Tools::isSubmit('submitDeletePNF')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'pagenotfound` WHERE date_add BETWEEN '.ModuleGraph::getDateBetween()); $this->_html .= '
'.$this->l('Pages not found have been deleted.').'
'; @@ -166,7 +166,7 @@ class Pagesnotfound extends Module { $http_referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''; if (empty($http_referer) OR Validate::isAbsoluteUrl($http_referer)) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'pagenotfound` (`request_uri`, `http_referer`, `date_add`, `id_shop`, `id_group_shop`) VALUES (\''.pSQL($request_uri).'\', \''.pSQL($http_referer).'\', NOW(), '.$this->context->shop->getID().', '.$this->context->shop->getGroupID().')'); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'pagenotfound` (`request_uri`, `http_referer`, `date_add`, `id_shop`, `id_group_shop`) VALUES (\''.pSQL($request_uri).'\', \''.pSQL($http_referer).'\', NOW(), '.$this->context->shop->getID().', '.$this->context->shop->getGroupID().')'); } } } diff --git a/modules/paypal/paypal.php b/modules/paypal/paypal.php index 964cb3732..55786b32f 100644 --- a/modules/paypal/paypal.php +++ b/modules/paypal/paypal.php @@ -102,7 +102,7 @@ class PayPal extends PaymentModule /* Set database */ - if (!Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paypal_order` ( + if (!Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paypal_order` ( `id_order` int(10) unsigned NOT NULL, `id_transaction` varchar(255) NOT NULL, `payment_method` int(10) unsigned NOT NULL, @@ -651,7 +651,7 @@ class PayPal extends PaymentModule FROM `'._DB_PREFIX_.'orders` WHERE `id_cart` = '.(int)$cart->id); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'paypal_order` (`id_order`, `id_transaction`, `payment_method`, `payment_status`, `capture`) VALUES ('.(int)$id_order.', \''.pSQL($extraVars['transaction_id']).'\', '.(int)Configuration::get('PAYPAL_PAYMENT_METHOD').', \''.pSQL($extraVars['payment_status']).((isset($extraVars['pending_reason']) AND $extraVars['pending_reason'] == 'authorization') ? '_authorization' : '').'\', '.(int)(Configuration::get('PAYPAL_CAPTURE')).')'); } @@ -1052,7 +1052,7 @@ class PayPal extends PaymentModule if (array_key_exists('ACK', $response) AND $response['ACK'] == 'Success' AND $response['REFUNDTRANSACTIONID'] != '') { $message .= $this->l('PayPal refund successful!'); - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `payment_status` = \'Refunded\' WHERE `id_order` = '.(int)($id_order))) + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `payment_status` = \'Refunded\' WHERE `id_order` = '.(int)($id_order))) die(Tools::displayError('Error when updating PayPal database')); $history = new OrderHistory(); $history->id_order = (int)($id_order); @@ -1097,7 +1097,7 @@ class PayPal extends PaymentModule } elseif (isset($response['PAYMENTSTATUS'])) $message .= $this->l('Transaction error!'); - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `capture` = 0, `payment_status` = \''.pSQL($response['PAYMENTSTATUS']).'\', `id_transaction` = \''.pSQL($response['TRANSACTIONID']).'\' WHERE `id_order` = '.(int)$id_order)) + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `capture` = 0, `payment_status` = \''.pSQL($response['PAYMENTSTATUS']).'\', `id_transaction` = \''.pSQL($response['TRANSACTIONID']).'\' WHERE `id_order` = '.(int)$id_order)) die(Tools::displayError('Error when updating PayPal database')); $this->_addNewPrivateMessage((int)($id_order), $message); @@ -1147,7 +1147,7 @@ class PayPal extends PaymentModule $history->changeIdOrderState(Configuration::get('PS_OS_ERROR'), (int)($id_order)); $history->addWithemail(); } - if (!Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `payment_status` = \''.pSQL($response['PAYMENTSTATUS']).($response['PENDINGREASON'] == 'authorization' ? '_authorization' : '').'\' WHERE `id_order` = '.(int)$id_order)) + if (!Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'paypal_order` SET `payment_status` = \''.pSQL($response['PAYMENTSTATUS']).($response['PENDINGREASON'] == 'authorization' ? '_authorization' : '').'\' WHERE `id_order` = '.(int)$id_order)) die(Tools::displayError('Error when updating PayPal database')); } } @@ -1191,14 +1191,14 @@ class PayPal extends PaymentModule } } /* Create Table */ - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'paypal_order` ( `id_order` int(10) unsigned NOT NULL auto_increment, `id_transaction` varchar(255) NOT NULL, PRIMARY KEY (`id_order`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8')) $ok = false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' ALTER TABLE `'._DB_PREFIX_.'paypal_order` ADD `payment_method` INT NOT NULL, ADD `payment_status` VARCHAR(255) NOT NULL, ADD `capture` INT NOT NULL')) diff --git a/modules/paysafecard/Disposition.php b/modules/paysafecard/Disposition.php index 1503984cd..7e9d199a0 100644 --- a/modules/paysafecard/Disposition.php +++ b/modules/paysafecard/Disposition.php @@ -31,19 +31,19 @@ class PSCDisposition public static function create($id_cart, $mtid, $amount, $currency) { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'INSERT INTO `'._DB_PREFIX_.self::TABLE_NAME.'` (`id_cart`, `mtid`, `amount`, `currency`) VALUES ('.(int)($id_cart).',\''.pSQL($mtid).'\','.(float)($amount).',\''.pSQL($currency).'\')'); } public static function delete($id) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_disposition` = '.(int)($id)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_disposition` = '.(int)($id)); } public static function deleteByCartId($id_cart) { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_cart` = '.(int)($id_cart)); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_cart` = '.(int)($id_cart)); } public static function getByCartId($id_cart) @@ -53,7 +53,7 @@ class PSCDisposition public static function createTable() { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'` ( `id_disposition` int(11) NOT NULL AUTO_INCREMENT, `id_cart` int(11) NOT NULL, @@ -67,12 +67,12 @@ class PSCDisposition public static function dropTable() { - return Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); } public static function updateAmount($id_disposition, $amount) { - return Db::getInstance()->Execute( + return Db::getInstance()->execute( 'UPDATE `'._DB_PREFIX_.self::TABLE_NAME.'` SET `amount` = `amount` - '.(float)($amount).' WHERE `id_disposition` = '.(int)($id_disposition)); } diff --git a/modules/paysafecard/PrepaidServices.php b/modules/paysafecard/PrepaidServices.php index 6d4e2162d..a000a6e2e 100644 --- a/modules/paysafecard/PrepaidServices.php +++ b/modules/paysafecard/PrepaidServices.php @@ -149,7 +149,7 @@ abstract class PSCPrepaidServices extends PaymentModule private function _getAllowedCurrencies() { if (empty($this->allowed_currencies)) - $this->allowed_currencies = DB::getInstance()->ExecuteS( + $this->allowed_currencies = DB::getInstance()->executeS( 'SELECT c.id_currency, c.iso_code, c.name, c.sign FROM '._DB_PREFIX_.'currency c WHERE c.deleted = 0 diff --git a/modules/prestafraud/prestafraud.php b/modules/prestafraud/prestafraud.php index a5f0bd955..dadaa8d45 100644 --- a/modules/prestafraud/prestafraud.php +++ b/modules/prestafraud/prestafraud.php @@ -98,7 +98,7 @@ class PrestaFraud extends Module $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach ($sql as $query) - if ($query AND sizeof($query) AND !Db::getInstance()->Execute(trim($query))) + if ($query AND sizeof($query) AND !Db::getInstance()->execute(trim($query))) return false; return true; } @@ -410,7 +410,7 @@ class PrestaFraud extends Module $carrier_infos->addChild('type', $carriers_type[$carrier->id]); if ($this->_pushDatas($root->asXml()) !== false) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'prestafraud_orders (id_order) VALUES('.(int)$params['order']->id.')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'prestafraud_orders (id_order) VALUES('.(int)$params['order']->id.')'); return true; } @@ -425,12 +425,12 @@ class PrestaFraud extends Module FROM '._DB_PREFIX_.'prestafraud_carts WHERE id_cart='.(int)($params['cart']->id)); if ($res) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'prestafraud_carts` SET `ip_address` = '.ip2long($_SERVER['REMOTE_ADDR']).', `date` = \''.pSQL(date('Y-m-d H:i:s')).'\' WHERE `id_cart` = '.(int)($params['cart']->id).' LIMIT 1'); else - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'prestafraud_carts` (`id_cart`, `ip_address`, `date`) VALUES ('.(int)($params['cart']->id).', '.ip2long($_SERVER['REMOTE_ADDR']).',\''.date('Y-m-d H:i:s').'\')'); return true; @@ -453,7 +453,7 @@ class PrestaFraud extends Module FROM '._DB_PREFIX_.'orders WHERE valid=0 AND id_order!='.(int)$order->id.' AND id_customer = '.(int)$order->id_customer); - $ip_addresses = Db::getInstance()->ExecuteS(' + $ip_addresses = Db::getInstance()->executeS(' SELECT c.ip_address FROM '._DB_PREFIX_.'guest g LEFT JOIN '._DB_PREFIX_.'connections c ON (c.id_guest = g.id_guest) @@ -513,7 +513,7 @@ class PrestaFraud extends Module return false; $xml = simplexml_load_string($result); if ((int)$xml->check_scoring->status != -1) - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'prestafraud_orders SET scoring = '.(float)$xml->check_scoring->scoring.', comment = \''.pSQL($xml->check_scoring->comment).'\' WHERE id_order='.(int)$id_order); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'prestafraud_orders SET scoring = '.(float)$xml->check_scoring->scoring.', comment = \''.pSQL($xml->check_scoring->comment).'\' WHERE id_order='.(int)$id_order); $scoring = array('scoring' => (float)$xml->check_scoring->scoring, 'comment' => (string)$xml->check_scoring->comment); } return $scoring; @@ -530,7 +530,7 @@ class PrestaFraud extends Module private function _getConfiguredCarriers() { - $res = Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'prestafraud_carrier'); + $res = Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'prestafraud_carrier'); $carriers = array(); foreach ($res AS $row) $carriers[$row['id_carrier']] = $row['id_prestafraud_carrier_type']; @@ -540,7 +540,7 @@ class PrestaFraud extends Module private function _getConfiguredPayments() { - $res = Db::getInstance()->ExecuteS('SELECT * FROM '._DB_PREFIX_.'prestafraud_payment'); + $res = Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'prestafraud_payment'); $payments = array(); foreach ($res AS $row) $payments[$row['id_module']] = $row['id_prestafraud_payment_type']; @@ -550,21 +550,21 @@ class PrestaFraud extends Module private function _setCarriersConfiguration($carriers) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'prestafraud_carrier'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'prestafraud_carrier'); foreach ($carriers AS $id_carrier => $id_carrier_type) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'prestafraud_carrier (id_carrier, id_prestafraud_carrier_type) VALUES ('.(int)$id_carrier.', '.(int)$id_carrier_type.')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'prestafraud_carrier (id_carrier, id_prestafraud_carrier_type) VALUES ('.(int)$id_carrier.', '.(int)$id_carrier_type.')'); } private function _setPaymentsConfiguration($payments) { - Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'prestafraud_payment'); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'prestafraud_payment'); foreach ($payments AS $id_module => $id_payment_type) - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'prestafraud_payment (id_module, id_prestafraud_payment_type) VALUES ('.(int)$id_module.', '.(int)$id_payment_type.')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'prestafraud_payment (id_module, id_prestafraud_payment_type) VALUES ('.(int)$id_module.', '.(int)$id_payment_type.')'); } private function _updateConfiguredCarrier($old, $new) { - return Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'prestafraud_carrier SET id_carrier='.(int)$new.' WHERE id_carrier='.(int)$old); + return Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'prestafraud_carrier SET id_carrier='.(int)$new.' WHERE id_carrier='.(int)$old); } private function _pushDatas($datas) diff --git a/modules/productcomments/ProductComment.php b/modules/productcomments/ProductComment.php index f6c65b4dd..c457af5dc 100644 --- a/modules/productcomments/ProductComment.php +++ b/modules/productcomments/ProductComment.php @@ -108,7 +108,7 @@ class ProductComment extends ObjectModel if ($n != null && $n <= 0) $n = 5; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT pc.`id_product_comment`, (SELECT count(*) FROM `'._DB_PREFIX_.'product_comment_usefulness` pcu WHERE pcu.`id_product_comment` = pc.`id_product_comment` AND pcu.`usefulness` = 1) as total_useful, (SELECT count(*) FROM `'._DB_PREFIX_.'product_comment_usefulness` pcu WHERE pcu.`id_product_comment` = pc.`id_product_comment`) as total_advice, '. @@ -129,7 +129,7 @@ class ProductComment extends ObjectModel */ public static function getByCustomer($id_product, $id_customer, $last = false, $id_guest = false) { - $results = Db::getInstance()->ExecuteS(' + $results = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'product_comment` pc WHERE pc.`id_product` = '.(int)$id_product.' @@ -159,7 +159,7 @@ class ProductComment extends ObjectModel $validate = Configuration::get('PRODUCT_COMMENTS_MODERATE'); - return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT pc.`id_product_comment`, pcg.`grade`, pccl.`name`, pcc.`id_product_comment_criterion` FROM `'._DB_PREFIX_.'product_comment` pc LEFT JOIN `'._DB_PREFIX_.'product_comment_grade` pcg ON (pcg.`id_product_comment` = pc.`id_product_comment`) @@ -250,7 +250,7 @@ class ProductComment extends ObjectModel */ public static function getByValidate($validate = '0', $deleted = false) { - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT pc.`id_product_comment`, pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name` FROM `'._DB_PREFIX_.'product_comment` pc LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = pc.`id_customer`) @@ -266,7 +266,7 @@ class ProductComment extends ObjectModel */ public static function getAll() { - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT pc.`id_product_comment`, pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name` FROM `'._DB_PREFIX_.'product_comment` pc LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = pc.`id_customer`) @@ -283,7 +283,7 @@ class ProductComment extends ObjectModel { if (!Validate::isUnsignedId($this->id)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product_comment` SET `validate` = '.(int)$validate.' WHERE `id_product_comment` = '.(int)$this->id)); @@ -298,7 +298,7 @@ class ProductComment extends ObjectModel { if (!Validate::isUnsignedId($id_product_comment)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_grade` WHERE `id_product_comment` = '.(int)$id_product_comment)); } @@ -312,7 +312,7 @@ class ProductComment extends ObjectModel { if (!Validate::isUnsignedId($id_product_comment)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_report` WHERE `id_product_comment` = '.(int)$id_product_comment)); } @@ -327,7 +327,7 @@ class ProductComment extends ObjectModel if (!Validate::isUnsignedId($id_product_comment)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_usefulness` WHERE `id_product_comment` = '.(int)$id_product_comment)); } @@ -339,7 +339,7 @@ class ProductComment extends ObjectModel */ public static function reportComment($id_product_comment, $id_customer) { - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_report` (`id_product_comment`, `id_customer`) VALUES ('.(int)$id_product_comment.', '.(int)$id_customer.')')); } @@ -365,7 +365,7 @@ class ProductComment extends ObjectModel */ public static function setCommentUsefulness($id_product_comment, $usefulness, $id_customer) { - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_usefulness` (`id_product_comment`, `usefulness`, `id_customer`) VALUES ('.(int)$id_product_comment.', '.(int)$usefulness.', '.(int)$id_customer.')')); } @@ -391,7 +391,7 @@ class ProductComment extends ObjectModel */ public static function getReportedComments() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT DISTINCT(pc.`id_product_comment`), pc.`id_product`, IF(c.id_customer, CONCAT(c.`firstname`, \' \', c.`lastname`), pc.customer_name) customer_name, pc.`content`, pc.`grade`, pc.`date_add`, pl.`name` FROM `'._DB_PREFIX_.'product_comment_report` pcr LEFT JOIN `'._DB_PREFIX_.'product_comment` pc diff --git a/modules/productcomments/ProductCommentCriterion.php b/modules/productcomments/ProductCommentCriterion.php index 387824c55..18f5b5b79 100644 --- a/modules/productcomments/ProductCommentCriterion.php +++ b/modules/productcomments/ProductCommentCriterion.php @@ -57,15 +57,15 @@ class ProductCommentCriterion extends ObjectModel if (!parent::delete()) return false; if ($this->id_product_comment_criterion_type == 2) - if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category + if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category WHERE id_product_comment_criterion='.(int)$this->id)) return false; elseif ($this->id_product_comment_criterion_type == 3) - if (!Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product + if (!Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product WHERE id_product_comment_criterion='.(int)$this->id)) return false; - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_grade` + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_grade` WHERE `id_product_comment_criterion` = '.(int)$this->id); } @@ -77,10 +77,10 @@ class ProductCommentCriterion extends ObjectModel if ($previousUpdate->id_product_comment_criterion_type != $this->id_product_comment_criterion_type) { if ($previousUpdate->id_product_comment_criterion_type == 2) - return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category + return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_category WHERE id_product_comment_criterion='.(int)$previousUpdate->id); elseif ($previousUpdate->id_product_comment_criterion_type == 3) - return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product + return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'product_comment_criterion_product WHERE id_product_comment_criterion='.(int)$previousUpdate->id); } return true; @@ -95,7 +95,7 @@ class ProductCommentCriterion extends ObjectModel { if (!Validate::isUnsignedId($id_product)) die(Tools::displayError()); - return (Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product` (`id_product_comment_criterion`, `id_product`) + return (Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product` (`id_product_comment_criterion`, `id_product`) VALUES('.(int)$this->id.','.(int)$id_product.')')); } @@ -108,7 +108,7 @@ class ProductCommentCriterion extends ObjectModel { if (!Validate::isUnsignedId($id_category)) die(Tools::displayError()); - return (Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_category` (`id_product_comment_criterion`, `id_category`) + return (Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_category` (`id_product_comment_criterion`, `id_category`) VALUES('.(int)$this->id.','.(int)$id_category.')')); } @@ -125,7 +125,7 @@ class ProductCommentCriterion extends ObjectModel $grade = 0; else if ($grade > 10) $grade = 10; - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_grade` (`id_product_comment`, `id_product_comment_criterion`, `grade`) VALUES( '.(int)($id_product_comment).', @@ -143,7 +143,7 @@ class ProductCommentCriterion extends ObjectModel if (!Validate::isUnsignedId($id_product) || !Validate::isUnsignedId($id_lang)) die(Tools::displayError()); - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT pcc.`id_product_comment_criterion`, pccl.`name` FROM `'._DB_PREFIX_.'product_comment_criterion` pcc LEFT JOIN `'._DB_PREFIX_.'product_comment_criterion_lang` pccl ON (pcc.id_product_comment_criterion = pccl.id_product_comment_criterion) @@ -163,7 +163,7 @@ class ProductCommentCriterion extends ObjectModel { if (!Validate::isUnsignedId($id_lang)) die(Tools::displayError()); - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT pcc.`id_product_comment_criterion`, pcc.id_product_comment_criterion_type, pccl.`name`, pcc.active FROM `'._DB_PREFIX_.'product_comment_criterion` pcc JOIN `'._DB_PREFIX_.'product_comment_criterion_lang` pccl ON (pcc.id_product_comment_criterion = pccl.id_product_comment_criterion) @@ -173,7 +173,7 @@ class ProductCommentCriterion extends ObjectModel public function getProducts() { - $res = Db::getInstance()->ExecuteS(' + $res = Db::getInstance()->executeS(' SELECT pccp.id_product, pccp.id_product_comment_criterion FROM `'._DB_PREFIX_.'product_comment_criterion_product` pccp WHERE pccp.id_product_comment_criterion = '.(int)$this->id); @@ -186,7 +186,7 @@ class ProductCommentCriterion extends ObjectModel public function getCategories() { - $res = Db::getInstance()->ExecuteS(' + $res = Db::getInstance()->executeS(' SELECT pccc.id_category, pccc.id_product_comment_criterion FROM `'._DB_PREFIX_.'product_comment_criterion_category` pccc WHERE pccc.id_product_comment_criterion = '.(int)$this->id); @@ -199,12 +199,12 @@ class ProductCommentCriterion extends ObjectModel public function deleteCategories() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_category` WHERE `id_product_comment_criterion` = '.(int)$this->id); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_category` WHERE `id_product_comment_criterion` = '.(int)$this->id); } public function deleteProducts() { - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product_comment_criterion` = '.(int)$this->id); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product_comment_criterion` = '.(int)$this->id); } public static function getTypes() diff --git a/modules/productcomments/ProductCriterion.php b/modules/productcomments/ProductCriterion.php index 58d72b14e..a164e4515 100644 --- a/modules/productcomments/ProductCriterion.php +++ b/modules/productcomments/ProductCriterion.php @@ -37,7 +37,7 @@ class ProductCommentCriterion if (!Validate::isUnsignedId($id_lang) || !Validate::isMessage($name)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_criterion` (`id_lang`, `name`) VALUES( '.(int)($id_lang).', @@ -54,7 +54,7 @@ class ProductCommentCriterion if (!Validate::isUnsignedId($id_product_comment_criterion) || !Validate::isUnsignedId($id_product)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_criterion_product` (`id_product_comment_criterion`, `id_product`) VALUES( '.(int)($id_product_comment_criterion).', @@ -75,7 +75,7 @@ class ProductCommentCriterion $grade = 0; else if ($grade > 10) $grade = 10; - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'product_comment_grade` (`id_product_comment`, `id_product_comment_criterion`, `grade`) VALUES( '.(int)($id_product_comment).', @@ -94,7 +94,7 @@ class ProductCommentCriterion !Validate::isUnsignedId($id_lang) || !Validate::isMessage($name)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'product_comment_criterion` SET `name` = \''.pSQL($name).'\' WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion).' AND @@ -111,7 +111,7 @@ class ProductCommentCriterion if (!Validate::isUnsignedId($id_product) || !Validate::isUnsignedId($id_lang)) die(Tools::displayError()); - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT pcc.`id_product_comment_criterion`, pcc.`name` FROM `'._DB_PREFIX_.'product_comment_criterion` pcc INNER JOIN `'._DB_PREFIX_.'product_comment_criterion_product` pccp ON pcc.`id_product_comment_criterion` = pccp.`id_product_comment_criterion` @@ -128,7 +128,7 @@ class ProductCommentCriterion { if (!Validate::isUnsignedId($id_lang)) die(Tools::displayError()); - return (Db::getInstance()->ExecuteS(' + return (Db::getInstance()->executeS(' SELECT pcc.`id_product_comment_criterion`, pcc.`name` FROM `'._DB_PREFIX_.'product_comment_criterion` pcc WHERE pcc.`id_lang` = '.(int)($id_lang).' @@ -144,7 +144,7 @@ class ProductCommentCriterion { if (!Validate::isUnsignedId($id_product)) die(Tools::displayError()); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product` = '.(int)($id_product))); } @@ -158,17 +158,17 @@ class ProductCommentCriterion { if (!Validate::isUnsignedId($id_product_comment_criterion)) die(Tools::displayError()); - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_grade` WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion)); if ($result === false) return ($result); - $result = Db::getInstance()->Execute(' + $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_criterion_product` WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion)); if ($result === false) return ($result); - return (Db::getInstance()->Execute(' + return (Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'product_comment_criterion` WHERE `id_product_comment_criterion` = '.(int)($id_product_comment_criterion))); } diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php index 18a310459..26d2842bd 100644 --- a/modules/productcomments/productcomments.php +++ b/modules/productcomments/productcomments.php @@ -63,7 +63,7 @@ class ProductComments extends Module $sql = preg_split("/;\s*[\r\n]+/", trim($sql)); foreach ($sql as $query) - if (!Db::getInstance()->Execute(trim($query))) + if (!Db::getInstance()->execute(trim($query))) return false; if (parent::install() == false || !$this->registerHook('productTab') || @@ -95,7 +95,7 @@ class ProductComments extends Module public function deleteTables() { - return Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute(' + return Db::getInstance()->execute(' DROP TABLE IF EXISTS `'._DB_PREFIX_.'product_comment`, `'._DB_PREFIX_.'product_comment_criterion`, diff --git a/modules/referralprogram/ReferralProgramModule.php b/modules/referralprogram/ReferralProgramModule.php index 2c26ff4f7..5af0bca66 100644 --- a/modules/referralprogram/ReferralProgramModule.php +++ b/modules/referralprogram/ReferralProgramModule.php @@ -143,7 +143,7 @@ class ReferralProgramModule extends ObjectModel $query.= ' AND s.`id_customer` != 0'; } - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($query); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); } /** diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php index 65672b99e..4dbe2f99d 100644 --- a/modules/referralprogram/referralprogram.php +++ b/modules/referralprogram/referralprogram.php @@ -84,7 +84,7 @@ class ReferralProgram extends Module public function installDB() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'referralprogram` ( `id_referralprogram` INT UNSIGNED NOT NULL AUTO_INCREMENT, `id_sponsor` INT UNSIGNED NOT NULL, @@ -116,7 +116,7 @@ class ReferralProgram extends Module public function uninstallDB() { - return Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'referralprogram`;'); + return Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'referralprogram`;'); } public function removeMail() diff --git a/modules/reverso/reverso.php b/modules/reverso/reverso.php index 8133a476e..392f5c872 100644 --- a/modules/reverso/reverso.php +++ b/modules/reverso/reverso.php @@ -57,7 +57,7 @@ class Reverso extends Module WHERE `name` = \'createAccountTop\' '); if (!$result) - if(!Db::getInstance()->Execute(' + if(!Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'createAccountTop\', \'Block above the form for create an account\', NULL , \'1\'); ')) diff --git a/modules/secuvad/classes/Secuvad_connection.php b/modules/secuvad/classes/Secuvad_connection.php index e38f7aa17..50a660dfb 100644 --- a/modules/secuvad/classes/Secuvad_connection.php +++ b/modules/secuvad/classes/Secuvad_connection.php @@ -96,7 +96,7 @@ class Secuvad_connection $this->secuvad_h->secuvad_log('secuvad_connection.php::report_fraud() '."\n\t".' Fraud: '.(int)($idtransaction).'/'.$feedback); elseif ($balise == 'impaye_report') $this->secuvad_h->secuvad_log('secuvad_connection.php::report_fraud() '."\n\t".' Unpaid: '.(int)($idtransaction).'/'.$feedback); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `is_fraud` = 1 WHERE `id_secuvad_order` = '.(int)($idtransaction)); @@ -131,7 +131,7 @@ class Secuvad_connection if (!empty($erreur)) { $this->secuvad_h->secuvad_log('secuvad_connection.php::send_transaction() '."\n\t".' Error: '.$erreur); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `secuvad_status` = 4, `error` = \''.pSQL($erreur).'\' WHERE `id_secuvad_order` = '.(int)($idtransaction)); @@ -140,7 +140,7 @@ class Secuvad_connection { $this->secuvad_h->secuvad_log('secuvad_connection.php::send_transaction() '."\n\t".' Response: '.(int)($idtransaction).'/'.(int)($score).'/'.$advice); if(preg_match('/[0-9]+/', $score)) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `secuvad_status` = 5, `score` = '.(int)($score).', error = \'\' WHERE `id_secuvad_order` = '.(int)($idtransaction)); @@ -158,7 +158,7 @@ class Secuvad_connection $secuvad_status = 2; else $secuvad_status = 4; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `advice` = \''.pSQL($advice).'\', `error` = \'\', `secuvad_status` = '.(int)($secuvad_status).' WHERE `id_secuvad_order` = '.(int)($idtransaction)); diff --git a/modules/secuvad/secuvad.php b/modules/secuvad/secuvad.php index 8dc50d123..6e8fed14e 100644 --- a/modules/secuvad/secuvad.php +++ b/modules/secuvad/secuvad.php @@ -85,7 +85,7 @@ class Secuvad extends Module $sql = preg_split("/;\s*[\r\n]+/", $sql); foreach ($sql as $query) - if ($query AND sizeof($query) AND !Db::getInstance()->Execute(trim($query))) + if ($query AND sizeof($query) AND !Db::getInstance()->execute(trim($query))) return false; $langs = Language::getLanguages(); @@ -130,7 +130,7 @@ class Secuvad extends Module (14,\'Services\',14,'.(int)($lang['id_lang']).'),'; } $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); $query = ' INSERT IGNORE INTO '._DB_PREFIX_.'secuvad_payment(`code`, `name`, `id_lang`) @@ -157,7 +157,7 @@ class Secuvad extends Module (\'contre-remboursement\',\'On delivery\','.(int)($lang['id_lang']).'),'; } $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); $query = ' INSERT IGNORE INTO '._DB_PREFIX_.'secuvad_transport(`transport_id`, `transport_name`, `id_lang`) @@ -184,7 +184,7 @@ class Secuvad extends Module (6,\'Immaterial Good/Service\','.(int)($lang['id_lang']).'),'; } $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); $query = ' INSERT IGNORE INTO `'._DB_PREFIX_.'secuvad_transport_delay`(`transport_delay_id`, `transport_delay_name`, `id_lang`) @@ -194,12 +194,12 @@ class Secuvad extends Module (1,\'express\','.(int)($lang['id_lang']).'), (2,\'standard\','.(int)($lang['id_lang']).'),'; $query = rtrim($query, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); if (!file_exists(dirname(__FILE__).'/../../classes/PaymentCC.php')) { @copy(dirname(__FILE__).'/classes/PaymentCC.php', dirname(__FILE__).'/../../classes/PaymentCC.php'); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook`(`name`, `title`, `position`) VALUES (\'paymentCCAdded\', \'paymentCCAdded\', 0)'); $this->registerHook('paymentCCAdded'); @@ -231,15 +231,15 @@ class Secuvad extends Module || !Configuration::deleteByName('SECUVAD_XML_ENCODING')) return false; - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_category`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_payment`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_transport`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_category`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_logs`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_order`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_payment`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_transport`'); - Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_transport_delay`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_category`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_payment`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_assoc_transport`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_category`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_logs`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_order`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_payment`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_transport`'); + Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.'secuvad_transport_delay`'); return true; } @@ -296,7 +296,7 @@ class Secuvad extends Module WHERE `id_secuvad_order` = '.(int)($id_order)); if (!$exists) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_order`(`id_secuvad_order`, `ip`, `ip_time`) VALUES ('.(int)($id_order).', \''.pSQL($this->getRemoteIPaddress()).'\', \''.pSQL(date("Y-m-d H:i:s")).'\') '); @@ -328,7 +328,7 @@ class Secuvad extends Module WHERE `id_secuvad_order` = '.(int)($id_order)); if (!$exists) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_order`(`id_secuvad_order`, `ip`, `ip_time`) VALUES ('.(int)($id_order).', \''.pSQL($this->getRemoteIPaddress()).'\', \''.pSQL(date("Y-m-d H:i:s")).'\') '); @@ -391,7 +391,7 @@ class Secuvad extends Module private function _getSecuvadCategories() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_category` sc WHERE sc.`id_lang` = '.(int)$this->context->language->id); @@ -399,7 +399,7 @@ class Secuvad extends Module private function _getSecuvadCategoryAssoc() { - $data = Db::getInstance()->ExecuteS(' + $data = Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_assoc_category`'); @@ -414,7 +414,7 @@ class Secuvad extends Module private function _getSecuvadPayment() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT IF(sp.name IS NULL, "Unknown", sp.name) AS `secuvad_name`, sp.`code`, m.`id_module`, m.`name` AS `module_name` FROM `'._DB_PREFIX_.'secuvad_assoc_payment` sac JOIN `'._DB_PREFIX_.'module` m ON (m.`id_module` = sac.`id_module`) @@ -423,7 +423,7 @@ class Secuvad extends Module private function _getSecuvadCodePayment() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_payment` WHERE `id_lang` = '.(int)$this->context->language->id @@ -432,7 +432,7 @@ class Secuvad extends Module private function _getSecuvadCarrier() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_assoc_transport` sat JOIN '._DB_PREFIX_.'carrier c ON (c.id_carrier = sat.id_carrier) @@ -443,7 +443,7 @@ class Secuvad extends Module private function _getSecuvadCarrierType() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_transport` WHERE `id_lang` = '.(int)$this->context->language->id @@ -452,7 +452,7 @@ class Secuvad extends Module private function _getSecuvadCarrierDelay() { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT * FROM `'._DB_PREFIX_.'secuvad_transport_delay` WHERE `id_lang` = '.(int)$this->context->language->id @@ -543,7 +543,7 @@ class Secuvad extends Module if (Tools::isSubmit('submitSecuvadCategory')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_category` '); $sql = 'INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_category` VALUES'; @@ -554,7 +554,7 @@ class Secuvad extends Module $sql .= '(NULL, '.(int)($id_category).', '.(int)($category_id).'),'; } $sql = rtrim($sql, ','); - if (Db::getInstance()->Execute($sql)) + if (Db::getInstance()->execute($sql)) $this->_html .= $this->displayConfirmation($this->l('Settings are updated')); else $this->_html .= $this->displayError($this->l('Error during update')); @@ -562,7 +562,7 @@ class Secuvad extends Module if (Tools::isSubmit('submitSecuvadPayment')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_payment` '); $sql = 'INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_payment` VALUES'; @@ -573,7 +573,7 @@ class Secuvad extends Module $sql .= '(NULL, '.(int)($id_module).', \''.pSQL($code).'\'),'; } $sql = rtrim($sql, ','); - if (Db::getInstance()->Execute($sql)) + if (Db::getInstance()->execute($sql)) $this->_html .= $this->displayConfirmation($this->l('Settings are updated')); else $this->_html .= $this->displayError($this->l('Error during update')); @@ -581,7 +581,7 @@ class Secuvad extends Module if (Tools::isSubmit('submitSecuvadCarrier')) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_transport` '); $sql = 'INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_transport` VALUES'; @@ -592,7 +592,7 @@ class Secuvad extends Module $sql .= '(NULL, '.(int)($id_carrier).', '.(int)($value).', '.(int)($_POST['secuvad_carrier_delay_'.(int)($id_carrier)]).'),'; } $sql = rtrim($sql, ','); - if (Db::getInstance()->Execute($sql)) + if (Db::getInstance()->execute($sql)) $this->_html .= $this->displayConfirmation($this->l('Settings are updated')); else $this->_html .= $this->displayError($this->l('Error during update')); @@ -959,7 +959,7 @@ class Secuvad extends Module $report .= $this->l('Mail:').$mail."\n\n"; $report .= $this->l('Issue description:')."\n".$probleme."\n\n"; $report .= $this->l('Log files:')."\n"; - $res = Db::getInstance()->ExecuteS(' + $res = Db::getInstance()->executeS(' SELECT `message`, `date` FROM `'._DB_PREFIX_.'secuvad_logs` ORDER BY `date` DESC @@ -996,7 +996,7 @@ class Secuvad extends Module private function check_payment() { $result = true; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_payment` WHERE `id_module` NOT IN ( @@ -1008,7 +1008,7 @@ class Secuvad extends Module ) '); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_payment` (`id_module`) ( SELECT m.`id_module` FROM `'._DB_PREFIX_.'hook` h @@ -1019,7 +1019,7 @@ class Secuvad extends Module AND sap.`id_module` IS NULL )'); - $module_not_assoc = Db::getInstance()->ExecuteS(' + $module_not_assoc = Db::getInstance()->executeS(' SELECT m.`name`, m.`id_module` FROM `'._DB_PREFIX_.'hook` h JOIN `'._DB_PREFIX_.'hook_module` hm ON (hm.`id_hook` = h.`id_hook`) @@ -1042,7 +1042,7 @@ class Secuvad extends Module private function check_transport() { $result = true; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_transport` WHERE `id_carrier` NOT IN ( @@ -1051,7 +1051,7 @@ class Secuvad extends Module ) '); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_transport`(id_carrier) ( SELECT c.`id_carrier` @@ -1062,7 +1062,7 @@ class Secuvad extends Module ) '); - $module_not_assoc = Db::getInstance()->ExecuteS(' + $module_not_assoc = Db::getInstance()->executeS(' SELECT c.`name`, c.`id_carrier` FROM `'._DB_PREFIX_.'carrier` c JOIN `'._DB_PREFIX_.'secuvad_assoc_transport` sat ON (sat.`id_carrier` = c.`id_carrier`) @@ -1087,7 +1087,7 @@ class Secuvad extends Module private function check_category() { $result = true; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_assoc_category` WHERE `id_category` NOT IN ( @@ -1096,7 +1096,7 @@ class Secuvad extends Module ) '); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_assoc_category`(id_category) ( SELECT c.`id_category` @@ -1106,7 +1106,7 @@ class Secuvad extends Module ) '); - $module_not_assoc = Db::getInstance()->ExecuteS(' + $module_not_assoc = Db::getInstance()->executeS(' SELECT cl.`name`, c.`id_category` FROM `'._DB_PREFIX_.'category` c JOIN `'._DB_PREFIX_.'category_lang` cl ON (cl.`id_category` = c.`id_category`'.$this->context->shop->sqlLang('cl').') @@ -1204,11 +1204,11 @@ class Secuvad extends Module SELECT COUNT(0) nb FROM `'._DB_PREFIX_.'secuvad_logs`'); if($res > $this->get_secuvad_max_log_size()) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'secuvad_logs` ORDER BY `date` LIMIT '.(int)($this->get_secuvad_log_size())); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'secuvad_logs` (`message`) VALUES (\''.pSQL($message).'\') '); diff --git a/modules/secuvad/secuvad_response.php b/modules/secuvad/secuvad_response.php index 90847f95c..ba4a181fc 100644 --- a/modules/secuvad/secuvad_response.php +++ b/modules/secuvad/secuvad_response.php @@ -53,7 +53,7 @@ if (in_array($secuvad->getRemoteIPaddress(), $secuvad->get_secuvad_ip())) if (!empty($erreur)) { $secuvad->secuvad_log('secuvad_response.php '."\n\t".' Error: '.$erreur); - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `secuvad_status` = 4, `error` = '.pSQL($erreur).' WHERE `id_secuvad_order` = '.(int)($idtransaction)); @@ -63,7 +63,7 @@ if (in_array($secuvad->getRemoteIPaddress(), $secuvad->get_secuvad_ip())) $secuvad->secuvad_log('secuvad_response.php '."\n\t".' Response: '.$rep); if (preg_match('/[0-9]+/Ui', $score)) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `secuvad_status` = 5, `score` = '.(int)($score).' WHERE `id_secuvad_order` = '.(int)($idtransaction)); @@ -81,7 +81,7 @@ if (in_array($secuvad->getRemoteIPaddress(), $secuvad->get_secuvad_ip())) $secuvad_status = 2; else $secuvad_status = 4; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'secuvad_order` SET `secuvad_status` = '.(int)($secuvad_status).', `advice` = \''.pSQL($advice).'\' WHERE `id_secuvad_order` = '.(int)($idtransaction)); diff --git a/modules/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php index 0a442370e..f9f386fa5 100644 --- a/modules/sekeywords/sekeywords.php +++ b/modules/sekeywords/sekeywords.php @@ -64,7 +64,7 @@ class SEKeywords extends ModuleGraph return false; Configuration::updateValue('SEK_MIN_OCCURENCES', 1); Configuration::updateValue('SEK_FILTER_KW', ''); - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'sekeyword` ( id_sekeyword INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, id_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\', @@ -79,7 +79,7 @@ class SEKeywords extends ModuleGraph { if (!parent::uninstall()) return false; - return (Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'sekeyword`')); + return (Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'sekeyword`')); } public function hookTop($params) @@ -88,7 +88,7 @@ class SEKeywords extends ModuleGraph return; if ($keywords = $this->getKeywords($_SERVER['HTTP_REFERER'])) - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'sekeyword` (`keyword`, `date_add`, `id_shop`, `id_group_shop`) + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'sekeyword` (`keyword`, `date_add`, `id_shop`, `id_group_shop`) VALUES (\''.pSQL(Tools::strtolower(trim($keywords))).'\', NOW(), '.$this->context->shop->getID().', '.$this->context->shop->getGroupID().')'); } @@ -103,7 +103,7 @@ class SEKeywords extends ModuleGraph if (Tools::getValue('export')) $this->csvExport(array('type' => 'pie')); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.ModuleGraph::getDateBetween().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.ModuleGraph::getDateBetween().$this->_query2); $total = count($result); $this->_html = '
'.$this->displayName.' '.$total.' '.($total == 1 ? $this->l('keyword matches your query.') : $this->l('keywords match your query.')).'
 
'; @@ -157,7 +157,7 @@ class SEKeywords extends ModuleGraph if (!isset($parsedUrl['query'])) return false; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `server`, `getvar` FROM `'._DB_PREFIX_.'search_engine`'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `server`, `getvar` FROM `'._DB_PREFIX_.'search_engine`'); foreach ($result as $index => $row) { $host =& $row['server']; @@ -179,12 +179,12 @@ class SEKeywords extends ModuleGraph protected function getData($layers) { $this->_titles['main'] = $this->l('10 first keywords'); - $totalResult = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $totalResult = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); $total = 0; $total2 = 0; foreach ($totalResult as $totalRow) $total += $totalRow['occurences']; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2.' LIMIT 9'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2.' LIMIT 9'); foreach ($result as $row) { $this->_legend[] = $row['keyword']; diff --git a/modules/shopimporter/ajax.php b/modules/shopimporter/ajax.php index b4adcd446..eb1aa5f87 100644 --- a/modules/shopimporter/ajax.php +++ b/modules/shopimporter/ajax.php @@ -32,10 +32,10 @@ if (Tools::isSubmit('checkAndSaveConfig')) $shopImporter = new shopImporter(); foreach($shopImporter->supportedImports as $key => $import) if (array_key_exists('alterTable', $import)) - $columns = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM `'._DB_PREFIX_.bqSQL($import['table']).'`'); + $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `'._DB_PREFIX_.bqSQL($import['table']).'`'); foreach ($columns as $column) if ($column['Field'] == $import['identifier'].'_'.$moduleName) - Db::getInstance()->Execute('ALTER IGNORE TABLE `'._DB_PREFIX_.bqSQL($import['table']).'` DROP `'.bqSQL($import['identifier'].'_'.$moduleName).'`'); + Db::getInstance()->execute('ALTER IGNORE TABLE `'._DB_PREFIX_.bqSQL($import['table']).'` DROP `'.bqSQL($import['identifier'].'_'.$moduleName).'`'); if ($link = @mysql_connect(Tools::getValue('server'), Tools::getValue('user'), Tools::getValue('password'))) { if (!@mysql_select_db(Tools::getValue('database'), $link)) diff --git a/modules/shopimporter/shopimporter.php b/modules/shopimporter/shopimporter.php index 807c16ede..0d76f22a8 100644 --- a/modules/shopimporter/shopimporter.php +++ b/modules/shopimporter/shopimporter.php @@ -701,7 +701,7 @@ class shopimporter extends ImportModule { $this->saveMatchId(strtolower($className), (int)$object->id, (int)$id); if ($className == 'Customer') - Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'customer SET `passwd_'.bqSQL(Tools::getValue('moduleName')).'` = \''.pSQL($password).'\' WHERE id_customer = '.(int)$object->id); + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'customer SET `passwd_'.bqSQL(Tools::getValue('moduleName')).'` = \''.pSQL($password).'\' WHERE id_customer = '.(int)$object->id); if (array_key_exists('hasImage', $this->supportedImports[strtolower($className)]) AND Tools::isSubmit('images_'.$className)) $this->copyImg($item, $className); } @@ -795,7 +795,7 @@ class shopimporter extends ImportModule $associatFields .= (int)$match[$association['fields'][1]][$v].'), '; } if ($associatFields != '') - Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.bqSQL($tableAssociation).'` (`'.$associatFieldsName.'`) VALUES '.rtrim($associatFields, ', ')); + Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.bqSQL($tableAssociation).'` (`'.$associatFieldsName.'`) VALUES '.rtrim($associatFields, ', ')); } } } @@ -805,7 +805,7 @@ class shopimporter extends ImportModule $table = $this->supportedImports[$className]['table']; $moduleName = Tools::getValue('moduleName'); $identifier = $this->supportedImports[$className]['identifier']; - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.bqSQL($table).'` SET `'.bqSQL($identifier).'_'.bqSQL($moduleName).'` = '.(int)$matchId.' WHERE `'.bqSQL($identifier).'` = '.(int)$psId); + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.bqSQL($table).'` SET `'.bqSQL($identifier).'_'.bqSQL($moduleName).'` = '.(int)$matchId.' WHERE `'.bqSQL($identifier).'` = '.(int)$psId); } private function getMatchId($className) @@ -813,7 +813,7 @@ class shopimporter extends ImportModule $table = $this->supportedImports[$className]['table']; $moduleName = Tools::getValue('moduleName'); $identifier = $this->supportedImports[$className]['identifier']; - $returns = Db::getInstance()->ExecuteS('SELECT `'.bqSQL($identifier).'_'.bqSQL($moduleName).'`, `'.bqSQL($identifier).'` FROM `'._DB_PREFIX_.bqSQL($table).'` WHERE `'.bqSQL($identifier).'_'.bqSQL($moduleName).'` != 0 '); + $returns = Db::getInstance()->executeS('SELECT `'.bqSQL($identifier).'_'.bqSQL($moduleName).'`, `'.bqSQL($identifier).'` FROM `'._DB_PREFIX_.bqSQL($table).'` WHERE `'.bqSQL($identifier).'_'.bqSQL($moduleName).'` != 0 '); $match = array(); foreach($returns as $return) $match[$return[$identifier.'_'.$moduleName]] = $return[$identifier]; @@ -930,7 +930,7 @@ class shopimporter extends ImportModule foreach ($this->supportedImports[$className]['alterTable'] AS $name => $type) { $moduleName = Tools::getValue('moduleName'); - Db::getInstance()->ExecuteS("SHOW COLUMNS FROM `"._DB_PREFIX_.bqSQL($from)."` LIKE '".pSQL($name).'_'.pSQL($moduleName)."'"); + Db::getInstance()->executeS("SHOW COLUMNS FROM `"._DB_PREFIX_.bqSQL($from)."` LIKE '".pSQL($name).'_'.pSQL($moduleName)."'"); if (!Db::getInstance()->numRows() AND !array_key_exists($name.'_'.$moduleName, $result)) $queryTmp .= ' ADD `'.$name.'_'.$moduleName.'` '.$type.' NOT NULL,'; } @@ -938,14 +938,14 @@ class shopimporter extends ImportModule { $query = 'ALTER TABLE `'._DB_PREFIX_.bqSQL($from).'` '; $query .= rtrim($queryTmp, ','); - Db::getInstance()->Execute($query); + Db::getInstance()->execute($query); } } private function updateCat() { $moduleName = Tools::getValue('moduleName'); - Db::getInstance()->Execute('UPDATE + Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'category c INNER JOIN '._DB_PREFIX_.'category c2 @@ -981,7 +981,7 @@ class shopimporter extends ImportModule foreach($this->supportedImports AS $table => $conf) if ($conf['identifier'] == $key2) $from = $this->supportedImports[$table]['table']; - $return = Db::getInstance()->ExecuteS('SELECT `'.bqSQL($key2).'_'.bqSQL($moduleName).'`, `'.bqSQL($key2).'` FROM `'._DB_PREFIX_.bqSQL($from).'` WHERE `'.bqSQL($key2).'_'.bqSQL($moduleName).'` != 0'); + $return = Db::getInstance()->executeS('SELECT `'.bqSQL($key2).'_'.bqSQL($moduleName).'`, `'.bqSQL($key2).'` FROM `'._DB_PREFIX_.bqSQL($from).'` WHERE `'.bqSQL($key2).'_'.bqSQL($moduleName).'` != 0'); if (!empty($return)) foreach($return AS $name => $val) $match[$key][$val[$key2.'_'.$moduleName]] = $val[$key2]; @@ -993,7 +993,7 @@ class shopimporter extends ImportModule { $id = $this->supportedImports[$table]['identifier']; $moduleName = Tools::getValue('moduleName'); - $return = Db::getInstance()->ExecuteS('SELECT `'.bqSQL($id).'_'.bqSQL($moduleName).'`, `'.bqSQL($id).'` FROM `'._DB_PREFIX_.bqSQL($table).'` WHERE `'.bqSQL($id).'_'.bqSQL($moduleName).'` != 0'); + $return = Db::getInstance()->executeS('SELECT `'.bqSQL($id).'_'.bqSQL($moduleName).'`, `'.bqSQL($id).'` FROM `'._DB_PREFIX_.bqSQL($table).'` WHERE `'.bqSQL($id).'_'.bqSQL($moduleName).'` != 0'); $match = array(); foreach($return AS $name => $val) $match[$val[$id.'_'.$moduleName]] = $val[$id]; @@ -1003,7 +1003,7 @@ class shopimporter extends ImportModule private function getMatchIdLang($order = 1) { $moduleName = Tools::getValue('moduleName'); - $return = Db::getInstance()->ExecuteS('SELECT `id_lang`, `id_lang_'.bqSQL($moduleName).'` FROM `'._DB_PREFIX_.'lang'.'` WHERE `id_lang_'.bqSQL($moduleName).'` != 0'); + $return = Db::getInstance()->executeS('SELECT `id_lang`, `id_lang_'.bqSQL($moduleName).'` FROM `'._DB_PREFIX_.'lang'.'` WHERE `id_lang_'.bqSQL($moduleName).'` != 0'); $match = array(); foreach($return AS $name => $val) if ((bool)$order) @@ -1182,7 +1182,7 @@ class shopimporter extends ImportModule else { $newId = Language::getIdByIso($iso); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'lang` + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'lang` SET `id_lang_'.bqSQL($moduleName).'` = '.(int)$language['id_lang'].' WHERE `id_lang` = '.(int)$newId); } @@ -1205,7 +1205,7 @@ class shopimporter extends ImportModule else { $newId = Language::getIdByIso($iso); - Db::getInstance()->Execute('UPDATE `'._DB_PREFIX_.'lang` + Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'lang` SET `id_lang_'.bqSQL($moduleName).'` = '.(int)$language['id_lang'].' WHERE `id_lang` = '.(int)$newId); } @@ -1217,80 +1217,80 @@ class shopimporter extends ImportModule switch ($table) { case 'customer' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'customer_group'); break; case 'address' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'address'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'address'); break; case 'country' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'state'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'country'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'country_lang'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'country'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'state'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'country'); + 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_.'ps_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_.'ps_group_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'group'); break; case 'combination' : - 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'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_attribute_combination'); break; case 'category' : - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1'); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1'); - Db::getInstance()->Execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2 '); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category` WHERE id_category != 1'); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'category_lang` WHERE id_category != 1'); + Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'category` AUTO_INCREMENT = 2 '); foreach (scandir(_PS_CAT_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_CAT_IMG_DIR_.$d); Image::clearTmpDir(); break; case 'product' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'image'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang'); - 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_.'specific_price'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'feature_product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'category_product'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'product_tag'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'image_lang'); + 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_.'specific_price'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'specific_price_priority'); Image::deleteAllImages(_PS_PROD_IMG_DIR_); Image::clearTmpDir(); break; case 'manufacturer' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer_lang'); foreach (scandir(_PS_MANU_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_MANU_IMG_DIR_.$d); Image::clearTmpDir(); break; case 'Suppliers' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'supplier_lang'); foreach (scandir(_PS_SUPP_IMG_DIR_) AS $d) if (preg_match('/^[0-9]+(\-(.*))?\.jpg$/', $d)) unlink(_PS_SUPP_IMG_DIR_.$d); Image::clearTmpDir(); break; case 'attribute' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute'); - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_lang'); break; case 'attributegroup' : - 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_group'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'attribute_group_lang'); break; case 'currency' : case 'customer' : case 'zone' : case 'state' : - Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`'); + Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`'); break; } return true; diff --git a/modules/socolissimo/socolissimo.php b/modules/socolissimo/socolissimo.php index 342d98917..e11e1c5d8 100644 --- a/modules/socolissimo/socolissimo.php +++ b/modules/socolissimo/socolissimo.php @@ -138,7 +138,7 @@ class Socolissimo extends CarrierModule PRIMARY KEY (`id_cart`,`id_customer`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8;'; - if(!Db::getInstance()->Execute($sql)) + if(!Db::getInstance()->execute($sql)) return false; //add carrier in back office @@ -153,7 +153,7 @@ class Socolissimo extends CarrierModule $so_id = (int)Configuration::get('SOCOLISSIMO_CARRIER_ID'); if (!parent::uninstall() - OR !Db::getInstance()->Execute('DROP TABLE IF EXISTS`'._DB_PREFIX_.'socolissimo_delivery_info`') + OR !Db::getInstance()->execute('DROP TABLE IF EXISTS`'._DB_PREFIX_.'socolissimo_delivery_info`') OR !$this->unregisterHook('extraCarrier') OR !$this->unregisterHook('payment') OR !$this->unregisterHook('AdminOrder') @@ -533,7 +533,7 @@ class Socolissimo extends CarrierModule $groups = Group::getgroups(true); foreach ($groups as $group) { - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'carrier_group VALUE (\''.(int)($carrier->id).'\',\''.(int)($group['id_group']).'\')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'carrier_group VALUE (\''.(int)($carrier->id).'\',\''.(int)($group['id_group']).'\')'); } $rangePrice = new RangePrice(); $rangePrice->id_carrier = $carrier->id; @@ -550,9 +550,9 @@ class Socolissimo extends CarrierModule $zones = Zone::getZones(true); foreach ($zones as $zone) { - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'carrier_zone VALUE (\''.(int)($carrier->id).'\',\''.(int)($zone['id_zone']).'\')'); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'delivery VALUE (\'\',\''.(int)($carrier->id).'\',\''.(int)($rangePrice->id).'\',NULL,\''.(int)($zone['id_zone']).'\',\'1\')'); - Db::getInstance()->Execute('INSERT INTO '._DB_PREFIX_.'delivery VALUE (\'\',\''.(int)($carrier->id).'\',NULL,\''.(int)($rangeWeight->id).'\',\''.(int)($zone['id_zone']).'\',\'1\')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'carrier_zone VALUE (\''.(int)($carrier->id).'\',\''.(int)($zone['id_zone']).'\')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'delivery VALUE (\'\',\''.(int)($carrier->id).'\',\''.(int)($rangePrice->id).'\',NULL,\''.(int)($zone['id_zone']).'\',\'1\')'); + Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'delivery VALUE (\'\',\''.(int)($carrier->id).'\',NULL,\''.(int)($rangeWeight->id).'\',\''.(int)($zone['id_zone']).'\',\'1\')'); } //copy logo if (!copy(dirname(__FILE__).'/socolissimo.jpg',_PS_SHIP_IMG_DIR_.'/'.$carrier->id.'.jpg')) diff --git a/modules/socolissimo/validation.php b/modules/socolissimo/validation.php index e8a5993c4..f00eb7c30 100644 --- a/modules/socolissimo/validation.php +++ b/modules/socolissimo/validation.php @@ -100,7 +100,7 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams) 'RDV' => 'Livraison sur Rendez-vous'); $db = Db::getInstance(); - $db->ExecuteS('SELECT * FROM '._DB_PREFIX_.'socolissimo_delivery_info WHERE id_cart = '.(int)($idCart).' AND id_customer ='.(int)($idCustomer)); + $db->executeS('SELECT * FROM '._DB_PREFIX_.'socolissimo_delivery_info WHERE id_cart = '.(int)($idCart).' AND id_customer ='.(int)($idCustomer)); $numRows = (int)($db->NumRows()); if ($numRows == 0) { @@ -144,7 +144,7 @@ function saveOrderShippingDetails($idCart, $idCustomer, $soParams) '.(isset($soParams['CEDOORCODE1']) ? '\''.pSQL($soParams['CEDOORCODE1']).'\'' : '\'\'').', '.(isset($soParams['CEDOORCODE2']) ? '\''.pSQL($soParams['CEDOORCODE2']).'\'' : '\'\'').')'; - if (Db::getInstance()->Execute($sql)) + if (Db::getInstance()->execute($sql)) return true; } else diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index 5e5874db7..0344a38dd 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -199,7 +199,7 @@ class StatsBestCategories extends ModuleGrid } if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); $this->_totalCount = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT FOUND_ROWS()'); } } \ No newline at end of file diff --git a/modules/statsbestcustomers/statsbestcustomers.php b/modules/statsbestcustomers/statsbestcustomers.php index 6789a0680..e4480a42c 100644 --- a/modules/statsbestcustomers/statsbestcustomers.php +++ b/modules/statsbestcustomers/statsbestcustomers.php @@ -156,7 +156,7 @@ class StatsBestCustomers extends ModuleGrid } if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); $this->_totalCount = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT FOUND_ROWS()'); } } diff --git a/modules/statsbestmanufacturers/statsbestmanufacturers.php b/modules/statsbestmanufacturers/statsbestmanufacturers.php index e00d091b2..aee265202 100755 --- a/modules/statsbestmanufacturers/statsbestmanufacturers.php +++ b/modules/statsbestmanufacturers/statsbestmanufacturers.php @@ -146,6 +146,6 @@ class StatsBestManufacturers extends ModuleGrid } if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance()->ExecuteS($this->_query); + $this->_values = Db::getInstance()->executeS($this->_query); } } diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index c021af7cf..adc87cd19 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -182,7 +182,7 @@ class StatsBestProducts extends ModuleGrid if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); $this->_totalCount = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT FOUND_ROWS()'); } } diff --git a/modules/statsbestsuppliers/statsbestsuppliers.php b/modules/statsbestsuppliers/statsbestsuppliers.php index 7c0654a86..da9e119bc 100644 --- a/modules/statsbestsuppliers/statsbestsuppliers.php +++ b/modules/statsbestsuppliers/statsbestsuppliers.php @@ -148,6 +148,6 @@ class StatsBestSuppliers extends ModuleGrid if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); } } \ No newline at end of file diff --git a/modules/statsbestvouchers/statsbestvouchers.php b/modules/statsbestvouchers/statsbestvouchers.php index 38e2fa38d..fc805ff81 100644 --- a/modules/statsbestvouchers/statsbestvouchers.php +++ b/modules/statsbestvouchers/statsbestvouchers.php @@ -126,7 +126,7 @@ class StatsBestVouchers extends ModuleGrid } if (($this->_start === 0 OR Validate::IsUnsignedInt($this->_start)) AND Validate::IsUnsignedInt($this->_limit)) $this->_query .= ' LIMIT '.$this->_start.', '.($this->_limit); - $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $this->_values = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); $this->_totalCount = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('SELECT FOUND_ROWS()'); } } diff --git a/modules/statscarrier/statscarrier.php b/modules/statscarrier/statscarrier.php index 2767dabc3..481d8e8ba 100644 --- a/modules/statscarrier/statscarrier.php +++ b/modules/statscarrier/statscarrier.php @@ -101,7 +101,7 @@ class StatsCarrier extends ModuleGraph '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' '.$stateQuery.' GROUP BY c.`id_carrier`'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($result as $row) { $this->_values[] = $row['total']; diff --git a/modules/statscatalog/statscatalog.php b/modules/statscatalog/statscatalog.php index 4cdef5ee6..35a3906f1 100644 --- a/modules/statscatalog/statscatalog.php +++ b/modules/statscatalog/statscatalog.php @@ -115,7 +115,7 @@ class StatsCatalog extends Module '.$this->_where.' AND p.`active` = 1 GROUP BY p.`id_product`'; - $precalc = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $precalc = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $precalc2 = array(); foreach ($precalc as $array) @@ -128,7 +128,7 @@ class StatsCatalog extends Module WHERE p.`active` = 1 '.(sizeof($precalc2) ? 'AND p.`id_product` NOT IN ('.implode(',', $precalc2).')' : '').' '.$this->_where; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return array('total' => Db::getInstance(_PS_USE_SQL_SLAVE_)->NumRows(), 'result' => $result); } diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index ab2ad9a7b..bdfc24435 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -81,7 +81,7 @@ class StatsCheckUp extends Module $sql = 'SELECT l.* FROM '._DB_PREFIX_.'lang l' .$this->context->shop->sqlAsso('lang', 'l'); - $languages = $db->ExecuteS($sql); + $languages = $db->executeS($sql); $arrayColors = array( 0 => ''.$this->l('bad').'', @@ -125,7 +125,7 @@ class StatsCheckUp extends Module LEFT JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$this->context->language->id.$this->context->shop->sqlLang('pl').') '.$this->context->shop->sqlAsso('product', 'p').' ORDER BY '.$orderBy; - $result = $db->ExecuteS($sql); + $result = $db->executeS($sql); if (!$result) return $this->l('No product found'); @@ -194,7 +194,7 @@ class StatsCheckUp extends Module $totals['images'] += (int)$scores['images']; $totals['sales'] += (int)$scores['sales']; $totals['stock'] += (int)$scores['stock']; - $descriptions = $db->ExecuteS('SELECT l.iso_code, pl.description FROM '._DB_PREFIX_.'product_lang pl LEFT JOIN '._DB_PREFIX_.'lang l ON pl.id_lang = l.id_lang WHERE id_product = '.(int)$row['id_product'].$this->context->shop->sqlLang('pl')); + $descriptions = $db->executeS('SELECT l.iso_code, pl.description FROM '._DB_PREFIX_.'product_lang pl LEFT JOIN '._DB_PREFIX_.'lang l ON pl.id_lang = l.id_lang WHERE id_product = '.(int)$row['id_product'].$this->context->shop->sqlLang('pl')); foreach ($descriptions as $description) { $row['desclength_'.$description['iso_code']] = Tools::strlen(strip_tags($description['description'])); diff --git a/modules/statsequipment/statsequipment.php b/modules/statsequipment/statsequipment.php index 1b1297dd5..c417a91da 100644 --- a/modules/statsequipment/statsequipment.php +++ b/modules/statsequipment/statsequipment.php @@ -63,7 +63,7 @@ class StatsEquipment extends ModuleGraph LEFT JOIN `'._DB_PREFIX_.'guest` g ON g.`id_guest` = c.`id_guest` WHERE c.`date_add` BETWEEN '.ModuleGraph::getDateBetween().' '.$this->sqlShopRestriction(false, 'c'); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql, false); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql, false); $calcArray = array('jsOK' => 0, 'jsKO' => 0, 'javaOK' => 0, 'javaKO' => 0, 'wmpOK' => 0, 'wmpKO' => 0, 'qtOK' => 0, 'qtKO' => 0, 'realOK' => 0, 'realKO' => 0, 'flashOK' => 0, 'flashKO' => 0, 'directorOK' => 0, 'directorKO' => 0); while ($row = Db::getInstance(_PS_USE_SQL_SLAVE_)->nextRow($result)) @@ -169,7 +169,7 @@ class StatsEquipment extends ModuleGraph protected function getData($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); $this->_values = array(); $i = 0; foreach ($result as $row) diff --git a/modules/statsforecast/statsforecast.php b/modules/statsforecast/statsforecast.php index c30024b38..150ff3f08 100644 --- a/modules/statsforecast/statsforecast.php +++ b/modules/statsforecast/statsforecast.php @@ -124,7 +124,7 @@ class StatsForecast extends Module '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY '.$dateFromGInvoice.' ORDER BY fix_date'; - $result = $db->ExecuteS($sql, false); + $result = $db->executeS($sql, false); $dataTable = array(); if ($this->context->cookie->stats_granularity == 10) @@ -170,7 +170,7 @@ class StatsForecast extends Module WHERE c.date_add BETWEEN '.ModuleGraph::getDateBetween().' '.$this->sqlShopRestriction(false, 'c').' GROUP BY '.$dateFromGAdd; - $visits = Db::getInstance()->ExecuteS($sql, false); + $visits = Db::getInstance()->executeS($sql, false); while ($row = $db->nextRow($visits)) $visitArray[$row['fix_date']] = $row['visits']; @@ -183,7 +183,7 @@ class StatsForecast extends Module AND o.invoice_date BETWEEN '.ModuleGraph::getDateBetween() .$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY '.$dateFromGInvoice; - $discounts = Db::getInstance()->ExecuteS($sql, false); + $discounts = Db::getInstance()->executeS($sql, false); while ($row = $db->nextRow($discounts)) $discountArray[$row['fix_date']] = $row['total']; @@ -504,7 +504,7 @@ class StatsForecast extends Module '.$where.' '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY p.id_category_default'; - $ca['cat'] = Db::getInstance()->ExecuteS($sql); + $ca['cat'] = Db::getInstance()->executeS($sql); uasort($ca['cat'], 'statsforecast_sort'); $langValues = ''; @@ -512,7 +512,7 @@ class StatsForecast extends Module FROM `'._DB_PREFIX_.'lang` l '.$this->context->shop->sqlAsso('lang', 'l').' WHERE l.active = 1'; - $languages = Db::getInstance()->ExecuteS($sql); + $languages = Db::getInstance()->executeS($sql); foreach ($languages as $language) $langValues .= 'SUM(IF(o.id_lang = '.(int)$language['id_lang'].', total_products / o.conversion_rate, 0)) as '.pSQL($language['iso_code']).','; $langValues = rtrim($langValues, ','); @@ -549,7 +549,7 @@ class StatsForecast extends Module '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY o.module ORDER BY total DESC'; - $ca['payment'] = Db::getInstance()->ExecuteS($sql); + $ca['payment'] = Db::getInstance()->executeS($sql); $sql = 'SELECT z.name, SUM(o.total_products / o.conversion_rate) as total, COUNT(*) as nb FROM `'._DB_PREFIX_.'orders` o @@ -561,7 +561,7 @@ class StatsForecast extends Module '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY c.id_zone ORDER BY total DESC'; - $ca['zones'] = Db::getInstance()->ExecuteS($sql); + $ca['zones'] = Db::getInstance()->executeS($sql); $sql = 'SELECT cu.name, SUM(o.total_products / o.conversion_rate) as total, COUNT(*) as nb FROM `'._DB_PREFIX_.'orders` o @@ -573,7 +573,7 @@ class StatsForecast extends Module '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY o.id_currency ORDER BY total DESC'; - $ca['currencies'] = Db::getInstance()->ExecuteS($sql); + $ca['currencies'] = Db::getInstance()->executeS($sql); $sql = 'SELECT SUM(total_products / o.conversion_rate) as total, COUNT(*) AS nb FROM `'._DB_PREFIX_.'orders` o @@ -593,7 +593,7 @@ class StatsForecast extends Module AND o.`invoice_date` BETWEEN '.ModuleGraph::getDateBetween().' '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY pac.id_attribute'; - $ca['attributes'] = Db::getInstance()->ExecuteS($sql); + $ca['attributes'] = Db::getInstance()->executeS($sql); return $ca; } diff --git a/modules/statsgeolocation/config.php b/modules/statsgeolocation/config.php index a87da9123..2c0822a0a 100644 --- a/modules/statsgeolocation/config.php +++ b/modules/statsgeolocation/config.php @@ -33,7 +33,7 @@ function show_countries($id_lang, $nb_by_line = 7) $output = ' '; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT cl.`id_country`, `name`, `iso_code` FROM `'._DB_PREFIX_.'country_lang` cl + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT cl.`id_country`, `name`, `iso_code` FROM `'._DB_PREFIX_.'country_lang` cl LEFT JOIN `'._DB_PREFIX_.'country` c ON c.`id_country` = cl.`id_country` WHERE `id_lang` = \''.(int)($id_lang).'\' ORDER BY `name` ASC;'); $separator = 0; @@ -56,7 +56,7 @@ function show_buttons($id_lang, $id_country) $output = ' '; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT cl.`id_country`, `name`, `iso_code`, `x`, `y` FROM `'._DB_PREFIX_.'country_lang` cl + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT cl.`id_country`, `name`, `iso_code`, `x`, `y` FROM `'._DB_PREFIX_.'country_lang` cl LEFT JOIN `'._DB_PREFIX_.'country` c ON c.`id_country` = cl.`id_country` LEFT JOIN `'._DB_PREFIX_.'location_coords` lc ON c.`id_country` = lc.`id_country` WHERE `id_lang` = \''.(int)($id_lang).'\' AND cl.`id_country`= \''.(int)($id_country).'\';'); @@ -80,8 +80,8 @@ function insert_coords($id_lang, $id_country, $x, $y) { if (!is_numeric($id_lang) || !is_numeric($id_country) || !is_numeric($x) || !is_numeric($y)) return ("error"); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'location_coords` WHERE `id_country` = \''.$id_country.'\';'); - if (!Db::getInstance()->Execute('INSERT INTO `'._DB_PREFIX_.'location_coords` (`x`, `y`, `id_country`) VALUES (\''.(int)($x).'\', \''.(int)($y).'\', \''.(int)($id_country).'\');')) + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'location_coords` WHERE `id_country` = \''.$id_country.'\';'); + if (!Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'location_coords` (`x`, `y`, `id_country`) VALUES (\''.(int)($x).'\', \''.(int)($y).'\', \''.(int)($id_country).'\');')) echo("error while inserting data
"); return (show_countries($id_lang)); } diff --git a/modules/statsgeolocation/drawer.php b/modules/statsgeolocation/drawer.php index 4f136d74b..1606bfe06 100644 --- a/modules/statsgeolocation/drawer.php +++ b/modules/statsgeolocation/drawer.php @@ -70,13 +70,13 @@ function drawCircles($image) function getTotalElements() { - $result = Db::getInstance()->ExecuteS('SELECT COUNT(`id_address`) as total FROM `'._DB_PREFIX_.'address` WHERE deleted = 0 AND id_customer IS NOT NULL AND id_customer != 0'); + $result = Db::getInstance()->executeS('SELECT COUNT(`id_address`) as total FROM `'._DB_PREFIX_.'address` WHERE deleted = 0 AND id_customer IS NOT NULL AND id_customer != 0'); return (isset($result[0]) ? $result[0]['total'] : 0); } function getCoords() { - return (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `x`, `y`, COUNT(`id_address`) AS total + return (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `x`, `y`, COUNT(`id_address`) AS total FROM `'._DB_PREFIX_.'address` a LEFT JOIN `'._DB_PREFIX_.'location_coords` lc ON lc.`id_country`=a.`id_country` WHERE deleted = 0 AND id_customer IS NOT NULL AND id_customer != 0 diff --git a/modules/statsgeolocation/statsgeolocation.php b/modules/statsgeolocation/statsgeolocation.php index f4d7f165b..b8891b3f9 100644 --- a/modules/statsgeolocation/statsgeolocation.php +++ b/modules/statsgeolocation/statsgeolocation.php @@ -86,7 +86,7 @@ class StatsGeoLocation extends Module if ( !parent::install() OR !$this->registerHook('AdminStatsModules')) return false; - if (!Db::getInstance()->Execute(' + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'location_coords` ( `id_location_coords` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, `x` int(4) NOT NULL, @@ -98,7 +98,7 @@ class StatsGeoLocation extends Module $flag = 0; $query = 'INSERT INTO `'._DB_PREFIX_.'location_coords` (`x`, `y`, `id_country`) VALUES '; - $result = Db::getInstance()->ExecuteS('SELECT `id_country`, `iso_code` FROM `'._DB_PREFIX_.'country`;'); + $result = Db::getInstance()->executeS('SELECT `id_country`, `iso_code` FROM `'._DB_PREFIX_.'country`;'); foreach ($result as $index => $row) { if (isset($countries[$row['iso_code']])) @@ -109,14 +109,14 @@ class StatsGeoLocation extends Module $flag = 1; } } - return Db::getInstance()->Execute($query.';'); + return Db::getInstance()->execute($query.';'); } function uninstall() { if (!parent::uninstall()) return false; - return (Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'location_coords`')); + return (Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'location_coords`')); } function hookAdminStatsModules() diff --git a/modules/statslive/statslive.php b/modules/statslive/statslive.php index 092f18633..22af37685 100644 --- a/modules/statslive/statslive.php +++ b/modules/statslive/statslive.php @@ -68,7 +68,7 @@ class StatsLive extends Module AND TIME_TO_SEC(TIMEDIFF(NOW(), cp.`time_start`)) < 900 GROUP BY c.id_connections ORDER BY u.firstname, u.lastname'; - $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return array($results, Db::getInstance()->NumRows()); } @@ -105,7 +105,7 @@ class StatsLive extends Module ORDER BY c.date_add DESC'; } - $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); return array($results, Db::getInstance()->NumRows()); } diff --git a/modules/statsnewsletter/statsnewsletter.php b/modules/statsnewsletter/statsnewsletter.php index 1fd4057fd..d6f41999e 100644 --- a/modules/statsnewsletter/statsnewsletter.php +++ b/modules/statsnewsletter/statsnewsletter.php @@ -117,8 +117,8 @@ class StatsNewsletter extends ModuleGraph protected function setAllTimeValues($layers) { - $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); - $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query2.$this->getDate()); + $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); + $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query2.$this->getDate()); foreach ($result1 AS $row) $this->_values[0][(int)(substr($row['newsletter_date_add'], 0, 4))] += 1; if ($result2) @@ -130,8 +130,8 @@ class StatsNewsletter extends ModuleGraph protected function setYearValues($layers) { - $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); - $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query2.$this->getDate()); + $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); + $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query2.$this->getDate()); foreach ($result1 AS $row) $this->_values[0][(int)(substr($row['newsletter_date_add'], 5, 2))] += 1; if ($result2) @@ -143,8 +143,8 @@ class StatsNewsletter extends ModuleGraph protected function setMonthValues($layers) { - $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); - $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query2.$this->getDate()); + $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); + $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query2.$this->getDate()); foreach ($result1 AS $row) $this->_values[0][(int)(substr($row['newsletter_date_add'], 8, 2))] += 1; if ($result2) @@ -156,8 +156,8 @@ class StatsNewsletter extends ModuleGraph protected function setDayValues($layers) { - $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); - $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query2.$this->getDate()); + $result1 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); + $result2 = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query2.$this->getDate()); foreach ($result1 AS $row) $this->_values[0][(int)(substr($row['newsletter_date_add'], 11, 2))] += 1; if ($result2) diff --git a/modules/statsorigin/statsorigin.php b/modules/statsorigin/statsorigin.php index 16ca87701..ed5354299 100644 --- a/modules/statsorigin/statsorigin.php +++ b/modules/statsorigin/statsorigin.php @@ -59,7 +59,7 @@ class StatsOrigin extends ModuleGraph WHERE 1 '.$this->sqlShopRestriction().' AND date_add BETWEEN '.$dateBetween; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql, false); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql, false); $websites = array($directLink => 0); while ($row = Db::getInstance(_PS_USE_SQL_SLAVE_)->nextRow($result)) { diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index b6d0a6942..df5c4ff80 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -136,7 +136,7 @@ class StatsPersonalInfos extends ModuleGraph WHERE 1 '.$this->sqlShopRestriction(Shop::SHARE_CUSTOMER, 'c').' GROUP BY c.id_gender'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); $gendersResults = array(); foreach ($result as $row) @@ -262,7 +262,7 @@ class StatsPersonalInfos extends ModuleGraph WHERE a.id_customer != 0 '.$this->sqlShopRestriction(Shop::SHARE_CUSTOMER, 'cu').' GROUP BY c.`id_country`'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($result as $row) { $this->_values[] = $row['total']; @@ -278,7 +278,7 @@ class StatsPersonalInfos extends ModuleGraph WHERE 1 '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY c.`id_currency`'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($result as $row) { $this->_values[] = $row['total']; @@ -294,7 +294,7 @@ class StatsPersonalInfos extends ModuleGraph WHERE 1 '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' GROUP BY c.`id_lang`'; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($result as $row) { $this->_values[] = $row['total']; diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 28da081ca..f80624aad 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -108,7 +108,7 @@ class StatsProduct extends ModuleGraph WHERE pl.`id_lang` = '.(int)($id_lang).' '.(Tools::getValue('id_category') ? 'AND cp.id_category = '.(int)(Tools::getValue('id_category')) : '').' ORDER BY pl.`name`'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } private function getSales($id_product, $id_lang) @@ -120,7 +120,7 @@ class StatsProduct extends ModuleGraph '.$this->sqlShopRestriction(Shop::SHARE_ORDER, 'o').' AND o.valid = 1 AND od.product_id = '.(int)($id_product); - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } private function getCrossSales($id_product, $id_lang) @@ -143,7 +143,7 @@ class StatsProduct extends ModuleGraph AND od.product_id != '.(int)$id_product.' GROUP BY od.product_id ORDER BY pqty DESC'; - return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); } public function hookAdminStatsModules($params) @@ -375,7 +375,7 @@ class StatsProduct extends ModuleGraph $assocNames[$id_product_attribute] = $list; } - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query); foreach ($result as $row) { $this->_values[] = $row['total']; @@ -388,7 +388,7 @@ class StatsProduct extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i]); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i]); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 0, 4))] += $row['total']; } @@ -398,7 +398,7 @@ class StatsProduct extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i]); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i]); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 5, 2))] += $row['total']; } @@ -408,7 +408,7 @@ class StatsProduct extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i]); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i]); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 8, 2))] += $row['total']; } @@ -418,7 +418,7 @@ class StatsProduct extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i]); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i]); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 11, 2))] += $row['total']; } diff --git a/modules/statsregistrations/statsregistrations.php b/modules/statsregistrations/statsregistrations.php index f621af156..535914a95 100644 --- a/modules/statsregistrations/statsregistrations.php +++ b/modules/statsregistrations/statsregistrations.php @@ -150,14 +150,14 @@ class StatsRegistrations extends ModuleGraph protected function setAllTimeValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); foreach ($result AS $row) $this->_values[(int)(substr($row['date_add'], 0, 4))]++; } protected function setYearValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); foreach ($result AS $row) { $mounth = (int)substr($row['date_add'], 5, 2); @@ -169,14 +169,14 @@ class StatsRegistrations extends ModuleGraph protected function setMonthValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); foreach ($result AS $row) $this->_values[(int)(substr($row['date_add'], 8, 2))]++; } protected function setDayValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate()); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate()); foreach ($result AS $row) $this->_values[(int)(substr($row['date_add'], 11, 2))]++; } diff --git a/modules/statssales/statssales.php b/modules/statssales/statssales.php index 4ea07dadb..76e227870 100644 --- a/modules/statssales/statssales.php +++ b/modules/statssales/statssales.php @@ -167,7 +167,7 @@ class StatsSales extends ModuleGraph protected function setAllTimeValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); foreach ($result AS $row) if ($this->_option == 1) { @@ -180,7 +180,7 @@ class StatsSales extends ModuleGraph protected function setYearValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); foreach ($result AS $row) { $mounth = (int)substr($row['invoice_date'], 5, 2); if ($this->_option == 1) @@ -203,7 +203,7 @@ class StatsSales extends ModuleGraph protected function setMonthValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); foreach ($result AS $row) if ($this->_option == 1) { @@ -216,7 +216,7 @@ class StatsSales extends ModuleGraph protected function setDayValues($layers) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); foreach ($result AS $row) if ($this->_option == 1) { @@ -229,7 +229,7 @@ class StatsSales extends ModuleGraph private function getStatesData() { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT osl.`name`, COUNT(oh.`id_order`) as total FROM `'._DB_PREFIX_.'order_state` os LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl ON (os.`id_order_state` = osl.`id_order_state` AND osl.`id_lang` = '.(int)($this->getLang()).') diff --git a/modules/statssearch/statssearch.php b/modules/statssearch/statssearch.php index db8469401..6fc4e9b4c 100644 --- a/modules/statssearch/statssearch.php +++ b/modules/statssearch/statssearch.php @@ -62,7 +62,7 @@ class StatsSearch extends ModuleGraph { if (!parent::install() OR !$this->registerHook('search') OR !$this->registerHook('AdminStatsModules')) return false; - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'statssearch` ( id_statssearch INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, id_shop INTEGER UNSIGNED NOT NULL DEFAULT \'1\', @@ -78,7 +78,7 @@ class StatsSearch extends ModuleGraph { if (!parent::uninstall()) return false; - return (Db::getInstance()->Execute('DROP TABLE `'._DB_PREFIX_.'statssearch`')); + return (Db::getInstance()->execute('DROP TABLE `'._DB_PREFIX_.'statssearch`')); } /** @@ -88,7 +88,7 @@ class StatsSearch extends ModuleGraph { $sql = 'INSERT INTO `'._DB_PREFIX_.'statssearch` (`id_shop`, `id_group_shop`, `keywords`, `results`, `date_add`) VALUES ('.$this->context->shop->getID(true).', '.$this->context->shop->getGroupID().', \''.pSQL($params['expr']).'\', '.(int)$params['total'].', NOW())'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } function hookAdminStatsModules() @@ -96,7 +96,7 @@ class StatsSearch extends ModuleGraph if (Tools::getValue('export')) $this->csvExport(array('type' => 'pie')); - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.ModuleGraph::getDateBetween().$this->_query2); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.ModuleGraph::getDateBetween().$this->_query2); $this->_html = '
'.$this->displayName.''; $table = '
@@ -133,12 +133,12 @@ class StatsSearch extends ModuleGraph protected function getData($layers) { $this->_titles['main'] = $this->l('First 10 keywords'); - $totalResult = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2); + $totalResult = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2); $total = 0; $total2 = 0; foreach ($totalResult as $totalRow) $total += $totalRow['occurences']; - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query.$this->getDate().$this->_query2.' LIMIT 9'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query.$this->getDate().$this->_query2.' LIMIT 9'); foreach ($result as $row) { if (!$row['occurences']) diff --git a/modules/statsstock/statsstock.php b/modules/statsstock/statsstock.php index bf6de1adf..e6319e298 100644 --- a/modules/statsstock/statsstock.php +++ b/modules/statsstock/statsstock.php @@ -77,7 +77,7 @@ class StatsStock extends Module INNER JOIN '._DB_PREFIX_.'product_lang pl ON (p.id_product = pl.id_product AND pl.id_lang = '.(int)$this->context->language->id.$this->context->shop->sqlLang('pl').') WHERE 1 = 1 '.$filter; - $products = Db::getInstance()->ExecuteS($sql); + $products = Db::getInstance()->executeS($sql); echo ' diff --git a/modules/statsvisits/statsvisits.php b/modules/statsvisits/statsvisits.php index 2958ef3f3..cbff0608a 100644 --- a/modules/statsvisits/statsvisits.php +++ b/modules/statsvisits/statsvisits.php @@ -140,7 +140,7 @@ class StatsVisits extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 4)'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 4)'); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 0, 4))] = (int)($row['total']); } @@ -150,7 +150,7 @@ class StatsVisits extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 7)'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 7)'); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 5, 2))] = (int)($row['total']); } @@ -160,7 +160,7 @@ class StatsVisits extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 10)'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 10)'); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 8, 2))] = (int)($row['total']); } @@ -170,7 +170,7 @@ class StatsVisits extends ModuleGraph { for ($i = 0; $i < $layers; $i++) { - $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 13)'); + $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($this->_query[$i].$this->getDate().' GROUP BY LEFT(date_add, 13)'); foreach ($result AS $row) $this->_values[$i][(int)(substr($row['date_add'], 11, 2))] = (int)($row['total']); } diff --git a/modules/themeinstallator/themeinstallator.php b/modules/themeinstallator/themeinstallator.php index 00eab732b..62c923feb 100644 --- a/modules/themeinstallator/themeinstallator.php +++ b/modules/themeinstallator/themeinstallator.php @@ -396,7 +396,7 @@ class ThemeInstallator extends Module if ((int)(Tools::getValue('imagesConfig')) == 1 AND $foo) continue ; if ($foo) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'image_type` i SET `width` = '.(int)($row['width']).', `height` = '.(int)($row['height']).', @@ -407,7 +407,7 @@ class ThemeInstallator extends Module `scenes` = '.($row['scenes'] == 'true' ? 1 : 0).' WHERE i.name LIKE \''.pSQL($row['name']).'\''); else - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'image_type` (`name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes`) VALUES ( \''.pSQL($row['name']).'\', @@ -455,27 +455,27 @@ class ThemeInstallator extends Module self::recurseCopy(_IMPORT_FOLDER_.'modules/'.$row, _PS_ROOT_DIR_.'/modules/'.$row); $obj = Module::getInstanceByName($row); if (Validate::isLoadedObject($obj)) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` = \''.pSQL($row).'\''); else if (!$obj OR !$obj->install()) continue; - Db::getInstance()->Execute('INSERT IGNORE INTO '._DB_PREFIX_.'module_shop (id_module, id_shop) VALUES('.(int)$obj->id.', '.$shopID.')'); + Db::getInstance()->execute('INSERT IGNORE INTO '._DB_PREFIX_.'module_shop (id_module, id_shop) VALUES('.(int)$obj->id.', '.$shopID.')'); $msg .= '- '.pSQL($row).'
'; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.pSQL($obj->id).' AND id_shop = '.$shopID); $count = -1; while (isset($hookedModule[++$count])) if ($hookedModule[$count] == $row) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VALUES ('.(int)$obj->id.', '.$shopID.', '.(int)Hook::getIdByName($hook[$count]).', '.(int)$position[$count].')'); if ($exceptions[$count]) foreach ($exceptions[$count] as $file_name) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`) VALUES ('.(int)$obj->id.', '.(int)Hook::getIdByName($hook[$count]).', "'.pSQL($file_name).'")'); } @@ -493,7 +493,7 @@ class ThemeInstallator extends Module if ($flag++ == 0) $msg .= ''.$this->l('The following modules have been disabled').' :
'; $msg .= '- '.pSQL($row).'
'; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'module_shop` WHERE `id_module` = '.pSQL($obj->id).' AND id_shop = '.$shopID); } @@ -505,30 +505,30 @@ class ThemeInstallator extends Module $obj = Module::getInstanceByName($row); if (Validate::isLoadedObject($obj)) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' UPDATE `'._DB_PREFIX_.'module` SET `active`= 1 WHERE `name` = \''.pSQL($row).'\''); - Db::getInstance()->Execute('INSERT IGNORE INTO '._DB_PREFIX_.'module_shop (id_module, id_shop) VALUES('.(int)$obj->id.', '.$shopID.')'); + Db::getInstance()->execute('INSERT IGNORE INTO '._DB_PREFIX_.'module_shop (id_module, id_shop) VALUES('.(int)$obj->id.', '.$shopID.')'); } else if (!is_object($obj) OR !$obj->install()) continue ; if ($flag++ == 0) $msg .= ''.$this->l('The following modules have been enabled').' :
'; $msg .= '- '.pSQL($row).'
'; - Db::getInstance()->Execute(' + Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.pSQL($obj->id).' AND id_shop = '.$shopID); $count = -1; while (isset($hookedModule[++$count])) if ($hookedModule[$count] == $row) { - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VALUES ('.(int)$obj->id.', '.$shopID.', '.(int)Hook::getIdByName($hook[$count]).', '.(int)$position[$count].')'); foreach ($exceptions[$count] as $filename) if (!empty($filename)) - Db::getInstance()->Execute(' + Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, id_shop, `id_hook`, `file_name`) VALUES ('.(int)$obj->id.', '.$shopID.', '.(int)Hook::getIdByName($hook[$count]).', "'.pSQL($filename).'")'); } @@ -919,8 +919,8 @@ class ThemeInstallator extends Module private function _initList() { $this->native_modules = self::getTheNativeModules(); - $this->module_list = Db::getInstance()->ExecuteS('SELECT id_module, name, active FROM `'._DB_PREFIX_.'module`'); - $this->hook_list = Db::getInstance()->ExecuteS(' + $this->module_list = Db::getInstance()->executeS('SELECT id_module, name, active FROM `'._DB_PREFIX_.'module`'); + $this->hook_list = Db::getInstance()->executeS(' SELECT a.id_hook, a.name as name_hook, c.position, c.id_module, d.name as name_module, GROUP_CONCAT(hme.file_name, ",") as exceptions FROM `'._DB_PREFIX_.'hook` a LEFT JOIN `'._DB_PREFIX_.'hook_module` c ON c.id_hook = a.id_hook @@ -989,7 +989,7 @@ class ThemeInstallator extends Module */ private function getImageState() { - $table = Db::getInstance()->ExecuteS('SELECT name, width, height, products, categories, manufacturers, suppliers, scenes FROM `'._DB_PREFIX_.'image_type`'); + $table = Db::getInstance()->executeS('SELECT name, width, height, products, categories, manufacturers, suppliers, scenes FROM `'._DB_PREFIX_.'image_type`'); foreach ($table as $row) $this->image_list[] = $row['name'].';'.$row['width'].';'.$row['height'].';'. ($row['products'] == 1 ? 'true' : 'false').';'. diff --git a/modules/treepodia/treepodia.php b/modules/treepodia/treepodia.php index 309bb1f26..447e29214 100644 --- a/modules/treepodia/treepodia.php +++ b/modules/treepodia/treepodia.php @@ -99,7 +99,7 @@ class Treepodia extends Module $defaultCurrencyIsoCode = strtoupper(Db::getInstance()->getValue('SELECT c.iso_code FROM '._DB_PREFIX_.'currency c WHERE c.id_currency = '.(int)Configuration::get('PS_CURRENCY_DEFAULT'))); $defaultIdLang = (int)Configuration::get('PS_LANG_DEFAULT'); - $sqlLangs = Db::getInstance()->ExecuteS('SELECT l.id_lang, l.iso_code FROM '._DB_PREFIX_.'lang l'); + $sqlLangs = Db::getInstance()->executeS('SELECT l.id_lang, l.iso_code FROM '._DB_PREFIX_.'lang l'); foreach ($sqlLangs AS $sqlLang) $langs[$sqlLang['id_lang']] = $sqlLang['iso_code']; @@ -116,7 +116,7 @@ XML; $infos->addCData('url', $this->_getShopURL()); $infos->addCData('logo', $this->_getShopURL()); - $languages = Db::getInstance()->ExecuteS(' + $languages = Db::getInstance()->executeS(' SELECT l.iso_code FROM '._DB_PREFIX_.'lang l WHERE l.active = 1'); @@ -134,7 +134,7 @@ XML; $limit_sql = ' LIMIT '.(int)$limit_start.','.(int)$limit_end; } - $sqlProducts = Db::getInstance()->ExecuteS(' + $sqlProducts = Db::getInstance()->executeS(' SELECT p.id_product, p.reference, p.weight, m.name manufacturer, s.name supplier, p.on_sale, p.id_manufacturer, pd.id_product_download FROM '._DB_PREFIX_.'product p LEFT JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer) @@ -157,7 +157,7 @@ XML; $name = $product->addChild('name'); $languageVariant = $name->addChild('language-variant'); - $texts = Db::getInstance()->ExecuteS(' + $texts = Db::getInstance()->executeS(' SELECT pl.name, pl.description_short, pl.link_rewrite, l.iso_code, l.id_lang FROM '._DB_PREFIX_.'product_lang pl LEFT JOIN '._DB_PREFIX_.'lang l ON (l.id_lang = pl.id_lang) @@ -186,7 +186,7 @@ XML; $variant->addCData('value', Tools::htmlentitiesDecodeUTF8(strip_tags($text['description_short']))); } - $accessories = Db::getInstance()->ExecuteS(' + $accessories = Db::getInstance()->executeS(' SELECT a.id_product_2 FROM '._DB_PREFIX_.'accessory a WHERE a.id_product_1 = '.(int)$sqlProduct['id_product']); @@ -215,7 +215,7 @@ XML; $product->addChild('downloadable', $sqlProduct['id_product_download'] >= 1 ? 1 : 0); - $pack = Db::getInstance()->ExecuteS(' + $pack = Db::getInstance()->executeS(' SELECT p.id_product, pp.quantity FROM '._DB_PREFIX_.'pack pp LEFT JOIN '._DB_PREFIX_.'product p ON (p.id_product = pp.id_product_item) @@ -232,7 +232,7 @@ XML; } } - $images = Db::getInstance()->ExecuteS(' + $images = Db::getInstance()->executeS(' SELECT i.id_image, il.legend, l.iso_code FROM '._DB_PREFIX_.'image i LEFT JOIN '._DB_PREFIX_.'image_lang il ON (il.id_image = i.id_image) @@ -275,7 +275,7 @@ XML; if (version_compare(_PS_VERSION_, '1.4') < 0) { - $quantityDiscounts = Db::getInstance()->ExecuteS(' + $quantityDiscounts = Db::getInstance()->executeS(' SELECT dq.quantity, dq.value, dq.id_discount_type FROM '._DB_PREFIX_.'discount_quantity dq WHERE dq.id_product = '.intval($sqlProduct['id_product'])); @@ -299,7 +299,7 @@ XML; } } - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT cl.name, l.iso_code FROM '._DB_PREFIX_.'category_product cp LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = cp.id_category'.$this->context->shop->sqlLang('cl').') @@ -319,7 +319,7 @@ XML; } } - $tags = Db::getInstance()->ExecuteS(' + $tags = Db::getInstance()->executeS(' SELECT pt.id_product, pt.id_tag, l.iso_code, t.name FROM '._DB_PREFIX_.'product_tag pt LEFT JOIN '._DB_PREFIX_.'tag t ON (t.id_tag = pt.id_tag) @@ -347,7 +347,7 @@ XML; } } - $groupAttributes = Db::getInstance()->ExecuteS(' + $groupAttributes = Db::getInstance()->executeS(' SELECT DISTINCT agl.id_attribute_group, agl.name, l.iso_code, a.id_attribute, al.name as attribute_name, al.id_lang, pa.id_product_attribute FROM '._DB_PREFIX_.'attribute_group_lang agl LEFT JOIN '._DB_PREFIX_.'attribute a ON (a.id_attribute_group = agl.id_attribute_group) @@ -408,7 +408,7 @@ XML; } } - $groupAttributes = Db::getInstance()->ExecuteS(' + $groupAttributes = Db::getInstance()->executeS(' SELECT agl.id_attribute_group, agl.name, l.iso_code, a.id_attribute, al.name attribute_name, al.id_lang, pa.id_product_attribute FROM '._DB_PREFIX_.'attribute_group_lang agl LEFT JOIN '._DB_PREFIX_.'lang l ON (l.id_lang = agl.id_lang) @@ -428,7 +428,7 @@ XML; $combinaison[$id_product_attribute][$id_group_attribute] = $id_attribute; } - $productAttributes = Db::getInstance()->ExecuteS(' + $productAttributes = Db::getInstance()->executeS(' SELECT pa.id_product_attribute, pa.weight, pa.quantity, pi.id_image FROM '._DB_PREFIX_.'product_attribute pa LEFT JOIN '._DB_PREFIX_.'product_attribute_image pi ON (pa.id_product_attribute = pi.id_product_attribute) diff --git a/modules/trustedshops/RatingAlert.php b/modules/trustedshops/RatingAlert.php index 9fffa4ca5..3e5b95d5a 100644 --- a/modules/trustedshops/RatingAlert.php +++ b/modules/trustedshops/RatingAlert.php @@ -37,7 +37,7 @@ class RatingAlert private static function _getAlertsInformations($nb_days = 10) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT a.id_alert, c.`email`, o.`id_order`, o.`id_lang` FROM `'._DB_PREFIX_.self::TABLE_NAME.'` a LEFT JOIN '._DB_PREFIX_.'orders o ON (a.id_order = o.id_order) @@ -51,7 +51,7 @@ class RatingAlert foreach ($ids AS $id) $to_remove[] = (int)($id); - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_alert` IN (\''.implode('\',\'', $to_remove).'\')'); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_alert` IN (\''.implode('\',\'', $to_remove).'\')'); } public static function executeCronTask() @@ -86,7 +86,7 @@ class RatingAlert public static function createTable() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'` ( `id_alert` INT NOT NULL AUTO_INCREMENT, `id_order` INT NOT NULL, @@ -97,12 +97,12 @@ class RatingAlert public static function dropTable() { - return Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); } public static function truncateTable() { - return Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.self::TABLE_NAME.'`'); } } diff --git a/modules/trustedshops/lib/RatingAlert.php b/modules/trustedshops/lib/RatingAlert.php index 9fffa4ca5..3e5b95d5a 100644 --- a/modules/trustedshops/lib/RatingAlert.php +++ b/modules/trustedshops/lib/RatingAlert.php @@ -37,7 +37,7 @@ class RatingAlert private static function _getAlertsInformations($nb_days = 10) { - return Db::getInstance()->ExecuteS(' + return Db::getInstance()->executeS(' SELECT a.id_alert, c.`email`, o.`id_order`, o.`id_lang` FROM `'._DB_PREFIX_.self::TABLE_NAME.'` a LEFT JOIN '._DB_PREFIX_.'orders o ON (a.id_order = o.id_order) @@ -51,7 +51,7 @@ class RatingAlert foreach ($ids AS $id) $to_remove[] = (int)($id); - return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_alert` IN (\''.implode('\',\'', $to_remove).'\')'); + return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.self::TABLE_NAME.'` WHERE `id_alert` IN (\''.implode('\',\'', $to_remove).'\')'); } public static function executeCronTask() @@ -86,7 +86,7 @@ class RatingAlert public static function createTable() { - return Db::getInstance()->Execute(' + return Db::getInstance()->execute(' CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'` ( `id_alert` INT NOT NULL AUTO_INCREMENT, `id_order` INT NOT NULL, @@ -97,12 +97,12 @@ class RatingAlert public static function dropTable() { - return Db::getInstance()->Execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('DROP TABLE IF EXISTS `'._DB_PREFIX_.self::TABLE_NAME.'`'); } public static function truncateTable() { - return Db::getInstance()->Execute('TRUNCATE TABLE `'._DB_PREFIX_.self::TABLE_NAME.'`'); + return Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.self::TABLE_NAME.'`'); } } diff --git a/modules/trustedshops/lib/TSBuyerProtection.php b/modules/trustedshops/lib/TSBuyerProtection.php index 8642a74c2..b6981fdf9 100644 --- a/modules/trustedshops/lib/TSBuyerProtection.php +++ b/modules/trustedshops/lib/TSBuyerProtection.php @@ -205,7 +205,7 @@ class TSBuyerProtection extends AbsTrustedShops `creation_date` VARCHAR( 25 ) NOT NULL ); '; - Db::getInstance()->Execute($req); + Db::getInstance()->execute($req); $req = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'` ( `id_application` INT NOT NULL PRIMARY KEY, @@ -216,7 +216,7 @@ class TSBuyerProtection extends AbsTrustedShops `last_update` DATETIME NOT NULL ); '; - Db::getInstance()->Execute($req); + Db::getInstance()->execute($req); //add hidden category $category = new Category(); @@ -446,7 +446,7 @@ class TSBuyerProtection extends AbsTrustedShops FROM `'._DB_PREFIX_.TSBuyerProtection::DB_APPLI.'` WHERE `id_order` = "'.(int)$params['shopOrderID'].'" '; - $order = Db::getInstance()->ExecuteS($sql); + $order = Db::getInstance()->executeS($sql); // If an order was already added, no need to continue. // Otherwise a new application is created by TrustedShops. @@ -486,7 +486,7 @@ class TSBuyerProtection extends AbsTrustedShops "'.$date.'" ) '; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); // To reset product quantity in database. $sql = ' @@ -494,7 +494,7 @@ class TSBuyerProtection extends AbsTrustedShops FROM `'._DB_PREFIX_.TSBuyerProtection::DB_ITEMS.'` WHERE `ts_product_id` = "'.(int)$params['tsProductID'].'" '; - $ts_product = Db::getInstance()->ExecuteS($sql); + $ts_product = Db::getInstance()->executeS($sql); $product = new Product($ts_product[0]['id_product']); $product->quantity = 1000; $product->update(); @@ -560,7 +560,7 @@ class TSBuyerProtection extends AbsTrustedShops FROM `'.$db_name.'` WHERE `last_update` >= "'.$date.'" OR `statut_number` <= 0 '; - $to_check = Db::getInstance()->ExecuteS($sql); + $to_check = Db::getInstance()->executeS($sql); foreach ($to_check as $application) { $code = $this->_getRequestState(array('tsID'=>$application['ts_id'], 'applicationID'=>$application['id_application'])); @@ -578,7 +578,7 @@ class TSBuyerProtection extends AbsTrustedShops SET `statut_number` = "'.$code.'" WHERE `id_application` >= "'.$application['id_application'].'" '; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); $msg = new Message(); $msg->message = $return_message; $msg->id_order = (int)$application['id_order']; @@ -652,7 +652,7 @@ class TSBuyerProtection extends AbsTrustedShops LEFT JOIN `ps_product` AS p ON ts.`id_product` = p.`id_product` LEFT JOIN `ps_product_lang` AS pl ON ts.`id_product` = pl.`id_product` WHERE ts.`ts_id`="'.$ts_id.'"'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); foreach ($protection_items as $key=>$item) { @@ -717,7 +717,7 @@ class TSBuyerProtection extends AbsTrustedShops "'.pSQL($item->protectionDurationInt).'", "'.pSQL($item->tsProductID).'" )'; - Db::getInstance()->Execute($sql); + Db::getInstance()->execute($sql); } else { $this->errors['products'] = $this->l('Product wasn\'t saved.'); @@ -1265,7 +1265,7 @@ class TSBuyerProtection extends AbsTrustedShops AND `currency` = "'.$currency->iso_code.'" ORDER BY `protected_amount_decimal` LIMIT 0,1'; - $items = Db::getInstance()->ExecuteS($sql); + $items = Db::getInstance()->executeS($sql); if (empty($items)) { $sql = ' @@ -1276,7 +1276,7 @@ class TSBuyerProtection extends AbsTrustedShops AND `currency` = "'.$currency->iso_code.'" ORDER BY `protected_amount_decimal` LIMIT 0,1'; - $items = Db::getInstance()->ExecuteS($sql); + $items = Db::getInstance()->executeS($sql); } TSBuyerProtection::$smarty->assign(array( @@ -1315,7 +1315,7 @@ class TSBuyerProtection extends AbsTrustedShops AND `ts_id` ="'.TSBuyerProtection::$CERTIFICATE[$lang]['tsID'].'" AND `currency` = "'.$currency->iso_code.'" '; - $item = Db::getInstance()->ExecuteS($sql); + $item = Db::getInstance()->executeS($sql); // No items ? means no buyer protection products was bought. if(empty($item)) diff --git a/modules/twenga/twenga.php b/modules/twenga/twenga.php index bc1d0805e..78a7ad276 100644 --- a/modules/twenga/twenga.php +++ b/modules/twenga/twenga.php @@ -184,7 +184,7 @@ class Twenga extends PaymentModule private function _initCurrentIsoCodeCountry() { - $country = Db::getInstance()->ExecuteS(' + $country = Db::getInstance()->executeS(' SELECT c.iso_code as iso FROM '._DB_PREFIX_.'country as c LEFT JOIN '._DB_PREFIX_.'country_lang as c_l @@ -361,7 +361,7 @@ class Twenga extends PaymentModule private function submitTwengaDisableTracking() { - $return = Db::getInstance()->ExecuteS('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = \''.pSQL($this->id).'\''); + $return = Db::getInstance()->executeS('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = \''.pSQL($this->id).'\''); foreach ($return as $hook) { $this->unregisterHook($hook['id_hook']); @@ -528,7 +528,7 @@ class Twenga extends PaymentModule if ($id_lang === NULL) return 'Undefined id_lang'; - $country = Db::getInstance()->ExecuteS(' + $country = Db::getInstance()->executeS(' SELECT c.name as name FROM '._DB_PREFIX_.'country_lang as c WHERE c.id_lang = '.(int)$id_lang.' @@ -556,7 +556,7 @@ class Twenga extends PaymentModule foreach($this->limited_countries as $iso) $query .= "'".strtoupper($iso)."', "; $query = rtrim($query, ', ').')'; - $countriesName = Db::getInstance()->ExecuteS($query); + $countriesName = Db::getInstance()->executeS($query); $htmlError = '

'.$this->l('Your default country is').' : '.Twenga::getCurrentCountryName().'

@@ -907,7 +907,7 @@ class Twenga extends PaymentModule $link = new Link(); - $result = Db::getInstance()->ExecuteS(' + $result = Db::getInstance()->executeS(' SELECT `id_product` FROM `'._DB_PREFIX_.'product` WHERE `active` = 1'); foreach ($result AS $k => $row) diff --git a/modules/upscarrier/upscarrier.php b/modules/upscarrier/upscarrier.php index c54d1845c..ed6cd6441 100644 --- a/modules/upscarrier/upscarrier.php +++ b/modules/upscarrier/upscarrier.php @@ -173,7 +173,7 @@ class UpsCarrier extends CarrierModule // Install SQL include(dirname(__FILE__).'/sql-install.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Install Module @@ -196,7 +196,7 @@ class UpsCarrier extends CarrierModule // Uninstall SQL include(dirname(__FILE__).'/sql-uninstall.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Uninstall Module @@ -212,7 +212,7 @@ class UpsCarrier extends CarrierModule Db::getInstance()->autoExecute(_DB_PREFIX_.'ups_rate_service_code', array('active' => 0), 'UPDATE'); // Get all services availables for this group - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)($id_ups_rate_service_group)); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)($id_ups_rate_service_group)); foreach ($rateServiceList as $rateService) if (!$rateService['id_carrier']) { @@ -522,7 +522,7 @@ class UpsCarrier extends CarrierModule
'; $id_country_current = 0; - $statesList = Db::getInstance()->ExecuteS(' + $statesList = Db::getInstance()->executeS(' SELECT `id_state`, `id_country`, `name` FROM `'._DB_PREFIX_.'state` WHERE `active` = 1 ORDER BY `id_country`, `name` ASC'); @@ -550,7 +550,7 @@ class UpsCarrier extends CarrierModule '.$rateService['service'].' '.($this->webserviceTest($rateService['code']) ? '('.$this->l('Available').')' : '('.$this->l('Not available').')').'
'; $html .= ' @@ -739,7 +739,7 @@ class UpsCarrier extends CarrierModule if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$this->context->shop->sqlLang('cl').') @@ -808,7 +808,7 @@ class UpsCarrier extends CarrierModule '; // Loading config list - $configCategoryList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_category` > 0'); + $configCategoryList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_category` > 0'); if (!$configCategoryList) $html .= ''.$this->l('There is no specific UPS configuration for categories at this point.').''; foreach ($configCategoryList as $k => $c) @@ -827,7 +827,7 @@ class UpsCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'ups_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'ups_rate_service_code` ursc ON (ursc.`id_ups_rate_service_code` = urcs.`id_ups_rate_service_code`) @@ -893,7 +893,7 @@ class UpsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_ups_rate_service_code` FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)(Tools::getValue('id_ups_rate_config')).' AND `id_ups_rate_service_code` = '.(int)($rateService['id_ups_rate_service_code'])); @@ -928,7 +928,7 @@ class UpsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_ups_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -1008,7 +1008,7 @@ class UpsCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'ups_rate_config', $updTab, 'UPDATE', '`id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); foreach ($services as $s) { $addTab = array('id_ups_rate_service_code' => pSQL($s), 'id_ups_rate_config' => (int)Tools::getValue('id_ups_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1025,8 +1025,8 @@ class UpsCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_ups_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); // Display Results if ($result1) @@ -1065,7 +1065,7 @@ class UpsCarrier extends CarrierModule '; // Loading config list - $configProductList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_product` > 0'); + $configProductList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_product` > 0'); if (!$configProductList) $html .= ''.$this->l('There is no specific UPS configuration for products at this point.').''; foreach ($configProductList as $k => $c) @@ -1078,7 +1078,7 @@ class UpsCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'ups_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'ups_rate_service_code` ursc ON (ursc.`id_ups_rate_service_code` = urcs.`id_ups_rate_service_code`) @@ -1136,7 +1136,7 @@ class UpsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_ups_rate_service_code` FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)(Tools::getValue('id_ups_rate_config')).' AND `id_ups_rate_service_code` = '.(int)($rateService['id_ups_rate_service_code'])); @@ -1156,7 +1156,7 @@ class UpsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_ups_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].'
'; $html .= ' @@ -1257,7 +1257,7 @@ class UpsCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'ups_rate_config', $updTab, 'UPDATE', '`id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); foreach ($services as $s) { $addTab = array('id_ups_rate_service_code' => pSQL($s), 'id_ups_rate_config' => (int)Tools::getValue('id_ups_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1274,8 +1274,8 @@ class UpsCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_ups_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'ups_rate_config_service` WHERE `id_ups_rate_config` = '.(int)Tools::getValue('id_ups_rate_config')); // Display Results if ($result1) @@ -1420,7 +1420,7 @@ class UpsCarrier extends CarrierModule $productConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_product` = '.(int)($product['id_product'])); if ($productConfiguration['id_ups_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'ups_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'ups_rate_service_code` ursc ON (ursc.`id_ups_rate_service_code` = urcs.`id_ups_rate_service_code`) @@ -1437,7 +1437,7 @@ class UpsCarrier extends CarrierModule $categoryConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'ups_rate_config` WHERE `id_category` = '.(int)($product['id_category_default'])); if ($categoryConfiguration['id_ups_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'ups_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'ups_rate_service_code` ursc ON (ursc.`id_ups_rate_service_code` = urcs.`id_ups_rate_service_code`) @@ -1450,7 +1450,7 @@ class UpsCarrier extends CarrierModule // Return general config $config['packaging_type_code'] = Configuration::get('UPS_CARRIER_PACKAGING_TYPE'); - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)(Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')).' AND `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)(Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')).' AND `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_ups_rate_service_code']] = $service; return $config; @@ -1670,7 +1670,7 @@ class UpsCarrier extends CarrierModule if (!empty($service)) $servicesList = array(array('code' => $service)); else - $servicesList = Db::getInstance()->ExecuteS('SELECT `code` FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); + $servicesList = Db::getInstance()->executeS('SELECT `code` FROM `'._DB_PREFIX_.'ups_rate_service_code` WHERE `id_ups_rate_service_group` = '.(int)Configuration::get('UPS_CARRIER_RATE_SERVICE_GROUP')); // Testing Service foreach ($servicesList as $service) diff --git a/modules/uspscarrier/uspscarrier.php b/modules/uspscarrier/uspscarrier.php index d22341fca..6b2ccc4e1 100644 --- a/modules/uspscarrier/uspscarrier.php +++ b/modules/uspscarrier/uspscarrier.php @@ -149,7 +149,7 @@ class UspsCarrier extends CarrierModule // Install SQL include(dirname(__FILE__).'/sql-install.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Install Carriers @@ -175,7 +175,7 @@ class UspsCarrier extends CarrierModule // Uninstall SQL include(dirname(__FILE__).'/sql-uninstall.php'); foreach ($sql as $s) - if (!Db::getInstance()->Execute($s)) + if (!Db::getInstance()->execute($s)) return false; // Uninstall Module @@ -191,7 +191,7 @@ class UspsCarrier extends CarrierModule Db::getInstance()->autoExecute(_DB_PREFIX_.'usps_rate_service_code', array('active' => 0), 'UPDATE'); // Get all services availables - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach ($rateServiceList as $rateService) if (!$rateService['id_carrier']) { @@ -447,7 +447,7 @@ class UspsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= ' '.$rateService['service'].' '.('COMMERCIAL' == substr($rateService['code'], -10) ? '['.$this->l('COMMERCIAL RATE').']' : '['.$this->l('REGULAR RATE').']').' '.($this->webserviceTest($rateService['code']) ? '('.$this->l('Available').')' : '('.$this->l('Not available').')').'
'; $html .= '

'.$this->l('Choose the Delivery Services you want to be available to your customers.').'
@@ -670,7 +670,7 @@ class UspsCarrier extends CarrierModule if (isset($category['id_category'])) { - $categories = Db::getInstance()->ExecuteS(' + $categories = Db::getInstance()->executeS(' SELECT c.id_category, cl.name, cl.link_rewrite FROM '._DB_PREFIX_.'category c LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.$this->context->shop->sqlLang('cl').') @@ -741,7 +741,7 @@ class UspsCarrier extends CarrierModule '; // Loading config list - $configCategoryList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_category` > 0'); + $configCategoryList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_category` > 0'); if (!$configCategoryList) $html .= ''.$this->l('There is no specific USPS configuration for categories at this point.').''; foreach ($configCategoryList as $k => $c) @@ -760,7 +760,7 @@ class UspsCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'usps_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'usps_rate_service_code` ursc ON (ursc.`id_usps_rate_service_code` = urcs.`id_usps_rate_service_code`) @@ -843,7 +843,7 @@ class UspsCarrier extends CarrierModule


'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_usps_rate_service_code` FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)(Tools::getValue('id_usps_rate_config')).' AND `id_usps_rate_service_code` = '.(int)($rateService['id_usps_rate_service_code'])); @@ -894,7 +894,7 @@ class UspsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_usps_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].' '.('COMMERCIAL' == substr($rateService['code'], -10) ? '['.$this->l('COMMERCIAL RATE').']' : '['.$this->l('REGULAR RATE').']').'
'; $html .= ' @@ -978,7 +978,7 @@ class UspsCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'usps_rate_config', $updTab, 'UPDATE', '`id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); foreach ($services as $s) { $addTab = array('id_usps_rate_service_code' => pSQL($s), 'id_usps_rate_config' => (int)Tools::getValue('id_usps_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -995,8 +995,8 @@ class UspsCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_usps_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); // Display Results if ($result1) @@ -1037,7 +1037,7 @@ class UspsCarrier extends CarrierModule '; // Loading config list - $configProductList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_product` > 0'); + $configProductList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_product` > 0'); if (!$configProductList) $html .= ''.$this->l('There is no specific USPS configuration for products at this point.').''; foreach ($configProductList as $k => $c) @@ -1050,7 +1050,7 @@ class UspsCarrier extends CarrierModule // Loading services attached to this config $services = ''; - $servicesTab = Db::getInstance()->ExecuteS(' + $servicesTab = Db::getInstance()->executeS(' SELECT ursc.`service` FROM `'._DB_PREFIX_.'usps_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'usps_rate_service_code` ursc ON (ursc.`id_usps_rate_service_code` = urcs.`id_usps_rate_service_code`) @@ -1125,7 +1125,7 @@ class UspsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach($rateServiceList as $rateService) { $configServiceSelected = Db::getInstance()->getValue('SELECT `id_usps_rate_service_code` FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)(Tools::getValue('id_usps_rate_config')).' AND `id_usps_rate_service_code` = '.(int)($rateService['id_usps_rate_service_code'])); @@ -1145,7 +1145,7 @@ class UspsCarrier extends CarrierModule

'; - $rateServiceList = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $rateServiceList = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code`'); foreach($rateServiceList as $rateService) $html .= '_isPostCheck($rateService['id_usps_rate_service_code']) == 1) ? 'checked="checked"' : '').' /> '.$rateService['service'].' '.('COMMERCIAL' == substr($rateService['code'], -10) ? '['.$this->l('COMMERCIAL RATE').']' : '['.$this->l('REGULAR RATE').']').'
'; $html .= ' @@ -1266,7 +1266,7 @@ class UspsCarrier extends CarrierModule 'date_upd' => pSQL($date) ); $result = Db::getInstance()->autoExecute(_DB_PREFIX_.'usps_rate_config', $updTab, 'UPDATE', '`id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); - Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); foreach ($services as $s) { $addTab = array('id_usps_rate_service_code' => pSQL($s), 'id_usps_rate_config' => (int)Tools::getValue('id_usps_rate_config'), 'date_add' => pSQL($date), 'date_upd' => pSQL($date)); @@ -1283,8 +1283,8 @@ class UspsCarrier extends CarrierModule // Delete Script if (Tools::getValue('action') == 'delete' && Tools::getValue('id_usps_rate_config')) { - $result1 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); - $result2 = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + $result1 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); + $result2 = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'usps_rate_config_service` WHERE `id_usps_rate_config` = '.(int)Tools::getValue('id_usps_rate_config')); // Display Results if ($result1) @@ -1431,7 +1431,7 @@ class UspsCarrier extends CarrierModule $productConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_product` = '.(int)($product['id_product'])); if ($productConfiguration['id_usps_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'usps_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'usps_rate_service_code` ursc ON (ursc.`id_usps_rate_service_code` = urcs.`id_usps_rate_service_code`) @@ -1448,7 +1448,7 @@ class UspsCarrier extends CarrierModule $categoryConfiguration = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'usps_rate_config` WHERE `id_category` = '.(int)($product['id_category_default'])); if ($categoryConfiguration['id_usps_rate_config']) { - $servicesConfiguration = Db::getInstance()->ExecuteS(' + $servicesConfiguration = Db::getInstance()->executeS(' SELECT urcs.*, ursc.`id_carrier` FROM `'._DB_PREFIX_.'usps_rate_config_service` urcs LEFT JOIN `'._DB_PREFIX_.'usps_rate_service_code` ursc ON (ursc.`id_usps_rate_service_code` = urcs.`id_usps_rate_service_code`) @@ -1461,7 +1461,7 @@ class UspsCarrier extends CarrierModule // Return general config $config['packaging_type_code'] = Configuration::get('USPS_CARRIER_PACKAGING_TYPE'); - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_usps_rate_service_code']] = $service; return $config; @@ -1490,7 +1490,7 @@ class UspsCarrier extends CarrierModule $weight += Tools::getValue('usps_carrier_packaging_weight', Configuration::get('USPS_CARRIER_PACKAGING_WEIGHT')); // Get service in adequation with carrier and check if available - $servicesConfiguration = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code` WHERE `active` = 1'); + $servicesConfiguration = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code` WHERE `active` = 1'); foreach ($servicesConfiguration as $service) $config['services'][$service['id_usps_rate_service_code']] = $service; $serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'usps_rate_service_code` WHERE `id_carrier` = '.(int)($this->id_carrier)); @@ -1649,7 +1649,7 @@ class UspsCarrier extends CarrierModule if (!empty($service)) $servicesList = array(array('code' => $service)); else - $servicesList = Db::getInstance()->ExecuteS('SELECT `code` FROM `'._DB_PREFIX_.'usps_rate_service_code`'); + $servicesList = Db::getInstance()->executeS('SELECT `code` FROM `'._DB_PREFIX_.'usps_rate_service_code`'); // Testing Service foreach ($servicesList as $service)