michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-06 07:50:40 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add fail-proof on misconfiguration

Browse Source 
4ef304662e
This commit is contained in:
Ilia Rostovtsev
2021-01-24 17:48:29 +03:00
parent e22aa66ba9
commit 4fc2fc3f05
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web-lib-funcs.pl
View File

@@ -4897,8 +4897,7 @@ $main::initial_module_name ||= $module_name;
# Set some useful variables
my $current_themes;
$current_themes = $ENV{'THEME_DIRS'} ? $ENV{'THEME_DIRS'} :
$ENV{'MOBILE_DEVICE'} && defined($gconfig{'mobile_theme'}) ?
$current_themes = $ENV{'MOBILE_DEVICE'} && defined($gconfig{'mobile_theme'}) ?
$gconfig{'mobile_theme'} :
defined($remote_user_attrs{'theme'}) ?
$remote_user_attrs{'theme'} :
@@ -4907,6 +4906,11 @@ $current_themes = $ENV{'THEME_DIRS'} ? $ENV{'THEME_DIRS'} :
defined($gconfig{'theme_'.$base_remote_user}) ?
$gconfig{'theme_'.$base_remote_user} :
$gconfig{'theme'};
# Prevent breakage on inconsistent configuration
my $env_theme_dirs = $ENV{'THEME_DIRS'};
if (!$env_theme_dirs || ($env_theme_dirs && $current_themes ne $env_theme_dirs)) {
$current_themes = $env_theme_dirs;
}
@current_themes = split(/\s+/, $current_themes);
$current_theme = $current_themes[0];
@theme_root_directories = map { "$root_directory/$_" } @current_themes;