diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php index 9690e93f3ccfac4f46ab7cc1fec63c2e473c1028..2e3cf836d9d81db42d509d31e420f44411bce1a0 100644 --- a/htdocs/holiday/admin/holiday.php +++ b/htdocs/holiday/admin/holiday.php @@ -25,15 +25,11 @@ * \brief Page module configuration paid holiday. */ -$res=0; -if (! $res && file_exists("../main.inc.php")) $res=@include("../main.inc.php"); // For root directory -if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); // For "custom" directory -if (! $res) die("Include of main fails"); - -dol_include_once("/holiday/class/holiday.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php"); +require '../main.inc.php'; +require DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php'; $action=GETPOST('action'); diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index f3b44f57d00545959794bdd89788709a8b4a2186..2c135d0ed8e0e5653a5cd114cee6bc1b7a4442a8 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -23,7 +23,8 @@ * \brief Common load of data */ -require_once(DOL_DOCUMENT_ROOT. "/holiday/class/holiday.class.php"); +require '../main.inc.php' ; +require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; $langs->load("user"); $langs->load("other"); diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php index 7d68e823a1debb00cadc19069f7d41bc2335217a..8c11e3bd031cf571089bbe1aeb253497d92709ba 100644 --- a/htdocs/holiday/define_holiday.php +++ b/htdocs/holiday/define_holiday.php @@ -25,9 +25,8 @@ * \author dmouillard@teclib.com <Dimitri Mouillard> */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php index 1499bc230baa32f8f842c23693067ef1e980afd1..968876e2466b34ad5434db3d5c088e208642953b 100644 --- a/htdocs/holiday/fiche.php +++ b/htdocs/holiday/fiche.php @@ -20,18 +20,14 @@ * \file fiche.php * \ingroup holiday * \brief Form and file creation of paid holiday. - * \version $Id: fiche.php,v 1.16 2011/09/15 11:00:00 dmouillard Exp $ - * \author dmouillard@teclib.com <Dimitri Mouillard> - * \remarks Form and file creation of paid holiday. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formfile.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/core/class/CMailFile.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formmail.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/CMailFile.class.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.formmail.class.php'; // Get parameters $myparam = GETPOST("myparam"); diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index c8f69cdfb089f7fc4ef5e6df4df1e2ee65ea3c21..6052297ede18fdddd8fa0810ebe8f6569c9d657c 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -23,12 +23,11 @@ * \brief List of holiday. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.form.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/core/class/html.formother.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/user/class/usergroup.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT. '/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php index c8ef3267ec66410e5546e776185af41ca406a642..70eb6049e74e096d81a60fba1c77b288f0978823 100644 --- a/htdocs/holiday/month_report.php +++ b/htdocs/holiday/month_report.php @@ -20,15 +20,12 @@ * \file month_report.php * \ingroup holiday * \brief Monthly report of paid holiday. - * \version $Id: month_report.php,v 1.00 2011/09/15 11:00:00 flegastelois Exp $ - * \author flegastelois@teclib.com <François Legastelois> - * \remarks Monthly report of paid holiday. */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT.'/user/class/user.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); + +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden(); diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php index 786f9d3dab6a99821273374c9056cd9afdfe4e46..177dd2cc498c1fc97ed980d5e8e94ca9bfab6fb0 100644 --- a/htdocs/holiday/view_log.php +++ b/htdocs/holiday/view_log.php @@ -23,9 +23,8 @@ * \ingroup holiday */ -require('../main.inc.php'); -require_once(DOL_DOCUMENT_ROOT. "/user/class/user.class.php"); -require_once(DOL_DOCUMENT_ROOT. "/holiday/common.inc.php"); +require DOL_DOCUMENT_ROOT. '/holiday/common.inc.php'; +require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php'; // Protection if external user if ($user->societe_id > 0) accessforbidden();