Finally get around to implementing deleting users. (status=4)

1 files changed, 20 insertions, 14 deletions

diff --git a/src/controllers/Users.class.php b/src/controllers/Users.class.php
index dc89603..d799760 100644
--- a/src/controllers/Users.class.php
+++ b/src/controllers/Users.class.php
@@ -201,17 +201,13 @@ class Users extends Controller {
 		$config_options = array();
 		global $mm;
 		$mm->pluginManager()->callHook('userConfig', &$config_options);
-
+		
 		foreach ($config_options as $group=>$options) {
 			foreach ($options as $option) {
 				$this->confText($user, $option[0]);
 			}
 		}
-		/*
-		$this->confText($user, 'firstname');
-		$this->confText($user, 'lastname');
-		$this->confText($user, 'hsclass');
-		*/
+		
 		// Change contact info /////////////////////////////////////////
 		global $CONTACT_METHODS;
 		foreach ($CONTACT_METHODS as $method) {
@@ -300,6 +296,10 @@ class Users extends Controller {
 			$editable = $editable && $logged_in_user->isAdmin();
 			$value = $user->isAdmin();
 			break;
+		case 'auth_delete':
+			$editable = $editable && $logged_in_user->isAdmin();
+			$value = false;
+			break;
 		default:
 			$value = $user->getConf($key);
 			if ($value===false) $value='';
@@ -325,6 +325,8 @@ class Users extends Controller {
 		case 'auth_admin':
 			$user->setAdmin($value=='true');
 			break;
+		case 'auth_delete':
+			if ($value=='true') $user->delete();
 		default: 
 			$user->setConf($key, $value);
 			break;
@@ -335,14 +337,18 @@ class Users extends Controller {
 		return array('key'=>$key, 'name'=>$name);
 	}
 	private function getIndexAttribs() {
-		$attribs = array($this->attrib('auth_user', 'Active'),
-		                 $this->attrib('lastname','Last'),
-		                 $this->attrib('firstname','First'),
-		                 $this->attrib('hsclass','Class of'),
-		                 $this->attrib('phone','Phone number'),
-		                 $this->attrib('email','Email'),
-		                 $this->attrib('auth_name', 'Username'),
-		                 );
+		$attribs = array();
+		$attribs[] = $this->attrib('auth_user', 'Active');
+		if (Auth::getObj(Login::isLoggedIn())->isAdmin()) {
+			$attribs[] = $this->attrib('auth_admin', 'Admin');
+			$attribs[] = $this->attrib('auth_delete', 'Delete');
+		}
+		$attribs[] = $this->attrib('lastname','Last');
+		$attribs[] = $this->attrib('firstname','First');
+		$attribs[] = $this->attrib('hsclass','Class of');
+		$attribs[] = $this->attrib('phone','Phone number');
+		$attribs[] = $this->attrib('email','Email');
+		$attribs[] = $this->attrib('auth_name', 'Username');
 		return $attribs;
 	}
 }