phpbt-dev Mailing List for phpBugTracker (Page 13)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Hoi,

The posinfo is lost when temporary leaving the bugdisplay to visit pages 
such as the bug history. This patch might help bring it back.

-- 
Ulf

Hoi,

This patch highlights a bug row when the mouse hovers over it (and the 
full row is clickable). You probably recognise it from phpMyAdmin?

-- 
Ulf

Hoi,

Here is my attempt to implement an "Edit Query" functionality as 
described in Feature Request 711560 (Edit query capability).

http://sourceforge.net/tracker/index.php?func=detail&aid=711560&group_id=14939&atid=364939

-- 
Ulf

Hoi,

I had some troubles on a server where the installer always reported 
success on "test database connection". It turned out 'db_error' was 
defined 'DB_Error'. Is this a known issue/bug for one or another version 
of MySQL and/or php? Anyway, this patch use DB::isError for error 
checking and patches isError to handle both cases..

-- 
Ulf

Hoi,

A search that doesn't return any hits gives a rather odd pagination 
footer. This patch avoids printing "page 1-0 of 0" when there are zero 
pages.

-- 
Ulf

Hoi,

This patch extends the "lookup" function to be able to lookup more 
fields than only 'assigned_to' (which has been renamed to 'user').

-- 
Ulf

Hoi,

When a bug has been reassigned to someone else the bug history shows the 
developers' unmasked email addresses. This patch uses the 'login' 
instead of email address and masks it (in case email is login).

-- 
Ulf

Hoi,

This patch allows you to keep an eye on bugs that are not reported by 
nor assigned to you. Bookmarking is done by clicking the "Bookmark this 
bug" link next to the link for casting votes. A new field with 
"Bookmarked bugs open/closed" sits next the assigned and reported bugs.

-- 
Ulf

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

Modified Files:
	auth.php 
Log Message:
Fixes bug #1092270 - Changing the name of the User group breaks the personal options page

Index: auth.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/auth.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20

--- auth.php	25 Oct 2004 12:07:00 -0000	1.19
+++ auth.php	22 Jan 2005 16:30:26 -0000	1.20
@@ -50,6 +50,13 @@
 			return false;
 		}
 	}
+	
+	function force_auth() {
+		if (!$this->is_authenticated()) {
+			show_text('You must be logged in to use this page');
+			exit;
+		}
+	}
 
 	function auth_validatelogin() {
 		global $db, $select, $emailpass, $emailsuccess, $uid;
@@ -178,7 +185,7 @@
 
 		if (!$this->check_auth('group', $group)) {
 			$t->assign('group', $group);
-			$t->wrap('badgroup.html');
+			$t->render('badgroup.html', 'Group Failure');
 			exit();
 		}
 	}




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

Modified Files:
	user.php 
Log Message:
Fixes bug #1092270 - Changing the name of the User group breaks the personal options page

Index: user.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/user.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- user.php	25 Oct 2004 12:06:58 -0000	1.29
+++ user.php	22 Jan 2005 16:30:26 -0000	1.30
@@ -132,7 +132,7 @@
 	$t->render('user.html', translate("User preferences"));
 }
 
