Merge branch 'anon-userlist'

2 files changed, 48 insertions, 24 deletions

diff --git a/src/views/pages/users/index.html.php b/src/views/pages/users/index.html.php
index 2650c5a..159ff76 100644
--- a/src/views/pages/users/index.html.php
+++ b/src/views/pages/users/index.html.php
@@ -2,6 +2,7 @@
 $t = $VARS['template'];
 $attribs = $VARS['attribs'];
 $users = $VARS['users'];
+require_once('Login.class.php');
 
 $t->header('Users');
 
@@ -10,27 +11,34 @@ $t->paragraph($t->link($t->url('users.csv'), "Download this as a spreadsheet.",
 $t->openTag('form', array('action'=>$t->url('users/index'),
                           'method'=>'post'));
 
-$t->tag('input', array('type'=>'submit',
-                       'value'=>'Save/Update'));
+if (Login::isLoggedIn()) {
+	$t->tag('input', array('type'=>'submit',
+	                       'value'=>'Save/Update'));
+}
 
 $t->openTag('table', array('class'=>'sortable', 'id'=>'bar'));
 
-$t->openTag('thead');
-$t->openTag('tr');
-foreach ($attribs as $attrib) {
-	$t->tag('th', array(), $attrib['name']);
+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->tag('th', array(), '-');
-$t->closeTag('tr');
+
+$t->openTag('thead');
+table_head($attribs, $t);
 $t->closeTag('thead');
 
 $t->openTag('tfoot');
-$t->openTag('tr');
-foreach ($attribs as $attrib) {
-	$t->tag('th', array(), $attrib['name']);
-}
-$t->tag('th', array(), '-');
-$t->closeTag('tr');
+table_head($attribs, $t);
 $t->closeTag('tfoot');
 
 $t->openTag('tbody');
@@ -42,11 +50,15 @@ foreach ($users as $user) {
 		$t->openTag('td');
 
 		$props = $user[$attrib['key']];
-		
-		$value    = $props['value'];
+
+		$bool = $attrib['type']=='bool';
+		if ($bool) {
+			$value = $props['value']=='true';
+		} else {
+			$value    = $props['value'];
+		}
 		$editable = $props['editable'];
 		$post_key = $props['post_key'];
-		$bool = is_bool($value);
 		
 		$arr = array('name'=>$post_key);
 		if (!$editable) {
@@ -73,18 +85,20 @@ foreach ($users as $user) {
 		$t->closeTag('td');
 	}
 	
-	$t->openTag('td');
-	$t->link($t->url('users/'.$user['auth_name']['value']), 'More');
-	$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');
 
-$t->tag('input', array('type'=>'submit',
-                       'value'=>'Save/Update'));
-$t->closeTag('form');
+if (Login::isLoggedIn()) {
+	$t->tag('input', array('type'=>'submit',
+	                       'value'=>'Save/Update'));
+}
 
 $t->footer();
diff --git a/src/views/pages/users/new.html.php b/src/views/pages/users/new.html.php
index 8b6bdf8..9df376f 100644
--- a/src/views/pages/users/new.html.php
+++ b/src/views/pages/users/new.html.php
@@ -7,6 +7,16 @@ $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);
 }