composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated session mechanisms: itop_env defaults to 'production', and adapted the setup to create the configuration

Browse Source 
SVN:trunk[1762]
This commit is contained in:
Romain Quetiez
2012-01-12 14:46:49 +00:00
parent 63f4ec3f82
commit 87bf09995d
11 changed files with 98 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup/ajax.dataloader.php
View File

@@ -121,8 +121,6 @@ require_once(APPROOT.'/core/kpi.class.inc.php');
require_once(APPROOT.'/core/cmdbsource.class.inc.php');
require_once('./xmldataloader.class.inc.php');
define('TMP_CONFIG_FILE', APPROOT.'/tmp-config-itop.php');
//define('FINAL_CONFIG_FILE', APPROOT.'/config-itop.php');
// Never cache this page
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
@@ -202,7 +200,7 @@ try
//
SetupPage::log_info("Update Database Schema.");
$oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */);
$oConfig = new Config();
$aParamValues = array(
'db_server' => utils::ReadParam('db_server', '', false, 'raw_data'),
@@ -231,7 +229,7 @@ try
//
SetupPage::log_info('After Database Creation');
$oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */);
$oConfig = new Config();
$aParamValues = array(
'db_server' => utils::ReadParam('db_server', '', false, 'raw_data'),
@@ -301,7 +299,7 @@ try
throw(new Exception("File $sFileName does not exist"));
}
$oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */);
$oConfig = new Config();
$aParamValues = array(
'db_server' => utils::ReadParam('db_server', '', false, 'raw_data'),