-$perm->check_group('User');
+$auth->force_auth();
 
 if (isset($_GET['op'])) {
 	switch ($_GET['op']) {




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

Modified Files:
	functions.php 
Log Message:
Fixes bug #1089416 - Exchange confused by lack of charset in email

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- functions.php	25 Oct 2004 12:07:00 -0000	1.47
+++ functions.php	22 Jan 2005 16:13:18 -0000	1.48
@@ -591,10 +591,12 @@
 		$headers .= "\n";
 		// There have to be no newline at the end of $headers
 	}
+	$charset = !empty($STRING['lang_charset']) ? 
+		$STRING['lang_charset'] : 'iso-8859-1';
 	if (false/*HTML_EMAIL*/) {
-		$headers .= "Content-Type: text/html; charset=\"".$STRING['lang_charset']."\"\r\nContent-Transfer-Encoding: ";
+		$headers .= "Content-Type: text/html; charset=\"$charset\"\r\nContent-Transfer-Encoding: ";
 	} else {
-		$headers .= "Content-Type: text/plain; charset=\"".$STRING['lang_charset']."\"\r\nContent-Transfer-Encoding: ";
+		$headers .= "Content-Type: text/plain; charset=\"$charset\"\r\nContent-Transfer-Encoding: ";
 	}
 
 	// If configured to send MIME encoded emails




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

Modified Files:
	query.php 
Log Message:
Fixes bug #1104354 - Sorting was causing some problems on the bug view

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- query.php	25 Oct 2004 12:06:58 -0000	1.99
+++ query.php	22 Jan 2005 16:09:30 -0000	1.100
@@ -327,7 +327,7 @@
 	if (!in_array($sort, array('asc', 'desc'))) $sort = 'asc';
 	
 	if (empty($_SESSION['queryinfo'])) $_SESSION['queryinfo'] = array();
-	$_SESSION['queryinfo']['order'] = $order;
+	$_SESSION['queryinfo']['order'] = $db_headers[$order];;
 	$_SESSION['queryinfo']['sort'] = $sort;
 
 	if (empty($_SESSION['queryinfo']['query']) or isset($op)) {




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

Modified Files:
	bugdisplay.html 
Log Message:
Oops, left a bug in there

Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bugdisplay.html	22 Jan 2005 16:03:49 -0000	1.47
+++ bugdisplay.html	22 Jan 2005 16:08:41 -0000	1.48
@@ -118,7 +118,7 @@
 		<td><select name="site_id" <?php echo $disabled ?>><?php build_select('site', $site_id) ?></select></td>
 	</tr><tr>
 		<td><?php echo translate("Summary"); ?>:</td>
-		<td><input type="text" size="30" maxlength="100" name="title" value="<?php echo stripslashes(get_htmlspecialchars($title)) ?>" <?php echo $disabled ?>></td>
+		<td><input type="text" size="30" maxlength="100" name="title" value="<?php echo stripslashes(htmlspecialchars($title)) ?>" <?php echo $disabled ?>></td>
 		<td><?php echo translate("Status"); ?>:</td>
 		<td><select name="status_id" <?php echo $disabled ?>><?php build_select('status', $status_id) ?></select></td>
 	</tr><tr>




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

Modified Files:
	bugdisplay.html 
Log Message:
Fixes bug #1104352 - html entities getting hosed.  Swapped out htmlspecialchars() in favor of just replacing the less-than and greater-than symbols

Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- bugdisplay.html	25 Oct 2004 12:07:04 -0000	1.46
+++ bugdisplay.html	22 Jan 2005 16:03:49 -0000	1.47
@@ -13,34 +13,34 @@
 	<?php build_project_js(true); ?>
 
 	function updateMenus(f) {
-	  	sel = f.project_id[f.project_id.selectedIndex].text;
-	  	f.version_id.length = versions[sel].length;
-	  	for (var x = 0; x < versions[sel].length; x++) {
-	    	f.version_id.options[x].value = versions[sel][x][0];
-	    	f.version_id.options[x].text = versions[sel][x][1];
+		sel = f.project_id[f.project_id.selectedIndex].text;
+		f.version_id.length = versions[sel].length;
+		for (var x = 0; x < versions[sel].length; x++) {
+			f.version_id.options[x].value = versions[sel][x][0];
+			f.version_id.options[x].text = versions[sel][x][1];
 				f.version_id.selectedIndex = 0;
-	  	}
+		}
 
-	  	f.to_be_closed_in_version_id.length = closedversions[sel].length;
-	  	for (var x = 0; x < closedversions[sel].length; x++) {
-	    	f.to_be_closed_in_version_id.options[x].value = closedversions[sel][x][0];
-	    	f.to_be_closed_in_version_id.options[x].text = closedversions[sel][x][1];
+		f.to_be_closed_in_version_id.length = closedversions[sel].length;
+		for (var x = 0; x < closedversions[sel].length; x++) {
+			f.to_be_closed_in_version_id.options[x].value = closedversions[sel][x][0];
+			f.to_be_closed_in_version_id.options[x].text = closedversions[sel][x][1];
 				f.to_be_closed_in_version_id.selectedIndex = 0;
-	  	}
+		}
 
-	  	f.closed_in_version_id.length = closedversions[sel].length;
-	  	for (var x = 0; x < closedversions[sel].length; x++) {
-	    	f.closed_in_version_id.options[x].value = closedversions[sel][x][0];
-	    	f.closed_in_version_id.options[x].text = closedversions[sel][x][1];
+		f.closed_in_version_id.length = closedversions[sel].length;
+		for (var x = 0; x < closedversions[sel].length; x++) {
+			f.closed_in_version_id.options[x].value = closedversions[sel][x][0];
+			f.closed_in_version_id.options[x].text = closedversions[sel][x][1];
 				f.closed_in_version_id.selectedIndex = 0;
-	  	}
+		}
 
-	  	f.component_id.length = components[sel].length;
-	  	for (var x = 0; x < components[sel].length; x++) {
-	    	f.component_id.options[x].value = components[sel][x][0];
-	    	f.component_id.options[x].text = components[sel][x][1];
+		f.component_id.length = components[sel].length;
+		for (var x = 0; x < components[sel].length; x++) {
+			f.component_id.options[x].value = components[sel][x][0];
+			f.component_id.options[x].text = components[sel][x][1];
 				f.component_id.selectedIndex = 0;
-	  	}
+		}
 	}
 
 	function popupAtt(id) {
@@ -57,205 +57,205 @@
 //-->
 </script>
 <form action="bug.php" method="post">
-    <input type="hidden" name="op" value="update">
-    <input type="hidden" name="bugid" value="<?php echo $bug_id ?>">
-    <input type="hidden" name="projectid" value="<?php echo $project_id ?>">
-    <input type="hidden" name="last_modified_date" value="<?php echo $last_modified_date ?>">
-    <input type="hidden" name="pos" value="<?php echo isset($_REQUEST['pos']) ? $_REQUEST['pos'] : ''; ?>">
-    <table border="0" width="100%">
+	<input type="hidden" name="op" value="update">
+	<input type="hidden" name="bugid" value="<?php echo $bug_id ?>">
+	<input type="hidden" name="projectid" value="<?php echo $project_id ?>">
+	<input type="hidden" name="last_modified_date" value="<?php echo $last_modified_date ?>">
+	<input type="hidden" name="pos" value="<?php echo isset($_REQUEST['pos']) ? $_REQUEST['pos'] : ''; ?>">
+	<table border="0" width="100%">
 	<tr>
-	    <td>Bug <b>#<?php echo $bug_id ?></b> - <?php echo stripslashes($title) ?> - <a href="query.php"><?php echo translate("Return to bug list"); ?></a></td>
+		<td>Bug <b>#<?php echo $bug_id ?></b> - <?php echo stripslashes($title) ?> - <a href="query.php"><?php echo translate("Return to bug list"); ?></a></td>
 		<td align="right">
-        <?php if (!empty($prevbug)) { ?>
-		    <b><a href="bug.php?op=show&bugid=<?php echo $prevbug ?>&pos=<?php echo $prevpos ?>"><?php echo translate("Previous bug"); ?></a></b>
-        <?php } ?>
-        <?php if (!empty($prevbug) && !empty($nextbug)) echo ' | '; ?>
-        <?php if (!empty($nextbug)) { ?>
-		    <b><a href="bug.php?op=show&bugid=<?php echo $nextbug ?>&pos=<?php echo $nextpos ?>"><?php echo translate("Next bug"); ?></a></b>
-        <?php } ?>
-	    </td>
+		<?php if (!empty($prevbug)) { ?>
+			<b><a href="bug.php?op=show&bugid=<?php echo $prevbug ?>&pos=<?php echo $prevpos ?>"><?php echo translate("Previous bug"); ?></a></b>
+		<?php } ?>
+		<?php if (!empty($prevbug) && !empty($nextbug)) echo ' | '; ?>
+		<?php if (!empty($nextbug)) { ?>
+			<b><a href="bug.php?op=show&bugid=<?php echo $nextbug ?>&pos=<?php echo $nextpos ?>"><?php echo translate("Next bug"); ?></a></b>
+		<?php } ?>
+		</td>
 	</tr>
-    <?php if (!empty($error['status'])) echo "<tr><td class=\"error\">{$error['status']}</td></tr>"; ?>
-    </table>
+	<?php if (!empty($error['status'])) echo "<tr><td class=\"error\">{$error['status']}</td></tr>"; ?>
+	</table>
 	<?php if (!empty($error['add_dep'])) echo "<div class=\"error\">{$error['add_dep']}</div>"; ?>
 	<?php if (!empty($error['vote'])) echo "<div class=\"error\">{$error['vote']}</div>" ?>
-    <table border="0" width="100%" cellspacing="0" cellpadding="2">
+	<table border="0" width="100%" cellspacing="0" cellpadding="2">
 	<tr>
-	    <td><?php echo translate("Reporter"); ?>:</td>
-	    <td><b><?php echo maskemail($reporter) ?></b></td>
-	    <td><?php echo translate("Created"); ?>:</td>
-	    <td><b><?php echo date(DATE_FORMAT, $created_date) ?></b></td>
-	</tr><tr>
-	    <td><?php echo translate("Project"); ?>:</td>
-	    <td><select name="project_id" onChange="updateMenus(this.form)" <?php echo $disabled ?>><?php build_select('project', $project_id) ?></select></td>
-	    <td><?php echo translate("Priority"); ?>:</td>
-	    <td><select name="priority" <?php echo $disabled ?>><?php build_select('priority', $priority) ?></select></td>
-	</tr><tr>
-	    <td><?php echo translate("Component"); ?>:</td>
-	    <td><select name="component_id" <?php echo $disabled ?>><?php build_select('component', $component_id, $project_id) ?></select></td>
-	    <td><?php echo translate("Severity"); ?>:</td>
-	    <td><select name="severity_id" <?php echo $disabled ?>><?php build_select('severity', $severity_id) ?></select></td>
-	</tr><tr>
-	    <td><?php echo translate("Version"); ?>:</td>
-	    <td><select name="version_id" <?php echo $disabled ?>><?php build_select('version', $version_id, $project_id) ?></select></td>
-	    <td><?php echo translate("Operating System"); ?>:</td>
-	    <td><select name="os_id" <?php echo $disabled ?>><?php build_select('os', $os_id) ?></select></td>
-	</tr><tr>
-	    <td><?php echo translate("To be closed in version"); ?></td>
-	    <td><select name="to_be_closed_in_version_id" <?php echo $disabled ?>>
-		    <option value="0"><?php echo translate("Choose one"); ?></option>
-		    <?php build_select('version', $to_be_closed_in_version_id, $project_id) ?>
+		<td><?php echo translate("Reporter"); ?>:</td>
+		<td><b><?php echo maskemail($reporter) ?></b></td>
+		<td><?php echo translate("Created"); ?>:</td>
+		<td><b><?php echo date(DATE_FORMAT, $created_date) ?></b></td>
+	</tr><tr>
+		<td><?php echo translate("Project"); ?>:</td>
+		<td><select name="project_id" onChange="updateMenus(this.form)" <?php echo $disabled ?>><?php build_select('project', $project_id) ?></select></td>
+		<td><?php echo translate("Priority"); ?>:</td>
+		<td><select name="priority" <?php echo $disabled ?>><?php build_select('priority', $priority) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("Component"); ?>:</td>
+		<td><select name="component_id" <?php echo $disabled ?>><?php build_select('component', $component_id, $project_id) ?></select></td>
+		<td><?php echo translate("Severity"); ?>:</td>
+		<td><select name="severity_id" <?php echo $disabled ?>><?php build_select('severity', $severity_id) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("Version"); ?>:</td>
+		<td><select name="version_id" <?php echo $disabled ?>><?php build_select('version', $version_id, $project_id) ?></select></td>
+		<td><?php echo translate("Operating System"); ?>:</td>
+		<td><select name="os_id" <?php echo $disabled ?>><?php build_select('os', $os_id) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("To be closed in version"); ?></td>
+		<td><select name="to_be_closed_in_version_id" <?php echo $disabled ?>>
+			<option value="0"><?php echo translate("Choose one"); ?></option>
+			<?php build_select('version', $to_be_closed_in_version_id, $project_id) ?>
 		</select></td>
-	    <td><?php echo translate("Database"); ?>:</td>
-	    <td><select name="database_id" <?php echo $disabled ?>><?php build_select('database', $database_id) ?></select></td>
+		<td><?php echo translate("Database"); ?>:</td>
+		<td><select name="database_id" <?php echo $disabled ?>><?php build_select('database', $database_id) ?></select></td>
 	</tr><tr>
-	    <td><?php echo translate("Closed in version"); ?></td>
-	    <td><select name="closed_in_version_id" <?php echo $disabled ?>>
-		    <option value="0"><?php echo translate("Choose one"); ?></option>
-		    <?php build_select('version', $closed_in_version_id, $project_id) ?>
+		<td><?php echo translate("Closed in version"); ?></td>
+		<td><select name="closed_in_version_id" <?php echo $disabled ?>>
+			<option value="0"><?php echo translate("Choose one"); ?></option>
+			<?php build_select('version', $closed_in_version_id, $project_id) ?>
 		</select></td>
-	    <td><?php echo translate("Site"); ?></td>
-	    <td><select name="site_id" <?php echo $disabled ?>><?php build_select('site', $site_id) ?></select></td>
+		<td><?php echo translate("Site"); ?></td>
+		<td><select name="site_id" <?php echo $disabled ?>><?php build_select('site', $site_id) ?></select></td>
 	</tr><tr>
-	    <td><?php echo translate("Summary"); ?>:</td>
-	    <td><input type="text" size="30" maxlength="100" name="title" value="<?php echo stripslashes(htmlspecialchars($title)) ?>" <?php echo $disabled ?>></td>
-	    <td><?php echo translate("Status"); ?>:</td>
-	    <td><select name="status_id" <?php echo $disabled ?>><?php build_select('status', $status_id) ?></select></td>
-	</tr><tr>
-	    <td><?php if($url) echo "<a href=\"$url\">URL</a>"; else echo 'URL'; ?>:</td>
-	    <td><input type="text" size="30" maxlength="255" name="url" value="<?php echo $url ?>" <?php echo $disabled ?>></td>
-	    <td><?php echo translate("Resolution"); ?>:</td>
-	    <td><select name="resolution_id" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('resolution', $resolution_id) ?></select></td>
-	</tr><tr>
-	    <td><?php echo translate("Assigned to"); ?>:</td>
-        <?php if (isset($perm) && $perm->have_perm('EditAssignment')) { ?>
-	    <td><select name="assigned_to" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('owner', $assigned_to) ?></select></td>
-        <?php } else { ?>
-        <td>
-            <?php echo lookup('assigned_to', $assigned_to); ?>
-            <input type="hidden" name="assigned_to" value="<?php echo $assigned_to ?>">
-        </td>
-        <?php } ?>
-	    <td><?php echo translate("Add CC"); ?>:</td>
-	    <td><input type="text" name="add_cc" <?php echo $disabled ?>></td>
+		<td><?php echo translate("Summary"); ?>:</td>
+		<td><input type="text" size="30" maxlength="100" name="title" value="<?php echo stripslashes(get_htmlspecialchars($title)) ?>" <?php echo $disabled ?>></td>
+		<td><?php echo translate("Status"); ?>:</td>
+		<td><select name="status_id" <?php echo $disabled ?>><?php build_select('status', $status_id) ?></select></td>
+	</tr><tr>
+		<td><?php if($url) echo "<a href=\"$url\">URL</a>"; else echo 'URL'; ?>:</td>
+		<td><input type="text" size="30" maxlength="255" name="url" value="<?php echo $url ?>" <?php echo $disabled ?>></td>
+		<td><?php echo translate("Resolution"); ?>:</td>
+		<td><select name="resolution_id" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('resolution', $resolution_id) ?></select></td>
+	</tr><tr>
+		<td><?php echo translate("Assigned to"); ?>:</td>
+		<?php if (isset($perm) && $perm->have_perm('EditAssignment')) { ?>
+		<td><select name="assigned_to" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('owner', $assigned_to) ?></select></td>
+		<?php } else { ?>
+		<td>
+			<?php echo lookup('assigned_to', $assigned_to); ?>
+			<input type="hidden" name="assigned_to" value="<?php echo $assigned_to ?>">
+		</td>
+		<?php } ?>
+		<td><?php echo translate("Add CC"); ?>:</td>
+		<td><input type="text" name="add_cc" <?php echo $disabled ?>></td>
 	</tr><tr>
-	    <td colspan="2" valign="top">
-        <?php if (!empty($error['add_dep'])) echo "<div class=\"error\">{$error['add_dep']}</div>"; ?>
+		<td colspan="2" valign="top">
+		<?php if (!empty($error['add_dep'])) echo "<div class=\"error\">{$error['add_dep']}</div>"; ?>
 		<?php echo translate("Depends on bugs"); ?>: 
-            <?php for ($i = 0, $count = count($bug_dependencies); $i < $count; $i++) {
-                printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', 
-                    $bug_dependencies[$i]['bug_id'], 
-                    ($bug_dependencies[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'),
-                    $bug_dependencies[$i]['bug_id'],
-                    ($i < $count - 1 ? ', ' : ''));
-            } ?>
-            <br>
+			<?php for ($i = 0, $count = count($bug_dependencies); $i < $count; $i++) {
+				printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', 
+					$bug_dependencies[$i]['bug_id'], 
+					($bug_dependencies[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'),
+					$bug_dependencies[$i]['bug_id'],
+					($i < $count - 1 ? ', ' : ''));
+			} ?>
+			<br>
 		<?php echo translate("Blocks bugs"); ?>:  
-            <?php for ($i = 0, $count = count($bug_blocks); $i < $count; $i++) {
-                printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', 
-                    $bug_blocks[$i]['bug_id'], 
-                    ($bug_blocks[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'),
-                    $bug_blocks[$i]['bug_id'],
-                    ($i < $count - 1 ? ', ' : ''));
-            } ?>
-            <br>
+			<?php for ($i = 0, $count = count($bug_blocks); $i < $count; $i++) {
+				printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', 
+					$bug_blocks[$i]['bug_id'], 
+					($bug_blocks[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'),
+					$bug_blocks[$i]['bug_id'],
+					($i < $count - 1 ? ', ' : ''));
+			} ?>
+			<br>
 		<?php echo translate("Add dependency"); ?>: <input type="text" name="add_dependency" size="5" <?php echo $disabled ?>><br>
 		<?php echo translate("Remove dependency"); ?>: <input type="text" name="del_dependency" size="5" <?php echo $disabled ?>><br><br></td>
-	    <td colspan="2" valign="top">
+		<td colspan="2" valign="top">
 		<?php echo translate("Remove selected CCs"); ?>:<br>
 		<select name="remove_cc[]" size="5" style="width: 15em" multiple <?php echo $disabled ?>><?php build_select('bug_cc', $bug_id) ?></select></td>
 	</tr>
-    </table>
-    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+	</table>
+	<table border="0" cellpadding="2" cellspacing="0" width="100%">
 	<tr class="noprint">
-	    <td valign="top"><?php echo translate("Additional comments"); ?>:<br><br>
+		<td valign="top"><?php echo translate("Additional comments"); ?>:<br><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="right">
-        <?php if (!empty($_SESSION['uid'])) { ?>
+		<?php if (!empty($_SESSION['uid'])) { ?>
 			<?php echo translate("Supress notification email"); ?> <input type="checkbox" name="suppress_email" value="1">
-		    <input type="submit" value="Submit">
-        <?php } else echo translate("You must login to modify this bug"); ?>
+			<input type="submit" value="Submit">
+		<?php } else echo translate("You must login to modify this bug"); ?>
 		</div></td>
 	</tr><tr>
-	    <td><table border="0" cellpadding="0" width="100%">
-		    <tr>
+		<td><table border="0" cellpadding="0" width="100%">
+			<tr>
 			<td colspan="2"><?php echo translate("Attachments"); ?>:</td>
 			<td colspan="3" align="right"><a href="attachment.php?bugid=<?php echo $bug_id; ?>" onClick="return popupAtt(<?php echo $bug_id; ?>)"><?php echo translate("Create new attachment"); ?></a></td>
-		    </tr><tr>
+			</tr><tr>
 			<td colspan="5" height="2" bgcolor="#ffffff"><spacer type="block" height="2" width="2"></td>
-		    </tr><tr>
+			</tr><tr>
 			<td bgcolor="#cccccc" align="center"><b><?php echo translate("Name"); ?></b></td>
 			<td width="60" bgcolor="#cccccc" align="center"><b><?php echo translate("Size"); ?></b></a></td>
 			<td width="150" bgcolor="#cccccc" align="center"><b><?php echo translate("Type"); ?></b></a></td>
 			<td width="80" bgcolor="#cccccc" align="center"><b><?php echo translate("Created"); ?></b></a></td>
 			<td width="80" bgcolor="#cccccc" align="center">&nbsp;</a></td>
-		    </tr><tr>
+			</tr><tr>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
-		    </tr>
-            <?php if ($attcount = count($attachments)) { ?>
-                <?php for ($i = 0; $i < $attcount; $i++) { ?>
-                    <tr title="<?php echo stripslashes($attachments[$i]['description']); ?>"<?php if ($i % 2 != 0) echo ' class="alt" bgcolor="#dddddd"' ?>>
-                    <td><?php echo stripslashes($attachments[$i]['file_name']); ?></td>
-                    <td align="right">
-                        <?php echo $attachments[$i]['file_size'] > 1024 
-                            ? number_format((round($attachments[$i]['file_size']) / 1024 * 100) / 100).'k'
-                            : number_format($attachments[$i]['file_size']).'b';
-                        ?>
-                    </td>
-                    <td align="center"><?php echo $attachments[$i]['mime_type']; ?></td>
-                    <td align="center"><?php echo date(DATE_FORMAT, $attachments[$i]['created_date']); ?></td>
-                    <td align="center"><a href='attachment.php?attachid=<?php echo $attachments[$i]['attachment_id']; ?>'>View</a>
-                    <?php if (isset($perm) and $perm->have_perm('Administrator')) { ?>
-                        | <a href='attachment.php?del=<?php echo $attachments[$i]['attachment_id']; ?>' onClick="return confirm('<?php echo translate("Are you sure you want to delete this attachment?"); ?>');"><?php echo translate("Delete"); ?></a>
-                    <?php } ?>
-                    </td>
-                    </tr>
-                <?php } ?>
-            <?php } else { ?>
-                <tr>
-                    <td colspan="5" align="center"><?php echo translate("No attachments found for this bug"); ?></td>
-                </tr>
-            <?php } ?>
-		    <tr>
+			</tr>
+			<?php if ($attcount = count($attachments)) { ?>
+				<?php for ($i = 0; $i < $attcount; $i++) { ?>
+					<tr title="<?php echo stripslashes($attachments[$i]['description']); ?>"<?php if ($i % 2 != 0) echo ' class="alt" bgcolor="#dddddd"' ?>>
+					<td><?php echo stripslashes($attachments[$i]['file_name']); ?></td>
+					<td align="right">
+						<?php echo $attachments[$i]['file_size'] > 1024 
+							? number_format((round($attachments[$i]['file_size']) / 1024 * 100) / 100).'k'
+							: number_format($attachments[$i]['file_size']).'b';
+						?>
+					</td>
+					<td align="center"><?php echo $attachments[$i]['mime_type']; ?></td>
+					<td align="center"><?php echo date(DATE_FORMAT, $attachments[$i]['created_date']); ?></td>
+					<td align="center"><a href='attachment.php?attachid=<?php echo $attachments[$i]['attachment_id']; ?>'>View</a>
+					<?php if (isset($perm) and $perm->have_perm('Administrator')) { ?>
+						| <a href='attachment.php?del=<?php echo $attachments[$i]['attachment_id']; ?>' onClick="return confirm('<?php echo translate("Are you sure you want to delete this attachment?"); ?>');"><?php echo translate("Delete"); ?></a>
+					<?php } ?>
+					</td>
+					</tr>
+				<?php } ?>
+			<?php } else { ?>
+				<tr>
+					<td colspan="5" align="center"><?php echo translate("No attachments found for this bug"); ?></td>
+				</tr>
+			<?php } ?>
+			<tr>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
 			<td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td>
-		    </tr><tr>
+			</tr><tr>
 			<td colspan="5" height="2" bgcolor="#ffffff"><spacer type="block" height="2" width="2"></td>
-		    </tr>
+			</tr>
 		</table></td>
 	</tr>
-    </table>
+	</table>
 </form>
 <div align="center" class="bugdisplaylinks">
 <?php if (!empty($error['vote'])) echo "<div class=\"error\">{$error['vote']}</div>" ?>
-    <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=vote&bugid=<?php echo $bug_id; ?>" onClick="if (<?php echo $already_voted; ?>) { alert ('<?php echo translate("You have already voted for this bug"); ?>'); return false; }"><?php echo translate("Vote for this bug"); ?></a></b> |
-    <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=viewvotes&bugid=<?php echo $bug_id; ?>"><?php echo translate("View votes"); ?> (<?php echo $num_votes; ?>)</a></b> |
-    <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=history&bugid=<?php echo $bug_id; ?>"><?php echo translate("View bug history"); ?></a></b>
+	<b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=vote&bugid=<?php echo $bug_id; ?>" onClick="if (<?php echo $already_voted; ?>) { alert ('<?php echo translate("You have already voted for this bug"); ?>'); return false; }"><?php echo translate("Vote for this bug"); ?></a></b> |
+	<b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=viewvotes&bugid=<?php echo $bug_id; ?>"><?php echo translate("View votes"); ?> (<?php echo $num_votes; ?>)</a></b> |
+	<b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=history&bugid=<?php echo $bug_id; ?>"><?php echo translate("View bug history"); ?></a></b>
 </div>
 <br><br>
 <table border="0" cellpadding="2" cellspacing="0" width="100%">
-    <tr>
+	<tr>
 	<td><?php echo translate("Comments"); ?>:</td>
-    </tr><tr class="alt">
+	</tr><tr class="alt">
 	<td><?php echo translate("Posted by"); ?>: <?php echo maskemail($reporter); ?> <br>
-	    <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $created_date); ?></td>
-    </tr><tr>
-	<td><?php echo nl2br(stripslashes(format_comments(htmlspecialchars($description)))); ?> <br><br></td>
-    </tr>
-    <?php for ($i = 0, $ccount = count($comments); $i < $ccount; $i++) { ?>
-        <tr class="alt">
-        <td><?php echo translate("Posted by"); ?>: <?php echo maskemail($comments[$i]['login']); ?> <br>
-            <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $comments[$i]['created_date']); ?></td>
-        </tr><tr>
-        <td><?php echo nl2br(stripslashes(format_comments(htmlspecialchars($comments[$i]['comment_text'])))); ?> <br><br></td>
-        </tr>
-    <?php } ?>
+		<?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $created_date); ?></td>
+	</tr><tr>
+	<td><?php echo format_comments($description); ?> <br><br></td>
+	</tr>
+	<?php for ($i = 0, $ccount = count($comments); $i < $ccount; $i++) { ?>
+		<tr class="alt">
+		<td><?php echo translate("Posted by"); ?>: <?php echo maskemail($comments[$i]['login']); ?> <br>
+			<?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $comments[$i]['created_date']); ?></td>
+		</tr><tr>
+		<td><?php echo format_comments($comments[$i]['comment_text']); ?> <br><br></td>
+		</tr>
+	<?php } ?>
 </table>




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

Modified Files:
	bug.php 
Log Message:
Fixes bug #1104352 - html entities getting hosed.  Swapped out htmlspecialchars() in favor of just replacing the less-than and greater-than symbols

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- bug.php	5 Dec 2004 17:01:32 -0000	1.136
+++ bug.php	22 Jan 2005 16:03:48 -0000	1.137
@@ -61,7 +61,7 @@
 		// If a number of votes are required to promote a bug, check for promotion
 		if (!$bug_is_new and $db->getOne("select count(*) from ".TBL_BUG_VOTE." where bug_id = $bug_id") == PROMOTE_VOTES) {
 			$status_id = BUG_PROMOTED;
-	  		$buginfo = $db->getOne("select * from ".TBL_BUG." where bug_id = $bug_id");
+			$buginfo = $db->getOne("select * from ".TBL_BUG." where bug_id = $bug_id");
 			$changedfields = array('status_id' => $status_id);
 			do_changedfields($u, $buginfo, $changedfields);
 		}
@@ -82,14 +82,18 @@
 	// Set up the regex replacements
 	$patterns = array(
 		'/(bug)[[:space:]]*(#?)([0-9]+)/i', // matches bug #nn
-		'/cvs:([^\.\s:,\?!]+(\.[^\.\s:,\?!]+)*)(:)?(\d\.[\d\.]+)?([\W\s])?/i' // matches cvs:filename.php or cvs:filename.php:n.nn
+		'/cvs:([^\.\s:,\?!]+(\.[^\.\s:,\?!]+)*)(:)?(\d\.[\d\.]+)?([\W\s])?/i', // matches cvs:filename.php or cvs:filename.php:n.nn
+		'/</',
+		'/>/',
 		);
 	$replacements = array(
 		"\\1 <a href='$me?op=show&bugid=\\3'>\\2\\3</a>", // internal link to bug
-		'<a href="'.CVS_WEB.'\\1#rev\\4" target="_new">\\1</a>\\5' // external link to cvs web interface
+		'<a href="'.CVS_WEB.'\\1#rev\\4" target="_new">\\1</a>\\5', // external link to cvs web interface
+		'&lt;',
+		'&gt;',
 		);
 
-	return preg_replace($patterns, $replacements, stripslashes($comments));
+	return nl2br(preg_replace($patterns, $replacements, stripslashes($comments)));
 }
 
 ///
@@ -152,19 +156,19 @@
 		if (empty($oldvalue)) $oldvalue = 'None';
 
 		if (isset($cf[$field.'_id'])) {
-		    $newvalue = $db->getOne("select ${field}_name from $table where ${field}_id = {$cf[$field.'_id']}");
-		    if (empty($newvalue)) $newvalue = 'None';
+			$newvalue = $db->getOne("select ${field}_name from $table where ${field}_id = {$cf[$field.'_id']}");
+			if (empty($newvalue)) $newvalue = 'None';
 
-		    $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($field)), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")");
-		    $t->assign(array(
+			$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($field)), $db->quote(stripslashes($oldvalue)), $db->quote(stripslashes($newvalue)), $u, $now)).")");
+			$t->assign(array(
 				$field.'_id' => stripslashes($newvalue),
 				$field.'_id_stat' => '!'
-			    ));
+				));
 		} else {
-		    $t->assign(array(
+			$t->assign(array(
 				$field.'_id' => stripslashes($oldvalue),
 				$field.'_id_stat' => ' '
-			    ));
+				));
 		}
 	}
 
