diff --git a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php index 1e34bdaac..fa40d3ca9 100644 --- a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php +++ b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php @@ -81,8 +81,10 @@ class FilesIntegrity * Check that files present in iTop folder corresponds to the manifest * * @param string $sRootPath + * @param bool $bCheckNewModule * * @throws \Combodo\iTop\FilesInformation\Service\FileIntegrityException + * @since 3.0.1 Add $bCheckNewModule parameter */ public static function CheckInstallationIntegrity($sRootPath = APPROOT, $bCheckNewModule = false) { diff --git a/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php index d262dc89e..0e839555a 100644 --- a/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php +++ b/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php @@ -47,6 +47,3 @@ SetupWebPage::AddModule( ), ) ); - - -?> diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php index bb8ea1f31..04efe683a 100644 --- a/sources/Controller/AjaxRenderController.php +++ b/sources/Controller/AjaxRenderController.php @@ -773,12 +773,12 @@ class AjaxRenderController } /** - * display list of licenses in "About iTop" popup + * Display list of licenses in "About iTop" popup * @param \AjaxPage $oPage * * @throws \Exception */ - private static function DisplayAboutLicenses( AjaxPage $oPage): void + private static function DisplayAboutLicenses(AjaxPage $oPage): void { $sCurrEnv = utils::GetCurrentEnvironment(); require_once(APPROOT.'setup/setuputils.class.inc.php'); @@ -804,6 +804,7 @@ JS $oPage->add(''); $oPage->add(""); } + /** * Display about iTop for all user non admin * @param \AjaxPage $oPage @@ -829,7 +830,7 @@ EOF $oPage->add(''); $oPage->add('
'.$sVersionString.'
'); $oPage->add(""); - self::DisplayAboutLicenses( $oPage); + self::DisplayAboutLicenses($oPage); $oPage->add(""); } @@ -885,8 +886,6 @@ EOF } $aAvailableModules = $oRuntimeEnv->AnalyzeInstallation(MetaModel::GetConfig(), $aSearchDirs); - - $aItopSettings = array('cron_max_execution_time', 'timezone'); $aPHPSettings = array('memory_limit', 'max_execution_time', 'upload_max_filesize', 'post_max_size'); $aMySQLSettings = array('max_allowed_packet', 'key_buffer_size', 'query_cache_size');