From a4fbff953c18ba4cc0a2ee28adbc1941555464dc Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 29 Oct 2009 17:16:47 +0000
Subject: [PATCH] Add a link to reload list (we severly need to fix this whole
 page!) Show email addresses in the management list as well, so when we add
 users and dotn give them names they wont just show blank.

---
 admin/committees.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/committees.php b/admin/committees.php
index 7c1113e..5fbe715 100644
--- a/admin/committees.php
+++ b/admin/committees.php
@@ -227,13 +227,14 @@ if($_GET['unlinkmember'] && $_GET['unlinkcommittee'])
 	echo "</td><td width=\"40\">&nbsp;</td><td>";
 
 	echo "<h4>".i18n("Add Committee Member")."</h4>\n";
-	echo "<form method=\"post\" name=\"addmember\" action=\"committees.php\">\n";
+	echo "<form method=\"post\" name=\"addmember\" action=\"committees.php\" onsubmit=\"return neweditor();\">\n";
 	echo "<table>\n";
 	echo "<tr><td>".i18n("Member Email").": </td><td>";
 	echo "<input type=\"text\" size=\"15\" name=\"add_member\" />\n";
 	echo "</td>\n";
-	echo " <td><input type=\"submit\" onclick=\"neweditor();\" value=\"".i18n("Add")."\" /></td></tr>\n";
+	echo " <td><input type=\"submit\" onclick=\"return neweditor();\" value=\"".i18n("Add")."\" /></td></tr>\n";
 	echo "</table>\n";
+	echo "<a href=\"committees.php\">".i18n("Reload committee list (needed after adding a new member)")."</a>\n";
 	echo "</form>\n";
 
 	echo "</td></tr>";
@@ -253,17 +254,18 @@ if($_GET['unlinkmember'] && $_GET['unlinkcommittee'])
 	echo "</select>";
 
 	echo "</td><td>";
-	$q=mysql_query("SELECT uid,MAX(year),firstname,lastname,deleted FROM users WHERE types LIKE '%committee%' GROUP BY uid ORDER BY firstname");
+	$q=mysql_query("SELECT uid,MAX(year),firstname,lastname,email,deleted FROM users WHERE types LIKE '%committee%' GROUP BY uid ORDER BY firstname");
 	echo "<select name=\"users_uid\">";
 	echo "<option value=\"\">".i18n("Select a Member")."</option>\n";
 	while($r=mysql_fetch_object($q))
 	{
 		if($r->deleted != 'no') continue;
 		$displayname = $r->firstname.' '.$r->lastname;
-		echo "<option value=\"$r->uid\">$displayname</option>\n";
+		echo "<option value=\"$r->uid\">$displayname ($r->email)</option>\n";
 	}
 	echo "</select>";
 
+
 	echo "</td><td>";