[Mantisbt-cvs] mantisbt account_delete.php,1.22,1.23 account_page.php,1.30,1.31 bug_delete.php,1.25,1.26 bug_view_advanced_page.php,1.3,1.4 bug_view_page.php,1.3,1.4 bugnote_delete.php,1.23,1.24 bugnote_inc.php,1.70,1.71 manage_proj_cat_delete.php,1.9,1.10 manage_proj_cat_edit_page.php,1.17,1.18 manage_proj_delete.php,1.15,1.16 manage_proj_edit_page.php,1.38,1.39 manage_proj_ver_delete.php,1.10,1.11 manage_proj_ver_edit_page.php,1.16,1.17 manage_user_delete.php,1.17,1.18 manage_user_page.php,1.30,1.31 news_delete.php,1.10,1.11 news_edit_page.php,1.23,1.24 proj_doc_delete.php,1.13,1.14 proj_doc_edit_page.php,1.16,1.17 account_delete_page.php,1.19,NONE bug_delete_page.php,1.17,NONE bugnote_delete_page.php,1.15,NONE manage_proj_cat_del_page.php,1.11,NONE manage_proj_delete_page.php,1.13,NONE manage_proj_ver_del_page.php,1.12,NONE manage_user_delete_page.php,1.13,NONE news_delete_page.php,1.12,NONE proj_doc_delete_page.php,1.12,NONE

[<jfi...@us...>]

Update of /cvsroot/mantisbt/mantisbt
In directory usw-pr-cvs1:/tmp/cvs-serv2740

Modified Files:
	account_delete.php account_page.php bug_delete.php 
	bug_view_advanced_page.php bug_view_page.php 
	bugnote_delete.php bugnote_inc.php manage_proj_cat_delete.php 
	manage_proj_cat_edit_page.php manage_proj_delete.php 
	manage_proj_edit_page.php manage_proj_ver_delete.php 
	manage_proj_ver_edit_page.php manage_user_delete.php 
	manage_user_page.php news_delete.php news_edit_page.php 
	proj_doc_delete.php proj_doc_edit_page.php 
Removed Files:
	account_delete_page.php bug_delete_page.php 
	bugnote_delete_page.php manage_proj_cat_del_page.php 
	manage_proj_delete_page.php manage_proj_ver_del_page.php 
	manage_user_delete_page.php news_delete_page.php 
	proj_doc_delete_page.php 
Log Message:
remove files that only perform a simple confirmation and use helper_ensure_confirmed() on the actual action pages


Index: account_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/account_delete.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- account_delete.php	1 Oct 2002 20:28:19 -0000	1.22
+++ account_delete.php	23 Oct 2002 02:49:05 -0000	1.23
@@ -11,7 +11,7 @@
 
 	# CALLERS
 	#	This page is called from:
-	#	- account_delete_page.php
+	#	- account_delete.php
 
 	# EXPECTED BEHAVIOUR
 	#	- Delete the currently logged in user account
@@ -38,6 +38,8 @@
 	}
 ?>
 <?php
+	helper_ensure_confirmed( lang_get( 'confirm_delete_msg' ),
+							 lang_get( 'delete_account_button' ) );
 
 	user_delete( auth_get_current_user_id() );
 

Index: account_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/account_page.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- account_page.php	5 Oct 2002 03:54:24 -0000	1.30
+++ account_page.php	23 Oct 2002 02:49:05 -0000	1.31
@@ -24,7 +24,7 @@
 	# CALLS
 	#	This page calls the following pages:
 	#	- account_update.php  (to save changes)
-	#	- account_delete_page.php  (to delete the user's account)
+	#	- account_delete.php  (to delete the user's account)
 
 	# RESTRICTIONS & PERMISSIONS
 	#	- User must be authenticated
@@ -206,7 +206,7 @@
 
 <!-- Delete Button -->
 <div class="border-center">
-	<form method="post" action="account_delete_page.php">
+	<form method="post" action="account_delete.php">
 	<input type="submit" value="<?php echo lang_get( 'delete_account_button' ) ?>" />
 	</form>
 </div>

Index: bug_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_delete.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bug_delete.php	23 Oct 2002 00:50:53 -0000	1.25
+++ bug_delete.php	23 Oct 2002 02:49:05 -0000	1.26
@@ -21,6 +21,8 @@
 	check_access( config_get( 'allow_bug_delete_access_level' ) );
 	bug_ensure_exists( $f_bug_id );
 
