phpbt-dev — Developer's mailing list and cvs commits

[phpBT-dev] CVS: phpbt/inc functions.php,1.66,1.67

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv485/inc

Modified Files:
	functions.php 
Log Message:
RFE #618641 - Stricter editing
RFE #579407 - Guest login


Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- functions.php	1 Oct 2005 15:19:55 -0000	1.66
+++ functions.php	2 Oct 2005 21:04:50 -0000	1.67
@@ -52,7 +52,7 @@
 ///
 /// Build a select box with the item matching $value selected
 function build_select($box, $selected = '', $project = 0) {
-	global $db, $select, $perm, $restricted_projects, $QUERY;
+	global $db, $select, $perm, $restricted_projects, $QUERY, $u;
 
 	// create hash to map tablenames
 	$cfgDatabase = array(
@@ -194,9 +194,12 @@
 			}
 			break;
 		case 'bug_cc':
+		        $may_edit = (isset($perm) && $perm->have_perm('EditBug', $project));
 			$rs = $db->query(sprintf($QUERY['functions-bug-cc'], $db->quote($selected)));
 			while (list($uid, $user) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
-				$text .= "<option value=\"$uid\">".maskemail($user).'</option>';
+				if ($may_edit or $uid == $u) {
+					$text .= "<option value=\"$uid\">".maskemail($user).'</option>';
+				}
 			}
 			// Pad the sucker
 			$text .= '<option value="" disabled>';
@@ -304,14 +307,36 @@
 
 ///
 /// Return human-friendly text for a value
-function lookup($var, $val) {
+function lookup($var, $val, $project = 0) {
 	global $db;
 
+	// create hash to map tablenames
+	$cfgDatabase = array(
+		'group' => TBL_AUTH_GROUP,
+		'project' => TBL_PROJECT,
+		'component' => TBL_COMPONENT,
+		'status' => TBL_STATUS,
+		'resolution' => TBL_RESOLUTION,
+		'severity' => TBL_SEVERITY,
+		'priority' => TBL_PRIORITY,
+		'version' => TBL_VERSION,
+		'database' => TBL_DATABASE,
+		'site' => TBL_SITE,
+		'os' => TBL_OS
+		);
+
 	switch($var) {
 		case 'reporter' :
 		case 'assigned_to' :
 			return maskemail($db->getOne("select login from ".TBL_AUTH_USER." where user_id = ".$db->quote($val)));
 			break;
+		case 'version' :
+			return $db->getOne("select {$var}_name from ".$cfgDatabase[$var]." where project_id = ".$db->quote($project)." and {$var}_id = ".$db->quote($val));
+			break;
+		default:
+			return $db->getOne("select {$var}_name from ".$cfgDatabase[$var]." where {$var}_id = ".$db->quote($val));
+			break;
+
 	}
 }
 

[phpBT-dev] CVS: phpbt/schemas mssql.in,1.4,1.5 mysql.in,1.52,1.53 mysqli.in,1.2,1.3 oci8.in,1.32,1.33 pgsql.in,1.51,1.52

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31223/schemas

Modified Files:
	mssql.in mysql.in mysqli.in oci8.in pgsql.in 
Log Message:
Adding two new permissions (AddBug, CloseBug) and one new group (Manager)


Index: mssql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mssql.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mssql.in	3 Sep 2005 16:41:48 -0000	1.4
+++ mssql.in	2 Oct 2005 20:57:40 -0000	1.5
@@ -395,27 +395,34 @@
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (1, 'Admin', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (2, 'User', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (3, 'Developer', 1);
+INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (4, 'Manager', 1);
 
 CREATE TABLE TBL_AUTH_GROUP_seq ([id] [int] IDENTITY (3, 1) NOT NULL, [vapor] [int] NULL)
 
 
 # ... and four permissions
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (1, 'Admin');
-INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'Editbug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'AddBug');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (3, 'EditAssignment');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (4, 'Assignable');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (5, 'EditBug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (6, 'CloseBug');
 
 
 # Admins can do all the admin stuff,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (1, 1);
 
-# users can edit bugs, and
+# users can add and edit bugs,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 2);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 5);
 
-# developers are users who can own bugs
-INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 2);
+# developers can own bugs, and
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 4);
 
+# managers can assign and close bugs
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 3);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 6);
+
 
 # Insert user_id 1 into the admin group
 INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);

Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mysql.in	3 Sep 2005 16:41:48 -0000	1.52
+++ mysql.in	2 Oct 2005 20:57:40 -0000	1.53
@@ -403,6 +403,7 @@
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (1, 'Admin', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (2, 'User', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (3, 'Developer', 1);
+INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (4, 'Manager', 1);
 
 CREATE TABLE TBL_AUTH_GROUP_seq (
   id int unsigned auto_increment not null primary key);
@@ -411,21 +412,27 @@
 
 # ... and four permissions
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (1, 'Admin');
-INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'Editbug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'AddBug');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (3, 'EditAssignment');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (4, 'Assignable');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (5, 'EditBug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (6, 'CloseBug');
 
 
 # Admins can do all the admin stuff,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (1, 1);
 
-# users can edit bugs, and
+# users can add and edit bugs,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 2);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 5);
 
-# developers are users who can own bugs
-INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 2);
+# developers can own bugs, and
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 4);
 
+# managers can assign and close bugs
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 3);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 6);
+
 
 # Insert user_id 1 into the admin group
 INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);
@@ -614,26 +621,20 @@
 
 CREATE TABLE TBL_ATTACHMENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_ATTACHMENT_seq values(0);
 
 CREATE TABLE TBL_BUG_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_BUG_seq values(0);
 
 CREATE TABLE TBL_COMMENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_COMMENT_seq values(0);
 
 CREATE TABLE TBL_COMPONENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_COMPONENT_seq values(0);
 
 CREATE TABLE TBL_PROJECT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_PROJECT_seq values(0);
 
 CREATE TABLE TBL_VERSION_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_VERSION_seq values(0);
 
 #--

Index: mysqli.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysqli.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysqli.in	3 Sep 2005 16:41:48 -0000	1.2
+++ mysqli.in	2 Oct 2005 20:57:40 -0000	1.3
@@ -403,6 +403,7 @@
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (1, 'Admin', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (2, 'User', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (3, 'Developer', 1);
+INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (4, 'Manager', 1);
 
 CREATE TABLE TBL_AUTH_GROUP_seq (
   id int unsigned auto_increment not null primary key);
@@ -411,21 +412,27 @@
 
 # ... and four permissions
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (1, 'Admin');
-INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'Editbug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'AddBug');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (3, 'EditAssignment');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (4, 'Assignable');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (5, 'EditBug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (6, 'CloseBug');
 
 
 # Admins can do all the admin stuff,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (1, 1);
 
-# users can edit bugs, and
+# users can add and edit bugs,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 2);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 5);
 
-# developers are users who can own bugs
-INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 2);
+# developers can own bugs, and
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 4);
 
+# managers can assign and close bugs
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 3);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 6);
+
 
 # Insert user_id 1 into the admin group
 INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);
@@ -614,26 +621,20 @@
 
 CREATE TABLE TBL_ATTACHMENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_ATTACHMENT_seq values(0);
 
 CREATE TABLE TBL_BUG_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_BUG_seq values(0);
 
 CREATE TABLE TBL_COMMENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_COMMENT_seq values(0);
 
 CREATE TABLE TBL_COMPONENT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_COMPONENT_seq values(0);
 
 CREATE TABLE TBL_PROJECT_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_PROJECT_seq values(0);
 
 CREATE TABLE TBL_VERSION_seq (
   id int unsigned auto_increment not null primary key);
-INSERT INTO TBL_VERSION_seq values(0);
 
 #--

Index: oci8.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/oci8.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- oci8.in	3 Sep 2005 16:41:48 -0000	1.32
+++ oci8.in	2 Oct 2005 20:57:40 -0000	1.33
@@ -406,27 +406,34 @@
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (1, 'Admin', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (2, 'User', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (3, 'Developer', 1);
+INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (4, 'Manager', 1);
 
 CREATE SEQUENCE TBL_AUTH_GROUP_seq START WITH 4 NOCACHE;
 
 
 # ... and four permissions
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (1, 'Admin');
-INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'Editbug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'AddBug');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (3, 'EditAssignment');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (4, 'Assignable');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (5, 'EditBug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (6, 'CloseBug');
 
 
 # Admins can do all the admin stuff,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (1, 1);
 
-# users can edit bugs, and
+# users can add and edit bugs,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 2);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 5);
 
-# developers are users who can own bugs
-INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 2);
+# developers can own bugs, and
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 4);
 
+# managers can assign and close bugs
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 3);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 6);
+
 
 # Insert user_id 1 into the admin group
 INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);

Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pgsql.in	3 Sep 2005 16:41:48 -0000	1.51
+++ pgsql.in	2 Oct 2005 20:57:40 -0000	1.52
@@ -394,27 +394,34 @@
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (1, 'Admin', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (2, 'User', 1);
 INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (3, 'Developer', 1);
+INSERT INTO TBL_AUTH_GROUP (group_id, group_name, locked) VALUES (4, 'Manager', 1);
 
 CREATE SEQUENCE TBL_AUTH_GROUP_seq START 4;
 
 
 # ... and four permissions
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (1, 'Admin');
-INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'Editbug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (2, 'AddBug');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (3, 'EditAssignment');
 INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (4, 'Assignable');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (5, 'EditBug');
+INSERT INTO TBL_AUTH_PERM (perm_id, perm_name) VALUES (6, 'CloseBug');
 
 
 # Admins can do all the admin stuff,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (1, 1);
 
-# users can edit bugs, and
+# users can add and edit bugs,
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 2);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (2, 5);
 
-# developers are users who can own bugs
-INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 2);
+# developers can own bugs, and
 INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (3, 4);
 
+# managers can assign and close bugs
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 3);
+INSERT INTO TBL_GROUP_PERM (group_id, perm_id) VALUES (4, 6);
+
 
 # Insert user_id 1 into the admin group
 INSERT INTO TBL_USER_GROUP (user_id, group_id) VALUES (1, 1);

[phpBT-dev] CVS: phpbt/templates/default bughistory.html,1.8,1.9

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30421/templates/default

Modified Files:
	bughistory.html 
Log Message:
RFE #561655 - Change reporter


Index: bughistory.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bughistory.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bughistory.html	22 Sep 2005 20:51:50 -0000	1.8
+++ bughistory.html	2 Oct 2005 20:52:09 -0000	1.9
@@ -11,12 +11,12 @@
             <tr<?php if ($i % 2) echo ' class="alt" bgcolor="#dddddd"' ?>>
                 <td><?php echo maskemail($history[$i]['login']); ?></td>
                 <td><?php echo $history[$i]['changed_field']; ?></td>
