cvs: php-master-web /manage users.php
| From: | jim winstead | Date: | Thu, 15 Nov 2001 00:55:06 +0000 |
| Subject: | cvs: php-master-web /manage users.php | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-7409@lists.php.net to get a copy of this message | ||
jimw Wed Nov 14 19:55:06 2001 EDT
Modified files:
/php-master-web/manage users.php
Log:
integrate the unapproved stuff a little more tightly
Index: php-master-web/manage/users.php
diff -u php-master-web/manage/users.php:1.13 php-master-web/manage/users.php:1.14
--- php-master-web/manage/users.php:1.13 Wed Nov 14 19:31:20 2001
+++ php-master-web/manage/users.php Wed Nov 14 19:55:05 2001
@@ -197,8 +197,13 @@
$limit = "LIMIT $begin,$max";
$orderby = $order ? "ORDER BY $order" : "";
-$searchby = $search ? "WHERE MATCH(name,email,username) AGAINST ('$search') OR
MATCH(note) AGAINST ('$search')" : "";
-if (!$searchby && $unapproved) $searchby = 'WHERE username IS NOT NULL AND NOT
cvsaccess';
+$searchby = $search ? "WHERE (MATCH(name,email,username) AGAINST ('$search') OR
MATCH(note) AGAINST ('$search'))" : "";
+if (!$searchby && $unapproved) {
+ $searchby = 'WHERE (username IS NOT NULL AND NOT cvsaccess)';
+}
+elseif ($unapproved) {
+ $searchby .= ' AND (username IS NOT NULL AND NOT cvsaccess)';
+}
$query = "SELECT DISTINCT COUNT(users.userid) FROM users";
if ($searchby)
@@ -219,6 +224,7 @@
"begin" => $begin,
"max" => $max,
"full" => $full,
+ "unapproved" => $unapproved,
);
show_prev_next($begin,mysql_num_rows($res),$max,$total,$extra);