From b2f8165a59cb41e95e2000e377fcdb715bb037e4 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Wed, 9 Apr 2008 00:34:08 +0000
Subject: [PATCH] remove user enable / disable in 2.2 too

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@794 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/user.class.php    | 13 -------------
 core/util.inc.php      |  2 +-
 ext/upgrade/schema.xml |  1 -
 ext/user/main.php      |  2 --
 ext/user/theme.php     |  2 --
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/core/user.class.php b/core/user.class.php
index 0174b2d4..08519f0a 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -8,7 +8,6 @@ class User {
 	var $email;
 	var $join_date;
 	var $days_old;
-	var $enabled;
 	var $admin;
 	
 	public function User($row) {
@@ -17,7 +16,6 @@ class User {
 		$this->email = $row['email'];
 		$this->join_date = $row['joindate'];
 		$this->days_old = $row['days_old'];
-		$this->enabled = ($row['enabled'] == 'Y');
 		$this->admin = ($row['admin'] == 'Y');
 	}
 
@@ -26,17 +24,6 @@ class User {
 		return ($this->id == $config->get_int('anon_id'));
 	}
 
-	public function is_enabled() {
-		return $this->enabled;
-	}
-
-	public function set_enabled($enabled) {
-		global $database;
-		
-		$yn = $enabled ? 'Y' : 'N';
-		$database->Execute("UPDATE users SET enabled=? WHERE id=?", array($yn, $this->id));
-	}
-
 	public function is_admin() {
 		return $this->admin;
 	}
diff --git a/core/util.inc.php b/core/util.inc.php
index 57bbe3db..13272546 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -508,7 +508,7 @@ function _get_user() {
 	$user = null;
 	if(isset($_COOKIE["shm_user"]) && isset($_COOKIE["shm_session"])) {
 	    $tmp_user = $database->get_user_session($_COOKIE["shm_user"], $_COOKIE["shm_session"]);
-		if(!is_null($tmp_user) && $tmp_user->is_enabled()) {
+		if(!is_null($tmp_user)) {
 			$user = $tmp_user;
 		}
 		
diff --git a/ext/upgrade/schema.xml b/ext/upgrade/schema.xml
index 23db4206..53db3704 100644
--- a/ext/upgrade/schema.xml
+++ b/ext/upgrade/schema.xml
@@ -38,7 +38,6 @@
 		<field name="name" type="C" size="32"><notnull/></field>
 		<field name="pass" type="C" size="32"></field>
 		<field name="joindate" type="T"><notnull/></field>
-		<field name="enabled" type="C" size="1"><notnull/><default value="Y"/></field>
 		<field name="admin" type="C" size="1"><notnull/><default value="N"/></field>
 		<field name="email" type="C" size="255"></field>
 		<index name="users__name"><col>name</col><unique/></index>
diff --git a/ext/user/main.php b/ext/user/main.php
index 42362416..a63e9ac1 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -305,11 +305,9 @@ class UserPage extends Extension {
 		}
 		else {
 			$admin = (isset($_POST['admin']) && ($_POST['admin'] == "on"));
-			$enabled = (isset($_POST['enabled']) && ($_POST['enabled'] == "on"));
 			
 			$duser = $database->get_user_by_id($_POST['id']);
 			$duser->set_admin($admin);
-			$duser->set_enabled($enabled);
 
 			$page->set_mode("redirect");
 			if($duser->id == $user->id) {
diff --git a/ext/user/theme.php b/ext/user/theme.php
index e5460702..9ace571c 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -168,13 +168,11 @@ class UserPageTheme extends Themelet {
 
 		$i_user_id = int_escape($duser->id);
 		$h_is_admin = $duser->is_admin() ? " checked" : "";
-		$h_is_enabled = $duser->is_enabled() ? " checked" : "";
 
 		$html = "
 			<form action='".make_link("user_admin/set_more")."' method='POST'>
 			<input type='hidden' name='id' value='$i_user_id'>
 			Admin: <input name='admin' type='checkbox'$h_is_admin>
-			<br>Enabled: <input name='enabled' type='checkbox'$h_is_enabled>
 			<p><input type='submit' value='Set'>
 			</form>
 			";