From ba4e1a2baf58b91cfcd9e0c4ce9dff9495cdd46c Mon Sep 17 00:00:00 2001 From: lLefevre Date: Thu, 29 Mar 2012 08:31:28 +0000 Subject: [PATCH] [-] BO : remove sprintf() which are unnecessary --- classes/CustomerMessage.php | 6 +++--- classes/CustomerThread.php | 6 +++--- classes/Employee.php | 4 ++-- classes/RequestSql.php | 4 ++-- classes/shop/GroupShop.php | 8 +------- classes/shop/Shop.php | 8 +------- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php index 634778f69..5a8d74a78 100644 --- a/classes/CustomerMessage.php +++ b/classes/CustomerMessage.php @@ -86,11 +86,11 @@ class CustomerMessageCore extends ObjectModel FROM '._DB_PREFIX_.'customer_message '); else - return (int)Db::getInstance()->getValue(sprintf(' + return (int)Db::getInstance()->getValue(' SELECT COUNT(*) FROM '._DB_PREFIX_.'customer_message - WHERE %s - ', $where)); + WHERE '.$where + ); } } diff --git a/classes/CustomerThread.php b/classes/CustomerThread.php index 63319bc4f..d94012dd6 100644 --- a/classes/CustomerThread.php +++ b/classes/CustomerThread.php @@ -122,11 +122,11 @@ class CustomerThreadCore extends ObjectModel FROM '._DB_PREFIX_.'customer_thread '); else - return (int)Db::getInstance()->getValue(sprintf(' + return (int)Db::getInstance()->getValue(' SELECT COUNT(*) FROM '._DB_PREFIX_.'customer_thread - WHERE %s - ', $where)); + WHERE '.$where + ); } public static function getMessageCustomerThreads($id_customer_thread) diff --git a/classes/Employee.php b/classes/Employee.php index b3127dc0b..39d7dad94 100644 --- a/classes/Employee.php +++ b/classes/Employee.php @@ -294,12 +294,12 @@ class EmployeeCore extends ObjectModel public static function getTotalEmployeeShopById($id) { - return (int)Db::getInstance()->getValue(sprintf('SELECT COUNT(*) FROM`'._DB_PREFIX_.'employee_shop` WHERE `id_employee` = %d', (int)$id)); + return (int)Db::getInstance()->getValue('SELECT COUNT(*) FROM`'._DB_PREFIX_.'employee_shop` WHERE `id_employee` = '.(int)$id); } public static function getEmployeeShopById($id) { - $result = Db::getInstance()->executeS(sprintf('SELECT * FROM`'._DB_PREFIX_.'employee_shop` WHERE `id_employee` = %d', (int)$id)); + $result = Db::getInstance()->executeS('SELECT * FROM`'._DB_PREFIX_.'employee_shop` WHERE `id_employee` = '.(int)$id); $data = array(); foreach ($result as $group_data) $data[] = (int)$group_data['id_shop']; diff --git a/classes/RequestSql.php b/classes/RequestSql.php index 02da7dfb7..afafaa490 100644 --- a/classes/RequestSql.php +++ b/classes/RequestSql.php @@ -101,7 +101,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('SELECT `sql` FROM `'._DB_PREFIX_.'request_sql` WHERE `id_request_sql` = '.(int)$id); } /** @@ -216,7 +216,7 @@ class RequestSqlCore extends ObjectModel */ public function getAttributesByTable($table) { - return Db::getInstance()->executeS(sprintf('DESCRIBE %s', $table)); + return Db::getInstance()->executeS('DESCRIBE '.pSQL($table)); } /** diff --git a/classes/shop/GroupShop.php b/classes/shop/GroupShop.php index c0ef3d5cd..aa613ee4e 100644 --- a/classes/shop/GroupShop.php +++ b/classes/shop/GroupShop.php @@ -153,13 +153,7 @@ class GroupShopCore extends ObjectModel */ public static function getGroupShopById($id, $identifier, $table) { - $sql = sprintf(' - SELECT `id_group_shop`, `%s` - FROM `'._DB_PREFIX_.'%s_group_shop` - WHERE `%s` = %d' - , $identifier, $table, $identifier, $id); - - return Db::getInstance()->executeS($sql); + return Db::getInstance()->executeS('SELECT `id_group_shop`, `'.pSQL($identifier).'` FROM `'._DB_PREFIX_.pSQL($table).'_group_shop` WHERE `'.pSQL($identifier).'` = '.(int)$id); } public function copyGroupShopData($old_id, $tables_import = false, $deleted = false) diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index 8a7d54c9d..d5a687fc2 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -641,13 +641,7 @@ class ShopCore extends ObjectModel */ public static function getShopById($id, $identifier, $table) { - $sql = sprintf(' - SELECT `id_shop`, `%s` - FROM `'._DB_PREFIX_.'%s_shop` - WHERE `%s` = %d', - pSQL($identifier), pSQL($table), pSQL($identifier), $id); - - return Db::getInstance()->executeS($sql); + return Db::getInstance()->executeS('SELECT `id_shop`, `'.pSQL($identifier).'` FROM `'._DB_PREFIX_.pSQL($table).'_shop` WHERE `'.pSQL($identifier).'` = '.(int)$id); } public static function setContext($type, $id = null)