autoload rework

- bootstrap.inc.php is now included by approot.inc.php - remove all unescessaries includes of bootstrap.inc.php - in bootstrap.inc.php autoload can be bypassed using a feature flag because "why not"
2026-03-05 09:04:19 +01:00 · 2019-11-08 16:08:05 +01:00
parent 1194c5c7fe
commit 08c1f4f072
58 changed files with 8 additions and 60 deletions
--- a/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
+++ b/.jenkins/configuration/default-environment/unattended_install/unattended_install.php
@@ -20,7 +20,6 @@
 //this scrit will be run under the ./toolkit directory, relatively to the document root

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/application/maintenancemsg.php
+++ b/application/maintenancemsg.php
@@ -18,7 +18,6 @@
 function _MaintenanceSetupPageMessage($sTitle, $sMessage)
 {
 	// Web Page
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT.'setup/setuppage.class.inc.php');
 	if (class_exists('SetupPage'))
 	{
@@ -58,7 +57,6 @@ function _MaintenanceHtmlMessage($sMessage)
 */
 function _MaintenanceJsonMessage($sTitle, $sMessage)
 {
-	@include_once(APPROOT.'bootstrap.inc.php');
 	@include_once(APPROOT."/application/ajaxwebpage.class.inc.php");
 	if (class_exists('ajax_page'))
 	{
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -15,6 +15,9 @@ else
 	$fItopStarted = 1000 * time();
 }

+require_once APPROOT.'bootstrap.inc.php';
+
+
 //
 // Maintenance mode
 //
--- a/bootstrap.inc.php
+++ b/bootstrap.inc.php
@@ -18,7 +18,9 @@
 * You should have received a copy of the GNU Affero General Public License
 */

-require_once __DIR__.'/approot.inc.php';
-require_once APPROOT.'/lib/autoload.php';

-// Require here files containing PHP instructions
+if (! isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false)
+{
+	require_once APPROOT.'/lib/autoload.php';
+}
+
--- a/datamodels/2.x/itop-attachments/ajax.attachment.php
+++ b/datamodels/2.x/itop-attachments/ajax.attachment.php
@@ -18,7 +18,6 @@
 */

 require_once('../../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/datamodels/2.x/itop-backup/ajax.backup.php
+++ b/datamodels/2.x/itop-backup/ajax.backup.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/datamodels/2.x/itop-backup/backup.php
+++ b/datamodels/2.x/itop-backup/backup.php
@@ -29,7 +29,6 @@ if (!defined('APPROOT'))
 		require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 	}
 }
-require_once(APPROOT.'/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');
--- a/datamodels/2.x/itop-backup/check-backup.php
+++ b/datamodels/2.x/itop-backup/check-backup.php
@@ -35,7 +35,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
 require_once(APPROOT.'application/startup.inc.php');

--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -19,7 +19,6 @@

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

--- a/datamodels/2.x/itop-hub-connector/myextensions.php
+++ b/datamodels/2.x/itop-hub-connector/myextensions.php
@@ -18,7 +18,6 @@
 */

 require_once ('../approot.inc.php');
-require_once (APPROOT.'/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');
--- a/datamodels/2.x/itop-portal-base/index.php
+++ b/datamodels/2.x/itop-portal-base/index.php
@@ -32,7 +32,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once APPROOT.'/bootstrap.inc.php';
 require_once APPROOT.'application/startup.inc.php';

 // Load frontal
--- a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php
@@ -38,7 +38,6 @@ if (!defined('MODULESROOT'))
 	{
 		require_once __DIR__.'/../../../../../approot.inc.php';   // When in datamodels/x.x folder
 	}
-	require_once APPROOT.'/bootstrap.inc.php';
 	require_once APPROOT.'/application/startup.inc.php';
 }

--- a/datamodels/2.x/itop-portal/index.php
+++ b/datamodels/2.x/itop-portal/index.php
@@ -46,7 +46,6 @@ else
 {
 	require_once __DIR__.'/../../../approot.inc.php';   // When in datamodels/x.x folder
 }
-require_once APPROOT.'/bootstrap.inc.php';
 require_once APPROOT.'application/startup.inc.php';

 // Protection against setup in the following configuration : ITIL Ticket with Enhanced Portal selected but neither UserRequest or Incident. Which would crash the portal.
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -332,7 +332,6 @@ function DisplayNavigatorGroupTab($oP)
 *
 ***********************************************************************************/
 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/ajax.csvimport.php
+++ b/pages/ajax.csvimport.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/ajax.document.php
+++ b/pages/ajax.document.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/utils.inc.php');


