From 0b057a071a494e051e6f276e5ab3171deb54b38b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 6 Sep 2012 08:24:29 +0200
Subject: [PATCH] Fix: for avoid phpunit errors
---
htdocs/holiday/admin/holiday.php | 14 +++++---------
htdocs/holiday/common.inc.php | 3 ++-
htdocs/holiday/define_holiday.php | 5 ++---
htdocs/holiday/fiche.php | 16 ++++++----------
htdocs/holiday/index.php | 11 +++++------
htdocs/holiday/month_report.php | 13 +++++--------
htdocs/holiday/view_log.php | 5 ++---
7 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 9690e93f3cc..2e3cf836d9d 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 f3b44f57d00..2c135d0ed8e 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 7d68e823a1d..8c11e3bd031 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 1499bc230ba..968876e2466 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 c8f69cdfb08..6052297ede1 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 c8ef3267ec6..70eb6049e74 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 786f9d3dab6..177dd2cc498 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();
--
GitLab