From d8bb6a45b22a79ee4a488a140acf1edc15b19716 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 22 Nov 2010 17:53:52 +0000 Subject: [PATCH] REVIEWED THE FILE INCLUSION POLICY - includes are relative to the application root folder, aka APPROOT - changed the config file, while preserving the compatibility with older installs SVN:trunk[962] --- application/ajaxwebpage.class.inc.php | 3 +- application/application.inc.php | 14 ++-- application/applicationcontext.class.inc.php | 2 +- application/audit.category.class.inc.php | 2 +- application/audit.rule.class.inc.php | 2 +- application/clipage.class.inc.php | 2 +- application/cmdbabstract.class.inc.php | 14 ++-- application/csvpage.class.inc.php | 2 +- application/displayblock.class.inc.php | 6 +- application/iotask.class.inc.php | 2 +- application/itopwebpage.class.inc.php | 6 +- application/loginwebpage.class.inc.php | 4 +- application/menunode.class.inc.php | 4 +- application/nicewebpage.class.inc.php | 2 +- application/portalwebpage.class.inc.php | 6 +- application/startup.inc.php | 4 +- application/template.class.inc.php | 6 +- .../ui.autocompletewidget.class.inc.php | 4 +- application/ui.linkswidget.class.inc.php | 4 +- application/ui.passwordwidget.class.inc.php | 4 +- application/user.preferences.class.inc.php | 4 +- application/utils.inc.php | 6 +- application/wizardhelper.class.inc.php | 2 +- application/xmlpage.class.inc.php | 2 +- approot.inc.php | 3 + core/action.class.inc.php | 2 +- core/config.class.inc.php | 57 ++++++---------- core/metamodel.class.php | 26 +++++-- core/ormpassword.class.inc.php | 2 +- .../model.itop-config-mgmt.php | 2 - pages/UI.php | 17 ++--- pages/UniversalSearch.php | 12 ++-- pages/ajax.csvimport.php | 17 ++--- pages/ajax.render.php | 21 +++--- pages/audit.php | 13 ++-- pages/csvimport.php | 13 ++-- pages/graphviz.php | 11 +-- pages/logoff.php | 11 +-- pages/navigator.php | 13 ++-- pages/run_query.php | 9 +-- pages/schema.php | 9 +-- pages/xml.navigator.php | 15 +++-- portal/index.php | 16 ++--- setup/ajax.dataloader.php | 17 ++--- setup/email.test.php | 5 +- setup/index.php | 67 ++++++++++--------- setup/setuppage.class.inc.php | 18 +++-- setup/xmldataloader.class.inc.php | 36 +++++----- test/benchmark.php | 15 +++-- test/test.class.inc.php | 35 +++++----- test/test.php | 5 +- test/testlist.inc.php | 41 +++++++++--- webservices/backoffice.dataloader.php | 19 +++--- webservices/check_sla_for_tickets.php | 5 +- webservices/createfrommail.php | 5 +- webservices/export.php | 13 ++-- webservices/import.php | 13 ++-- webservices/soapserver.php | 5 +- webservices/webservices.class.inc.php | 2 +- 59 files changed, 369 insertions(+), 308 deletions(-) create mode 100644 approot.inc.php diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index 8b0302723..250eac496 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -24,7 +24,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/webpage.class.inc.php"); +require_once('../approot.inc.php'); +require_once(APPROOT."/application/webpage.class.inc.php"); class ajax_page extends WebPage { diff --git a/application/application.inc.php b/application/application.inc.php index 6d63f8941..88dcd7c0c 100644 --- a/application/application.inc.php +++ b/application/application.inc.php @@ -23,13 +23,13 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/applicationcontext.class.inc.php'); -require_once('../application/cmdbabstract.class.inc.php'); -require_once('../application/displayblock.class.inc.php'); -require_once('../application/audit.category.class.inc.php'); -require_once('../application/audit.rule.class.inc.php'); -//require_once('../application/menunode.class.inc.php'); -require_once('../application/utils.inc.php'); +require_once(APPROOT.'/application/applicationcontext.class.inc.php'); +require_once(APPROOT.'/application/cmdbabstract.class.inc.php'); +require_once(APPROOT.'/application/displayblock.class.inc.php'); +require_once(APPROOT.'/application/audit.category.class.inc.php'); +require_once(APPROOT.'/application/audit.rule.class.inc.php'); +//require_once(APPROOT.'/application/menunode.class.inc.php'); +require_once(APPROOT.'/application/utils.inc.php'); class ApplicationException extends CoreException { diff --git a/application/applicationcontext.class.inc.php b/application/applicationcontext.class.inc.php index cac2f2025..04e43c1bb 100644 --- a/application/applicationcontext.class.inc.php +++ b/application/applicationcontext.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/utils.inc.php"); +require_once(APPROOT."/application/utils.inc.php"); /** * Helper class to store and manipulate the parameters that make the application's context * diff --git a/application/audit.category.class.inc.php b/application/audit.category.class.inc.php index 3da91713d..c07b2e882 100644 --- a/application/audit.category.class.inc.php +++ b/application/audit.category.class.inc.php @@ -25,7 +25,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/cmdbabstract.class.inc.php'); +require_once(APPROOT.'/application/cmdbabstract.class.inc.php'); class AuditCategory extends cmdbAbstractObject { diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php index 360d23bb5..01088f617 100644 --- a/application/audit.rule.class.inc.php +++ b/application/audit.rule.class.inc.php @@ -26,7 +26,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/audit.category.class.inc.php'); +require_once(APPROOT.'/application/audit.category.class.inc.php'); class AuditRule extends cmdbAbstractObject { diff --git a/application/clipage.class.inc.php b/application/clipage.class.inc.php index afeaa1694..ca9ec5e46 100644 --- a/application/clipage.class.inc.php +++ b/application/clipage.class.inc.php @@ -24,7 +24,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/webpage.class.inc.php"); +require_once(APPROOT."/application/webpage.class.inc.php"); class CLIPage { diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 21676f21f..9a7b9c2ef 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -31,13 +31,13 @@ define('HILIGHT_CLASS_WARNING', 'orange'); define('HILIGHT_CLASS_OK', 'green'); define('HILIGHT_CLASS_NONE', ''); -require_once('../core/cmdbobject.class.inc.php'); -require_once('../application/utils.inc.php'); -require_once('../application/applicationcontext.class.inc.php'); -require_once('../application/ui.linkswidget.class.inc.php'); -require_once('../application/ui.passwordwidget.class.inc.php'); -require_once('../application/ui.autocompletewidget.class.inc.php'); -require_once('../application/ui.htmleditorwidget.class.inc.php'); +require_once(APPROOT.'/core/cmdbobject.class.inc.php'); +require_once(APPROOT.'/application/utils.inc.php'); +require_once(APPROOT.'/application/applicationcontext.class.inc.php'); +require_once(APPROOT.'/application/ui.linkswidget.class.inc.php'); +require_once(APPROOT.'/application/ui.passwordwidget.class.inc.php'); +require_once(APPROOT.'/application/ui.autocompletewidget.class.inc.php'); +require_once(APPROOT.'/application/ui.htmleditorwidget.class.inc.php'); abstract class cmdbAbstractObject extends CMDBObject { diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php index 9ef3655ae..7ccf83782 100644 --- a/application/csvpage.class.inc.php +++ b/application/csvpage.class.inc.php @@ -24,7 +24,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/webpage.class.inc.php"); +require_once(APPROOT."/application/webpage.class.inc.php"); class CSVPage extends WebPage { diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 8daa78f48..991284f22 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -23,8 +23,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/webpage.class.inc.php'); -require_once('../application/utils.inc.php'); +require_once(APPROOT.'/application/webpage.class.inc.php'); +require_once(APPROOT.'/application/utils.inc.php'); /** * Helper class to manage 'blocks' of HTML pieces that are parts of a page and contain some list of cmdb objects * @@ -757,7 +757,7 @@ EOF break; case 'open_flash_chart_ajax': - include '../pages/php-ofc-library/open-flash-chart.php'; + require_once(APPROOT.'/pages/php-ofc-library/open-flash-chart.php'); $sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie'; $oChart = new open_flash_chart(); diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php index a4d8f58e5..21f002d83 100644 --- a/application/iotask.class.inc.php +++ b/application/iotask.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/cmdbabstract.class.inc.php'); +require_once(APPROOT.'/application/cmdbabstract.class.inc.php'); /** * This class manages the input/output tasks diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index a3a3b5d91..924ab8434 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -23,9 +23,9 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/nicewebpage.class.inc.php"); -require_once("../application/applicationcontext.class.inc.php"); -require_once("../application/user.preferences.class.inc.php"); +require_once(APPROOT."/application/nicewebpage.class.inc.php"); +require_once(APPROOT."/application/applicationcontext.class.inc.php"); +require_once(APPROOT."/application/user.preferences.class.inc.php"); /** * Web page with some associated CSS and scripts (jquery) for a fancier display */ diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 0fb41efbf..2dfda9eb8 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/nicewebpage.class.inc.php"); +require_once(APPROOT."/application/nicewebpage.class.inc.php"); /** * Web page used for displaying the login form */ @@ -393,7 +393,7 @@ EOF if ($bMustBeAdmin && !UserRights::IsAdministrator()) { - require_once('../setup/setuppage.class.inc.php'); + require_once(APPROOT.'/setup/setuppage.class.inc.php'); $oP = new SetupWebPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("