--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/ajax.searchform.php
+++ b/pages/ajax.searchform.php
@@ -21,7 +21,6 @@ use Combodo\iTop\Application\Search\AjaxSearchException;
 use Combodo\iTop\Application\Search\CriterionParser;

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/audit.php
+++ b/pages/audit.php
@@ -159,7 +159,6 @@ function GetReportColor($iTotal, $iErrors)
 try
 {
 	require_once('../approot.inc.php');
-	require_once(APPROOT.'/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');
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -21,7 +21,6 @@ try
 {
 	ini_set('memory_limit', '256M');
 	require_once('../approot.inc.php');
-	require_once(APPROOT.'/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');
--- a/pages/exec.php
+++ b/pages/exec.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');

 // Needed to read the parameters (with sanitization)
 require_once(APPROOT.'application/utils.inc.php');
--- a/pages/graphviz.php
+++ b/pages/graphviz.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');

--- a/pages/logoff.php
+++ b/pages/logoff.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/navigator.php
+++ b/pages/navigator.php
@@ -22,7 +22,6 @@
 * Display the Flash navigator, in the whole pane
 */
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');

--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');

--- a/pages/opensearch.xml.php
+++ b/pages/opensearch.xml.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');

--- a/pages/preferences.php
+++ b/pages/preferences.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');

--- a/pages/tagadmin.php
+++ b/pages/tagadmin.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/portal/index.php
+++ b/portal/index.php
@@ -19,7 +19,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');

 try
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -35,7 +35,6 @@
 */ 
 define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/setup/email.test.php
+++ b/setup/email.test.php
@@ -21,7 +21,6 @@
 * Wizard to configure and initialize the iTop application
 */
 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once(APPROOT.'/core/email.class.inc.php');
 require_once('./setuppage.class.inc.php');
--- a/setup/index.php
+++ b/setup/index.php
@@ -19,7 +19,6 @@

 $bBypassMaintenance = true; // Reset maintenance mode in case of problem
 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/setup/phpinfo.php
+++ b/setup/phpinfo.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');

 require_once(APPROOT.'/application/startup.inc.php');

--- a/sources/application/status/status.inc.php
+++ b/sources/application/status/status.inc.php
@@ -29,7 +29,6 @@ function StatusGetAppRoot($sAppRootFilename = 'approot.inc.php')
            throw new Exception($sAppRootFilename . ' is not readable');
        }
        @require_once($sAppRootFile);
-        @require_once(APPROOT.'bootstrap.inc.php');
 }

 /**
--- a/synchro/priv_sync_chunk.php
+++ b/synchro/priv_sync_chunk.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/synchro/replica.php
+++ b/synchro/replica.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/itopwebpage.class.inc.php');

--- a/synchro/synchro_exec.php
+++ b/synchro/synchro_exec.php
@@ -29,7 +29,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -28,7 +28,6 @@ if (!defined('__DIR__'))
 	define('__DIR__', dirname(__FILE__));
 }
 require_once __DIR__.'/../approot.inc.php';
-require_once APPROOT.'/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';
--- a/test/GroupByAndFunctions.php
+++ b/test/GroupByAndFunctions.php
@@ -18,7 +18,6 @@
 */

 require_once ('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/test/ItopTestCase.php
+++ b/test/ItopTestCase.php
@@ -44,7 +44,6 @@ class ItopTestCase extends TestCase
 		@include_once '../../../../../../approot.inc.php';
 		@include_once '../../../../../../../approot.inc.php';
 		@include_once '../../../../../../../../approot.inc.php';
-		@require_once APPROOT.'/bootstrap.inc.php';

        $this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");

--- a/test/VerifyOQL.php
+++ b/test/VerifyOQL.php
@@ -24,7 +24,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/test/benchmark.php
+++ b/test/benchmark.php
@@ -18,7 +18,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/test/build_test_oql.php
+++ b/test/build_test_oql.php
@@ -23,7 +23,6 @@


 require_once('../approot.inc.php');
-require_once(APPROOT.'bootstrap.inc.php');
 require_once(APPROOT.'application/startup.inc.php');

 \LoginWebPage::DoLogin(true);
--- a/test/display_cache_content.php
+++ b/test/display_cache_content.php
@@ -22,7 +22,6 @@
 */

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'application/startup.inc.php');


--- a/test/replay_query_log.php
+++ b/test/replay_query_log.php
@@ -204,7 +204,6 @@ class QueryLogEntry
 /////////////////////////////////////////////////////////////////////////////

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');

--- a/test/test.php
+++ b/test/test.php
@@ -86,7 +86,6 @@ function DisplayEvents($aEvents, $sTitle)
 date_default_timezone_set('Europe/Paris');

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 require_once('./test.class.inc.php');
 require_once('./testlist.inc.php');
--- a/webservices/backoffice.dataloader.php
+++ b/webservices/backoffice.dataloader.php
@@ -25,7 +25,6 @@
 define('SAFE_MINIMUM_MEMORY', 256*1024*1024);

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');

 require_once(APPROOT.'/application/startup.inc.php');
--- a/webservices/createfrommail.php
+++ b/webservices/createfrommail.php
@@ -37,7 +37,6 @@ define('DEFAULT_WORKGROUP_ID', 5);

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');

--- a/webservices/cron.php
+++ b/webservices/cron.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -29,7 +29,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/itop.wsdl.php
+++ b/webservices/itop.wsdl.php
@@ -38,7 +38,6 @@ else
 }

 require_once('../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/rest.php
+++ b/webservices/rest.php
@@ -19,7 +19,6 @@

 if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
 require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/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');
--- a/webservices/soapserver.php
+++ b/webservices/soapserver.php
@@ -21,7 +21,6 @@
 // in the error "looks like we got no XML document"...

 require_once('../approot.inc.php');
-require_once(APPROOT.'/bootstrap.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/startup.inc.php');