arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Email address fix for user_list (now show accounts.username and accounts.email)

Browse Source
This commit is contained in:
james 2011-01-28 18:01:31 +00:00
parent 552ce74d96
commit 349af780ed
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/user_list.php
View File

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