From 9647d5a7a644d407da8e9ad3c7f2673d3110e25c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Mar 2010 08:08:49 +0000 Subject: [PATCH] Qual: First change to remove pre.inc.php --- htdocs/user/clicktodial.php | 2 +- htdocs/user/fiche.php | 2 +- htdocs/user/group/fiche.php | 2 +- htdocs/user/group/index.php | 2 +- htdocs/user/group/ldap.php | 3 +- htdocs/user/group/perms.php | 3 +- htdocs/user/group/pre.inc.php | 65 ----------------------------------- htdocs/user/home.php | 2 +- htdocs/user/index.php | 2 +- htdocs/user/info.php | 2 +- htdocs/user/ldap.php | 2 +- htdocs/user/note.php | 2 +- htdocs/user/param_ihm.php | 2 +- htdocs/user/perms.php | 2 +- htdocs/user/pre.inc.php | 61 -------------------------------- 15 files changed, 15 insertions(+), 139 deletions(-) delete mode 100644 htdocs/user/group/pre.inc.php delete mode 100644 htdocs/user/pre.inc.php diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 669eaa59c3d..308ebfa6dd2 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); $langs->load("users"); diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 817da4778e3..599adc55ff7 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -27,7 +27,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 23f5e4e7bee..94c11cf7cbd 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/usergroup.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 57dc0a646e5..86fd80ea963 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index f638f3b51cd..27c4ae7d4e3 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -24,7 +24,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index f3c46a1b525..f7050626990 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -26,7 +26,8 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT.'/usergroup.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); $langs->load("users"); diff --git a/htdocs/user/group/pre.inc.php b/htdocs/user/group/pre.inc.php deleted file mode 100644 index 9aed84f574a..00000000000 --- a/htdocs/user/group/pre.inc.php +++ /dev/null @@ -1,65 +0,0 @@ - - * Copyright (C) 2005 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/user/group/pre.inc.php - \brief Fichier gestionnaire du menu groupe d'utilisateurs - \version $Id$ -*/ - -require("../../main.inc.php"); - -require(DOL_DOCUMENT_ROOT.'/usergroup.class.php'); - -function llxHeader($head = "", $urlp = "") -{ - global $user, $langs; - - top_menu($head); - - $menu = new Menu(); - - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); - $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); - } - - if($user->rights->user->user->creer || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser")); - } - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); - $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); - } - - if($user->rights->user->user->creer || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup")); - } - - - left_menu($menu->liste); -} - -?> diff --git a/htdocs/user/home.php b/htdocs/user/home.php index ccd7b18717d..bc0a6aaa511 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); if (! $user->rights->user->user->lire && !$user->admin) { diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 2f6acb50be3..5eb27ab6d2e 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); if (! $user->rights->user->user->lire && ! $user->admin) accessforbidden(); diff --git a/htdocs/user/info.php b/htdocs/user/info.php index f19f89fd0dd..55c0831034c 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -23,7 +23,7 @@ * \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/usergroups.lib.php'); require_once(DOL_DOCUMENT_ROOT."/user.class.php"); diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 8ab04afc9a2..eaea78bb59c 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.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/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 109d6f424d0..b1e9947b7f4 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.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.'/user.class.php'); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index b28c33b08a2..bd5a63b7c7e 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -23,7 +23,7 @@ * \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/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index ce3f3f1ac1b..b8f10108553 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -26,7 +26,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); $langs->load("users"); diff --git a/htdocs/user/pre.inc.php b/htdocs/user/pre.inc.php deleted file mode 100644 index 0f7c519cee8..00000000000 --- a/htdocs/user/pre.inc.php +++ /dev/null @@ -1,61 +0,0 @@ - - * Copyright (C) 2005 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/user/pre.inc.php - \brief Gestionnaire menu fichier users - \version $Id$ -*/ -require("../main.inc.php"); - -function llxHeader($head = '', $title='', $help_url='') -{ - global $user,$langs; - - top_menu($head, $title); - - $menu = new Menu(); - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); - $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); - } - - if($user->rights->user->user->creer || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser")); - } - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); - $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); - } - - if($user->rights->user->user->creer || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup")); - } - - - left_menu($menu->liste, $help_url); -} - -?>