Refactor to separate the framework from the app; drop message stuff, this app is just user management. Add a json view for individual users

10 files changed, 0 insertions, 410 deletions

diff --git a/src/views/pages/users/401.html.php b/src/views/pages/users/401.html.php
deleted file mode 100644
index 0a5a1ce..0000000
--- a/src/views/pages/users/401.html.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-
-$t->status('401 Unauthorized');
-$t->header('Unauthorized');
-$t->tag('h1', array(), "401: Unauthorized");
-if ($VARS['uid']===false) {
-	// Not logged in
-	$t->paragraph('You need to be logged in to view user-data.');
-} else {
-	// Logged in, so the account must not activated
-	$t->paragraph('Your account needs to be activated by an administrator '.
-	              'to view user-data.');
-}
-$t->footer();
diff --git a/src/views/pages/users/404.html.php b/src/views/pages/users/404.html.php
deleted file mode 100644
index 00f9dca..0000000
--- a/src/views/pages/users/404.html.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-$username = $VARS['username'];
-
-$t->status('404 Not Found');
-$t->header('User Not Found');
-$t->tag('h1',array(),"404: Not Found");
-$t->paragraph('No user with the name <q>'.
-              htmlentities($username).'</q> exists.');
-$t->footer();
diff --git a/src/views/pages/users/500.html.php b/src/views/pages/users/500.html.php
deleted file mode 100644
index 339fe63..0000000
--- a/src/views/pages/users/500.html.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php global $VARS;
-require_once('Database.class.php');
-$t = $VARS['template'];
-$db = Database::getInstance();
-
-$t->status('500 Internal Server Error');
-$t->header('Unknown error');
-$t->paragraph("An unknown error was encountered when creating ".
-              "the user. The username appears to be free, and ".
-              "the passwords match, so I'm assuming that the ".
-              "error is on our end. Sorry.");
-$t->paragraph("Here's a dump of the SQL error stack, it may ".
-              "help us find the issue:");
-$t->tag('pre', array(), htmlentities($db->mysql_error()));
-$t->footer();
diff --git a/src/views/pages/users/created.html.php b/src/views/pages/users/created.html.php
deleted file mode 100644
index d3027cc..0000000
--- a/src/views/pages/users/created.html.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-$username = $VARS['username'];
-
-//$t->status('201 Created');
-header('Location: '.$t->url("users/$username"));
-$t->header('User created');
-/*$t->paragraph("You can go ahead and fill out more of your ".
-              "user information, (click the @username link at ".
-              "the top) but will need to wait for an ".
-              "administrator to approve your account before ".
-              "you can really use the site.  Actually, ".
-              "filling your info out might help approval, so ".
-              "that the administrator can more easily see who ".
-              "you are.");
-*/
-$t->tag('h2',array(), $t->link($t->url("users/$username"), 'Go on to step 2'));
-$t->footer();
diff --git a/src/views/pages/users/index.csv.php b/src/views/pages/users/index.csv.php
deleted file mode 100644
index 0a69cee..0000000
--- a/src/views/pages/users/index.csv.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php global $VARS;
-$attribs = $VARS['attribs'];
-$users = $VARS['users'];
-
-function escape($value) {
-	if (is_bool($value)) {
-		return ($value?'true':'false');
-	} else {
-		$chars = "'" . '"' .  '\\' . ',';
-		return addcslashes($value, $chars);
-	}
-}
-
-$arr = array();
-foreach ($attribs as $attrib) {
-	$arr[] = escape($attrib['name']);
-}
-echo implode(',', $arr)."\n";
-
-foreach ($users as $user) {
-	$arr = array();
-	foreach ($attribs as $attrib) {
-		$props = $user[$attrib['key']];
-		$arr[] = escape($props['value']);
-	}
-	echo implode(',', $arr)."\n";
-}
diff --git a/src/views/pages/users/index.html.php b/src/views/pages/users/index.html.php
deleted file mode 100644
index 159ff76..0000000
--- a/src/views/pages/users/index.html.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-$attribs = $VARS['attribs'];
-$users = $VARS['users'];
-require_once('Login.class.php');
-
-$t->header('Users');
-
-$t->paragraph($t->link($t->url('users.csv'), "Download this as a spreadsheet.", true));
-
-$t->openTag('form', array('action'=>$t->url('users/index'),
-                          'method'=>'post'));
-
-if (Login::isLoggedIn()) {
-	$t->tag('input', array('type'=>'submit',
-	                       'value'=>'Save/Update'));
-}
-
-$t->openTag('table', array('class'=>'sortable', 'id'=>'bar'));
-
-function table_head($attribs, $t) {
-	$t->openTag('tr');
-	foreach ($attribs as $attrib) {
-		switch ($attrib['type']) {
-		case 'bool': $class = 'small'; break;
-		default: $class = ''; break;
-		}
-		$t->tag('th', array('class'=>$class), $attrib['name']);
-	}
-	if (Login::isLoggedIn()) {
-		$t->tag('th', array(), '-');
-	}
-	$t->closeTag('tr');
-}
-
-$t->openTag('thead');
-table_head($attribs, $t);
-$t->closeTag('thead');
-
-$t->openTag('tfoot');
-table_head($attribs, $t);
-$t->closeTag('tfoot');
-
-$t->openTag('tbody');
-
-foreach ($users as $user) {
-	$t->openTag('tr');
-	
-	foreach ($attribs as $attrib) {
-		$t->openTag('td');
-
-		$props = $user[$attrib['key']];
-
-		$bool = $attrib['type']=='bool';
-		if ($bool) {
-			$value = $props['value']=='true';
-		} else {
-			$value    = $props['value'];
-		}
-		$editable = $props['editable'];
-		$post_key = $props['post_key'];
-		
-		$arr = array('name'=>$post_key);
-		if (!$editable) {
-			$arr['readonly'] = 'readonly';
-			if ($bool) $arr['disabled'] = $disabled;
-		}
-		if ($bool) {
-			$t->tag('input', array('type'=>'hidden', 'name'=>$post_key, 'value'=>'false'));
-			if ($value==true) {
-				$arr['checked'] = 'checked';
-			}
-			$arr['value'] = 'true';
-			$arr['type'] = 'checkbox';
-		} else {
-			$t->tag('span', array('class'=>'cell_width'), $value);
-			$arr['value'] = $value;
-			$arr['type'] = 'text';
-		}
-		
-		$t->tag('input', array('name'=>'_old['.$arr['name'].']',
-		                       'value'=>$arr['value'],
-		                       'type'=>'hidden'));
-		$t->tag('input', $arr);
-		$t->closeTag('td');
-	}
-	
-	if (Login::isLoggedIn()) {
-		$t->openTag('td');
-		$t->link($t->url('users/'.$user['auth_name']['value']), 'More');
-		$t->closeTag('td');
-	}
-	$t->closeTag('tr');
-}
-
-$t->closeTag('tbody');
-$t->closeTag('table');
-
-if (Login::isLoggedIn()) {
-	$t->tag('input', array('type'=>'submit',
-	                       'value'=>'Save/Update'));
-}
-
-$t->footer();
diff --git a/src/views/pages/users/individual.html.php b/src/views/pages/users/individual.html.php
deleted file mode 100644
index 39360b7..0000000
--- a/src/views/pages/users/individual.html.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php global $VARS, $CONTACT_METHODS;
-$t = $VARS['template'];
-$users = $VARS['users'];
-$username = $VARS['username'];
-
-function inputText($user, $key, $label, $hint='') {
-	global $VARS; $t = $VARS['template'];
-	$current_setting = $user->getConf($key);
-	$t->inputText("user_$key", $label, $hint, $current_setting,
-	              !$user->canEdit());
-}
-function inputTextarea($user, $key, $label, $hint='') {
-	global $VARS; $t = $VARS['template'];
-	$current_setting = $user->getConf($key);
-	$t->inputTextarea("user_$key", $label, $hint, $current_setting,
-	              !$user->canEdit());
-}
-
-function inputBool($user, $key, $label, $hint='') {
-	global $VARS; $t = $VARS['template'];
-	$current_setting = $user->getConf($key)=='true';
-	$t->inputBool("user_$key", $label, $hint, $current_setting,
-	              !$user->canEdit());
-}
-
-function inputArray($user, $key, $arr) {
-	global $VARS; $t = $VARS['template'];
-	$defaults = $user->getConfArray($key);
-	
-	foreach ($arr as $value => $label) {
-		$t->inputBoolArray($key, $value, $label,
-		              in_array($value, $defaults), !$user->canEdit());
-	}
-}
-
-function inputField($user, $arr) {
-	$fieldname = $arr[0];
-	$fieldlabel = $arr[1];
-	$fieldtype = $arr[2];
-	
-	switch ($fieldtype) {
-	case 'text':
-		inputText($user, $fieldname, $fieldlabel, '');
-		break;
-	case 'textarea':
-		inputTextarea($user, $fieldname, $fieldlabel, '');
-		break; 
-	case 'paragraph':
-		global $VARS; $t = $VARS['template'];
-		$t->inputP($fieldlabel);
-		break;
-	case 'checkbox':
-		inputBool($user, $fieldname, $fieldlabel, '');
-		break;
-	}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-if (count($users)>1) {
-	$t->header("Users: $username");
-} else {
-	$t->header("User: $username");
-}
-
-foreach($users as $user) {
-$username = $user->getName();
-
-$t->tag('h1', array(), ($user->canEdit()?'Edit':'View')." User <q>$username</q> (UID: ".$user->getUID().")");
-
-if ($user->canEdit()) {
-	$t->openTag('form', array('method'=>'post',
-	                          'action'=>$t->url("users/$username")));
-} else {
-	$t->openTag('form');
-}
-
-$t->openFieldset("Login / Authentication");
-// Username ////////////////////////////////////////////////////////////////////
-if (isset($VARS['changed name']) && !$VARS['changed name']) {
-	$t->inputP("Error setting username to ".
-	           "<q>$new_name</q>. This is probably because".
-	           " a user with that name already exists.",
-	           true);
-}
-$t->inputText('auth_name','Username',
-              "This is the name you use to log in, but it is also a ".
-              "short name that is used in various places, think of it ".
-              "as a sort of <q>Twitter name</q>.",
-              $user->getName(), !$user->canEdit());
-// Password ////////////////////////////////////////////////////////////////////
-if (@$VARS['pw_updated']===true) {
-	$t->inputP('Password successfully updated.');
-}
-if (@$VARS['pw mixmatch']===true) {
-	$t->inputP("Passwords don't match.", true);
-}
-if ($user->canEdit()) $t->inputNewPassword('auth_password','Reset Password');
-////////////////////////////////////////////////////////////////////////////////
-$t->closeFieldset();
-
-$t->openFieldset("Contact");
-// TODO: I should make this a setting for admins to set.
-$hints = array('email'=>
-               "Right now you can only have one email address, ".
-               "but I'm working on making it so you can have ".
-               "multiple.",
-               'phone'=>
-               "A home phone number isn't much use here because it is ".
-               "used to text-message you (if you enable it), and ".
-               "contact you at competition."
-               );
-$use_arr = array();
-foreach ($CONTACT_METHODS as $method) {
-	inputText($user,
-	          $method->addr_slug,
-	          ucwords($method->addr_text),
-	          $hints[$method->addr_slug]);
-	$use_arr[$method->verb_slug] = ucwords($method->verb_text);
-}
-
-$t->inputP("When I recieve a message, notify me using the following methods:");
-inputArray($user, 'use', $use_arr);
-$t->closeFieldSet();
-
-foreach ($VARS['config_options'] as $groupname=>$options) {
-	$t->openFieldset($groupname);
-	foreach ($options as $option) {
-		inputField($user, $option);
-	}
-	$t->closeFieldset();
-}
-
-$t->openFieldSet('Groups');
-$group_arr = array();
-foreach ($VARS['groups'] as $group_name) {
-	$group_arr[$group_name] = ucwords($group_name);
-}
-inputArray($user, 'groups', $group_arr);
-$t->closeFieldset();
-	
-if ($user->canEdit()) {
-	$t->tag('input', array('type'=>'submit', 'value'=>'Save'));
-}
-$t->closeTag('form');
-}
-$t->footer();
diff --git a/src/views/pages/users/new-locked.html.php b/src/views/pages/users/new-locked.html.php
deleted file mode 100644
index dc7ad0d..0000000
--- a/src/views/pages/users/new-locked.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-
-$t->status('403 Forbidden');
-$t->header('Create new user');
-
-$t->paragraph("Sorry, new user registration is disabled.");
-
-$t->footer();
diff --git a/src/views/pages/users/new-logged-in.html.php b/src/views/pages/users/new-logged-in.html.php
deleted file mode 100644
index 51823fe..0000000
--- a/src/views/pages/users/new-logged-in.html.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-
-$t->header('Create new user');
-
-$t->paragraph("Dude, you're logged in, what are you doing creating an account?");
-
-$t->footer();
diff --git a/src/views/pages/users/new.html.php b/src/views/pages/users/new.html.php
deleted file mode 100644
index 9df376f..0000000
--- a/src/views/pages/users/new.html.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php global $VARS;
-$t = $VARS['template'];
-
-$t->header('Create new user');
-
-$t->openTag('form', array('method'=>'post',
-                          'action'=>$t->url('users')));
-
-$t->openFieldset("New User: Step 1");
-
-if ($VARS['userlist']) {
-	$t->inputP("If you may have already created a username, please, ".
-	           "<em>please</em> check the ".
-	           $t->link($t->url('users/'), 'user-list', true).
-	           " to find your old username, instead of creating a new ".
-	           "user. If you don't like the name, you can log in and ".
-	           "change it.");
-}
-
-if (in_array('illegal name', $VARS['errors'])) {
-	$t->inputP("That is a forbidden username.", true);
-}
-if (in_array('user exists', $VARS['errors'])) {
-	$t->inputP("A user with that name already exists.");
-}
-$t->inputText('auth_name','Username',
-              "This is the name you use to log in, but it is also a ".
-              "short name that is used in various places, think of it ".
-              "as a sort of <q>Twitter name</q>.",$VARS['username']);
-
-@$password = $VARS['password1'];
-if (in_array('pw mixmatch', $VARS['errors'])) {
-	$t->inputP("The passwords didn't match.", true);
-	$password = '';
-}
-if (in_array('no pw', $VARS['errors'])) {
-	$t->inputP("You must set a password.", true);
-	$password = '';
-}
-$t->inputNewPassword('auth_password','Password', $password);
-
-if (in_array('no email', $VARS['errors'])) {
-	$t->inputP("You must provide an email address.", true);
-}
-$t->inputText('user_email', 'Email Address',
-              'This is so that we can contact you. (duh).', $VARS['email']);
-$t->closeFieldset();
-
-foreach ($VARS['antispam_html'] as $html) {
-	echo $html;
-}
-
-$t->tag('input', array('type'=>'submit', 'value'=>'Go on to Step 2'));
-
-$t->closeTag('form');
-
-$t->footer();