forked from science-ation/science-ation
Simplify the user list and make it work again
This commit is contained in:
james
parent
39ff0dd2ce
commit
e278505bc0
@ -67,7 +67,7 @@ function openeditor(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;
|
||||
|
||||
}
|
||||
@ -108,7 +108,6 @@ function neweditor()
|
||||
</script>
|
||||
|
||||
<?
|
||||
|
||||
echo "<div class=\"notice\">";
|
||||
echo "<a id=\"optionstext\" onclick=\"toggleoptions();return false;\">- ".i18n('Show Display Options')."</a>";
|
||||
|
||||
@ -119,7 +118,7 @@ function neweditor()
|
||||
$x = 0;
|
||||
foreach($user_what as $k=>$v ) {
|
||||
$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>";
|
||||
$x = ~$x;
|
||||
}
|
||||
@ -176,29 +175,39 @@ function neweditor()
|
||||
|
||||
/* Grab a list of users */
|
||||
$clauses = array();
|
||||
$roles = array();
|
||||
$showroles = array();
|
||||
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($show_complete == 'yes') $clauses[] = 'ur.complete = "yes"';
|
||||
if($show_all == 'no') $clauses[] = "u1.conferences_id={$conference['id']}";
|
||||
if(count($showroles) > 0) $clauses[] = 'user_roles.roles_id IN(SELECT id FROM roles WHERE ' . implode(' OR ', $showroles) . ')';
|
||||
if($show_complete == 'yes') $clauses[] = 'user_roles.complete = "yes"';
|
||||
if($show_all == 'no') $clauses[] = "users.conferences_id={$conference['id']}";
|
||||
|
||||
$querystr =
|
||||
"SELECT u1.id as userid, u1.*, ur.*, conferences.name AS conference_name " .
|
||||
"FROM users u1 " .
|
||||
"LEFT JOIN user_roles ur ON ur.users_id = u1.id " .
|
||||
"JOIN conferences ON u1.conferences_id = conferences.id ";
|
||||
"SELECT users.*,
|
||||
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 ";
|
||||
|
||||
if(count($clauses) > 0){
|
||||
$querystr .= "WHERE " . implode(' AND ', $clauses) . " ";
|
||||
$querystr .= " WHERE " . implode(' AND ', $clauses) . " ";
|
||||
}
|
||||
|
||||
$querystr .=
|
||||
"GROUP BY u1.accounts_id " .
|
||||
"HAVING u1.deleted = 'no' " .
|
||||
"ORDER BY lastname ASC, firstname ASC, conferences_id DESC ";
|
||||
$querystr .= "
|
||||
ORDER BY lastname ASC, firstname ASC, conferences_id DESC ";
|
||||
|
||||
/*
|
||||
echo $querystr;
|
||||
echo "<br />\n";
|
||||
echo "<br />\n";
|
||||
*/
|
||||
$q = mysql_query($querystr);
|
||||
echo mysql_error();
|
||||
echo "<br />\n";
|
||||
$num = mysql_num_rows($q);
|
||||
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("Email Address")."</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("Complete")."</th>";
|
||||
echo " <th>".i18n("Actions")."</th>";
|
||||
@ -228,19 +237,11 @@ function neweditor()
|
||||
$tally['inactive']['na'] = 0;
|
||||
while($r=mysql_fetch_assoc($q)) {
|
||||
// get the role data for this user
|
||||
$roleData = array();
|
||||
$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>";
|
||||
echo "<tr><td>";
|
||||
|
||||
$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']);
|
||||
echo $qq.";<br/>";
|
||||
$rr = mysql_fetch_assoc($qq);
|
||||
@ -251,49 +252,39 @@ function neweditor()
|
||||
echo "<a href=\"#\" onclick=\"return openeditor({$r['id']})\">$name</a>";
|
||||
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;
|
||||
$incomplete = false;
|
||||
foreach($roleData as $roleData) {
|
||||
if(!$first) echo '</tr><tr>';
|
||||
echo "<td>{$roleData['name']}</td>";
|
||||
|
||||
echo "<td>";
|
||||
if($roleData["active"] == 'yes') {
|
||||
echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>";
|
||||
$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> ";
|
||||
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>";
|
||||
if($r["active"] == 'yes') {
|
||||
echo "<div class=\"happy\" align=\"center\">".i18n("yes")."</div>";
|
||||
$userstate = 'active';
|
||||
} else {
|
||||
echo "<div class=\"error\" align=\"center\">".i18n("no")."</div>";
|
||||
$userstate = 'inactive';
|
||||
}
|
||||
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> ";
|
||||
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>';
|
||||
|
||||
if($complete){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user