X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FUsers.pm;h=bdad4fc9b61c19dac0b1bb4b5bc7c0ee5a709866;hb=1b1eb5ca9edbf7914f749f592a959f353a0968ca;hp=a77d93d9f10402ed8a1b573197671bb8c3066924;hpb=84d8f30ecbac4d41009e3f979526a47557f49225;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Users.pm b/lib/NDWeb/Controller/Users.pm
index a77d93d..bdad4fc 100644
--- a/lib/NDWeb/Controller/Users.pm
+++ b/lib/NDWeb/Controller/Users.pm
@@ -28,18 +28,15 @@ sub index :Path :Args(0) {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(qq{SELECT uid,username,array_to_string(array_agg(g.groupname),', ') AS groups
-		FROM users u LEFT OUTER JOIN (groupmembers gm NATURAL JOIN groups g) USING (uid)
-		WHERE uid > 0
-		GROUP BY u.uid,username
-		ORDER BY username});
+	my $query = $dbh->prepare(q{
+SELECT uid,username,pnick,array_to_string(array_agg(g.groupname),', ') AS groups
+FROM users u LEFT OUTER JOIN (groupmembers gm NATURAL JOIN groups g) USING (uid)
+WHERE uid > 0
+GROUP BY u.uid,username,pnick
+ORDER BY username
+		});
 	$query->execute;
-
-	my @users;
-	while (my $user = $query->fetchrow_hashref){
-		push @users, $user;
-	}
-	$c->stash(users => \@users);
+	$c->stash(users => $query->fetchall_arrayref({}));
 }
 
 sub edit : Local {
@@ -130,7 +127,7 @@ sub findUser : Private {
 
 	my $query = $dbh->prepare(q{
 SELECT uid,username,hostmask,attack_points,defense_points,scan_points,humor_points,info, email, sms
-	,COALESCE(coords(x,y,z),'') AS planet
+	,COALESCE(coords(x,y,z),'') AS planet, pid
 FROM users u LEFT OUTER JOIN current_planet_stats p USING (pid)
 WHERE uid = ?;
 		});