-		<td>&nbsp;<?php if ($history[$i]['changed_field'] == translate("Assigned To")) {
+		<td>&nbsp;<?php if ($history[$i]['changed_field'] == translate("Assigned To") or $history[$i]['changed_field'] == translate("Reporter")) {
 					echo maskemail($history[$i]['old_value']);
 				} else {
 					echo $history[$i]['old_value'];
 				} ?></td>
-		<td>&nbsp;<?php if ($history[$i]['changed_field'] == translate("Assigned To")) {
+		<td>&nbsp;<?php if ($history[$i]['changed_field'] == translate("Assigned To") or $history[$i]['changed_field'] == translate("Reporter")) {
 					echo maskemail($history[$i]['new_value']);
 				} else {
 					echo $history[$i]['new_value'];

[phpBT-dev] CVS: phpbt bug.php,1.151,1.152

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30421

Modified Files:
	bug.php 
Log Message:
RFE #561655 - Change reporter


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- bug.php	1 Oct 2005 15:19:56 -0000	1.151
+++ bug.php	2 Oct 2005 20:52:09 -0000	1.152
@@ -264,10 +264,7 @@
 			$oldassignedto_login = '';
 		}
 	       
-		$assignedto_login = '';
-		if (!empty($cf['assigned_to'])) {
-			$assignedto_login = $db->getOne('select login from '.TBL_AUTH_USER.' u where u.user_id = '.(!empty($cf['assigned_to'])));
-		}
+		$assignedto_login = $db->getOne('select login from '.TBL_AUTH_USER.' u where u.user_id = '.$cf['assigned_to']);
 		if (is_null($assignedto_login)) {
 			$assignedto_login = '';
 		}
@@ -277,13 +274,34 @@
 		$assignedtostat = ' ';
 	}
 
+	if (!empty($cf['created_by'])) {
+		$reporterstat = '!';
+		$oldreporter_login = $db->getOne('select login from '.TBL_AUTH_USER.' u where u.user_id = '.$buginfo['created_by']);
+		if (is_null($oldreporter_login)) {
+			$oldreporter_login = '';
+		}
+	       
+		$reporter_login = $db->getOne('select login from '.TBL_AUTH_USER.' u where u.user_id = '.$cf['created_by']);
+		if (is_null($reporter_login)) {
+			$reporter_login = '';
+		}
+
+		$db->query('insert into '.TBL_BUG_HISTORY.' (bug_id, changed_field, old_value, new_value, created_by, created_date) values ('. join(', ', array($buginfo['bug_id'], $db->quote(translate("Reporter")), $db->quote($oldreporter_login), $db->quote($reporter_login), $u, $now)).")");
+	} else {
+		$reporterstat = ' ';
+	}
+
 	if (!empty($_POST['suppress_email'])) return; // Don't send email if silent update requested.
 
 	if (defined('EMAIL_DISABLED') and EMAIL_DISABLED) return;
 
-	// Reporter never changes
-	$reporter = $db->getOne('select email from '.TBL_AUTH_USER." u, ".TBL_USER_PREF." p where u.user_id = {$buginfo['created_by']} and u.user_id = p.user_id and email_notices = 1");
-	$reporterstat = ' ';
+	if (isset($perm) and $perm->have_perm_proj($project_id) and is_numeric($created_by)) {
+		$reporter = $db->getOne('select email from '.TBL_AUTH_USER." u, ".TBL_USER_PREF." p where u.user_id = {$buginfo['created_by']} and u.user_id = p.user_id and email_notices = 1");
+		$reporterstat = '!';
+	} else {
+		$reporter = $db->getOne('select email from '.TBL_AUTH_USER." u, ".TBL_USER_PREF." p where u.user_id = {$buginfo['created_by']} and u.user_id = p.user_id and email_notices = 1");
+		$reporterstat = ' ';
+	}
 
 	// If there are new comments grab the comments immediately before the latest
 	if ($comments or $newbug) {
@@ -417,6 +435,11 @@
 	$resolution_id = isset($resolution_id) ? $resolution_id : $buginfo['resolution_id'];
 	$assigned_to = isset($assigned_to) ? $assigned_to : $buginfo['assigned_to'];
 	$project_id = isset($project_id) ? $project_id : $buginfo['project_id'];
+	if (isset($perm) and $perm->have_perm_proj($project_id) and isset($created_by) && is_numeric($created_by)) {
+		$created_by = (int) $created_by;
+	} else {
+		$created_by = $buginfo['created_by'];
+	}
 	$version_id = isset($version_id) ? $version_id : $buginfo['version_id'];
 	$component_id = isset($component_id) ? $component_id : $buginfo['component_id'];
 	$os_id = isset($os_id) ? $os_id : $buginfo['os_id'];
@@ -492,7 +515,7 @@
 	} else {
 		$closed_query = '';
 	}
-	$db->query("update ".TBL_BUG." set title = ".$db->quote(stripslashes($title)).', url = '.$db->quote(stripslashes($url)).", severity_id = ".(int)$severity_id.", priority = ".(int)$priority.", status_id = ".(int)$status_id.", database_id = ".(int)$database_id.", to_be_closed_in_version_id = ".(int)$to_be_closed_in_version_id.", closed_in_version_id = ".(int)$closed_in_version_id.', site_id ='.(int)$site_id.", resolution_id = ".(int)$resolution_id.", assigned_to = ".(int)$assigned_to.", project_id = $project_id, version_id = $version_id, component_id = ".(int)$component_id.", os_id = ".(int)$os_id.", last_modified_by = $u, last_modified_date = $now $closed_query where bug_id = $bugid");
+	$db->query("update ".TBL_BUG." set title = ".$db->quote(stripslashes($title)).', url = '.$db->quote(stripslashes($url)).", severity_id = ".(int)$severity_id.", priority = ".(int)$priority.", status_id = ".(int)$status_id.", database_id = ".(int)$database_id.", to_be_closed_in_version_id = ".(int)$to_be_closed_in_version_id.", closed_in_version_id = ".(int)$closed_in_version_id.', site_id ='.(int)$site_id.", resolution_id = ".(int)$resolution_id.", assigned_to = ".(int)$assigned_to.", created_by = $created_by, project_id = $project_id, version_id = $version_id, component_id = ".(int)$component_id.", os_id = ".(int)$os_id.", last_modified_by = $u, last_modified_date = $now $closed_query where bug_id = $bugid");
 	
 	// If the project has changed, move any attachments	
 	if (!empty($changedfields['project_id'])) {

[phpBT-dev] CVS: phpbt/templates/default/admin project-edit.html,1.16,1.17

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30027/templates/default/admin

Modified Files:
	project-edit.html 
Log Message:
RFE #815120 -- Replace Created Date with Owner in Component


Index: project-edit.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/admin/project-edit.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- project-edit.html	27 Aug 2005 13:14:28 -0000	1.16
+++ project-edit.html	2 Oct 2005 20:50:11 -0000	1.17
@@ -99,7 +99,6 @@
 			<table class="bordertable" align="center">
 				<tr>
 					<th><?php echo translate("Version"); ?></th>
-					<th><?php echo translate("Created"); ?></th>
 					<th><?php echo translate("Active"); ?></th>
 					<th><?php echo translate("Sort Order"); ?></th>
 					<th><?php echo translate("Delete"); ?></th>
@@ -107,7 +106,6 @@
 				<?php for ($i = 0, $count = count($versions); $i < $count; $i++) { ?>
 				<tr>
 					<td><a href="project.php?op=edit_version&id=<?php echo $versions[$i]['version_id']; ?>" onClick="popupVersion(<?php echo $versions[$i]['version_id']; ?>); return false;"><?php echo stripslashes(htmlspecialchars($versions[$i]['version_name'])); ?></a></td>
-					<td align="center"><?php echo date(DATE_FORMAT, $versions[$i]['created_date']); ?></td>
 					<td align="center"><?php echo $versions[$i]['active'] ? translate("Yes") : translate("No"); ?></td>
 					<td align="center"><?php echo $versions[$i]['sort_order']; ?></td>
 					<td align="center"><?php if(!$versions[$i]['bug_count']) { ?><a href="project.php?op=del_version&id=<?php echo $versions[$i]['version_id']; ?>&project_id=<?php echo $project_id; ?>"><?php echo translate("Delete"); ?></a><?php } ?></td>
@@ -127,7 +125,7 @@
 			<table class="bordertable" align="center">
 				<tr>
 					<th><?php echo translate("Component"); ?></th>
-					<th><?php echo translate("Created"); ?></th>
+					<th><?php echo translate("Owner"); ?></th>
 					<th><?php echo translate("Active"); ?></th>
 					<th><?php echo translate("Sort Order"); ?></th>
 					<th><?php echo translate("Delete"); ?></th>
@@ -135,7 +133,7 @@
 				<?php for ($i = 0, $count = count($components); $i < $count; $i++) { ?>
 				<tr>
 					<td><a href="project.php?op=edit_component&id=<?php echo $components[$i]['component_id']; ?>" onClick="popupComponent(<?php echo $components[$i]['component_id']; ?>); return false;"><?php echo stripslashes(htmlspecialchars($components[$i]['component_name'])); ?></a></td>
-					<td align="center"><?php echo date(DATE_FORMAT, $components[$i]['created_date']); ?></td>
+					<td align="center"><?php echo lookup('assigned_to', $components[$i]['owner']); ?></td>
 					<td align="center"><?php echo $components[$i]['active'] ? translate("Yes") : translate("No"); ?></td>
 					<td align="center"><?php echo $components[$i]['sort_order']; ?></td>
 					<td align="center"><?php if(!$components[$i]['bug_count']) { ?><a href="project.php?op=del_component&id=<?php echo $components[$i]['component_id']; ?>&project_id=<?php echo $project_id; ?>"><?php echo translate("Delete"); ?></a><?php } ?></td>

[phpBT-dev] CVS: phpbt/inc/db mssql.php,1.6,1.7 mysql.php,1.29,1.30 mysqli.php,1.3,1.4 oci8.php,1.22,1.23 pgsql.php,1.30,1.31

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30027/inc/db

Modified Files:
	mssql.php mysql.php mysqli.php oci8.php pgsql.php 
Log Message:
RFE #815120 -- Replace Created Date with Owner in Component


Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mssql.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mssql.php	2 Oct 2005 20:47:59 -0000	1.6
+++ mssql.php	2 Oct 2005 20:50:11 -0000	1.7
@@ -8,6 +8,7 @@
 			'c.component_id, '.
 			'c.component_name, '.
 			'c.created_date, '.
+			'c.owner, '.
 			'c.active, '.
 			'sort_order, '.
 			'count(bug_id) as bug_count '.

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mysql.php	2 Oct 2005 20:47:59 -0000	1.29
+++ mysql.php	2 Oct 2005 20:50:11 -0000	1.30
@@ -8,6 +8,7 @@
 			'c.component_id, '.
 			'component_name, '.
 			'c.created_date, '.
+			'owner, '.
 			'active, '.
 			'sort_order, '.
 			'count(bug_id) as bug_count '.

Index: mysqli.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mysqli.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysqli.php	2 Oct 2005 20:47:59 -0000	1.3
+++ mysqli.php	2 Oct 2005 20:50:11 -0000	1.4
@@ -8,6 +8,7 @@
 			'c.component_id, '.
 			'component_name, '.
 			'c.created_date, '.
+			'owner, '.
 			'active, '.
 			'sort_order, '.
 			'count(bug_id) as bug_count '.

Index: oci8.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- oci8.php	2 Oct 2005 20:47:59 -0000	1.22
+++ oci8.php	2 Oct 2005 20:50:11 -0000	1.23
@@ -8,6 +8,7 @@
 			'c.component_id, '.
 			'component_name, '.
 			'c.created_date, '.
+			'owner, '.
 			'active, '.
 			'sort_order, '.
 			'count(bug_id) as bug_count '.

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pgsql.php	2 Oct 2005 20:47:59 -0000	1.30
+++ pgsql.php	2 Oct 2005 20:50:11 -0000	1.31
@@ -8,6 +8,7 @@
 			'c.component_id, '.
 			'c.component_name, '.
 			'c.created_date, '.
+			'c.owner, '.
 			'c.active, '.
 			'c.sort_order, '.
 			'count(bug_id) as bug_count '.

[phpBT-dev] CVS: phpbt/inc/db mssql.php,1.5,1.6 mysql.php,1.28,1.29 mysqli.php,1.2,1.3 oci8.php,1.21,1.22 pgsql.php,1.29,1.30

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29576/inc/db

Modified Files:
	mssql.php mysql.php mysqli.php oci8.php pgsql.php 
Log Message:
Bug #1282025, reported and patched by Kris


Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mssql.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mssql.php	29 Aug 2005 19:14:13 -0000	1.5
+++ mssql.php	2 Oct 2005 20:47:59 -0000	1.6
@@ -154,7 +154,8 @@
 			's.status_id, '.
 			'status_name, '.
 			'status_desc, '.
-			'sort_order '.
+			'sort_order, '.
+			'bug_open '.
 		'order by '.
 			'%s %s',
 	'admin-list-versions' =>

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mysql.php	29 Aug 2005 19:14:13 -0000	1.28
+++ mysql.php	2 Oct 2005 20:47:59 -0000	1.29
@@ -154,7 +154,8 @@
 			's.status_id, '.
 			'status_name, '.
 			'status_desc, '.
-			'sort_order '.
+			'sort_order, '.
+			'bug_open '.
 		'order by '.
 			'%s %s',
 	'admin-list-versions' =>

Index: mysqli.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mysqli.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysqli.php	29 Aug 2005 19:14:13 -0000	1.2
+++ mysqli.php	2 Oct 2005 20:47:59 -0000	1.3
@@ -154,7 +154,8 @@
 			's.status_id, '.
 			'status_name, '.
 			'status_desc, '.
-			'sort_order '.
+			'sort_order, '.
+			'bug_open '.
 		'order by '.
 			'%s %s',
 	'admin-list-versions' =>

Index: oci8.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- oci8.php	29 Aug 2005 19:14:13 -0000	1.21
+++ oci8.php	2 Oct 2005 20:47:59 -0000	1.22
@@ -172,7 +172,8 @@
 			's.status_id, '.
 			'status_name, '.
 			'status_desc, '.
-			'sort_order '.
+			'sort_order, '.
+			'bug_open '.
 		'order by '.
 			'%s %s',
 	'admin-list-versions' =>

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pgsql.php	29 Aug 2005 19:14:13 -0000	1.29
+++ pgsql.php	2 Oct 2005 20:47:59 -0000	1.30
@@ -154,7 +154,8 @@
 			's.status_id, '.
 			'status_name, '.
 			'status_desc, '.
-			'sort_order '.
+			'sort_order, '.
+			'bug_open '.
 		'order by '.
 			'%s %s',
 	'admin-list-versions' =>

[phpBT-dev] CVS: phpbt/templates/default wrap.html,1.33,1.34

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29309/templates/default

Modified Files:
	wrap.html 
Log Message:
Only show "Bugs assigned to me" when Assignable (or I have assigned bugs)


Index: wrap.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/wrap.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wrap.html	27 Aug 2005 13:14:28 -0000	1.33
+++ wrap.html	2 Oct 2005 20:46:46 -0000	1.34
@@ -48,8 +48,10 @@
 		<input type="checkbox" name="savecookie" value="1" <?php if (!empty($_COOKIE['phpbt_user'])) echo 'checked' ?> class="bottomnavinput" title="<?php printf(translate('Remember %s for next time'), $loginlabel) ?>"> <?php echo translate("Remember me"); ?>
 	<?php } ?>
 <?php } else { ?>
-	<?php echo translate("Bugs assigned to me"); ?>: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open"><?php echo $owner_open ?></a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed"><?php echo $owner_closed ?></a>
-	| <?php echo translate("Bugs reported by me"); ?>: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open"><?php echo $reporter_open ?></a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed"><?php echo $reporter_closed ?></a>
+<?php if (isset($perm) && $perm->have_perm('Assignable') || $owner_open || $owner_closed) { ?>
+	<?php echo translate("Bugs assigned to me"); ?>: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open"><?php echo $owner_open ?></a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed"><?php echo $owner_closed ?></a> |
+<?php } ?>
+	<?php echo translate("Bugs reported by me"); ?>: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open"><?php echo $reporter_open ?></a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed"><?php echo $reporter_closed ?></a>
 	| <?php echo translate("Bookmarked bugs"); ?>: <a href="query.php?op=mybugs&bookmarked=1&open=1" title="Open"><?php echo $bookmarks_open ?></a> / <a href="query.php?op=mybugs&bookmarked=1&open=0" title="Closed"><?php echo $bookmarks_closed ?></a>
 	| <a href="user.php"><?php echo translate("Personal Page"); ?></a>
 	| <a href="logout.php"><?php echo translate("Logout"), " ", $_SESSION["uname"]; ?></a>

[phpBT-dev] CVS: phpbt/inc auth.php,1.24,1.25

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29096/inc

Modified Files:
	auth.php 
Log Message:
project admin permissions


Index: auth.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/auth.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- auth.php	1 Oct 2005 15:19:55 -0000	1.24
+++ auth.php	2 Oct 2005 20:45:21 -0000	1.25
@@ -104,9 +104,9 @@
 	var $classname = 'uperm';
 	var $permissions = array ();
 
-	function check($p) {
+	function check($p, $proj = 0) {
 
-		if (!$this->have_perm($p)) {
+		if (!$this->have_perm($p, $proj)) {
 			if (!isset($_SESSION['perms']) ) {
 				$_SESSION['perms'] = '';
 			}
@@ -148,13 +148,17 @@
 		}
 	}
 
-	function check_auth($auth_var, $reqs) {
+	function check_auth($auth_var, $reqs, $proj = 0) {
 
 		// Administrators always pass
 		if (@isset($_SESSION[$auth_var]['Admin'])) {
 			return true;
 		}
 
+		if (isset($proj) && !empty($proj) && $this->have_perm_proj($proj)) {
+			return true;
+		}
+
 		if (is_array($reqs)) {
 			foreach ($reqs as $req) {
 				if (!@isset($_SESSION[$auth_var][$req])) {
@@ -177,8 +181,8 @@
 	}
 
 
-	function have_perm($req_perms) {
-		return $this->check_auth('perms', $req_perms);
+	function have_perm($req_perms, $proj = 0) {
+		return $this->check_auth('perms', $req_perms, $proj);
 	}
 
 

[phpBT-dev] CVS: phpbt index.php,1.41,1.42 query.php,1.106,1.107

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28854

Modified Files:
	index.php query.php 
Log Message:
Fix for edit advanced queries


Index: index.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/index.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- index.php	19 Jul 2005 19:25:36 -0000	1.41
+++ index.php	2 Oct 2005 20:44:19 -0000	1.42
@@ -142,7 +142,7 @@
 	foreach ($aProjects['projects'] as $iProjectNumberKey => $value1) {
 		foreach ($aProjects['projects'][$iProjectNumberKey] as $sResolutionKey => $value2) {
 			if ($sResolutionKey != "Project" && $sResolutionKey != "Total" && $sResolutionKey != "Open") {
-				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?resolution%5B%5D=" . $aResolutionsToIds[$sResolutionKey] . "&projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
+				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?resolution%5B%5D=" . $aResolutionsToIds[$sResolutionKey] . "&projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery&form=advanced'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
 			} elseif ($sResolutionKey == "Open") {
 				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . $sOpenStatusQuery . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
 			} elseif ($sResolutionKey == "Total") {

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- query.php	27 Sep 2005 19:49:42 -0000	1.106
+++ query.php	2 Oct 2005 20:44:19 -0000	1.107
@@ -81,7 +81,8 @@
 	}
 
 	// Show the advanced query form
-	if (!empty($_GET['form']) and $_GET['form'] == 'advanced') {
+	if (!empty($_GET['form']) and $_GET['form'] == 'advanced' or
+		!empty($form) and $form == 'advanced') {
 		$t->render('queryform.html', translate("Query Bugs"));
 	} else { // or show the simple one
 		$t->render('queryform-simple.html', translate("Query Bugs"));

[phpBT-dev] CVS: phpbt/templates/default install-question.html,NONE,1.1 install-complete.html,1.7,1.8 install-failure.html,1.1,1.2 install.html,1.11,1.12

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22440/templates/default

Modified Files:
	install-complete.html install-failure.html install.html 
Added Files:
	install-question.html 
Log Message:
Updating the install files with links to README, INSTALL and UPGRADING.
Installing on top of an earlier install will offer to run upgrade.php


--- NEW FILE: install-question.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Trasitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
	<title><?php echo translate("phpBugTracker Installation"); ?></title>
	<link rel="StyleSheet" href="styles/default.css" type="text/css">
	<meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
</head>
<body bgcolor="#ffffff" link="#006699" vlink="#006699" alink="#006699">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
	<tr>
		<td width="200" valign="top"><br />
			<table border="0" cellpadding="0" cellspacing="3">
				<tr>
					<td>
						<img src="logo.jpg" alt="phpBugTracker Logo" />
					</td>
				</tr>
				<tr>
					<td>
						<ul>
							<li><a href="README">README</a></li>
							<li><a href="INSTALL">INSTALL</a></li>
							<li><a href="UPGRADING">UPGRADING</a></li>
							<li><a href="docs/html/index.html">Documentation</a>
							<li><a href="COPYING">LICENSE</a></li>
						</ul>
					</td>
				</tr>
			</table>
		</td>
		<td valign="top">
			<div class="banner"><?php echo translate("phpBugTracker Installation"); ?></div>
			<p><div class="error">Already installed</div></p>
			<p>It seems as if phpBugTracker is already installed in
			this database and with this table prefix.</p>
			<p>You can do one of the following:</p>
			<ol>
			<li>Go back to the previous screen and choose another database or
			another table prefix.</li>
			<li>Force an install in this database and with this table prefix.</li>
			<li>Save a config file with the submitted options and upgrade your old database.</li>
			</ol>
			<hr>
			<h4>1. Choose another database or table prefix</h4>
			<p>
			If you wish to have a look at the newest version of
			phpBugTracker and try it out in a safe environment
			while deciding whether it is stable enough for your
			needs you can better choose another database or table
			prefix. Keeping the new and old versions of
			phpBugTracker in separate databases or separated by
			different table prefixes you can run both versions
			without any interference. But there will also be no
			interaction between the two versions. To be able to
			work with your old bugs in the new version your old
			database will have to be upgraded one day.
			</p>

<form action="install.php" method="post">
	<input type="hidden" name="db_type" value="<?php echo $db_type; ?>">
	<input type="hidden" name="db_host" value="<?php echo $db_host; ?>">
	<input type="hidden" name="db_database" value="<?php echo $db_database; ?>">
	<input type="hidden" name="db_user" value="<?php echo $db_user; ?>">
	<input type="hidden" name="db_pass" value="<?php echo $db_pass; ?>">
	<input type="hidden" name="tbl_prefix" value="<?php echo $tbl_prefix; ?>">
	<input type="hidden" name="phpbt_email" value="<?php echo $phpbt_email; ?>">
	<input type="hidden" name="admin_login" value="<?php echo $admin_login; ?>">
	<input type="hidden" name="admin_pass" value="">
	<input type="hidden" name="admin_pass2" value="">
	<input type="hidden" name="encrypt_pass" value="<?php echo $encrypt_pass; ?>">
	<input type="submit" value="Change Options">
</form>

			<hr>
			<h4>2. Force an install</h4>
			<p>
			This is usually a bad choice. If you have tried to
			install phpBugTracker but failed and now think that
			the problem is solved a forced install might be what
			you want. Another possibility would be to instead
			remove the half-installed database or tables to allow
			a normal install.
			</p>

<form action="install.php" method="post">
	<input type="hidden" name="op" value="<?php echo $op; ?>">
	<input type="hidden" name="db_type" value="<?php echo $db_type; ?>">
	<input type="hidden" name="db_host" value="<?php echo $db_host; ?>">
	<input type="hidden" name="db_database" value="<?php echo $db_database; ?>">
	<input type="hidden" name="db_user" value="<?php echo $db_user; ?>">
	<input type="hidden" name="db_pass" value="<?php echo $db_pass; ?>">
	<input type="hidden" name="tbl_prefix" value="<?php echo $tbl_prefix; ?>">
	<input type="hidden" name="phpbt_email" value="<?php echo $phpbt_email; ?>">
	<input type="hidden" name="admin_login" value="<?php echo $admin_login; ?>">
	<input type="hidden" name="admin_pass" value="<?php echo $admin_pass; ?>">
	<input type="hidden" name="admin_pass2" value="<?php echo $admin_pass2; ?>">
	<input type="hidden" name="encrypt_pass" value="<?php echo $encrypt_pass; ?>">
	<input type="hidden" name="force_install" value="1">
	<input type="submit" value="Force Install !">
</form>

			<hr>
			<h4>3. Save options and Upgrade</h4>
		<p>
			If phpBugTracker is already installed upgrading the
			database is almost always the right thing to do. This
			will let you use the new version of phpBugTracker with
			your old bugs.
		</p><p>
			<em>Notice</em>: Your database will be modified during
			the upgrade. There is no guarantee that an earlier
			version of phpBugTracker can still be used after an
			upgrade. We hope that the upgrade will go smooth and
			that the new version is stable enough for you to
			use. But you are warned: There is no easy way
			back. Please backup your database before continuing.
		</p>

<form action="install.php" method="post">
	<input type="hidden" name="db_type" value="<?php echo $db_type; ?>">
	<input type="hidden" name="db_host" value="<?php echo $db_host; ?>">
	<input type="hidden" name="db_database" value="<?php echo $db_database; ?>">
	<input type="hidden" name="db_user" value="<?php echo $db_user; ?>">
	<input type="hidden" name="db_pass" value="<?php echo $db_pass; ?>">
	<input type="hidden" name="tbl_prefix" value="<?php echo $tbl_prefix; ?>">
	<input type="hidden" name="phpbt_email" value="<?php echo $phpbt_email; ?>">
	<input type="hidden" name="admin_login" value="<?php echo $admin_login; ?>">
	<input type="hidden" name="admin_pass" value="<?php echo $admin_pass; ?>">
	<input type="hidden" name="admin_pass2" value="<?php echo $admin_pass2; ?>">
	<input type="hidden" name="encrypt_pass" value="<?php echo $encrypt_pass; ?>">
	<input type="hidden" name="no_install" value="1">
	<input type="submit" value="Save Options">
	<?php if (@is_writeable('config.php')) { ?>
		<p>
			When you click the button config.php will be saved to
		disk. Afterwards you will be able to upgrade the bug tracker.
		</p>
		<input type="hidden" name="op" value="save_config_file" />
	<?php } else { ?>
		<p>
			Since config.php is not writeable by this script, when
		you click the button you will be prompted to save config.php.
		Copy this file to the location of the bug tracker. Afterwards
		you will be able to <a href="upgrade.php">upgrade the bug
		tracker</a>.
		</p>
		<input type="hidden" name="op" value="dump_config_file" />
	<?php } ?>
</form>

			<br>
			<hr size="1" width="300">
		</td>
	</tr>
</table>
</body>
</html>

Index: install-complete.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/install-complete.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- install-complete.html	25 Oct 2004 12:07:04 -0000	1.7
+++ install-complete.html	30 Sep 2005 21:56:54 -0000	1.8
@@ -1,11 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Trasitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
+<head>
 	<title><?php echo translate("phpBugTracker Installation"); ?></title>
 	<link rel="StyleSheet" href="styles/default.css" type="text/css">
+	<meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
 </head>
 <body bgcolor="#ffffff" link="#006699" vlink="#006699" alink="#006699">
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
-		<td width="200" valign="top"><br><img src="logo.jpg"></td>
+		<td width="200" valign="top"><br />
+			<table border="0" cellpadding="0" cellspacing="3">
+				<tr>
+					<td>
+						<img src="logo.jpg" alt="phpBugTracker Logo" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<ul>
+							<li><a href="README">README</a></li>
+							<li><a href="INSTALL">INSTALL</a></li>
+							<li><a href="UPGRADING">UPGRADING</a></li>
+							<li><a href="docs/html/index.html">Documentation</a>
+							<li><a href="COPYING">LICENSE</a></li>
+						</ul>
+					</td>
+				</tr>
+			</table>
+		</td>
 		<td valign="top">
 			<div class="banner"><?php echo translate("phpBugTracker Installation"); ?></div>
 			The database tables have been created and the config file has been

Index: install-failure.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/install-failure.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- install-failure.html	31 May 2005 18:49:39 -0000	1.1
+++ install-failure.html	30 Sep 2005 21:56:54 -0000	1.2
@@ -1,12 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Trasitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
 	<title><?php echo translate("phpBugTracker Installation"); ?></title>
 	<link rel="StyleSheet" href="styles/default.css" type="text/css">
+	<meta http-equiv="Content-type" content="text/html; charset=iso-8859-1" />
 </head>
 <body bgcolor="#ffffff" link="#006699" vlink="#006699" alink="#006699">
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
-		<td width="200" valign="top"><br><img src="logo.jpg"></td>
+		<td width="200" valign="top"><br />
+			<table border="0" cellpadding="0" cellspacing="3">
+				<tr>
+					<td>
+						<img src="logo.jpg" alt="phpBugTracker Logo" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<ul>
+							<li><a href="README">README</a></li>
+							<li><a href="INSTALL">INSTALL</a></li>
+							<li><a href="UPGRADING">UPGRADING</a></li>
+							<li><a href="docs/html/index.html">Documentation</a>
+							<li><a href="COPYING">LICENSE</a></li>
+						</ul>
+					</td>
+				</tr>
+			</table>
+		</td>
 		<td valign="top">
 			<div class="banner"><?php echo translate("phpBugTracker Installation"); ?></div>
 			<br>

Index: install.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/install.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- install.html	20 Jun 2005 01:05:29 -0000	1.11
+++ install.html	30 Sep 2005 21:56:54 -0000	1.12
@@ -19,7 +19,26 @@
 <form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 	<tr>
-		<td width="200" valign="top"><br /><img src="logo.jpg" alt="phpBugTracker Logo" /></td>
+		<td width="200" valign="top"><br />
+			<table border="0" cellpadding="0" cellspacing="3">
+				<tr>
+					<td>
+						<img src="logo.jpg" alt="phpBugTracker Logo" />
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<ul>
+							<li><a href="README">README</a></li>
+							<li><a href="INSTALL">INSTALL</a></li>
+							<li><a href="UPGRADING">UPGRADING</a></li>
+							<li><a href="docs/html/index.html">Documentation</a>
+							<li><a href="COPYING">LICENSE</a></li>
+						</ul>
+					</td>
+				</tr>
+			</table>
+		</td>
 		<td valign="top" align="center">
 			<div class="banner"><?php echo translate("phpBugTracker Installation"); ?></div>
 			<?php if (!empty($error))  echo "<div class=\"error\">$error</div>"; ?>

[phpBT-dev] CVS: phpbt install.php,1.54,1.55

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22440

Modified Files:
	install.php 
Log Message:
Updating the install files with links to README, INSTALL and UPGRADING.
Installing on top of an earlier install will offer to run upgrade.php


Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- install.php	3 Sep 2005 16:53:05 -0000	1.54
+++ install.php	30 Sep 2005 21:56:53 -0000	1.55
@@ -204,7 +204,25 @@
 	global $_POST, $tables;
 	global $db, $log_text, $num_errors;
 
-	$db = test_database($_POST);
+	$query = 'select count(*) from '.$_POST['tbl_prefix'].'configuration';
+	$count = $db->getOne($query);
+	if (!DB::isError($count) && empty($_POST['force_install'])) {
+		$op = $_POST['op'];
+		$db_type = $_POST['db_type'];
+		$db_host = $_POST['db_host'];
+		$db_database = $_POST['db_database'];
+		$db_user = $_POST['db_user'];
+		$db_pass = $_POST['db_pass'];
+		$tbl_prefix = $_POST['tbl_prefix'];
+		$phpbt_email = $_POST['phpbt_email'];
+		$admin_login = $_POST['admin_login'];
+		$admin_pass = $_POST['admin_pass'];
+		$admin_pass2 = $_POST['admin_pass2'];
+		$encrypt_pass = $_POST['encrypt_pass'];
+		include('templates/default/install-question.html');
+		exit;
+	}
+
 	$db->setOption('optimize', 'portability');
 
 	$db->setErrorHandling(PEAR_ERROR_CALLBACK, "handle_install_error");
@@ -267,18 +285,22 @@
 }
 
 function dump_config_file() {
+	global $db;
 
 	if (!check_vars()) return;
-	create_tables();
+	$db = test_database($_POST);
+	if (empty($_POST['no_install'])) create_tables();
 	header('Content-Type: text/x-delimtext; name="config.php"');
 	header('Content-disposition: attachment; filename=config.php');
 	echo grab_config_file();
 }
 
 function save_config_file() {
+	global $db;
 
 	if (!check_vars()) return;
-	create_tables();
+	$db = test_database($_POST);
+	if (empty($_POST['no_install'])) create_tables();
 	if (!$fp = @fopen('config.php', 'w')) {
 		show_front(translate("Error writing to config.php"));
 	} else {
@@ -292,7 +314,11 @@
 	global $t, $_POST;
 
 	$login = $_POST['admin_login'];
-	include('templates/default/install-complete.html');
+	if (!empty($_POST['no_install'])) {
+		header("Location: upgrade.php");
+		exit;
+	}
+	include('templates/default/install-complete.html');	
 }
 
 function show_front($error = '') {
@@ -314,14 +340,15 @@
 		case 'dbtest' : test_database($_GET, true); break;
 	}
 } else {
+	$error = '';
+
 	if (!get_magic_quotes_gpc()) {
-	        echo "<p>magic_quotes_gpc is OFF!</p>";
-	        echo "<p>You must have magic_quotes_gpc set to On either in php.ini or in ";
-	        echo ".htaccess (see <a href=\"http://www.php.net/manual/en/configuration.php\">http://www.php.net/manual/en/configuration.php</a> for more info).</p>";
-	}
-	else {
-		show_front();
+		$error .= "<p><hr></p><p>magic_quotes_gpc is OFF!</p>".
+			"<p>You must have magic_quotes_gpc set to On either in php.ini or in ".
+			".htaccess (see <a href=\"http://www.php.net/manual/en/configuration.php\">http://www.php.net/manual/en/configuration.php</a> for more info).</p><p><hr></p>";
 	}
+
+	show_front($error);
 }
 // Any whitespace below the end tag will disrupt config.php
 ?>
\ No newline at end of file

[phpBT-dev] CVS: phpbt/templates/default bugdisplay.html,1.53,1.54

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17927/templates/default

Modified Files:
	bugdisplay.html 
Log Message:
Allow admins and project admins to delete bugs


Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- bugdisplay.html	22 Sep 2005 20:51:50 -0000	1.53
+++ bugdisplay.html	1 Oct 2005 15:19:56 -0000	1.54
@@ -268,4 +268,13 @@
 		<td><?php echo format_comments($comments[$i]['comment_text']); ?> <br><br></td>
 		</tr>
 	<?php } ?>
+	<?php if (isset($perm) && $perm->have_perm_proj($project_id)) { ?>
+		<tr class="noprint">
+		<td>
+			<div align="right">
+			<a href="bug.php?op=del&bugid=<?php echo $bug_id; ?>"><?php echo translate("Delete bug"); ?></a>
+			</div>
+		</td>
+		</tr>
+	<?php } ?>
 </table>

[phpBT-dev] CVS: phpbt bug.php,1.150,1.151 CHANGELOG,1.72,1.73

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17927

Modified Files:
	bug.php CHANGELOG 
Log Message:
Allow admins and project admins to delete bugs


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- bug.php	27 Sep 2005 19:49:42 -0000	1.150
+++ bug.php	1 Oct 2005 15:19:56 -0000	1.151
@@ -818,6 +818,11 @@
 				show_projects();
 			}
 			break;
+		case 'del':
+			$perm->check_proj();
+			delete_bug(check_id($_GET['bugid']));
+			header("Location: query.php");
+			break;
 		case 'show':
 			show_bug(check_id($_GET['bugid']));
 			break;

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpbt/phpbt/CHANGELOG,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- CHANGELOG	28 Sep 2005 19:51:26 -0000	1.72
+++ CHANGELOG	1 Oct 2005 15:19:56 -0000	1.73
@@ -10,6 +10,7 @@
 : Fixed some permissions related issues for project admins
 : Added "priority" and "dependency" to the bug history
 : Added the ability to update several bugs at once
+: Allow admins and project admins to delete bugs
 
 -- 1.0 -- 3 Aug 2005
 : Added links from project summary on home page (Phil Davis).

Re: [phpBT-dev] Towards 1.0.2

[Ulf E. <ulf...@fa...>]

Hoi,

> Actually, I meant the changes to the Italian translation and the bug  
> history fix.  I can look at the others, too, though. :)

There is also a Portuguese language update in the patches section now:
http://sourceforge.net/tracker/index.php?func=detail&aid=1304084&group_id=14939&atid=314939

I had to correct a few syntax errors.. so you might want to reuse the 
one from HEAD instead of the submitted patch.

And.. I've got even more work for you ;)

>> * Permissions fixes:
>> http://sourceforge.net/mailarchive/message.php?msg_id=12794116
>>
>> * Obvious faults in the Oracle specific code:
>> http://sourceforge.net/mailarchive/message.php?msg_id=12794118
>>
>>
>> Please don't forget
>> * Updated Italian translation:
>> http://sourceforge.net/tracker/index.php? 
>> func=detail&aid=1292068&group_id=14939&atid=314939
>>
>>
>> I've also got this old patch that might "fix" Bug #1277490 -- assign
>> http://sourceforge.net/tracker/index.php? 
>> func=detail&aid=1277490&group_id=14939&atid=114939
>> * Group permissions "editor"
>> http://sourceforge.net/mailarchive/message.php?msg_id=10827345

While going through my old commits in order to update the ChangeLog I 
found one more patch that might be interesting:

* Permission fixes for project admins
http://sourceforge.net/mailarchive/forum.php?thread_id=8106482&forum_id=4570
http://sourceforge.net/mailarchive/forum.php?thread_id=8106481&forum_id=4570

Will you please review this one too before 1.0.2?

/Ulf

[phpBT-dev] CVS: phpbt CHANGELOG,1.71,1.72

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6145

Modified Files:
	CHANGELOG 
Log Message:
Updated the CHANGLEOG to reflect current CVS HEAD


Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpbt/phpbt/CHANGELOG,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- CHANGELOG	22 Aug 2005 21:04:39 -0000	1.71
+++ CHANGELOG	28 Sep 2005 19:51:26 -0000	1.72
@@ -6,6 +6,10 @@
 : Added a simple UI to edit group permissions
 : Added support to (re)edit a query
 : Added support for sending smtp mail
+: Made the group "User" less special
+: Fixed some permissions related issues for project admins
+: Added "priority" and "dependency" to the bug history
+: Added the ability to update several bugs at once
 
 -- 1.0 -- 3 Aug 2005
 : Added links from project summary on home page (Phil Davis).

[phpBT-dev] CVS: phpbt/languages pt.php,NONE,1.1

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5621/languages

Added Files:
	pt.php 
Log Message:
Portuguese translation by Mario Valente


--- NEW FILE: pt.php ---
<?php

// pt.php - Portuguese strings and titles
// Translation by Mario Valente <ma...@va...>
// ------------------------------------------------------------------------
// Copyright (c) 2001, 2005 The phpBugTracker Group
// ------------------------------------------------------------------------
// This file is part of phpBugTracker
//
// phpBugTracker is free software; you can redistribute it and/or modify
// 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.
// ------------------------------------------------------------------------
// $Id: pt.php,v 1.1 2005/09/28 19:48:41 ulferikson Exp $

$STRING = array(
	"That attachment does not exist" => "O anexo não existe",
	"Please specify a file to upload" => "Por favor especifique um fichário para subir",
	"The file you specified is larger than %s bytes" => "O fichário especificado tem um tamanho superior a %s bytes",
	"The file you specified is larger than %d bytes" => "O fichário especificado tem um tamanho superior %d bytes",
	"That bug does not exist" => "Esse erro não existe",
	"That attachment already exists for this bug" => "Esse anexo já existe para este erro",
	"Couldn't find where to save the file!" => "foi impossível encontrar onde guardar o fichário!",
	"Couldn't create a file in the save path" => "foi impossível criar um fichário na rota de guardado",
	"There was an error moving the uploaded file" => "surgiu um erro ao mover o fichário subido",
	"Add Attachment" => "Acrescentar um anexo",
	"You do not have the permissions required for that function" => "Não tem os privilégios requeridos para esta função",
	"Bug Votes" => "Votos do erro",
	"You have already voted for this bug" => "Já votou por este erro",
	"You have reached the maximum number of votes per user" => "alcançou o número máximo de votos como usuário",
	"There is no history for this bug" => "Não há histórico para este erro",
	"Bug History" => "Histórico do erro",
	"You can not change this bug" => "Não pode modificar este erro",
	"Someone has updated this bug since you viewed it. The bug info has been reloaded with the latest changes." => "Este erro foi modificado desde sua última leitura. foi recarregado com suas últimas modificações",
	"That user does not exist" => "Este usuário não existe",
	"That bug dependency has already been added" => "Esta dependência já foi acrescentada",
	"Please enter a summary" => "Introduza um resumo",
	"Please enter a description" => "Introduza uma descrição",
	"Create Bug" => "Criar um erro",
	"View Bug" => "Ver um erro",
	"No projects found" => "Não se encontraram projetos",
	"Select Project" => "Selecionar um projeto",
	"Invalid login" => "Identificador não válido",
	"phpBugTracker Login" => "Identificador de phpBugTracker",
	"Your phpBugTracker password is %s" => "Sua palavra-passe phpBugTracker é %s",
	"Your password has been emailed to you" => "Sua palavra-passe lhe foi enviada por correio",
	"No bugs found" => "Nenhum erro encontrado",
	"Bug Summary" => "Resumo do erro",
	"Project" => "Projeto",
	"Open" => "Aberto",
	"Total" => "Total",
	"Home" => "Início",
	"Please enter the host name for your database server" => "Introduza o nome do host que alberga a sua base de dados",
	"Please enter the name of the database you will be using" => "Introduza o nome da base de dados que quer utilizar",
	"Please enter the user name for connecting to the database" => "Introduza o usuário de conexão à base de dados",
	"Please enter the phpBT email address" => "Introduza o endereço de correio electrónico phpBT",
	"Please enter the admin login" => "Introduza o identificador do administrador",
	"Please use a valid email address for the admin login" => "Introduza o endereço de correio electrónico válido como identificador para o administrador",
	"Please enter the admin password" => "Introduza a palavra-passe do administrador",
	"Please confirm the admin password" => "Confirme a palavra-passe do administrador",
	"The admin passwords don't match" => "As palavras-passe do administrador não coincidem",
	"Error writing to config.php" => "Erro ao escrever em config.php",
	"Please enter a login" => "Introduza um identificador",
	"Please enter a valid email" => "Introduza um endereço de correio electrónico válido",
	"That login has already been used" => "Este identificador já está em uso",
	"New account created" => "Nova conta criada",
	"Create new account" => "Criar uma nova conta",
	"Query Bugs" => "Pesquisa de erros",
	"Bug List" => "Lista de erros",
	"Assigned To" => "Atribuído a ",
	"Reporting" => "Estatísticas",
	"Bug Counts by Date" => "Numero de erros por data",
	"Your bug list column preferences have been saved" => "Suas preferências para as colunas da lista de erros foram guardadas",
	"Please enter a password" => "Introduza uma palavra-passe",
	"Those passwords don't match -- please try again" => "As palavras-passe não coincidem -- tente-o de novo",
	"Password changed" => "Palavra-passe modificada",
	"Changes Saved" => "Modificações guardadas",
	"Preferences changed" => "Preferências modificadas",
	"Receive notifications of bug changes via email" => "Receber as notificações de modificações de erros por correio",
	"Show saved queries on the homepage" => "Mostrar as consultas guardadas na página de início",
	"User preferences" => "Preferências de usuário",
	"Configuration" => "Configuração",
	"Please enter a name" => "Introduza um nome",
	"Edit Database" => "Editar a base de dados",
	"Database List" => "Lista de base de dados",
	"Edit Group" => "Editar os grupos",
	"Group List" => "Lista de grupos",
	"Edit Operating System" => "Editar os sistemas operacionais",
	"Operating System List" => "Lista de sistemas operacionais",
	"Please enter a version" => "Introduza uma versão",
	"Edit Version" => "Editar as versões",
	"Edit Component" => "Editar os componentes",
	"You cannot choose specific groups when \"All Groups\" is chosen" => "Não pode escolher grupos quando \"Todos os Grupos\" está selecionado",
	"Edit Project" => "Editar os projetos",
	"Project List" => "Lista de projetos",
	"Edit Resolution" => "Editar as resoluções",
	"Resolution List" => "Lista de resoluções",
	"Edit Severity" => "Editar as severidades",
	"Severity List" => "Lista de severidades",
	"Edit Site" => "Editar os sítios",
	"Site List" => "Lista de sítios",
	"Edit Status" => "Editar os estados",
	"Status List" => "Lista de estados",
	"Please enter an email" => "Introduza o endereço de correio",
	"Edit User" => "Editar os usuários",
	"User List" => "Lista de usuários",
	"Name" => "Nome",
	"Description" => "Descrição",
	"Owner" => "Proprietário",
	"None" => "Nenhum",
	"Active" => "Ativo",
	"Submit" => "Enviar",
	"Add new project" => "Acrescentar um novo projeto",
	"Created Date" => "Data de criação",
	"Yes" => "Se",
	"No" => "Não",
	"Variable" => "Variável",
	"Value" => "Valor",
	"Information" => "Informação",
	"description" => "descrição",
	"Sort Order" => "Ordem de classificação",
	"Database list" => "Lista de base de dados",
	"Add new database" => "Acrescentar uma nova base de dados",
	"Are you sure you want to delete this item?" => "Está seguro de querer apagar este elemento?",
	"Delete" => "Suprimir",
	"Add new group" => "Acrescentar um novo grupo",
	"Users" => "Usuários",
	"Locked" => "Bloqueado",
	"This will remove all user assignments to this group and the group itself. Continue?" => "Isto eliminará todas as atribuições de usuários a este grupo e o próprio grupo. Continuar?",
	"This will remove all user assignments to this group.  Continue?" => "Isto eliminará todas as atribuições de usuários a este grupo. Continuar?",
	"Purge" => "Purgar",
	"Assignable" => "Atribuível",
	"Find Bug" => "Procurar por número de erro",
	"Projects" => "Projetos",
	"Groups" => "Grupos",
	"Documentation" => "Documentação",
	"User Tools" => "Ferramentas de usuário",
	"Statuses" => "Estados",
	"Resolutions" => "Resoluções",
	"Severities" => "Severidades",
	"Operating Systems" => "Sistemas operacionais",
	"Databases" => "base de dados",
	"Sites" => "Sítios",
	"Regex" => "Expressions regulares",
	"Add new operating system" => "Acrescentar um novo sistema operacional",
	"Are you sure you want to delete this OS" => "Está seguro de que quer eliminar este sistema operacional?",
	"Items with a Sort Order = 0 will not be selectable by users." => "Os elementos com uma ordem de classificação = 0 não seran seleccionáveis pelos usuários.",
	"Only those items that have no bugs referencing them can be deleted." => "Só os elementos que não tem referências a erros podem ser eliminados.",
	"Project Information" => "Informação do projeto",
	"Version Information" => "Informação da versão",
	"Initial Version" => "Versão inicial",
	"Component Information" => "Informação do componente",
	"Initial Component Name" => "Nome do componente inicial",
	"Only users in the following groups can see this project" => "Só os usuários dos grupos seguintes podem ver este projeto",
	"These developers can administer this project" => "Estes desenvolvedores podem administrar o projeto",
	"Versions" => "Versões",
	"Add new version" => "Acrescentar uma nova versão",
	"Version" => "Versão",
	"Created" => "Criado",
	"No versions found" => "Nenhuma versão encontrada",
	"Components" => "Componentes",
	"Add new component" => "Acrescentar um novo componente",
	"Component" => "Componente",
	"No components found" => "Nenhum componente encontrado",
	"Add new resolution" => "Acrescentar uma nova resolução",
	"Are you sure you want to delete this resolution?" => "Está seguro de querer eliminar esta resolução?",
	"Row Color" => "Cor de fila",
	"Add new severity" => "Acrescentar uma nova severidade",
	"Are you sure you want to delete this severity?" => "Está seguro de querer eliminar esta severidade",
	"Add new site" => "Acrescentar uma nova severidade",
	"Open/Closed" => "Aberto/Fechado",
	"Closed" => "Fechado",
	"Add new status" => "Acrescentar um novo estado",
	"Login" => "Identificador",
	"Email" => "Correio",
	"First Name" => "Primeiro Nome",
	"Last Name" => "Ultimo Nome",
	"Password" => "Palavra-passe",
	"User Groups" => "Grupos dos usuários",
	"Email Notify" => "Notificar por correio",
	"Add new user" => "Acrescentar um novo usuário",
	"Filter" => "Filtro",
	"Bug" => "Erro",
	"Reporter" => "Informador",
	"Assigned to" => "Atribuído a",
	"Status" => "Estado",
	"Resolution" => "Resolução",
	"Severity" => "Severidade",
	"Priority" => "Prioridade",
	"Operating System" => "Sistema operacional",
	"Summary" => "Resumo",
	"URL" => "URL",
	"Depends on bugs" => "Depende dos errores",
	"Blocks bugs" => "Bloqueia os errores",
	"Comments" => "Comentários",
	"Posted by" => "Colocado por",
	"Back to bug" => "Voltar para erro",
	"You must login to modify this bug" => "Deve identificar-se no sistema para modificar este erro",
	"Return to bug list" => "Voltar para a lista de erros",
	"Previous bug" => "Erro anterior",
	"Next bug" => "Erro seguinte",
	"To be closed in version" => "A fechar na versão",
	"Choose one" => "Escolha um",
	"Database" => "Base de dados",
	"Closed in version" => "Fechado na versão",
	"Site" => "Sítio",
	"Add CC" => "Acrescentar cópia de carvão (DC)",
	"Add dependency" => "Acrescentar uma dependência",
	"Remove dependency" => "Eliminar uma dependência",
	"Remove selected CCs" => "Eliminar os destinatários de cópias gerais (DC) selecionados",
	"Additional comments" => "Comentários adicionais",
	"Supress notification email" => "Eliminar a notificação por correio",
	"Attachments" => "Anexos",
	"Create new attachment" => "Criar um novo anexo",
	"Size" => "Tamanho",
	"Type" => "Tipo",
	"Are you sure you want to delete this attachment?" => "Está seguro de querer eliminar este anexo?",
	"No attachments found for this bug" => "Nenhum anexo achado para este erro",
	"Vote for this bug" => "Votar por este erro",
	"View votes" => "Ver os votos",
	"View bug history" => "Ver o histórico deste erro",
	"Date" => "Data",
	"Who" => "Quem",
	"What" => "Que",
	"Old Value" => "Antigo valor",
	"New Value" => "Novo valor",
	"When" => "Quando",
	"No history found for this bug" => "Não se encontrou a história para este erro",
	"Download to spreadsheet" => "Descarregar em uma folha de cálculo",
	"No votes found for this bug" => "Não se encontraram votos para este erro",
	"Back" => "Voltar",
	"Five most recently submitted bugs" => "Cinco últimos erros remetidos",
	"Five most recently closed bugs" => "Cinco últimos erros fechados",
	"Saved Queries" => "Consultas guardadas",
	"The image path is not writeable" => "A rota de acesso das imagens não tem acesso de escritura",
	"Quick Stats" => "Estatísticas rapidamente",
	"# bugs" => "Número de erros",
	"phpBugTracker Installation" => "Instalação de phpBugTracker",
	"DB Test Failure" => "Falha na prova da base de dados",
	"The installation script could not connect to the database <b>%s</b> on the host <b>%s</b> using the specified username and password.<br>Please check these details are correct and that the database already exists then retry." => "O script de instalação não pôde conectar-se à base de dados <b>%s</b> no host <b>%s</b> usando o usuarioy a palavra-passe especificadas.<br>Verifique que a informação subministrada é correta e que a base de dados existe, e repita.",
	"DB Test Success" => "Êxito na prova da base de dados",
	"The installation script successfully connected to the database <b>%s</b> on the host <b>%s</b> using the specified username and password.<br>Congratulations!" => "O script de instalação se conectou com êxito à base de dados <b>%s</b> no host <b>%s</b> usando o usuário e a palavra-passe especificados.<br>Parabéns!",
	"Close window" => "Fechar a janela",
	"Database Options" => "Opções da base de dados",
	"Database Name" => "Nome da base de dados",
	"This database must already exist" => "Esta base de dados já deve existir",
	"User" => "Usuário",
	"Table Prefix" => "Prefixo da tabela",
	"Test Database Connection" => "Prova de conexão à base de dados",
	"phpBT Email" => "Correio de phpBT",
	"The email address used for sending bug updates, etc." => "Direção de correio utilizada para as enviar atualizações de erros, etc.",
	"Admin Login" => "Início de sessão do administrador",
	"Must be a valid email address" => "Deve ser o endereço de correio válido",
	"Admin Password" => "Palavra-passe do administrador",
	"Confirm Password" => "Confirmar palavra-passe",
	"Encrypt Passwords in DB" => "Encriptar as palavras-passe na base de dados",
	"When you submit the form, the database tables will be created and config.php will be saved to disk.  You will then be able to login and use the bug tracker." => "Quando envia o formulário, as pranchas da base de dados serão criadas e o fichário de configuração config.php será guardado em disco. Poderá então identificar-se e usar phpBugTracker.",
	"Since config.php is not writeable by this script, when you submit this form
you will be prompted to save config.php.  Copy this file to
the location of the bug tracker, and then you will be able to
<a href=\index.php\>login to the bug tracker</a>.  From the
home page you can go to the Admin Tools and customize your
installation via the Configuration link.  Once you have
completed the configuration, you will be ready to add a project and
start reporting bugs!" => "Posto que este script não pode escrever no fichário config.php, quando enviar este formulário
se le pedirá que guarde o ficheiro config.php. Copie-lo adonde se encontra
phpBugTracker, e poderá então
<a href=\index.php\>conectar-se a phpBugTracker</a>. Desde a página de inicio,
poderá aceder às ferramentas de administração e personalizar sua
instalação a través da ligação de Configuração. Quando concluir
a configuração, estará pronto para introduzir um projeto
e começar a reportar erros!",
	"Save Options" => "Guardar as opções",
	"User Login" => "Identificador do usuário",
	"Invalid login and/or password" => "Identificador ou palavra-passe não válido",
	"Your password has been mailed to you" => "Sua palavra-passe lhe foi enviada por correio",
	"Email my password" => "Evia-me minha palavra-passe por correio",
	"Open a new account" => "Criar uma nova conta",
	"You have been logged out" => "Saiu do sistema",
	"Return to phpBugTracker home" => "Voltar para a página de início de phpBugTracker",
	"Sorry, but the self-creation of new accounts has been disabled.  Please contact the administrator to have an account created for you." => "A auto-criação de contas de usuário foi desabilitada. Fique em contato com o administrador para que lhe crie uma conta.",
	"Create a new account" => "Criar uma nova conta",
	"optional" => "opcional",
	"Thanks for creating an account.  Check your email for your password." => "Obrigado por ter criado uma conta. Receberá sua palavra-passe em seu correio eletrónico.",
	"First, you must pick a product on which to enter a bug." => "Primeiro, deve escolher um produto sobre o que remeter um erro.",
	"All" => "Todos",
	"Sort by" => "Ordenar por",
	"Bug number" => "Número de erro",
	"Ascending" => "Ascendente",
	"Descending" => "Descendente",
	"Save this query as" => "Guardar esta consulta como",
	"Reset to default query" => "Voltar para a consulta por defeito",
	"Are you sure you want to delete this saved query?" => "Está seguro de querer eliminar a consulta?",
	"Go to the advanced query page" => "Ir à página de consulta avançada",
	"Reported on Site" => "Remetido sobre o sítio",
	"matching as" => "coincide com",
	"regexp" => "expressão regular",
	"not regexp" => "expressão não regular",
	"substring" => "subcadeia",
	"exact" => "exatamente",
	"A description entry" => "Uma breve descrição",
	"Created Date Range" => "Fila de datas de criação",
	"to" => "a",
	"Closed in Version" => "Fechado na versão",
	"To be Closed in Version" => "A fechar na versão",
	"Sort By" => "Ordenar por",
	"Go to the simple query page" => "Ir à página de consulta simples",
	"Show bug statistics for the selected project" => "Mostrar as estatísticas de erros para o projeto selecionado",
	"All projects" => "Todos os projetos",
	"Go" => "Ir",
	"Bug Resolutions" => "Resoluções de erros",
	"Unassigned" => "Não atribuído",
	"Upgade phpBugTracker" => "Atualização de phpBugTracker",
	"Your database has been updated." => "Sua base de dados foi atualizada.",
	"phpBugTracker home" => "Inicio phpBugTracker",
	"This script will upgrade your database from version %s to version %s of phpBugTracker." => "Este script atualizará sua base de dados da versão %s à versão %s de phpBugTracker.",
	"Do it!" => "Faça-o!",
	"Change Password" => "Modificar a palavra-passe",
	"Enter new password" => "Introduza uma nova palavra-passe",
	"Verify password" => "Verifique sua palavra-passe",
	"Change Preferences" => "Modificar as preferências",
	"Number of results per page" => "Número de resultados por página",
	"Bug List Columns" => "Colunas da lista de erros",
	"Choose the fields you want to see in the bug list" => "Escolha os campos que quer ver na lista de erros",
	"Votes" => "Votos",
	"Are you sure you want to delete this vote?" => "Está seguro de querer apagar este voto?",
	"Add a new bug" => "Acrescentar um erro",
	"View Reports" => "Ver as estatísticas",
	"Create a New Account" => "Criar uma nova conta",
	"Read Documentation" => "Ver a documentação",
	"Administration Tools" => "Ferramentas de administração",
	"Email Password" => "Enviar a palavra-passe por correio",
	"Forgot your password?  Have it sent to you" => "esqueceu sua palavra-passe? Envie-lhe",
	"Remember %s for next time" => "Recordar %s para a próxima vez",
	"Remember me" => "Lembra-me",
	"Bugs assigned to me" => "Os erros que me foram atribuídos",
	"Bugs reported by me" => "Os erros que atribuí",
	"Personal Page" => "Página pessoal",
	"Logout %s" => "Desconectar %s",
	"You do not have the rights to view this project." => "Não tem privilégios para ver este projeto.",
	"Unable to load JPGraph" => "foi impossível carregar JPGraph",
	"Unable to load JPGraph pie class" => "Impossível carregar a classe de bolo do JPGraph",
	"There was a problem when trying to use the JPGraph library. Please fix or disable by setting 'USE_JPGRAPH' to 'NO' on the Configuration page of the Administration Tools." => "Há ocorrido um problema ao tentar usar a livraria JPGraph. Por favor arranje este erro ou desabilite usando 'USE_JPGRAPH' a 'NÃO' na página de configuração das Ferramentas Administrativas.",
	);

?>

[phpBT-dev] CVS: phpbt/templates/default buglist.html,1.17,1.18

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3853/templates/default

Modified Files:
	buglist.html 
Log Message:
Fixes for Edit Query and Mass Update


Index: buglist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/buglist.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buglist.html	24 Sep 2005 21:53:43 -0000	1.17
+++ buglist.html	27 Sep 2005 19:49:42 -0000	1.18
@@ -57,20 +57,7 @@
 </div>
 <?php } ?>
 <div align="left">
-	<a href="query.php?op=edit<?php
-		$paramstr = '';
-		foreach ($_GET as $k => $v) {
-			$$k = $v;
-			if ($k == 'op') continue;
-			if (is_array($v)) {
-				foreach ($v as $value) {
-					$paramstr .= "&{$k}[]=$value";
-				}
-			} else {
-				$paramstr .= "&$k=$v";
-			}
-		}
-		echo $paramstr; ?>"><?php echo translate("Edit this query"); ?></a>
+	<a href="query.php?op=edit"><?php echo translate("Edit this query"); ?></a>
 </div>
 <?php if ($mass_update) { ?>
 	<hr>

[phpBT-dev] CVS: phpbt bug.php,1.149,1.150 query.php,1.105,1.106

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3853

Modified Files:
	bug.php query.php 
Log Message:
Fixes for Edit Query and Mass Update


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- bug.php	24 Sep 2005 21:53:43 -0000	1.149
+++ bug.php	27 Sep 2005 19:49:42 -0000	1.150
@@ -513,7 +513,7 @@
 		}
 	}
 
-	header("Location: query.php?op=doquery");
+	header("Location: query.php");
 }
 
 function add_attachment($bugid, $description) {

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- query.php	22 Aug 2005 20:44:16 -0000	1.105
+++ query.php	27 Sep 2005 19:49:42 -0000	1.106
@@ -46,6 +46,9 @@
 
 	if ($edit) {
 		extract($_GET);
+		if (isset($_SESSION['queryinfo']['queryparams'])) {
+			extract($_SESSION['queryinfo']['queryparams']);
+		}
 		$t->assign('project', isset($projects) ? $projects : null);
 		$t->assign('version', isset($versions) ? $versions : null);
 		$t->assign('component', isset($components) ? $components : null);
@@ -365,6 +368,9 @@
 	if (empty($_SESSION['queryinfo'])) $_SESSION['queryinfo'] = array();
 	$_SESSION['queryinfo']['order'] = $db_headers[$order];;
 	$_SESSION['queryinfo']['sort'] = $sort;
+	if (empty($_SESSION['queryinfo']['queryparams']) || !empty($_GET)) {
+	      $_SESSION['queryinfo']['queryparams'] = $_GET;
+	}
 
 	if (empty($_SESSION['queryinfo']['query']) or isset($op)) {
 		list($_SESSION['queryinfo']['query'], $paramstr) =

[phpBT-dev] Re: [Phpbt-users] functions.php --> PHP Warning: in_array()

[Ulf E. <ulf...@fa...>]

Hi Marco,

> I got an Warning in my apache error_log, which says
> 
> [error] PHP Warning:  in_array(): Wrong datatype for second argument 
> in /var/www/htdocs/phpbugtracker/inc/functions.php on line 

What line?

> in my functions.php at this line is
> 
> 	if (($selected == $row['user_id']) || in_array($row['user_id'], $selected)) 

What version of phpBugTracker is this?

The 'owner' case of the big switch in build_select() was modified from 
what you quote above by this patch:
http://cvs.sourceforge.net/viewcvs.py/phpbt/phpbt/inc/functions.php?r1=1.44.2.10&r2=1.44.2.11&only_with_tag=htmltemplates

The fix has since been included in 1.0rc5, 1.0rc6, v1.0, and v1.0.1.

> Does anybody now about this problem ?

I'd say that it is known and fixed.. but please let me know if I am 
looking at the wrong issue

> It occurs, when I load bugdisplay.html and it calls the function 
> build_select('owner', $assigned_to) .

/Ulf

[phpBT-dev] functions.php --> PHP Warning: in_array()

[Marco K. <kuh...@we...>]

hallo list,

I got an Warning in my apache error_log, which says

[error] PHP Warning:  in_array(): Wrong datatype for second argument 
in /var/www/htdocs/phpbugtracker/inc/functions.php on line 

in my functions.php at this line is

	if (($selected == $row['user_id']) || in_array($row['user_id'], $selected)) 

Does anybody now about this problem ?
It occurs, when I load bugdisplay.html and it calls the function 
build_select('owner', $assigned_to) .

thanks for the great bugtracker

best

marco 

[phpBT-dev] CVS: phpbt/templates/default buglist.html,1.16,1.17

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13431/templates/default

Modified Files:
	buglist.html 
Log Message:
RFE #467256 -- Multiple-bug update feature
RFE #591584 -- Enhancement: Changing multiple bugs
Allow (project) admins to alter several bugs from a query list at the same time



Index: buglist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/buglist.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- buglist.html	22 Aug 2005 20:40:08 -0000	1.16
+++ buglist.html	24 Sep 2005 21:53:43 -0000	1.17
@@ -1,3 +1,16 @@
+<?php	
+	$project_id = 0;
+	if (isset($_GET['projects']) && is_numeric($_GET['projects'])) {
+		$project_id = (int)$_GET['projects'];
+	}
+	$mass_update = false;
+	if (!empty($_SESSION['uid']) && isset($perm) && $perm->have_perm_proj($project_id)) {
+		$mass_update = true;
+	}
+?>
+<form action="bug.php" method="post">
+<input type="hidden" name="op" value="mass_update">
+<input type="hidden" name="last_modified_date" value="<?php echo empty($now) ? time() : $now; ?>">
 <table class="bordertable" align="center" style="width: 100%">
 	<tr>
 		<?php for ($i = 0, $colcount = count($db_fields); $i < $colcount; $i++) { 
@@ -18,9 +31,18 @@
  					<tr class="bugrow<?php echo ($i % 2 != 0) ? ' alt' : ''; ?>">
 				<?php } ?> 
 				<?php 
+					$n = 1;
 					foreach ($bugs[$i] as $var => $val) {
 						if ($var == 'bug_link_id') $bugid = $val;
-						elseif ($var != 'severity_color' && $var != 'priority_color') echo '<td>'.format_bug_col($val, $var, $bugid, $i).'</td>';
+						elseif ($var != 'severity_color' && $var != 'priority_color') {
+							echo '<td>';
+							if ($mass_update && $n==1) {
+								echo "<input type=\"checkbox\" name=\"bugids[]\" value=\"$bugid\"> &nbsp; ";
+							}
+							echo format_bug_col($val, $var, $bugid, $i);
+							echo '</td>';
+							$n = $n + 1;
+						}
 					}
 				?>
 			</tr>
@@ -28,6 +50,7 @@
 	<?php } ?>
 </table>
 <?php include('admin/pagination.html'); ?>
+<div class="noprint">
 <?php if ($has_excel) { ?>
 <div align="center">
 	<a href="query.php?xl=1"><?php echo translate("Download to spreadsheet"); ?></a>
@@ -49,3 +72,48 @@
 		}
 		echo $paramstr; ?>"><?php echo translate("Edit this query"); ?></a>
 </div>
+<?php if ($mass_update) { ?>
+	<hr>
+	<table border="0" width="100%" cellspacing="0" cellpadding="2">
+	<tr>
+<?php if ($project_id > 0) { ?>
+		<td><?php echo translate("Component"); ?>:
+		<select name="component_id"><option value="-1" selected>No Change</option><?php build_select('component', -1, $projects) ?></select></td>
+		<td><?php echo translate("Version"); ?>:
+		<select name="version_id"><option value="-1" selected>No Change</option><?php build_select('version', -1, $projects) ?></select></td>
+	</tr><tr>
+<?php } ?>
+		<td><?php echo translate("Priority"); ?>:
+		    <select name="priority"><option value="-1" selected>No Change</option><?php build_select('priority', -1) ?></select></td>
+		<td><?php echo translate("Status"); ?>:
+		    <select name="status_id"><option value="-1" selected>No Change</option><?php build_select('status', -1) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("Severity"); ?>:
+		<select name="severity_id"><option value="-1" selected>No Change</option><?php build_select('severity', -1) ?></select></td>
+		<td><?php echo translate("Resolution"); ?>:
+		<select name="resolution_id"><option value="-1" selected>No Change</option><option value="0"><?php echo translate("None"); ?></option><?php build_select('resolution', -1) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("Assigned to"); ?>:
+		<?php if (isset($perm) && ($perm->have_perm('EditAssignment') or $perm->have_perm_proj($projects))) { ?>
+		<select name="assigned_to"><option value="-1" selected>No Change</option><option value="0"><?php echo translate("None"); ?></option><?php build_select('owner', -1) ?></select></td>
+		<?php } else { ?>
+		
+			<?php echo lookup('assigned_to', $assigned_to); ?>
+			<input type="hidden" name="assigned_to" value="<?php echo $assigned_to ?>">
+		</td>
+		<?php } ?>
+	</tr>
+	<tr class="noprint">
+		<td valign="top" colspan=2><?php echo translate("Additional comments"); ?>:<br>
+			<textarea name="comments" rows="6" cols="55" wrap="virtual" <?php echo $disabled ?>><?php echo isset($_POST['comments']) ? $_POST['comments'] : ''; ?></textarea>
+			<br><br>
+			<div align="left">
+				<?php echo translate("Supress notification email"); ?> <input type="checkbox" name="suppress_email" value="1">
+				<input type="submit" value="Submit">
+			</div>
+		</td>
+	</tr>
+	</table>
+<?php } ?>
+</div>
+</form>

[phpBT-dev] CVS: phpbt bug.php,1.148,1.149

[Ulf E. <ulf...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13431

Modified Files:
	bug.php 
Log Message:
RFE #467256 -- Multiple-bug update feature
RFE #591584 -- Enhancement: Changing multiple bugs
Allow (project) admins to alter several bugs from a query list at the same time



Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- bug.php	22 Sep 2005 20:51:49 -0000	1.148
+++ bug.php	24 Sep 2005 21:53:43 -0000	1.149
@@ -372,6 +372,9 @@
 
 	if (isset($_POST)) {
 		foreach ($_POST as $k => $v) {
+			if ($v == -1 && isset($buginfo[$k])) {
+				$v = $buginfo[$k];
+			}
 			$$k = $v;
 			if ($k == 'url') {
 				if (($v == 'http://') || ($v == 'https://')) {
@@ -388,24 +391,45 @@
 		}
 	}
 
+	$project_id = isset($project_id) ? $project_id : $buginfo['project_id'];
+
 	// Should we allow changes to be made to this bug by this user?
 	if (STRICT_UPDATING and !($u == $buginfo['assigned_to'] or
 		$u == $buginfo['created_by'] or $perm->have_perm_proj($project_id))) {
-		show_bug($bugid,array('status' => translate("You can not change this bug")));
-		return;
+		return (array('status' => translate("You can not change this bug")));
 	}
 
 	// Check for more than one person modifying the bug at the same time
-	if ($last_modified_date != $buginfo['last_modified_date']) {
-		show_bug($bugid, array('status' => translate("Someone has updated this bug since you viewed it. The bug info has been reloaded with the latest changes.")));
-		return;
+	if ($last_modified_date < $buginfo['last_modified_date']) {
+		return (array('status' => translate("Someone has updated this bug since you viewed it. The bug info has been reloaded with the latest changes.")));
 	}
 
+	$project_id = isset($project_id) ? $project_id : $buginfo['project_id'];
+	$title = isset($title) ? $title : $buginfo['title'];
+	$url = isset($url) ? $url : $buginfo['url'];
+	$severity_id = isset($severity_id) ? $severity_id : $buginfo['severity_id'];
+	$priority = isset($priority) ? $priority : $buginfo['priority'];
+	$status_id = isset($status_id) ? $status_id : $buginfo['status_id'];
+	$database_id = isset($database_id) ? $database_id : $buginfo['database_id'];
+	$to_be_closed_in_version_id = isset($to_be_closed_in_version_id) ? $to_be_closed_in_version_id : $buginfo['to_be_closed_in_version_id'];
+	$closed_in_version_id = isset($closed_in_version_id) ? $closed_in_version_id : $buginfo['closed_in_version_id'];
+	$site_id = isset($site_id) ? $site_id : $buginfo['site_id'];
+	$resolution_id = isset($resolution_id) ? $resolution_id : $buginfo['resolution_id'];
+	$assigned_to = isset($assigned_to) ? $assigned_to : $buginfo['assigned_to'];
+	$project_id = isset($project_id) ? $project_id : $buginfo['project_id'];
+	$version_id = isset($version_id) ? $version_id : $buginfo['version_id'];
+	$component_id = isset($component_id) ? $component_id : $buginfo['component_id'];
+	$os_id = isset($os_id) ? $os_id : $buginfo['os_id'];
+	$comments = isset($comments) ? $comments : null;
+	$add_cc = isset($add_cc) ? $add_cc : null;
+	$remove_cc = isset($remove_cc) ? $remove_cc : null;
+	$add_dependency = isset($add_dependency) ? $add_dependency : null;
+	$remove_dependency = isset($remove_dependency) ? $remove_dependency : null;
+
 	// Add CC if specified
 	if ($add_cc) {
 		if (!$cc_uid = $db->getOne("select user_id from ".TBL_AUTH_USER." where login = ".$db->quote(stripslashes($add_cc)))) {
-			show_bug($bugid,array('status' => translate("That user does not exist")));
-			return;
+			return (array('status' => translate("That user does not exist")));
 		}
 		$cc_already = $db->getOne('select user_id from '.TBL_BUG_CC." where bug_id = $bugid and user_id = $cc_uid");
 		if (!$cc_already && $cc_uid != $buginfo['created_by']) {
@@ -424,18 +448,15 @@
 
 		// Validate the bug number
 		if (!is_numeric($add_dependency)) {
-			show_bug($bugid, array('add_dep' => translate("That bug does not exist")));
-			return;
+			return (array('add_dep' => translate("That bug does not exist")));
 		}
 		if (!$db->getOne('select count(*) from '.TBL_BUG." where bug_id = $add_dependency")) {
-			show_bug($bugid, array('add_dep' => translate("That bug does not exist")));
-			return;
+			return (array('add_dep' => translate("That bug does not exist")));
 		}
 
 		// Check if the dependency has already been added
 		if ($db->getOne('select count(*) from '.TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $add_dependency")) {
-			show_bug($bugid, array('add_dep' => translate("That bug dependency has already been added")));
-			return;
+			return (array('add_dep' => translate("That bug dependency has already been added")));
 		}
 
 		$old_dependencies = delimit_list(', ', $db->getCol("select depends_on from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid"));
@@ -481,8 +502,18 @@
 	if (count($changedfields) or !empty($comments)) {
 		do_changedfields($u, $buginfo, $changedfields, $comments);
 	}
+}
+
+function update_bugs($bugs) {
+	if (!empty($bugs) && is_array($bugs)) {
+		foreach($bugs as $bug) {
+			if (is_numeric($bug)) {
+				update_bug((int)$bug);
+			}
+		}
+	}
 
-	header("Location: bug.php?op=show&bugid=$bugid&pos=$pos");
+	header("Location: query.php?op=doquery");
 }
 
 function add_attachment($bugid, $description) {
@@ -791,7 +822,19 @@
 			show_bug(check_id($_GET['bugid']));
 			break;
 		case 'update':
-			update_bug(check_id($_POST['bugid']));
+			$error = update_bug(check_id($_POST['bugid']));
+			if (!empty($error)) {
+				show_bug($_POST['bugid'], $error);
+			} else {
+				header("Location: bug.php?op=show&bugid=".$_POST['bugid']."&pos=".$_POST['pos']);
+			}
+			break;
+		case 'mass_update':
+			$bugs = array();
+			if (!empty($_POST['bugids'])) {
+				$bugs = $_POST['bugids'];
+			}
+			update_bugs($bugs);
 			break;
 		case 'do':
 			do_form(check_id($_POST['bugid']));

Re: [phpBT-dev] Towards 1.0.2 and 1.1

[Ulf E. <ulf...@fa...>]

* Benjamin Curtis [2005-09-23, 04:42 -0700]:
> Actually, I meant the changes to the Italian translation and the bug  
> history fix.  I can look at the others, too, though. :)

Hmm.. The bug history fix will probably not work. It requires the
TBL_PRIORITY patch.

BTW. I never changed the name of the priority field in TBL_BUG when I
moved the priorities into a table. Should it be named 'priority_id'
instead of 'priority' now? I skipped it because it would require a more
involved update script, but I now think that that would make history
work without this bug history fix.. What do you think?

/Ulf

[phpBT-dev] Test manager

[Ulf E. <ulf...@fa...>]

* Benjamin Curtis [2005-09-23, 04:37 -0700]:
> Heh, this was exactly my intent with Tesly - http://www.tesly.com/. :)

Isn't it about time to start using phpBugTracker and Tesly together for
this project instead of the SourceForge trackers? :)

> On Sep 22, 2005, at 8:43 AM, Sharif Khan wrote:
> > Just some input on a feature I feel would be beneficial.  That is,
> > linking TestLink with phpBugTracker.  They are both open source and
> > would work wonderfully.
> >
> > Features:
> >     1)  Cross-linking of bugs to Test Case

I've seen the submitted patch that adds this feature. I have not
comitted it because it removes CVS linking. My idea is to one day add
something like "InterWiki" links used in many Wiki systems (probably
configured with a simple text file). That way you can easily link to
anything that only requires a single parameter. Since the CVS links can
use two parameters they will remain a special case

> >     2)  Cross-linking of Test Cases to bugs

Requires a TestLink patch?

> >     3)  Ability to fail a Test Case and auto-insert into
> > phpBugTracker.

Requires a TestLink patch?

> >     4)  Use TestLink to do queries, status, metrics, etc.

I'm not sure if I understand this.. do you want to query the TestLink
database from phpBugTracker?

/Ulf