".Dict::S('UI:Login:Error:AccessAdmin')."

\n"); $oP->p("".Dict::S('UI:LogOffMenu').""); diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index 652a3b75d..3cc59072a 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -23,8 +23,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/utils.inc.php'); -require_once('../application/template.class.inc.php'); +require_once(APPROOT.'/application/utils.inc.php'); +require_once(APPROOT.'/application/template.class.inc.php'); /** diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php index 6343279db..fd9f9795a 100644 --- a/application/nicewebpage.class.inc.php +++ b/application/nicewebpage.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/webpage.class.inc.php"); +require_once(APPROOT."/application/webpage.class.inc.php"); /** * Web page with some associated CSS and scripts (jquery) for a fancier display */ diff --git a/application/portalwebpage.class.inc.php b/application/portalwebpage.class.inc.php index af270379d..233d1fe78 100644 --- a/application/portalwebpage.class.inc.php +++ b/application/portalwebpage.class.inc.php @@ -23,9 +23,9 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/nicewebpage.class.inc.php"); -require_once("../application/applicationcontext.class.inc.php"); -require_once("../application/user.preferences.class.inc.php"); +require_once(APPROOT."/application/nicewebpage.class.inc.php"); +require_once(APPROOT."/application/applicationcontext.class.inc.php"); +require_once(APPROOT."/application/user.preferences.class.inc.php"); /** * Web page with some associated CSS and scripts (jquery) for a fancier display * of the Portal web page diff --git a/application/startup.inc.php b/application/startup.inc.php index 812ff5828..9c71599b0 100644 --- a/application/startup.inc.php +++ b/application/startup.inc.php @@ -23,8 +23,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../core/cmdbobject.class.inc.php'); -require_once('../application/utils.inc.php'); +require_once(APPROOT.'/core/cmdbobject.class.inc.php'); +require_once(APPROOT.'/application/utils.inc.php'); MetaModel::Startup(ITOP_CONFIG_FILE); diff --git a/application/template.class.inc.php b/application/template.class.inc.php index dca6d7a29..b7caf07c9 100644 --- a/application/template.class.inc.php +++ b/application/template.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/displayblock.class.inc.php'); +require_once(APPROOT.'/application/displayblock.class.inc.php'); /** * This class manages the special template format used internally to build the iTop web pages */ @@ -218,8 +218,8 @@ class DisplayTemplate */ static public function UnitTest() { - require_once('../application/startup.inc.php'); - require_once("../application/itopwebpage.class.inc.php"); + require_once(APPROOT.'/application/startup.inc.php'); + require_once(APPROOT."/application/itopwebpage.class.inc.php"); $sTemplate = '
Actions
diff --git a/application/ui.autocompletewidget.class.inc.php b/application/ui.autocompletewidget.class.inc.php index 77735e991..1d53c373a 100644 --- a/application/ui.autocompletewidget.class.inc.php +++ b/application/ui.autocompletewidget.class.inc.php @@ -58,8 +58,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/webpage.class.inc.php'); -require_once('../application/displayblock.class.inc.php'); +require_once(APPROOT.'/application/webpage.class.inc.php'); +require_once(APPROOT.'/application/displayblock.class.inc.php'); class UIAutoCompleteWidget { diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index f1fde07ab..4cec00017 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -23,8 +23,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/webpage.class.inc.php'); -require_once('../application/displayblock.class.inc.php'); +require_once(APPROOT.'/application/webpage.class.inc.php'); +require_once(APPROOT.'/application/displayblock.class.inc.php'); class UILinksWidget { diff --git a/application/ui.passwordwidget.class.inc.php b/application/ui.passwordwidget.class.inc.php index 7e67b24ff..882b3f2ef 100644 --- a/application/ui.passwordwidget.class.inc.php +++ b/application/ui.passwordwidget.class.inc.php @@ -24,8 +24,8 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/webpage.class.inc.php'); -require_once('../application/displayblock.class.inc.php'); +require_once(APPROOT.'/application/webpage.class.inc.php'); +require_once(APPROOT.'/application/displayblock.class.inc.php'); class UIPasswordWidget { diff --git a/application/user.preferences.class.inc.php b/application/user.preferences.class.inc.php index ee0f2ff4d..591e5e563 100644 --- a/application/user.preferences.class.inc.php +++ b/application/user.preferences.class.inc.php @@ -22,8 +22,8 @@ * @author Denis Flaven * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../core/dbobject.class.php'); -require_once('../core/userrights.class.inc.php'); +require_once(APPROOT.'/core/dbobject.class.php'); +require_once(APPROOT.'/core/userrights.class.inc.php'); /** * This class is used to store, in a persistent manner, user related settings (preferences) diff --git a/application/utils.inc.php b/application/utils.inc.php index 1f2a02388..23eb1085c 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -23,10 +23,10 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../core/config.class.inc.php'); -require_once('../application/transaction.class.inc.php'); +require_once(APPROOT.'/core/config.class.inc.php'); +require_once(APPROOT.'/application/transaction.class.inc.php'); -define('ITOP_CONFIG_FILE', '../config-itop.php'); +define('ITOP_CONFIG_FILE', APPROOT.'/config-itop.php'); class FileUploadException extends Exception { diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php index eaf4333b5..db231ca9a 100644 --- a/application/wizardhelper.class.inc.php +++ b/application/wizardhelper.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/uiwizard.class.inc.php'); +require_once(APPROOT.'/application/uiwizard.class.inc.php'); class WizardHelper { diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php index a6c7dcb88..7ebc21aa2 100644 --- a/application/xmlpage.class.inc.php +++ b/application/xmlpage.class.inc.php @@ -23,7 +23,7 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once("../application/webpage.class.inc.php"); +require_once(APPROOT."/application/webpage.class.inc.php"); /** * Simple web page with no includes or fancy formatting, useful to generateXML documents * The page adds the content-type text/XML and the encoding into the headers diff --git a/approot.inc.php b/approot.inc.php new file mode 100644 index 000000000..6caae3533 --- /dev/null +++ b/approot.inc.php @@ -0,0 +1,3 @@ + diff --git a/core/action.class.inc.php b/core/action.class.inc.php index f660fb624..e0eb20085 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -24,7 +24,7 @@ */ -require_once('../core/email.class.inc.php'); +require_once(APPROOT.'/core/email.class.inc.php'); /** * A user defined action, to customize the application diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 0687e9045..0fee7486d 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -267,36 +267,36 @@ class Config $this->m_sFile = $sConfigFile; $this->m_aAppModules = array( // Some default modules, always present can be move to an official iTop Module later if needed - '../application/transaction.class.inc.php', - '../application/menunode.class.inc.php', - '../application/user.preferences.class.inc.php', - '../application/audit.rule.class.inc.php', + '/application/transaction.class.inc.php', + '/application/menunode.class.inc.php', + '/application/user.preferences.class.inc.php', + '/application/audit.rule.class.inc.php', // Romain - That's dirty, because those 3 classes are in fact part of the core // but I needed those classes to be derived from cmdbAbstractObject // (to be managed via the GUI) and this class in not really known from // the core, PLUS I needed the includes to be there also for the setup // to create the tables. - '../core/event.class.inc.php', - '../core/action.class.inc.php', - '../core/trigger.class.inc.php', + '/core/event.class.inc.php', + '/core/action.class.inc.php', + '/core/trigger.class.inc.php', ); $this->m_aDataModels = array(); $this->m_aAddons = array( // Default AddOn, always present can be moved to an official iTop Module later if needed - 'user rights' => '../addons/userrights/userrightsprofile.class.inc.php', + 'user rights' => '/addons/userrights/userrightsprofile.class.inc.php', ); $this->m_aDictionaries = array( // Default dictionaries, always present can be moved to an official iTop Module later if needed - '../dictionaries/dictionary.itop.core.php', - '../dictionaries/dictionary.itop.ui.php', // Support for English - '../dictionaries/fr.dictionary.itop.ui.php', // Support for French - '../dictionaries/fr.dictionary.itop.core.php', // Support for French - '../dictionaries/es_cr.dictionary.itop.ui.php', // Support for Spanish (from Costa Rica) - '../dictionaries/es_cr.dictionary.itop.core.php', // Support for Spanish (from Costa Rica) - '../dictionaries/de.dictionary.itop.ui.php', // Support for German - '../dictionaries/de.dictionary.itop.core.php', // Support for German - '../dictionaries/pt_br.dictionary.itop.ui.php', // Support for Brazilian Portuguese - '../dictionaries/pt_br.dictionary.itop.core.php', // Support for Brazilian Portuguese + '/dictionaries/dictionary.itop.core.php', + '/dictionaries/dictionary.itop.ui.php', // Support for English + '/dictionaries/fr.dictionary.itop.ui.php', // Support for French + '/dictionaries/fr.dictionary.itop.core.php', // Support for French + '/dictionaries/es_cr.dictionary.itop.ui.php', // Support for Spanish (from Costa Rica) + '/dictionaries/es_cr.dictionary.itop.core.php', // Support for Spanish (from Costa Rica) + '/dictionaries/de.dictionary.itop.ui.php', // Support for German + '/dictionaries/de.dictionary.itop.core.php', // Support for German + '/dictionaries/pt_br.dictionary.itop.ui.php', // Support for Brazilian Portuguese + '/dictionaries/pt_br.dictionary.itop.core.php', // Support for Brazilian Portuguese ); foreach($this->m_aSettings as $sPropCode => $aSettingInfo) @@ -396,7 +396,8 @@ class Config } if (!array_key_exists('user rights', $MyModules['addons'])) { - $MyModules['addons']['user rights'] = '../addons/userrights/userrightsnull.class.inc.php'; + // Add one, by default + $MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php'; } if (!array_key_exists('dictionaries', $MyModules)) { @@ -452,22 +453,8 @@ class Config protected function Verify() { - foreach ($this->m_aAppModules as $sModule => $sToInclude) - { - $this->CheckFile('application module', $sToInclude); - } - foreach ($this->m_aDataModels as $sModule => $sToInclude) - { - $this->CheckFile('business model', $sToInclude); - } - foreach ($this->m_aAddons as $sModule => $sToInclude) - { - $this->CheckFile('addon module', $sToInclude); - } - foreach ($this->m_aDictionaries as $sModule => $sToInclude) - { - $this->CheckFile('dictionary', $sToInclude); - } + // Files are verified later on, just before using them -see MetaModel::Plugin() + // (we have their final path at that point) } public function GetModuleSetting($sModule, $sProperty, $defaultvalue = null) diff --git a/core/metamodel.class.php b/core/metamodel.class.php index b967979a6..f9cf7d91f 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -3251,7 +3251,7 @@ abstract class MetaModel if (self::$m_oConfig->GetLogIssue()) { self::$m_bLogIssue = true; - IssueLog::Enable('../error.log'); + IssueLog::Enable(APPROOT.'/error.log'); } self::$m_bLogNotification = self::$m_oConfig->GetLogNotification(); self::$m_bLogWebService = self::$m_oConfig->GetLogWebService(); @@ -3289,7 +3289,7 @@ abstract class MetaModel // Romain: this is the only way I've found to cope with the fact that // classes have to be derived from cmdbabstract (to be editable in the UI) - require_once('../application/cmdbabstract.class.inc.php'); + require_once(APPROOT.'/application/cmdbabstract.class.inc.php'); foreach (self::$m_oConfig->GetAppModules() as $sModule => $sToInclude) { @@ -3348,11 +3348,27 @@ abstract class MetaModel protected static function Plugin($sConfigFile, $sModuleType, $sToInclude) { - if (!file_exists($sToInclude)) + if (substr($sToInclude, 0, 3) == '../') { - throw new CoreException('Wrong filename in configuration file', array('file' => $sConfigFile, 'module' => $sModuleType, 'filename' => $sToInclude)); + // Preserve compatibility with config files written before 1.0.1 + // Replace '../' by '/' + $sFile = APPROOT.'/'.substr($sToInclude, 3); } - require_once($sToInclude); + elseif (substr($sToInclude, 0, 1) == '/') + { + // Preferred... + $sFile = APPROOT.$sToInclude; + } + else + { + // Leave as is - should be an absolute path + $sFile = $sToInclude; + } + if (!file_exists($sFile)) + { + throw new CoreException('Wrong filename in configuration file', array('file' => $sConfigFile, 'module' => $sModuleType, 'filename' => $sFile)); + } + require_once($sFile); } protected static function InitPlugins() diff --git a/core/ormpassword.class.inc.php b/core/ormpassword.class.inc.php index 217076480..5a220e145 100644 --- a/core/ormpassword.class.inc.php +++ b/core/ormpassword.class.inc.php @@ -14,7 +14,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require_once('../core/simplecrypt.class.inc.php'); +require_once(APPROOT.'/core/simplecrypt.class.inc.php'); /** * ormPassword diff --git a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php index bc699b85d..dcd88eaea 100644 --- a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php @@ -23,8 +23,6 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/cmdbabstract.class.inc.php'); -require_once('../application/template.class.inc.php'); MetaModel::RegisterRelation("impacts", array("description"=>"Objects impacted by", "verb_down"=>"impacts", "verb_up"=>"depends on")); MetaModel::RegisterRelation("depends on", array("description"=>"That impacts ", "verb_down"=>"depends on", "verb_up"=>"impacts")); diff --git a/pages/UI.php b/pages/UI.php index e22ca9962..ea53451a1 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -495,16 +495,17 @@ EOF * ***********************************************************************************/ try { - require_once('../application/application.inc.php'); - require_once('../application/itopwebpage.class.inc.php'); - require_once('../application/wizardhelper.class.inc.php'); + require_once('../approot.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'); - require_once('../application/startup.inc.php'); + require_once(APPROOT.'/application/startup.inc.php'); $operation = utils::ReadParam('operation', ''); $oKPI = new ExecutionKPI(); - require_once('../application/loginwebpage.class.inc.php'); + require_once(APPROOT.'/application/loginwebpage.class.inc.php'); LoginWebPage::DoLogin(); // Check user rights and prompt if needed $oAppContext = new ApplicationContext(); @@ -1308,7 +1309,7 @@ EOF { throw new ApplicationException(Dict::Format('UI:Error:4ParametersMissing', 'class', 'id', 'target_class', 'link_attr')); } - require_once('../application/uilinkswizard.class.inc.php'); + require_once(APPROOT.'/application/uilinkswizard.class.inc.php'); $oWizard = new UILinksWizard($sClass, $sLinkAttr, $id, $sTargetClass); $oWizard->Display($oP, array('StartWithAdd' => $bAddObjects)); break; @@ -1490,7 +1491,7 @@ EOF } catch(CoreException $e) { - require_once('../setup/setuppage.class.inc.php'); + require_once(APPROOT.'/setup/setuppage.class.inc.php'); $oP = new SetupWebPage(Dict::S('UI:PageTitle:FatalError')); if ($e instanceof SecurityException) { @@ -1533,7 +1534,7 @@ catch(CoreException $e) } catch(Exception $e) { - require_once('../setup/setuppage.class.inc.php'); + require_once(APPROOT.'/setup/setuppage.class.inc.php'); $oP = new SetupWebPage(Dict::S('UI:PageTitle:FatalError')); $oP->add("

".Dict::S('UI:FatalErrorMessage')."

\n"); $oP->error(Dict::Format('UI:Error_Details', $e->getMessage())); diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php index 2cd24d5d5..eb350045b 100644 --- a/pages/UniversalSearch.php +++ b/pages/UniversalSearch.php @@ -23,13 +23,14 @@ * @license http://www.opensource.org/licenses/gpl-3.0.html LGPL */ -require_once('../application/application.inc.php'); -require_once('../application/itopwebpage.class.inc.php'); -require_once('../application/applicationcontext.class.inc.php'); +require_once('../approot.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'); -require_once('../application/startup.inc.php'); +require_once(APPROOT.'/application/startup.inc.php'); -require_once('../application/loginwebpage.class.inc.php'); +require_once(APPROOT.'/application/loginwebpage.class.inc.php'); LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin) $oAppContext = new ApplicationContext(); @@ -47,7 +48,6 @@ $sOperation = utils::ReadParam('operation', ''); // First part: select the class to search for $oP->add("
"); -$oP->add(""); $oP->add(Dict::S('UI:UniversalSearch:LabelSelectTheClass')."