From e04e6631e80926b93fa649d6b2cb76ffec0593fc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Mar 2010 08:28:29 +0000 Subject: [PATCH] Qual: First change to remove pre.inc.php --- htdocs/rapport/Atome.class.php | 10 +++--- htdocs/rapport/index.php | 2 +- htdocs/rapport/pre.inc.php | 45 ------------------------- htdocs/societe/agenda.php | 2 +- htdocs/societe/commerciaux.php | 10 +++--- htdocs/societe/document.php | 2 +- htdocs/societe/info.php | 12 +++---- htdocs/societe/lien.php | 10 +++--- htdocs/societe/notify/fiche.php | 2 +- htdocs/societe/notify/index.php | 2 +- htdocs/societe/notify/pre.inc.php | 53 ----------------------------- htdocs/societe/pre.inc.php | 55 ------------------------------- htdocs/societe/rib.php | 2 +- htdocs/societe/socnote.php | 2 +- 14 files changed, 28 insertions(+), 181 deletions(-) delete mode 100644 htdocs/rapport/pre.inc.php delete mode 100644 htdocs/societe/notify/pre.inc.php delete mode 100644 htdocs/societe/pre.inc.php diff --git a/htdocs/rapport/Atome.class.php b/htdocs/rapport/Atome.class.php index 304e086d799..ada9d44a6f8 100644 --- a/htdocs/rapport/Atome.class.php +++ b/htdocs/rapport/Atome.class.php @@ -18,17 +18,17 @@ */ /** - \file htdocs/rapport/Atome.class.php - \brief Fichier de la classe mère Atome de génération de rapports - \version $Id$ -*/ + * \file htdocs/rapport/Atome.class.php + * \brief Fichier de la classe mere Atome de generation de rapports + * \version $Id$ + */ include_once DOL_DOCUMENT_ROOT.'/core/dolgraph.class.php'; /** \class Atome - \brief Classe mère des classes de génération des images de rapports + \brief Classe m�re des classes de g�n�ration des images de rapports */ class Atome diff --git a/htdocs/rapport/index.php b/htdocs/rapport/index.php index 0e8aa03818b..f3c155b24cd 100644 --- a/htdocs/rapport/index.php +++ b/htdocs/rapport/index.php @@ -18,7 +18,7 @@ * $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require("./AtomeFactureValidee.class.php"); require("./AtomePropaleValidee.class.php"); diff --git a/htdocs/rapport/pre.inc.php b/htdocs/rapport/pre.inc.php deleted file mode 100644 index 31a9681daf3..00000000000 --- a/htdocs/rapport/pre.inc.php +++ /dev/null @@ -1,45 +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$ - */ - -require ("../main.inc.php"); - -function llxHeader($head = '', $title='', $help_url='') -{ - global $user, $conf; - - /* - * - * - */ - top_menu($head, $title); - - $menu = new Menu(); - - - $menu->add(DOL_URL_ROOT."/rapport/presentation", "Presentation"); - - /* - * - */ - - left_menu($menu->liste, $help_url); - -} -?> diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index d4867f94b98..bd71f3c26b2 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -27,7 +27,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 17ec508e022..09b882d3ef4 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -18,13 +18,13 @@ */ /** - \file htdocs/societe/commerciaux.php - \ingroup societe - \brief Page d'affectations des commerciaux aux societes - \version $Id$ + * \file htdocs/societe/commerciaux.php + * \ingroup societe + * \brief Page d'affectations des commerciaux aux societes + * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); $langs->load("companies"); diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index 37a687bc975..e1e574294f2 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 9e87722f872..979863eaafe 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -17,13 +17,13 @@ */ /** - \file htdocs/societe/info.php - \ingroup societe - \brief Page des informations d'une societe - \version $Id$ -*/ + * \file htdocs/societe/info.php + * \ingroup societe + * \brief Page des informations d'une societe + * \version $Id$ + */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index 6a2244ae7a0..391d8f3643c 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -18,13 +18,13 @@ */ /** - \file htdocs/societe/lien.php - \ingroup societe - \brief Page of links to other third parties - \version $Id$ + * \file htdocs/societe/lien.php + * \ingroup societe + * \brief Page of links to other third parties + * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); $langs->load("companies"); diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index e1efdd38521..e8dc674bab0 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require("pre.inc.php"); +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php index 10d7c350685..ef3878f2f27 100644 --- a/htdocs/societe/notify/index.php +++ b/htdocs/societe/notify/index.php @@ -24,7 +24,7 @@ \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); $langs->load("companies"); $langs->load("banks"); diff --git a/htdocs/societe/notify/pre.inc.php b/htdocs/societe/notify/pre.inc.php deleted file mode 100644 index f1a7b32836d..00000000000 --- a/htdocs/societe/notify/pre.inc.php +++ /dev/null @@ -1,53 +0,0 @@ - - * Copyright (C) 2004-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/societe/notify/pre.inc.php - \ingroup product,service - \brief Fichier gestionnaire du menu gauche des notifications - \version $Id$ -*/ -require ("../../main.inc.php"); - -function llxHeader($head = "") -{ - global $langs, $user, $conf; - - top_menu($head); - - $menu = new Menu(); - - if ($conf->societe->enabled) - { - $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("ThirdParties"),"company"); - - if ($conf->rights->societe->creer) - { - $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", $langs->trans("NewThirdParty")); - } - - $menu->add_submenu(DOL_URL_ROOT."/contact.php", $langs->trans("Contacts")); - - $menu->add_submenu("index.php", $langs->trans("Notifications")); - } - - left_menu($menu->liste); -} - -?> diff --git a/htdocs/societe/pre.inc.php b/htdocs/societe/pre.inc.php deleted file mode 100644 index 22eb512cfbf..00000000000 --- a/htdocs/societe/pre.inc.php +++ /dev/null @@ -1,55 +0,0 @@ - - * Copyright (C) 2004-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/societe/pre.inc.php - \ingroup company - \brief Fichier gestionnaire du menu gauche des notifications - \version $Id$ -*/ - -require ("../main.inc.php"); - - -function llxHeader($head = '', $title='', $help_url='') -{ - global $langs, $user, $conf; - - top_menu($head); - - $menu = new Menu(); - - if ($conf->societe->enabled) - { - $menu->add(DOL_URL_ROOT."/societe.php", $langs->trans("Companies"),"company"); - - if ($conf->rights->societe->creer) - { - $menu->add_submenu(DOL_URL_ROOT."/soc.php?&action=create", $langs->trans("NewCompany")); - } - - $menu->add_submenu(DOL_URL_ROOT."/contact/index.php", $langs->trans("Contacts")); - - $menu->add_submenu("notify/index.php", $langs->trans("Notifications")); - } - - left_menu($menu->liste, $help_url); -} - -?> diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index e3960e1d452..55c7f0a3fd1 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -26,7 +26,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/bank.lib.php"); require_once DOL_DOCUMENT_ROOT."/companybankaccount.class.php"; diff --git a/htdocs/societe/socnote.php b/htdocs/societe/socnote.php index 18ddbfcad93..c642db22ba5 100644 --- a/htdocs/societe/socnote.php +++ b/htdocs/societe/socnote.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); $action = isset($_GET["action"])?$_GET["action"]:$_POST["action"];