diff --git a/admin-dev/tabs/AdminCMS.php b/admin-dev/tabs/AdminCMS.php index d92782f1a..2c87173fa 100644 --- a/admin-dev/tabs/AdminCMS.php +++ b/admin-dev/tabs/AdminCMS.php @@ -235,7 +235,7 @@ class AdminCMS extends AdminTab $cms = new CMS((int)(Tools::getValue('id_cms'))); $cms->cleanPositions($cms->id_cms_category); if (!$cms->delete()) - $this->_errors[] = Tools::displayError('An error occurred while deleting object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while deleting object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; else Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=1&token='.Tools::getAdminTokenLite('AdminCMSContent')); }/* Delete multiple objects */ @@ -273,7 +273,7 @@ class AdminCMS extends AdminTab $cms = new CMS(); $this->copyFromPost($cms, 'cms'); if (!$cms->add()) - $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; elseif (Tools::isSubmit('submitAddcmsAndPreview')) { $preview_url = $context->link->getCMSLink($cms, $this->getFieldValue($object, 'link_rewrite', $this->_defaultFormLanguage), $context->language->id); @@ -295,7 +295,7 @@ class AdminCMS extends AdminTab $cms = new CMS($id_cms); $this->copyFromPost($cms, 'cms'); if (!$cms->update()) - $this->_errors[] = Tools::displayError('An error occurred while updating object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while updating object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; elseif (Tools::isSubmit('submitAddcmsAndPreview')) { $preview_url = $context->link->getCMSLink($cms, $this->getFieldValue($object, 'link_rewrite', $this->_defaultFormLanguage), $context->language->id); diff --git a/admin-dev/tabs/AdminCustomers.php b/admin-dev/tabs/AdminCustomers.php index 411bc492a..0540f1d78 100644 --- a/admin-dev/tabs/AdminCustomers.php +++ b/admin-dev/tabs/AdminCustomers.php @@ -153,7 +153,7 @@ class AdminCustomers extends AdminTab $shop = new Shop((int)$object->id_shop); $object->id_group_shop = (int)$shop->id_group_shop; if (!$object->add()) - $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; elseif (($_POST[$this->identifier] = $object->id /* voluntary */) AND $this->postImage($object->id) AND !sizeof($this->_errors) AND $this->_redirect) { // Add Associated groups diff --git a/admin-dev/tabs/AdminImport.php b/admin-dev/tabs/AdminImport.php index 81491083b..480172fef 100644 --- a/admin-dev/tabs/AdminImport.php +++ b/admin-dev/tabs/AdminImport.php @@ -523,7 +523,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -577,7 +577,7 @@ class AdminImport extends AdminTab if (!$res) { $this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } @@ -634,7 +634,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -654,7 +654,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -693,7 +693,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -715,7 +715,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $categoryToCreate->name[$defaultLanguageId].(isset($categoryToCreate->id) ? ' ('.$categoryToCreate->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -762,7 +762,7 @@ class AdminImport extends AdminTab if (!$res) { $this->_errors[] = $info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } else @@ -866,7 +866,7 @@ class AdminImport extends AdminTab else { $this->_warnings[] = $image->legend[$defaultLanguageId].(isset($image->id_product) ? ' ('.$image->id_product.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -989,7 +989,7 @@ class AdminImport extends AdminTab if (!$res) { $this->_errors[] = $info['email'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : ($langFieldError !== true ? $langFieldError : '')).mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : ($langFieldError !== true ? $langFieldError : '')).Db::getInstance()->getMsgError(); } } $this->closeCsvFile($handle); @@ -1034,7 +1034,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $country->name[$defaultLanguageId].' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -1062,7 +1062,7 @@ class AdminImport extends AdminTab else { $this->_errors[] = $state->name.' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } } @@ -1075,7 +1075,7 @@ class AdminImport extends AdminTab if ($customer) $address->id_customer = (int)($customer); else - $this->_errors[] = mysql_error().' '.$address->customer_email.' '.Tools::displayError('does not exist in database').' '.(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); + $this->_errors[] = Db::getInstance()->getMsgError().' '.$address->customer_email.' '.Tools::displayError('does not exist in database').' '.(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); } else $this->_errors[] = '"'.$address->customer_email.'" :' .Tools::displayError('Is not a valid Email'); @@ -1091,8 +1091,8 @@ class AdminImport extends AdminTab $address->id_manufacturer = (int)($manufacturer->id); else { - $this->_errors[] = mysql_error().' '.$manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = Db::getInstance()->getMsgError().' '.$manufacturer->name.(isset($manufacturer->id) ? ' ('.$manufacturer->id.')' : '').' '.Tools::displayError('Cannot be saved'); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } @@ -1106,8 +1106,8 @@ class AdminImport extends AdminTab $address->id_supplier = (int)($supplier->id); else { - $this->_errors[] = mysql_error().' '.$supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = Db::getInstance()->getMsgError().' '.$supplier->name.(isset($supplier->id) ? ' ('.$supplier->id.')' : '').' '.Tools::displayError('Cannot be saved'); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } @@ -1122,7 +1122,7 @@ class AdminImport extends AdminTab if (!$res) { $this->_errors[] = $info['alias'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } $this->closeCsvFile($handle); @@ -1172,8 +1172,8 @@ class AdminImport extends AdminTab if (!$res) { - $this->_errors[] = mysql_error().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); - $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').mysql_error(); + $this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); + $this->_errors[] = ($fieldError !== true ? $fieldError : '').($langFieldError !== true ? $langFieldError : '').Db::getInstance()->getMsgError(); } } $this->closeCsvFile($handle); @@ -1203,7 +1203,7 @@ class AdminImport extends AdminTab $res = $supplier->add(); if (!$res) - $this->_errors[] = mysql_error().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); + $this->_errors[] = Db::getInstance()->getMsgError().' '.$info['name'].(isset($info['id']) ? ' (ID '.$info['id'].')' : '').' '.Tools::displayError('Cannot be saved'); else { // Associate supplier to group shop diff --git a/admin-dev/tabs/AdminTaxRulesGroup.php b/admin-dev/tabs/AdminTaxRulesGroup.php index 762b935ca..4fffd0103 100755 --- a/admin-dev/tabs/AdminTaxRulesGroup.php +++ b/admin-dev/tabs/AdminTaxRulesGroup.php @@ -541,7 +541,7 @@ class AdminTaxRulesGroup extends AdminTab $object = new $this->className(); $this->copyFromPost($object, $this->table); if (!$object->add()) - $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; elseif (($_POST[$this->identifier] = $object->id /* voluntary */) AND $this->postImage($object->id) AND !sizeof($this->_errors) AND $this->_redirect) { $parent_id = (int)(Tools::getValue('id_parent', 1)); diff --git a/classes/AdminTab.php b/classes/AdminTab.php index 00c72a074..a93bad724 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -712,7 +712,7 @@ abstract class AdminTabCore $object = new $this->className(); $this->copyFromPost($object, $this->table); if (!$object->add()) - $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.mysql_error().')'; + $this->_errors[] = Tools::displayError('An error occurred while creating object.').' '.$this->table.' ('.Db::getInstance()->getMsgError().')'; elseif (($_POST[$this->identifier] = $object->id /* voluntary */) AND $this->postImage($object->id) AND !sizeof($this->_errors) AND $this->_redirect) { $parent_id = (int)(Tools::getValue('id_parent', 1)); diff --git a/classes/MySQL.php b/classes/MySQL.php index 40fb166e7..894c5081c 100644 --- a/classes/MySQL.php +++ b/classes/MySQL.php @@ -204,7 +204,7 @@ class MySQLCore extends Db return mysql_insert_id($this->_link); return false; } - + public function Affected_Rows() { if ($this->_link) @@ -228,11 +228,10 @@ class MySQLCore extends Db } return false; } - + /** * Returns the text of the error message from previous MySQL operation * - * @acces public * @return string error */ public function getMsgError($query = false) diff --git a/install-dev/php/price_converter.php b/install-dev/php/price_converter.php index 1bf1db474..1c24dcef1 100644 --- a/install-dev/php/price_converter.php +++ b/install-dev/php/price_converter.php @@ -34,7 +34,7 @@ function convert_product_price() $taxRates[$data['id_tax']] = (float)($data['rate']) / 100; $resource = DB::getInstance()->ExecuteS('SELECT `id_product`, `price`, `id_tax` FROM `'._DB_PREFIX_.'product`', false); if (!$resource) - die(mysql_error()); + die(Db::getInstance()->getMsgError()); while ($row = DB::getInstance()->nextRow($resource)) if ($row['id_tax']) {