').'
+ '.(!empty($order->gift_message) ? '').'
'.nl2br2($message['message']).'
'; + echo ''.Tools::nl2br($message['message']).'
'; echo ''; echo ''.$sql.'')); + die(Tools::displayError($this->getMsgError())); + } + } + + /** + * 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) + * @return string Sanitized data + */ + public function escape($string, $htmlOK) + { + if (_PS_MAGIC_QUOTES_GPC_) + $string = stripslashes($string); + if (!is_numeric($string)) + { + $string = $this->_escape($string); + if (!$htmlOK) + $string = strip_tags(Tools::nl2br($string)); + } + + return $string; + } /** * Alias of Db::getInstance()->ExecuteS @@ -264,80 +469,21 @@ abstract class DbCore * @acces string query The query to execute * @return array Array of line returned by MySQL */ - static public function s($query, $use_cache = 1) + static public function s($sql, $use_cache = 1) { - return Db::getInstance()->ExecuteS($query, true, $use_cache); + return Db::getInstance()->ExecuteS($sql, true, $use_cache); } - static public function ps($query, $use_cache = 1) + static public function ps($sql, $use_cache = 1) { - $ret = Db::s($query, $use_cache); + $ret = Db::s($sql, $use_cache); p($ret); return $ret; } - static public function ds($query, $use_cache = 1) + static public function ds($sql, $use_cache = 1) { - Db::s($query, $use_cache); + Db::s($sql, $use_cache); die(); } - - /** - * getRow return an associative array containing the first row of the query - * This function automatically add "limit 1" to the query - * - * @param mixed $query the select query (without "LIMIT 1") - * @param int $use_cache find it in cache first - * @return array associative array of (field=>value) - */ - abstract public function getRow($query, $use_cache = 1); - - /** - * getValue return the first item of a select query. - * - * @param mixed $query - * @param int $use_cache - * @return void - */ - abstract public function getValue($query, $use_cache = 1); - - /** - * Returns the text of the error message from previous database operation - */ - abstract public function getMsgError(); -} - -/** - * 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) - * @return string Sanitized data - */ -function pSQL($string, $htmlOK = false) -{ - if (_PS_MAGIC_QUOTES_GPC_) - $string = stripslashes($string); - if (!is_numeric($string)) - { - $link = Db::getInstance()->getRessource(); - $string = _PS_MYSQL_REAL_ESCAPE_STRING_ ? Db::getInstance()->escape($string, $link) : addslashes($string); - if (!$htmlOK) - $string = strip_tags(nl2br2($string)); - } - - return $string; -} - -/** - * Convert \n and \r\n and \r to
'.$query.'')); - } - die(Tools::displayError((mysql_error()))); - } + return mysql_errno($this->_link); } /** @@ -252,17 +119,28 @@ class MySQLCore extends Db */ public function getVersion() { - return mysql_get_server_info(); + return mysql_get_server_info($this->_link); } /** - * @see DbCore::escape() + * @see DbCore::_escape() */ - public function escape($str) + public function _escape($str) { - return mysql_real_escape_string($str, $this->_link); + 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); } + /** + * @see DbCore::tryToConnect() + */ static public function tryToConnect($server, $user, $pwd, $db) { if (!$link = @mysql_connect($server, $user, $pwd)) @@ -273,6 +151,9 @@ class MySQLCore extends Db return 0; } + /** + * @see DbCore::tryUTF8() + */ static public function tryUTF8($server, $user, $pwd) { $link = @mysql_connect($server, $user, $pwd); diff --git a/classes/OrderReturn.php b/classes/OrderReturn.php index 13a2a116c..27978700c 100644 --- a/classes/OrderReturn.php +++ b/classes/OrderReturn.php @@ -65,7 +65,7 @@ class OrderReturnCore extends ObjectModel $fields['state'] = pSQL($this->state); $fields['date_add'] = pSQL($this->date_add); $fields['date_upd'] = pSQL($this->date_upd); - $fields['question'] = pSQL(nl2br2($this->question), true); + $fields['question'] = pSQL(Tools::nl2br($this->question), true); return $fields; } diff --git a/classes/Shop.php b/classes/Shop.php index 01a1c9b4d..1d4720fd8 100644 --- a/classes/Shop.php +++ b/classes/Shop.php @@ -185,7 +185,7 @@ class ShopCore extends ObjectModel AND s.active = 1 AND s.deleted = 0'; if (!$id_shop = $db->getValue($sql)) - $id_shop = Configuration::get('PS_SHOP_DEFAULT'); + $id_shop = (int)Db::getInstance()->getValue('SELECT value FROM '._DB_PREFIX_.'configuration WHERE name = \'PS_SHOP_DEFAULT\''); } // Get instance of found shop @@ -496,6 +496,8 @@ class ShopCore extends ObjectModel } else { + if (!isset($context->shop)) + return ($type == 'shop' || $type == 'group') ? '' : array('', ''); $shopID = (int)$context->shop->id_shop; $shopGroupID = (int)$context->shop->id_group_shop; } diff --git a/classes/Tools.php b/classes/Tools.php index e880ace7c..54b549a7c 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -2094,7 +2094,17 @@ FileETag INode MTime Size public static function url($begin, $end) { return $begin.((strpos($begin, '?') !== false) ? '&' : '?').$end; - + } + + /** + * Convert \n and \r\n and \r to