[phpBT-dev] CVS: phpbt include.php,1.33,1.34 query.php,1.20,1.21 user.php,1.10,1.11

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

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

Modified Files:
	include.php query.php user.php 
Log Message:
Bug columns still broken, but getting closer

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- include.php	2001/08/20 23:16:50	1.33
+++ include.php	2001/08/21 14:29:59	1.34
@@ -169,6 +169,7 @@
 			$this->auth['lname'] = $u['last_name'];
 			$this->auth['email'] = $u['email'];
 			$this->auth['perm'] = $select['authlevels'][$u['user_level']];
+			$this->auth['db_fields'] = unserialize($u['bug_list_fields']);
 			return $u['user_id'];
 		}
 	}

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- query.php	2001/08/20 23:16:50	1.20
+++ query.php	2001/08/21 14:29:59	1.21
@@ -158,7 +158,8 @@
 
 function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
 	global $querystring, $me, $q, $t, $selrange, $order, $sort, $query, 
-		$page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $default_db_fields;
+		$page, $op, $select, $TITLE, $STRING, $savedqueryname, $u, $auth, 
+		$default_db_fields;
 
 	$t->set_file('content','buglist.html');
 	$t->set_block('content','row','rows');
@@ -214,7 +215,9 @@
 	}
 	
 	// Header row 
-	foreach ($default_db_fields as $field => $title) {
+	$db_fields = $auth->auth['db_fields'] ? $auth->auth['db_fields'] :
+		$default_db_fields;
+	foreach ($db_fields as $field => $title) {
 		$t->set_var(array(
 			'coldata' => "<a href='{{$field}url}'>$title</a>",
 			'td-extra' => "class=\"header-col\" bgcolor=\"{{$field}color}\""
@@ -229,7 +232,7 @@
 	while ($row = $q->grab()) {
 		$bgcolor = USE_SEVERITY_COLOR ? $row['severity_color'] : 
 			((++$i % 2 == 0) ? '#dddddd' : '#ffffff');
-		foreach ($default_db_fields as $field => $title) {
+		foreach ($db_fields as $field => $title) {
 			switch ($field) {
 				case 'url' : 
 					$coldata = "<a href='{$row[$field]}'>{$row[$field]}</a>"; 
@@ -270,7 +273,7 @@
 		$t->parse('rows','row',true);
 		$t->set_var('cols', '');
 	}
-	$t->set_var('numcols', count($default_db_fields));
+	$t->set_var('numcols', count($db_fields));
 }
 
 $t->set_file('wrap','wrap.html');

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- user.php	2001/08/20 23:16:50	1.10
+++ user.php	2001/08/21 14:29:59	1.11
@@ -24,11 +24,13 @@
 include 'include.php';
 
 function change_bug_list_columns($column_list) {
-	global $q, $u, $t;
+	global $q, $u, $t, $auth;
 	
+	$auth->auth['db_fields'] = $column_list;
 	$column_list = serialize($column_list);
 	$q->query("update user set bug_list_fields = '$column_list' where user_id = $u");
-	$t->set_file('content', 'columnlistchanged.html');
+	//$t->set_file('content', 'columnlistchanged.html');
+	show_text('Your bug list column preferences have been saved');
 }
 
 function change_password($pass1, $pass2) {
@@ -79,9 +81,9 @@
 $t->set_file('wrap', 'wrap.html');
 $perm->check('User');
 
-if ($do) switch ($op) {
-	case 'changepassword' : change_password($_gv['pass1'], $_gv['pass2']); break;
-	case 'changecolumnlist' : change_bug_list_columns($_gv['column_list']); break;
+if ($do) switch ($do) {
+	case 'changepassword' : change_password($_pv['pass1'], $_pv['pass2']); break;
+	case 'changecolumnlist' : change_bug_list_columns($_pv['column_list']); break;
 	default : show_preferences_form();
 }
 else show_preferences_form();