[phpBT-dev] CVS: phpbt query.php,1.98.2.1,1.98.2.2 user.php,1.28.4.1,1.28.4.2

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

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1:/tmp/cvs-serv1578

Modified Files:
      Tag: htmltemplates
	query.php user.php 
Log Message:
Cleanup, conversion to gettext

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.98.2.1
retrieving revision 1.98.2.2
diff -u -r1.98.2.1 -r1.98.2.2
--- query.php	30 Aug 2003 22:07:12 -0000	1.98.2.1
+++ query.php	16 Sep 2003 11:39:33 -0000	1.98.2.2
@@ -2,7 +2,7 @@
 
 // query.php - Query the bug database
 // ------------------------------------------------------------------------
-// Copyright (c) 2001, 2002 The phpBugTracker Group
+// Copyright (c) 2001 - 2003 The phpBugTracker Group
 // ------------------------------------------------------------------------
 // This file is part of phpBugTracker
 //
@@ -27,8 +27,7 @@
 function delete_saved_query($queryid) {
 	global $db, $u, $me;
 
-	$db->query("delete from ".TBL_SAVED_QUERY." where user_id = $u
-		and saved_query_id = $queryid");
+	$db->query("delete from ".TBL_SAVED_QUERY." where user_id = $u and saved_query_id = $queryid");
 	if (!empty($_GET['form']) and $_GET['form'] == 'advanced') {
 		header("Location: $me?op=query&form=advanced");
 	} else {
@@ -37,7 +36,7 @@
 }
 
 function show_query() {
-	global $db, $t, $TITLE, $u;
+	global $db, $t, $u;
 
 	if ($u != 'nobody') {
 		// Grab the saved queries if there are any
@@ -47,9 +46,9 @@
 
 	// Show the advanced query form
 	if (!empty($_GET['form']) and $_GET['form'] == 'advanced') {
-		$t->render('queryform.html', translate('Query Bugs'));
+		$t->render('queryform.html', translate("Query Bugs"));
 	} else { // or show the simple one
-		$t->render('queryform-simple.html', translate('Query Bugs'));
+		$t->render('queryform-simple.html', translate("Query Bugs"));
 	}
 
 }
@@ -138,7 +137,7 @@
 				switch (${$searchfield."_type"}) {
 					case 'like' : $cond = "like '%".$$searchfield."%'"; break;
 					case 'rlike' : $cond = "rlike '".$$searchfield."'"; break;
-					case 'not rlike' :$cond = "not rlike '".$$searchfield."'"; break;
+					case 'not rlike' : $cond = "not rlike '".$$searchfield."'"; break;
 				}
 				$fields[] = "$searchfield $cond".
 					($searchfield == 'description' 
@@ -210,8 +209,7 @@
 }
 
 function list_items($assignedto = 0, $reportedby = 0, $open = 0) {
-	global $me, $db, $t, $select, $TITLE, $STRING, $u,
-		$default_db_fields, $all_db_fields, $QUERY;
+	global $me, $db, $t, $select, $u, $default_db_fields, $all_db_fields, $QUERY;
 
 	$query_db_fields = array(
 		'bug_id' => 'bug_id',
@@ -274,18 +272,11 @@
 		$savedquerystring = ereg_replace('&savedqueryname=.*(&?)', '\1', $_SERVER['QUERY_STRING']);
 		$savedquerystring .= '&op=doquery';
 		if ($savedqueryoverride) { // Updating an existing query
-			$db->query("update ".TBL_SAVED_QUERY." set saved_query_string = ".
-				$db->quote(stripslashes($savedquerystring)).
-				" where user_id = $u and saved_query_name = ".
-				$db->quote(stripslashes($savedqueryname)));
+			$db->query("update ".TBL_SAVED_QUERY." set saved_query_string = ".$db->quote(stripslashes($savedquerystring))." where user_id = $u and saved_query_name = ".$db->quote(stripslashes($savedqueryname)));
 		} else { // Adding a new saved query
 			$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.
-				" (saved_query_id, user_id, saved_query_name, saved_query_string)
-				values (".join(', ', array($nextid, $u,
-					$db->quote(stripslashes($savedqueryname)),
-					$db->quote(stripslashes($savedquerystring)))).")");
+			$db->query("insert into ".TBL_SAVED_QUERY." (saved_query_id, user_id, saved_query_name, saved_query_string) values (".join(', ', array($nextid, $u, $db->quote(stripslashes($savedqueryname)), $db->quote(stripslashes($savedquerystring)))).")");
 		}
 	}
 	if (!isset($order)) {
@@ -297,11 +288,8 @@
 			$sort = 'asc';
 		}
 	}
-	if (!session_is_registered('queryinfo')) {
-		session_register('queryinfo');
-		$_SESSION['queryinfo'] = array();
-	}
-
+	
+	if (empty($_SESSION['queryinfo'])) $_SESSION['queryinfo'] = array();
 	$_SESSION['queryinfo']['order'] = $order;
 	$_SESSION['queryinfo']['sort'] = $sort;
 
@@ -319,7 +307,7 @@
 	list($selrange, $llimit) = multipages($nr, $page, "order=$order&sort=$sort");
 
 	$desired_fields = !empty($_SESSION['db_fields']) ?
-		$_SESSION['db_fields'] :	$default_db_fields;
+		$_SESSION['db_fields'] : $default_db_fields;
 
 	$query_fields = array('bug_id as bug_link_id', 'severity.severity_color');
 	foreach ($desired_fields as $field) {
@@ -341,7 +329,7 @@
 
 	sorting_headers($me, $headers, $order, $sort, "page=$page".
 		(!empty($paramstr) ? $paramstr : ''));
-	$t->render('buglist.html', translate('Bug List'));
+	$t->render('buglist.html', translate("Bug List"));
 }
 
 $reportedby = !empty($_GET['reportedby']) ? $_GET['reportedby'] : 0;
@@ -351,8 +339,14 @@
 if (isset($_GET['op'])) switch($_GET['op']) {
 	case 'query' : show_query(); break;
 	case 'doquery' : $_SESSION['queryinfo'] = array(); list_items(); break;
-	case 'delquery' : delete_saved_query($_GET['queryid']); break;
-	case 'mybugs' : list_items($assignedto, $reportedby, $open); break;
+	case 'delquery' : 
+		if ($auth->is_authenticated()) delete_saved_query($_GET['queryid']);  
+		else show_query(); 
+		break;
+	case 'mybugs' : 
+		if ($auth->is_authenticated()) list_items($assignedto, $reportedby, $open); 
+		else show_query(); 
+		break;
 	default : show_query(); break;
 }
 else list_items($assignedto, $reportedby, $open);

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -u -r1.28.4.1 -r1.28.4.2
--- user.php	30 Aug 2003 22:07:12 -0000	1.28.4.1
+++ user.php	16 Sep 2003 11:39:34 -0000	1.28.4.2
@@ -10,12 +10,12 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-// 
+//
 // phpBugTracker is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with phpBugTracker; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -25,137 +25,139 @@
 include 'include.php';
 
 function delete_vote($bug_id) {
-    global $db, $u, $me, $now;
-	
-    $db->query("delete from ".TBL_BUG_VOTE." where user_id = $u and bug_id = $bug_id");
-    header("Location: $me?r=$now");
+	global $db, $u, $me, $now;
+
+	$db->query("delete from ".TBL_BUG_VOTE." where user_id = $u and bug_id = $bug_id");
+	header("Location: $me?r=$now");
 }
 
 function change_bug_list_columns($column_list) {
-    global $db, $u, $t, $HTTP_SESSION_VARS, $STRING;
-	
-    $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");
-    show_text($STRING['USER_PREF']['ColumnPreferencesSaved']);
+	global $db, $u, $t;
+
+	$_SESSION['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");
+	show_text(translate("Your bug list column preferences have been saved"));
 }
 
 function change_password($pass1, $pass2) {
-    global $t, $db, $u, $STRING;
+	global $t, $db, $u;
+
+	if (!$pass1 = trim($pass1)) {
+		$error = translate("Please enter a password");
+	} elseif ($pass1 != $pass2) {
+		$error = translate("Those passwords don't match -- please try again");
+	} else {
+		$error = false;
+	}
+
+	if ($error) {
+		show_preferences_form($error);
+		return;
+	}
+
+	if (ENCRYPT_PASS) {
+		$mpassword = md5($pass1);
+	} else {
+		$mpassword = $pass1;
+	}
 
-    if (!$pass1 = trim($pass1)) {
-	$error = $STRING['givepassword'];
-    } elseif ($pass1 != $pass2) {
-	$error = $STRING['passwordmatch'];
-    } else {
-	$error = false;
-    }
-
-    if ($error) {
-	show_preferences_form($error);
-	return;
-    }
-
-    if (ENCRYPT_PASS) {
-	$mpassword = md5($pass1);
-    } else {
-	$mpassword = $pass1;
-    }
+	$db->query("update ".TBL_AUTH_USER." set password = '$mpassword' where user_id = $u");
 	
-    $db->query("update ".TBL_AUTH_USER." set password = '$mpassword' where user_id = $u");
-    $t->assign('changetext', translate('Password changed'));
-    $t->render('changessaved.html', translate('Changes Saved'));
+	$t->assign('changetext', translate("Password changed"));
+	$t->render('changessaved.html', translate("Changes Saved"));
 }
 
 // Save changes to a user's preferences
 function change_preferences($prefs) {
-    global $db, $u, $t, $STRING;
+	global $db, $u, $t;
 
-    $updates = array();
-    $old_prefs = $db->getRow("select * from ".TBL_USER_PREF." where user_id = $u");
+	$updates = array();
+	$old_prefs = $db->getRow("select * from ".TBL_USER_PREF." where user_id = $u");
 
-    array_shift($old_prefs); // Drop the user_id field
-    $updates = array();
-    foreach ($old_prefs as $pref => $val) {
-	if ($pref == 'def_results') continue;
-	if (in_array($pref, $prefs) and !$val) {
-	    $updates[] = "$pref = 1";
-	} elseif (!in_array($pref, $prefs) and $val) {
-	    $updates[] = "$pref = 0";
+	array_shift($old_prefs); // Drop the user_id field
+	$updates = array();
+	foreach ($old_prefs as $pref => $val) {
+		if ($pref == 'def_results') continue;
+		if (in_array($pref, $prefs) and !$val) {
+			$updates[] = "$pref = 1";
+		} elseif (!in_array($pref, $prefs) and $val) {
+			$updates[] = "$pref = 0";
+		}
 	}
-    }
 
 	$updates[] = 'def_results = '.(int)$prefs['def_results']; // override previous set
-	
-    if (count($updates)) {
-	$db->query("update ".TBL_USER_PREF.' set '.@join(', ', $updates).
-	    " where user_id = $u");
-    }
 
-    $t->assign('changetext', translate('Preferences changed'));
-    $t->render('changessaved.html', translate('Changes Saved'));
+	if (count($updates)) {
+		$db->query("update ".TBL_USER_PREF.' set '.@join(', ', $updates)." where user_id = $u");
+	}
+
+	$t->assign('changetext', translate("Preferences changed"));
+	$t->render('changessaved.html', translate("Changes Saved"));
 }
 
 
 function show_preferences_form($error = '') {
-    global $t, $all_db_fields, $default_db_fields, $_sv, $db, $u, $STRING;
+	global $t, $all_db_fields, $default_db_fields, $db, $u;
 
-    // Display the votes (if any)
-    $t->assign('votes',
-	$db->getAll("select * from ".TBL_BUG_VOTE." where user_id = $u"));
-
-    // Display current preference settings
-    $pref_labels = array(
-	'email_notices' => $STRING['USER_PREF']['ReceiveNotifications'],
-	'saved_queries' => $STRING['USER_PREF']['ShowSavedQueries']
-	);
-    
-    $prefs = $db->getRow("select * from ".TBL_USER_PREF." where user_id = $u");
-    foreach ($pref_labels as $pref => $label) {
-	$preferences[] = array(
-	    'pref' => $pref,
-	    'label' => $label,
-	    'checked' => $prefs[$pref]
-	);
+	// Display the votes (if any)
+	$t->assign('votes',
+		$db->getAll("select * from ".TBL_BUG_VOTE." where user_id = $u"));
+
+	// Display current preference settings
+	$pref_labels = array(
+		'email_notices' => translate("Receive notifications of bug changes via email"),
+		'saved_queries' => translate("Show saved queries on the homepage")
+		);
+
+	$prefs = $db->getRow("select * from ".TBL_USER_PREF." where user_id = $u");
+	foreach ($pref_labels as $pref => $label) {
+		$preferences[] = array(
+			'pref' => $pref,
+			'label' => $label,
+			'checked' => $prefs[$pref]
+			);
 	}
-	
+
 	$def_results = $prefs['def_results'];
 
-    $t->assign(array(
-	'error' => $error,
-	'my_fields' => $_sv['db_fields'] ? $_sv['db_fields'] : $default_db_fields,
-	'field_titles' => $all_db_fields,
-	'preferences' => $preferences,
-    'def_results' => $def_results
-	));
-		
-    $t->render('user.html', translate('User preferences'));
+	$t->assign(array(
+		'error' => $error,
+		'my_fields' => $_SESSION['db_fields'] ? $_SESSION['db_fields'] : $default_db_fields,
+		'field_titles' => $all_db_fields,
+		'preferences' => $preferences,
+		'def_results' => $def_results
+		));
+
+	$t->render('user.html', translate("User preferences"));
 }
 
 $perm->check_group('User');
 
-if (isset($_gv['op'])) {
-    switch ($_gv['op']) {
-	case 'delvote':
-	    delete_vote($_gv['bugid']);
-	break;
-    }
-} elseif (isset($_pv['do'])) {
-    switch ($_pv['do']) {
-	case 'changepassword':
-	    change_password($_pv['pass1'], $_pv['pass2']);
-	break;
-	case 'changecolumnlist':
-	    change_bug_list_columns($_pv['column_list']);
-	break;
-	case 'changeprefs':
-	    change_preferences(isset($_pv['preferences']) ? array_merge($_pv['preferences'], array('def_results' => $_pv['def_results'])) : array());
-	break;
-	default:
-	    show_preferences_form();
-    }
+if (isset($_GET['op'])) {
+	switch ($_GET['op']) {
+		case 'delvote':
+			delete_vote($_GET['bugid']);
+			break;
+	}
+} elseif (isset($_POST['do'])) {
+	switch ($_POST['do']) {
+		case 'changepassword':
+			change_password($_POST['pass1'], $_POST['pass2']);
+			break;
+		case 'changecolumnlist':
+			change_bug_list_columns($_POST['column_list']);
+			break;
+		case 'changeprefs':
+			change_preferences(isset($_POST['preferences']) 
+				? array_merge($_POST['preferences'], array('def_results' => $_POST['def_results'])) 
+				: array());
+			break;
+		default:
+			show_preferences_form();
+	}
 } else {
-    show_preferences_form();
+	show_preferences_form();
 }
 
 ?>