[phpBT-dev] CVS: phpbt query.php,1.53,1.54

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

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

Modified Files:
	query.php 
Log Message:
Removing the need for register_globals = on

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- query.php	2002/01/19 15:11:25	1.53
+++ query.php	2002/01/19 17:20:11	1.54
@@ -33,8 +33,7 @@
 }
 
 function show_query() {
-	global $q, $t, $status, $resolution, $os, $priority, $severity, $TITLE, $u,
-		$perm, $auth;
+	global $q, $t, $TITLE, $u, $perm, $auth;
 	
 	$nq = new dbclass;
 	$js = '';
@@ -101,11 +100,11 @@
 	
 	$t->set_var(array(
 		'js' => $js,
-		'status' => build_select('status',$status),
-		'resolution' => build_select('resolution',$resolution),
+		'status' => build_select('status'),
+		'resolution' => build_select('resolution'),
 		'os' => build_select('os',-1), // Prevent the OS regex selection
-		'priority' => build_select('priority',$priority),
-		'severity' => build_select('severity',$severity),
+		'priority' => build_select('priority'),
+		'severity' => build_select('severity'),
 		'projects' => build_select('project'),
 		'TITLE' => $TITLE['bugquery']
 		));
@@ -195,17 +194,20 @@
 }
 
 function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
-	global $me, $q, $t, $selrange, $order, $sort, $query, 
-		$page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $auth, 
-		$default_db_fields, $all_db_fields, $_sv;
+	global $me, $q, $t, $select, $TITLE, $STRING, $_gv, $u, $auth, 
+		$default_db_fields, $all_db_fields, $_sv, $HTTP_SERVER_VARS;
 
 	$t->set_file('content','buglist.html');
 	$t->set_block('content','row','rows');
 	$t->set_block('row','col','cols');
 	
+	extract($_gv);
+	if (!isset($page)) {
+		$page = 1;
+	}
 	// Save the query if requested
-	if ($savedqueryname) {
-		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\\1', $GLOBALS['QUERY_STRING']);
+	if (!empty($savedqueryname)) {
+		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\\1', $HTTP_SERVER_VARS['QUERY_STRING']);
 		$q->query("insert into ".TBL_SAVED_QUERY.
 			" (saved_query_id, user_id, saved_query_name, saved_query_string) 
 			values (".$q->nextid(TBL_SAVED_QUERY).", $u, '$savedqueryname', '$savedquerystring')");
@@ -368,8 +370,8 @@
 if (isset($_gv['op'])) switch($_gv['op']) {
 	case 'query' : show_query(); break;
 	case 'doquery' : $_sv['queryinfo'] = array(); list_items(); break;
-	case 'delquery' : delete_saved_query($queryid); break;
-	case 'mybugs' : list_items($assignedto, $reportedby, $open); break;
+	case 'delquery' : delete_saved_query($_gv['queryid']); break;
+	case 'mybugs' : list_items($_gv['assignedto'], $_gv['reportedby'], $_gv['open']); break;
 	default : show_query(); break;
 }
 else list_items($assignedto, $reportedby, $open);