Load 3rd party libs earlier (glpi-project#4711)

Mainly to get lib constants available (so we can refine Logger level in local_define for example).
sebeka · Sep 28, 2018 · be66983 · be66983
1 parent f621c1e
commit be66983
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/apirest.php b/apirest.php
@@ -39,7 +39,7 @@
 define('DO_NOT_CHECK_HTTP_REFERER', 1);
 ini_set('session.use_cookies', 0);
 
-include ('./inc/autoload.function.php');
+include_once (GLPI_ROOT . "/inc/based_config.php");
 
 $api = new APIRest;
 $api->call();
diff --git a/apixmlrpc.php b/apixmlrpc.php
@@ -38,7 +38,7 @@
 define('GLPI_ROOT', __DIR__);
 define('DO_NOT_CHECK_HTTP_REFERER', 1);
 
-include ('./inc/autoload.function.php');
+include_once (GLPI_ROOT . "/inc/based_config.php");
 
 $api = new APIXmlrpc;
 $api->call();
diff --git a/inc/autoload.function.php b/inc/autoload.function.php
@@ -34,9 +34,6 @@
    die("Sorry. You can't access this file directly");
 }
 
-include_once (GLPI_ROOT."/inc/based_config.php");
-include_once (GLPI_ROOT."/inc/define.php");
-
 define ('NS_GLPI', 'Glpi\\');
 define ('NS_PLUG', 'GlpiPlugin\\');
 

diff --git a/inc/based_config.php b/inc/based_config.php
@@ -42,6 +42,8 @@
    date_default_timezone_set(@date_default_timezone_get());
 }
 
+include_once (GLPI_ROOT . "/inc/autoload.function.php");
+
 // If this file exists, it is load
 if (file_exists(GLPI_ROOT. '/config/local_define.php') && !defined('TU_USER')) {
    require_once GLPI_ROOT. '/config/local_define.php';
@@ -162,3 +164,5 @@
    define("GLPI_JQUERY_UPLOADHANDLER",
           GLPI_ROOT.'/lib/jqueryplugins/jquery-file-upload/server/php/UploadHandler.php');
 }
+
+include_once (GLPI_ROOT . "/inc/define.php");
diff --git a/inc/includes.php b/inc/includes.php
@@ -34,7 +34,7 @@
    define('GLPI_ROOT', dirname(__DIR__));
 }
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once GLPI_ROOT . '/inc/based_config.php';
 
 // Init Timer to compute time of display
 $TIMER_DEBUG = new Timer();

diff --git a/install/install.php b/install/install.php
@@ -32,7 +32,7 @@
 
 define('GLPI_ROOT', realpath('..'));
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 
 Config::detectRootDoc();
@@ -673,4 +673,4 @@ function checkConfigFile() {
          break;
    }
 }
-footer_html();
+footer_html();
diff --git a/install/update.php b/install/update.php
@@ -34,7 +34,7 @@
    define('GLPI_ROOT', realpath('..'));
 }
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 include_once (GLPI_CONFIG_DIR . "/config_db.php");
 Config::detectRootDoc();

diff --git a/install/update_content.php b/install/update_content.php
@@ -36,7 +36,7 @@
 // Do not include config.php so set root_doc
 $CFG_GLPI['root_doc'] = '..';
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 include_once (GLPI_CONFIG_DIR . "/config_db.php");
 

diff --git a/scripts/checkdb.php b/scripts/checkdb.php
@@ -55,7 +55,7 @@ function displayUsage() {
    define("GLPI_CONFIG_DIR", $args['config-dir']);
 }
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 include_once (GLPI_CONFIG_DIR . "/config_db.php");
 Config::detectRootDoc();

diff --git a/scripts/cliinstall.php b/scripts/cliinstall.php
@@ -38,7 +38,7 @@
    @mkdir(GLPI_CONFIG_DIR . '/files/_log', 0775, true);
 }
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 
 $GLPI = new GLPI();

diff --git a/scripts/cliupdate.php b/scripts/cliupdate.php
@@ -53,7 +53,7 @@
    define("GLPI_CONFIG_DIR", $args['config-dir']);
 }
 
-include_once (GLPI_ROOT . "/inc/autoload.function.php");
+include_once (GLPI_ROOT . "/inc/based_config.php");
 include_once (GLPI_ROOT . "/inc/db.function.php");
 include_once (GLPI_CONFIG_DIR . "/config_db.php");