Clean up get_preferences a little bit

Don't use userid as some sort of weird flag value. Especially when
your flag value is a valid value for userid. Just...no.

2 files changed, 8 insertions, 9 deletions

diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 84fb700e..4b283d62 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -193,17 +193,15 @@ class User extends database_object {
 	 * []['prefs'] = array(array('name','display','value'));
 	 * []['admin'] = t/f value if this is an admin only section
 	 */
-	function get_preferences($user_id=0,$type=0) {
+	function get_preferences($type = 0, $system = false) {
 
 		// Fill out the user id
-		$user_id = $user_id ? Dba::escape($user_id) : Dba::escape($this->id);
+		$user_id = $system ? Dba::escape(-1) : Dba::escape($this->id);
 
-		if ($user_id != '-1') {
+		if (!$system) {
 			$user_limit = "AND preference.catagory != 'system'";
 		}
 
-		if (!Config::get('use_auth')) { $user_id = '-1'; }
-
 		if ($type != '0') {
 			$user_limit = "AND preference.catagory = '" . Dba::escape($type) . "'";
 		}
diff --git a/preferences.php b/preferences.php
index e58af2a5..47a81be2 100644
--- a/preferences.php
+++ b/preferences.php
@@ -44,6 +44,7 @@ switch($_REQUEST['action']) {
 		/* Reset the Theme */
 		if ($_POST['method'] == 'admin') {
 			$user_id = '-1';
+			$system = true;
 			$fullname = _('Server');
 			$_REQUEST['action'] = 'admin';
 		}
@@ -56,7 +57,7 @@ switch($_REQUEST['action']) {
 		update_preferences($user_id);
 		Preference::init();
 
-		$preferences = $GLOBALS['user']->get_preferences($user_id,$_REQUEST['tab']);
+		$preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], $system);
 	break;
 	case 'admin_update_preferences':
 		// Make sure only admins here
@@ -80,7 +81,7 @@ switch($_REQUEST['action']) {
 			exit;
 		}
 		$fullname= _('Server');
-		$preferences = $GLOBALS['user']->get_preferences(-1,$_REQUEST['tab']);
+		$preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], true);
 	break;
 	case 'user':
 		if (!Access::check('interface','100')) {
@@ -89,7 +90,7 @@ switch($_REQUEST['action']) {
 		}
 		$client = new User($_REQUEST['user_id']);
 		$fullname = $client->fullname;
-		$preferences = $client->get_preferences(0,$_REQUEST['tab']);
+		$preferences = $client->get_preferences($_REQUEST['tab']);
 	break;
 	case 'update_user':
 		// Make sure we're a user and they came from the form
@@ -122,7 +123,7 @@ switch($_REQUEST['action']) {
 	break;
 	default:
 		$fullname = $GLOBALS['user']->fullname;
-		$preferences = $GLOBALS['user']->get_preferences(0,$_REQUEST['tab']);
+		$preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab']);
 	break;
 } // End Switch Action