Merge remote-tracking branch 'origin/support/3.0' into develop

This commit is contained in:
Molkobain
2022-05-11 18:14:00 +02:00
3 changed files with 5 additions and 79 deletions

View File

@@ -1,13 +1,11 @@
<p align="center"><a href="https://www.combodo.com/itop-193" target="_blank">
<img src="https://www.combodo.com/logos/logo-itop.svg">
<img src="https://www.combodo.com/logos/logo-itop-baseline.svg" width=350>
</a></p>
# iTop - ITSM & CMDB
iTop stands for *IT Operations Portal*.
It is a complete open source, ITIL, web based service management tool including a fully customizable CMDB, a helpdesk system and a document management tool.
iTop also offers mass import tools and web services to integrate with your IT
iTop stands for IT Operations Portal. It is a complete open source and web based IT service management platform including a fully customizable CMDB, a helpdesk system and a document management tool. It is ITIL compliant and easily customizable and extensible thanks to a high number of adds-on and web services to integrate with your IT.
iTop also offers mass import tools to help you being even more efficient.
## Features
- Fully configurable [Configuration Management (CMDB)][10]

View File

@@ -2599,79 +2599,7 @@ class WizStepDone extends WizardStep
$sForm .= '<input type="hidden" name="auth_pwd" value="'.htmlentities($this->oWizard->GetParameter('admin_pwd'), ENT_QUOTES, 'UTF-8').'">';
$sForm .= "<button id=\"enter_itop\" class=\"ibo-button ibo-is-regular ibo-is-primary\" type=\"submit\">Enter ".ITOP_APPLICATION."</button></div>";
$sForm .= '</form>';
$sPHPVersion = phpversion();
$sMySQLVersion = SetupUtils::GetMySQLVersion(
$this->oWizard->GetParameter('db_server'),
$this->oWizard->GetParameter('db_user'),
$this->oWizard->GetParameter('db_pwd'),
$this->oWizard->GetParameter('db_tls_enabled'),
$this->oWizard->GetParameter('db_tls_ca')
);
$aParameters = json_decode($this->oWizard->GetParameter('selected_components', '{}'), true);
$sCompactWizChoices = array();
foreach($aParameters as $iStep => $aChoices)
{
$aShortChoices = array();
foreach($aChoices as $sChoiceCode)
{
$sShortCode = str_replace('_', '', $sChoiceCode);
$aShortChoices[] = $sShortCode;
}
$sCompactWizChoices[] = implode(' ',$aShortChoices);
}
$sInstallMode = 'i';
if ($this->oWizard->GetParameter('install_mode', 'install') == 'upgrade')
{
if (!$this->oWizard->GetParameter('license'))
{
// When the version does not change we don't ask for the licence again
$sInstallMode = 'r';
}
else
{
// An actual upgrade
$sInstallMode = 'u';
}
}
$aUrlParams = array(
'p' => ITOP_APPLICATION,
'v' => ITOP_VERSION,
'php' => $sPHPVersion,
'mysql' => $sMySQLVersion,
'os' => PHP_OS,
's' => ($this->oWizard->GetParameter('sample_data', '') == 'yes') ? 1 : 0 ,
'l' => $this->oWizard->GetParameter('default_language'),
'i' => $sInstallMode,
'w' => json_encode($sCompactWizChoices),
);
$aSafeParams = array();
foreach($aUrlParams as $sCode => $sValue)
{
$aSafeParams[] = $sCode.'='.urlencode($sValue);
}
$sImgUrl = 'http://www.combodo.com/stats/?'.implode('&', $aSafeParams);
$aAdditionalModules = array();
foreach(json_decode($this->oWizard->GetParameter('additional_extensions_modules'), true) as $idx => $aModuleInfo)
{
if (in_array('_'.$idx, $aParameters[count($aParameters)-1])) {
// Extensions "choices" can now have more than one module
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
{
$aReportedModules[] = $aAdditionalModules[$idx];
$idx++;
}
$sImgUrl .= '&m='.urlencode(implode(' ', $aReportedModules));
$oPage->add('<img style="visibility: hidden;border:0" src="'.$sImgUrl.'"/>');
$sForm = addslashes($sForm);
$oPage->add_ready_script("$('#wiz_form').append('$sForm');");
// avoid leaving in a dirty state

View File

@@ -21,7 +21,7 @@
<ini name="error_reporting" value="E_ALL"/>
<ini name="display_errors" value="On"/>
<ini name="log_errors" value="On"/>
<ini name="html_errors" value="On"/>
<ini name="html_errors" value="Off"/>
</php>
<testsuites>