diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 3774c9aeae7..7d4979c5fa8 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -21,11 +21,11 @@ /** * \file htdocs/adherents/card_subscriptions.php * \ingroup member - * \brief Onglet d'ajout, edition, suppression des adh�sions d'un adh�rent + * \brief Onglet d'ajout, edition, suppression des adhesions d'un adherent * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index 58f056ec807..164c6ad44ff 100755 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -24,7 +24,7 @@ * \brief Page to output members business cards * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php"); diff --git a/htdocs/adherents/cartes/etiquette.php b/htdocs/adherents/cartes/etiquette.php index 24ff5ca248d..a1d5f3cf18a 100755 --- a/htdocs/adherents/cartes/etiquette.php +++ b/htdocs/adherents/cartes/etiquette.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/member/PDF_card.class.php'); diff --git a/htdocs/adherents/cartes/pre.inc.php b/htdocs/adherents/cartes/pre.inc.php deleted file mode 100644 index 5de4f22fb06..00000000000 --- a/htdocs/adherents/cartes/pre.inc.php +++ /dev/null @@ -1,66 +0,0 @@ - - * Copyright (C) 2004-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/adherents/cartes/pre.inc.php - \ingroup adherent - \brief Fichier de gestion du menu gauche du module adherent - \version $Id$ -*/ - -require("../../main.inc.php"); - -function llxHeader($head = '', $title='', $help_url='') -{ - global $user, $conf, $langs; - - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Members")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated")); - - $menu->add(DOL_URL_ROOT."/adherents/public.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Exports")); - $menu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php",$langs->trans("Filehtpasswd")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php",$langs->trans("MembersCards")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php",$langs->trans("MembersTickets")); - - $langs->load("compta"); - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Accountancy")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php",$langs->trans("Subscriptions")); - $langs->load("banks"); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/",$langs->trans("Bank")); - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Setup")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/type.php",$langs->trans("MembersTypes")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/options.php",$langs->trans("MembersAttributes")); - - left_menu($menu->liste); -} - -?> diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index df7d3c9cf63..e6e39f7d151 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 7395491e4b6..c4c64d73406 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/images.lib.php"); diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 25de8c39634..dbe377ec4a6 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -23,7 +23,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php index 1ef487e5751..a3df0d98f53 100644 --- a/htdocs/adherents/htpasswd.php +++ b/htdocs/adherents/htpasswd.php @@ -19,14 +19,14 @@ */ /** - \file htdocs/adherents/htpasswd.php - \ingroup member - \brief Page d'export htpasswd du fichier des adherents - \author Rodolphe Quiedeville - \version $Id$ -*/ + * \file htdocs/adherents/htpasswd.php + * \ingroup member + * \brief Page d'export htpasswd du fichier des adherents + * \author Rodolphe Quiedeville + * \version $Id$ + */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/security.lib.php'); llxHeader(); diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index b60ff316ddc..e5825e19b8a 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -24,7 +24,7 @@ * \brief Page accueil module adherents */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 90973a5b891..98cbc4be4cd 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -24,7 +24,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."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php index 84aad2a88b1..b1556263988 100644 --- a/htdocs/adherents/info_subscription.php +++ b/htdocs/adherents/info_subscription.php @@ -24,7 +24,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."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index e3e178d3a2f..5cf67c786cb 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.lib.php"); diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 3ff427d5cf4..eb71071c33c 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 779672a6eca..b0b400de395 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -24,7 +24,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/adherents/adherent.class.php'); diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index c91a126ae00..428f874905b 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); $langs->load("members"); diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php deleted file mode 100644 index 3b481a976e5..00000000000 --- a/htdocs/adherents/pre.inc.php +++ /dev/null @@ -1,70 +0,0 @@ - - * Copyright (C) 2004-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/adherents/pre.inc.php - * \ingroup member - * \brief Fichier de gestion du menu gauche du module adherent - * \version $Id$ - */ - -require("../main.inc.php"); - -function llxHeader($head = '', $title='', $help_url='') -{ - global $user, $conf, $langs; - - $langs->load("members"); - - top_menu($head, $title); - - $menu = new Menu(); - - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Members")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=outofdate",$langs->trans("MenuMembersNotUpToDate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated")); - - $menu->add(DOL_URL_ROOT."/adherents/public.php?leftmenu=member_public",$langs->trans("MemberPublicLinks")); - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Exports")); - $menu->add_submenu(DOL_URL_ROOT."/exports/index.php?leftmenu=export",$langs->trans("Datas")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php",$langs->trans("Filehtpasswd")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php",$langs->trans("MembersCards")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php",$langs->trans("MembersTickets")); - - $langs->load("compta"); - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Accountancy")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/cotisations.php",$langs->trans("Subscriptions")); - $langs->load("banks"); - $menu->add_submenu(DOL_URL_ROOT."/compta/bank/",$langs->trans("Banks")); - - $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Setup")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/type.php",$langs->trans("MembersTypes")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/options.php",$langs->trans("MembersAttributes")); - - left_menu($menu->liste, $help_url); - -} - -?> diff --git a/htdocs/adherents/public.php b/htdocs/adherents/public.php index 20088ad11ec..7d6780d4676 100644 --- a/htdocs/adherents/public.php +++ b/htdocs/adherents/public.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index f28b8818638..bfc94b0d691 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -25,7 +25,7 @@ * \version $Id$ */ -require("./pre.inc.php"); +require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");