[Mantisbt-cvs] mantisbt bug_update.php,1.67,1.68

[Glenn H. <thr...@us...>]

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

Modified Files:
	bug_update.php 
Log Message:
The original consolidation of the resolve, close, reopen, and update pages
missed some special treatments for these pages.


Index: bug_update.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_update.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- bug_update.php	4 Aug 2004 15:02:22 -0000	1.67
+++ bug_update.php	18 Aug 2004 17:13:01 -0000	1.68
@@ -28,6 +28,7 @@
 
 	# extract current extended information
 	$t_bug_data = bug_get( $f_bug_id, true );
+	$t_old_bug_status = $t_bug_data->status;
 
 	$t_bug_data->reporter_id		= gpc_get_int( 'reporter_id', $t_bug_data->reporter_id );
 	$t_bug_data->handler_id			= gpc_get_int( 'handler_id', $t_bug_data->handler_id );
@@ -55,6 +56,7 @@
 
 	$f_private						= gpc_get_bool( 'private' );
 	$f_bugnote_text					= gpc_get_string( 'bugnote_text', '' );
+	$f_close_now					= gpc_get_string( 'close_now', false );
 
 	# Handle auto-assigning
 	if ( ( NEW_ == $t_bug_data->status )
@@ -99,14 +101,36 @@
 		}
 	}
 
-	# Add a bugnote if there is one
-	$f_bugnote_text = trim( $f_bugnote_text );
-	if ( !is_blank( $f_bugnote_text ) ) {
-		bugnote_add( $f_bug_id, $f_bugnote_text, $f_private );
-	}
+	switch ( $t_bug_data->status ) {
+		case config_get( 'bug_resolved_status_threshold' ):
+			bug_resolve( $f_bug_id, $t_bug_data->resolution, $t_bug_data->fixed_in_version, 
+						$f_bugnote_text, $t_bug_data->duplicate_id, $t_bug_data->handler_id);
 
-	# Update the bug entry
-	bug_update( $f_bug_id, $t_bug_data, true );
+			if ( $f_close_now ) {
+				bug_set_field( $f_bug_id, 'status', CLOSED );
+			}
+			break;
+
+		case CLOSED:
+			bug_close( $f_bug_id, $f_bugnote_text );
+			break;
+
+		case config_get( 'bug_reopen_status' ):
+			if ( $t_old_bug_status >= config_get( 'bug_resolved_status_threshold' ) ) {
+				bug_reopen( $f_bug_id, $f_bugnote_text );
+				break;
+			} # else fall through to default
+
+		default:				
+			# Add a bugnote if there is one
+			if ( !is_blank( $f_bugnote_text ) ) {
+				bugnote_add( $f_bug_id, $f_bugnote_text, $f_private );
+			}
+
+			# Update the bug entry
+			bug_update( $f_bug_id, $t_bug_data, true );
+			break;
+	}
 
 	helper_call_custom_function( 'issue_update_notify', array( $f_bug_id ) );