From 818fec7e6b7cd6b4f42919a20de403906d074bdf Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Mar 2010 08:42:10 +0000 Subject: [PATCH] Qual: First change to remove pre.inc.php --- htdocs/projet/activity/index.php | 4 +- htdocs/projet/activity/list.php | 4 +- htdocs/projet/activity/pre.inc.php | 69 ---------------------------- htdocs/projet/contact.php | 2 +- htdocs/projet/element.php | 7 +-- htdocs/projet/fiche.php | 6 +-- htdocs/projet/index.php | 3 +- htdocs/projet/liste.php | 3 +- htdocs/projet/note.php | 2 +- htdocs/projet/pre.inc.php | 72 ------------------------------ htdocs/projet/tasks/contact.php | 4 +- htdocs/projet/tasks/fiche.php | 4 +- htdocs/projet/tasks/index.php | 4 +- htdocs/projet/tasks/note.php | 3 +- htdocs/projet/tasks/pre.inc.php | 69 ---------------------------- htdocs/projet/tasks/task.php | 4 +- htdocs/projet/tasks/time.php | 4 +- 17 files changed, 34 insertions(+), 230 deletions(-) delete mode 100644 htdocs/projet/activity/pre.inc.php delete mode 100644 htdocs/projet/pre.inc.php delete mode 100644 htdocs/projet/tasks/pre.inc.php diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 92f268a76f9..9bc46cd4a90 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 76f2b39f09c..b8225b7c251 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mode=$_REQUEST["mode"]; diff --git a/htdocs/projet/activity/pre.inc.php b/htdocs/projet/activity/pre.inc.php deleted file mode 100644 index e97b47c2b8b..00000000000 --- a/htdocs/projet/activity/pre.inc.php +++ /dev/null @@ -1,69 +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/projet/activity/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ - -require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); - -$langs->load("projects"); -$langs->load("companies"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = "", $title="", $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - left_menu($menu->liste, $help_url); -} - -?> diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 9c782ff0d10..bda75869b85 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require ("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 18d4104a38d..fcb189eff6b 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -25,8 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture-rec.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); @@ -34,7 +36,6 @@ if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fourniss if ($conf->fournisseur->enabled) require_once(DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->agenda->enabled) require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index d6649056d40..f134dfdfa54 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -25,11 +25,11 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); $langs->load("projects"); $langs->load('companies'); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 5ad54a94c00..3bccf17953e 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -25,7 +25,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mine = $_REQUEST['mode']=='mine' ? 1 : 0; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index daac7fca6a5..d277865f291 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -26,7 +26,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if (!$user->rights->projet->lire) accessforbidden(); diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index b9cee76ca51..a580cc6d3db 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require('./pre.inc.php'); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/pre.inc.php b/htdocs/projet/pre.inc.php deleted file mode 100644 index 47b3a83d5be..00000000000 --- a/htdocs/projet/pre.inc.php +++ /dev/null @@ -1,72 +0,0 @@ - - * 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 - * (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/projet/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ - -require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); - -$langs->load("projects"); -$langs->load("companies"); -$langs->load("bills"); -$langs->load("orders"); -$langs->load("commercial"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = '', $title='', $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - - left_menu($menu->liste, $help_url); -} -?> diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index add9f35dec8..d4c1f50e4a4 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require ("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index 16389a65b73..8b106d0499e 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -25,10 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); $projectid=''; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index f95f406eecf..1de86ba0385 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -25,10 +25,10 @@ * \version $Id$ */ -require("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); +require ("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load('projects'); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index 6a7b8b202fc..ec31ee9bd92 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -23,7 +23,8 @@ * \version $Id$ */ -require('./pre.inc.php'); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/projet/tasks/pre.inc.php b/htdocs/projet/tasks/pre.inc.php deleted file mode 100644 index a7cd6186d9f..00000000000 --- a/htdocs/projet/tasks/pre.inc.php +++ /dev/null @@ -1,69 +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/projet/tasks/pre.inc.php - * \ingroup projet - * \brief Fichier de gestion du menu gauche du module projet - * \version $Id$ - */ -require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); - -$langs->load("projects"); -$langs->load("companies"); - -/** - * Enter description here... - * - * @param unknown_type $head - * @param unknown_type $title - * @param unknown_type $help_url - */ -function llxHeader($head = "", $title="", $help_url='') -{ - global $langs, $user; - - top_menu($head, $title); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects", $langs->trans("Projects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/index.php?leftmenu=projects&mode=mine", $langs->trans("MyProjects"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - $menu->add(DOL_URL_ROOT."/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); - $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); - - - left_menu($menu->liste, $help_url); -} - -?> diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 908569c809c..e2a893726f4 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require ("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 0c64cf8d441..55f421f0fef 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -25,7 +25,9 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");