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

The new 2.0 setup is under way...

Browse Source 
SVN:trunk[2184]
This commit is contained in:
Romain Quetiez
2012-09-13 09:00:53 +00:00
parent 39d2534bda
commit 71208d362a
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
setup/applicationinstaller.class.inc.php
View File

@@ -165,10 +165,9 @@ class ApplicationInstaller
$sDBUser = $aDBParams['user']; $sDBUser = $aDBParams['user'];
$sDBPwd = $aDBParams['pwd']; $sDBPwd = $aDBParams['pwd'];
$sDBName = $aDBParams['name']; $sDBName = $aDBParams['name'];
$sDBNewName = $aDBParams['new_name'];
$sDBPrefix = $aDBParams['prefix']; $sDBPrefix = $aDBParams['prefix'];
self::DoUpdateDBSchema($sMode, $sTargetDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBNewName, $sDBPrefix, $sTargetEnvironment); self::DoUpdateDBSchema($sMode, $sTargetDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sTargetEnvironment);
$aResult = array( $aResult = array(
'status' => self::OK, 'status' => self::OK,
@@ -192,7 +191,6 @@ class ApplicationInstaller
$sDBUser = $aDBParams['user']; $sDBUser = $aDBParams['user'];
$sDBPwd = $aDBParams['pwd']; $sDBPwd = $aDBParams['pwd'];
$sDBName = $aDBParams['name']; $sDBName = $aDBParams['name'];
$sDBNewName = $aDBParams['new_name'];
$sDBPrefix = $aDBParams['prefix']; $sDBPrefix = $aDBParams['prefix'];
$aAdminParams = $this->oParams->Get('admin_account'); $aAdminParams = $this->oParams->Get('admin_account');
$sAdminUser = $aAdminParams['user']; $sAdminUser = $aAdminParams['user'];
@@ -201,7 +199,7 @@ class ApplicationInstaller
$sLanguage = $this->oParams->Get('language'); $sLanguage = $this->oParams->Get('language');
$aSelectedModules = $this->oParams->Get('selected_modules', array()); $aSelectedModules = $this->oParams->Get('selected_modules', array());
self::AfterDBCreate($sMode, $sTargetDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBNewName, $sDBPrefix, $sAdminUser, $sAdminPwd, $sAdminLanguage, $sLanguage, $aSelectedModules, $sTargetEnvironment); self::AfterDBCreate($sMode, $sTargetDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sAdminUser, $sAdminPwd, $sAdminLanguage, $sLanguage, $aSelectedModules, $sTargetEnvironment);
$aResult = array( $aResult = array(
'status' => self::OK, 'status' => self::OK,
@@ -225,7 +223,6 @@ class ApplicationInstaller
$sDBUser = $aDBParams['user']; $sDBUser = $aDBParams['user'];
$sDBPwd = $aDBParams['pwd']; $sDBPwd = $aDBParams['pwd'];
$sDBName = $aDBParams['name']; $sDBName = $aDBParams['name'];
$sDBNewName = $aDBParams['new_name'];
$sDBPrefix = $aDBParams['prefix']; $sDBPrefix = $aDBParams['prefix'];
$aFiles = $this->oParams->Get('files', array()); $aFiles = $this->oParams->Get('files', array());
@@ -253,7 +250,6 @@ class ApplicationInstaller
$sDBUser = $aDBParams['user']; $sDBUser = $aDBParams['user'];
$sDBPwd = $aDBParams['pwd']; $sDBPwd = $aDBParams['pwd'];
$sDBName = $aDBParams['name']; $sDBName = $aDBParams['name'];
$sDBNewName = $aDBParams['new_name'];
$sDBPrefix = $aDBParams['prefix']; $sDBPrefix = $aDBParams['prefix'];
$sUrl = $this->oParams->Get('url', ''); $sUrl = $this->oParams->Get('url', '');
$sLanguage = $this->oParams->Get('language', ''); $sLanguage = $this->oParams->Get('language', '');
@@ -360,7 +356,7 @@ class ApplicationInstaller
} }
} }
protected static function DoUpdateDBSchema($sMode, $sModulesDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBNewName, $sDBPrefix, $sTargetEnvironment = '') protected static function DoUpdateDBSchema($sMode, $sModulesDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sTargetEnvironment = '')
{ {
SetupPage::log_info("Update Database Schema for environment '$sTargetEnvironment'."); SetupPage::log_info("Update Database Schema for environment '$sTargetEnvironment'.");
@@ -371,7 +367,6 @@ class ApplicationInstaller
'db_user' => $sDBUser, 'db_user' => $sDBUser,
'db_pwd' => $sDBPwd, 'db_pwd' => $sDBPwd,
'db_name' => $sDBName, 'db_name' => $sDBName,
'new_db_name' => $sDBNewName,
'db_prefix' => $sDBPrefix, 'db_prefix' => $sDBPrefix,
); );
$oConfig->UpdateFromParams($aParamValues, $sModulesDir); $oConfig->UpdateFromParams($aParamValues, $sModulesDir);
@@ -386,7 +381,7 @@ class ApplicationInstaller
SetupPage::log_info("Database Schema Successfully Updated for environment '$sTargetEnvironment'."); SetupPage::log_info("Database Schema Successfully Updated for environment '$sTargetEnvironment'.");
} }
protected static function AfterDBCreate($sMode, $sModulesDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBNewName, $sDBPrefix, $sAdminUser, $sAdminPwd, $sAdminLanguage, $sLanguage, $aSelectedModules, $sTargetEnvironment = '') protected static function AfterDBCreate($sMode, $sModulesDir, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $sAdminUser, $sAdminPwd, $sAdminLanguage, $sLanguage, $aSelectedModules, $sTargetEnvironment = '')
{ {
SetupPage::log_info('After Database Creation'); SetupPage::log_info('After Database Creation');
@@ -398,7 +393,6 @@ class ApplicationInstaller
'db_user' => $sDBUser, 'db_user' => $sDBUser,
'db_pwd' => $sDBPwd, 'db_pwd' => $sDBPwd,
'db_name' => $sDBName, 'db_name' => $sDBName,
'new_db_name' => $sDBNewName,
'db_prefix' => $sDBPrefix, 'db_prefix' => $sDBPrefix,
); );
$oConfig->UpdateFromParams($aParamValues, $sModulesDir); $oConfig->UpdateFromParams($aParamValues, $sModulesDir);
@@ -517,7 +511,6 @@ class ApplicationInstaller
'db_user' => $sDBUser, 'db_user' => $sDBUser,
'db_pwd' => $sDBPwd, 'db_pwd' => $sDBPwd,
'db_name' => $sDBName, 'db_name' => $sDBName,
'new_db_name' => $sDBName,
'db_prefix' => $sDBPrefix, 'db_prefix' => $sDBPrefix,
); );
$oConfig = new Config(); $oConfig = new Config();
@@ -561,7 +554,6 @@ class ApplicationInstaller
'db_user' => $sDBUser, 'db_user' => $sDBUser,
'db_pwd' => $sDBPwd, 'db_pwd' => $sDBPwd,
'db_name' => $sDBName, 'db_name' => $sDBName,
'new_db_name' => $sDBName,
'db_prefix' => $sDBPrefix, 'db_prefix' => $sDBPrefix,
'application_path' => $sUrl, 'application_path' => $sUrl,
'mode' => $sMode, 'mode' => $sMode,