Merge branch 'concurrent-editing' into anon-userlist

Conflicts:
	src/controllers/Users.class.php

2 files changed, 51 insertions, 105 deletions

diff --git a/src/controllers/Config.class.php b/src/controllers/Config.class.php
new file mode 100644
index 0000000..37d1f09
--- /dev/null
+++ b/src/controllers/Config.class.php
@@ -0,0 +1,30 @@
+<?php
+require_once('Auth.class.php');
+
+Router::register('config', 'Config', 'index');
+
+class Config extends Controller {
+	public function index($routed, $remainder) {
+		$uid = Login::isLoggedIn();
+		if ($uid===false || !Auth::getObj($uid)->isAdmin()) {
+			$this->http401($routed, $remainder);
+			return;
+		}
+		
+		$method = $_SERVER['REQUEST_METHOD'];
+		switch ($method) {
+		case 'PUT': $_POST = $_PUT;
+		case 'POST':
+			// We're PUTing an updated configuration.
+			$this->update();
+			break;
+		}
+		$this->show_index();
+	}
+	private function show_index() {
+		
+	}
+	private function update() {
+		
+	}
+}
diff --git a/src/controllers/Users.class.php b/src/controllers/Users.class.php
index c69701f..24bb8aa 100644
--- a/src/controllers/Users.class.php
+++ b/src/controllers/Users.class.php
@@ -1,6 +1,7 @@
 <?php
 require_once('Login.class.php');
 require_once('Auth.class.php');
+require_once('DB.class.php');
 
 Router::register('users/new'  , 'Users', 'new_user');
 Router::register('users/index', 'Users', 'index_file');
@@ -188,7 +189,7 @@ class Users extends Controller {
 				$this->showView('users/500');
 			} else {
 				Login::login($username, $password);
-				$this->setConf($uid, 'email', $vars['email']);
+				DB::set('users', $uid, 'email', $vars['email']);
 				$this->showView('users/created',
 				                array('username'=>$username));
 			}
@@ -272,50 +273,28 @@ class Users extends Controller {
 	 */
 	private function update_users() {
 		$attribs = $this->getIndexAttribs();
+		$form = new Form(null, null);
 		foreach ($attribs as $attrib) {
 			$key = $attrib['key'];
 			if (isset($_POST[$key]) && is_array($_POST[$key])) {
 				$old = $_POST['_old'][$key];
 				foreach ($_POST[$key] as $uid => $value) {
-					$doit = true;
-					$forked = false;
-					$have_old = isset($old[$uid]);
-					if ($have_old) {
-						@$value_base = $old[$uid];
-						$we_changed_it = $value_base != $value;
-						if ($we_changed_it) {
-							$user = Auth::getObj($uid);
-							$value_fork = $this->getConf($user,$key);
-							$value_fork = $value_fork['value'];
-							if ($value_fork===false) $value_fork = 'false';
-							if ($value_fork===true)  $value_fork = 'true';
-							
-							$someone_else_changed_it = $value_fork != $value_base;
-							if ($someone_else_changed_it) {
-								if ($value == $value_fork) {
-									// we might as well not have
-									$we_changed_it = false;
-								} else {
-									$forked = true;
-								}
-							}
-						}
-						if (!$we_changed_it) {
-							$doit = false;// nothing to do
-						}
-					}
-					if ($doit) {
-						$this->setConf($uid, $key, $value);
-					}
-					if ($forked) {
+					@$value_base = $old[$uid];
+					$set = DB::set('users', $uid, $key, $value, $value_base);
+					if (is_string($set)) {
 						echo "<pre>\n";
-						echo "Error: Value changed elsewhere, and I don't have real handling for this yet.\n";
+						echo "Error: Value changed elsewhere, ".
+							"and I don't have real handling ".
+							"for this yet.\n";
 						echo "UID: $uid\n";
 						echo "Name: ".$user->getName()."\n";
 						echo "Key: $key\n";
-						echo "Value: Original  : "; var_dump($value_base);
-						echo "Value: Other edit: "; var_dump($value_fork);
-						echo "Value: This edit : "; var_dump($value);
+						echo "Value: Original  : ";
+						var_dump($value_base);
+						echo "Value: Other edit: ";
+						var_dump($value_fork);
+						echo "Value: This edit : ";
+						var_dump($value);
 						echo "</pre>";
 					}
 				}
@@ -342,81 +321,18 @@ class Users extends Controller {
 		$vars['users'] = array();
 		$uids = $db->listUsers();
 		foreach ($uids as $uid) {
-			$user = Auth::getObj($uid);
 			$vars['users'][$uid] = array();
 			foreach ($vars['attribs'] as $attrib) {
 				$key = $attrib['key'];
-				$props = $this->getConf($user, $key);
+				$props = DB::get('users', $uid, $key);
 				$vars['users'][$uid][$key] = $props;
 			}
 		}
 		$this->showView('users/index', $vars);
 	}
 	
-	private function getConf($user, $key) {
-		$logged_in_user = Auth::getObj(Login::isLoggedIn());
-		$uid = $user->getUID();
-		$post_key = $key."[$uid]";
-		@$value = $_POST[$post_key];
-		$editable = $user->canEdit();
-		
-		switch ($key) {
-		case 'auth_uid':
-			$value = $user->getUID();
-			$editable = false;
-			break;
-		case 'auth_name':
-			$value = $user->getName();
-			break;
-		case 'auth_user':
-			$editable = $editable && $logged_in_user->isAdmin();
-			$value = $user->isUser();
-			break;
-		case 'auth_admin':
-			$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='';
-			break;
-		}
-		
-		return array('value'=>$value,
-		             'post_key'=>$post_key,
-		             'editable'=>$editable);
-	}
-	private function setConf($uid, $key, $value) {
-		// So, this rocks because we don't have to check permissions,
-		// the User object does that.
-		$user = Auth::getObj($uid);
-		
-		switch ($key) {
-		case 'auth_uid':
-			break;
-		case 'auth_name':
-			$user->setName($value);
-			break;
-		case 'auth_user':
-			$user->setUser($value=='true');
-			break;
-		case 'auth_admin':
-			$user->setAdmin($value=='true');
-			break;
-		case 'auth_delete':
-			if ($value=='true') $user->delete();
-		default: 
-			$user->setConf($key, $value);
-			break;
-		}
-	}
-	
-	function attrib($key, $name) {
-		return array('key'=>$key, 'name'=>$name);
+	function attrib($key, $name, $type='string') {
+		return array('key'=>$key, 'name'=>$name, 'type'=>$type);
 	}
 	private function getIndexAttribs() {
 		$user = Auth::getObj(Login::isLoggedIn());
@@ -424,10 +340,10 @@ class Users extends Controller {
 		$attribs = array();
 		if ($user->isUser()) {
 			$attribs[] = $this->attrib('auth_uid', 'UID');
-			$attribs[] = $this->attrib('auth_user', 'Active');
+			$attribs[] = $this->attrib('auth_user', 'Active', 'bool');
 			if ($user->isAdmin()) {
-				$attribs[] = $this->attrib('auth_admin', 'Admin');
-				$attribs[] = $this->attrib('auth_delete', 'Delete');
+				$attribs[] = $this->attrib('auth_admin', 'Admin', 'bool');
+				$attribs[] = $this->attrib('auth_delete', 'Delete', 'bool');
 			}
 			$attribs[] = $this->attrib('lastname','Last');
 			$attribs[] = $this->attrib('firstname','First');