composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2439 Add real autoloader for framework files (not modules)

Browse Source
This commit is contained in:
Molkobain
2019-08-13 13:46:19 +02:00
parent 83e3321a48
commit ec09589646
55 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/configuration/default-environment/unattended_install/unattended_install.php
View File

@@ -1,7 +1,7 @@
<?php
//this scrit will be run under the ./toolkit directory, relatively to the document root
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/utils.inc.php');
require_once(APPROOT.'/application/clipage.class.inc.php');
require_once(APPROOT.'/core/config.class.inc.php');

2
application/utils.inc.php
View File

@@ -1215,7 +1215,7 @@ class utils
*
* ```php
* if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
* require_once(__DIR__.'/../../approot.inc.php');
* require_once(__DIR__.'/../../bootstrap.inc.php');
* ```
*
* @param string $sModule

24
bootstrap.inc.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
/**
* Copyright (C) 2013-2019 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
require_once __DIR__.'/approot.inc.php';
$oClassLoader = require APPROOT.'/lib/autoload.php';
// Require here files containing PHP instructions

2
core/simplegraph.class.inc.php
View File

@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*
* Example:
* require_once('../approot.inc.php');
* require_once('../bootstrap.inc.php');
* require_once(APPROOT.'application/startup.inc.php');
* require_once(APPROOT.'core/simplegraph.class.inc.php');
*

2
datamodels/2.x/itop-attachments/ajax.attachment.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../../approot.inc.php');
require_once('../../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/webpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
datamodels/2.x/itop-backup/ajax.backup.php
View File

@@ -24,7 +24,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
if (!defined('APPROOT')) require_once(__DIR__.'/../../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/webpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

6
datamodels/2.x/itop-backup/backup.php
View File

@@ -17,13 +17,13 @@
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
if (!defined('APPROOT'))
{
if (file_exists(__DIR__.'/../../approot.inc.php'))
if (file_exists(__DIR__.'/../../bootstrap.inc.php'))
{
require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
require_once __DIR__.'/../../bootstrap.inc.php'; // When in env-xxxx folder
}
else
{
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
require_once __DIR__.'/../../../bootstrap.inc.php'; // When in datamodels/x.x folder
}
}
require_once(APPROOT.'application/application.inc.php');

6
datamodels/2.x/itop-backup/check-backup.php
View File

@@ -24,13 +24,13 @@
// /usr/bin/php -q /var/www/combodo/modules/itop-backup/check-backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
// Do not forget to set the 'itop_backup_incident' configuration file parameter !
if (file_exists(__DIR__.'/../../approot.inc.php'))
if (file_exists(__DIR__.'/../../bootstrap.inc.php'))
{
require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
require_once __DIR__.'/../../bootstrap.inc.php'; // When in env-xxxx folder
}
else
{
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
require_once __DIR__.'/../../../bootstrap.inc.php'; // When in datamodels/x.x folder
}
require_once(APPROOT.'application/utils.inc.php');
require_once(APPROOT.'application/startup.inc.php');

2
datamodels/2.x/itop-backup/status.php
View File

@@ -25,7 +25,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
if (!defined('APPROOT')) require_once(__DIR__.'/../../bootstrap.inc.php');
require_once(APPROOT.'application/application.inc.php');
require_once(APPROOT.'application/itopwebpage.class.inc.php');

2
datamodels/2.x/itop-hub-connector/myextensions.php
View File

@@ -22,7 +22,7 @@
* @copyright Copyright (C) 2010-2016 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once ('../approot.inc.php');
require_once ('../bootstrap.inc.php');
require_once (APPROOT.'/application/application.inc.php');
require_once (APPROOT.'/application/itopwebpage.class.inc.php');
require_once (APPROOT.'setup/extensionsmap.class.inc.php');

6
datamodels/2.x/itop-portal-base/index.php
View File

@@ -26,13 +26,13 @@
*/
// Load current environment
if (file_exists(__DIR__.'/../../approot.inc.php'))
if (file_exists(__DIR__.'/../../bootstrap.inc.php'))
{
require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
require_once __DIR__.'/../../bootstrap.inc.php'; // When in env-xxxx folder
}
else
{
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
require_once __DIR__.'/../../../bootstrap.inc.php'; // When in datamodels/x.x folder
}
require_once APPROOT.'application/startup.inc.php';

6
datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
View File

