Qual: First change to remove pre.inc.php

htdocs/admin/accounting.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');

htdocs/admin/adherent.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/agenda.php

@@ -23,7 +23,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 

htdocs/admin/agenda_xcal.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/agenda.lib.php');
 

htdocs/admin/bank.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
 

htdocs/admin/barcode.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
 

htdocs/admin/bookmark.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/boutique.php

@@ -22,13 +22,13 @@
  */
 
 /**
- \file 		htdocs/admin/boutique.php
+ *  \file 		htdocs/admin/boutique.php
- \ingroup    boutique
+ *  \ingroup    boutique
- \brief      Page d'administration/configuration du module OsCommerce
+ *  \brief      Page d'administration/configuration du module OsCommerce
- \version    $Revision$
+ *  \version    $Revision$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/boxes.php

@@ -18,12 +18,12 @@
  */
 
 /**
-        \file       htdocs/admin/boxes.php
+ *   \file       htdocs/admin/boxes.php
-        \brief      Page d'administration/configuration des boites
+ *   \brief      Page d'administration/configuration des boites
-        \version    $Id$
+ *   \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 

htdocs/admin/cashdesk.php

@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php");
 

htdocs/admin/clicktodial.php

@@ -17,13 +17,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
  
-/**	    \file       htdocs/admin/clicktodial.php
+/**	
-		\ingroup    clicktodial
+ *   \file       htdocs/admin/clicktodial.php
-		\brief      Page d'administration/configuration du module clicktodial
+ *   \ingroup    clicktodial
-		\version    $Id$
+ *   \brief      Page d'administration/configuration du module clicktodial
-*/
+ *   \version    $Id$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/commande.php

@@ -29,7 +29,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
 

htdocs/admin/company.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php");

htdocs/admin/compta.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');

htdocs/admin/confexped.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/const.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/delais.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/dict.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
 

htdocs/admin/dons.php

@@ -22,7 +22,7 @@
  *		\brief      Page d'administration/configuration du module Dons
  *		\version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/don.class.php");
 

htdocs/admin/droitpret.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/categories/categorie.class.php");
 

htdocs/admin/editeur.php

@@ -25,7 +25,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/energie.php

@@ -19,13 +19,14 @@
  * $Id$
  */
  
-/**	    \file       htdocs/admin/energie.php
+/**	
-	    \ingroup    energie
+ *  \file       htdocs/admin/energie.php
-	    \brief      Page d'administration/configuration du module de gestion de l'energie
+ *  \ingroup    energie
-	    \version    $Revision$
+ *  \brief      Page d'administration/configuration du module de gestion de l'energie
-*/
+ *  \version    $Revision$
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/events.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 

htdocs/admin/expedition.php

@@ -28,7 +28,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/expedition/expedition.class.php');
 

htdocs/admin/external_rss.php

@@ -27,7 +27,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 include_once(MAGPIERSS_PATH."rss_fetch.inc");
 

htdocs/admin/facture.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/facture.class.php');
 

htdocs/admin/fckeditor.php

