diff --git a/account_prefs_update.php b/account_prefs_update.php index 9f955cf0e3..d903410816 100644 --- a/account_prefs_update.php +++ b/account_prefs_update.php @@ -139,5 +139,5 @@ form_security_purge( 'account_prefs_update' ); -print_successful_redirect( $f_redirect_url, /* force_show */ true ); +print_header_redirect( $f_redirect_url, /* force_show */ true ); diff --git a/adm_config_delete.php b/adm_config_delete.php index 4a4238efff..8a5b2cb15b 100644 --- a/adm_config_delete.php +++ b/adm_config_delete.php @@ -66,5 +66,5 @@ form_security_purge( 'adm_config_delete' ); -print_successful_redirect( 'adm_config_report.php' ); +print_header_redirect( 'adm_config_report.php' ); diff --git a/adm_config_set.php b/adm_config_set.php index 311f81fe0b..14d3f33008 100644 --- a/adm_config_set.php +++ b/adm_config_set.php @@ -121,4 +121,4 @@ form_security_purge( 'adm_config_set' ); -print_successful_redirect( 'adm_config_report.php' ); +print_header_redirect( 'adm_config_report.php' ); diff --git a/bug_monitor_add.php b/bug_monitor_add.php index 3aaf34423f..f2ad10fa5e 100644 --- a/bug_monitor_add.php +++ b/bug_monitor_add.php @@ -66,4 +66,4 @@ form_security_purge( 'bug_monitor_add' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/bug_monitor_delete.php b/bug_monitor_delete.php index 82cb2bf694..ebe86c29eb 100644 --- a/bug_monitor_delete.php +++ b/bug_monitor_delete.php @@ -84,4 +84,4 @@ form_security_purge( 'bug_monitor_delete' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/bug_revision_drop.php b/bug_revision_drop.php index 18792a3467..556ba5c064 100644 --- a/bug_revision_drop.php +++ b/bug_revision_drop.php @@ -54,5 +54,5 @@ bug_revision_drop( $f_revision_id ); form_security_purge( 'bug_revision_drop' ); -print_successful_redirect_to_bug( $t_revision['bug_id'] ); +print_header_redirect_view( $t_revision['bug_id'] ); diff --git a/bug_stick.php b/bug_stick.php index c483a7b1e1..8942f10e6f 100644 --- a/bug_stick.php +++ b/bug_stick.php @@ -59,4 +59,4 @@ form_security_purge( 'bug_stick' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/bug_update.php b/bug_update.php index dd4ade74cb..a5286eedb3 100644 --- a/bug_update.php +++ b/bug_update.php @@ -509,4 +509,4 @@ function get_valid_version( BugData $p_bug, $p_field ) { form_security_purge( 'bug_update' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/bugnote_add.php b/bugnote_add.php index 39b5d5248c..51c33bbb1a 100644 --- a/bugnote_add.php +++ b/bugnote_add.php @@ -65,4 +65,4 @@ form_security_purge( 'bugnote_add' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/bugnote_delete.php b/bugnote_delete.php index abe997e4ef..fce4813b1f 100644 --- a/bugnote_delete.php +++ b/bugnote_delete.php @@ -50,4 +50,4 @@ form_security_purge( 'bugnote_delete' ); -print_successful_redirect( string_get_bug_view_url( $t_result['issue_id'] ) . '#bugnotes' ); +print_header_redirect( string_get_bug_view_url( $t_result['issue_id'] ) . '#bugnotes' ); diff --git a/bugnote_set_view_state.php b/bugnote_set_view_state.php index 2226bf6ea5..97723bb1d4 100644 --- a/bugnote_set_view_state.php +++ b/bugnote_set_view_state.php @@ -87,4 +87,4 @@ form_security_purge( 'bugnote_set_view_state' ); -print_successful_redirect( string_get_bug_view_url( $t_bug_id ) . '#bugnotes' ); +print_header_redirect( string_get_bug_view_url( $t_bug_id ) . '#bugnotes' ); diff --git a/bugnote_update.php b/bugnote_update.php index a891e2085d..401ac5da77 100644 --- a/bugnote_update.php +++ b/bugnote_update.php @@ -90,4 +90,4 @@ form_security_purge( 'bugnote_update' ); -print_successful_redirect( string_get_bugnote_view_url( $t_bug_id, $f_bugnote_id ) ); +print_header_redirect( string_get_bugnote_view_url( $t_bug_id, $f_bugnote_id ) ); diff --git a/core/print_api.php b/core/print_api.php index 053591403c..3dc95ad979 100644 --- a/core/print_api.php +++ b/core/print_api.php @@ -151,11 +151,11 @@ function print_header_redirect_view( $p_bug_id ) { * * @param integer $p_bug_id A bug identifier. * @return void + * @deprecated Use print_header_redirect() instead. */ function print_successful_redirect_to_bug( $p_bug_id ) { $t_url = string_get_bug_view_url( $p_bug_id ); - - print_successful_redirect( $t_url ); + print_header_redirect( $t_url ); } /** @@ -165,19 +165,10 @@ function print_successful_redirect_to_bug( $p_bug_id ) { * @param string $p_redirect_to URI to redirect to. * @param bool $p_force_show Force showing operation successful * @return void + * @deprecated Use print_header_redirect() instead. */ function print_successful_redirect( $p_redirect_to, $p_force_show = false ) { - if( $p_force_show || helper_log_to_page() ) { - layout_page_header( null, $p_redirect_to ); - layout_page_begin(); - echo '
'; - echo lang_get( 'operation_successful' ) . '
'; - print_link_button( $p_redirect_to, lang_get( 'proceed' ) ); - echo '
'; - layout_page_end(); - } else { - print_header_redirect( $p_redirect_to ); - } + print_header_redirect( $p_redirect_to ); } /** diff --git a/docbook/Developers_Guide/en-US/Plugins_Building.xml b/docbook/Developers_Guide/en-US/Plugins_Building.xml index f7d0cf12d1..838c43fe5d 100644 --- a/docbook/Developers_Guide/en-US/Plugins_Building.xml +++ b/docbook/Developers_Guide/en-US/Plugins_Building.xml @@ -706,7 +706,7 @@ if( $f_reset ) { trigger_error( ERROR_CONFIG_OPT_INVALID, ERROR ); } -print_successful_redirect( plugin_page( 'config', true ) ); +print_header_redirect( plugin_page( 'config', true ) ); ]]> diff --git a/manage_plugin_install.php b/manage_plugin_install.php index c9146cdefe..fe01a0ed2c 100644 --- a/manage_plugin_install.php +++ b/manage_plugin_install.php @@ -57,4 +57,4 @@ form_security_purge( 'manage_plugin_install' ); -print_successful_redirect( 'manage_plugin_page.php' ); +print_header_redirect( 'manage_plugin_page.php' ); diff --git a/manage_plugin_uninstall.php b/manage_plugin_uninstall.php index b390bedb10..3ade10a2e4 100644 --- a/manage_plugin_uninstall.php +++ b/manage_plugin_uninstall.php @@ -81,4 +81,4 @@ form_security_purge( 'manage_plugin_uninstall' ); -print_successful_redirect( 'manage_plugin_page.php' ); +print_header_redirect( 'manage_plugin_page.php' ); diff --git a/manage_plugin_update.php b/manage_plugin_update.php index e4d0fcef53..1345fd4be6 100644 --- a/manage_plugin_update.php +++ b/manage_plugin_update.php @@ -79,4 +79,4 @@ form_security_purge( 'manage_plugin_update' ); -print_successful_redirect( 'manage_plugin_page.php' ); +print_header_redirect( 'manage_plugin_page.php' ); diff --git a/manage_proj_update_children.php b/manage_proj_update_children.php index 21b7aa4ee2..32cf3e3190 100644 --- a/manage_proj_update_children.php +++ b/manage_proj_update_children.php @@ -67,4 +67,4 @@ form_security_purge( 'manage_proj_update_children' ); -print_successful_redirect( 'manage_proj_edit_page.php?project_id=' . $f_project_id . '#subprojects'); +print_header_redirect( 'manage_proj_edit_page.php?project_id=' . $f_project_id . '#subprojects' ); diff --git a/manage_proj_ver_add.php b/manage_proj_ver_add.php index 8dfc906d81..0824e59f48 100644 --- a/manage_proj_ver_add.php +++ b/manage_proj_ver_add.php @@ -100,4 +100,4 @@ $t_redirect_url = 'manage_proj_edit_page.php?project_id=' . $f_project_id . '#versions'; } -print_successful_redirect( $t_redirect_url ); +print_header_redirect( $t_redirect_url ); diff --git a/manage_user_create.php b/manage_user_create.php index dc2f33432a..e90d96ad87 100644 --- a/manage_user_create.php +++ b/manage_user_create.php @@ -99,8 +99,8 @@ $t_redirect_url = 'manage_user_edit_page.php?user_id=' . $t_user_id; layout_page_header( null, $t_redirect_url ); - layout_page_begin( 'manage_overview_page.php' ); + $t_access_level = get_enum_element( 'access_levels', $f_access_level ); $t_message = lang_get( 'created_user_part1' ) . ' ' . $f_username . ' ' @@ -108,6 +108,4 @@ . ' ' . $t_access_level . '
'; html_operation_successful( $t_redirect_url, $t_message ); -echo ''; - layout_page_end(); diff --git a/news_add.php b/news_add.php index 49d2b61c26..e9fc33173b 100644 --- a/news_add.php +++ b/news_add.php @@ -65,12 +65,7 @@ $t_news_row = news_get_row( $t_news_id ); layout_page_header(); - layout_page_begin( 'main_page.php' ); - -echo '
'; html_operation_successful( 'main_page.php' ); - print_news_entry_from_row( $t_news_row ); - layout_page_end(); diff --git a/plugins/MantisCoreFormatting/pages/config_edit.php b/plugins/MantisCoreFormatting/pages/config_edit.php index e2e4e71e80..484c9b84aa 100644 --- a/plugins/MantisCoreFormatting/pages/config_edit.php +++ b/plugins/MantisCoreFormatting/pages/config_edit.php @@ -50,4 +50,4 @@ form_security_purge( 'plugin_format_config_edit' ); -print_successful_redirect( plugin_page( 'config', true ) ); +print_header_redirect( plugin_page( 'config', true ) ); diff --git a/tag_attach.php b/tag_attach.php index b01e6b2acb..7a97319c13 100644 --- a/tag_attach.php +++ b/tag_attach.php @@ -78,4 +78,5 @@ $t_command->execute(); form_security_purge( 'tag_attach' ); -print_successful_redirect_to_bug( $f_bug_id ); + +print_header_redirect_view( $f_bug_id ); diff --git a/tag_create.php b/tag_create.php index 1fc50e745e..3f71a02c32 100644 --- a/tag_create.php +++ b/tag_create.php @@ -59,5 +59,5 @@ } form_security_purge( 'tag_create' ); -print_successful_redirect( 'manage_tags_page.php' ); +print_header_redirect( 'manage_tags_page.php' ); diff --git a/tag_delete.php b/tag_delete.php index 96810b0781..cfbec8bfa3 100644 --- a/tag_delete.php +++ b/tag_delete.php @@ -56,4 +56,4 @@ form_security_purge( 'tag_delete' ); -print_successful_redirect( 'manage_tags_page.php' ); +print_header_redirect( 'manage_tags_page.php' ); diff --git a/tag_detach.php b/tag_detach.php index ae9d41ebfe..f29e32d7e1 100644 --- a/tag_detach.php +++ b/tag_detach.php @@ -48,4 +48,4 @@ form_security_purge( 'tag_detach' ); -print_successful_redirect_to_bug( $f_bug_id ); +print_header_redirect_view( $f_bug_id ); diff --git a/tag_update.php b/tag_update.php index f22d5dbc16..f0415c6099 100644 --- a/tag_update.php +++ b/tag_update.php @@ -72,4 +72,4 @@ form_security_purge( 'tag_update' ); $t_url = 'tag_view_page.php?tag_id='.$f_tag_id; -print_successful_redirect( $t_url ); +print_header_redirect( $t_url );