Index: bug_change_status_page.php =================================================================== --- bug_change_status_page.php (revision 5751) +++ bug_change_status_page.php (working copy) @@ -285,6 +285,7 @@ if ( ON == $f_reopen_flag ) { # bug was re-opened printf(" \n", config_get( 'bug_reopen_resolution' ) ); + printf(" \n" ); } ?> Index: bug_update.php =================================================================== --- bug_update.php (revision 5751) +++ bug_update.php (working copy) @@ -39,6 +39,7 @@ $f_bug_id = gpc_get_int( 'bug_id' ); $f_update_mode = gpc_get_bool( 'update_mode', FALSE ); # set if called from generic update page $f_new_status = gpc_get_int( 'status', bug_get_field( $f_bug_id, 'status' ) ); + $f_reopen_flag = gpc_get_int( 'reopen_flag', OFF ); $t_bug_data = bug_get( $f_bug_id, true ); if( $t_bug_data->project_id != helper_get_current_project() ) { @@ -47,12 +48,15 @@ $g_project_override = $t_bug_data->project_id; } - if ( ! ( + $t_is_reporter = ( bug_get_field( $f_bug_id, 'reporter_id' ) == auth_get_current_user_id() ); + $t_reopen_status = config_get( 'bug_reopen_status' ); + + if ( ! ( ( ( ON == $f_reopen_flag ) && ( $f_new_status == $t_reopen_status ) && + ( access_has_bug_level( config_get( 'reopen_bug_threshold' ), $f_bug_id ) || + ( $t_is_reporter && ( ON == config_get( 'allow_reporter_reopen' ) ) ) ) ) || ( access_has_bug_level( access_get_status_threshold( $f_new_status, bug_get_field( $f_bug_id, 'project_id' ) ), $f_bug_id ) ) || ( access_has_bug_level( config_get( 'update_bug_threshold' ) , $f_bug_id ) ) || - ( ( bug_get_field( $f_bug_id, 'reporter_id' ) == auth_get_current_user_id() ) && - ( ( ON == config_get( 'allow_reporter_reopen' ) ) || - ( ON == config_get( 'allow_reporter_close' ) ) ) ) + ( $t_is_reporter && ( $f_new_status == CLOSED ) && ( ON == config_get( 'allow_reporter_close' ) ) ) ) ) { access_denied(); } @@ -181,7 +185,7 @@ $t_bug_note_set = true; break; - case config_get( 'bug_reopen_status' ): + case $t_reopen_status: if ( $t_old_bug_status >= $t_resolved ) { bug_set_field( $f_bug_id, 'handler_id', $t_bug_data->handler_id ); # fix: update handler_id before calling bug_reopen # bug_reopen updates the status and bugnote and sends message