@@ -174,26 +178,26 @@
 
 	foreach($versions as $field => $field_name) {
 		if (isset($buginfo[$field.'_id'])) {
-		    $oldvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$buginfo[$field.'_id']);
+			$oldvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$buginfo[$field.'_id']);
 		}
 		if (empty($oldvalue)) $oldvalue = 'None';
 
 		if (isset($cf[$field.'_id'])) {
-		    $newvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$cf[$field.'_id']);
+			$newvalue = $db->getOne('select version_name from '.$cfgDatabase['version'].' where version_id = '.$cf[$field.'_id']);
 			if (empty($newvalue)) $newvalue = 'None';
 
-		    $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($field_name)),
+			$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($field_name)),
 				$db->quote(stripslashes($oldvalue)),
 				$db->quote(stripslashes($newvalue)), $u, $now)).")");
-		    $t->assign(array(
+			$t->assign(array(
 				$field.'_id' => stripslashes($newvalue),
 				$field.'_id_stat' => '!'
-			    ));
+				));
 		} else {
-		    $t->assign(array(
+			$t->assign(array(
 				$field.'_id' => stripslashes($oldvalue),
 				$field.'_id_stat' => ' '
-			    ));
+				));
 		}
 	}
 
@@ -224,29 +228,29 @@
 		$rs = $db->limitQuery('select u.login, c.comment_text, c.created_date from '.TBL_COMMENT.' c, '.TBL_AUTH_USER." u where bug_id = {$buginfo['bug_id']} and c.created_by = u.user_id order by created_date desc", 0, 2);
 		$rs->fetchInto($row);
 		$t->assign(array(
-		    'newpostedby' => $row['login'],
-		    'newpostedon' => date(TIME_FORMAT, $row['created_date']).' on '.
+			'newpostedby' => $row['login'],
+			'newpostedon' => date(TIME_FORMAT, $row['created_date']).' on '.
 			date(DATE_FORMAT, $row['created_date']),
-		    'newcomments' => textwrap('+ '.format_comments($row['comment_text']),72,"\n+ ")
+			'newcomments' => textwrap('+ '.format_comments($row['comment_text']),72,"\n+ ")
 		));
 
 		// If this comment is the first additional comment after the creation of the
 		// bug then we need to grab the bug's description as the previous comment
 		if ($rs->numRows() < 2) {
-		    list($by, $on, $comments) = $db->getRow('select u.login, b.created_date, b.description from '.TBL_BUG.' b, '.TBL_AUTH_USER." u where b.created_by = u.user_id and bug_id = {$buginfo['bug_id']}", null, DB_FETCHMODE_ORDERED);
-		    $t->assign(array(
+			list($by, $on, $comments) = $db->getRow('select u.login, b.created_date, b.description from '.TBL_BUG.' b, '.TBL_AUTH_USER." u where b.created_by = u.user_id and bug_id = {$buginfo['bug_id']}", null, DB_FETCHMODE_ORDERED);
+			$t->assign(array(
 			'oldpostedby' => $by,
 			'oldpostedon' => date(TIME_FORMAT,$on).' on '.date(DATE_FORMAT,$on),
 			'oldcomments' => textwrap(format_comments($comments),72)
-		    ));
+			));
 		} else {
-		    $rs->fetchInto($row);
-		    $t->assign(array(
+			$rs->fetchInto($row);
+			$t->assign(array(
 			'oldpostedby' => $row['login'],
 			'oldpostedon' => date(TIME_FORMAT,$row['created_date']).' on '.
-			    date(DATE_FORMAT,$row['created_date']),
+				date(DATE_FORMAT,$row['created_date']),
 			'oldcomments' => textwrap(format_comments($row['comment_text']),72)
-		    ));
+			));
 		}
 		$t->assign('showcomments', true);
 	} else {
@@ -262,7 +266,7 @@
 	}
 	if ($userid != (!empty($cf['assigned_to']) ? $cf['assigned_to'] : $buginfo['assigned_to'])
 		and !empty($assignedto) and $emailassignedto) {
-	    $maillist[] = $assignedto;
+		$maillist[] = $assignedto;
 	}
 
 	// Collect the CCs
@@ -324,8 +328,8 @@
 	// 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('Manager'))) {
-	    show_bug($bugid,array('status' => translate("You can not change this bug")));
-	    return;
+		show_bug($bugid,array('status' => translate("You can not change this bug")));
+		return;
 	}
 
 	// Check for more than one person modifying the bug at the same time
@@ -342,7 +346,7 @@
 		}
 		$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']) {
