X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/07b86e486dc9afa2f10ba50c85e2c1b108128892..v3.9-8-g882347cba8:/login/list.php

diff --git a/login/list.php b/login/list.php
index 4883da6..698b805 100644
--- a/login/list.php
+++ b/login/list.php
@@ -8,10 +8,19 @@ foreach ($users as $col => $userdir) {
 	$users[$col] = new User($userdir);
 }
 
-if (@$Place['order'] == 'seen') {
-	$order = array_map(function ($col) { return $col->seen; }, $users);
-#	$order = array_column($users, 'seen');  #TODO php7 simplification
-	array_multisort($order, SORT_DESC, SORT_NUMERIC, $users);
+if (isset($Place['order'])) {
+	$ordercol = $Place['order'];
+	$order = array_map(function ($row) use ($ordercol) {
+		return $row->$ordercol;
+	}, $users);
+#	$order = array_column($users, $ordercol);  #TODO php7 simplification
+	if ($ordercol == 'seen') {
+		array_multisort($order, SORT_DESC, SORT_NUMERIC, $users);
+		$users = array_intersect_key($users, array_filter($order));
+	}
+	else {
+		array_multisort($order, SORT_ASC, SORT_NATURAL, $users);
+	}
 }
 
 if (isset($Place['n'])) {
@@ -29,7 +38,7 @@ print ">\n";
 
 foreach ($users as $user) {
 	$name = $user->name ?: $user->login;
-	if (!empty($GLOBALS['User']['admin'])) {
+	if ($GLOBALS['User'] and $GLOBALS['User']->admin) {
 		$link = '/login/edit/'.$user->login;
 		$name = sprintf('<a href="%s">%s</a>', $link, $name);
 	}
@@ -56,8 +65,9 @@ foreach ($users as $user) {
 		# continue to default
 	default:
 		if ($user->admin) {
-			$name .= ' <em>(beheerder)</em>';
+			$name .= ' <span class="icon admin" title="beheerder">&#x1F527;</span>';
 		}
+		$name = "<div>$name</div>";
 	}
 
 	print "<li>$name</li>\n";