@@ -32,13 +32,13 @@ require_once APPROOT.'/lib/autoload.php';
// Load current environment if necessary (typically from CLI as the app is not started yet)
if (!defined('MODULESROOT'))
{
if (file_exists(__DIR__.'/../../../../approot.inc.php'))
if (file_exists(__DIR__.'/../../../../bootstrap.inc.php'))
{
require_once __DIR__.'/../../../../approot.inc.php'; // When in env-xxxx folder
require_once __DIR__.'/../../../../bootstrap.inc.php'; // When in env-xxxx folder
}
else
{
require_once __DIR__.'/../../../../../approot.inc.php'; // When in datamodels/x.x folder
require_once __DIR__.'/../../../../../bootstrap.inc.php'; // When in datamodels/x.x folder
}
require_once APPROOT.'/application/startup.inc.php';
}

6
datamodels/2.x/itop-portal/index.php
View File

@@ -40,13 +40,13 @@
);
// Load current environment
if (file_exists(__DIR__.'/../../approot.inc.php'))
if (file_exists(__DIR__.'/../../bootstrap.inc.php'))
{
require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
require_once __DIR__.'/../../bootstrap.inc.php'; // When in env-xxxx folder
}
else
{
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
require_once __DIR__.'/../../../bootstrap.inc.php'; // When in datamodels/x.x folder
}
require_once APPROOT.'application/startup.inc.php';

2
pages/UI.php
View File

@@ -340,7 +340,7 @@ function DisplayNavigatorGroupTab($oP)
* Main user interface page starts here
*
***********************************************************************************/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/wizardhelper.class.inc.php');

2
pages/UniversalSearch.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/applicationcontext.class.inc.php');

2
pages/ajax.csvimport.php
View File

@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/webpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
pages/ajax.document.php
View File

@@ -19,7 +19,7 @@
*
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'application/utils.inc.php');

2
pages/ajax.render.php
View File

@@ -19,7 +19,7 @@
*
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'application/application.inc.php');
require_once(APPROOT.'application/webpage.class.inc.php');
require_once(APPROOT.'application/ajaxwebpage.class.inc.php');

2
pages/ajax.searchform.php
View File

@@ -22,7 +22,7 @@
use Combodo\iTop\Application\Search\AjaxSearchException;
use Combodo\iTop\Application\Search\CriterionParser;
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/webpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
pages/audit.php
View File

