From ec09589646e711da375edb0039a2ccdc169405b8 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 13 Aug 2019 13:46:19 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02439=20Add=20real=20autoloader=20for=20f?= =?UTF-8?q?ramework=20files=20(not=20modules)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unattended_install/unattended_install.php | 2 +- application/utils.inc.php | 2 +- bootstrap.inc.php | 24 +++++++++++++++++++ core/simplegraph.class.inc.php | 2 +- .../2.x/itop-attachments/ajax.attachment.php | 2 +- datamodels/2.x/itop-backup/ajax.backup.php | 2 +- datamodels/2.x/itop-backup/backup.php | 6 ++--- datamodels/2.x/itop-backup/check-backup.php | 6 ++--- datamodels/2.x/itop-backup/status.php | 2 +- .../2.x/itop-hub-connector/myextensions.php | 2 +- datamodels/2.x/itop-portal-base/index.php | 6 ++--- .../portal/config/bootstrap.php | 6 ++--- datamodels/2.x/itop-portal/index.php | 6 ++--- pages/UI.php | 2 +- pages/UniversalSearch.php | 2 +- pages/ajax.csvimport.php | 2 +- pages/ajax.document.php | 2 +- pages/ajax.render.php | 2 +- pages/ajax.searchform.php | 2 +- pages/audit.php | 2 +- pages/csvimport.php | 2 +- pages/exec.php | 2 +- pages/graphviz.php | 2 +- pages/logoff.php | 2 +- pages/navigator.php | 2 +- pages/notifications.php | 2 +- pages/opensearch.xml.php | 2 +- pages/preferences.php | 2 +- pages/run_query.php | 2 +- pages/schema.php | 2 +- pages/tagadmin.php | 2 +- portal/index.php | 2 +- setup/ajax.dataloader.php | 2 +- setup/email.test.php | 2 +- setup/index.php | 2 +- setup/phpinfo.php | 2 +- synchro/priv_sync_chunk.php | 2 +- synchro/replica.php | 2 +- synchro/synchro_exec.php | 2 +- synchro/synchro_import.php | 2 +- test/GroupByAndFunctions.php | 2 +- test/ItopTestCase.php | 16 ++++++------- test/benchmark.php | 2 +- test/display_cache_content.php | 2 +- test/replay_query_log.php | 2 +- test/test.php | 2 +- webservices/backoffice.dataloader.php | 2 +- webservices/createfrommail.php | 2 +- webservices/cron.php | 2 +- webservices/export-v2.php | 2 +- webservices/export.php | 2 +- webservices/import.php | 2 +- webservices/itop.wsdl.php | 2 +- webservices/rest.php | 2 +- webservices/soapserver.php | 2 +- 55 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 bootstrap.inc.php diff --git a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php index 7f67bee85..504757673 100644 --- a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php +++ b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php @@ -1,7 +1,7 @@ -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'); diff --git a/pages/navigator.php b/pages/navigator.php index 683df1740..a59e14b60 100755 --- a/pages/navigator.php +++ b/pages/navigator.php @@ -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'); diff --git a/pages/notifications.php b/pages/notifications.php index 384db331a..fa7679962 100644 --- a/pages/notifications.php +++ b/pages/notifications.php @@ -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'); diff --git a/pages/opensearch.xml.php b/pages/opensearch.xml.php index 1c4d791af..62105845d 100644 --- a/pages/opensearch.xml.php +++ b/pages/opensearch.xml.php @@ -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'); diff --git a/pages/preferences.php b/pages/preferences.php index 989fd499f..ce42981f3 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -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'); diff --git a/pages/run_query.php b/pages/run_query.php index 2d9288c34..e65253ad1 100644 --- a/pages/run_query.php +++ b/pages/run_query.php @@ -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'); diff --git a/pages/schema.php b/pages/schema.php index c9d6348e2..eeb4b4628 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -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'); diff --git a/pages/tagadmin.php b/pages/tagadmin.php index 997e0944d..7acbdb36b 100644 --- a/pages/tagadmin.php +++ b/pages/tagadmin.php @@ -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'); diff --git a/portal/index.php b/portal/index.php index df35cae6c..ba341733e 100644 --- a/portal/index.php +++ b/portal/index.php @@ -20,7 +20,7 @@ * */ -require_once('../approot.inc.php'); +require_once('../bootstrap.inc.php'); require_once(APPROOT.'/application/application.inc.php'); try diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php index 127873410..09ffae17c 100644 --- a/setup/ajax.dataloader.php +++ b/setup/ajax.dataloader.php @@ -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'); diff --git a/setup/email.test.php b/setup/email.test.php index e03bfc62f..e1ab91d9a 100644 --- a/setup/email.test.php +++ b/setup/email.test.php @@ -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'); diff --git a/setup/index.php b/setup/index.php index cc2cae1a5..14abfc796 100644 --- a/setup/index.php +++ b/setup/index.php @@ -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'); diff --git a/setup/phpinfo.php b/setup/phpinfo.php index 4590b291e..9181c67ef 100644 --- a/setup/phpinfo.php +++ b/setup/phpinfo.php @@ -1,5 +1,5 @@ // -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'); diff --git a/test/ItopTestCase.php b/test/ItopTestCase.php index 943757a63..96f83c2ad 100644 --- a/test/ItopTestCase.php +++ b/test/ItopTestCase.php @@ -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"); diff --git a/test/benchmark.php b/test/benchmark.php index e448eff6e..2f66215cf 100644 --- a/test/benchmark.php +++ b/test/benchmark.php @@ -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'); diff --git a/test/display_cache_content.php b/test/display_cache_content.php index 28fe18d9b..44ce59281 100644 --- a/test/display_cache_content.php +++ b/test/display_cache_content.php @@ -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'); diff --git a/test/replay_query_log.php b/test/replay_query_log.php index 4b2ba0a03..7bd1c1fad 100644 --- a/test/replay_query_log.php +++ b/test/replay_query_log.php @@ -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'); diff --git a/test/test.php b/test/test.php index a8783c55a..1863ae544 100644 --- a/test/test.php +++ b/test/test.php @@ -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'); diff --git a/webservices/backoffice.dataloader.php b/webservices/backoffice.dataloader.php index 2ba07f0bd..dc71e6764 100644 --- a/webservices/backoffice.dataloader.php +++ b/webservices/backoffice.dataloader.php @@ -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'); diff --git a/webservices/createfrommail.php b/webservices/createfrommail.php index 14f7b65ff..fb82f67cc 100644 --- a/webservices/createfrommail.php +++ b/webservices/createfrommail.php @@ -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'); diff --git a/webservices/cron.php b/webservices/cron.php index 6d3f8e07b..5bdaccf1a 100644 --- a/webservices/cron.php +++ b/webservices/cron.php @@ -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'); diff --git a/webservices/export-v2.php b/webservices/export-v2.php index ae5857aff..5929aa12a 100644 --- a/webservices/export-v2.php +++ b/webservices/export-v2.php @@ -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'); diff --git a/webservices/export.php b/webservices/export.php index 0b0855cf0..d10f9016b 100644 --- a/webservices/export.php +++ b/webservices/export.php @@ -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'); diff --git a/webservices/import.php b/webservices/import.php index e67a7a95f..3903b2eb4 100644 --- a/webservices/import.php +++ b/webservices/import.php @@ -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'); diff --git a/webservices/itop.wsdl.php b/webservices/itop.wsdl.php index ebd0f84dd..1602dc6c4 100644 --- a/webservices/itop.wsdl.php +++ b/webservices/itop.wsdl.php @@ -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'); diff --git a/webservices/rest.php b/webservices/rest.php index 5b7707d8a..774e7087d 100644 --- a/webservices/rest.php +++ b/webservices/rest.php @@ -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'); diff --git a/webservices/soapserver.php b/webservices/soapserver.php index 72bea3cbc..f313a7f0e 100644 --- a/webservices/soapserver.php +++ b/webservices/soapserver.php @@ -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');