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

Simplify the user list and make it work again

Browse Source
This commit is contained in:
james 2010-12-06 20:26:39 +00:00
parent 39ff0dd2ce
commit e278505bc0
1 changed files with 59 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
admin/user_list.php
View File

@ -67,7 +67,7 @@ function openeditor(id)
{ {
if(id) currentid=id; if(id) currentid=id;
window.open("user_editor_window.php?id="+currentid,"UserEditor","location=no,menubar=no,directories=no,toolbar=no,width=1000,height=640,scrollbars=yes"); window.open("user_editor_window.php?users_id="+currentid,"UserEditor","location=no,menubar=no,directories=no,toolbar=no,width=1000,height=640,scrollbars=yes");
return false; return false;
} }
@ -108,7 +108,6 @@ function neweditor()
</script> </script>
<? <?
echo "<div class=\"notice\">"; echo "<div class=\"notice\">";
echo "<a id=\"optionstext\" onclick=\"toggleoptions();return false;\">- ".i18n('Show Display Options')."</a>"; echo "<a id=\"optionstext\" onclick=\"toggleoptions();return false;\">- ".i18n('Show Display Options')."</a>";
@ -119,7 +118,7 @@ function neweditor()
$x = 0; $x = 0;
foreach($user_what as $k=>$v ) { foreach($user_what as $k=>$v ) {
$sel = (in_array($k, $show_types)) ? 'checked="checked"' : ''; $sel = (in_array($k, $show_types)) ? 'checked="checked"' : '';
echo "<td><input type=\"checkbox\" name=\"show_types[]\" value=\"$k\" $sel >".i18n($v)."</input></td>"; echo "<td><input type=\"radio\" name=\"show_types[]\" value=\"$k\" $sel >".i18n($v)."</input></td>";
if($x) echo "</tr><tr><td></td>"; if($x) echo "</tr><tr><td></td>";
$x = ~$x; $x = ~$x;
} }
@ -176,29 +175,39 @@ function neweditor()
/* Grab a list of users */ /* Grab a list of users */
$clauses = array(); $clauses = array();
$roles = array(); $showroles = array();
foreach($show_types as $t){ foreach($show_types as $t){
$roles[] = "type = '$t'"; $showroles[] = "type = '$t'";
} }
if(count($roles) > 0) $clauses[] = 'ur.roles_id IN(SELECT id FROM roles WHERE ' . implode(' OR ', $roles) . ')'; if(count($showroles) > 0) $clauses[] = 'user_roles.roles_id IN(SELECT id FROM roles WHERE ' . implode(' OR ', $showroles) . ')';
if($show_complete == 'yes') $clauses[] = 'ur.complete = "yes"'; if($show_complete == 'yes') $clauses[] = 'user_roles.complete = "yes"';
if($show_all == 'no') $clauses[] = "u1.conferences_id={$conference['id']}"; if($show_all == 'no') $clauses[] = "users.conferences_id={$conference['id']}";
$querystr = $querystr =
"SELECT u1.id as userid, u1.*, ur.*, conferences.name AS conference_name " . "SELECT users.*,
"FROM users u1 " . user_roles.accounts_id, user_roles.roles_id, user_roles.active, user_roles.complete,
"LEFT JOIN user_roles ur ON ur.users_id = u1.id " . roles.type,
"JOIN conferences ON u1.conferences_id = conferences.id "; 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 ";
if(count($clauses) > 0){ if(count($clauses) > 0){
$querystr .= "WHERE " . implode(' AND ', $clauses) . " "; $querystr .= " WHERE " . implode(' AND ', $clauses) . " ";
} }
$querystr .= $querystr .= "
"GROUP BY u1.accounts_id " . ORDER BY lastname ASC, firstname ASC, conferences_id DESC ";
"HAVING u1.deleted = 'no' " .
"ORDER BY lastname ASC, firstname ASC, conferences_id DESC "; /*
echo $querystr;
echo "<br />\n";
echo "<br />\n";
*/
$q = mysql_query($querystr); $q = mysql_query($querystr);
echo mysql_error();
echo "<br />\n";
$num = mysql_num_rows($q); $num = mysql_num_rows($q);
echo i18n("Listing %1 people total. See the bottom for breakdown by complete status",array($num)); echo i18n("Listing %1 people total. See the bottom for breakdown by complete status",array($num));
@ -209,7 +218,7 @@ function neweditor()
echo " <th>".i18n("Name")."</th>"; echo " <th>".i18n("Name")."</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>";
echo " <th>".i18n("Active")."</th>"; echo " <th>".i18n("Active")."</th>";
echo " <th>".i18n("Complete")."</th>"; echo " <th>".i18n("Complete")."</th>";
echo " <th>".i18n("Actions")."</th>"; echo " <th>".i18n("Actions")."</th>";
@ -228,19 +237,11 @@ function neweditor()
$tally['inactive']['na'] = 0; $tally['inactive']['na'] = 0;
while($r=mysql_fetch_assoc($q)) { while($r=mysql_fetch_assoc($q)) {
// get the role data for this user // get the role data for this user
$roleData = array(); echo "<tr><td>";
$roleQuery = mysql_query("SELECT * FROM roles JOIN user_roles ON user_roles.roles_id = roles.id WHERE user_roles.users_id = " . $r['userid']);
while($dat = mysql_fetch_assoc($roleQuery)){
//print_r($roleData);
$roleData[] = $dat;
$roleTypes[] = $dat['type'];
}
$span = count($roleData) > 1 ? "rowspan=\"".count($roleData)."\"" : '';
echo "<tr><td $span>";
$name = "{$r['firstname']} {$r['lastname']}"; $name = "{$r['firstname']} {$r['lastname']}";
if(in_array('fair', $roleTypes)) {
if($r['type']=='fair') {
$qq = mysql_query("SELECT * FROM fairs WHERE id = " . $r['fairs_id']); $qq = mysql_query("SELECT * FROM fairs WHERE id = " . $r['fairs_id']);
echo $qq.";<br/>"; echo $qq.";<br/>";
$rr = mysql_fetch_assoc($qq); $rr = mysql_fetch_assoc($qq);
@ -251,49 +252,39 @@ 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 $span>{$r['email']}</td>"; echo "<td>{$r['email']}</td>";
echo "<td>{$r['conference_name']}</td>";
echo "<td $span>{$r['conference_name']}</td>";
$first = true;
$complete = false; $complete = false;
$incomplete = false; $incomplete = false;
foreach($roleData as $roleData) { echo "<td>";
if(!$first) echo '</tr><tr>'; if($r["active"] == 'yes') {
echo "<td>{$roleData['name']}</td>"; echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>";
$userstate = 'active';
echo "<td>"; } else {
if($roleData["active"] == 'yes') { echo "<div class=\"error\" align=\"center\">".i18n("no")."</div>";
echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>"; $userstate = 'inactive';
$userstate = 'active';
} else {
echo "<div class=\"error\" align=\"center\">".i18n("no")."</div>";
$userstate = 'inactive';
}
echo "</td>";
echo "<td>";
if(in_array($roleData['type'], array('parent','committee','alumni','mentor','fair'))) {
/* Do nothing, there's nothing to complete */
} else if($roleData["complete"] == 'yes') {
echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>";
$complete = true;
} else {
echo "<div class=\"error\" align=\"center\">".i18n("no")."</div>";
$incomplete = true;
}
echo "</td>";
if($first) {
/* Finish off the the first line */
echo "<td $span align=\"center\">";
echo "<a href=\"#\" onclick=\"return openeditor({$r['id']})\"><img border=0 src=\"{$config['SFIABDIRECTORY']}/images/16/edit.{$config['icon_extension']}\"></a>&nbsp;";
echo "<a onclick=\"return confirmClick('Are you sure you wish to completely delete this user?')\" href=\"user_list.php?action=remove&uid={$r['id']}\"><img border=0 src=\"{$config['SFIABDIRECTORY']}/images/16/button_cancel.{$config['icon_extension']}\"></a>";
echo "</td>";
}
$first = false;
} }
echo "</td>";
echo "<td>";
if(in_array($r['type'], array('parent','committee','alumni','mentor','fair','admin','config'))) {
/* Do nothing, there's nothing to complete */
} else if($r["complete"] == 'yes') {
echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>";
$complete = true;
} else {
echo "<div class=\"error\" align=\"center\">".i18n("no")."</div>";
$incomplete = true;
}
echo "</td>";
/* Finish off the the first line */
echo "<td align=\"center\">";
echo "<a href=\"#\" onclick=\"return openeditor({$r['id']})\"><img border=0 src=\"{$config['SFIABDIRECTORY']}/images/16/edit.{$config['icon_extension']}\"></a>&nbsp;";
echo "<a onclick=\"return confirmClick('Are you sure you wish to completely delete this user?')\" href=\"user_list.php?action=remove&uid={$r['id']}\"><img border=0 src=\"{$config['SFIABDIRECTORY']}/images/16/button_cancel.{$config['icon_extension']}\"></a>";
echo "</td>";
echo '</tr>'; echo '</tr>';
if($complete){ if($complete){