diff --git a/htdocs/boutique/client/client.class.php b/htdocs/boutique/client/client.class.php index 9ee7923502c..5f85cef7601 100644 --- a/htdocs/boutique/client/client.class.php +++ b/htdocs/boutique/client/client.class.php @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ * */ diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index 3a9ef723531..b7ccd21111c 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2003-2005 Éric Seigne + * Copyright (C) 2003-2005 �ric Seigne * Copyright (C) 2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -28,7 +27,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index fbe3df3dded..0755c51af96 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -27,10 +26,12 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $langs->load("companies"); + + llxHeader(); if ($sortfield == "") { diff --git a/htdocs/boutique/client/pre.inc.php b/htdocs/boutique/client/pre.inc.php deleted file mode 100644 index 885b4617a65..00000000000 --- a/htdocs/boutique/client/pre.inc.php +++ /dev/null @@ -1,52 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/client/pre.inc.php - \brief Fichier gestionnaire du menu de gauche de l'espace boutique client - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/client.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?> diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index 34c7cc72b5a..081df45fdd7 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -27,7 +27,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index 19e6f47b126..d3189c17c03 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2003-2005 �ric Seigne + * Copyright (C) 2003-2005 Eric Seigne * Copyright (C) 2004-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -28,10 +28,12 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $langs->load("products"); + + llxHeader(); diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index b51ca81e21e..6d0d3b873d6 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -27,7 +27,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/commande/pre.inc.php b/htdocs/boutique/commande/pre.inc.php deleted file mode 100644 index 17e2e7c518d..00000000000 --- a/htdocs/boutique/commande/pre.inc.php +++ /dev/null @@ -1,52 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/commande/pre.inc.php - \brief Fichier gestionnaire du menu de gauche - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/boutique/commande/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Products")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?> diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index eca4c90c955..cbc99beacde 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -1,6 +1,6 @@ - * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2003 �ric Seigne * Copyright (C) 2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -28,7 +28,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/critiques/critique.class.php b/htdocs/boutique/critiques/critique.class.php index 4a20b5276fd..696df3624a8 100644 --- a/htdocs/boutique/critiques/critique.class.php +++ b/htdocs/boutique/critiques/critique.class.php @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /* diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php index 0e05d42f476..9d4d744e6a6 100644 --- a/htdocs/boutique/critiques/fiche.php +++ b/htdocs/boutique/critiques/fiche.php @@ -27,11 +27,12 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $id=$_GET["id"]; + llxHeader(); if ($id) @@ -39,19 +40,19 @@ if ($id) $critique = new Critique($dbosc); $result = $critique->fetch($id); - + if ( $result ) - { + { print '
Fiche Critique

'; - + print ''; print ""; print ''; print ''; print "
Produit'.$critique->product_name.'
Texte'.nl2br($critique->text).'
"; - + } @@ -59,13 +60,13 @@ if ($id) { print "Fetch failed"; } - + } /* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ +/* */ +/* Barre d'action */ +/* */ /* ************************************************************************** */ print '
'; @@ -73,7 +74,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print '
------

'; diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index a081a7c78be..926eed41886 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -27,7 +27,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/critiques/pre.inc.php b/htdocs/boutique/critiques/pre.inc.php deleted file mode 100644 index 85534a7ebf6..00000000000 --- a/htdocs/boutique/critiques/pre.inc.php +++ /dev/null @@ -1,54 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/critiques/pre.inc.php - \ingroup boutique - \brief Fichier gestionnaire du menu gauche des critiques OSCommerce - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/boutique/critiques/critique.class.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} - -?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index af3907d4406..250371b0722 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -24,7 +24,7 @@ \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); $langs->load("boutique"); $langs->load("orders"); @@ -120,7 +120,7 @@ print ''; print_titre($langs->trans("Orders")); /* - * 5 dernières commandes reçues + * 5 derni�res commandes re�ues select o.orders_id, o.customers_id, o.customers_name, o.date_purchased, o.payement_method, o.status, t.value 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 @@ -157,7 +157,7 @@ else } /* - * 5 dernières commandes en attente + * 5 derni�res commandes en attente */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; @@ -191,7 +191,7 @@ else } /* - * Commandes à traiter + * Commandes � traiter */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; @@ -227,7 +227,7 @@ else print ''; /* -* Derniers clients qui ont commandé +* 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 ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; diff --git a/htdocs/boutique/notification/fiche.php b/htdocs/boutique/notification/fiche.php index bf37b5e5684..990a7273bcd 100644 --- a/htdocs/boutique/notification/fiche.php +++ b/htdocs/boutique/notification/fiche.php @@ -24,7 +24,9 @@ \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); @@ -63,14 +65,14 @@ if ($action == 'create') print ''; print '
Nouvel Editeur

'; - + print ''; print ""; print ''; - print ''; + print ''; print '
Nom
 
 
'; print ''; - + } else @@ -82,27 +84,27 @@ else $result = $editeur->fetch($id); if ( $result ) - { + { if ($action == 'edit') { print '
Edition de la fiche Editeur : '.$editeur->titre.'

'; - + print "
\n"; print ''; print ''; - + print ''; print ""; print ''; print ''; - + print ''; print '
Nom
 
'; - - } + + } print '
Fiche Editeur : '.$editeur->titre.'

'; @@ -118,7 +120,7 @@ else { print "Fetch failed"; } - + } else @@ -128,9 +130,9 @@ else } /* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ +/* */ +/* Barre d'action */ +/* */ /* ************************************************************************** */ diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index f110abc7255..f285f4ae880 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2003 �ric Seigne * Copyright (C) 2004-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -28,10 +28,12 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $langs->load("products"); + + llxHeader(); if ($sortfield == "") { diff --git a/htdocs/boutique/notification/pre.inc.php b/htdocs/boutique/notification/pre.inc.php deleted file mode 100644 index 96c9369caa2..00000000000 --- a/htdocs/boutique/notification/pre.inc.php +++ /dev/null @@ -1,53 +0,0 @@ - - * - * 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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$ - */ - -/** - \file htdocs/boutique/notification/pre.inc.php - \brief Fichier gestionnaire du menu de gauche - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/boutique/notification/notification.class.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?> diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index 3bcf0071de0..62db80c228a 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -1,6 +1,6 @@ - * Copyright (C) 2003 Éric Seigne + * Copyright (C) 2003 �ric Seigne * Copyright (C) 2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -28,7 +28,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/pre.inc.php b/htdocs/boutique/pre.inc.php deleted file mode 100644 index 0e387e58f65..00000000000 --- a/htdocs/boutique/pre.inc.php +++ /dev/null @@ -1,53 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/pre.inc.php - \brief Fichier gestionnaire du menu de gauche - \version $Id$ -*/ - -require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); - -//affichages dans la page d'accueil -define("OSC_MAXNBCOM", 5); - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?> diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index f855acb4d85..2cafd3a47c7 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -26,10 +26,12 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $langs->load("companies"); + + llxHeader(); if ($sortfield == "") { @@ -50,7 +52,7 @@ $sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.cu $sql .= " FROM ".DB_NAME_OSC.".customers as c"; $sql .= " ORDER BY $sortfield $sortorder "; $sql .= $dbosc->plimit( $limit ,$offset); - + if ( $dbosc->query($sql) ) { $num = $dbosc->num_rows(); diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 6d2f6dda062..4ad23059f2a 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -26,7 +26,9 @@ \version $Revision$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + + llxHeader(); diff --git a/htdocs/boutique/produits/pre.inc.php b/htdocs/boutique/produits/pre.inc.php deleted file mode 100644 index 9df8960c23d..00000000000 --- a/htdocs/boutique/produits/pre.inc.php +++ /dev/null @@ -1,50 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/produits/pre.inc.php - \brief Fichier gestionnaire du menu de gauche - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf,$langs; - $langs->load("shop"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?> diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index b1052cb7718..b3a6ce78b89 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -24,7 +24,8 @@ \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); + llxHeader(); diff --git a/htdocs/boutique/promotion/pre.inc.php b/htdocs/boutique/promotion/pre.inc.php deleted file mode 100644 index 71c63e46707..00000000000 --- a/htdocs/boutique/promotion/pre.inc.php +++ /dev/null @@ -1,53 +0,0 @@ - - * Copyright (C) 2006 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 - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ - -/** - \file htdocs/boutique/promotion/pre.inc.php - \ingroup boutique - \brief Fichier gestionnaire du menu gauche des promotions OSCommerce - \version $Id$ -*/ - -require("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/boutique/promotion/promotion.class.php'); - - -function llxHeader($head = "", $urlp = "") -{ - global $user,$conf, $langs; - $langs->load("shop"); - $langs->load("products"); - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/boutique/index.php", $langs->trans("OSCommerceShop")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/produits/osc-liste.php", $langs->trans("Produits")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/index.php", $langs->trans("Critiques")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/critiques/bestproduct.php", "Meilleurs produits",2); - $menu->add_submenu(DOL_URL_ROOT."/boutique/promotion/index.php", $langs->trans("Promotion")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/notification/", $langs->trans("Notifications")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/client/", $langs->trans("Customers")); - $menu->add_submenu(DOL_URL_ROOT."/boutique/commande/", $langs->trans("Commandes")); - - left_menu($menu->liste); -} -?>