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

Merge branch 'hotfix/N941'

Browse Source
This commit is contained in:
Eric
2019-02-13 17:45:44 +01:00
parent 43b0747b83 a784661025
commit c6fd381b01
1 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
setup/setuputils.class.inc.php
View File

@@ -1305,6 +1305,16 @@ EOF
$sDBUser = $aParameters['db_user']; $sDBUser = $aParameters['db_user'];
$sDBPwd = $aParameters['db_pwd']; $sDBPwd = $aParameters['db_pwd'];
$sDBName = $aParameters['db_name']; $sDBName = $aParameters['db_name'];
$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
if ($bIsWindows && (strpos($sDBPwd, '%') !== false))
{
// Unsuported Password, disable the "Next" button
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
$oPage->add_ready_script('$("#db_info").html("<img src=\'../images/error.png\'/>&nbsp;Database password cannot contain % character...");');
}
else
{
$sTlsEnabled = (isset($aParameters['db_tls_enabled'])) ? $aParameters['db_tls_enabled'] : null; $sTlsEnabled = (isset($aParameters['db_tls_enabled'])) ? $aParameters['db_tls_enabled'] : null;
$sTlsCA = (isset($aParameters['db_tls_ca'])) ? $aParameters['db_tls_ca'] : null; $sTlsCA = (isset($aParameters['db_tls_ca'])) ? $aParameters['db_tls_ca'] : null;
@@ -1328,17 +1338,22 @@ EOF
{ {
$aErrors[] = $oCheck->sLabel; $aErrors[] = $oCheck->sLabel;
} }
else if ($oCheck->iSeverity == CheckResult::WARNING) else
{
if ($oCheck->iSeverity == CheckResult::WARNING)
{ {
$aWarnings[] = $oCheck->sLabel; $aWarnings[] = $oCheck->sLabel;
} }
} }
}
if (count($aErrors) > 0) if (count($aErrors) > 0)
{ {
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");'); $oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_error.png"/>&nbsp;<b>Error:</b> '.htmlentities(implode('<br/>', $aErrors), ENT_QUOTES, 'UTF-8').'\');'); $oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_error.png"/>&nbsp;<b>Error:</b> '.htmlentities(implode('<br/>', $aErrors), ENT_QUOTES, 'UTF-8').'\');');
} }
else if (count($aWarnings) > 0) else
{
if (count($aWarnings) > 0)
{ {
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");'); $oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/error.png"/>&nbsp;<b>Warning:</b> '.htmlentities(implode('<br/>', $aWarnings), ENT_QUOTES, 'UTF-8').'\');'); $oPage->add_ready_script('$("#db_info").html(\'<img src="../images/error.png"/>&nbsp;<b>Warning:</b> '.htmlentities(implode('<br/>', $aWarnings), ENT_QUOTES, 'UTF-8').'\');');
@@ -1348,6 +1363,7 @@ EOF
$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");'); $oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_ok.png"/>&nbsp;Database server connection Ok.\');'); $oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_ok.png"/>&nbsp;Database server connection Ok.\');');
} }
}
if ($checks['databases'] == null) if ($checks['databases'] == null)
{ {
@@ -1372,6 +1388,7 @@ EOF
$oPage->add_ready_script('$("#db_name").bind("click keyup change", function() { $("#existing_db").prop("checked", true); WizardUpdateButtons(); });'); $oPage->add_ready_script('$("#db_name").bind("click keyup change", function() { $("#existing_db").prop("checked", true); WizardUpdateButtons(); });');
} }
}
$oPage->add_ready_script('WizardUpdateButtons();'); $oPage->add_ready_script('WizardUpdateButtons();');
} }