tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 00:04:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

StyleSheet: Do not rely on config to trigger auth

Browse Source 
fixes #5385

(cherry picked from commit 5d71d09e548e048e8b275afc203cfa1bc2707ba8)
This commit is contained in:
Johannes Meyer 2025-07-08 15:01:45 +02:00
parent 6d18f00ed0
commit d7ec19d829
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Web/StyleSheet.php
View File

@ -139,6 +139,7 @@ class StyleSheet
$this->lessCompiler->addLessFile($this->pubPath . '/' . $lessFile); $this->lessCompiler->addLessFile($this->pubPath . '/' . $lessFile);
} }
$auth = Auth::getInstance();
$mm = $this->app->getModuleManager(); $mm = $this->app->getModuleManager();
foreach ($mm->getLoadedModules() as $moduleName => $module) { foreach ($mm->getLoadedModules() as $moduleName => $module) {
@ -157,7 +158,6 @@ class StyleSheet
} }
if (! (bool) $themingConfig->get('disabled', false)) { if (! (bool) $themingConfig->get('disabled', false)) {
$auth = Auth::getInstance();
if ($auth->isAuthenticated()) { if ($auth->isAuthenticated()) {
$userTheme = $auth->getUser()->getPreferences()->getValue('icingaweb', 'theme'); $userTheme = $auth->getUser()->getPreferences()->getValue('icingaweb', 'theme');
if ($userTheme !== null) { if ($userTheme !== null) {
@ -174,7 +174,7 @@ class StyleSheet
Logger::warning(sprintf( Logger::warning(sprintf(
'Theme "%s" set by user "%s" has not been found.', 'Theme "%s" set by user "%s" has not been found.',
$theme, $theme,
($user = Auth::getInstance()->getUser()) !== null ? $user->getUsername() : 'anonymous' $auth->isAuthenticated() ? $auth->getUser()->getUsername() : 'anonymous'
)); ));
} }
} }
@ -184,10 +184,10 @@ class StyleSheet
} }
$mode = 'none'; $mode = 'none';
if ($user = Auth::getInstance()->getUser()) { if ($auth->isAuthenticated()) {
$file = $themePath !== null ? @file_get_contents($themePath) : false; $file = $themePath !== null ? @file_get_contents($themePath) : false;
if (! $file || strpos($file, self::LIGHT_MODE_IDENTIFIER) !== false) { if (! $file || strpos($file, self::LIGHT_MODE_IDENTIFIER) !== false) {
$mode = $user->getPreferences()->getValue('icingaweb', 'theme_mode', self::DEFAULT_MODE); $mode = $auth->getUser()->getPreferences()->getValue('icingaweb', 'theme_mode', self::DEFAULT_MODE);
} }
} }