-		    $db->query("insert into ".TBL_BUG_CC." (bug_id, user_id, created_by, created_date)  values ($bugid, $cc_uid, $u, $now)");
+			$db->query("insert into ".TBL_BUG_CC." (bug_id, user_id, created_by, created_date)  values ($bugid, $cc_uid, $u, $now)");
 		}
 	}
 
@@ -357,12 +361,12 @@
 
 		// Validate the bug number
 		if (!is_numeric($add_dependency)) {
-		    show_bug($bugid, array('add_dep' => translate("That bug does not exist")));
-		    return;
+			show_bug($bugid, array('add_dep' => translate("That bug does not exist")));
+			return;
 		}
 		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;
+			show_bug($bugid, array('add_dep' => translate("That bug does not exist")));
+			return;
 		}
 
 		// Check if the dependency has already been added
@@ -379,7 +383,7 @@
 	if (!empty($del_dependency)) {
 		$del_dependency = preg_replace('/\D/', '', $del_dependency);
 		if (is_numeric($del_dependency)) {
-		    $db->query("delete from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $del_dependency");
+			$db->query("delete from ".TBL_BUG_DEPENDENCY." where bug_id = $bugid and depends_on = $del_dependency");
 		}
 	}
 
@@ -502,9 +506,9 @@
 
 	// Check to see if this bug's component has an owner and should be assigned
 	if ($owner = $db->getOne("select owner from ".TBL_COMPONENT." c where component_id = $component")) {
-	    $status = BUG_ASSIGNED;
+		$status = BUG_ASSIGNED;
 	} else {
-	    $owner = 0;
+		$owner = 0;
 		// If we aren't using voting to promote, then auto-promote to New
 		$status = PROMOTE_VOTES ? BUG_UNCONFIRMED : BUG_PROMOTED;
 	}
@@ -547,7 +551,7 @@
 
 	if (!is_numeric($bugid) or
 		!$row = $db->getRow(sprintf($QUERY['bug-printable'], $bugid,
-	    $restricted_projects))) {
+		$restricted_projects))) {
 		show_text(translate("That bug does not exist"), true);
 		exit;
 	}
@@ -613,7 +617,7 @@
 
 	if (!ereg('^[0-9]+$',$bugid) or
 		!$row = $db->getRow(sprintf($QUERY['bug-show-bug'], $bugid,
-	    	$restricted_projects))) {
+			$restricted_projects))) {
 		show_text(translate("That bug does not exist"), true);
 		return;
 	}
@@ -641,9 +645,9 @@
 	$rs = $db->query("select * from ".TBL_ATTACHMENT." where bug_id = $bugid");
 	if ($rs->numRows()) {
 		while ($rs->fetchInto($att)) {
-		    if (@is_readable(ATTACHMENT_PATH."/{$row['project_id']}/$bugid-{$att['file_name']}")) {
+			if (@is_readable(ATTACHMENT_PATH."/{$row['project_id']}/$bugid-{$att['file_name']}")) {
 				$attachments[] = $att;
-		    }
+			}
 		}
 	}
 




Hi all,

I'm using phpBugTracker, and i discover small bugs in spanish
tranlation. I attach the changes that i apply.

The changes are:

  * Some call to function "translate()" at template files, that not
