From 00524039b2b611a95db1af9cc91043b87f43ae7e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 1 Mar 2010 09:30:33 +0000 Subject: [PATCH] Qual: First change to remove pre.inc.php --- htdocs/bookmarks/fiche.php | 2 +- htdocs/bookmarks/liste.php | 2 +- htdocs/bookmarks/pre.inc.php | 48 ------------------------------------ 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 htdocs/bookmarks/pre.inc.php diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php index c6fe20ca221..db29b82b759 100644 --- a/htdocs/bookmarks/fiche.php +++ b/htdocs/bookmarks/fiche.php @@ -25,7 +25,7 @@ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/bookmarks/bookmark.class.php"); $langs->load("other"); diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index d1350638949..74c707c5c8e 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/bookmarks/bookmark.class.php"); diff --git a/htdocs/bookmarks/pre.inc.php b/htdocs/bookmarks/pre.inc.php deleted file mode 100644 index b33aed49e96..00000000000 --- a/htdocs/bookmarks/pre.inc.php +++ /dev/null @@ -1,48 +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/bookmarks/pre.inc.php - \ingroup bookmark - \brief File Management menu left bookmarks - \version $Id$ -*/ - -require("../main.inc.php"); - - -function llxHeader($head = '', $title='', $help_url='') -{ - global $user, $conf, $langs; - $langs->load("other"); - - top_menu($head, $title); - - $menu = new Menu(); - - // Bookmarks - if ($conf->bookmark->enabled) - { - if ($user->rights->bookmark->lire) $menu->add(DOL_URL_ROOT."/bookmarks/liste.php", $langs->trans("Bookmarks")); - if ($user->rights->bookmark->creer) $menu->add(DOL_URL_ROOT."/bookmarks/fiche.php?action=create", $langs->trans("NewBookmark"),1); - if ($user->rights->bookmark->lire) $menu->add(DOL_URL_ROOT."/bookmarks/liste.php", $langs->trans("List"),1); - } - - left_menu($menu->liste); -} -?>