diff --git a/htdocs/public/adherents/index.php b/htdocs/public/adherents/index.php index 114d7ffcfa2..d99b9d671a6 100644 --- a/htdocs/public/adherents/index.php +++ b/htdocs/public/adherents/index.php @@ -23,8 +23,6 @@ require("./pre.inc.php"); llxHeader(); -//$db = new Db(); - print_titre("Gestion des adhesions a l'association"); print '

'; diff --git a/htdocs/public/adherents/new.php b/htdocs/public/adherents/new.php index 351facc13ca..c1010338cb5 100644 --- a/htdocs/public/adherents/new.php +++ b/htdocs/public/adherents/new.php @@ -20,14 +20,12 @@ * */ require("./pre.inc.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent_type.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); //require($GLOBALS["DOCUMENT_ROOT"]."/cotisation.class.php"); //require($GLOBALS["DOCUMENT_ROOT"]."/paiement.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherents/adherent_options.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); - -//$db = new Db(); $adho = new AdherentOptions($db); $errmsg=''; $num=0; diff --git a/htdocs/public/adherents/pre.inc.php b/htdocs/public/adherents/pre.inc.php index 57f7e96888c..b28ce56879d 100644 --- a/htdocs/public/adherents/pre.inc.php +++ b/htdocs/public/adherents/pre.inc.php @@ -19,12 +19,11 @@ * $Source$ * */ -require($GLOBALS["DOCUMENT_ROOT"]."/main.inc.php3"); + +require("../../main.inc.php3"); function llxHeader($head = "") { global $user, $conf; - - /* * * diff --git a/htdocs/public/adherents/priv_edit.php b/htdocs/public/adherents/priv_edit.php index 7f8d7ab7a73..d170217d210 100644 --- a/htdocs/public/adherents/priv_edit.php +++ b/htdocs/public/adherents/priv_edit.php @@ -20,11 +20,10 @@ * */ require("./pre.inc.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent_type.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherents/adherent_options.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); -//$db = new Db(); $adho = new AdherentOptions($db); $errmsg=''; diff --git a/htdocs/public/adherents/priv_fiche.php b/htdocs/public/adherents/priv_fiche.php index fdbaf16eed2..c1197abb400 100644 --- a/htdocs/public/adherents/priv_fiche.php +++ b/htdocs/public/adherents/priv_fiche.php @@ -21,14 +21,12 @@ * */ require("./pre.inc.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherent_type.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/cotisation.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/paiement.class.php"); -require($GLOBALS["DOCUMENT_ROOT"]."/adherents/adherent_options.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php"); +require(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); - -//$db = new Db(); $adho = new AdherentOptions($db); llxHeader(); diff --git a/htdocs/public/adherents/priv_liste.php b/htdocs/public/adherents/priv_liste.php index a2f6d0ff693..1aa8abc59c6 100644 --- a/htdocs/public/adherents/priv_liste.php +++ b/htdocs/public/adherents/priv_liste.php @@ -24,7 +24,6 @@ require("./pre.inc.php"); llxHeader(); -//$db = new Db(); if ($sortorder == "") { $sortorder="ASC"; } if ($sortfield == "") { $sortfield="nom"; }