present in phpbt-1rc5 version (from CVS repository).

  * In admin/*.php, you check "$perm->check('Admin');" for know if the
user that he start the session has role Admin or not. If i traduce the
terms of tables TBL_AUTH_PERM, (ex: 'Admin' => 'Administrador', etc...).
I think is better check the perm_id than perm_name.
 
  * I have problems with "admin/user.php", when i save changes of an
user. I have changed the select, that not presents this problems.

Would be interesting, that i change the language at configuration,
automatically execute a sql script, that updates some terms of the data
scheme (i attach the file Updates-phpbt.sql).

I hope that will be usefully.
Ignacio.

I'd be happy to receive and integrate the changes required for 
firebird/interbase support. :)

Chris wrote:

> Hi
>
>  
>
> We would be interested in developing a firebird / interbase version of 
> phpbugtracker
>
>  
>
> regards Chris
>

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

Added Files:
	fi.php 
Log Message:


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

// fi.php - Finnish strings and titles
// Translated by Olli Jarva <oll...@pa...>
// ------------------------------------------------------------------------
// Copyright (c) 2001 - 2004 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: fi.php,v 1.1 2004/12/06 00:36:38 bcurtis Exp $

$STRING = array(
	"That attachment does not exist" => "Liitettä ei löydy",
	"Please specify a file to upload" => "Valitse lähetettävä tiedosto",
	"The file you specified is larger than %s bytes" => "Valitsemasi tiedosto on yli %s tavua",
	"The file you specified is larger than %d bytes" => "Valitsemasi tiedosto on yli %d tavua",
	"That bug does not exist" => "Kohdetta ei löydy",
	"That attachment already exists for this bug" => "Valitsemasi liite on jo olemassa",
	"Couldn't find where to save the file!" => "Ongelma tallennuksessa: polkua ei löydy!",
	"Couldn't create a file in the save path" => "Tiedostoa ei voi tallentaa tallennuskansioon",
	"There was an error moving the uploaded file" => "Virhe tallennetun tiedoston siirrossa",
	"Add Attachment" => "Lisää liite",
	"You do not have the permissions required for that function" => "Ei oikeuksia tähän toimintoon",
	"Bug Votes" => "Kohteen äänestys",
	"You have already voted for this bug" => "Olet jo äänestänyt tätä kohdetta",
	"You have reached the maximum number of votes per user" => "Olet käyttänyt enimmäismäärän ääniä",
	"There is no history for this bug" => "Tällä kohteella ei ole historiaa",
	"Bug History" => "Historia",
	"You can not change this bug" => "Et voi muuttaa tätä kohdetta",
	"Someone has updated this bug since you viewed it. The bug info has been reloaded with the latest changes." => "Joku on muuttanut kohdetta kun katsoit sitä. Kohteen tiedot ladataan uudelleen.",
	"That user does not exist" => "Käyttäjää ei ole",
	"That bug dependency has already been added" => "Riippuvuus on jo lisätty",
	"Please enter a summary" => "Kirjoita yhteenveto",
	"Please enter a description" => "Kirjoita kuvaus",
	"Create Bug" => "Luo kohde",
	"View Bug" => "Katso kohdetta",
	"No projects found" => "Ei projekteja",
	"Select Project" => "Valitse projekti",
	"Invalid login" => "Virheellinen kirjautuminen",
	"phpBugTracker Login" => "phpBugTracker:n kirjautuminen",
	"Your phpBugTracker password is %s" => "Sinun phpBugTracker-salasana on %s",
	"Your password has been emailed to you" => "Salasanasi on lähetetty sinulle",
	"No bugs found" => "Ei kohteita",
	"Bug Summary" => "Kohteen tiedot",
	"Project" => "Projekti",
	"Open" => "Avoin",
	"Total" => "Yhteensä",
	"Home" => "Alkuun",
	"Please enter the host name for your database server" => "Kirjoita tietokantapalvelimen nimi",
	"Please enter the name of the database you will be using" => "Kirjoita tietokannan nimi",
	"Please enter the user name for connecting to the database" => "Kirjoita tietokannan käyttäjätunnus",
	"Please enter the phpBT email address" => "Kirjoita phpBT:n sähköpostiosoite",
	"Please enter the admin login" => "Kirjoita ylläpitäjän käyttäjätunnus",
	"Please use a valid email address for the admin login" => "Käytä oikeaa sähköpostia ylläpitäjälle",
	"Please enter the admin password" => "Anna ylläpitäjän salasana",
	"Please confirm the admin password" => "Anna ylläpitäjän salasana uudelleen",
	"The admin passwords don't match" => "Ylläpitäjän salasanat eivät täsmää",
	"Error writing to config.php" => "Virhe kirjoittaessa tiedostoa config.php",
	"Please enter a login" => "Anna käyttäjätunnus",
	"Please enter a valid email" => "Anna oikea sähköpostiosoite",
	"That login has already been used" => "Käyttäjätunnus on jo käytössä",
	"New account created" => "Uusi tili on luotu",
	"Create new account" => "Luo uusi tili",
	"Query Bugs" => "Etsi kohteita",
	"Bug List" => "Lista",
	"Assigned To" => "Osoitettu:",
	"Reporting" => "Raportoi",
	"Bug Counts by Date" => "Kohteiden määrä päivien mukaan",
	"Your bug list column preferences have been saved" => "Kohdelistan asetukset on tallennettu",
	"Please enter a password" => "Anna salasana",
	"Those passwords don't match -- please try again" => "Salasanat eivät täsmää, yritä uudelleen",
	"Password changed" => "Salasana vaihdettu",
	"Changes Saved" => "Muutokset tallennettu",
	"Preferences changed" => "Asetukset muutettu",
	"Receive notifications of bug changes via email" => "Lähetä ilmoitukset muutoksista sähköpostilla",
	"Show saved queries on the homepage" => "Näytä tallennetut haut aloitussivulla",
	"User preferences" => "Käyttäjän asetukset",
	"Configuration" => "Asetukset",
	"Please enter a name" => "Anna nimi",
	"Edit Database" => "Muokkaa tietokantaa",
	"Database List" => "Tietokantalista",
	"Edit Group" => "Muokkaa ryhmää",
	"Group List" => "Ryhmät",
	"Edit Operating System" => "Muokkaa käyttöjärjestelmiä",
	"Operating System List" => "Käyttöjärjestelmät",
	"Please enter a version" => "Anna versio",
	"Edit Version" => "Muokkaa versiota",
	"Edit Component" => "Muokkaa komponenttia",
	"You cannot choose specific groups when \"All Groups\" is chosen" => "Et voi valita tiettyjä ryhmiä, kun \"Kaikki ryhmät\" on valittu",
	"Edit Project" => "Muokkaa projektia",
	"Project List" => "Projektit",
	"Edit Resolution" => "Muokkaa ratkaisuja",
	"Resolution List" => "Ratkaisut",
	"Edit Severity" => "Muokkaa vakavuuksia",
	"Severity List" => "Vakavuudet",
	"Edit Site" => "Muokkaa sivuja",
	"Site List" => "Sivulista",
	"Edit Status" => "Muokkaa tilaa",
	"Status List" => "Tilat",
	"Please enter an email" => "Anna sähköposti",
	"Edit User" => "Muokkaa käyttäjää",
	"User List" => "Käyttäjät",
	"Name" => "Nimi",
	"Description" => "Kuvaus",
	"Owner" => "Omistaja",
	"None" => "Ei mitään",
	"Active" => "Aktiivinen",
	"Submit" => "Lähetä",
	"Add new project" => "Lisää uusi projekti",
	"Created Date" => "Luontipäivä",
	"Yes" => "Kyllä",
	"No" => "Ei",
	"Variable" => "Muuttuja",
	"Value" => "Arvo",
	"Information" => "Tietoa",
	"description" => "kuvaus",
	"Sort Order" => "Järjestys",
	"Database list" => "Tietokannat",
	"Add new database" => "Lisää tietokanta",
	"Are you sure you want to delete this item?" => "Haluatko varmasti poistaa tämän kohteen?",
	"Delete" => "Poista",
	"Add new group" => "Lisää ryhmä",
	"Users" => "Käyttäjät",
	"Locked" => "Lukittu",
	"This will remove all user assignments to this group and the group itself. Continue?" => "Tämä poistaa kaikki käyttäjät tästä ryhmästä ja ryhmän. Jatka?",
	"This will remove all user assignments to this group.  Continue?" => "Tämä poistaa kaikki käyttäjät ryhmästä. Jatka?",
 	"Purge" => "Poista",
	"Assignable" => "Lisättävä",
	"Find Bug" => "Etsi kohde",
	"Projects" => "Projektit",
	"Groups" => "Ryhmät",
	"Documentation" => "Dokumentaatio",
	"User Tools" => "Käyttäjän työkalut",
	"Statuses" => "Tilat",
	"Resolutions" => "Ratkaisut",
	"Severities" => "Vakavuudet",
	"Operating Systems" => "Käyttöjärjestelmät",
	"Databases" => "Tietokannat",
	"Sites" => "Sivut",
	"Regex" => "Regex",
	"Add new operating system" => "Lisää uusi käyttöjärjestelmä",
	"Are you sure you want to delete this OS" => "Haluatko varmasti poistaa tämän käyttöjärjestelmän",
	"Items with a Sort Order = 0 will not be selectable by users." => "Kohteet, joissa järjestys on 0 eivät ole käyttäjien valittavissa.",
	"Only those items that have no bugs referencing them can be deleted." => "Vain käyttämättömät kohteet voi poistaa.",
 	"Project Information" => "Projektin tiedot",
	"Version Information" => "Versiotiedot",
	"Initial Version" => "Aloitusversio",
	"Component Information" => "Komponentin tiedot",
	"Initial Component Name" => "Aloituskomponentin nimi",
	"Only users in the following groups can see this project" => "Vain seuraavien ryhmien käyttäjät voivat nähdä tämän projektin",
	"These developers can administer this project" => "Nämä kehittäjät voivat hallita tätä projektia",
	"Versions" => "Versiot",
	"Add new version" => "Lisää uusi versio",
	"Version" => "Versio",
	"Created" => "Luotu",
	"No versions found" => "Ei versioita",
	"Components" => "Komponentit",
	"Add new component" => "Lisää uusi komponentti",
	"Component" => "Komponentti",
	"No components found" => "Ei komponentteja",
	"Add new resolution" => "Lisää uusi ratkaisu",
	"Are you sure you want to delete this resolution?" => "Haluatko varmasti poistaa tämän ratkaisun?",
	"Row Color" => "Rivin väri",
	"Add new severity" => "Lisää uusi vakavuus",
	"Are you sure you want to delete this severity?" => "Haluatko varmasti poistaa tämän vakavuuden?",
	"Add new site" => "Lisää uusi sivu",
	"Open/Closed" => "Avaa/sulje",
	"Closed" => "Suljettu",
	"Add new status" => "Lisää uusi tila",
	"Login" => "Käyttäjätunnus",
	"Email" => "Sähköposti",
	"First Name" => "Etunimi",
	"Last Name" => "Sukunimi",
	"Password" => "Salasana",
	"User Groups" => "Käyttäjäryhmät",
	"Email Notify" => "Sähköpostihuomautukset",
	"Add new user" => "Lisää uusi käyttäjä",
	"Filter" => "Suodatin",
	"Bug" => "Kohde",
	"Reporter" => "Raportoija",
	"Assigned to" => "Osoitettu:",
	"Status" => "Tila",
	"Resolution" => "Ratkaisu",
	"Severity" => "Vakavuus",
	"Priority" => "Prioriteetti",
	"Operating System" => "Käyttöjärjestelmä",
	"Summary" => "Yhteenveto",
	"URL" => "URL",
	"Depends on bugs" => "Riippuu kohteesta",
	"Blocks bugs" => "Estää kohteen",
	"Comments" => "Kommentit",
	"Posted by" => "Lähettäjä",
	"Back to bug" => "Takaisin",
	"You must login to modify this bug" => "Sinun pitää kirjautua jotta voit muuttaa tätä",
	"Return to bug list" => "Takaisin bugilistaan",
	"Previous bug" => "Edellinen kohde",
	"Next bug" => "Seuraava kohde",
	"To be closed in version" => "Suljetaan versiossa",
	"Choose one" => "Valitse yksi",
	"Database" => "Tietokanta",
	"Closed in version" => "Suljettu versiossa",
	"Site" => "Sivu",
	"Add CC" => "Lisää CC",
	"Add dependency" => "Lisää riippuvuus",
	"Remove dependency" => "Poista riippuvuus",
	"Remove selected CCs" => "Poista valitut CCt",
	"Additional comments" => "Ylimääräiset komponentit",
	"Supress notification email" => "Älä lähetä ilmoitusviestiä",
	"Attachments" => "Liitteet",
	"Create new attachment" => "Lisää uusi liite",
	"Size" => "Koko",
	"Type" => "Tyyppi",
	"Are you sure you want to delete this attachment?" => "Haluatko poistaa tämän liitteen?",
	"No attachments found for this bug" => "Ei liitteitä",
	"Vote for this bug" => "Äänestä tätä kohdetta",
	"View votes" => "Katso äänestys",
	"View bug history" => "Historia",
	"Date" => "Päiväys",
	"Who" => "Kuka",
	"What" => "Mitä",
	"Old Value" => "Vanha arvo",
	"New Value" => "Uusi arvo",
	"When" => "Milloin",
	"No history found for this bug" => "Ei historiaa",
	"Download to spreadsheet" => "Lataa taulukko",
	"No votes found for this bug" => "Ei äänestyksiä",
	"Back" => "Takaisin",
	"Five most recently submitted bugs" => "Viisi uusinta",
	"Five most recently closed bugs" => "Viisi viimeksi suljettua",
	"Saved Queries" => "Tallennetut haut",
	"The image path is not writeable" => "Kuvia ei voi tallentaa",
	"Quick Stats" => "Tilastot",
	"# bugs" => "# kohdetta",
	"phpBugTracker Installation" => "phpBugTracker:n asennus",
	"DB Test Failure" => "Tietokannan testaus epäonnistui",
	"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." => "Asennusohjelma ei voi yhdistää tietokantaan <b>%s</b>. Tarkista, että tietokanta on jo olemassa.",
	"DB Test Success" => "Tietokannan testaus suoritettu",
	"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!" => "Asennusohjelma on onnistuneesti yhdistänyt tietokantaan %s koneella %s käyttäen annettua salasanaa ja käyttäjätunnusta.",
	"Close window" => "Sulje ikkuna",
	"Database Options" => "Tietokannan asetukset",
	"Database Name" => "Tietokannan nimi",
	"This database must already exist" => "Tietokannan pitää olla olemassa",
	"User" => "Käyttäjä",
	"Table Prefix" => "Taulun etuliite",
	"Test Database Connection" => "Testaa tietokanta",
	"phpBT Email" => "phpBT:n sähköposti",
	"The email address used for sending bug updates, etc." => "Sähköpostiosoite, josta lähetetään tiedotteet",
	"Admin Login" => "Ylläpitäjän käyttäjätunnus",
	"Must be a valid email address" => "Olemassa oleva sähköposti",
	"Admin Password" => "Ylläpitäjän salasana",
	"Confirm Password" => "Uudelleen",
	"Encrypt Passwords in DB" => "Salaa salasanat tietokantaan",
	"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." => "Kun lähetät lomakkeen, tietokannan taulut luodaan ja config.php tallennetaan levylle. Tämän jälkeen bugtrackeriin voi kirjautua ja sitä voi käyttää normaalisti.",
	"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!" => "Koska tämä ohjelma ei voi kirjoittaa config.php:tä, tämän lomakkeen lähettäminen pyytää sinua tallentamaan config.php:n. Tallenna tämä tiedosto bug track:n 
kansioon. Sen jälkeen <a href=\"index.php\">voit kirjatua</a> sisään. Aloitussivulta voit siirtyä ylläpitäjän työkaluihin ja muokata oletusasennusta. Asetusten muokkaamisen jälkeen voit 
lisätä uuden projektin ja aloittaa bugien raportoinnin!",
	"Save Options" => "Tallenna asetukset",
	"User Login" => "Kirjautuminen",
	"Invalid login and/or password" => "Väärä käyttäjätunnus tai salasana",
	"Your password has been mailed to you" => "Salasanasi on lähetetty sähköpostilla",
	"Email my password" => "Lähetä salasana sähköpostilla",
	"Open a new account" => "Avaa uusi käyttäjätunnus",
	"You have been logged out" => "Sinut on kirjattu ulos",
	"Return to phpBugTracker home" => "Takaisin phpBugTracker:n aloitussivulle",
	"Sorry, but the self-creation of new accounts has been disabled.  Please contact the administrator to have an account created for you." => "Valitettavasti itse luotavat käyttäjätilit on poistettu käytöstä. Ota yhteyttä ylläpitäjään, jos haluat tilin.",
	"Create a new account" => "Luo uusi käyttäjätunnus",
	"optional" => "Valinnaiset",
	"Thanks for creating an account.  Check your email for your password." => "Kiitos käyttäjätunnuksen luonnista. Hae salasanasi sähköpostista-",
	"First, you must pick a product on which to enter a bug." => "Valitse aluksi tuote johon kohde lisätään.",
	"All" => "Kaikki",
	"Sort by" => "Lajittele",
	"Bug number" => "Numero",
	"Ascending" => "Nouseva",
	"Descending" => "Laskeva",
	"Save this query as" => "Tallenna haku",
	"Reset to default query" => "Tyhjennä oletusasetuksiin",
	"Are you sure you want to delete this saved query?" => "Haluatko varmasti poistaa tämän tallennetun haun?",
	"Go to the advanced query page" => "Siirry monipuolisempaan hakuun",
	"Reported on Site" => "Raportoitu sivulle",
	"matching as" => "täsmää",
	"regexp" => "regexp",
	"not regexp" => "ei regexp",
	"substring" => "sisältää",
	"exact" => "täsmälleen",
	"A description entry" => "Kuvauskenttä",
	"Created Date Range" => "Luotu ajalla",
	"to" => "",
	"Closed in Version" => "Suljettu versiossa",
	"To be Closed in Version" => "Suljetaan versiossa",
	"Sort By" => "Lajittele",
	"Go to the simple query page" => "Siirry yksinkertaiseen hakuun",
	"Show bug statistics for the selected project" => "Näytä tilastot valitulle projektille",
	"All projects" => "Kaikki projektit",
	"Go" => "Siirry",
	"Bug Resolutions" => "Kohteen ratkaisut",
	"Unassigned" => "Osoittamaton",
	"Upgade phpBugTracker" => "Päivitä phpBugTracker",
	"Your database has been updated." => "Tietokantasi on päivitetty.",
	"phpBugTracker home" => "phpBugTracker:n alku",
	"This script will upgrade your database from version %s to version %s of phpBugTracker." => "Tämä ohjelma päivittää tietokannan versiosta %s versioon %s.",
	"Do it!" => "Do it!",
	"Change Password" => "Vaihda salasana",
	"Enter new password" => "Uusi salasana",
	"Verify password" => "Uudelleen",
	"Change Preferences" => "Muuta asetuksia",
	"Number of results per page" => "Tuloksia sivulla",
	"Bug List Columns" => "Listan kentät",
	"Choose the fields you want to see in the bug list" => "Valitse kentät, jotka haluat nähdä listauksessa",
	"Votes" => "Äänet",
	"Are you sure you want to delete this vote?" => "Haluatko varmasti poistaa tämän äänen?",
	"Add a new bug" => "Lisää uusi",
	"View Reports" => "Katso raportteja",
	"Create a New Account" => "Luo uusi käyttäjätunnus",
	"Read Documentation" => "Lue dokumentaatiota",
	"Administration Tools" => "Ylläpitäjän työkalut",
	"Email Password" => "Lähetä salasana",
	"Forgot your password?  Have it sent to you" => "Unohdit salasanan? Lähetetty sähköpostilla",
	"Remember %s for next time" => "Remember %s for next time",
	"Remember me" => "Muistuta minua",
	"Bugs assigned to me" => "Minulle osoitetut kohteet",
	"Bugs reported by me" => "Minun lähettämät kohteet",
	"Personal Page" => "Omat asetukset",
	"Logout %s" => "Kirjaa ulos %s",
	"You do not have the rights to view this project." => "Sinulla ei ole oikeuksia katsoa tätä projektia.",
	"Unable to load JPGraph" => "Ei voi ladata JPGraph:ia",
	"Unable to load JPGraph pie class" => "Ei voi ladata JPGraph:n pie-luokkaa",
	"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." => "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.",
	);

?>




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

Modified Files:
	queryform-simple.html queryform.html 
Log Message:
Fixes bug #1023126 - Errors when querying bugs when not logged in

Index: queryform-simple.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform-simple.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- queryform-simple.html	25 Oct 2004 12:07:04 -0000	1.11
+++ queryform-simple.html	5 Dec 2004 17:09:18 -0000	1.12
@@ -111,7 +111,10 @@
 	<?php if (!empty($_SESSION['uid'])) { ?>
 		<?php echo translate("Save this query as"); ?>: <input maxlength="40" type="text" name="savedqueryname">
 		<br><br>
-	<?php } ?>
+	<?php } else { ?>
+                <input type="hidden" name="savedqueryname" value="" />
+        <?php } ?>
+
 	<input type="hidden" name="op" value="doquery">
 	<input type="hidden" name="savedqueryoverride" value="0">
 	<input type="reset" value="<?php echo translate("Reset to default query"); ?>">

Index: queryform.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/queryform.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- queryform.html	25 Oct 2004 12:07:04 -0000	1.21
+++ queryform.html	5 Dec 2004 17:09:18 -0000	1.22
@@ -218,6 +218,8 @@
 	<?php if (!empty($_SESSION['uid'])) { ?>
 		<?php echo translate("Save this query as"); ?>: <input maxlength="40" type="text" name="savedqueryname">
 		<br><br>
+	<?php } else { ?>
+		<input type="hidden" name="savedqueryname" value="" />
 	<?php } ?>
     <input type="reset" value="<?php echo translate("Reset to default query"); ?>">
     <input type="submit">




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

Modified Files:
	bug.php include.php 
Log Message:
Fixes bug #1022927 - Use the EMAIL_DISABLED flag

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- bug.php	25 Oct 2004 12:06:54 -0000	1.135
+++ bug.php	5 Dec 2004 17:01:32 -0000	1.136
@@ -213,6 +213,8 @@
 
 	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 = ' ';

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- include.php	25 Oct 2004 12:15:49 -0000	1.128
+++ include.php	5 Dec 2004 17:01:32 -0000	1.129
@@ -169,13 +169,17 @@
 				$mpassword = md5($password);
 				$db->query("update ".TBL_AUTH_USER." set password = '$mpassword' where login = '$username'");
 			}
-			qp_mail($email, 
-				translate("phpBugTracker Login"),
-				sprintf(translate("Your phpBugTracker password is %s"), $password),
-				sprintf("From: %s", ADMIN_EMAIL));
-			$t->assign('loginerror',
-				'<div class="result">'.translate("Your password has been emailed to you").'</div>');
-			$emailsuccess = true;
+			if (defined('EMAIL_DISABLED') and EMAIL_DISABLED) {
+				$t->assign('loginerror','<div class="result">'.translate("Your password has not been mailed to you because all system email has been disabled.").'</div>');
+			} else {
+				qp_mail($email, 
+					translate("phpBugTracker Login"),
+					sprintf(translate("Your phpBugTracker password is %s"), $password),
+					sprintf("From: %s", ADMIN_EMAIL));
+				$t->assign('loginerror',
+					'<div class="result">'.translate("Your password has been emailed to you").'</div>');
+				$emailsuccess = true;
+			}
 		}
 	} else {
 		if (!$u = $auth->auth_validatelogin()) {




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

Modified Files:
	htmlMimeMail.php 
Log Message:
Fixes bug #542884 - Misconfigured mail settings cause errors to fly

Index: htmlMimeMail.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/htmlMimeMail/htmlMimeMail.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- htmlMimeMail.php	25 Oct 2004 12:07:05 -0000	1.2
+++ htmlMimeMail.php	5 Dec 2004 16:36:14 -0000	1.3
@@ -666,9 +666,9 @@
 				$to = $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']);

 

 				if (!empty($this->return_path)) {

-					$result = mail($to, $subject, $this->output, implode(CRLF, $headers), '-f' . $this->return_path);

+					$result = @mail($to, $subject, $this->output, implode(CRLF, $headers), '-f' . $this->return_path);

 				} else {

-					$result = mail($to, $subject, $this->output, implode(CRLF, $headers));

+					$result = @mail($to, $subject, $this->output, implode(CRLF, $headers));

 				}

 				

 				// Reset the subject in case mail is resent





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

Added Files:
	cn.php 
Log Message:


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

// cn.php - Chinese (Simplified) strings and titles
// Translation by visli
// ------------------------------------------------------------------------
// Copyright (c) 2001 - 2004 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: cn.php,v 1.1 2004/12/05 16:23:07 bcurtis Exp $

$STRING = array(
	"That attachment does not exist" => "¸½¼þ²»´æÔÚ",
	"Please specify a file to upload" => "ÇëÖ¸¶¨Ò»¸öÒªÉÏ´«µÄÎÄ¼þ",
	"The file you specified is larger than %s bytes" => "ÄúÖ¸¶¨µÄÎÄ¼þ³¬¹ýÁË %s ×Ö½Ú",
	"The file you specified is larger than %d bytes" => "ÄúÖ¸¶¨µÄÎÄ¼þ³¬¹ýÁË %d ×Ö½Ú",
	"That bug does not exist" => "¸ÃBug²»´æÔÚ",
	"That attachment already exists for this bug" => "¸Ã¸½¼þÒÑ´æÔÚµ±Ç°BugÖÐ",
	"Couldn't find where to save the file!" => "ÎÞ·¨»ñÖªÎÄ¼þ±£´æµØµã!",
	"Couldn't create a file in the save path" => "ÔÚ±£´æÂ·¾¶ÖÐ²»ÄÜ´´½¨ÎÄ¼þ",
	"There was an error moving the uploaded file" => "¸´ÖÆÉÏ´«ÎÄ¼þÊ±·¢Éú´íÎó",
	"Add Attachment" => "Ìí¼Ó¸½¼þ",
	"You do not have the permissions required for that function" => "Äú²»¾ß±¸Ö´ÐÐ´ËÏî²Ù×÷µÄÈ¨ÏÞ",
	"Bug Votes" => "BugµÄÍ¶Æ±",
	"You have already voted for this bug" => "ÄúÒÑ¾²ÎÓë¹ý¸ÃBugµÄÍ¶Æ±",
	"You have reached the maximum number of votes per user" => "ÄúÒÑ¾´ïµ½Ã¿¸öÓÃ»§µÄ×î´óÍ¶Æ±Êý",
	"There is no history for this bug" => "¸ÃBugÃ»ÓÐÐÞ¸ÄÀúÊ·",
	"Bug History" => "BugÐÞ¸ÄÀúÊ·",
	"You can not change this bug" => "Äú²»ÄÜ¸ü¸Ä¸ÃBug",
	"Someone has updated this bug since you viewed it. The bug info has been reloaded with the latest changes." => "¸ÃBugÔÚÄú²é¿´ºóÓÐÈËÓÖ½øÐÐÁË¸üÐÂ, BugÐÅÏ¢ÒÑ¾±»Ë¢ÐÂ.",
	"That user does not exist" => "¸ÃÓÃ»§²»´æÔÚ",
	"That bug dependency has already been added" => "ËùÒÀÀµµÄBugÒÑ¾±»Ìí¼Ó¹ý",
	"Please enter a summary" => "ÇëÊäÈë¸ÅÒªËµÃ÷",
	"Please enter a description" => "ÇëÊäÈëÃèÊö",
	"Create Bug" => "´´½¨Bug",
	"View Bug" => "²é¿´Bug",
	"No projects found" => "Ã»ÓÐ·¢ÏÖ¹¤³Ì",
	"Select Project" => "Ñ¡Ôñ¹¤³Ì",
	"Invalid login" => "ÎÞÐ§µÇÂ¼",
	"phpBugTracker Login" => "phpBugTracker µÇÂ¼",
	"Your phpBugTracker password is %s" => "ÄúµÄ phpBugTracker ÃÜÂëÊÇ: %s",
	"Your password has been emailed to you" => "ÄúµÄÃÜÂëÒÑ¾·¢ËÍµ½ÄúµÄÓÊÏä",
	"No bugs found" => "Ã»ÓÐ·¢ÏÖBug",
	"Bug Summary" => "Bug¸ÅÒª",
	"Project" => "¹¤³Ì",
	"Open" => "¿ª·Å",
	"Total" => "×Ü¼Æ",
	"Home" => "Ö÷Ò³",
	"Please enter the host name for your database server" => "ÇëÊäÈëÊý¾Ý¿â·þÎñÆ÷µÄÖ÷»úÃû",
	"Please enter the name of the database you will be using" => "ÇëÊäÈëÄúÒªÊ¹ÓÃµÄÊý¾Ý¿âÃû",
	"Please enter the user name for connecting to the database" => "ÇëÊäÈëÁ¬½ÓÊý¾Ý¿âµÄÓÃ»§Ãû",
	"Please enter the phpBT email address" => "ÇëÊäÈë phpBT ÓÊÏäµØÖ·",
	"Please enter the admin login" => "ÇëÊäÈë¹ÜÀíÔ±ÕÊºÅ",
	"Please use a valid email address for the admin login" => "ÇëÊäÈë¹ÜÀíÔ±µÄÓÐÐ§ÓÊÏäµØÖ·",
	"Please enter the admin password" => "ÇëÊäÈë¹ÜÀíÔ±ÃÜÂë",
	"Please confirm the admin password" => "ÇëÈ·ÈÏ¹ÜÀíÔ±ÃÜÂë",
	"The admin passwords don't match" => "¹ÜÀíÔ±ÃÜÂë²»Æ¥Åä",
	"Error writing to config.php" => "Ð´Èëconfig.phpÎÄ¼þ³ö´í",
	"Please enter a login" => "ÇëÊäÈëÕÊºÅ",
	"Please enter a valid email" => "ÇëÊäÈëÓÐÐ§ÓÊÏä",
	"That login has already been used" => "¸ÃÕÊºÅÒÑ¾±»Õ¼ÓÃ",
	"New account created" => "ÐÂÕÊºÅÒÑ´´½¨",
	"Create new account" => "´´½¨ÐÂÕÊºÅ",
	"Query Bugs" => "²éÑ¯Bug",
	"Bug List" => "BugÁÐ±í",
	"Assigned To" => "·ÖÅä¸ø",
	"Reporting" => "±¨±í",
	"Bug Counts by Date" => "Bug°´ÈÕÆÚ¼ÆËã",
	"Your bug list column preferences have been saved" => "ÄúµÄBugÁÐ±í²ÎÊýÒÑ±»±£´æ",
	"Please enter a password" => "ÇëÊäÈëÃÜÂë",
	"Those passwords don't match -- please try again" => "ÃÜÂë²»Æ¥Åä -- ÇëÖØÐÂÊäÈë",
	"Password changed" => "ÃÜÂëÒÑ±»ÐÞ¸Ä",
	"Changes Saved" => "ÐÞ¸ÄÒÑ±£´æ",
	"Preferences changed" => "²ÎÊýÒÑÐÞ¸Ä",
	"Receive notifications of bug changes via email" => "ÓÃEmail½ÓÊÕBug±ä¸üµÄÍ¨Öª",
	"Show saved queries on the homepage" => "ÔÚÖ÷Ò³ÉÏÏÔÊ¾ÒÑ±£´æµÄ²éÑ¯",
	"User preferences" => "ÓÃ»§²ÎÊýÑ¡Ôñ",
	"Configuration" => "ÅäÖÃ",
	"Please enter a name" => "ÇëÊäÈëÃû³Æ",
	"Edit Database" => "±à¼Êý¾Ý¿â",
	"Database List" => "Êý¾Ý¿âÁÐ±í",
	"Edit Group" => "±à¼Èº×é",
	"Group List" => "Èº×éÁÐ±í",
	"Edit Operating System" => "±à¼²Ù×÷ÏµÍ³",
	"Operating System List" => "²Ù×÷ÏµÍ³ÁÐ±í",
	"Please enter a version" => "ÇëÊäÈë°æ±¾ºÅ",
	"Edit Version" => "±à¼°æ±¾ºÅ",
	"Edit Component" => "±à¼Ä£¿é",
	"You cannot choose specific groups when \"All Groups\" is chosen" => "µ±ËùÓÐÈº×é±»Ñ¡¶¨Ê±Äú²»ÄÜÔÙÑ¡ÔñÌØ¶¨µÄÈº×é",
	"Edit Project" => "±à¼¹¤³Ì",
	"Project List" => "¹¤³ÌÁÐ±í",
	"Edit Resolution" => "±à¼½â¾ö",
	"Resolution List" => "½â¾öÁÐ±í",
	"Edit Severity" => "±à¼ÑÏÖØÐÔ",
	"Severity List" => "ÑÏÖØÐÔÁÐ±í",
	"Edit Site" => "±à¼µØµã",
	"Site List" => "µØµãÁÐ±í",
	"Edit Status" => "±à¼×´Ì¬",
	"Status List" => "×´Ì¬ÁÐ±í",
	"Please enter an email" => "ÇëÊäÈëemail",
	"Edit User" => "±à¼ÓÃ»§",
	"User List" => "ÓÃ»§ÁÐ±í",
	"Name" => "Ãû³Æ",
	"Description" => "ÃèÊö",
	"Owner" => "ÊôÖ÷",
	"None" => "ÎÞ",
	"Active" => "»î¶¯",
	"Submit" => "Ìá½»",
	"Add new project" => "Ìí¼ÓÐÂ¹¤³Ì",
	"Created Date" => "´´½¨ÈÕÆÚ",
	"Yes" => "ÊÇ",
	"No" => "·ñ",
	"Variable" => "±äÁ¿",
	"Value" => "Öµ",
	"Information" => "ÐÅÏ¢",
	"description" => "ÃèÊö",
	"Sort Order" => "ÅÅÐò",
	"Database list" => "Êý¾Ý¿âÁÐ±í",
	"Add new database" => "Ìí¼ÓÐÂÊý¾Ý¿â",
	"Are you sure you want to delete this item?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸ÃÏîÂð?",
	"Delete" => "É¾³ý",
	"Add new group" => "Ìí¼ÓÐÂÈº×é",
	"Users" => "ÓÃ»§",
	"Locked" => "ÒÑËø¶¨",
	"This will remove all user assignments to this group and the group itself. Continue?" => "´Ë²Ù×÷½«É¾³ý¸ÃÈº×é¼°¸ÃÈº×éÏÂµÄËùÓÐÓÃ»§. ¼ÌÐøÂð?",
	"This will remove all user assignments to this group.  Continue?" => "´Ë²Ù×÷½«É¾³ý¸ÃÈº×éÏÂµÄËùÓÐÓÃ»§.  ¼ÌÐøÂð?",
	"Purge" => "Çå³ý",
	"Assignable" => "¿É·ÖÅäµÄ",
	"Find Bug" => "°´±àºÅ²éÑ¯Bug",
	"Projects" => "¹¤³Ì",
	"Groups" => "Èº×é",
	"Documentation" => "°ïÖú",
	"User Tools" => "ÓÃ»§¹¤¾ß",
	"Statuses" => "×´Ì¬",
	"Resolutions" => "½â¾ö",
	"Severities" => "ÑÏÖØÐÔ",
	"Operating Systems" => "²Ù×÷ÏµÍ³",
	"Databases" => "Êý¾Ý¿â",
	"Sites" => "µØµã",
	"Regex" => "±í´ïÊ½",
	"Add new operating system" => "Ìí¼ÓÐÂ²Ù×÷ÏµÍ³",
	"Are you sure you want to delete this OS" => "ÄúÈ·¶¨ÒªÉ¾³ý¸Ã²Ù×÷ÏµÍ³Âð",
	"Items with a Sort Order = 0 will not be selectable by users." => "ÅÅÐòÖµÎª0µÄÏîÄ¿½«²»ÄÜ±»ÓÃ»§ËùÑ¡Ôñ.",
	"Only those items that have no bugs referencing them can be deleted." => "Ö»ÓÐµ±ÏîÄ¿Ã»ÓÐ±»ÈÎºÎBugÒýÓÃÊ±²ÅÄÜ±»É¾³ý.",
	"Project Information" => "¹¤³ÌÐÅÏ¢",
	"Version Information" => "°æ±¾ÐÅÏ¢",
	"Initial Version" => "³õÊ¼°æ±¾",
	"Component Information" => "Ä£¿éÐÅÏ¢",
	"Initial Component Name" => "³õÊ¼Ä£¿éÃû³Æ",
	"Only users in the following groups can see this project" => "Ö»ÓÐÏÂÁÐÈº×éÖÐµÄÓÃ»§²ÅÄÜ¿´µ½¸Ã¹¤³Ì",
	"These developers can administer this project" => "¿ª·¢ÈËÔ±¿ÉÒÔ¹ÜÀí¸Ã¹¤³Ì",
	"Versions" => "°æ±¾",
	"Add new version" => "Ìí¼ÓÐÂ°æ±¾",
	"Version" => "°æ±¾",
	"Created" => "ÒÑ´´½¨",
	"No versions found" => "Ã»ÓÐ·¢ÏÖ°æ±¾",
	"Components" => "Ä£¿é",
	"Add new component" => "Ìí¼ÓÐÂÄ£¿é",
	"Component" => "Ä£¿é",
	"No components found" => "Ã»ÓÐ·¢ÏÖÄ£¿é",
	"Add new resolution" => "Ìí¼ÓÐÂ½â¾ö",
	"Are you sure you want to delete this resolution?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸Ã½â¾öÂð?",
	"Row Color" => "ÐÐÑÕÉ«",
	"Add new severity" => "Ìí¼ÓÐÂÑÏÖØÐÔ",
	"Are you sure you want to delete this severity?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸ÃÑÏÖØÐÔÂð?",
	"Add new site" => "Ìí¼ÓÐÂµØµã",
	"Open/Closed" => "¿ª·Å/¹Ø±Õ",
	"Closed" => "¹Ø±Õ",
	"Add new status" => "Ìí¼ÓÐÂ×´Ì¬",
	"Login" => "µÇÂ¼",
	"Email" => "Email",
	"First Name" => "ÐÕÊÏ",
	"Last Name" => "Ãû×Ö",
	"Password" => "ÃÜÂë",
	"User Groups" => "ÓÃ»§Èº×é",
	"Email Notify" => "Email Í¨Öª",
	"Add new user" => "Ìí¼ÓÐÂÓÃ»§",
	"Filter" => "¹ýÂËÆ÷",
	"Bug" => "Bug",
	"Reporter" => "±¨¸æÈË",
	"Assigned to" => "·ÖÅä¸ø",
	"Status" => "×´Ì¬",
	"Resolution" => "½â¾ö",
	"Severity" => "ÑÏÖØÐÔ",
	"Priority" => "ÓÅÏÈ¼¶",
	"Operating System" => "²Ù×÷ÏµÍ³",
	"Summary" => "¸ÅÒª",
	"URL" => "URL",
	"Depends on bugs" => "ÒÀ¿¿Bug",
	"Blocks bugs" => "Blocks bugs",
	"Comments" => "×¢ÊÍ",
	"Posted by" => "Ìá½»Õß",
	"Back to bug" => "·µ»ØBug",
	"You must login to modify this bug" => "Äú±ØÐëµÇÂ¼²ÅÄÜÐÞ¸Ä¸ÃBug",
	"Return to bug list" => "·µ»ØBugÁÐ±í",
	"Previous bug" => "ÉÏÒ»Bug",
	"Next bug" => "ÏÂÒ»Bug",
	"To be closed in version" => "ÆÚ´ý½â¾ö°æ±¾",
	"Choose one" => "Ñ¡¶¨Ò»¸ö",
	"Database" => "Êý¾Ý¿â",
	"Closed in version" => "½â¾ö°æ±¾",
	"Site" => "µØµã",
	"Add CC" => "Ìí¼Ó¹Ø×¢Õß",
	"Add dependency" => "ÐÂÔöÒÀ´æ¹ØÏµ",
	"Remove dependency" => "É¾³ýÒÀ´æ¹ØÏµ",
	"Remove selected CCs" => "É¾³ýÒÑÑ¡ÔñµÄ¹Ø×¢Õß",
	"Additional comments" => "¸½¼Ó×¢ÊÍ",
	"Supress notification email" => "½ûÓÃÍ¨Öªemail",
	"Attachments" => "¸½¼þ",
	"Create new attachment" => "Ìí¼ÓÐÂ¸½¼þ",
	"Size" => "´óÐ¡",
	"Type" => "ÀàÐÍ",
	"Are you sure you want to delete this attachment?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸Ã¸½¼þÂð?",
	"No attachments found for this bug" => "¸ÃBugÎÞ¸½¼þ",
	"Vote for this bug" => "Îª¸ÃBugÍ¶Æ±",
	"View votes" => "²é¿´Í¶Æ±",
	"View bug history" => "²é¿´BugÀúÊ·",
	"Date" => "ÈÕÆÚ",
	"Who" => "²Ù×÷Õß",
	"What" => "ÊÂ¼þ",
	"Old Value" => "¾ÉÖµ",
	"New Value" => "ÐÂÖµ",
	"When" => "Ê±¼ä",
	"No history found for this bug" => "¸ÃBugÎÞÐÞ¸ÄÀúÊ·",
	"Download to spreadsheet" => "ÏÂÔØÎªµç×Ó±í¸ñ",
	"No votes found for this bug" => "¸ÃBugÎÞÍ¶Æ±",
	"Back" => "·µ»Ø",
	"Five most recently submitted bugs" => "×î½üÌá½»µÄ5¸öBug",
	"Five most recently closed bugs" => "×î½ü¹Ø±ÕµÄ5¸öBug",
	"Saved Queries" => "¿ì½Ý²éÑ¯",
	"The image path is not writeable" => "Í¼Æ¬Â·¾¶²»¿ÉÐ´",
	"Quick Stats" => "µ±Ç°BugÐÅÏ¢",
	"# bugs" => "# bug",
	"phpBugTracker Installation" => "phpBugTracker °²×°",
	"DB Test Failure" => "Êý¾Ý¿â²âÊÔÊ§°Ü",
	"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." => "°²×°½Å±¾ÓÃÖ¸¶¨µÄÓÃ»§ÃûÓëÃÜÂëÎÞ·¨Á¬½ÓÊý¾Ý¿â <b>%s</b> ÓÚÖ÷»ú <b>%s</b> .<br>Çë¼ì²é×ÊÁÏÊÇ·ñÕýÈ·»òÊý¾Ý¿âÊÇ·ñÒÑ´æÔÚºóÔÙÖØÊÔ.",
	"DB Test Success" => "Êý¾Ý¿â²âÊÔ³É¹¦",
	"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!" => "°²×°½Å±¾ÓÃÖ¸¶¨ÓÃ»§ÃûºÍÃÜÂë³É¹¦Á¬½ÓÊý¾Ý¿â <b>%s</b> ÓÚÖ÷»ú <b>%s</b> .<br>¹§Ï²!",
	"Close window" => "¹Ø±Õ´°¿Ú",
	"Database Options" => "Êý¾Ý¿âÑ¡Ïî",
	"Database Name" => "Êý¾Ý¿âÃû",
	"This database must already exist" => "¸ÃÊý¾Ý¿âÒÑ¾´æÔÚ",
	"User" => "ÓÃ»§",
	"Table Prefix" => "±íÇ°×º",
	"Test Database Connection" => "²âÊÔÊý¾Ý¿âÁ¬½Ó",
	"phpBT Email" => "phpBT Email",
	"The email address used for sending bug updates, etc." => "ÓÃÓÚ·¢ËÍBug¸üÐÂµÈÍ¨ÖªµÄEmailµØÖ·.",
	"Admin Login" => "¹ÜÀíÔ±µÇÂ¼",
	"Must be a valid email address" => "±ØÐëÊÇÓÐÐ§µÄEmailµØÖ·",
	"Admin Password" => "¹ÜÀíÔ±ÃÜÂë",
	"Confirm Password" => "È·ÈÏÃÜÂë",
	"Encrypt Passwords in DB" => "ÃÜÂëÔÚÊý¾Ý¿âÖÐ¼ÓÃÜ",
	"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." => "µ±ÄúÌá½»¸Ã±íµ¥, Êý¾Ý±í½«±»´´½¨ÇÒconfig.phpÎÄ¼þ½«±»±£´æµ½Ó²ÅÌ.  Ö®ºóÄú¾Í¿ÉÒÔµÇÂ¼ºÍÊ¹ÓÃ±¾bug¸ú×ÙÏµÍ³ÁË.",
	"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!" => "ÓÉÓÚ½Å±¾²»ÄÜ°Ñconfig.phpÎÄ¼þÐ´ÈëÓ²ÅÌ, ËùÒÔµ±ÄúÌá½»Íê±¾Ò³Ãæºó
ÄúÐèÒªÊÖ¹¤±£´æconfig.php.  ¸´ÖÆ¸ÃÎÄ¼þµ½Bug TrackerµÄ°²×°Ä¿Â¼, 
È»ºóÄúÐèÒª<a href=\index.php\>µÇÂ¼Bug Tracker</a>.  ´ÓÖ÷Ò³ÉÏ
×ªµ½¹ÜÀí¹¤¾ß, ²¢Í¨¹ýÅäÖÃÁ´½ÓÀ´×Ô¶¨ÒåÄúµÄ°²×°.  Ò»µ©ÄúÍê³ÉÁËÅäÖÃ, 
Äú¾Í¿ÉÒÔ¿ª·¢Ìí¼Ó¹¤³ÌÓëÌá½»BugÁË!",
	"Save Options" => "±£´æÑ¡Ïî",
	"User Login" => "ÓÃ»§µÇÂ¼",
	"Invalid login and/or password" => "ÎÞÐ§ÓÃ»§Ãû»òÃÜÂë",
	"Your password has been mailed to you" => "ÄúµÄÃÜÂëÒÑ¾·¢ËÍµ½ÄúµÄÓÊÏä",
	"Email my password" => "·¢ËÍÃÜÂë",
	"Open a new account" => "¿ªÆôÐÂÕÊºÅ",
	"You have been logged out" => "ÄúÒÑ¾ÍË³öµÇÂ¼",
	"Return to phpBugTracker home" => "·µ»ØphpBugTrackerÖ÷Ò³",
	"Sorry, but the self-creation of new accounts has been disabled.  Please contact the administrator to have an account created for you." => "¶Ô²»Æð, ´´½¨ÐÂÕÊºÅ¹¦ÄÜÒÑ±»½ûÓÃ.  Òª´´½¨ÕÊºÅÇëÓë¹ÜÀíÔ±ÁªÏµ.",
	"Create a new account" => "´´½¨ÐÂÕÊºÅ",
	"optional" => "¿ÉÑ¡",
	"Thanks for creating an account.  Check your email for your password." => "¶àÐ»´´½¨ÐÂÕÊºÅ.  Çëµ½ÄúµÄÓÊÏäÊÕÈ¡ÄúµÄÃÜÂë.",
	"First, you must pick a product on which to enter a bug." => "Ê×ÏÈ, ÄúÐèÒªÑ¡È¡Ìí¼ÓBugµÄ¹¤³Ì.",
	"All" => "È«²¿",
	"Sort by" => "ÅÅÐò·½Ê½",
	"Bug number" => "Bug±àºÅ",
	"Ascending" => "ÉýÐò",
	"Descending" => "½µÐò",
	"Save this query as" => "±£´æ¸Ã²éÑ¯Îª",
	"Reset to default query" => "ÖØÖÃÎªÄ¬ÈÏ²éÑ¯",
	"Are you sure you want to delete this saved query?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸Ã±£´æµÄ²éÑ¯Âð?",
	"Go to the advanced query page" => "Ìø×ªµ½¸ß¼¶²éÑ¯Ò³Ãæ",
	"Reported on Site" => "±¨¸æµØµã",
	"matching as" => "Æ¥ÅäÎª",
	"regexp" => "ÕýÔò±í´ïÊ½",
	"not regexp" => "·ÇÕýÔò±í´ïÊ½",
	"substring" => "×Ó´®",
	"exact" => "¾«È·",
	"A description entry" => "ÃèÊöÏî",
	"Created Date Range" => "´´½¨ÈÕÆÚ·¶Î§",
	"to" => "µ½",
	"Closed in Version" => "½â¾ö°æ±¾",
	"To be Closed in Version" => "ÆÚ´ý½â¾ö°æ±¾",
	"Sort By" => "ÅÅÐò·½Ê½",
	"Go to the simple query page" => "Ìø×ªµ½¼òµ¥²éÑ¯Ò³Ãæ",
	"Show bug statistics for the selected project" => "ÏÔÊ¾Ñ¡¶¨¹¤³ÌµÄBugÍ³¼Æ",
	"All projects" => "È«²¿¹¤³Ì",
	"Go" => "×ªµ½",
	"Bug Resolutions" => "Bug ½â¾ö",
	"Unassigned" => "Î´·ÖÅä",
	"Upgade phpBugTracker" => "Éý¼¶ phpBugTracker",
	"Your database has been updated." => "ÄúµÄÊý¾Ý¿âÒÑ±»Éý¼¶.",
	"phpBugTracker home" => "phpBugTrackerÖ÷Ò³",
	"This script will upgrade your database from version %s to version %s of phpBugTracker." => "¸Ã½Å±¾½«°ÑÄúµÄphpBugTrackerÊý¾Ý¿â´Ó°æ±¾ %s Éý¼¶µ½°æ±¾ %s.",
	"Do it!" => "Do it!",
	"Change Password" => "ÐÞ¸ÄÃÜÂë",
	"Enter new password" => "ÊäÈëÐÂÃÜÂë",
	"Verify password" => "Ð£ÑéÃÜÂë",
	"Change Preferences" => "ÐÞ¸Ä²ÎÊý",
	"Number of results per page" => "Ã¿Ò³µÄ½á¹ûÊýÄ¿",
	"Bug List Columns" => "BugÁÐ±íÏÔÊ¾ÁÐ",
	"Choose the fields you want to see in the bug list" => "Ñ¡ÔñÄúÐèÒªÔÚBugÁÐ±íÖÐÏÔÊ¾µÄ×Ö¶Î",
	"Votes" => "Í¶Æ±",
	"Are you sure you want to delete this vote?" => "ÄúÈ·¶¨ÒªÉ¾³ý¸ÃÍ¶Æ±?",
	"Add a new bug" => "Ìí¼ÓÐÂBug",
	"View Reports" => "²é¿´±¨±í",
	"Create a New Account" => "´´½¨ÐÂÕÊºÅ",
	"Read Documentation" => "ÔÄ¶Á°ïÖú",
	"Administration Tools" => "¹ÜÀí¹¤¾ß",
	"Email Password" => "EmailÃÜÂë",
	"Forgot your password?  Have it sent to you" => "ÄúÍü¼ÇÃÜÂëÁË?  ÓÃËü·¢ËÍ¸øÄú",
	"Remember %s for next time" => "ÏÂ´Î¼Ç×¡ %s ",
	"Remember me" => "¼Ç×¡ÎÒ",
	"Bugs assigned to me" => "·ÖÅä¸øÎÒµÄBug",
	"Bugs reported by me" => "ÎÒ±¨¸æµÄBug",
	"Personal Page" => "¸öÈËÒ³Ãæ",
	"Logout %s" => "ÍË³ö %s",
	"You do not have the rights to view this project." => "ÄúÃ»ÓÐ²é¿´¸Ã¹¤³ÌµÄÈ¨ÏÞ.",
	"Unable to load JPGraph" => "²»ÄÜ¼ÓÔØJPGraph",
	"Unable to load JPGraph pie class" => "²»ÄÜ¼ÓÔØ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." => "ÊÔÍ¼Ê¹ÓÃJPGraph¿âÊ±³öÏÖ¹ÊÕÏ. ÇëÔÚ¹ÜÀí¹¤¾ßµÄÅäÖÃÒ³Ãæ, Í¨¹ýÉèÖÃ'USE_JPGRAPH'Îª'NO'À´½ûÓÃËü.",
	);

?>



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

Added Files:
	.htaccess gnats-to-phpbt.py 
Log Message:


--- NEW FILE: .htaccess ---
Order deny,allow
Deny from all

--- NEW FILE: gnats-to-phpbt.py ---
#!/usr/bin/python
#
#PROGRAM: gnats-to-phpbt.py
#
#DESCRIPTION: Converts a single GNATS bug tracking database entry to phpbt and
#inserts it; designed to be run in loop on all GNATS entries for a given
#project.  Do the following before running:
#
#1. Fill out the configuration setting
#2. Transfer over any user accounts manually; make sure to configure a
#default user account.
#3. Create the project that the GNATS bugs are for.
#4. Create the following status types: Feedback, Suspended, and Analyzed.
#
#USAGE: gnats-to-phpbt.py <filename>
#
#AUTHOR: Karen Pease (kar...@ui...)
#
#LICENSE: GPL
#

import sys,re,string,MySQLdb,time

##############################
#CONFIGURATION
#
db_host='my.host.name'
db_user='username'
db_passwd='password'
db_name='bug_tracker'
#
database_id="2"
#1=Oracle, 2=Mysql, 3=Postgres (should always be 2)
#
site_id="0"
#0=All, 1=Production 1, 2=Production 2, 3=Test 1, 4=Test 2
#
default_username="unknown"
#
project='Foobar'
version='2.0'
component="Default"
#
os='Linux'
#
##############################

False=0
True=1

if len(sys.argv)!=2:
	print "ERROR: This script takes one argument (the C++ file to process)"
	sys.exit(1)

filename=sys.argv[1]
fp=None
try:
	fp=open(filename,'r')
except:
	print "ERROR: File %s not found." % filename

data=fp.read()
fp.close()

data=string.replace(data,"'","''")
lines2=string.split(data,'\n')
lines=[]
for line in lines2:
	lines.append(line+"\n")

vars={}
started=False
last_var=None
for line in lines:
	if line[0]=='>' or line[:14]=='State-Changed-':
		started=True
		if line[0]=='>':
			line=line[1:]
		split=string.split(line,':',1)
		vars[split[0]]=split[1][1:]
		if last_var!=None:
			vars[last_var]=vars[last_var][:-1]	#Strip the trailing newline
		last_var=split[0]
	elif started==True:
		vars[last_var]=vars[last_var]+line

for key in vars.keys():
	while len(vars[key])>0 and vars[key][0]==' ':
		vars[key]=vars[key][1:]
	
db=MySQLdb.connect(host=db_host,user=db_user,passwd=db_passwd,db=db_name)
curs=db.cursor()

curs.execute("select id from phpbt_bug_seq")
bug_id_num=curs.fetchall()[0][0]
bug_id="%d" % (bug_id_num+1)

if vars['Priority']=="high":
	priority="2"
elif vars['Priority']=="medium":
	priority="1"
else:
	priority="0"

if priority=="2":
	curs.execute("select severity_id from phpbt_severity where severity_name='Critical'")
if priority=="1":
	curs.execute("select severity_id from phpbt_severity where severity_name='Significant'")
if priority=="0":
	curs.execute("select severity_id from phpbt_severity where severity_name='Annoyance'")
severity_id="%d" % curs.fetchall()[0][0]

state_name="Unconfirmed"
if vars['State']=="open":
	curs.execute("select status_id from phpbt_status where status_name='Assigned'")
elif vars['State']=="closed":
	curs.execute("select status_id from phpbt_status where status_name='Closed'")
elif vars['State']=="analyzed":
	curs.execute("select status_id from phpbt_status where status_name='Analyzed'")
elif vars['State']=="feedback":
	curs.execute("select status_id from phpbt_status where status_name='Feedback'")
elif vars['State']=="suspended":
	curs.execute("select status_id from phpbt_status where status_name='Suspended'")
status_id="%d" % curs.fetchall()[0][0]

resolution_id="1"		#Assign all of them to "Fixed"?

curs.execute("select user_id from phpbt_auth_user where login='"+vars['Responsible']+"'")
try:
	assigned_to="%d" % curs.fetchall()[0][0]
except IndexError:
	curs.execute("select user_id from phpbt_auth_user where login='"+default_username+"'")
	assigned_to="%d" % curs.fetchall()[0][0]
	
curs.execute("select user_id from phpbt_auth_user where login='"+vars['Submitter-Id']+"'")
try:
	created_by="%d" % curs.fetchall()[0][0]
except IndexError:
	curs.execute("select user_id from phpbt_auth_user where login='"+default_username+"'")
	created_by="%d" % curs.fetchall()[0][0]

date_str=vars['Arrival-Date']
date_str=date_str[:-10]+date_str[-4:]
created_date=time.mktime(time.strptime(date_str))
created_date="%d" % created_date

try:
	curs.execute("select user_id from phpbt_auth_user where login='"+vars['State-Changed-By']+"'")
	try:
		last_modified_by="%d" % curs.fetchall()[0][0]
	except IndexError:
		curs.execute("select user_id from phpbt_auth_user where login='"+default_username+"'")
		last_modified_by="%d" % curs.fetchall()[0][0]
except KeyError:
	last_modified_by="NULL"

try:
	date_str=vars['Last-Modified']
	date_str=date_str[:-10]+date_str[-4:]
	last_modified_date=time.mktime(time.strptime(date_str))
except KeyError:
	last_modified_date=0
last_modified_date="%d" % last_modified_date

curs.execute("select project_id from phpbt_project where project_name='"+project+"'")
project_id="%d" % curs.fetchall()[0][0]

curs.execute("select version_id from phpbt_version where version_name='"+version+"' and project_id="+project_id)
version_id="%d" % curs.fetchall()[0][0]

curs.execute("select component_id from phpbt_component where component_name='"+component+"'")
component_id="%d" % curs.fetchall()[0][0]

curs.execute("select os_id from phpbt_os where os_name='"+os+"'")
os_id="%d" % curs.fetchall()[0][0]

browser_string="''"

try:
	date_str=vars['Closed-Date']
	date_str=date_str[:-10]+date_str[-4:]
	close_date=time.mktime(time.strptime(date_str))
except KeyError:
	close_date=0
close_date="%d" % close_date
	
#print {"bug_id":filename,"title":vars['Synopsis'],\
#"description":vars['Description'],"severity_id":severity_id,\
#"priority":priority,"status_id":status_id,"resolution_id":resolution_id,\
#"database_id":database_id,"site_id":site_id,"assigned_to":assigned_to,\
#"created_by":created_by,"created_date":created_date,\
#"last_modified_by":last_modified_by,"last_modified_date":last_modified_date,\
#"project_id":project_id,"version_id":version_id,"component_id":component_id,\
#"os_id":os_id,"browser_string":browser_string,"close_date":close_date,\
#"closed_in_version_id":closed_in_version_id,
#"to_be_closed_version_id":to_be_closed_version_id}
#
#print "insert into phpbt_bug (bug_id, title, description, url, severity_id,\
#priority, status_id, resolution_id, database_id, site_id, assigned_to, created_by,\
#created_date, last_modified_by, last_modified_date, project_id, version_id,\
#component_id, os_id, browser_string, close_date, closed_in_version_id,\
#to_be_closed_in_version_id) values ("+filename+",'"+vars['Synopsis']+"','"+\
#vars['Description']+"','',"+severity_id+","+priority+","+status_id+","+\
#resolution_id+","+database_id+","+site_id+","+assigned_to+","+created_by+","+\
#created_date+","+last_modified_by+","+last_modified_date+","+project_id+","+\
#version_id+","+component_id+","+os_id+","+browser_string+","+close_date+","+\
#version_id+","+version_id+")"

curs.execute("insert into phpbt_bug (bug_id, title, description, url, severity_id,\
priority, status_id, resolution_id, database_id, site_id, assigned_to, created_by,\
created_date, last_modified_by, last_modified_date, project_id, version_id,\
component_id, os_id, browser_string, close_date, closed_in_version_id,\
to_be_closed_in_version_id) values ("+bug_id+",'"+vars['Synopsis']+"','"+\
vars['Description']+"','',"+severity_id+","+priority+","+status_id+","+\
resolution_id+","+database_id+","+site_id+","+assigned_to+","+created_by+","+\
created_date+","+last_modified_by+","+last_modified_date+","+project_id+","+\
version_id+","+component_id+","+os_id+","+browser_string+","+close_date+","+\
version_id+","+version_id+")")

curs.execute("update phpbt_bug_seq set id=%d" % (bug_id_num+1))

#curs.execute("select max(comment_id) from phpbt_comment")
#comment_id_num=curs.fetchall()[0][0]
#comment_id="%d" % (comment_id_num+1)
#
#curs.execute("insert into phpbt_comment (comment_id, bug_id, comment_text,\
#created_by,created_date) values ("+comment_id+","+bug_id+","+data+","+\
#created_by+","+created_date+")")

curs.close()
db.close()





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

Log Message:
Directory /cvsroot/phpbt/phpbt/contrib added to the repository





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

Removed Files:
	cz.php cz_iso-8859-2.php da.php du.php ja.php nl.php no.php 
	pt-br.php 
Log Message:
Removing old translation files

--- cz.php DELETED ---

--- cz_iso-8859-2.php DELETED ---

--- da.php DELETED ---

--- du.php DELETED ---

--- ja.php DELETED ---

--- nl.php DELETED ---

--- no.php DELETED ---

--- pt-br.php DELETED ---





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (34)	Aug (215)	Sep (180)	Oct (135)	Nov (105)	Dec (81)
2002	Jan (76)	Feb (22)	Mar (154)	Apr (149)	May (128)	Jun (94)	Jul (14)	Aug (24)	Sep (77)	Oct (52)	Nov (22)	Dec (6)
2003	Jan (4)	Feb (10)	Mar (6)	Apr (29)	May (10)	Jun (37)	Jul (39)	Aug (13)	Sep (23)	Oct (3)	Nov (7)	Dec (2)
2004	Jan	Feb (10)	Mar (4)	Apr	May (35)	Jun (4)	Jul (17)	Aug (6)	Sep (14)	Oct (18)	Nov (2)	Dec (14)
2005	Jan (9)	Feb (30)	Mar (6)	Apr	May (38)	Jun (23)	Jul (21)	Aug (76)	Sep (50)	Oct (51)	Nov (13)	Dec

phpbt-dev Mailing List for phpBugTracker (Page 13)

Bug tracking system

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