diff --git a/htdocs/admin/boutique.php b/htdocs/admin/boutique.php index 8dced5b25e9..c7a63ce7f8e 100644 --- a/htdocs/admin/boutique.php +++ b/htdocs/admin/boutique.php @@ -53,7 +53,9 @@ if ($_POST["save"]) $i+=dolibarr_set_const($db,'OSC_DB_NAME',trim($_POST["oscommerce_dbname"]),'chaine',0); $i+=dolibarr_set_const($db,'OSC_DB_USER',trim($_POST["oscommerce_dbuser"]),'chaine',0); $i+=dolibarr_set_const($db,'OSC_DB_PASS',trim($_POST["oscommerce_dbpass"]),'chaine',0); - + $i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim($_POST["oscommerce_db_table_prefix"]),'chaine',0); + $i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0); + if ($i >= 4) { $db->commit(); @@ -88,7 +90,7 @@ elseif ($_POST["test"]) { // V�rifie si bonne base par requete sur une table OSCommerce $sql ="SELECT configuration_value"; - $sql.=" FROM configuration"; + $sql.=" FROM ".$_POST["oscommerce_db_table_prefix"]."configuration"; $sql.=" WHERE configuration_key='STORE_NAME'"; $resql=$oscommercedb->query($sql); if ($resql) { @@ -96,7 +98,7 @@ elseif ($_POST["test"]) $mesg.=""; } else { - $mesg ="
".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase"); + $mesg ="
".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',$_POST["oscommerce_db_table_prefix"]."configuration"); $mesg.="
"; } @@ -139,13 +141,13 @@ $var=true; print '
'; print ""; print ""; -print ""; +print ""; print ""; print ""; print ""; $var=!$var; print ""; -print ""; +print ""; print ""; print ""; print ""; $var=!$var; print ""; -print ""; +print ""; print ""; print ""; print ""; $var=!$var; +print ""; +print ""; +print ""; +print ""; +print ""; +$var=!$var; print ""; -print ""; +print ""; print ""; print "'; print ''; $sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " WHERE t.class = 'ot_subtotal'"; if ( $dbosc->query($sql) ) @@ -79,7 +79,7 @@ else } $sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " WHERE t.class = 'ot_shipping'"; if ( $dbosc->query($sql) ) diff --git a/htdocs/boutique/commande/commande.class.php b/htdocs/boutique/commande/commande.class.php index 0bc7e278917..efdeade08cb 100644 --- a/htdocs/boutique/commande/commande.class.php +++ b/htdocs/boutique/commande/commande.class.php @@ -59,7 +59,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 ".OSC_DB_NAME.".orders WHERE orders_id = $id"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders WHERE orders_id = $id"; $result = $this->db->query($sql) ; @@ -93,7 +93,7 @@ class Commande * Totaux */ $sql = "SELECT value, class "; - $sql .= " FROM ".OSC_DB_NAME.".orders_total WHERE orders_id = $id"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 df2ddd9f9f8..1dc08fb707d 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -66,7 +66,7 @@ if ($_GET['id']) * */ $sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity"; - $sql .= " FROM ".OSC_DB_NAME.".orders_products"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_products"; $sql .= " WHERE orders_id = " . $commande->id; if ( $dbosc->query($sql) ) diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 038d1d6b004..2024ffe2ef4 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -48,7 +48,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,".$dbosc->pdate("date_purchased")." as date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value"; -$sql .= " FROM ".OSC_DB_NAME.".orders as o, ".OSC_DB_NAME.".orders_total as t"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; $sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'"; $sql .= " ORDER BY $sortfield $sortorder "; $sql .= $dbosc->plimit( $limit ,$offset); diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index b81d3c24000..b309b7d8d53 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -48,7 +48,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 ".OSC_DB_NAME.".reviews as r,".OSC_DB_NAME.".products as p "; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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/boutique/critiques/critique.class.php b/htdocs/boutique/critiques/critique.class.php index 3f08cd40694..36c8469f916 100644 --- a/htdocs/boutique/critiques/critique.class.php +++ b/htdocs/boutique/critiques/critique.class.php @@ -52,8 +52,8 @@ class Critique { $sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name"; - $sql .= " FROM ".OSC_DB_NAME.".reviews as r, ".OSC_DB_NAME.".reviews_description as d"; - $sql .= " ,".OSC_DB_NAME.".products_description as p"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews_description as d"; + $sql .= " ,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index 89c64584a9a..b056260cb43 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -45,7 +45,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 ".OSC_DB_NAME.".reviews as r, ".OSC_DB_NAME.".reviews_description as d, ".OSC_DB_NAME.".products_description as p"; +$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews as r, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."reviews_description as d, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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/boutique/index.php b/htdocs/boutique/index.php index 27af2fddf28..d70f530da0e 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -53,8 +53,8 @@ print ''; print ''; $sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t"; -$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; +$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate(mktime()).")"; $sql .= " GROUP BY mois ORDER BY mois"; @@ -90,8 +90,8 @@ else /* mensuel $sql = "SELECT sum(t.value) as value"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t"; -$sql .= " JOIN ".OSC_DB_NAME.".orders as o ON o.orders_id = t.orders_id"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t"; +$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; $sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->db->idate(mktime()).") AND MONTH(o.date_purchased) = MONTH(".$this->db->idate(mktime()).")"; if ( $dbosc->query($sql) ) @@ -128,7 +128,7 @@ from orders_total as t join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id "; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc"; if ( $dbosc->query($sql) ) @@ -162,7 +162,7 @@ else * 5 dernières commandes en attente */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id "; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc"; if ( $dbosc->query($sql) ) @@ -196,7 +196,7 @@ else * Commandes à traiter */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id "; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; $sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc"; if ( $dbosc->query($sql) ) @@ -232,8 +232,8 @@ print ''; * Derniers clients qui ont commandé */ $sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; -$sql .= " FROM ".OSC_DB_NAME.".orders_total as t JOIN ".OSC_DB_NAME.".orders as o on o.orders_id = t.orders_id "; -$sql .= " JOIN ".OSC_DB_NAME.".orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; +$sql .= " JOIN ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1"; $sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc"; if ( $dbosc->query($sql) ) diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index f05b4384524..581f93e5c8e 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -49,8 +49,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 ".OSC_DB_NAME.".products_notifications as n,".OSC_DB_NAME.".products_description as p"; -$sql .= ",".OSC_DB_NAME.".customers as c"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_notifications as n,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as p"; +$sql .= ",".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 dc3d96944f9..b97c8849c08 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 ".OSC_DB_NAME.".products WHERE products_id = $idosc "; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc "; - $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc"; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc"; - $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc"; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 a9f3585b404..b588edada1f 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -47,7 +47,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 ".OSC_DB_NAME.".products_notifications as n,".OSC_DB_NAME.".products_description as p"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_notifications as n,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 818a7f813b2..289da8498e7 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/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 ".OSC_DB_NAME.".products as p, ".OSC_DB_NAME.".products_description as d, ".OSC_DB_NAME.".manufacturers as m"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as d, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 ($reqstock=='epuise') diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index f09372d68f0..6779c41c18d 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -61,7 +61,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 .= ",".$dbosc->pdate("expires_date")." as fin"; -$sql .= " FROM ".OSC_DB_NAME.".specials as s,".OSC_DB_NAME.".products_description as pd,".OSC_DB_NAME.".products as p"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials as s,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description as pd,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 .= $dbosc->plimit( $limit ,$offset); diff --git a/htdocs/boutique/promotion/promotion.class.php b/htdocs/boutique/promotion/promotion.class.php index 3c144a9c2dd..5b8bc61fcfd 100644 --- a/htdocs/boutique/promotion/promotion.class.php +++ b/htdocs/boutique/promotion/promotion.class.php @@ -44,7 +44,7 @@ class Promotion { function create($user, $pid, $percent) { $sql = "SELECT products_price "; - $sql .= " FROM ".OSC_DB_NAME.".products as p"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products as p"; $sql .= " WHERE p.products_id = $pid"; $result = $this->db->query($sql) ; @@ -59,7 +59,7 @@ class Promotion { $date_exp = "2003-05-01"; - $sql = "INSERT INTO ".OSC_DB_NAME.".specials "; + $sql = "INSERT INTO ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials "; $sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) "; $sql .= " VALUES ($pid, $newprice, ".$this->db->idate(mktime()).", NULL, '$date_exp',NULL,1)"; @@ -100,7 +100,7 @@ class Promotion { */ function set_active($id) { - $sql = "UPDATE ".OSC_DB_NAME.".specials"; + $sql = "UPDATE ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."specials"; $sql .= " SET status = 1"; $sql .= " WHERE products_id = " . $id; @@ -116,7 +116,7 @@ class Promotion { */ function set_inactive($id) { - $sql = "UPDATE ".OSC_DB_NAME.".specials"; + $sql = "UPDATE ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 ".OSC_DB_NAME.".categories as c,".OSC_DB_NAME.".categories_description as cd"; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."categories as c,".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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,15 +162,12 @@ class Promotion { */ function delete($user) { - $sql = "DELETE FROM ".OSC_DB_NAME.".products WHERE products_id = $idosc "; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc "; - $sql = "DELETE FROM ".OSC_DB_NAME.".products_to_categories WHERE products_id = $idosc"; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc"; - $sql = "DELETE FROM ".OSC_DB_NAME.".products_description WHERE products_id = $idosc"; + $sql = "DELETE FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc"; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."album WHERE rowid = $id"; - - } diff --git a/htdocs/commande/osccommande.class.php b/htdocs/commande/osccommande.class.php index ec81873d19c..358916dd7f1 100644 --- a/htdocs/commande/osccommande.class.php +++ b/htdocs/commande/osccommande.class.php @@ -1,7 +1,8 @@ - * Copyright (C) 2003 Éric Seigne - * +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2003 Eric Seigne + * Copyright (C) 2005-2008 Laurent Destailleur + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,10 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * + */ + +/** + * \brief Class order OSCommerce + * \version $Id$ */ class OscCommande @@ -43,7 +45,7 @@ class OscCommande */ function fetch ($id) { - $sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".OSC_DB_NAME.".orders as o"; + $sql = "SELECT o.orders_id, o.customers_name, o.orders_status FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 7547e6ef7b4..fd8fe688d40 100644 --- a/htdocs/includes/boxes/box_osc_client.php +++ b/htdocs/includes/boxes/box_osc_client.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2005-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,15 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/includes/boxes/box_osc_client.php \ingroup osc \brief Module de génération de l'affichage de la box osc client + \version $Id$ */ include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php"); @@ -66,7 +64,7 @@ class box_osc_clients extends ModeleBoxes { if ($user->rights->boutique->lire) { - $sql = "SELECT count(*) as cus FROM ".OSC_DB_NAME.".customers"; + $sql = "SELECT count(*) as cus FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers"; $result = $db->query($sql); if ($result) diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php index cb3f2f77686..3afa76bbfd3 100644 --- a/htdocs/includes/modules/modBoutique.class.php +++ b/htdocs/includes/modules/modBoutique.class.php @@ -52,7 +52,7 @@ class modBoutique extends DolibarrModules $this->family = "products"; $this->name = "OSCommerce direct"; - $this->description = "Interface de visualisation d'une boutique OSCommerce"; + $this->description = "Interface de visualisation d'une boutique OSCommerce ou OSCSS"; $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version $this->const_name = 'MAIN_MODULE_BOUTIQUE'; $this->special = 1; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7b4ed98a250..188bd608a70 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -277,7 +277,7 @@ Module600Desc=Send notifications (by email) on Dolibarr business events Module700Name=Donations Module700Desc=Donations' management Module800Name=OSCommerce direct -Module800Desc=Interface to show an OSCommerce shop via direct database access +Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access Module900Name=OSCommerce by WS Module900Desc=Interface to show an OSCommerce shop via Web services.\nThis module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server. Module1200Name=Mantis @@ -883,7 +883,7 @@ FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines fo FCKeditorForProductDetailsPerso=WYSIWIG creation/edition of products personalized details lines for all entities (proposals, orders, invoices, etc...) FCKeditorForMailing=WYSIWIG creation/edition of mailings ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database. +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. diff --git a/htdocs/langs/en_US/oscommerce.lang b/htdocs/langs/en_US/oscommerce.lang index ccd65aea74f..1b031f39f20 100644 --- a/htdocs/langs/en_US/oscommerce.lang +++ b/htdocs/langs/en_US/oscommerce.lang @@ -2,6 +2,7 @@ OSCommerce=OS Commerce OSCommerceSetup=OS Commerce module setup OSCommerceSetupSaved=OS Commerce setup saved -OSCOmmerceServer=OS Commerce server host/ip -OSCOmmerceDatabaseName=OS Commerce database name -OSCOmmerceUser=OS Commerce database login +OSCommerceServer=OS Commerce server host/ip +OSCommerceDatabaseName=OS Commerce database name +OSCommercePrefix=OS Commerce tables prefix +OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/es_ES/oscommerce.lang b/htdocs/langs/es_ES/oscommerce.lang index 0c18e791f81..6b767101aa4 100644 --- a/htdocs/langs/es_ES/oscommerce.lang +++ b/htdocs/langs/es_ES/oscommerce.lang @@ -2,6 +2,6 @@ OSCommerce=OS Commerce OSCommerceSetup=Configuración del módulo OS Commerce OSCommerceSetupSaved=Configuración OS Commerce guardada -OSCOmmerceServer=Nombre/IP servidor de la base de datos OS commerce -OSCOmmerceDatabaseName=Nombre de la base de datos OS Commerce -OSCOmmerceUser=Usuario de la base de datos OS Commerce +OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce +OSCommerceDatabaseName=Nombre de la base de datos OS Commerce +OSCommerceUser=Usuario de la base de datos OS Commerce diff --git a/htdocs/langs/fr_BE/oscommerce.lang b/htdocs/langs/fr_BE/oscommerce.lang deleted file mode 100644 index 5589c483ce9..00000000000 --- a/htdocs/langs/fr_BE/oscommerce.lang +++ /dev/null @@ -1,7 +0,0 @@ -# Dolibarr language file - fr_BE - oscommerce= -OSCommerce=OS Commerce -OSCommerceSetup=Configuration du module OS Commerce -OSCommerceSetupSaved=Configuration OS Commerce sauvegardée -OSCOmmerceServer=Hôte/IP du serveur OS Commerce -OSCOmmerceDatabaseName=Base de données OS Commerce -OSCOmmerceUser=Login base de données OS Commerce diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index a770633e75f..4999ca1bbd1 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -276,7 +276,7 @@ Module600Desc=Envoi de notifications (par mail) sur les Module700Name=Dons Module700Desc=Gestion des dons Module800Name=OSCommerce direct -Module800Desc=Interface de visualisation d'une boutique OSCommerce par accès direct en base. +Module800Desc=Interface de visualisation d'une boutique OSCommerce ou OSCSS par accès direct en base. Module900Name=OSCommerce by WS Module900Desc=Interface de visualisation d'une boutique OSCommerce par accès via des Web services.\nCe module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server. Module1200Name=Mantis @@ -885,7 +885,7 @@ FCKeditorForProductDetails=Cr FCKeditorForProductDetailsPerso=Création/édition WYSIWIG des lignes details produits personnalisées (sur commandes, propales, factures, etc...) FCKeditorForMailing=Création/édition WYSIWIG des mailings ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base OSCommerce. +OSCommerceErrorConnectOkButWrongDatabase=La connexion a réussie mais la base ne semble pas etre une base OSCommerce (clé %s non trouvée dans la table %s). OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur '%s' a réussi. OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte. OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué. diff --git a/htdocs/langs/fr_FR/oscommerce.lang b/htdocs/langs/fr_FR/oscommerce.lang index e0c807d0dd9..fc856662d68 100644 --- a/htdocs/langs/fr_FR/oscommerce.lang +++ b/htdocs/langs/fr_FR/oscommerce.lang @@ -2,6 +2,7 @@ OSCommerce=OS Commerce OSCommerceSetup=Configuration du module OS Commerce OSCommerceSetupSaved=Configuration OS Commerce sauvegardée -OSCOmmerceServer=Nom hote/ip serveur base de donnée OS Commerce -OSCOmmerceDatabaseName=Nom base de donnée OS Commerce -OSCOmmerceUser=Compte accès base de donnée OS Commerce \ No newline at end of file +OSCommerceServer=Nom hote/ip serveur base de donnée OS Commerce +OSCommerceDatabaseName=Nom base de donnée OS Commerce +OSCommercePrefix=Prefix tables base de donnée OS Commerce +OSCommerceUser=Compte accès base de donnée OS Commerce \ No newline at end of file diff --git a/htdocs/oscommerce_ws/index.php b/htdocs/oscommerce_ws/index.php index 5a0db58edc8..52cc6a8270f 100644 --- a/htdocs/oscommerce_ws/index.php +++ b/htdocs/oscommerce_ws/index.php @@ -30,7 +30,7 @@ $langs->load("shop"); $langs->load("orders"); -llxHeader("",$langs->trans("OSCOmmerceShop")); +llxHeader("",$langs->trans("OSCommerceShop")); print_fiche_titre($langs->trans("OSCommerceShop"));
".$langs->trans("Parameter")."".$langs->trans("Parameter")."".$langs->trans("Value")."".$langs->trans("Examples")."
".$langs->trans("OSCOmmerceServer")."".$langs->trans("OSCommerceServer")."global->OSC_DB_HOST) . "\" size=\"30\">localhost"; //print "
__dolibarr_main_db_host__ (".$dolibarr_main_db_host.")" @@ -153,15 +155,22 @@ print "
".$langs->trans("OSCOmmerceDatabaseName")."".$langs->trans("OSCommerceDatabaseName")."global->OSC_DB_NAME) . "\" size=\"30\">oscommerce"; //print "
__dolibarr_main_db_name__ (".$dolibarr_main_db_name.")"; print "
".$langs->trans("OSCommercePrefix")."global->DB_TABLE_PREFIX) . "\" size=\"30\">osc_"; +print "
".$langs->trans("OSCOmmerceUser")."".$langs->trans("OSCommerceUser")."global->OSC_DB_USER) . "\" size=\"30\">oscommerceuser"; //print "
__dolibarr_main_db_user__ (".$dolibarr_main_db_user.")"; diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php index 81c1b611b56..df359c9d0c6 100644 --- a/htdocs/admin/osc-languages.php +++ b/htdocs/admin/osc-languages.php @@ -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 ".OSC_DB_NAME.".languages as l"; +$sql = "SELECT l.languages_id, l.name, l.code FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 4aff005625c..b63a9546c93 100644 --- a/htdocs/boutique/client/client.class.php +++ b/htdocs/boutique/client/client.class.php @@ -53,7 +53,7 @@ class Client function fetch ($id) { - $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".OSC_DB_NAME.".customers WHERE customers_id = $id"; + $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 f3706129c42..7cc47fe6da4 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -62,7 +62,7 @@ if ($_GET['id']) * */ $sql = "SELECT o.orders_id, o.customers_id,".$dbosc->pdate("date_purchased")." as date_purchased, t.value as total"; - $sql .= " FROM ".OSC_DB_NAME.".orders as o, ".OSC_DB_NAME.".orders_total as t";; + $sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."orders as o, ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."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 ( $dbosc->query($sql) ) diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 2d09fe811d4..0d84d7fc947 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -48,7 +48,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 ".OSC_DB_NAME.".customers as c"; +$sql .= " FROM ".OSC_DB_NAME.".".OSC_DB_TABLE_PREFIX."customers as c"; $sql .= " ORDER BY $sortfield $sortorder "; $sql .= $dbosc->plimit( $limit ,$offset); diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 596e144270c..9e8f0f99320 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -51,7 +51,7 @@ print '
'.$langs->trans("Description").''.$langs->trans("Lastname").'
'.$langs->trans("Description").''.$langs->trans("Total").'