composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02: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
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';