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

Code cleanup

Browse Source
This commit is contained in:
Molkobain
2022-03-06 22:56:37 +01:00
parent faa38155e5
commit 6775a3e928
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php
View File

@@ -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)
{

3
datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
View File

@@ -47,6 +47,3 @@ SetupWebPage::AddModule(
),
)
);
?>

9
sources/Controller/AjaxRenderController.php
View File

@@ -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('</fieldset>');
$oPage->add("</div>");
}
/**
* Display about iTop for all user non admin
* @param \AjaxPage $oPage
@@ -829,7 +830,7 @@ EOF
$oPage->add('<a href="http://www.combodo.com" title="www.combodo.com" target="_blank" style="background: none;"><img src="../images/logo-combodo.png?t='.utils::GetCacheBusterTimestamp().'"/></a>');
$oPage->add('<div>'.$sVersionString.'</div>');
$oPage->add("</div>");
self::DisplayAboutLicenses( $oPage);
self::DisplayAboutLicenses($oPage);
$oPage->add("</div>");
}
@@ -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');