[phpBT-dev] CVS: phpbt query.php,1.61,1.62 user.php,1.22,1.23

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

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

Modified Files:
	query.php user.php 
Log Message:
Trying to solve some session problems

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- query.php	20 Mar 2002 20:02:51 -0000	1.61
+++ query.php	27 Mar 2002 17:52:00 -0000	1.62
@@ -151,7 +151,7 @@
 
 function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
 	global $me, $db, $t, $select, $TITLE, $STRING, $_gv, $u, 
-		$default_db_fields, $all_db_fields, $_sv, $HTTP_SERVER_VARS;
+		$default_db_fields, $all_db_fields, $HTTP_SESSION_VARS, $HTTP_SERVER_VARS;
 
 	$t->set_file('content','buglist.html');
 	$t->set_block('content','row','rows');
@@ -171,32 +171,32 @@
 			values ($nextid, $u, '$savedqueryname', '$savedquerystring')");
 	}
 	if (!isset($order)) { 
-		if (isset($_sv['queryinfo']['order'])) {
-			$order = $_sv['queryinfo']['order'];
-			$sort = $_sv['queryinfo']['sort'];
+		if (isset($HTTP_SESSION_VARS['queryinfo']['order'])) {
+			$order = $HTTP_SESSION_VARS['queryinfo']['order'];
+			$sort = $HTTP_SESSION_VARS['queryinfo']['sort'];
 		} else {
 			$order = 'bug_id'; 
 			$sort = 'asc'; 
 		}
 	}
-	$_sv['queryinfo']['order'] = $order;
-	$_sv['queryinfo']['sort'] = $sort;
+	$HTTP_SESSION_VARS['queryinfo']['order'] = $order;
+	$HTTP_SESSION_VARS['queryinfo']['sort'] = $sort;
 	
-	if (empty($_sv['queryinfo']['query']) or isset($op)) {
-		$_sv['queryinfo']['query'] = build_query($assignedto, $reportedby, $open);
+	if (empty($HTTP_SESSION_VARS['queryinfo']['query']) or isset($op)) {
+		$HTTP_SESSION_VARS['queryinfo']['query'] = build_query($assignedto, $reportedby, $open);
 	}
 	
 	if (!session_is_registered('queryinfo')) {
 		session_register('queryinfo');
-		$_sv['queryinfo'] = array();
+		$HTTP_SESSION_VARS['queryinfo'] = array();
 	}
 	
 	$nr = $db->getOne('select count(*) from '.TBL_BUG.' b 
 		left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id
 		left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
-		(!empty($_sv['queryinfo']['query']) ? "where {$_sv['queryinfo']['query']}": ''));
+		(!empty($HTTP_SESSION_VARS['queryinfo']['query']) ? "where {$HTTP_SESSION_VARS['queryinfo']['query']}": ''));
 
-	$_sv['queryinfo']['numrows'] = $nr;
+	$HTTP_SESSION_VARS['queryinfo']['numrows'] = $nr;
 	list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
 		"order=$order&sort=$sort");
 								
@@ -220,7 +220,7 @@
 		where b.severity_id = severity.severity_id and b.status_id = status.status_id 
 		and b.os_id = os.os_id and b.version_id = version.version_id 
 		and b.component_id = component.component_id and b.project_id = project.project_id '.
-		(!empty($_sv['queryinfo']['query']) ? "and {$_sv['queryinfo']['query']} " : '').
+		(!empty($HTTP_SESSION_VARS['queryinfo']['query']) ? "and {$HTTP_SESSION_VARS['queryinfo']['query']} " : '').
 		"order by $order $sort, bug_id asc", $llimit, $selrange);
 				
 	$headers = array(
@@ -254,7 +254,7 @@
 	}
 	
 	// Header row 
-	$db_fields = !empty($_sv['db_fields']) ? $_sv['db_fields'] :
+	$db_fields = !empty($HTTP_SESSION_VARS['db_fields']) ? $HTTP_SESSION_VARS['db_fields'] :
 		$default_db_fields;
 	foreach ($db_fields as $field) {
 		$t->set_var(array(

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- user.php	21 Mar 2002 13:44:54 -0000	1.22
+++ user.php	27 Mar 2002 17:52:01 -0000	1.23
@@ -32,9 +32,9 @@
 }
 
 function change_bug_list_columns($column_list) {
-	global $db, $u, $t, $_sv;
+	global $db, $u, $t, $HTTP_SESSION_VARS;
 	
-	$_sv['db_fields'] = $column_list;
+	$HTTP_SESSION_VARS['db_fields'] = $column_list;
 	$column_list = serialize($column_list);
 	$db->query("update ".TBL_AUTH_USER." set bug_list_fields = '$column_list' where user_id = $u");
 	//$t->set_file('content', 'columnlistchanged.html');