@@ -163,7 +163,7 @@ function GetReportColor($iTotal, $iErrors)
try
{
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/csvpage.class.inc.php');

2
pages/csvimport.php
View File

@@ -26,7 +26,7 @@
try
{
ini_set('memory_limit', '256M');
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
pages/exec.php
View File

@@ -32,7 +32,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
// Needed to read the parameters (with sanitization)
require_once(APPROOT.'application/utils.inc.php');

2
pages/graphviz.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');

2
pages/logoff.php
View File

@@ -16,7 +16,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/wizardhelper.class.inc.php');

2
pages/navigator.php
View File

@@ -20,7 +20,7 @@
/**
* Display the Flash navigator, in the whole pane
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');

2
pages/notifications.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');

2
pages/opensearch.xml.php
View File

@@ -23,7 +23,7 @@
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
pages/preferences.php
View File

@@ -23,7 +23,7 @@
* @copyright Copyright (C) 2010-2017 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
pages/run_query.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
pages/schema.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');

2
pages/tagadmin.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'application/application.inc.php');
require_once(APPROOT.'application/itopwebpage.class.inc.php');
require_once(APPROOT.'application/startup.inc.php');

2
portal/index.php
View File

@@ -20,7 +20,7 @@
*
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
try

2
setup/ajax.dataloader.php
View File

@@ -41,7 +41,7 @@
* 'percent': integer 0..100 the percentage of completion once the file has been loaded
*/
define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/utils.inc.php');
require_once(APPROOT.'/setup/setuppage.class.inc.php');
require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');

2
setup/email.test.php
View File

@@ -27,7 +27,7 @@
/**
* Wizard to configure and initialize the iTop application
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/utils.inc.php');
require_once(APPROOT.'/core/email.class.inc.php');
require_once('./setuppage.class.inc.php');

2
setup/index.php
View File

@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/utils.inc.php');
require_once(APPROOT.'/core/config.class.inc.php');
require_once(APPROOT.'/setup/setuppage.class.inc.php');

2
setup/phpinfo.php
View File

@@ -1,5 +1,5 @@
<?php
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
synchro/priv_sync_chunk.php
View File

@@ -24,7 +24,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.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');

2
synchro/replica.php
View File

@@ -22,7 +22,7 @@
* @copyright Copyright (C) 2010-2017 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');

2
synchro/synchro_exec.php
View File

@@ -34,7 +34,7 @@
//
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.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');

2
synchro/synchro_import.php
View File

@@ -33,7 +33,7 @@ if (!defined('__DIR__'))
/** @noinspection DirectoryConstantCanBeUsedInspection */
define('__DIR__', dirname(__FILE__));
}
require_once __DIR__.'/../approot.inc.php';
require_once __DIR__.'/../bootstrap.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';

2
test/GroupByAndFunctions.php
View File

@@ -17,7 +17,7 @@
// along with iTop. If not, see <http://www.gnu.org/licenses/>
//
require_once ('../approot.inc.php');
require_once ('../bootstrap.inc.php');
require_once(APPROOT.'application/application.inc.php');
require_once(APPROOT.'application/itopwebpage.class.inc.php');
require_once(APPROOT.'application/startup.inc.php');

16
test/ItopTestCase.php
View File

@@ -33,14 +33,14 @@ class ItopTestCase extends TestCase
{
protected function setUp()
{
@include_once '../approot.inc.php';
@include_once '../../approot.inc.php';
@include_once '../../../approot.inc.php';
@include_once '../../../../approot.inc.php';
@include_once '../../../../../approot.inc.php';
@include_once '../../../../../../approot.inc.php';
@include_once '../../../../../../../approot.inc.php';
@include_once '../../../../../../../../approot.inc.php';
@include_once '../bootstrap.inc.php';
@include_once '../../bootstrap.inc.php';
@include_once '../../../bootstrap.inc.php';
@include_once '../../../../bootstrap.inc.php';
@include_once '../../../../../bootstrap.inc.php';
@include_once '../../../../../../bootstrap.inc.php';
@include_once '../../../../../../../bootstrap.inc.php';
@include_once '../../../../../../../../bootstrap.inc.php';
$this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");

2
test/benchmark.php
View File

@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/itopwebpage.class.inc.php');
require_once(APPROOT.'/application/wizardhelper.class.inc.php');

2
test/display_cache_content.php
View File

@@ -21,7 +21,7 @@
* Date: 06/10/2017
*/
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'application/startup.inc.php');

2
test/replay_query_log.php
View File

@@ -210,7 +210,7 @@ class QueryLogEntry
//
/////////////////////////////////////////////////////////////////////////////
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
test/test.php
View File

@@ -92,7 +92,7 @@ function DisplayEvents($aEvents, $sTitle)
date_default_timezone_set('Europe/Paris');
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/utils.inc.php');
require_once('./test.class.inc.php');
require_once('./testlist.inc.php');

2
webservices/backoffice.dataloader.php
View File

@@ -31,7 +31,7 @@
*/
define('SAFE_MINIMUM_MEMORY', 256*1024*1024);
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
webservices/createfrommail.php
View File

@@ -51,7 +51,7 @@ define('DEFAULT_PRODUCT', 'Request via eMail');
define('DEFAULT_WORKGROUP_ID', 5);
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/startup.inc.php');

2
webservices/cron.php
View File

@@ -24,7 +24,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/nicewebpage.class.inc.php');
require_once(APPROOT.'/application/webpage.class.inc.php');

2
webservices/export-v2.php
View File

@@ -24,7 +24,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/nicewebpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
webservices/export.php
View File

@@ -25,7 +25,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/nicewebpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
webservices/import.php
View File

@@ -35,7 +35,7 @@
//
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.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');

2
webservices/itop.wsdl.php
View File

@@ -43,7 +43,7 @@ else
header('Content-Disposition: online; filename="itop.wsdl"');
}
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'webservices/webservices.class.inc.php');
require_once(APPROOT.'core/config.class.inc.php');
require_once(APPROOT.'application/utils.inc.php');

2
webservices/rest.php
View File

@@ -61,7 +61,7 @@
*/
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(__DIR__.'/../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/loginwebpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

2
webservices/soapserver.php
View File

@@ -27,7 +27,7 @@
// Important note: if some required includes are missing, this might result
// in the error "looks like we got no XML document"...
require_once('../approot.inc.php');
require_once('../bootstrap.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/startup.inc.php');