From 629e998f45b0ae305a75ddef09b14dfb7c371199 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 14 Feb 2012 06:41:45 +0000
Subject: [PATCH] more work on user classes

---
 core/user.class.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/user.class.php b/core/user.class.php
index fc32e689..3e781aea 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -15,7 +15,7 @@ class User {
 	var $name;
 	var $email;
 	var $join_date;
-	var $admin;
+	var $class;
 
 	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 	* Initialisation                                               *
@@ -35,8 +35,12 @@ class User {
 		$this->name = $row['name'];
 		$this->email = $row['email'];
 		$this->join_date = $row['joindate'];
-		$this->admin = ($row['admin'] == 'Y');
 		$this->passhash = $row['pass'];
+
+		global $config;
+		if($row['admin'] == 'Y') $this->class = "admin";
+		else if($this->id != $config->get_int('anon_id')) $this->class = "user";
+		else $this->class = "anonymous";
 	}
 
 	public static function by_session(/*string*/ $name, /*string*/ $session) {
@@ -165,14 +169,7 @@ class User {
 			),
 		);
 
-		return $user_classes[$this->get_class()][$ability];
-	}
-
-	// FIXME: this should be a column in the users table
-	public function get_class() {
-		if($this->is_admin()) return "admin";
-		else if($this->is_logged_in()) return "user";
-		else return"anonymous";
+		return $user_classes[$this->class][$ability];
 	}
 
 
@@ -202,7 +199,7 @@ class User {
 	 * @retval bool
 	 */
 	public function is_admin() {
-		return $this->admin;
+		return ($this->class === "admin");
 	}
 
 	public function set_admin(/*bool*/ $admin) {