+	helper_ensure_confirmed( lang_get( 'delete_bug_sure_msg' ), lang_get( 'delete_bug_button' ) );
+
 	bug_delete( $f_bug_id );
 
 	print_header_redirect( 'view_all_bug_page.php' );

Index: bug_view_advanced_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_advanced_page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bug_view_advanced_page.php	20 Oct 2002 23:59:48 -0000	1.3
+++ bug_view_advanced_page.php	23 Oct 2002 02:49:05 -0000	1.4
@@ -466,7 +466,7 @@
 <?php # DELETE form BEGIN ?>
 <?php if ( empty( $f_check ) && access_level_check_greater_or_equal( $g_allow_bug_delete_access_level ) ) { ?>
 	<td class="center">
-		<form method="post" action="bug_delete_page.php">
+		<form method="post" action="bug_delete.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="submit" value="<?php echo $s_delete_bug_button ?>" />
 		</form>

Index: bug_view_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_view_page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bug_view_page.php	20 Oct 2002 23:59:48 -0000	1.3
+++ bug_view_page.php	23 Oct 2002 02:49:05 -0000	1.4
@@ -372,7 +372,7 @@
 <?php # DELETE form BEGIN ?>
 <?php if ( access_level_check_greater_or_equal( $g_allow_bug_delete_access_level ) ) { ?>
 	<td class="center">
-		<form method="post" action="bug_delete_page.php">
+		<form method="post" action="bug_delete.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="submit" value="<?php echo $s_delete_bug_button ?>" />
 		</form>

Index: bugnote_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bugnote_delete.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- bugnote_delete.php	27 Sep 2002 00:06:47 -0000	1.23
+++ bugnote_delete.php	23 Oct 2002 02:49:05 -0000	1.24
@@ -20,6 +20,9 @@
 	check_access( $g_delete_bugnote_threshold );
 	bug_ensure_exists( $t_bug_id );
 
+	helper_ensure_confirmed( lang_get( 'delete_bugnote_sure_msg' ),
+							 lang_get( 'delete_bugnote_button' ) );
+
 	$result = bugnote_delete( $f_bugnote_id );
 
 	# Determine which view page to redirect back to.

Index: bugnote_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bugnote_inc.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- bugnote_inc.php	20 Oct 2002 23:59:48 -0000	1.70
+++ bugnote_inc.php	23 Oct 2002 02:49:05 -0000	1.71
@@ -87,7 +87,7 @@
 				if (( access_level_check_greater_or_equal( ADMINISTRATOR ) ) ||
 					( $v3_reporter_id == $t_user_id )) {
 					print_bracket_link( 'bugnote_edit_page.php?f_bugnote_id='.$v3_id, $s_bugnote_edit_link );
-					print_bracket_link( 'bugnote_delete_page.php?f_bugnote_id='.$v3_id, $s_delete_link );
+					print_bracket_link( 'bugnote_delete.php?f_bugnote_id='.$v3_id, $s_delete_link );
 					if ( access_level_check_greater_or_equal( $g_private_bugnote_threshold ) ) {
 						if ( PRIVATE == $v3_view_state ) {
 							print_bracket_link('bugnote_set_view_state.php?f_private=0&f_bugnote_id='.$v3_id, $s_make_public);

Index: manage_proj_cat_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_cat_delete.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- manage_proj_cat_delete.php	25 Aug 2002 21:04:57 -0000	1.9
+++ manage_proj_cat_delete.php	23 Oct 2002 02:49:05 -0000	1.10
@@ -11,6 +11,9 @@
 	check_access( MANAGER );
 	$f_category = urldecode( $f_category );
 
+	helper_ensure_confirmed( lang_get( 'category_delete_sure_msg' ),
+							 lang_get( 'delete_category_button' ) );
+
 	$result = category_delete( $f_project_id, $f_category );
 
     $t_redirect_url = 'manage_proj_edit_page.php?f_project_id='.$f_project_id;

Index: manage_proj_cat_edit_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_cat_edit_page.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- manage_proj_cat_edit_page.php	5 Oct 2002 02:38:31 -0000	1.17
+++ manage_proj_cat_edit_page.php	23 Oct 2002 02:49:05 -0000	1.18
@@ -64,7 +64,7 @@
 <br />
 
 <div class="border-center">
-	<form method="post" action="manage_proj_cat_del_page.php">
+	<form method="post" action="manage_proj_cat_delete.php">
 	<input type="hidden" name="f_project_id" value="<?php echo $f_project_id ?>" />
 	<input type="hidden" name="f_category" value="<?php echo $f_category ?>" />
 	<input type="submit" value="<?php echo lang_get( 'delete_category_button' ) ?>" />

Index: manage_proj_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_delete.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- manage_proj_delete.php	27 Aug 2002 04:26:42 -0000	1.15
+++ manage_proj_delete.php	23 Oct 2002 02:49:05 -0000	1.16
@@ -12,6 +12,9 @@
 	
 	$f_project_id = gpc_get_int( 'f_project_id' );
 	
+	helper_ensure_confirmed( lang_get( 'project_delete_msg' ),
+							 lang_get( 'project_delete_button' ) );
+
 	project_delete( $f_project_id );
 
     $t_redirect_url = 'manage_proj_menu_page.php';

Index: manage_proj_edit_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_edit_page.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- manage_proj_edit_page.php	19 Oct 2002 04:43:27 -0000	1.38
+++ manage_proj_edit_page.php	23 Oct 2002 02:49:05 -0000	1.39
@@ -120,7 +120,7 @@
 
 <?php if ( access_level_check_greater_or_equal ( ADMINISTRATOR ) ) { ?>
 <div class="border-center">
-	<form method="post" action="manage_proj_delete_page.php">
+	<form method="post" action="manage_proj_delete.php">
 	<input type="hidden" name="f_project_id" value="<?php echo $f_project_id ?>" />
 	<input type="submit" value="<?php echo lang_get( 'delete_project_button' ) ?>" />
 	</form>
@@ -172,7 +172,7 @@
 				<?php
 					print_bracket_link( 'manage_proj_cat_edit_page.php?f_project_id='.$f_project_id.'&amp;f_category='.$t2_category.'&amp;f_assigned_to='.$c_user_id, lang_get( 'edit_link' ) );
 					PRINT '&nbsp;';
-					print_bracket_link( 'manage_proj_cat_del_page.php?f_project_id='.$f_project_id.'&amp;f_category='.$t2_category, lang_get( 'delete_link' ) );
+					print_bracket_link( 'manage_proj_cat_delete.php?f_project_id='.$f_project_id.'&amp;f_category='.$t2_category, lang_get( 'delete_link' ) );
 				?>
 			</td>
 		</tr>
@@ -238,7 +238,7 @@
 				<?php
 					print_bracket_link( 'manage_proj_ver_edit_page.php?f_project_id='.$f_project_id.'&amp;f_version='.$t2_version.'&amp;f_date_order='.$t2_date_order, lang_get( 'edit_link' ) );
 					PRINT '&nbsp;';
-					print_bracket_link( 'manage_proj_ver_del_page.php?f_project_id='.$f_project_id.'&amp;f_version='.$t2_version.'&amp;f_date_order='.$t2_date_order, lang_get( 'delete_link' ) );
+					print_bracket_link( 'manage_proj_ver_delete.php?f_project_id='.$f_project_id.'&amp;f_version='.$t2_version.'&amp;f_date_order='.$t2_date_order, lang_get( 'delete_link' ) );
 				?>
 			</td>
 		</tr>

Index: manage_proj_ver_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_ver_delete.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- manage_proj_ver_delete.php	27 Aug 2002 04:26:42 -0000	1.10
+++ manage_proj_ver_delete.php	23 Oct 2002 02:49:05 -0000	1.11
@@ -13,6 +13,9 @@
 	$f_project_id = gpc_get_int( 'f_project_id' );
 	$f_version = gpc_get_string( 'f_version' );
 
+	helper_ensure_confirmed( lang_get( 'version_delete_sure' ),
+							 lang_get( 'delete_version_button' ) );
+
 	# delete version
 	$result = version_delete( $f_project_id, $f_version );
 

Index: manage_proj_ver_edit_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_proj_ver_edit_page.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- manage_proj_ver_edit_page.php	5 Oct 2002 02:38:31 -0000	1.16
+++ manage_proj_ver_edit_page.php	23 Oct 2002 02:49:05 -0000	1.17
@@ -61,7 +61,7 @@
 <br />
 
 <div class="border-center">
-	<form method="post" action="manage_proj_ver_del_page.php">
+	<form method="post" action="manage_proj_ver_delete.php">
 	<input type="hidden" name="f_project_id" value="<?php echo $f_project_id ?>" />
 	<input type="hidden" name="f_version" value="<?php echo $f_version ?>" />
 	<input type="submit" value="<?php echo lang_get( 'delete_version_button' ) ?>" />

Index: manage_user_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_user_delete.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- manage_user_delete.php	20 Oct 2002 23:59:48 -0000	1.17
+++ manage_user_delete.php	23 Oct 2002 02:49:05 -0000	1.18
@@ -12,9 +12,12 @@
 	
 	$f_user_id	= gpc_get_int( 'f_user_id' );
 
-    $t_redirect_url = 'manage_page.php';
+	helper_ensure_confirmed( lang_get( 'delete_account_sure_msg' ),
+							 lang_get( 'delete_account_button' ) );
 
 	user_delete( $f_user_id );
+
+    $t_redirect_url = 'manage_page.php';
 
 	print_page_top1();
 

Index: manage_user_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/manage_user_page.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- manage_user_page.php	20 Oct 2002 23:59:49 -0000	1.30
+++ manage_user_page.php	23 Oct 2002 02:49:05 -0000	1.31
@@ -95,7 +95,7 @@
 
 
 <!-- Delete Button -->
-	<form method="post" action="manage_user_delete_page.php">
+	<form method="post" action="manage_user_delete.php">
 	<input type="hidden" name="f_user_id" value="<?php echo $u_id ?>" />
 	<input type="submit" value="<?php echo lang_get( 'delete_user_button' ) ?>" />
 	</form>

Index: news_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/news_delete.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- news_delete.php	20 Oct 2002 23:59:49 -0000	1.10
+++ news_delete.php	23 Oct 2002 02:49:05 -0000	1.11
@@ -12,6 +12,9 @@
 
 	$f_news_id = gpc_get_int( 'f_news_id' );
 
+	helper_ensure_confirmed( lang_get( 'delete_news_sure_msg' ),
+							 lang_get( 'delete_news_item_button' ) );
+
     news_delete( $f_news_id );
 
     $t_redirect_url = 'news_menu_page.php';

Index: news_edit_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/news_edit_page.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- news_edit_page.php	20 Oct 2002 23:59:49 -0000	1.23
+++ news_edit_page.php	23 Oct 2002 02:49:05 -0000	1.24
@@ -15,7 +15,7 @@
 
 	# If deleting item redirect to delete script
 	if ( 'delete' == $f_action ) {
-		print_header_redirect( 'news_delete_page.php?f_news_id='.$f_news_id );
+		print_header_redirect( 'news_delete.php?f_news_id='.$f_news_id );
 	}
 
 	# Retrieve news item data and prefix with v_

Index: proj_doc_delete.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/proj_doc_delete.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- proj_doc_delete.php	20 Oct 2002 23:59:49 -0000	1.13
+++ proj_doc_delete.php	23 Oct 2002 02:49:05 -0000	1.14
@@ -11,6 +11,9 @@
 	check_access( MANAGER );  # @@@ Need to check that the person is assigned to this project
 	$c_file_id = (integer)$f_file_id;
 
+	helper_ensure_confirmed( lang_get( 'confirm_file_delete_msg' ),
+							 lang_get( 'file_delete_button' ) );
+
 	if ( DISK == $g_file_upload_method ) {
 		# grab the file name
 		$query = "SELECT diskfile

Index: proj_doc_edit_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/proj_doc_edit_page.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- proj_doc_edit_page.php	20 Oct 2002 23:59:49 -0000	1.16
+++ proj_doc_edit_page.php	23 Oct 2002 02:49:05 -0000	1.17
@@ -74,7 +74,7 @@
 
 <br />
 
-		<form method="post" action="proj_doc_delete_page.php">
+		<form method="post" action="proj_doc_delete.php">
 		<input type="hidden" name="f_file_id" value="<?php echo $f_file_id ?>" />
 		<input type="submit" value="<?php echo $s_file_delete_button ?>" />
 		</form>

--- account_delete_page.php DELETED ---

--- bug_delete_page.php DELETED ---

--- bugnote_delete_page.php DELETED ---

--- manage_proj_cat_del_page.php DELETED ---

--- manage_proj_delete_page.php DELETED ---

--- manage_proj_ver_del_page.php DELETED ---

--- manage_user_delete_page.php DELETED ---

--- news_delete_page.php DELETED ---

--- proj_doc_delete_page.php DELETED ---