cleanup work

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@1583 f5dc347c-c33d-0410-90a0-b07cc1902cb9
mantisbt · Oct 23, 2002 · f4ac810 · f4ac810
1 parent bbdc152
commit f4ac810
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 43 deletions.
diff --git a/bug_actiongroup.php b/bug_actiongroup.php
@@ -4,9 +4,13 @@
 	# Copyright (C) 2002         Mantis Team   - mantisbt-dev@lists.sourceforge.net
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
+
+	# --------------------------------------------------------
+	# $Id: bug_actiongroup.php,v 1.16 2002-10-23 00:50:53 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php
-	# This page allows the close / suppress / others mass treatments, and display the adequate page
+	# This page allows actions to be performed an an array of bugs
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
@@ -62,5 +66,5 @@
 		}
 	}
 
-	print_meta_redirect( 'view_all_bug_page.php',0 );
+	print_meta_redirect( 'view_all_bug_page.php', 0 );
 ?>
diff --git a/bug_actiongroup_page.php b/bug_actiongroup_page.php
@@ -5,8 +5,12 @@
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
 
-	# <SQLI>
-	# This page allows the close / suppress / others mass treatments, and display the adequate page
+	# --------------------------------------------------------
+	# $Id: bug_actiongroup_page.php,v 1.24 2002-10-23 00:50:53 jfitzell Exp $
+	# --------------------------------------------------------
+?>
+<?php
+	# This page allows actions to be performed an an array of bugs
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>

diff --git a/bug_assign.php b/bug_assign.php
@@ -5,18 +5,11 @@
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
 
-	# This module is based on bug_update.php and provides a quick method
-	# for assigning a call to the currently signed on user.
-	# Copyright (C) 2001  Steve Davies - steved@ihug.co.nz
-
 	# --------------------------------------------------------
-	# $Revision: 1.23 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_assign.php,v 1.23 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_assign.php,v 1.24 2002-10-23 00:50:53 jfitzell Exp $
 	# --------------------------------------------------------
-
+?>
+<?php
 	# Assign bug to user then redirect to viewing page
 ?>
 <?php require_once( 'core.php' ) ?>

diff --git a/bug_close.php b/bug_close.php
@@ -6,11 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Revision: 1.25 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_close.php,v 1.25 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_close.php,v 1.26 2002-10-23 00:50:53 jfitzell Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -20,17 +16,14 @@
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
+	$f_bug_id		= gpc_get_int( 'f_bug_id' );
+	$f_bugnote_text	= gpc_get_string( 'f_bugnote_text', '' );
+
 	project_access_check( $f_bug_id );
-	check_access( $g_close_bug_threshold );
+	check_access( config_get( 'close_bug_threshold' ) );
 	bug_ensure_exists( $f_bug_id );
 
-	# check variables
-	check_varset( $f_bugnote_text, '' );
+	bug_close( $f_bug_id, $f_bugnote_text );
 
-	$result = bug_close( $f_bug_id, $f_bugnote_text );
-	if ( $result ) {
-		print_header_redirect( 'view_all_bug_page.php' );
-	} else {
-		print_mantis_error( ERROR_GENERIC );
-	}
+	print_header_redirect( 'view_all_bug_page.php' );
 ?>
diff --git a/bug_close_page.php b/bug_close_page.php
@@ -4,12 +4,19 @@
 	# Copyright (C) 2002         Mantis Team   - mantisbt-dev@lists.sourceforge.net
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
+
+	# --------------------------------------------------------
+	# $Id: bug_close_page.php,v 1.17 2002-10-23 00:50:53 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
+	$f_bug_id		= gpc_get_int( 'f_bug_id' );
+	$f_bugnote_text	= gpc_get_string( 'f_bugnote_text', '' );
+
 	project_access_check( $f_bug_id );
-	check_access( $g_close_bug_threshold );
+	check_access( config_get( 'close_bug_threshold' ) );
 	bug_ensure_exists( $f_bug_id );
 ?>
 <?php print_page_top1() ?>
@@ -23,7 +30,7 @@
 <tr>
 	<td class="form-title" colspan="2">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<?php echo $s_close_bug_title ?>
+		<?php echo lang_get( 'close_bug_title' ) ?>
 	</td>
 </tr>
 <tr class="row-1">
@@ -33,14 +40,14 @@
 </tr>
 <tr>
 	<td class="center" colspan="2">
-		<input type="submit" value="<?php echo $s_close_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'close_bug_button' ) ?>" />
 	</td>
 </tr>
 </table>
 </form>
 </div>
 <?php # Close Form END ?>
 
-<?php include( $g_bug_view_inc ) ?>
+<?php include( config_get( 'bug_view_inc' ) ) ?>
 
 <?php print_page_bot1( __FILE__ ) ?>
diff --git a/bug_delete.php b/bug_delete.php
@@ -4,20 +4,24 @@
 	# Copyright (C) 2002         Mantis Team   - mantisbt-dev@lists.sourceforge.net
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
+
+	# --------------------------------------------------------
+	# $Id: bug_delete.php,v 1.25 2002-10-23 00:50:53 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php
 	# Deletes the bug and re-directs to view_all_bug_page.php 
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
+	$f_bug_id = gpc_get_int( 'f_bug_id' );
+
 	project_access_check( $f_bug_id );
-	check_access( $g_allow_bug_delete_access_level );
+	check_access( config_get( 'allow_bug_delete_access_level' ) );
 	bug_ensure_exists( $f_bug_id );
 
-	if ( bug_delete( $f_bug_id ) ) {
-		print_header_redirect( 'view_all_bug_page.php' );
-	} else {
-		print_mantis_error( ERROR_GENERIC );
-	}
+	bug_delete( $f_bug_id );
+
+	print_header_redirect( 'view_all_bug_page.php' );
 ?>
diff --git a/bug_delete_page.php b/bug_delete_page.php
@@ -4,6 +4,10 @@
 	# Copyright (C) 2002         Mantis Team   - mantisbt-dev@lists.sourceforge.net
 	# This program is distributed under the terms and conditions of the GPL
 	# See the README and LICENSE files for details
+
+	# --------------------------------------------------------
+	# $Id: bug_delete_page.php,v 1.17 2002-10-23 00:50:53 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php
 	# Bug delete confirmation page
@@ -12,24 +16,26 @@
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
+	$f_bug_id = gpc_get_int( 'f_bug_id' );
+
 	project_access_check( $f_bug_id );
-	check_access( $g_allow_bug_delete_access_level );
+	check_access( config_get( 'allow_bug_delete_access_level' ) );
 	bug_ensure_exists( $f_bug_id );
 ?>
 <?php print_page_top1() ?>
 <?php print_page_top2() ?>
 
 <br />
 <div align="center">
-	<?php print_hr( $g_hr_size, $g_hr_width ) ?>
-	<?php echo $s_delete_bug_sure_msg ?>
+	<?php print_hr() ?>
+	<?php echo lang_get( 'delete_bug_sure_msg' ) ?>
 
 	<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 ?>" />
+		<input type="submit" value="<?php echo lang_get( 'delete_bug_button' ) ?>" />
 	</form>
 
-	<?php print_hr( $g_hr_size, $g_hr_width ) ?>
+	<?php print_hr() ?>
 </div>
 
 <?php print_page_bot1( __FILE__ ) ?>