[phpBT-dev] CVS: phpbt attachment.php,1.5,1.6 bug.php,1.28,1.29

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

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

Modified Files:
	attachment.php bug.php 
Log Message:
Bug stompin'

Index: attachment.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/attachment.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- attachment.php	2001/08/18 03:12:27	1.5
+++ attachment.php	2001/08/23 02:03:16	1.6
@@ -20,6 +20,7 @@
 // along with phpBugTracker; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 // ------------------------------------------------------------------------
+// $Id$
 
 include 'include.php';
 
@@ -77,7 +78,7 @@
 	}
 
 	// Check for a previously-uploaded attachment with the same name, bug, and project
-	$q->query("select a.bug_id, project_id from attachment a, Bug b where file_name = '{$HTTP_POST_FILES['attachment']['name']}' and a.bug_id = b.bug_id");
+	$q->query("select a.bug_id, project_id from attachment a, bug b where file_name = '{$HTTP_POST_FILES['attachment']['name']}' and a.bug_id = b.bug_id");
 	while ($ainfo = $q->grab()) {
 		if ($bugid == $ainfo['bug_id'] && $projectid == $ainfo['project_id']) {
 			show_attachment_form($bugid, $STRING['dupe_attachment']);

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bug.php	2001/08/19 03:28:31	1.28
+++ bug.php	2001/08/23 02:03:16	1.29
@@ -20,6 +20,7 @@
 // along with phpBugTracker; if not, write to the Free Software Foundation,
 // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 // ------------------------------------------------------------------------
+// $Id$
 
 include 'include.php';
 
@@ -344,7 +345,7 @@
 function show_bug($bugid = 0, $error = '') {
 	global $q, $me, $t, $project, $STRING, $u, $perm; 
 	
-	if (!ereg('^[0-9]+$',$bugid) or !$row = $q->grab("select bug_id, title, reporter.email as reporter, owner.email as owner, b.project_id, b.version_id, b.severity_id, b.created_date, b.last_modified_date, status_name as status, b.priority, b.description, resolution_name as resolution, url, b.component_id, b.os_id from bug b left join resolution r using(resolution_id), severity sv, status st left join user owner on b.assigned_to = owner.user_id left join user reporter on b.created_by = reporter.user_id where bug_id = '$bugid' and b.severity_id = sv.severity_id and b.status_id = st.status_id")) {
+	if (!ereg('^[0-9]+$',$bugid) or !$row = $q->grab("select b.*, reporter.email as reporter, owner.email as owner, status_name, resolution_name from bug b left join resolution r using(resolution_id), severity sv, status st left join user owner on b.assigned_to = owner.user_id left join user reporter on b.created_by = reporter.user_id where bug_id = '$bugid' and b.severity_id = sv.severity_id and b.status_id = st.status_id")) {
 		show_text($STRING['bugbadnum'],true);
 		return;
 	}
@@ -367,8 +368,8 @@
 		'urllabel' => $row['url'] ? "<a href='{$row['url']}'>URL</a>" : 'URL',
 		'severity' => build_select('severity',$row['severity_id']),
 		'priority' => build_select('priority',$row['priority']),
-		'status' => $row['status_id'],
-		'resolution' => $row['resolution_id'],
+		'status' => $row['status_name'],
+		'resolution' => $row['resolution_name'],
 		'owner' => maskemail($row['owner']),
 		'reporter' => maskemail($row['reporter']),
 		'createddate' => date(DATEFORMAT,$row['created_date']),
@@ -380,11 +381,11 @@
 		'component' => build_select('component',$row['component_id'],$row['project_id']),
 		'os' => build_select('os',$row['os_id']),
 		'browserstring' => $row['browser_string'],
-		'bugresolution' => build_select('resolution_id'),
+		'bugresolution' => build_select('resolution'),
 		'submit' => $u == 'nobody' ? $STRING['logintomodify'] : 
 			'<input type="submit" value="Submit">'
 		));
-	switch($row['Status']) {
+	switch($row['status_name']) {
 		case 'Unconfirmed' :
 		case 'New' :
 		case 'Reopened' :