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

N°3952 - code hardening (merged from support/2.6)

Browse Source
This commit is contained in:
Eric
2021-05-27 09:55:16 +02:00
parent caa2a05bf4 43daa2ef08
commit 6be9a87c15
5 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/wizardsteps.class.inc.php
View File

@@ -2208,7 +2208,7 @@ CSS
$oPage->add('<div class="closed"><span class="title">Database Parameters</span><ul>');
$oPage->add('<li>Server Name: '.$aInstallParams['database']['server'].'</li>');
$oPage->add('<li>DB User Name: '.$aInstallParams['database']['user'].'</li>');
$oPage->add('<li>DB user password: '.$aInstallParams['database']['pwd'].'</li>');
$oPage->add('<li>DB user password: ***</li>');
if (($sMode == 'install') && ($this->oWizard->GetParameter('create_db') == 'yes'))
{
$oPage->add('<li>Database Name: '.$aInstallParams['database']['name'].' (will be created)</li>');
@@ -2646,18 +2646,16 @@ class WizStepDone extends WizardStep
$aAdditionalModules = array();
foreach(json_decode($this->oWizard->GetParameter('additional_extensions_modules'), true) as $idx => $aModuleInfo)
{
if (in_array('_'.$idx, $aParameters[count($aParameters)-1]))
{
if (in_array('_'.$idx, $aParameters[count($aParameters)-1])) {
// Extensions "choices" can now have more than one module
foreach($aModuleInfo['modules'] as $sModuleName)
{
foreach ($aModuleInfo['modules'] as $sModuleName) {
$aAdditionalModules[] = $sModuleName;
}
}
}
$idx = 0;
$aReportedModules = array();
while($idx < count($aAdditionalModules) && (strlen($sImgUrl.'&m='.urlencode(implode(' ', $aReportedModules))) < 2000)) // reasonable limit for the URL: 2000 chars
while ($idx < count($aAdditionalModules) && (strlen($sImgUrl.'&m='.urlencode(implode(' ', $aReportedModules))) < 2000)) // reasonable limit for the URL: 2000 chars
{
$aReportedModules[] = $aAdditionalModules[$idx];
$idx++;
@@ -2667,6 +2665,7 @@ class WizStepDone extends WizardStep
$oPage->add('<img style="border:0" src="'.$sImgUrl.'"/>');
$sForm = addslashes($sForm);
$oPage->add_ready_script("$('#wiz_form').after('$sForm');");
SetupUtils::EraseSetupToken();
}
public function CanMoveForward()