[phpBT-dev] CVS: phpbt query.php,1.32,1.33

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv24080

Modified Files:
	query.php 
Log Message:
Search by login or email address

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- query.php	2001/10/12 04:19:31	1.32
+++ query.php	2001/10/16 04:19:47	1.33
@@ -96,10 +96,10 @@
 }
 
 function build_query($assignedto, $reportedby, $open) {
-	global $q, $sess, $auth, $querystring, $status, $resolution, $os, $priority, 
-		$severity, $email1, $emailtype1, $emailfield1, $Title, $Description, $URL, 
-		$Title_type, $Description_type, $URL_type, $projects, $versions, $components;
+	global $q, $sess, $auth, $querystring, $_gv;
 
+	foreach ($_gv as $k => $v) { $$k = $v; }
+	
 	// Open bugs assigned to the user -- a hit list
 	if ($assignedto || $reportedby) {
 		$q->query("select status_id from ".TBL_STATUS." where status_name ".($open ? '' : 'not ')."in ('Unconfirmed', 'New', 'Assigned', 'Reopened')");
@@ -127,7 +127,7 @@
 				case 'not rlike' : 
 				case '=' : $econd = "$emailtype1 '$email1'"; break;
 			}
-			foreach($emailfield1 as $field) $equery[] = "$field.email $econd";
+			foreach($emailfield1 as $field) $equery[] = "$field.$emailsearch1 $econd";
 			$query[] = '('.delimit_list(' or ',$equery).')';
 		}
 
@@ -171,9 +171,14 @@
 		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\\1', $GLOBALS['QUERY_STRING']);
 		$q->query("insert into ".TBL_SAVED_QUERY." (user_id, saved_query_name, saved_query_string)"
 			." values ($u, '$savedqueryname', '$savedquerystring')");
+	}
+	if (!$order) { 
+		$order = 'bug_id'; 
+		$sort = 'asc'; 
+	}
+	if (!$querystring or $op) {
+		build_query($assignedto, $reportedby, $open);
 	}
-	if (!$order) { $order = 'bug_id'; $sort = 'asc'; }
-	if (!$querystring or $op) build_query($assignedto, $reportedby, $open);
 	$nr = $q->grab_field("select count(*) from ".TBL_BUG." bug"
 		." left join ".TBL_AUTH_USER." owner on bug.assigned_to = owner.user_id"
 		." left join ".TBL_AUTH_USER." reporter on bug.created_by = reporter.user_id "