composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 09:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
SVN:trunk[1243]
This commit is contained in:
Romain Quetiez
2011-04-28 07:28:40 +00:00
parent d45149a327
commit 374858ef73
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webservices/createfrommail.php
View File

@@ -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');

13
webservices/cron.php
View File

@@ -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");

3
webservices/export.php
View File

@@ -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');

3
webservices/import.php
View File

@@ -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');