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

Make sure that we catch exceptions that may occur during the setup.

Browse Source 
SVN:code[96]
This commit is contained in:
Denis Flaven
2009-08-22 09:48:03 +00:00
parent 6c70bc4f03
commit 3cd364ab4b
1 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
trunk/setup/index.php
View File

@@ -484,53 +484,64 @@ catch(Exception $e)
// We'll end here when the tmp config file does not exist. It's normal // We'll end here when the tmp config file does not exist. It's normal
$oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */); $oConfig = new Config(TMP_CONFIG_FILE, false /* Don't try to load it */);
} }
switch($sOperation) try
{ {
case 'step1': switch($sOperation)
$oP->log("Info - ========= Wizard step 1 ========");
DisplayStep1($oP);
break;
case 'step2':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 2 ========");
$sDBServer = Utils::ReadParam('db_server');
$sDBUser = Utils::ReadParam('db_user');
$sDBPwd = Utils::ReadParam('db_pwd');
DisplayStep2($oP, $oConfig, $sDBServer, $sDBUser, $sDBPwd);
break;
case 'step3':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 3 ========");
$sDBName = Utils::ReadParam('db_name');
if (empty($sDBName))
{ {
$sDBName = Utils::ReadParam('new_db_name'); case 'step1':
} $oP->log("Info - ========= Wizard step 1 ========");
$sDBPrefix = Utils::ReadParam('db_prefix'); DisplayStep1($oP);
DisplayStep3($oP, $oConfig, $sDBName, $sDBPrefix); break;
break;
case 'step2':
case 'step4': $oP->no_cache();
$oP->no_cache(); $oP->log("Info - ========= Wizard step 2 ========");
$oP->log("Info - ========= Wizard step 4 ========"); $sDBServer = Utils::ReadParam('db_server');
$sAdminUser = Utils::ReadParam('auth_user'); $sDBUser = Utils::ReadParam('db_user');
$sAdminPwd = Utils::ReadParam('auth_pwd'); $sDBPwd = Utils::ReadParam('db_pwd');
DisplayStep4($oP, $oConfig, $sAdminUser, $sAdminPwd); DisplayStep2($oP, $oConfig, $sDBServer, $sDBUser, $sDBPwd);
break; break;
case 'step5':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 5 ========");
$sAdminUser = Utils::ReadParam('auth_user');
$sAdminPwd = Utils::ReadParam('auth_pwd');
DisplayStep5($oP, $oConfig, $sAdminUser, $sAdminPwd);
break;
default:
$oP->error("Error: unsupported operation '$sOperation'");
case 'step3':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 3 ========");
$sDBName = Utils::ReadParam('db_name');
if (empty($sDBName))
{
$sDBName = Utils::ReadParam('new_db_name');
}
$sDBPrefix = Utils::ReadParam('db_prefix');
DisplayStep3($oP, $oConfig, $sDBName, $sDBPrefix);
break;
case 'step4':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 4 ========");
$sAdminUser = Utils::ReadParam('auth_user');
$sAdminPwd = Utils::ReadParam('auth_pwd');
DisplayStep4($oP, $oConfig, $sAdminUser, $sAdminPwd);
break;
case 'step5':
$oP->no_cache();
$oP->log("Info - ========= Wizard step 5 ========");
$sAdminUser = Utils::ReadParam('auth_user');
$sAdminPwd = Utils::ReadParam('auth_pwd');
DisplayStep5($oP, $oConfig, $sAdminUser, $sAdminPwd);
break;
default:
$oP->error("Error: unsupported operation '$sOperation'");
}
}
catch(Exception $e)
{
$oP->error("Error: '".$e->getMessage()."'");
}
catch(CoreException $e)
{
$oP->error("Error: '".$e->getHtmlDesc()."'");
} }
$oP->output(); $oP->output();
?> ?>