Project

General

Profile

« Previous | Next » 

Revision 8bab524e

Added by Phil Davis about 9 years ago

Feature #6388 custom GUI preference settings per user

View differences:

src/etc/inc/authgui.inc
71 71
 */
72 72
$allowedpages = getAllowedPages($_SESSION['Username'], $_SESSION['user_radius_attributes']);
73 73

  
74
/*
75
 * Get user-based preference settings so they can be easily referenced.
76
 */
77
$user_settings = get_user_settings($_SESSION['Username']);
78

  
74 79
/*
75 80
 * redirect to first allowed page if requesting a wrong url
76 81
 */
......
123 128
 * determine if the user is allowed access to the requested page
124 129
 */
125 130
function display_error_form($http_code, $desc) {
126
	global $config, $g;
131
	global $config, $user_settings, $g;
127 132

  
128 133
	if (isAjax()) {
129 134
		printf(gettext('Error: %1$s Description: %2$s'), $http_code, $desc);
......
132 137

  
133 138
	$cssfile = "/css/pfSense.css";
134 139

  
135
	if (isset($config['system']['webgui']['webguicss'])) {
136
	if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) {
137
		$cssfile = "/css/" . $config['system']['webgui']['webguicss'];
140
	if (isset($user_settings['webgui']['webguicss'])) {
141
		if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['webguicss'])) {
142
			$cssfile = "/css/" . $user_settings['webgui']['webguicss'];
143
		}
138 144
	}
139
}
140 145

  
141 146
?>
142 147
<!DOCTYPE html>
......
234 239
	}
235 240
}
236 241

  
242
// For the login form, get the settings of no particular user.
243
// That ensures we will use the system default theme for the login form.
244
$user_settings = get_user_settings("");
237 245
$cssfile = "/css/pfSense.css";
238 246

  
239
if (isset($config['system']['webgui']['webguicss'])) {
240
	if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) {
241
		$cssfile = "/css/" . $config['system']['webgui']['webguicss'];
247
if (isset($user_settings['webgui']['webguicss'])) {
248
	if (file_exists("/usr/local/www/css/" . $user_settings['webgui']['webguicss'])) {
249
		$cssfile = "/css/" . $user_settings['webgui']['webguicss'];
242 250
	}
243 251
}
244 252

  

Also available in: Unified diff