@@ -20,13 +20,13 @@
  */
 
 /**
-	    \file       htdocs/admin/fckeditor.php
+ *  \file       htdocs/admin/fckeditor.php
-		\ingroup    fckeditor
+ *  \ingroup    fckeditor
-		\brief      Page d'activation du module FCKeditor dans les autres modules
+ *  \brief      Page d'activation du module FCKeditor dans les autres modules
-		\version    $Revision$
+ *  \version    $Revision$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/fichinter.php

@@ -28,7 +28,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php');
 

htdocs/admin/fournisseur.php

@@ -21,13 +21,13 @@
  */
 
 /**
- \file       htdocs/admin/fournisseur.php
+ *  \file       htdocs/admin/fournisseur.php
- \ingroup    fournisseur
+ *  \ingroup    fournisseur
- \brief      Page d'administration-configuration du module Fournisseur
+ *  \brief      Page d'administration-configuration du module Fournisseur
- \version    $Id$
+ *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php');

htdocs/admin/ftpclient.php

@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/geoipmaxmind.php

@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/dolgeoip.class.php");
 

htdocs/admin/ihm.php

@@ -24,7 +24,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");

htdocs/admin/index.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 $langs->load("admin");
 $langs->load("companies");

htdocs/admin/ldap.php

@@ -27,7 +27,7 @@
  *      \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");

htdocs/admin/ldap_contacts.php

@@ -21,13 +21,13 @@
  */
 
 /**
-    	\file       htdocs/admin/ldap_contacts.php
+ * 	\file       htdocs/admin/ldap_contacts.php
-		\ingroup    ldap
+ *  \ingroup    ldap
-		\brief      Page d'administration/configuration du module Ldap
+ *  \brief      Page d'administration/configuration du module Ldap
-		\version    $Id$
+ *  \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php");

htdocs/admin/ldap_groups.php

@@ -27,7 +27,7 @@
  *     	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");

htdocs/admin/ldap_members.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");

htdocs/admin/ldap_users.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php");

htdocs/admin/limits.php

@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/price.lib.php");
 

htdocs/admin/livraison.php

@@ -27,7 +27,7 @@
  *      \brief      Page d'administration/configuration du module Livraison
  *      \version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php");
 

htdocs/admin/mailing.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/mails.php

@@ -23,7 +23,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("companies");

htdocs/admin/mantis.php

@@ -23,13 +23,13 @@
  */
 
 /**
-	    \file       htdocs/admin/mantis.php
+ *   \file       htdocs/admin/mantis.php
-        \ingroup    mantis
+ *   \ingroup    mantis
-        \brief      Page de configuration du module mantis
+ *   \brief      Page de configuration du module mantis
-		\version    $Revision$
+ *   \version    $Revision$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/mantis/mantis.class.php');
 

htdocs/admin/menus.php

@@ -25,7 +25,7 @@
  *		\version	$Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");

htdocs/admin/menus/edit.php

@@ -24,7 +24,7 @@
  *		\version	$Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
 

htdocs/admin/menus/index.php

@@ -25,7 +25,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/treeview.lib.php");
 

htdocs/admin/menus/pre.inc.php

@@ -1,66 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser  <simon@kornog-computing.com>
- *
- * 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/admin/pre.inc.php
-   \brief      Fichier gestionnaire du menu de gauche de l'espace configuration
-   \version    $Id$
-*/
-
-$res=@include("../../main.inc.php");
-
-
-$langs->load("admin");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $conf, $user, $langs;
-
-	top_menu($head, $title, '');
-
-	$menuarray=array();
-
-	//if ($conf->left_menu == 'rodolphe.php')
-	//{
-	$langs->load("admin");
-	$langs->load("users");
-	$menu = new Menu();
-	$menu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"));
-	$menu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"));
-	$menu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"));
-	$menu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"));
-	$menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
-	$menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-	$menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"));
-	$menu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
-	$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
-	$menu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
-	$menu->add(DOL_URL_ROOT."/admin/system/", $langs->trans("System"));
-	$menu->add(DOL_URL_ROOT."/admin/tools/", $langs->trans("Tools"));
-	$varmenuarray=$menu->liste;
-	//}
-
-	left_menu($varmenuarray, $help_url);
-}
-
-?>

htdocs/admin/modules.php

@@ -26,7 +26,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("errors");

htdocs/admin/multicompany.php

@@ -23,7 +23,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/multicompany/multicompany.class.php');

htdocs/admin/notification.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/numberwords.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
 

htdocs/admin/osc-languages.php

@@ -23,7 +23,7 @@
  * \version    	$Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 $langs->load("admin");
 

htdocs/admin/paybox.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $servicename='PayBox';

htdocs/admin/perms.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/phenix.php

