diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php
index 33c9bfae467d2fcfffc95ff5959ce00b5013037b..81c1b611b56f99441bcb9132f426ec35657885ed 100644
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.php
@@ -37,7 +37,7 @@ if (!$user->admin)
llxHeader();
-if (! strlen(DB_NAME_OSC))
+if (! strlen(OSC_DB_NAME))
{
print "Non dispo";
llxFooter();
@@ -57,7 +57,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php");
-$sql = "SELECT l.languages_id, l.name, l.code FROM ".DB_NAME_OSC.".languages as l";
+$sql = "SELECT l.languages_id, l.name, l.code FROM ".OSC_DB_NAME.".languages as l";
$sql .= $db->plimit( $limit ,$offset);
diff --git a/htdocs/boutique/client/client.class.php b/htdocs/boutique/client/client.class.php
index 22b0e51060f40b5abd6b4361bdda2a46f241a1b8..3de0647e0dfce4b3f3126c4d75e810a468711434 100644
--- a/htdocs/boutique/client/client.class.php
+++ b/htdocs/boutique/client/client.class.php
@@ -48,7 +48,7 @@ class Client {
function fetch ($id) {
- $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".DB_NAME_OSC.".customers WHERE customers_id = $id";
+ $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".OSC_DB_NAME.".customers WHERE customers_id = $id";
$result = $this->db->query($sql) ;
diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php
index 896bfb971b9d21618480bc2cf11e0e90da83d2f0..2819aa91f45b47c8ae158a2bf5d1647d2f448cf4 100644
--- a/htdocs/boutique/client/fiche.php
+++ b/htdocs/boutique/client/fiche.php
@@ -54,7 +54,7 @@ if ($_GET['id'])
*
*/
$sql = "SELECT o.orders_id, o.customers_id,".$db->pdate("date_purchased")." as date_purchased, t.value as total";
- $sql .= " FROM ".DB_NAME_OSC.".orders as o, ".DB_NAME_OSC.".orders_total as t";;
+ $sql .= " FROM ".OSC_DB_NAME.".orders as o, ".OSC_DB_NAME.".orders_total as t";;
$sql .= " WHERE o.customers_id = " . $client->id;
$sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'";
if ( $db->query($sql) )
diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php
index a462421a7cecf66d5a21f8b41de11c8930c80101..0378858380b68c5064c8c12800b7d6ca41a4c383 100644
--- a/htdocs/boutique/client/index.php
+++ b/htdocs/boutique/client/index.php
@@ -42,7 +42,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des clients", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
-$sql .= " FROM ".DB_NAME_OSC.".customers as c";
+$sql .= " FROM ".OSC_DB_NAME.".customers as c";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $db->plimit( $limit ,$offset);
diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php
index 02e8678943cf48b146fcf72fab2a0e7543e2f805..1dd0678e88a50cc77023682de846f99d25a655c6 100644
--- a/htdocs/boutique/commande/ca.php
+++ b/htdocs/boutique/commande/ca.php
@@ -45,7 +45,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
print '<td align="right">'.$langs->trans("Lastname").'</td></tr>';
$sql = "SELECT sum(t.value) as value";
-$sql .= " FROM ".DB_NAME_OSC.".orders_total as t";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " WHERE t.class = 'ot_subtotal'";
if ( $db->query($sql) )
@@ -73,7 +73,7 @@ else
}
$sql = "SELECT sum(t.value) as value";
-$sql .= " FROM ".DB_NAME_OSC.".orders_total as t";
+$sql .= " FROM ".OSC_DB_NAME.".orders_total as t";
$sql .= " WHERE t.class = 'ot_shipping'";
if ( $db->query($sql) )
diff --git a/htdocs/boutique/commande/commande.class.php b/htdocs/boutique/commande/commande.class.php
index 17ebb53adcb92ca8db6e1b8b11840231d8a0dec9..136d24897d480ba4ff138ac0eed8f3e97fba5889 100644
--- a/htdocs/boutique/commande/commande.class.php
+++ b/htdocs/boutique/commande/commande.class.php
@@ -49,7 +49,7 @@ class Commande {
$sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, ".$this->db->pdate("date_purchased") . " as date_purchased, orders_status, orders_date_finished, currency, currency_value";
- $sql .= " FROM ".DB_NAME_OSC.".orders WHERE orders_id = $id";
+ $sql .= " FROM ".OSC_DB_NAME.".orders WHERE orders_id = $id";
$result = $this->db->query($sql) ;
@@ -83,7 +83,7 @@ class Commande {
* Totaux
*/
$sql = "SELECT value, class ";
- $sql .= " FROM ".DB_NAME_OSC.".orders_total WHERE orders_id = $id";
+ $sql .= " FROM ".OSC_DB_NAME.".orders_total WHERE orders_id = $id";
$result = $this->db->query($sql) ;
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
index 9f843bea3e08c4906a7a84300a610db9851f2ebc..d737317559775c8e8cbdf92b9e63e7f8eb6277a8 100644
--- a/htdocs/boutique/commande/fiche.php
+++ b/htdocs/boutique/commande/fiche.php
@@ -64,7 +64,7 @@ if ($_GET['id'])
*
*/
$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
- $sql .= " FROM ".DB_NAME_OSC.".orders_products";
+ $sql .= " FROM ".OSC_DB_NAME.".orders_products";
$sql .= " WHERE orders_id = " . $commande->id;
if ( $db->query($sql) )
diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php
index 285b99bfc63a4c8ccf88f3a0d1b0a7a973a8a531..8bd782890f40cdae9431506cb7f512e11702342b 100644
--- a/htdocs/boutique/commande/index.php
+++ b/htdocs/boutique/commande/index.php
@@ -42,7 +42,7 @@ print_barre_liste("Liste des commandes", $page, "commande.php");
$sql = "SELECT o.orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified,".$db->pdate("date_purchased")." as date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value";
-$sql .= " FROM ".DB_NAME_OSC.".orders as o, ".DB_NAME_OSC.".orders_total as t";
+$sql .= " FROM ".OSC_DB_NAME.".orders as o, ".OSC_DB_NAME.".orders_total as t";
$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'";
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $db->plimit( $limit ,$offset);
diff --git a/htdocs/boutique/livre/livre.class.php b/htdocs/boutique/livre/livre.class.php
index 8218354acf51221c6a995a08adb20cc99af24d0a..99e066122838f2bc49acb828766bf435741d3be8 100644
--- a/htdocs/boutique/livre/livre.class.php
+++ b/htdocs/boutique/livre/livre.class.php
@@ -52,19 +52,19 @@ class Livre {
$this->annee = 0;
}
- $sql = "INSERT INTO ".DB_NAME_OSC.".products (products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added) ";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products (products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added) ";
$sql .= "VALUES ('', '', 'Array', '', null, '', '0', '0', '8', now())";
if ($this->db->query($sql) )
{
- $idosc = $this->db->last_insert_id(DB_NAME_OSC.".products");
+ $idosc = $this->db->last_insert_id(OSC_DB_NAME.".products");
- $sql = "INSERT INTO ".DB_NAME_OSC.".products_to_categories (products_id, categories_id) VALUES ($idosc, 0)";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products_to_categories (products_id, categories_id) VALUES ($idosc, 0)";
if ($this->db->query($sql) )
{
- $sql = "INSERT INTO ".DB_NAME_OSC.".products_description (products_name, products_description, products_url, products_id, language_id) VALUES ('".trim($this->titre)."', '".trim($this->description)."', '', $idosc, '".OSC_LANGUAGE_ID."')";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products_description (products_name, products_description, products_url, products_id, language_id) VALUES ('".trim($this->titre)."', '".trim($this->description)."', '', $idosc, '".OSC_LANGUAGE_ID."')";
if ($this->db->query($sql) )
{
@@ -186,7 +186,7 @@ class Livre {
function unlinkcategorie($categories_id)
{
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories ";
$sql .= " WHERE products_id=".$this->oscid;
$sql .= " AND categories_id=".$categories_id;
@@ -207,7 +207,7 @@ class Livre {
function linkcategorie($categories_id)
{
- $sql = "INSERT INTO ".DB_NAME_OSC.".products_to_categories ";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products_to_categories ";
$sql .= " (products_id, categories_id)";
$sql .= " VALUES (".$this->oscid.",".$categories_id.")";
@@ -235,7 +235,7 @@ class Livre {
$pcat = array();
$sql = "SELECT products_id, categories_id";
- $sql .= " FROM ".DB_NAME_OSC.".products_to_categories ";
+ $sql .= " FROM ".OSC_DB_NAME.".products_to_categories ";
$sql .= " WHERE products_id = " . $this->oscid;
if ($this->db->query($sql) )
@@ -283,7 +283,7 @@ class Livre {
*/
function update_status($status)
{
- $sql = "UPDATE ".DB_NAME_OSC.".products ";
+ $sql = "UPDATE ".OSC_DB_NAME.".products ";
$sql .= " SET products_status = ".$status;
$sql .= " WHERE products_id = " . $this->oscid;
@@ -379,7 +379,7 @@ class Livre {
}
- $sql = "UPDATE ".DB_NAME_OSC.".products_description ";
+ $sql = "UPDATE ".OSC_DB_NAME.".products_description ";
$sql .= " SET products_name = '".addslashes($this->titre)."'";
@@ -396,7 +396,7 @@ class Livre {
if ( $this->db->query($sql) )
{
- $sql = "UPDATE ".DB_NAME_OSC.".products ";
+ $sql = "UPDATE ".OSC_DB_NAME.".products ";
$sql .= "SET products_model = '".$this->ref."'";
$sql .= ", products_image = '".$this->image."'";
$sql .= ", products_price = ".ereg_replace(",",".",$this->price)."";
@@ -499,7 +499,7 @@ class Livre {
$sql = "SELECT products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added";
- $sql .= " FROM ".DB_NAME_OSC.".products WHERE products_id = " . $this->oscid;
+ $sql .= " FROM ".OSC_DB_NAME.".products WHERE products_id = " . $this->oscid;
$result = $this->db->query($sql) ;
@@ -539,7 +539,7 @@ class Livre {
*/
function update_image($file_name)
{
- $sql = "UPDATE ".DB_NAME_OSC.".products SET products_image='".$file_name."'";
+ $sql = "UPDATE ".OSC_DB_NAME.".products SET products_image='".$file_name."'";
$sql .= " WHERE products_id = " . $this->oscid;
$result = $this->db->query($sql) ;
@@ -555,11 +555,11 @@ class Livre {
*/
function delete()
{
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = ".$this->oscid;
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = ".$this->oscid;
$result = $this->db->query($sql) ;
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = ".$this->oscid;
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = ".$this->oscid;
$result = $this->db->query($sql) ;
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = ".$this->oscid;
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = ".$this->oscid;
$result = $this->db->query($sql) ;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."livre WHERE rowid = ".$this->id;
$result = $this->db->query($sql) ;
diff --git a/htdocs/boutique/newsletter/newsletter.class.php b/htdocs/boutique/newsletter/newsletter.class.php
index 702d54803a405333aaa92d2b13e31e0792563e71..c43c7c49d30bf100cb3f30d68ca202a96887ca37 100644
--- a/htdocs/boutique/newsletter/newsletter.class.php
+++ b/htdocs/boutique/newsletter/newsletter.class.php
@@ -196,7 +196,7 @@ class Newsletter {
{
$sql = "SELECT c.customers_lastname as name, c.customers_firstname as firstname, c.customers_email_address as email";
- $sql .= " FROM ".DB_NAME_OSC.".customers as c";
+ $sql .= " FROM ".OSC_DB_NAME.".customers as c";
$sql .= " WHERE c.customers_newsletter=1";
}
diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php
index a7f8b4899ffa965b86761216a610f8be18e8ec59..40458157060841f4eead8c167c363b4f47083577 100644
--- a/htdocs/boutique/notification/index.php
+++ b/htdocs/boutique/notification/index.php
@@ -43,8 +43,8 @@ $offset = $limit * $page ;
print_barre_liste("Liste des notifications", $page, "index.php");
$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, p.products_name, p.products_id";
-$sql .= " FROM ".DB_NAME_OSC.".products_notifications as n,".DB_NAME_OSC.".products_description as p";
-$sql .= ",".DB_NAME_OSC.".customers as c";
+$sql .= " FROM ".OSC_DB_NAME.".products_notifications as n,".OSC_DB_NAME.".products_description as p";
+$sql .= ",".OSC_DB_NAME.".customers as c";
$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder ";
diff --git a/htdocs/boutique/notification/notification.class.php b/htdocs/boutique/notification/notification.class.php
index d8b399c1af0b34e3de66d9570a69c27a5e636b5b..dc3d96944f913d0993625c69f35625a629aeeaa2 100644
--- a/htdocs/boutique/notification/notification.class.php
+++ b/htdocs/boutique/notification/notification.class.php
@@ -138,11 +138,11 @@ class Editeur {
*/
function delete($user) {
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = $idosc ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc ";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."livre WHERE rowid = $id";
diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php
index 85e7be9e37e0db4c6d05ee532b052cc5f41d142e..8135b71ef5a74c27ad4e7465ff690485b9bb76ea 100644
--- a/htdocs/boutique/notification/produits.php
+++ b/htdocs/boutique/notification/produits.php
@@ -40,7 +40,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits suivis", $page, "produits.php");
$sql = "SELECT p.products_name, p.products_id, count(p.products_id) as nb";
-$sql .= " FROM ".DB_NAME_OSC.".products_notifications as n,".DB_NAME_OSC.".products_description as p";
+$sql .= " FROM ".OSC_DB_NAME.".products_notifications as n,".OSC_DB_NAME.".products_description as p";
$sql .= " WHERE p.products_id=n.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID;
$sql .= " GROUP BY p.products_name, p.products_id";
diff --git a/htdocs/commande/osccommande.class.php b/htdocs/commande/osccommande.class.php
index 574003115ff27ef8403aa71a0a861a402cac2f27..01585ce8909acb3631f3101e2a541aa4167efdeb 100644
--- a/htdocs/commande/osccommande.class.php
+++ b/htdocs/commande/osccommande.class.php
@@ -39,7 +39,7 @@ class OscCommande {
function fetch ($id)
{
- $sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".DB_NAME_OSC.".orders as o";
+ $sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".OSC_DB_NAME.".orders as o";
$sql .= " WHERE o.orders_id = $id";
$result = $this->db->query($sql) ;
diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/includes/boxes/box_osc_client.php
index eea08affaed1dd4abbb0d0105eb50ed897c4760e..4118d5185ad7faa3883d7777e3ab4a0e8ff1fb88 100644
--- a/htdocs/includes/boxes/box_osc_client.php
+++ b/htdocs/includes/boxes/box_osc_client.php
@@ -64,7 +64,7 @@ class box_osc_clients extends ModeleBoxes {
if ($user->rights->boutique->lire)
{
- $sql = "SELECT count(*) as cus FROM ".DB_NAME_OSC.".customers";
+ $sql = "SELECT count(*) as cus FROM ".OSC_DB_NAME.".customers";
$result = $db->query($sql);
if ($result)
diff --git a/htdocs/product/album/album.class.php b/htdocs/product/album/album.class.php
index 441748f70d594ee05464fe0019fbe6f1daffde06..9edc7f82525a28756efe7aa1236fdbd66ff173c0 100644
--- a/htdocs/product/album/album.class.php
+++ b/htdocs/product/album/album.class.php
@@ -48,19 +48,19 @@ class Album {
$this->annee = 0;
}
- $sql = "INSERT INTO ".DB_NAME_OSC.".products (products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added) ";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products (products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added) ";
$sql .= "VALUES ('', '', 'Array', '', null, '', '0', '0', '8', now())";
if ($this->db->query($sql) )
{
- $idosc = $this->db->last_insert_id(DB_NAME_OSC.".products");
+ $idosc = $this->db->last_insert_id(OSC_DB_NAME.".products");
- $sql = "INSERT INTO ".DB_NAME_OSC.".products_to_categories (products_id, categories_id) VALUES ($idosc, 0)";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products_to_categories (products_id, categories_id) VALUES ($idosc, 0)";
if ($this->db->query($sql) )
{
- $sql = "INSERT INTO ".DB_NAME_OSC.".products_description (products_name, products_description, products_url, products_id, language_id) VALUES ('".trim($this->titre)."', '".trim($this->description)."', '', $idosc, '1')";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".products_description (products_name, products_description, products_url, products_id, language_id) VALUES ('".trim($this->titre)."', '".trim($this->description)."', '', $idosc, '1')";
if ($this->db->query($sql) )
{
@@ -162,7 +162,7 @@ class Album {
function updateosc()
{
- $sql = "UPDATE ".DB_NAME_OSC.".products_description ";
+ $sql = "UPDATE ".OSC_DB_NAME.".products_description ";
$sql .= " SET products_name = '".$this->titre."'";
@@ -275,7 +275,7 @@ class Album {
$sql = "SELECT products_quantity, products_model, products_image, products_price, products_date_available, products_weight, products_status, products_tax_class_id, manufacturers_id, products_date_added";
- $sql .= " FROM ".DB_NAME_OSC.".products WHERE products_id = " . $this->oscid;
+ $sql .= " FROM ".OSC_DB_NAME.".products WHERE products_id = " . $this->oscid;
$result = $this->db->query($sql) ;
@@ -308,11 +308,11 @@ class Album {
*/
function delete($user) {
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = $idosc ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc ";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."album WHERE rowid = $id";
diff --git a/htdocs/product/categorie/categorie.class.php b/htdocs/product/categorie/categorie.class.php
index 49785381a2cc0ff9b6a5125cb5fa9aa35b05f7ff..265e230091913eff70d148368a53fcf0c95852bb 100644
--- a/htdocs/product/categorie/categorie.class.php
+++ b/htdocs/product/categorie/categorie.class.php
@@ -85,7 +85,7 @@ class Categorie {
$cl = array();
$sql = "SELECT c.categories_id, cd.categories_name ";
- $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd";
+ $sql .= " FROM ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " AND c.parent_id = 0 ORDER BY cd.categories_name";
@@ -155,7 +155,7 @@ class Categorie {
$ga = array();
$sql = "SELECT c.categories_id, cd.categories_name";
- $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd";
+ $sql .= " FROM ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " AND c.parent_id = " . $this->id;
$sql .= " ORDER BY cd.categories_name";
@@ -214,7 +214,7 @@ class Categorie {
function fetch ($id) {
$sql = "SELECT c.categories_id, cd.categories_name, c.parent_id";
- $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd";
+ $sql .= " FROM ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " AND c.categories_id = $id";
$result = $this->db->query($sql) ;
@@ -241,11 +241,11 @@ class Categorie {
*/
function delete($user) {
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = $idosc ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc ";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."album WHERE rowid = $id";
diff --git a/htdocs/product/categorie/index.php b/htdocs/product/categorie/index.php
index 88d31f55816a5d8aa8c1037a9c2757704385ea91..dd0fc809e42a26ff362e36106279b50666a56bba 100644
--- a/htdocs/product/categorie/index.php
+++ b/htdocs/product/categorie/index.php
@@ -32,7 +32,7 @@ if ($id)
print_barre_liste($title, $page, "index.php");
- $sql = "SELECT products_id FROM ".DB_NAME_OSC.".products_to_categories WHERE categories_id = $id";
+ $sql = "SELECT products_id FROM ".OSC_DB_NAME.".products_to_categories WHERE categories_id = $id";
if ( $db->query($sql) )
{
@@ -121,7 +121,7 @@ else
print_barre_liste("Liste des cat�gories", $page, "index.php");
$sql = "SELECT c.categories_id, cd.categories_name ";
- $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd";
+ $sql .= " FROM ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " AND c.parent_id = 0";
$sql .= " ORDER BY cd.categories_name ASC ";
diff --git a/htdocs/product/critiques/bestproduct.php b/htdocs/product/critiques/bestproduct.php
index f606c1c2ae021509eb5a4cbfcfaae91fbbe7e9ab..ce1d9b89f4a4f2f5c229ef35a11a6f64560cab23 100644
--- a/htdocs/product/critiques/bestproduct.php
+++ b/htdocs/product/critiques/bestproduct.php
@@ -41,7 +41,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits class�s pas critiques", $page, "bestproduct.php");
$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status";
-$sql .= " FROM ".DB_NAME_OSC.".reviews as r,".DB_NAME_OSC.".products as p ";
+$sql .= " FROM ".OSC_DB_NAME.".reviews as r,".OSC_DB_NAME.".products as p ";
$sql .= " WHERE r.products_id = p.products_id";
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";
diff --git a/htdocs/product/critiques/critique.class.php b/htdocs/product/critiques/critique.class.php
index 23f2e685b888b17eef296b9589b31a71e87def08..c8156325990f9384ee86aed739e5c71d7bb91ef9 100644
--- a/htdocs/product/critiques/critique.class.php
+++ b/htdocs/product/critiques/critique.class.php
@@ -40,8 +40,8 @@ class Critique {
$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name";
- $sql .= " FROM ".DB_NAME_OSC.".reviews as r, ".DB_NAME_OSC.".reviews_description as d";
- $sql .= " ,".DB_NAME_OSC.".products_description as p";
+ $sql .= " FROM ".OSC_DB_NAME.".reviews as r, ".OSC_DB_NAME.".reviews_description as d";
+ $sql .= " ,".OSC_DB_NAME.".products_description as p";
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID. " AND d.languages_id=".OSC_LANGUAGE_ID;
diff --git a/htdocs/product/critiques/index.php b/htdocs/product/critiques/index.php
index 866f5260fcbfe87fcfce47bd03fcee2a3ecf5531..2d8ddb3ecfbffc1ce4026062c2d169613400a82e 100644
--- a/htdocs/product/critiques/index.php
+++ b/htdocs/product/critiques/index.php
@@ -38,7 +38,7 @@ $offset = $limit * $page ;
print_barre_liste("Critiques", $page, "index.php");
-$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".DB_NAME_OSC.".reviews as r, ".DB_NAME_OSC.".reviews_description as d, ".DB_NAME_OSC.".products_description as p";
+$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".OSC_DB_NAME.".reviews as r, ".OSC_DB_NAME.".reviews_description as d, ".OSC_DB_NAME.".products_description as p";
$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
$sql .= " AND p.language_id = ".OSC_LANGUAGE_ID. " AND d.languages_id=".OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder ";
diff --git a/htdocs/product/groupart/groupart.class.php b/htdocs/product/groupart/groupart.class.php
index 6c52805aa37c20bdf62d671ba7673116500274ed..8ee915c4193c8dfa19919e5eb03abda81c38a5d1 100644
--- a/htdocs/product/groupart/groupart.class.php
+++ b/htdocs/product/groupart/groupart.class.php
@@ -202,11 +202,11 @@ class Groupart {
*/
function delete($user) {
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = $idosc ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc ";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."album WHERE rowid = $id";
diff --git a/htdocs/product/osc-liste.php b/htdocs/product/osc-liste.php
index 7a9e609061bf66904bf48bdcda7baef476fa3e08..561073c2254b705cfd4da7b28d28af75e4efd43c 100644
--- a/htdocs/product/osc-liste.php
+++ b/htdocs/product/osc-liste.php
@@ -46,7 +46,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php");
$sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id";
-$sql .= " FROM ".DB_NAME_OSC.".products as p, ".DB_NAME_OSC.".products_description as d, ".DB_NAME_OSC.".manufacturers as m";
+$sql .= " FROM ".OSC_DB_NAME.".products as p, ".OSC_DB_NAME.".products_description as d, ".OSC_DB_NAME.".manufacturers as m";
$sql .= " WHERE p.products_id = d.products_id AND d.language_id =" . OSC_LANGUAGE_ID;
$sql .= " AND p.manufacturers_id=m.manufacturers_id";
if ($_GET['reqstock']=='epuise')
diff --git a/htdocs/product/osc-productsbyreviews.php b/htdocs/product/osc-productsbyreviews.php
index 243570c416494e1e54941792affe5b27856e2521..8dee2aad2c19ea63fe53194f7c6818d3d628cdff 100644
--- a/htdocs/product/osc-productsbyreviews.php
+++ b/htdocs/product/osc-productsbyreviews.php
@@ -40,7 +40,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits class�s pas critiques", $page, "osc-productsbyreviews.php");
$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status";
-$sql .= " FROM ".DB_NAME_OSC.".reviews as r,".DB_NAME_OSC.".products as p ";
+$sql .= " FROM ".OSC_DB_NAME.".reviews as r,".OSC_DB_NAME.".products as p ";
$sql .= " WHERE r.products_id = p.products_id";
$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";
diff --git a/htdocs/product/osc-reviews.php b/htdocs/product/osc-reviews.php
index 4486867d86e25f0bfddf47f954f635c373819711..92e99a70f14453bdd8c34e2b9eb000259647bbf4 100644
--- a/htdocs/product/osc-reviews.php
+++ b/htdocs/product/osc-reviews.php
@@ -39,7 +39,7 @@ $offset = $limit * $page ;
print_barre_liste("Liste des produits oscommerce", $page, "osc-reviews.php");
-$sql = "SELECT r.reviews_rating FROM ".DB_NAME_OSC.".reviews as r";
+$sql = "SELECT r.reviews_rating FROM ".OSC_DB_NAME.".reviews as r";
//$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $db->plimit( $limit ,$offset);
diff --git a/htdocs/product/promotion/index.php b/htdocs/product/promotion/index.php
index 52376a946f6afeacbe1fd6e15b8cff647f83cfa2..3d57cb176b5615b7edd376c788832ef9fff9b51f 100644
--- a/htdocs/product/promotion/index.php
+++ b/htdocs/product/promotion/index.php
@@ -55,7 +55,7 @@ $urladd = "&sortorder=$sortorder&sortfield=$sortfield";
$sql = "SELECT pd.products_name, s.specials_new_products_price, p.products_price, p.products_model, s.status, p.products_id";
$sql .= ",".$db->pdate("expires_date")." as fin";
-$sql .= " FROM ".DB_NAME_OSC.".specials as s,".DB_NAME_OSC.".products_description as pd,".DB_NAME_OSC.".products as p";
+$sql .= " FROM ".OSC_DB_NAME.".specials as s,".OSC_DB_NAME.".products_description as pd,".OSC_DB_NAME.".products as p";
$sql .= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $db->plimit( $limit ,$offset);
diff --git a/htdocs/product/promotion/promotion.class.php b/htdocs/product/promotion/promotion.class.php
index e73db55c72f89aefc3ada6d43f169a43b9956f09..86c0b66bf34d2d6618ecefb81c42be723484c2ef 100644
--- a/htdocs/product/promotion/promotion.class.php
+++ b/htdocs/product/promotion/promotion.class.php
@@ -44,7 +44,7 @@ class Promotion {
function create($user, $pid, $percent) {
$sql = "SELECT products_price ";
- $sql .= " FROM ".DB_NAME_OSC.".products as p";
+ $sql .= " FROM ".OSC_DB_NAME.".products as p";
$sql .= " WHERE p.products_id = $pid";
$result = $this->db->query($sql) ;
@@ -59,13 +59,13 @@ class Promotion {
$date_exp = "2003-05-01";
- $sql = "INSERT INTO ".DB_NAME_OSC.".specials ";
+ $sql = "INSERT INTO ".OSC_DB_NAME.".specials ";
$sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) ";
$sql .= " VALUES ($pid, $newprice, now(),NULL,'$date_exp',NULL,1)";
if ($this->db->query($sql) )
{
- $id = $this->db->last_insert_id(DB_NAME_OSC.".specials");
+ $id = $this->db->last_insert_id(OSC_DB_NAME.".specials");
return $id;
}
@@ -100,7 +100,7 @@ class Promotion {
*/
function set_active($id)
{
- $sql = "UPDATE ".DB_NAME_OSC.".specials";
+ $sql = "UPDATE ".OSC_DB_NAME.".specials";
$sql .= " SET status = 1";
$sql .= " WHERE products_id = " . $id;
@@ -116,7 +116,7 @@ class Promotion {
*/
function set_inactive($id)
{
- $sql = "UPDATE ".DB_NAME_OSC.".specials";
+ $sql = "UPDATE ".OSC_DB_NAME.".specials";
$sql .= " SET status = 0";
$sql .= " WHERE products_id = " . $id;
@@ -135,7 +135,7 @@ class Promotion {
function fetch ($id) {
$sql = "SELECT c.categories_id, cd.categories_name, c.parent_id";
- $sql .= " FROM ".DB_NAME_OSC.".categories as c,".DB_NAME_OSC.".categories_description as cd";
+ $sql .= " FROM ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd";
$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".OSC_LANGUAGE_ID;
$sql .= " AND c.categories_id = $id";
$result = $this->db->query($sql) ;
@@ -162,11 +162,11 @@ class Promotion {
*/
function delete($user) {
- $sql = "DELETE FROM ".DB_NAME_OSC.".products WHERE products_id = $idosc ";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc ";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_to_categories WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc";
- $sql = "DELETE FROM ".DB_NAME_OSC.".products_description WHERE products_id = $idosc";
+ $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc";
$sql = "DELETE FROM ".MAIN_DB_PREFIX."album WHERE rowid = $id";
diff --git a/mysql/migration/1.1.0-2.0.0.sql b/mysql/migration/1.1.0-2.0.0.sql
index 7fab1ea48f0e1954aca4d90ba58ea72e0d2993ba..083e15536581e2129eec6398392d48e3250c8784 100644
--- a/mysql/migration/1.1.0-2.0.0.sql
+++ b/mysql/migration/1.1.0-2.0.0.sql
@@ -1545,3 +1545,6 @@ insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SET
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_TIME', 'MAIN_FORCE_SETLOCALE_LC_TIME', 'chaine', 1, 'Pour forcer LC_TIME si pb de locale');
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_MONETARY', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'chaine', 1, 'Pour forcer LC_MONETARY si pb de locale');
insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'chaine', 1, 'Mettre la valeur C si probl�me de centimes');
+
+
+update llx_const set name='OSC_DB_NAME' where name'DB_NAME_OSC';