[phpBT-dev] CVS: phpbt/admin user.php,1.51,1.52

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17060/admin

Modified Files:
	user.php 
Log Message:
Make the group "User" less special (don't force everyone into it)


Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/admin/user.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- user.php	22 Aug 2005 20:11:49 -0000	1.51
+++ user.php	29 Aug 2005 19:14:13 -0000	1.52
@@ -167,22 +167,30 @@
 	$filter_user = '';
 	$filter_group = '';
 	if (isset($_GET['userfilter'])) switch($_GET['userfilter']) {
-		case 1 : $filter_user = ' and u.active = 1'; break;
-		case 2 : $filter_user = ' and u.active = 0'; break;
+		case 1 : $filter_user = 'u.active = 1'; break;
+		case 2 : $filter_user = 'u.active = 0'; break;
 	}
 	if (isset($_GET['groupfilter'])) {
 		if ((int)$_GET['groupfilter'] > 0) {
-			$filter_group = ' and ug.group_id = '.(int)$_GET['groupfilter'];
+			$filter_group = 'u.user_id = ug.user_id and ug.group_id = '.(int)$_GET['groupfilter'];
 		}
 	}
-	$nr = $db->getOne("select count(distinct u.user_id) from ".TBL_AUTH_USER." u, ".TBL_USER_GROUP." ug where u.user_id = ug.user_id".$filter_user.$filter_group);
+	if ($filter_group<>'' && $filter_user<>'') {
+		$filter_group = 'and '.$filter_group;
+	}
+	$nr = $db->getOne("select count(distinct u.user_id)".
+		" from ".TBL_AUTH_USER." u ".
+		($filter_group<>'' ? ", ".TBL_USER_GROUP." ug" : "").
+		(($filter_group<>'' or $filter_user<>'') ? " where $filter_user $filter_group" : ""));
 
 	list($selrange, $llimit) = multipages($nr, $page, 
 		"order=$order&sort=$sort&userfilter=$user_filter&groupfilter=$group_filter");
 
 	$t->assign('users', $db->getAll($db->modifyLimitQuery("select distinct u.user_id, u.first_name, u.last_name, u.email, u.login, u.created_date, u.active".
-	    " from ".TBL_AUTH_USER." u, ".TBL_USER_GROUP." ug where u.user_id = ug.user_id $filter_user $filter_group".
-	    " order by $order $sort", $llimit, $selrange)));
+		" from ".TBL_AUTH_USER." u".
+		($filter_group<>'' ? ", ".TBL_USER_GROUP." ug" : "").
+		(($filter_group<>'' or $filter_user<>'') ? " where $filter_user $filter_group" : "").
+		" order by $order $sort", $llimit, $selrange)));
 
 	$headers = array(
 		'userid' => 'user_id',