diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php index 361d67ba35d..b0d5d6fca23 100644 --- a/htdocs/mantis/mantis.php +++ b/htdocs/mantis/mantis.php @@ -20,12 +20,12 @@ /** \file htdocs/mantis/mantis.php \ingroup mantis - \brief Page générant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis + \brief Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis \author Laurent Destailleur \version $Revision$ */ -require("./pre.inc.php"); +require("../main.inc.php"); if (empty($conf->global->PHPMANTIS_URL)) { @@ -57,7 +57,7 @@ print "
Malheureusement, votre navigateur est trop vieux pour visualiser cette zone.
- Il vous faut un navigateur gérant les frames.
+ Il vous faut un navigateur g�rant les frames.
diff --git a/htdocs/mantis/pre.inc.php b/htdocs/mantis/pre.inc.php deleted file mode 100644 index a611a002954..00000000000 --- a/htdocs/mantis/pre.inc.php +++ /dev/null @@ -1,37 +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. - */ - -/** - \file htdocs/mantis/pre.inc.php - \ingroup mantis - \brief Fichier de gestion du menu gauche du module mantis - \version $Id$ -*/ -require ("../main.inc.php"); - -function llxHeader($head = '', $title='', $help_url='') -{ - global $langs; - - top_menu($head, $title); - - $menu = new Menu(); - - left_menu($menu->liste, $help_url); -} -?> diff --git a/htdocs/oscommerce_ws/index.php b/htdocs/oscommerce_ws/index.php index 5d3d45f01e6..c5283ab28e9 100644 --- a/htdocs/oscommerce_ws/index.php +++ b/htdocs/oscommerce_ws/index.php @@ -18,13 +18,13 @@ */ /** - \file htdocs/oscommerce_ws/index.php - \ingroup oscommerce2 - \brief Page accueil zone boutique - \version $Id$ + * \file htdocs/oscommerce_ws/index.php + * \ingroup oscommerce2 + * \brief Page accueil zone boutique + * \version $Id$ */ -require("./pre.inc.php"); +require("./pre.inc.php"); // Use pre.inc.php as menus not defined in module $langs->load("shop"); $langs->load("orders"); @@ -45,9 +45,6 @@ print ''; print '
'; -// initialisation des webservices -set_magic_quotes_runtime(0); - //WebService Client. require_once(NUSOAP_PATH."nusoap.php"); require_once("./includes/configure.php"); diff --git a/htdocs/phenix/phenix.php b/htdocs/phenix/phenix.php index ba193c99e80..f5b4afbed72 100644 --- a/htdocs/phenix/phenix.php +++ b/htdocs/phenix/phenix.php @@ -18,12 +18,12 @@ /** \file htdocs/phenix/phenix.php \ingroup phenix - \brief Page générant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier + \brief Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier \author Laurent Destailleur \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); if (empty($conf->global->PHPPHENIX_URL)) { @@ -55,7 +55,7 @@ print "
Malheureusement, votre navigateur est trop vieux pour visualiser cette zone.
- Il vous faut un navigateur gérant les frames.
+ Il vous faut un navigateur g�rant les frames.
diff --git a/htdocs/phenix/pre.inc.php b/htdocs/phenix/pre.inc.php deleted file mode 100644 index 68c2b70847e..00000000000 --- a/htdocs/phenix/pre.inc.php +++ /dev/null @@ -1,41 +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. - */ - -/** - \file htdocs/phenix/pre.inc.php - \ingroup phenix - \brief Fichier de gestion du menu gauche du module phenix - \version $Id$ -*/ - -require ("../main.inc.php"); - - -function llxHeader($head = '', $title='', $help_url='') -{ - global $langs; - - top_menu($head, $title); - - $menu = new Menu(); - - - - left_menu($menu->liste, $help_url); -} -?>