From 349af780eda1d0dc23283c5818460276921185ab Mon Sep 17 00:00:00 2001
From: james <james>
Date: Fri, 28 Jan 2011 18:01:31 +0000
Subject: [PATCH] Email address fix for user_list (now show accounts.username
 and accounts.email)

---
 admin/user_list.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/user_list.php b/admin/user_list.php
index 5a33111..d1679fc 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -185,13 +185,16 @@ function neweditor()
 
 	$querystr =
 		"SELECT users.*, 
+				accounts.username,
+				accounts.email AS emailaddress,
 				user_roles.accounts_id, user_roles.roles_id, user_roles.active, user_roles.complete,
 				roles.type,
 				conferences.name AS conference_name
 		FROM users
 		JOIN user_roles ON user_roles.users_id = users.id
 		JOIN roles ON user_roles.roles_id=roles.id
-		JOIN conferences ON users.conferences_id = conferences.id ";
+		JOIN conferences ON users.conferences_id = conferences.id
+		JOIN accounts ON user_roles.accounts_id=accounts.id";
 
 	if(count($clauses) > 0){
 		$querystr .= " WHERE " . implode(' AND ', $clauses) . " ";
@@ -216,6 +219,7 @@ function neweditor()
 	echo "<thead>";
 	echo "<tr>";
 	echo " <th>".i18n("Name")."</th>";
+	echo " <th>".i18n("Username")."</th>";
 	echo " <th>".i18n("Email Address")."</th>";
 	echo " <th>".i18n("Conference")."</th>";
 //	echo " <th>".i18n("Type(s)")."</th>";
@@ -252,7 +256,8 @@ function neweditor()
 		echo "<a href=\"#\" onclick=\"return openeditor({$r['id']})\">$name</a>";
 		echo "</td>";
 
-		echo "<td>{$r['email']}</td>";
+		echo "<td>{$r['username']}</td>";
+		echo "<td>{$r['emailaddress']}</td>";
 		echo "<td>{$r['conference_name']}</td>";
 
 		$complete = false;