Qual: First change to remove pre.inc.php

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");

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");

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');

htdocs/adherents/cartes/pre.inc.php

-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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&amp;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);
-}
-
-?>

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");

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");

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");

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();

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");
 

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");

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");

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");

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");
 

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');
 

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");

htdocs/adherents/pre.inc.php

-<?php
-/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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&amp;filter=outofdate",$langs->trans("MenuMembersNotUpToDate"));
-	$menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&amp;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);
-
-}
-
-?>

htdocs/adherents/public.php

@@ -25,7 +25,7 @@
  *		\version    $Id$
  */
 
-require("./pre.inc.php");
+require("../main.inc.php");
 
 
 

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");