diff --git a/README.md b/README.md index 93881cc0b4..e78cce6515 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@
-# 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] diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 44579ffb90..448439b8cf 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -2599,79 +2599,7 @@ class WizStepDone extends WizardStep $sForm .= ''; $sForm .= ""; $sForm .= ''; - $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(''); $sForm = addslashes($sForm); $oPage->add_ready_script("$('#wiz_form').append('$sForm');"); // avoid leaving in a dirty state diff --git a/test/postbuild_integration.xml.dist b/test/postbuild_integration.xml.dist index 0a3ce6ef08..bc85293f26 100644 --- a/test/postbuild_integration.xml.dist +++ b/test/postbuild_integration.xml.dist @@ -21,7 +21,7 @@