@@ -18,13 +18,13 @@
  */
 
 /**
-	    \file       htdocs/admin/phenix.php
+ *   \file       htdocs/admin/phenix.php
-        \ingroup    phenix
+ *   \ingroup    phenix
-        \brief      Page de configuration du module Phenix
+ *   \brief      Page de configuration du module Phenix
-		\version    $Id$
+ *   \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/phenix/phenix.class.php');
 

htdocs/admin/pre.inc.php

@@ -1,64 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser  <simon@kornog-computing.com>
- *
- * 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/admin/pre.inc.php
-   \brief      Fichier gestionnaire du menu de gauche de l'espace configuration
-   \version    $Id$
-*/
-
-$res=@include("../main.inc.php");
-if (! $res) include("../../../dolibarr/htdocs/main.inc.php");	// Used on dev env only
-
-
-$langs->load("admin");
-
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-	global $conf, $user, $langs;
-
-	top_menu($head, $title, '');
-
-	$menuarray=array();
-
-	$langs->load("admin");
-	$langs->load("users");
-	$menu = new Menu();
-	$menu->add(DOL_URL_ROOT."/admin/company.php", $langs->trans("MenuCompanySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/modules.php", $langs->trans("Modules"));
-	$menu->add(DOL_URL_ROOT."/admin/menus.php", $langs->trans("Menus"));
-	$menu->add(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup"));
-	$menu->add(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes"));
-	$menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts"));
-	$menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security"));
-	$menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails"));
-	$menu->add(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits"));
-	$menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("MenuUsersAndGroups"));
-	$menu->add(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup"));
-	$menu->add(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup"));
-	$menu->add(DOL_URL_ROOT."/admin/system/", $langs->trans("System"));
-	$menu->add(DOL_URL_ROOT."/admin/tools/", $langs->trans("Tools"));
-	$varmenuarray=$menu->liste;
-
-	left_menu($varmenuarray, $help_url);
-}
-
-?>

htdocs/admin/produit.php

@@ -21,13 +21,13 @@
  */
 
 /**
- \file       htdocs/admin/produit.php
+ *  \file       htdocs/admin/produit.php
- \ingroup    produit
+ *  \ingroup    produit
- \brief      Page d'administration/configuration du module Produit
+ *  \brief      Page d'administration/configuration du module Produit
- \version    $Id$
+ *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
 

htdocs/admin/project.php

@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/projet/tasks/task.class.php');

htdocs/admin/propale.php

@@ -29,7 +29,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 

htdocs/admin/security.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/security.lib.php');
 

htdocs/admin/security_other.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 

htdocs/admin/societe.php

@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/stock.php

@@ -24,7 +24,7 @@
  *	\brief      Page d'administration/configuration du module gestion de stock
  *	\version    $Id$
  */
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/syslog.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 if (!$user->admin)

htdocs/admin/system/constall.php

@@ -24,7 +24,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("user");

htdocs/admin/system/database-tables-contraintes.php

@@ -25,7 +25,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");

htdocs/admin/system/database-tables.php

@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");

htdocs/admin/system/database.php

@@ -25,7 +25,7 @@
  *   \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");

htdocs/admin/system/dbtable.php

@@ -20,12 +20,12 @@
  */
 
 /**
- \file           htdocs/admin/system/dbtable.php
+ *  \file           htdocs/admin/system/dbtable.php
- \brief          Page d'info des contraintes d'une table
+ *  \brief          Page d'info des contraintes d'une table
- \version        $Id$
+ *  \version        $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");

htdocs/admin/system/dolibarr.php

@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/memory.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
 

htdocs/admin/system/index.php

@@ -24,7 +24,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 

htdocs/admin/system/modules.php

@@ -23,7 +23,7 @@
  *  \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("install");

htdocs/admin/system/os.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 $langs->load("admin");

htdocs/admin/system/phpinfo.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 

htdocs/admin/system/pre.inc.php

@@ -1,70 +0,0 @@
-<?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- *
- * 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/admin/system/pre.inc.php
- *		\brief      Fichier gestionnaire menu page infos syst<73>me
- *		\version    $Id$
- */
-
-require("../../main.inc.php");
-
-function llxHeader($head = "", $urlp = "")
-{
-    global $langs;
-
-    $langs->load("admin");
-
-
-	top_menu($head);
-
-    $menu = new Menu();
-
-    $menu->add(DOL_URL_ROOT."/admin/system/index.php", $langs->trans("Summary"));
-
-    // Dolibarr
-    $menu->add(DOL_URL_ROOT."/admin/system/dolibarr.php", "Dolibarr");
-    $menu->add(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),1);
-	$menu->add(DOL_URL_ROOT."/admin/system/modules.php", $langs->trans("Modules"),1);
-    $menu->add(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers"),1);
-    $menu->add(DOL_URL_ROOT."/about.php", $langs->trans("About"),1);
-
-    // OS
-    $menu->add(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS"));
-
-    // Web server
-    $menu->add(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer"));
-
-    // PHP
-    $menu->add(DOL_URL_ROOT."/admin/system/phpinfo.php", $langs->trans("Php"));
-
-    // XDebug
-    //$menu->add(DOL_URL_ROOT."/admin/system/xdebug.php", $langs->trans("XDebug"));
-
-    // Database
-    $menu->add(DOL_URL_ROOT."/admin/system/database.php", $langs->trans("Database"));
-    $menu->add(DOL_URL_ROOT."/admin/system/database-tables.php", $langs->trans("Tables"),1);
-    $menu->add(DOL_URL_ROOT."/admin/system/database-tables-contraintes.php", $langs->trans("Constraints"),1);
-
-    left_menu($menu->liste);
-}
-
-?>

htdocs/admin/system/web.php

@@ -18,11 +18,11 @@
 
 /**
  *	    \file       htdocs/admin/system/web.php
- *		\brief      Page des infos syst<EFBFBD>me du serveur Web
+ *		\brief      Page des infos systeme du serveur Web
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 

htdocs/admin/system/xdebug.php

@@ -17,12 +17,12 @@
  */
 
 /**
-        \file       htdocs/admin/system/xdebug.php
+ *     \file       htdocs/admin/system/xdebug.php
-		\brief      Page administration XDebug
+ *     \brief      Page administration XDebug
-		\version    $Id$
+ *     \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 

htdocs/admin/taxes.php

@@ -19,13 +19,13 @@
  */
 
 /**
-	    \file       htdocs/admin/taxes.php
+ *     \file       htdocs/admin/taxes.php
-        \ingroup    tax
+ *     \ingroup    tax
-        \brief      Page de configuration du module tax
+ *     \brief      Page de configuration du module tax
-		\version    $Id$
+ *     \version    $Id$
-*/
+ */
 
-require('./pre.inc.php');
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load('admin');

htdocs/admin/tools/dolibarr_export.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 

htdocs/admin/tools/dolibarr_import.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("other");

htdocs/admin/tools/eaccelerator.php

@@ -17,12 +17,12 @@
  */
 
 /**
-        \file       htdocs/admin/tools/eaccelerator.php
+ *     \file       htdocs/admin/tools/eaccelerator.php
-		\brief      Page administration de eaccelerator
+ *     \brief      Page administration de eaccelerator
-		\version    $Id$
+ *     \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 

htdocs/admin/tools/export.php

@@ -22,7 +22,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";

htdocs/admin/tools/index.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 
 $langs->load("admin");
 $langs->load("companies");

htdocs/admin/tools/listevents.php

@@ -24,7 +24,7 @@
  *      \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 
 if (! $user->admin)
   accessforbidden();

htdocs/admin/tools/listsessions.php

@@ -24,7 +24,7 @@
  *      \version    $Id$
  */
 
-require_once("./pre.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/admin.lib.php');
 
 if (! $user->admin)

htdocs/admin/tools/pre.inc.php

@@ -1,51 +0,0 @@
-<?php
-/* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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/admin/tools/pre.inc.php
-		\brief      Fichier gestionnaire menu page outils
-		\version    $Id$
-*/
-
-require("../../main.inc.php");
-
-function llxHeader($head = '', $title='', $help_url='')
-{
-    global $langs;
-
-    $langs->load("admin");
-
-
-	top_menu($head);
-
-    $menu = new Menu();
-
-    $menu->add(DOL_URL_ROOT."/admin/tools/index.php", $langs->trans("SystemTools"));
-    $menu->add(DOL_URL_ROOT."/admin/tools/dolibarr_export.php", $langs->trans("Backup"),1);
-    $menu->add(DOL_URL_ROOT."/admin/tools/dolibarr_import.php", $langs->trans("Restore"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/update.php", $langs->trans("MenuUpgrade"),1);
-	if (function_exists('eaccelerator_info')) $menu->add(DOL_URL_ROOT."/admin/tools/eaccelerator.php", $langs->trans("EAccelerator"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/listevents.php", $langs->trans("Audit"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/listsessions.php", $langs->trans("Sessions"),1);
-	$menu->add(DOL_URL_ROOT."/admin/tools/purge.php", $langs->trans("Purge"),1);
-	$menu->add(DOL_URL_ROOT."/support/index.php", $langs->trans("HelpCenter"),1,1,'targethelp');
-
-    left_menu($menu->liste, $help_url);
-}
-
-?>

htdocs/admin/tools/purge.php

@@ -22,7 +22,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php");
 include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
 

htdocs/admin/tools/update.php

@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../../main.inc.php");
 include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php";
 
 $langs->load("admin");

htdocs/admin/triggers.php

@@ -22,7 +22,7 @@
  *       \version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 include_once(DOL_DOCUMENT_ROOT ."/interfaces.class.php");
 
 if (!$user->admin)

htdocs/admin/user.php

@@ -27,7 +27,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");

htdocs/admin/webcalendar.php

@@ -21,13 +21,13 @@
  */
 
 /**
-	    \file       htdocs/admin/webcalendar.php
+ *    \file       htdocs/admin/webcalendar.php
-        \ingroup    webcalendar
+ *    \ingroup    webcalendar
-        \brief      Page de configuration du module webcalendar
+ *    \brief      Page de configuration du module webcalendar
-		\version    $Id$
+ *    \version    $Id$
-*/
+ */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/webcal/webcal.class.php');
 

htdocs/admin/webservices.php

@@ -17,13 +17,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/**	    \file       htdocs/admin/webservices.php
+/**	    
+ *      \file       htdocs/admin/webservices.php
  *		\ingroup    webservices
  *		\brief      Page to setup webservices module
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");