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

Performance: Change theme signature check to be done only when necessary at runtime in a production environment

Browse Source
This commit is contained in:
Molkobain
2021-04-25 14:00:07 +02:00
parent d5d3a7af47
commit cbc5bb70d0
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
application/themehandler.class.inc.php
View File

@@ -174,6 +174,29 @@ class ThemeHandler
return static::GetCompiledThemesFolderAbsolutePath().$sThemeId.'/';
}
/**
* @param string $sThemeId
*
* @return string Absolute path of the compiled file for the $sThemeId theme (Note: It doesn't mean that the theme is actually compiled)
* @since 3.0.0
*/
public static function GetCompiledThemeFileAbsolutePath(string $sThemeId): string
{
return static::GetCompiledThemeFolderAbsolutePath($sThemeId).'main.css';
}
/**
* @param string $sThemeId
*
* @return string Absolute URL of the compiled file for the $sThemeId theme (Note: It doesn't mean that the theme is actually compiled)
* @throws \Exception
* @since 3.0.0
*/
public static function GetCompiledThemeFileAbsoluteUrl(string $sThemeId): string
{
return utils::GetAbsoluteUrlModulesRoot().'branding/themes/'.$sThemeId.'/main.css';
}
/**
* Return the absolute URL for the current theme CSS file
*
@@ -186,7 +209,9 @@ class ThemeHandler
// Try to compile theme defined in the configuration
// Note: In maintenance mode we should stick to the app theme (also we don't have access to many PHP classes, including the user preferences)
$sThemeId = SetupUtils::IsInMaintenanceMode() ? static::GetApplicationThemeId() : static::GetCurrentUserThemeId();
static::CompileTheme($sThemeId);
if (static::ShouldThemeSignatureCheckBeForced($sThemeId)) {
static::CompileTheme($sThemeId);
}
}
catch (CoreException $oCompileException) {
// Fallback on our default theme (should always be compilable) in case the previous theme doesn't exists
@@ -199,11 +224,34 @@ class ThemeHandler
SetupUtils::builddir($sDefaultThemeDirPath);
}
static::CompileTheme($sThemeId, false, "", $aDefaultTheme['parameters']);
if (static::ShouldThemeSignatureCheckBeForced($sThemeId)) {
static::CompileTheme($sThemeId, false, "", $aDefaultTheme['parameters']);
}
}
// Return absolute url to theme compiled css
return utils::GetAbsoluteUrlModulesRoot().'branding/themes/'.$sThemeId.'/main.css';
return static::GetCompiledThemeFileAbsoluteUrl($sThemeId);
}
/**
* @param string $sThemeId
*
* @return bool True if the $sThemeId signature check -and possibly the compilation- should be forced (dev. environment, missing compiled file, ...)
*/
protected static function ShouldThemeSignatureCheckBeForced(string $sThemeId): bool
{
if (utils::IsDevelopmentEnvironment()) {
return true;
}
if (false === file_exists(static::GetCompiledThemeFileAbsolutePath($sThemeId))) {
return true;
}
if (true === utils::GetConfig()->Get('theme.force_signature_check_at_runtime')) {
return true;
}
return false;
}
/**