diff options
Diffstat (limited to 'src/etc/inc/authgui.inc')
| -rw-r--r-- | src/etc/inc/authgui.inc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index cbaac9f..cc01456 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -72,6 +72,11 @@ if (!session_auth()) { $allowedpages = getAllowedPages($_SESSION['Username'], $_SESSION['user_radius_attributes']); /* + * Get user-based preference settings so they can be easily referenced. + */ +$user_settings = get_user_settings($_SESSION['Username']); + +/* * redirect to first allowed page if requesting a wrong url */ @@ -123,7 +128,7 @@ session_commit(); * determine if the user is allowed access to the requested page */ function display_error_form($http_code, $desc) { - global $config, $g; + global $config, $user_settings, $g; if (isAjax()) { printf(gettext('Error: %1$s Description: %2$s'), $http_code, $desc); @@ -132,11 +137,11 @@ function display_error_form($http_code, $desc) { $cssfile = "/css/pfSense.css"; - if (isset($config['system']['webgui']['webguicss'])) { - if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) { - $cssfile = "/css/" . $config['system']['webgui']['webguicss']; + if (isset($user_settings['webgui']['webguicss'])) { + if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['webguicss'])) { + $cssfile = "/css/" . $user_settings['webgui']['webguicss']; + } } -} ?> <!DOCTYPE html> @@ -234,11 +239,14 @@ if ($local_ip == false) { } } +// For the login form, get the settings of no particular user. +// That ensures we will use the system default theme for the login form. +$user_settings = get_user_settings(""); $cssfile = "/css/pfSense.css"; -if (isset($config['system']['webgui']['webguicss'])) { - if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) { - $cssfile = "/css/" . $config['system']['webgui']['webguicss']; +if (isset($user_settings['webgui']['webguicss'])) { + if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['webguicss'])) { + $cssfile = "/css/" . $user_settings['webgui']['webguicss']; } } |
