Przeglądaj źródła

Fixed bug: Web services in CLI mode failing with an error when attempting to include APPROOT

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1243 a333f486-631f-4898-b8df-5754b55c2be0
romainq 14 lat temu
rodzic
commit
cab41b577e

+ 2 - 1
webservices/createfrommail.php

@@ -50,7 +50,8 @@ define('DEFAULT_SUBSERVICE_ID', 12);
 define('DEFAULT_PRODUCT', 'Request via eMail');
 define('DEFAULT_PRODUCT', 'Request via eMail');
 define('DEFAULT_WORKGROUP_ID', 5);
 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/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
 
 

+ 10 - 3
webservices/cron.php

@@ -22,13 +22,21 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  * @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');
 require_once(APPROOT.'/application/application.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
+echo "coucou\n";
 require_once(APPROOT.'/application/clipage.class.inc.php');
 require_once(APPROOT.'/application/clipage.class.inc.php');
-
+echo "apres cli page\n";
 require_once(APPROOT.'/application/startup.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');
+echo "apres startup\n";
+
 
 
 
 
 function ReadMandatoryParam($oP, $sParam)
 function ReadMandatoryParam($oP, $sParam)
@@ -104,7 +112,6 @@ function CronExec($oP, $aBackgroundProcesses, $bVerbose)
 //
 //
 // Main
 // Main
 //
 //
-
 if (utils::IsModeCLI())
 if (utils::IsModeCLI())
 {
 {
 	$oP = new CLIPage("iTop - CRON");
 	$oP = new CLIPage("iTop - CRON");

+ 2 - 1
webservices/export.php

@@ -23,7 +23,8 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  * @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/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');

+ 2 - 1
webservices/import.php

@@ -33,7 +33,8 @@
 // - not outputing xml when a wrong input is given (class, attribute names)
 // - 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/application.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');