[phpBT-dev] CVS: phpbt query.php,1.75,1.76

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

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

Modified Files:
	query.php 
Log Message:
Fix a bug with the saved queries on windows, and return to the correct query page when deleting a saved query

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- query.php	8 Jun 2002 20:13:03 -0000	1.75
+++ query.php	8 Jun 2002 20:28:30 -0000	1.76
@@ -25,11 +25,15 @@
 include 'include.php';
 
 function delete_saved_query($queryid) {
-	global $db, $u, $me;
+	global $db, $u, $me, $_gv;
 	
 	$db->query("delete from ".TBL_SAVED_QUERY." where user_id = $u 
 		and saved_query_id = $queryid");
-	header("Location: $me?op=query&form=advanced");
+	if (!empty($_gv['form']) and $_gv['form'] == 'advanced') {
+		header("Location: $me?op=query&form=advanced");
+	} else {
+		header("Location: $me?op=query");
+	}
 }
 
 function show_query() {
@@ -220,7 +224,7 @@
 	}
 	// Save the query if requested
 	if (!empty($savedqueryname)) {
-		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\\1', $HTTP_SERVER_VARS['QUERY_STRING']);
+		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\1', $HTTP_SERVER_VARS['QUERY_STRING']);
 		$nextid = $db->getOne("select max(saved_query_id)+1 from ".TBL_SAVED_QUERY." where user_id = $u");
 		$nextid = $nextid ? $nextid : 1;
 		$db->query("insert into ".TBL_SAVED_QUERY.