From: <jfi...@us...> - 2002-12-30 05:38:43
|
Update of /cvsroot/mantisbt/mantisbt In directory sc8-pr-cvs1:/tmp/cvs-serv2254 Modified Files: bug_report.php bug_report_advanced_page.php bug_report_page.php bug_update.php constant_inc.php Log Message: cleanup bug_report* and a few related fixes to other files Index: bug_report.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_report.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bug_report.php 29 Dec 2002 10:26:07 -0000 1.10 +++ bug_report.php 30 Dec 2002 05:38:39 -0000 1.11 @@ -47,9 +47,12 @@ $t_project_id = helper_get_current_project(); $t_upload_method = config_get( 'file_upload_method' ); - if ( 0 != $f_file['size'] && - ( DISK == $t_upload_method || FTP == $t_upload_method ) && - is_uploaded_file( $f_file ) ) { + + # If a file was uploaded, and we need to store it on disk, let's make + # sure that the file path for this project exists + if ( is_uploaded_file( $f_file['tmp_name'] ) && + file_allow_bug_upload() && + ( DISK == $t_upload_method || FTP == $t_upload_method ) ) { $t_file_path = project_get_field( $t_project_id, 'file_path' ); if ( !file_exists( $t_file_path ) ) { @@ -57,19 +60,19 @@ } } + # if a profile was selected then let's use that information if ( 0 != $f_profile_id ) { $row = user_get_profile_row( $t_reporter_id, $f_profile_id ); - extract( $row, EXTR_PREFIX_ALL, 'v' ); - if ( '' == $f_platform ) { - $f_platform = $v_platform; + if ( is_blank( $f_platform ) ) { + $f_platform = $row['platform']; } - if ( '' == $f_os ) { - $f_os = $v_os; + if ( is_blank( $f_os ) ) { + $f_os = $row['os']; } - if ( '' == $f_os_build ) { - $f_os_build = $v_os_build; + if ( is_blank( $f_os_build ) ) { + $f_os_build = $row['os_build']; } } @@ -84,22 +87,25 @@ $f_profile_id, $f_summary, $f_view_state, $f_description, $f_steps_to_reproduce, $f_additional_info ); - # File Uploaded + + # Handle the file upload if ( is_uploaded_file( $f_file['tmp_name'] ) && 0 != $f_file['size'] && file_allow_bug_upload() ) { file_add( $t_bug_id, $f_file['tmp_name'], $f_file['name'], $f_file['type'] ); } -if( ON == config_get( 'use_experimental_custom_fields' ) ) { - $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); - foreach( $t_related_custom_field_ids as $id ) { - $t_def = custom_field_get_definition($id); - if( !custom_field_set_value( $id, $t_bug_id, gpc_get_string( "custom_field_$id", $t_def['default_value'] ) ) ) { - trigger_error( ERROR_CUSTOM_FIELD_WRONG_VALUE, ERROR ); + + # Handle custom field submission + if( ON == config_get( 'use_experimental_custom_fields' ) ) { + $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); + foreach( $t_related_custom_field_ids as $id ) { + $t_def = custom_field_get_definition($id); + if( !custom_field_set_value( $id, $t_bug_id, gpc_get_string( "custom_field_$id", $t_def['default_value'] ) ) ) { + trigger_error( ERROR_CUSTOM_FIELD_INVALID_VALUE, ERROR ); + } } } -} // ON = config_get( 'use_experimental_custom_fields' ) print_page_top1(); @@ -116,19 +122,20 @@ if ( $f_report_stay ) { ?> - <form method="post" action="<?php echo string_get_bug_report_url() ?>"> - <input type="hidden" name="category" value="<?php echo $f_category ?>" /> - <input type="hidden" name="severity" value="<?php echo $f_severity ?>" /> - <input type="hidden" name="reproducibility" value="<?php echo $f_reproducibility ?>" /> - <input type="hidden" name="profile_id" value="<?php echo $f_profile_id ?>" /> - <input type="hidden" name="platform" value="<?php echo $f_platform ?>" /> - <input type="hidden" name="os" value="<?php echo $f_os ?>" /> - <input type="hidden" name="os_build" value="<?php echo $f_os_build ?>" /> - <input type="hidden" name="product_version" value="<?php echo $f_product_version ?>" /> - <input type="hidden" name="build" value="<?php echo $f_build ?>" /> - <input type="hidden" name="report_stay" value="<?php echo $f_report_stay ?>" /> - <input type="submit" value="<?php echo lang_get( 'report_more_bugs' ) ?>" /> - </form> + <form method="post" action="<?php echo string_get_bug_report_url() ?>"> + <input type="hidden" name="category" value="<?php echo $f_category ?>" /> + <input type="hidden" name="severity" value="<?php echo $f_severity ?>" /> + <input type="hidden" name="reproducibility" value="<?php echo $f_reproducibility ?>" /> + <input type="hidden" name="profile_id" value="<?php echo $f_profile_id ?>" /> + <input type="hidden" name="platform" value="<?php echo $f_platform ?>" /> + <input type="hidden" name="os" value="<?php echo $f_os ?>" /> + <input type="hidden" name="os_build" value="<?php echo $f_os_build ?>" /> + <input type="hidden" name="product_version" value="<?php echo $f_product_version ?>" /> + <input type="hidden" name="build" value="<?php echo $f_build ?>" /> + <input type="hidden" name="report_stay" value="1" /> + <input type="hidden" name="view_state" value="<?php echo $f_view_state ?>" /> + <input type="submit" value="<?php echo lang_get( 'report_more_bugs' ) ?>" /> + </form> <?php } else { print_bracket_link( string_get_bug_view_url( $t_bug_id, 1 ), lang_get( 'view_submitted_bug_link' ) . " $t_bug_id" ); Index: bug_report_advanced_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_report_advanced_page.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bug_report_advanced_page.php 29 Dec 2002 10:26:07 -0000 1.10 +++ bug_report_advanced_page.php 30 Dec 2002 05:38:39 -0000 1.11 @@ -17,7 +17,7 @@ <?php # this page is invalid for the 'All Project' selection if ( 0 == helper_get_current_project() ) { - print_header_redirect( 'login_select_proj_page.php?ref=' . string_get_bug_report_url() ); + print_header_redirect( 'login_select_proj_page.php?ref=bug_report_advanced_page.php' ); } if ( SIMPLE_ONLY == config_get( 'show_report' ) ) { @@ -34,7 +34,7 @@ $f_profile_id = gpc_get_int( 'profile_id', 0 ); $f_handler_id = gpc_get_int( 'handler_id', 0 ); - $f_category = gpc_get_string( 'category', 0 ); + $f_category = gpc_get_string( 'category', '' ); $f_reproducibility = gpc_get_int( 'reproducibility', 0 ); $f_severity = gpc_get_int( 'severity', 0 ); $f_priority = gpc_get_int( 'priority', NORMAL ); @@ -42,6 +42,7 @@ $f_description = gpc_get_string( 'description', '' ); $f_steps_to_reproduce = gpc_get_string( 'steps_to_reproduce', '' ); $f_additional_info = gpc_get_string( 'additional_info', '' ); + $f_view_state = gpc_get_int( 'view_state', 0 ); $f_report_stay = gpc_get_bool( 'report_stay' ); ?> @@ -52,6 +53,9 @@ <div align="center"> <form name="report_bug_form" method="post" <?php if ( file_allow_bug_upload() ) { echo 'enctype="multipart/form-data"'; } ?> action="bug_report.php"> <table class="width75" cellspacing="1"> + + +<!-- Title --> <tr> <td class="form-title"> <?php echo lang_get( 'enter_report_details_title' ) ?> @@ -64,7 +68,10 @@ ?> </td> </tr> -<tr class="row-1"> + + +<!-- Category --> +<tr <?php echo helper_alternate_class() ?>> <td class="category" width="30%"> <?php echo lang_get( 'category' ) ?> <?php print_documentation_link( 'category' ) ?> </td> @@ -74,7 +81,10 @@ </select> </td> </tr> -<tr class="row-2"> + + +<!-- Reproducibility --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'reproducibility' ) ?> <?php print_documentation_link( 'reproducibility' ) ?> </td> @@ -84,7 +94,9 @@ </select> </td> </tr> -<tr class="row-1"> + +<!-- Severity --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'severity' ) ?> <?php print_documentation_link( 'severity' ) ?> </td> @@ -95,8 +107,10 @@ </td> </tr> + +<!-- Priority (if permissions allow) --> <?php if ( access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) ) { ?> -<tr class="row-2"> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'priority' ) ?> <?php print_documentation_link( 'priority' ) ?> </td> @@ -108,38 +122,17 @@ </tr> <?php } ?> -<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?> -<tr> - <td class="spacer" colspan="2"> - - </td> -</tr> -<?php -$t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); -foreach( $t_related_custom_field_ids as $id ) { - $t_def = custom_field_get_definition($id); -?> -<tr <?php echo helper_alternate_class() ?>> - <td class="category"> - <?php echo lang_get_defaulted( $t_def['name'] ) ?> - </td> - <td> - <?php - print_custom_field_input( $t_def ); - ?> - </td> -</tr> -<?php -} // foreach -?> -<?php } // ON = config_get( 'use_experimental_custom_fields' ) ?> +<!-- spacer --> <tr> <td class="spacer" colspan="2"> </td> </tr> -<tr class="row-2"> + + +<!-- Profile --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'select_profile' ) ?> </td> @@ -149,12 +142,18 @@ </select> </td> </tr> + + +<!-- instructions --> <tr> <td colspan="2"> <?php echo lang_get( 'or_fill_in' ) ?> </td> </tr> -<tr class="row-2"> + + +<!-- Platform --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'platform' ) ?> </td> @@ -162,7 +161,10 @@ <input tabindex="6" type="text" name="platform" size="32" maxlength="32" value="<?php echo $f_platform ?>" /> </td> </tr> -<tr class="row-1"> + + +<!-- Operating System --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'os' ) ?> </td> @@ -170,7 +172,10 @@ <input tabindex="7" type="text" name="os" size="32" maxlength="32" value="<?php echo $f_os ?>" /> </td> </tr> -<tr class="row-2"> + + +<!-- OS Version --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'os_version' ) ?> </td> @@ -178,12 +183,18 @@ <input tabindex="8" type="text" name="os_build" size="16" maxlength="16" value="<?php echo $f_os_build ?>"> </td> </tr> + + +<!-- spacer --> <tr> <td class="spacer" colspan="2"> </td> </tr> -<tr class="row-1"> + + +<!-- Product Version --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'product_version' ) ?> </td> @@ -193,7 +204,10 @@ </select> </td> </tr> -<tr class="row-2"> + + +<!-- Product Build --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'product_build' ) ?> </td> @@ -201,14 +215,19 @@ <input tabindex="10" type="text" name="build" size="32" maxlength="32" value="<?php echo $f_build ?>" /> </td> </tr> + + +<!-- spacer --> <tr> <td class="spacer" colspan="2"> </td> </tr> -<?php if ( current_user_get_field( 'access_level' ) > REPORTER ) { ?> -<tr class="row-2"> + +<!-- Handler (if permissions allow) --> +<?php if ( access_level_check_greater_or_equal( config_get( 'update_bug_threshold' ) ) ) { ?> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'assign_to' ) ?> </td> @@ -219,18 +238,19 @@ </select> </td> </tr> -<?php - } else { -?> -<input type="hidden" name="handler_id" value="0" /> <?php } ?> + +<!-- spacer --> <tr> <td class="spacer" colspan="2"> </td> </tr> -<tr class="row-1"> + + +<!-- Summary --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <span class="required">*</span><?php echo lang_get( 'summary' ) ?> <?php print_documentation_link( 'summary' ) ?> </td> @@ -238,7 +258,10 @@ <input tabindex="12" type="text" name="summary" size="80" maxlength="128" value="<?php echo $f_summary ?>" /> </td> </tr> -<tr class="row-2"> + + +<!-- Description --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <span class="required">*</span><?php echo lang_get( 'description' ) ?> <?php print_documentation_link( 'description' ) ?> </td> @@ -246,7 +269,10 @@ <textarea tabindex="13" name="description" cols="60" rows="5" wrap="virtual"><?php echo $f_description ?></textarea> </td> </tr> -<tr class="row-1"> + + +<!-- Steps to Reproduce --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'steps_to_reproduce' ) ?> <?php print_documentation_link( 'steps_to_reproduce' ) ?> </td> @@ -254,7 +280,10 @@ <textarea tabindex="14" name="steps_to_reproduce" cols="60" rows="5" wrap="virtual"><?php echo $f_steps_to_reproduce ?></textarea> </td> </tr> -<tr class="row-2"> + + +<!-- Additional Information --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'additional_information' ) ?> <?php print_documentation_link( 'additional_information' ) ?> </td> @@ -263,8 +292,50 @@ </td> </tr> + +<!-- Custom Fields --> +<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { + $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); + + # insert a spacer as long as we actually have some custom fields + if ( count( $t_related_custom_field_ids ) > 0 ) { +?> +<tr> + <td class="spacer" colspan="2"> + + </td> +</tr> +<?php + } # if ( size( $t_related_custom_field_ids ) > 0 ) + + foreach( $t_related_custom_field_ids as $id ) { + $t_def = custom_field_get_definition($id); +?> +<tr <?php echo helper_alternate_class() ?>> + <td class="category"> + <?php echo lang_get_defaulted( $t_def['name'] ) ?> + </td> + <td> + <?php print_custom_field_input( $t_def ) ?> + </td> +</tr> +<?php + } # foreach( $t_related_custom_field_ids as $id ) +} # if( ON == config_get( 'use_experimental_custom_fields' ) ) +?> + + +<!-- spacer --> +<tr> + <td class="spacer" colspan="2"> + + </td> +</tr> + + +<!-- File Upload (if enabled) --> <?php if ( file_allow_bug_upload() ) { ?> -<tr class="row-1"> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'upload_file' ) ?> </td> @@ -275,23 +346,31 @@ </tr> <?php } ?> -<tr class="row-2"> + +<!-- View Status --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'view_status' ) ?> </td> <td> - <input tabindex="17" type="radio" name="view_state" value="10" checked="checked" /> <?php echo lang_get( 'public' ) ?> - <input tabindex="18" type="radio" name="view_state" value="50" /> <?php echo lang_get( 'private' ) ?> + <input tabindex="17" type="radio" name="view_state" value="<?php echo PUBLIC ?>" <?php check_checked( $f_view_state, PUBLIC ) ?> /> <?php echo lang_get( 'public' ) ?> + <input tabindex="18" type="radio" name="view_state" value="<?php echo PRIVATE ?>" <?php check_checked( $f_view_state, PRIVATE ) ?> /> <?php echo lang_get( 'private' ) ?> </td> </tr> -<tr class="row-1"> + + +<!-- Report Stay (report more bugs) --> +<tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'report_stay' ) ?> <?php print_documentation_link( 'report_stay' ) ?> </td> <td> - <input tabindex="19" type="checkbox" name="report_stay" <?php if ( $f_report_stay ) echo 'checked="checked"' ?> /> (<?php echo lang_get( 'check_report_more_bugs' ) ?>) + <input tabindex="19" type="checkbox" name="report_stay" <?php check_checked( $f_report_stay ) ?> /> (<?php echo lang_get( 'check_report_more_bugs' ) ?>) </td> </tr> + + +<!-- Submit Button --> <tr> <td class="left"> <span class="required"> * <?php echo lang_get( 'required' ) ?></span> @@ -300,6 +379,8 @@ <input tabindex="20" type="submit" value="<?php echo lang_get( 'submit_report_button' ) ?>" /> </td> </tr> + + </table> </form> </div> Index: bug_report_page.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_report_page.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bug_report_page.php 29 Dec 2002 10:26:07 -0000 1.10 +++ bug_report_page.php 30 Dec 2002 05:38:40 -0000 1.11 @@ -17,7 +17,7 @@ <?php # this page is invalid for the 'All Project' selection if ( 0 == helper_get_current_project() ) { - print_header_redirect( 'login_select_proj_page.php?ref=' . string_get_bug_report_url() ); + print_header_redirect( 'login_select_proj_page.php?ref=bug_report_page.php' ); } if ( ADVANCED_ONLY == config_get( 'show_report' ) ) { @@ -26,13 +26,14 @@ check_access( config_get( 'report_bug_threshold' ) ); - $f_category = gpc_get_string( 'category', 0 ); + $f_category = gpc_get_string( 'category', '' ); $f_reproducibility = gpc_get_int( 'reproducibility', 0 ); $f_severity = gpc_get_int( 'severity', 0 ); $f_priority = gpc_get_int( 'priority', NORMAL ); $f_summary = gpc_get_string( 'summary', '' ); $f_description = gpc_get_string( 'description', '' ); $f_additional_info = gpc_get_string( 'additional_info', '' ); + $f_view_state = gpc_get_int( 'view_state', 0 ); $f_report_stay = gpc_get_bool( 'report_stay' ); ?> @@ -43,6 +44,9 @@ <div align="center"> <form name="report_bug_form" method="post" <?php if ( file_allow_bug_upload() ) { echo 'enctype="multipart/form-data"'; } ?> action="bug_report.php"> <table class="width75" cellspacing="1"> + + +<!-- Title --> <tr> <td class="form-title"> <input type="hidden" name="handler_id" value="0" /> @@ -56,6 +60,9 @@ ?> </td> </tr> + + +<!-- Category --> <tr <?php echo helper_alternate_class() ?>> <td class="category" width="30%"> <?php echo lang_get( 'category' ) ?> <?php print_documentation_link( 'category' ) ?> @@ -66,6 +73,9 @@ </select> </td> </tr> + + +<!-- Reproducibility --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'reproducibility' ) ?> <?php print_documentation_link( 'reproducibility' ) ?> @@ -76,6 +86,9 @@ </select> </td> </tr> + + +<!-- Severity --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'severity' ) ?> <?php print_documentation_link( 'severity' ) ?> @@ -87,7 +100,9 @@ </td> </tr> -<?php if ( access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) ) { ?> + +<!-- Priority (if permissions allow) --> +<?php if ( access_level_check_greater_or_equal( config_get( 'update_bug_threshold' ) ) ) { ?> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'priority' ) ?> <?php print_documentation_link( 'priority' ) ?> @@ -100,64 +115,91 @@ </tr> <?php } ?> -<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { ?> + +<!-- spacer --> <tr> <td class="spacer" colspan="2"> </td> </tr> -<?php -$t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); -foreach( $t_related_custom_field_ids as $id ) { - $t_def = custom_field_get_definition($id); - if( !$t_def['advanced'] ) { -?> + + +<!-- Summary --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> - <?php echo lang_get_defaulted( $t_def['name'] ) ?> + <span class="required">*</span><?php echo lang_get( 'summary' ) ?> <?php print_documentation_link( 'summary' ) ?> </td> <td> - <?php - print_custom_field_input( $t_def ); - ?> + <input tabindex="5" type="text" name="summary" size="80" maxlength="128" value="<?php echo $f_summary ?>" /> </td> </tr> -<?php - } // !$t_def['advanced'] -} -?> -<?php } // ON = config_get( 'use_experimental_custom_fields' ) ?> -<tr> - <td class="spacer" colspan="2"> - - </td> -</tr> + +<!-- Description --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> - <span class="required">*</span><?php echo lang_get( 'summary' ) ?> <?php print_documentation_link( 'summary' ) ?> + <span class="required">*</span><?php echo lang_get( 'description' ) ?> <?php print_documentation_link( 'description' ) ?> </td> <td> - <input tabindex="5" type="text" name="summary" size="80" maxlength="128" value="<?php echo $f_summary ?>" /> + <textarea tabindex="6" name="description" cols="60" rows="5" wrap="virtual"><?php echo $f_description ?></textarea> </td> </tr> + + +<!-- Additional information --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> - <span class="required">*</span><?php echo lang_get( 'description' ) ?> <?php print_documentation_link( 'description' ) ?> + <?php echo lang_get( 'additional_information' ) ?> <?php print_documentation_link( 'additional_information' ) ?> </td> <td> - <textarea tabindex="6" name="description" cols="60" rows="5" wrap="virtual"><?php echo $f_description ?></textarea> + <textarea tabindex="7" name="additional_info" cols="60" rows="5" wrap="virtual"><?php echo $f_additional_info ?></textarea> </td> </tr> + + +<!-- Custom Fields --> +<?php if( ON == config_get( 'use_experimental_custom_fields' ) ) { + $t_related_custom_field_ids = custom_field_get_bound_ids( helper_get_current_project() ); + + # insert a spacer as long as we actually have some custom fields + if ( count( $t_related_custom_field_ids ) > 0 ) { +?> +<tr> + <td class="spacer" colspan="2"> + + </td> +</tr> +<?php + } # if ( size( $t_related_custom_field_ids ) > 0 ) + + foreach( $t_related_custom_field_ids as $id ) { + $t_def = custom_field_get_definition($id); + if( !$t_def['advanced'] ) { +?> <tr <?php echo helper_alternate_class() ?>> <td class="category"> - <?php echo lang_get( 'additional_information' ) ?> <?php print_documentation_link( 'additional_information' ) ?> + <?php echo lang_get_defaulted( $t_def['name'] ) ?> </td> <td> - <textarea tabindex="6" name="additional_info" cols="60" rows="5" wrap="virtual"><?php echo $f_additional_info ?></textarea> + <?php print_custom_field_input( $t_def ) ?> + </td> +</tr> +<?php + } # if (!$t_def['advanced']) + } # foreach( $t_related_custom_field_ids as $id ) +} # if( ON == config_get( 'use_experimental_custom_fields' ) ) +?> + + +<!-- spacer --> +<tr> + <td class="spacer" colspan="2"> + </td> </tr> + +<!-- File Upload (if enabled) --> <?php if ( file_allow_bug_upload() ) { ?> <tr <?php echo helper_alternate_class() ?>> <td class="category"> @@ -165,40 +207,52 @@ </td> <td> <input type="hidden" name="max_file_size" value="<?php echo config_get( 'max_file_size' ) ?>" /> - <input tabindex="7" name="file" type="file" size="60" /> + <input tabindex="8" name="file" type="file" size="60" /> </td> </tr> <?php } ?> + +<!-- View Status --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'view_status' ) ?> </td> <td> - <input tabindex="8" type="radio" name="view_state" value="10" checked="checked" /> <?php echo lang_get( 'public' ) ?> - <input tabindex="9" type="radio" name="view_state" value="50" /> <?php echo lang_get( 'private' ) ?> + <input tabindex="9" type="radio" name="view_state" value="<?php echo PUBLIC ?>" <?php check_checked( $f_view_state, PUBLIC ) ?> /> <?php echo lang_get( 'public' ) ?> + <input tabindex="10" type="radio" name="view_state" value="<?php echo PRIVATE ?>" <?php check_checked( $f_view_state, PRIVATE ) ?> /> <?php echo lang_get( 'private' ) ?> </td> </tr> + + +<!-- Report Stay (report more bugs) --> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <?php echo lang_get( 'report_stay' ) ?> <?php print_documentation_link( 'report_stay' ) ?> </td> <td> - <input tabindex="10" type="checkbox" name="report_stay" <?php if ( $f_report_stay ) echo 'checked="checked"' ?> /> (<?php echo lang_get( 'check_report_more_bugs' ) ?>) + <input tabindex="11" type="checkbox" name="report_stay" <?php check_checked( $f_report_stay ) ?> /> (<?php echo lang_get( 'check_report_more_bugs' ) ?>) </td> </tr> + + +<!-- Submit Button --> <tr> <td class="left"> <span class="required"> * <?php echo lang_get( 'required' ) ?></span> </td> <td class="center"> - <input tabindex="11" type="submit" value="<?php echo lang_get( 'submit_report_button' ) ?>" /> + <input tabindex="12" type="submit" value="<?php echo lang_get( 'submit_report_button' ) ?>" /> </td> </tr> + + </table> </form> </div> + +<!-- Autofocus JS --> <script language="JavaScript"> <!-- window.document.report_bug_form.category.focus(); Index: bug_update.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/bug_update.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- bug_update.php 29 Dec 2002 10:26:07 -0000 1.42 +++ bug_update.php 30 Dec 2002 05:38:40 -0000 1.43 @@ -68,7 +68,7 @@ foreach( $t_related_custom_field_ids as $t_id ) { $t_def = custom_field_get_definition($t_id); if (!custom_field_set_value( $t_id, $f_bug_id, gpc_get_string( "custom_field_$t_id", $t_def['default_value'] ) )) { - trigger_error( ERROR_CUSTOM_FIELD_WRONG_VALUE, ERROR ); + trigger_error( ERROR_CUSTOM_FIELD_INVALID_VALUE, ERROR ); } } } // ON = config_get( 'use_experimental_custom_fields' ) Index: constant_inc.php =================================================================== RCS file: /cvsroot/mantisbt/mantisbt/constant_inc.php,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- constant_inc.php 4 Dec 2002 08:05:47 -0000 1.63 +++ constant_inc.php 30 Dec 2002 05:38:40 -0000 1.64 @@ -204,7 +204,7 @@ define( 'ERROR_CUSTOM_FIELD_NOT_FOUND', 1300 ); define( 'ERROR_CUSTOM_FIELD_NAME_NOT_UNIQUE', 1301 ); define( 'ERROR_CUSTOM_FIELD_IN_USE', 1302 ); - define( 'ERROR_CUSTOM_FIELD_WRONG_VALUE', 1303 ); + define( 'ERROR_CUSTOM_FIELD_INVALID_VALUE', 1303 ); # ERROR_LDAP_* define( 'ERROR_LDAP_AUTH_FAILED', 1400 ); |