From 374858ef73848eb7302c6ead62c836a319ef76d1 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 28 Apr 2011 07:28:40 +0000
Subject: [PATCH] Fixed bug: Web services in CLI mode failing with an error
 when attempting to include APPROOT

SVN:trunk[1243]
---
 webservices/createfrommail.php |  3 ++-
 webservices/cron.php           | 13 ++++++++++---
 webservices/export.php         |  3 ++-
 webservices/import.php         |  3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/webservices/createfrommail.php b/webservices/createfrommail.php
index f934072f84..d434003825 100644
--- a/webservices/createfrommail.php
+++ b/webservices/createfrommail.php
@@ -50,7 +50,8 @@ define('DEFAULT_SUBSERVICE_ID', 12);
 define('DEFAULT_PRODUCT', 'Request via eMail');
 define('DEFAULT_WORKGROUP_ID', 5);
 
-require_once('../approot.inc.php');
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
diff --git a/webservices/cron.php b/webservices/cron.php
index 919d64e89b..b5775d8de0 100644
--- a/webservices/cron.php
+++ b/webservices/cron.php
@@ -22,13 +22,21 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
-require_once('../approot.inc.php');
+echo "coucou\n";
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/application.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/webpage.class.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/clipage.class.inc.php');
-
+echo "apres cli page\n";
 require_once(APPROOT.'/application/startup.inc.php');
+echo "apres startup\n";
+
 
 
 function ReadMandatoryParam($oP, $sParam)
@@ -104,7 +112,6 @@ function CronExec($oP, $aBackgroundProcesses, $bVerbose)
 //
 // Main
 //
-
 if (utils::IsModeCLI())
 {
 	$oP = new CLIPage("iTop - CRON");
diff --git a/webservices/export.php b/webservices/export.php
index 906f20b986..4d81723c9f 100644
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -23,7 +23,8 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
-require_once('../approot.inc.php');
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
diff --git a/webservices/import.php b/webservices/import.php
index e9ba408a6c..6fd764b94e 100644
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -33,7 +33,8 @@
 // - not outputing xml when a wrong input is given (class, attribute names)
 //
 
-require_once('../approot.inc.php');
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');