From bb5ef59c93feb7ffbd85280fdc4ccbaffd8d04d2 Mon Sep 17 00:00:00 2001
From: Julian Fitzell <jfitzell@users.sourceforge.net>
Date: Sun, 27 Oct 2002 23:35:40 +0000
Subject: [PATCH] rough cleanup (basically removed $s_ and $g_ variable
 references)

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@1596 f5dc347c-c33d-0410-90a0-b07cc1902cb9
---
 bug_update.php               |  20 +++---
 bug_update_advanced_page.php |  94 ++++++++++++------------
 bug_update_page.php          |  72 +++++++++----------
 bug_view_advanced_page.php   | 134 +++++++++++++++++++----------------
 bug_view_inc.php             |  46 ++++++------
 bug_view_page.php            | 126 +++++++++++++++++---------------
 bug_vote_add.php             |   9 ++-
 7 files changed, 264 insertions(+), 237 deletions(-)

diff --git a/bug_update.php b/bug_update.php
index 7bf5a612af..aed16e968b 100644
--- a/bug_update.php
+++ b/bug_update.php
@@ -6,11 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Revision: 1.36 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_update.php,v 1.36 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_update.php,v 1.37 2002-10-27 23:35:40 jfitzell Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -19,12 +15,14 @@
 <?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_update_bug_threshold );
+	check_access( config_get( 'update_bug_threshold' ) );
+	bug_ensure_exists( $f_bug_id );
 
 	$c_bug_id = (integer)$f_bug_id;
 
-	bug_ensure_exists( $f_bug_id );
 
 	# extract current extended information into history variables
 	$row = bug_get_extended_row( $f_bug_id );
@@ -86,8 +84,10 @@
 	$h_steps_to_reproduce		= string_prepare_textarea( $h_steps_to_reproduce );
 	$h_additional_information	= string_prepare_textarea( $h_additional_information );
 
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
 	# Update all fields
-    $query = "UPDATE $g_mantis_bug_table
+    $query = "UPDATE $t_bug_table
     		SET category='$c_category',
     			severity='$c_severity',
     			reproducibility='$c_reproducibility',
@@ -109,9 +109,11 @@
     		WHERE id='$c_bug_id'";
    	$result = db_query($query);
 
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
 	# These fields are not changed as often as the assigned person, priority, status, etc.
 	if ( ( $c_description != $h_description ) || ( $c_steps_to_reproduce != $h_steps_to_reproduce ) || ( $c_additional_information != $h_additional_information ) ) {
-	    $query = "UPDATE $g_mantis_bug_text_table ".
+	    $query = "UPDATE $t_bug_text_table ".
 					"SET description='$c_description', ".
 					"steps_to_reproduce='$c_steps_to_reproduce', ".
 					"additional_information='$c_additional_information' ".
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index a54e58425a..1e5f419979 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -6,11 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Revision: 1.33 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_update_advanced_page.php,v 1.33 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_update_advanced_page.php,v 1.34 2002-10-27 23:35:40 jfitzell Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -19,31 +15,35 @@
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
-	if ( SIMPLE_ONLY == $g_show_update ) {
+	if ( SIMPLE_ONLY == config_get( 'show_update' ) ) {
 		print_header_redirect ( 'bug_update_page.php?f_bug_id='.$f_bug_id );
 	}
 
 	$f_bug_id		= gpc_get_int( 'f_bug_id' );
 
 	project_access_check( $f_bug_id );
-	check_access( $g_update_bug_threshold );
+	check_access( config_get( 'update_bug_threshold' ) );
 	bug_ensure_exists( $f_bug_id );
 
 	$c_bug_id = (integer)$f_bug_id;
 
-    $query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
-    		UNIX_TIMESTAMP(last_updated) as last_updated
-    		FROM $g_mantis_bug_table
-    		WHERE id='$c_bug_id'";
-    $result = db_query( $query );
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
+	$query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
+			UNIX_TIMESTAMP(last_updated) as last_updated
+			FROM $t_bug_table
+			WHERE id='$c_bug_id'";
+	$result = db_query( $query );
 	$row = db_fetch_array( $result );
 	extract( $row, EXTR_PREFIX_ALL, 'v' );
 
 	# if bug is private, make sure user can view private bugs
 	access_bug_check( $f_bug_id, $v_view_state );
 
-    $query = "SELECT *
-    		FROM $g_mantis_bug_text_table
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
+	$query = "SELECT *
+    		FROM $t_bug_text_table
     		WHERE id='$v_bug_text_id'";
     $result = db_query( $query );
 	$row = db_fetch_array( $result );
@@ -69,36 +69,36 @@
 		<input type="hidden" name="f_bug_id" value="<?php echo $v_id ?>" />
 		<input type="hidden" name="f_old_status" value="<?php echo $v_status ?>" />
 		<input type="hidden" name="f_old_handler_id" value="<?php echo $v_handler_id ?>" />
-		<?php echo $s_updating_bug_advanced_title ?>
+		<?php echo lang_get( 'updating_bug_advanced_title' ) ?>
 	</td>
 	<td class="right" colspan="3">
 <?php
-	print_bracket_link( string_get_bug_view_url( $f_bug_id ), $s_back_to_bug_link );
+	print_bracket_link( string_get_bug_view_url( $f_bug_id ), lang_get( 'back_to_bug_link' ) );
 
-	if ( BOTH == $g_show_update ) {
-		print_bracket_link( 'bug_update_page.php?f_bug_id='.$f_bug_id, $s_update_simple_link );
+	if ( BOTH == config_get( 'show_update' ) ) {
+		print_bracket_link( 'bug_update_page.php?f_bug_id='.$f_bug_id, lang_get( 'update_simple_link' ) );
 	}
 ?>
 	</td>
 </tr>
 <tr class="row-category">
 	<td width="15%">
-		<?php echo $s_id ?>
+		<?php echo lang_get( 'id' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo $s_category ?>
+		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_severity ?>
+		<?php echo lang_get( 'severity' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo $s_reproducibility ?>
+		<?php echo lang_get( 'reproducibility' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_date_submitted ?>
+		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_last_update ?>
+		<?php echo lang_get( 'last_update' ) ?>
 	</td>
 </tr>
 <tr class="row-2">
@@ -134,7 +134,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_reporter ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td>
 		<select name="f_reporter_id">
@@ -142,7 +142,7 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_view_status ?>
+		<?php echo lang_get( 'view_status' ) ?>
 	</td>
 	<td>
 		<select name="f_view_state">
@@ -155,7 +155,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_assigned_to ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td colspan="5">
 		<select name="f_handler_id">
@@ -166,7 +166,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_priority ?>
+		<?php echo lang_get( 'priority' ) ?>
 	</td>
 	<td align="left">
 		<select name="f_priority">
@@ -174,13 +174,13 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_resolution ?>
+		<?php echo lang_get( 'resolution' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'resolution', $v_resolution ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_platform ?>
+		<?php echo lang_get( 'platform' ) ?>
 	</td>
 	<td>
 		<input type="text" name="f_platform" size="16" maxlength="32" value="<?php echo $v_platform ?>" />
@@ -188,7 +188,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_status ?>
+		<?php echo lang_get( 'status' ) ?>
 	</td>
 	<td bgcolor="<?php echo get_status_color( $v_status ) ?>">
 		<select name="f_status">
@@ -196,13 +196,13 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_duplicate_id ?>
+		<?php echo lang_get( 'duplicate_id' ) ?>
 	</td>
 	<td>
 		<?php echo $v_duplicate_id ?>
 	</td>
 	<td class="category">
-		<?php echo $s_os ?>
+		<?php echo lang_get( 'os' ) ?>
 	</td>
 	<td>
 		<input type="text" name="f_os" size="16" maxlength="32" value="<?php echo $v_os ?>" />
@@ -210,7 +210,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_projection ?>
+		<?php echo lang_get( 'projection' ) ?>
 	</td>
 	<td>
 		<select name="f_projection">
@@ -221,7 +221,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_os_version ?>
+		<?php echo lang_get( 'os_version' ) ?>
 	</td>
 	<td>
 		<input type="text" name="f_os_build" size="16" maxlength="16" value="<?php echo $v_os_build ?>" />
@@ -229,7 +229,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_eta ?>
+		<?php echo lang_get( 'eta' ) ?>
 	</td>
 	<td>
 		<select name="f_eta">
@@ -240,7 +240,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_product_version ?>
+		<?php echo lang_get( 'product_version' ) ?>
 	</td>
 	<td>
 		<select name="f_version">
@@ -253,7 +253,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_build ?>
+		<?php echo lang_get( 'build' ) ?>
 	</td>
 	<td>
 		<input type="text" name="f_build" size="16" maxlength="32" value="<?php echo $v_build ?>" />
@@ -264,7 +264,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_votes ?>
+		<?php echo lang_get( 'votes' ) ?>
 	</td>
 	<td>
 		<?php echo $v_votes ?>
@@ -277,7 +277,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_summary ?>
+		<?php echo lang_get( 'summary' ) ?>
 	</td>
 	<td colspan="5">
 		<input type="text" name="f_summary" size="80" maxlength="128" value="<?php echo $v_summary ?>" />
@@ -285,7 +285,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_description ?>
+		<?php echo lang_get( 'description' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea cols="60" rows="5" name="f_description" wrap="virtual"><?php echo $v2_description ?></textarea>
@@ -293,7 +293,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_steps_to_reproduce ?>
+		<?php echo lang_get( 'steps_to_reproduce' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea cols="60" rows="5" name="f_steps_to_reproduce" wrap="virtual"><?php echo $v2_steps_to_reproduce ?></textarea>
@@ -301,7 +301,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_additional_information ?>
+		<?php echo lang_get( 'additional_information' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea cols="60" rows="5" name="f_additional_information" wrap="virtual"><?php echo $v2_additional_information ?></textarea>
@@ -314,16 +314,16 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_add_bugnote_title ?>
+		<?php echo lang_get( 'add_bugnote_title' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea name="f_bugnote_text" cols="80" rows="10" wrap="virtual"></textarea>
 	</td>
 </tr>
-<?php if ( access_level_check_greater_or_equal( $g_private_bugnote_threshold ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'private_bugnote_threshold' ) ) ) { ?>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_private ?>
+		<?php echo lang_get( 'private' ) ?>
 	</td>
 	<td>
 		<input type="checkbox" name="f_private" />
@@ -332,7 +332,7 @@
 <?php } ?>
 <tr>
 	<td class="center" colspan="6"">
-		<input type="submit" value="<?php echo $s_update_information_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'update_information_button' ) ?>" />
 	</td>
 </tr>
 </table>
diff --git a/bug_update_page.php b/bug_update_page.php
index a22a420b7d..7468b9da3f 100644
--- a/bug_update_page.php
+++ b/bug_update_page.php
@@ -6,11 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Revision: 1.33 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_update_page.php,v 1.33 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_update_page.php,v 1.34 2002-10-27 23:35:40 jfitzell Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -19,22 +15,24 @@
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
 <?php
-	if ( ADVANCED_ONLY == $g_show_update ) {
+	if ( ADVANCED_ONLY == config_get( 'show_update' ) ) {
 		print_header_redirect ( 'bug_update_advanced_page.php?f_bug_id='.$f_bug_id );
 	}
 
 	$f_bug_id		= gpc_get_int( 'f_bug_id' );
 
 	project_access_check( $f_bug_id );
-	check_access( $g_update_bug_threshold );
+	check_access( config_get( 'update_bug_threshold' ) );
 	bug_ensure_exists( $f_bug_id );
 
 	$c_bug_id = (integer)$f_bug_id;
 
 	# grab data
-    $query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
-    		UNIX_TIMESTAMP(last_updated) as last_updated
-    		FROM $g_mantis_bug_table
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
+	$query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
+			UNIX_TIMESTAMP(last_updated) as last_updated
+			FROM $t_bug_table
     		WHERE id='$c_bug_id'";
     $result = db_query( $query );
 	$row = db_fetch_array( $result );
@@ -43,8 +41,10 @@
 	# if bug is private, make sure user can view private bugs
 	access_bug_check( $f_bug_id, $v_view_state );
 
-    $query = "SELECT *
-    		FROM $g_mantis_bug_text_table
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
+	$query = "SELECT *
+    		FROM $t_bug_text_table
     		WHERE id='$v_bug_text_id'";
     $result = db_query( $query );
 	$row = db_fetch_array( $result );
@@ -66,36 +66,36 @@
 		<input type="hidden" name="f_bug_id"                 value="<?php echo $v_id ?>" />
 		<input type="hidden" name="f_old_status"         value="<?php echo $v_status ?>" />
 		<input type="hidden" name="f_old_handler_id"     value="<?php echo $v_handler_id ?>" />
-		<?php echo $s_updating_bug_simple_title ?>
+		<?php echo lang_get( 'updating_bug_simple_title' ) ?>
 	</td>
 	<td class="right" colspan="3">
 <?php
-	print_bracket_link( string_get_bug_view_url( $f_bug_id ), $s_back_to_bug_link );
+	print_bracket_link( string_get_bug_view_url( $f_bug_id ), lang_get( 'back_to_bug_link' ) );
 
-	if ( BOTH == $g_show_update ) {
-		print_bracket_link( 'bug_update_advanced_page.php?f_bug_id='.$f_bug_id, $s_update_advanced_link );
+	if ( BOTH == config_get( 'show_update' ) ) {
+		print_bracket_link( 'bug_update_advanced_page.php?f_bug_id='.$f_bug_id, lang_get( 'update_advanced_link' ) );
 	}
 ?>
 	</td>
 </tr>
 <tr class="row-category">
 	<td width="15%">
-		<?php echo $s_id ?>
+		<?php echo lang_get( 'id' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo $s_category ?>
+		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_severity ?>
+		<?php echo lang_get( 'severity' ) ?>
 	</td>
 	<td width="20%">
-		<?php echo $s_reproducibility ?>
+		<?php echo lang_get( 'reproducibility' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_date_submitted ?>
+		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
 	<td width="15%">
-		<?php echo $s_last_update ?>
+		<?php echo lang_get( 'last_update' ) ?>
 	</td>
 </tr>
 <tr class="row-2">
@@ -131,7 +131,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_reporter ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td>
 		<select name="f_reporter_id">
@@ -139,7 +139,7 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_view_status ?>
+		<?php echo lang_get( 'view_status' ) ?>
 	</td>
 	<td>
 		<select name="f_view_state">
@@ -152,7 +152,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_assigned_to ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td colspan="5">
 		<select name="f_handler_id">
@@ -163,7 +163,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_priority ?>
+		<?php echo lang_get( 'priority' ) ?>
 	</td>
 	<td>
 		<select name="f_priority">
@@ -171,7 +171,7 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_resolution ?>
+		<?php echo lang_get( 'resolution' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'resolution', $v_resolution ) ?>
@@ -182,7 +182,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_status ?>
+		<?php echo lang_get( 'status' ) ?>
 	</td>
 	<td bgcolor="<?php echo get_status_color( $v_status ) ?>">
 		<select name="f_status">
@@ -190,7 +190,7 @@
 		</select>
 	</td>
 	<td class="category">
-		<?php echo $s_duplicate_id ?>
+		<?php echo lang_get( 'duplicate_id' ) ?>
 	</td>
 	<td>
 		<?php echo $v_duplicate_id ?>
@@ -206,7 +206,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_summary ?>
+		<?php echo lang_get( 'summary' ) ?>
 	</td>
 	<td colspan="5">
 		<input type="text" name="f_summary" size="80" maxlength="128" value="<?php echo $v_summary ?>" />
@@ -214,7 +214,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_description ?>
+		<?php echo lang_get( 'description' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea cols="60" rows="5" name="f_description" wrap="virtual"><?php echo $v2_description ?></textarea>
@@ -222,7 +222,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_additional_information ?>
+		<?php echo lang_get( 'additional_information' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea cols="60" rows="5" name="f_additional_information" wrap="virtual"><?php echo $v2_additional_information ?></textarea>
@@ -235,16 +235,16 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_add_bugnote_title ?>
+		<?php echo lang_get( 'add_bugnote_title' ) ?>
 	</td>
 	<td colspan="5">
 		<textarea name="f_bugnote_text" cols="80" rows="10" wrap="virtual"></textarea>
 	</td>
 </tr>
-<?php if ( access_level_check_greater_or_equal( $g_private_bugnote_threshold ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'private_bugnote_threshold' ) ) ) { ?>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_private ?>
+		<?php echo lang_get( 'private' ) ?>
 	</td>
 	<td>
 		<input type="checkbox" name="f_private" />
@@ -253,7 +253,7 @@
 <?php } ?>
 <tr>
 	<td class="center" colspan="6">
-		<input type="submit" value="<?php echo $s_update_information_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'update_information_button' ) ?>" />
 	</td>
 </tr>
 </table>
diff --git a/bug_view_advanced_page.php b/bug_view_advanced_page.php
index 374bf62f76..d4f1465306 100644
--- a/bug_view_advanced_page.php
+++ b/bug_view_advanced_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_view_advanced_page.php,v 1.7 2002-10-27 23:35:40 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php # Login check is delayed, since this page can be viewed with no login (CRC needed) ?>
@@ -17,7 +21,7 @@
 	$f_check	= gpc_get_string( 'f_check', '' );
 	$f_history	= gpc_get_bool( 'f_history' );
 
-	if ( SIMPLE_ONLY == $g_show_view ) {
+	if ( SIMPLE_ONLY == config_get( 'show_view' ) ) {
 		$t_simple_url = 'bug_view_page.php?f_bug_id=' . $f_bug_id;
 
 		if ( !empty( $f_check ) ) {
@@ -40,9 +44,11 @@
 
 	$c_bug_id = (integer)$f_bug_id;
 
-    $query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
-    		UNIX_TIMESTAMP(last_updated) as last_updated
-    		FROM $g_mantis_bug_table
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
+	$query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
+			UNIX_TIMESTAMP(last_updated) as last_updated
+			FROM $t_bug_table
     		WHERE id='$c_bug_id'";
     $result = db_query( $query );
 
@@ -60,8 +66,10 @@
 		access_bug_check( $f_bug_id, $v_view_state );
 	}
 
-    $query = "SELECT *
-    		FROM $g_mantis_bug_text_table
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
+	$query = "SELECT *
+    		FROM $t_bug_text_table
     		WHERE id='$v_bug_text_id'";
     $result = db_query( $query );
 	$row = db_fetch_array( $result );
@@ -91,17 +99,17 @@
 <table class="width100" cellspacing="1">
 <tr>
 	<td class="form-title" colspan="4">
-		<?php echo $s_viewing_bug_advanced_details_title ?>
-		<span class="small"><?php print_bracket_link( '#bugnotes', $s_jump_to_bugnotes ) ?></span>
+		<?php echo lang_get( 'viewing_bug_advanced_details_title' ) ?>
+		<span class="small"><?php print_bracket_link( '#bugnotes', lang_get( 'jump_to_bugnotes' ) ) ?></span>
 	</td>
 	<td class="right" colspan="2">
 
 <?php if ( empty( $f_check ) ) { ?>
-	<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id.'&amp;f_check=' . helper_calc_crc( $f_bug_id, __FILE__ ), $s_publish )?></span>
+	<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id.'&amp;f_check=' . helper_calc_crc( $f_bug_id, __FILE__ ), lang_get( 'publish' ) )?></span>
 <?php }?>
 
-<?php if ( empty( $f_check ) && ( BOTH == $g_show_view ) ) { ?>
-		<span class="small"><?php print_bracket_link( 'bug_view_page.php?f_bug_id='.$f_bug_id, $s_view_simple_link )?></span>
+<?php if ( empty( $f_check ) && ( BOTH == config_get( 'show_view' ) ) ) { ?>
+		<span class="small"><?php print_bracket_link( 'bug_view_page.php?f_bug_id='.$f_bug_id, lang_get( 'view_simple_link' ) )?></span>
 <?php }?>
 <?php
 	if ( !empty ( $f_check ) ) {
@@ -110,28 +118,28 @@
 		$t_check = '';
 	}
 ?>
-	<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id.$t_check.'&amp;f_history=1#history', $s_bug_history ) ?></span>
-	<span class="small"><?php print_bracket_link( 'print_bug_page.php?f_bug_id='.$f_bug_id, $s_print ) ?></span>
+	<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id.$t_check.'&amp;f_history=1#history', lang_get( 'bug_history' ) ) ?></span>
+	<span class="small"><?php print_bracket_link( 'print_bug_page.php?f_bug_id='.$f_bug_id, lang_get( 'print' ) ) ?></span>
 	</td>
 </tr>
 <tr class="row-category">
 	<td width="16%">
-		<?php echo $s_id ?>
+		<?php echo lang_get( 'id' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_category ?>
+		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_severity ?>
+		<?php echo lang_get( 'severity' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_reproducibility ?>
+		<?php echo lang_get( 'reproducibility' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_date_submitted ?>
+		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_last_update ?>
+		<?php echo lang_get( 'last_update' ) ?>
 	</td>
 </tr>
 <tr class="row-2">
@@ -161,13 +169,13 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_reporter ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td>
 		<?php print_user_with_subject( $v_reporter_id, $f_bug_id ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_view_status ?>
+		<?php echo lang_get( 'view_status' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'project_view_state', $v_view_state ) ?>
@@ -178,7 +186,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_assigned_to ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td colspan="5">
 		<?php print_user_with_subject( $v_handler_id, $f_bug_id ) ?>
@@ -186,19 +194,19 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_priority ?>
+		<?php echo lang_get( 'priority' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'priority', $v_priority ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_resolution ?>
+		<?php echo lang_get( 'resolution' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'resolution', $v_resolution ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_platform ?>
+		<?php echo lang_get( 'platform' ) ?>
 	</td>
 	<td>
 		<?php echo $v_platform ?>
@@ -206,19 +214,19 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_status ?>
+		<?php echo lang_get( 'status' ) ?>
 	</td>
 	<td bgcolor="<?php echo get_status_color( $v_status ) ?>">
 		<?php echo get_enum_element( 'status', $v_status ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_duplicate_id ?>
+		<?php echo lang_get( 'duplicate_id' ) ?>
 	</td>
 	<td>
 		<?php print_duplicate_id( $v_duplicate_id ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_os ?>
+		<?php echo lang_get( 'os' ) ?>
 	</td>
 	<td>
 		<?php echo $v_os ?>
@@ -226,7 +234,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_projection ?>
+		<?php echo lang_get( 'projection' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'projection', $v_projection ) ?>
@@ -235,7 +243,7 @@
 
 	</td>
 	<td class="category">
-		<?php echo $s_os_version ?>
+		<?php echo lang_get( 'os_version' ) ?>
 	</td>
 	<td>
 		<?php echo $v_os_build ?>
@@ -243,7 +251,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_eta ?>
+		<?php echo lang_get( 'eta' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'eta', $v_eta ) ?>
@@ -252,7 +260,7 @@
 
 	</td>
 	<td class="category">
-		<?php echo $s_product_version ?>
+		<?php echo lang_get( 'product_version' ) ?>
 	</td>
 	<td>
 		<?php echo $v_version ?>
@@ -263,7 +271,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_product_build ?>
+		<?php echo lang_get( 'product_build' ) ?>
 	</td>
 	<td>
 		<?php echo $v_build?>
@@ -274,7 +282,7 @@
 		&nbsp;
 	</td>
 	<td class="category">
-		<?php echo $s_votes ?>
+		<?php echo lang_get( 'votes' ) ?>
 	</td>
 	<td>
 		<?php echo $v_votes ?>
@@ -287,7 +295,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_summary ?>
+		<?php echo lang_get( 'summary' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v_summary ?>
@@ -295,7 +303,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_description ?>
+		<?php echo lang_get( 'description' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_description ?>
@@ -303,7 +311,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_steps_to_reproduce ?>
+		<?php echo lang_get( 'steps_to_reproduce' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_steps_to_reproduce ?>
@@ -311,17 +319,19 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_additional_information ?>
+		<?php echo lang_get( 'additional_information' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_additional_information ?>
 	</td>
 </tr>
 <?php
+	$t_user_profile_table = config_get( 'mantis_user_profile_table' );
+
 	# account profile description
 	if ( $v_profile_id > 0 ) {
 		$query = "SELECT description
-				FROM $g_mantis_user_profile_table
+				FROM $t_user_profile_table
 				WHERE id='$v_profile_id'";
 		$result = db_query( $query );
 		$t_profile_description = '';
@@ -338,7 +348,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_system_profile ?>
+		<?php echo lang_get( 'system_profile' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $t_profile_description ?>
@@ -351,14 +361,14 @@
 		$t_show_attachments = true;
 	} else {
 		$t_user_id = current_user_get_field ( 'id' );
-		$t_show_attachments = ( ( $v_reporter_id == $t_user_id ) || access_level_check_greater_or_equal( $g_view_attachments_threshold ) );
+		$t_show_attachments = ( ( $v_reporter_id == $t_user_id ) || access_level_check_greater_or_equal( config_get( 'view_attachments_threshold' ) ) );
 	}
 
 	if ( $t_show_attachments ) {
 ?>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_attached_files ?>
+		<?php echo lang_get( 'attached_files' ) ?>
 	</td>
 	<td colspan="5">
 		<?php file_list_attachments ( $f_bug_id ); ?>
@@ -370,12 +380,12 @@
 		<table width="100%">
 			<tr align="center">
 <?php # UPDATE form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_update_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'update_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<form method="post" action="<?php echo string_get_bug_update_page() ?>">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_bug_text_id" value="<?php echo $v_bug_text_id ?>" />
-		<input type="submit" value="<?php echo $s_update_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'update_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -383,14 +393,14 @@
 	# UPDATE form END
 ?>
 <?php # ASSIGN form BEGIN ?>
-<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( $g_handle_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<?php #check if current user already assigned to the bug ?>
 		<?php if ( $t_user_id != $v_handler_id ) { ?>
 		<form method="post" action="bug_assign.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_date_submitted" value="<?php echo $v_date_submitted ?>" />
-		<input type="submit" value="<?php echo $s_bug_assign_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'bug_assign_button' ) ?>" />
 		</form>
 		<?php } #end of checking if current user already assigned ?>
 	</td>
@@ -398,11 +408,11 @@
 	} # ASSIGN form END
 ?>
 <?php # RESOLVE form BEGIN ?>
-<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( $g_handle_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_resolve_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_resolve_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'resolve_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -410,26 +420,26 @@
 ?>
 <?php # REOPEN form BEGIN ?>
 <?php if ( empty( $f_check ) && ( $v_status >= RESOLVED ) &&
-		( access_level_check_greater_or_equal( $g_reopen_bug_threshold ) ||
+		( access_level_check_greater_or_equal( config_get( 'reopen_bug_threshold' ) ) ||
 		( $v_reporter_id == $t_user_id  && ON == config_get( 'allow_reporter_reopen' ) ) ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_reopen_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_reopen_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'reopen_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
 	} # REOPEN form END
 ?>
 <?php # CLOSE form BEGIN ?>
-<?php if ( empty( $f_check ) && ( access_level_check_greater_or_equal( $g_close_bug_threshold ) ||
-		( ON == $g_allow_reporter_close &&
+<?php if ( empty( $f_check ) && ( access_level_check_greater_or_equal( config_get( 'close_bug_threshold' ) ) ||
+		( ON == config_get( 'allow_reporter_close' ) &&
 		  $v_reporter_id == $t_user_id ) ) &&
 		( RESOLVED == $v_status ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_close_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_close_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'close_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -437,13 +447,13 @@
 ?>
 <?php # MONITOR form BEGIN ?>
 <?php
- if ( empty( $f_check ) && (( PUBLIC == $v_view_state && access_level_check_greater_or_equal( $g_monitor_bug_threshold ) ) || ( PRIVATE == $v_view_state && access_level_check_greater_or_equal( $g_private_bug_threshold ) )) && ! user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) {
+ if ( empty( $f_check ) && (( PUBLIC == $v_view_state && access_level_check_greater_or_equal( config_get( 'monitor_bug_threshold' ) ) ) || ( PRIVATE == $v_view_state && access_level_check_greater_or_equal( config_get( 'private_bug_threshold' ) ) )) && ! user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) {
 ?>
 	<td class="center">
 		<form method="post" action="bug_monitor.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_action" value="add" />
-		<input type="submit" value="<?php echo $s_monitor_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'monitor_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -451,12 +461,12 @@
 	# MONITOR form END
 ?>
 <?php # UNMONITOR form BEGIN ?>
-<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( $g_monitor_bug_threshold ) && user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) { ?>
+<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( config_get( 'monitor_bug_threshold' ) ) && user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_monitor.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_action" value="delete" />
-		<input type="submit" value="<?php echo $s_unmonitor_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'unmonitor_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -464,11 +474,11 @@
 	# MONITOR form END
 ?>
 <?php # DELETE form BEGIN ?>
-<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( $g_allow_bug_delete_access_level ) ) { ?>
+<?php if ( empty( $f_check ) && access_level_check_greater_or_equal( config_get( 'allow_bug_delete_access_level' ) ) ) { ?>
 	<td class="center">
 		<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>
 	</td>
 <?php
@@ -482,13 +492,13 @@
 
 <?php
 	if ( empty( $f_check ) && $t_show_attachments && $v_status < RESOLVED && access_level_check_greater_or_equal( REPORTER ) ) {
-		include( $g_bug_file_upload_inc );
+		include( config_get( 'bug_file_upload_inc' ) );
 	}
 
-	include( $g_bugnote_include_file );
+	include( config_get( 'bugnote_include_file' ) );
 
 	if ( $f_history ) {
-		include( $g_history_include_file );
+		include( config_get( 'history_include_file' ) );
 	}
 
 	print_page_bot1( __FILE__ );
diff --git a/bug_view_inc.php b/bug_view_inc.php
index 9998034d04..5ef89f99ee 100644
--- a/bug_view_inc.php
+++ b/bug_view_inc.php
@@ -6,11 +6,7 @@
 	# See the files README and LICENSE for details
 
 	# --------------------------------------------------------
-	# $Revision: 1.2 $
-	# $Author: jfitzell $
-	# $Date: 2002-10-20 23:59:48 $
-	#
-	# $Id: bug_view_inc.php,v 1.2 2002-10-20 23:59:48 jfitzell Exp $
+	# $Id: bug_view_inc.php,v 1.3 2002-10-27 23:35:40 jfitzell Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -19,17 +15,21 @@
 ?>
 <?php
 	$c_bug_id = (integer)$f_bug_id;
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
 	$query ="SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted, ".
 			"UNIX_TIMESTAMP(last_updated) as last_updated ".
-			"FROM $g_mantis_bug_table ".
+			"FROM $t_bug_table ".
 			"WHERE id='$c_bug_id' ".
 			"LIMIT 1";
 	$result = db_query( $query );
 	$row = db_fetch_array( $result );
 	extract( $row, EXTR_PREFIX_ALL, 'v' );
 
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
 	$query ="SELECT * ".
-			"FROM $g_mantis_bug_text_table ".
+			"FROM $t_bug_text_table ".
 			"WHERE id='$v_bug_text_id' ".
 			"LIMIT 1";
 	$result = db_query( $query );
@@ -49,27 +49,27 @@
 <table class="width100" cellspacing="1">
 <tr>
 	<td class="form-title" colspan="6">
-		<?php echo $s_viewing_bug_simple_details_title ?>
+		<?php echo lang_get( 'viewing_bug_simple_details_title' ) ?>
 	</td>
 </tr>
 <tr>
 	<td class="category" width="15%">
-		<?php echo $s_id ?>
+		<?php echo lang_get( 'id' ) ?>
 	</td>
 	<td class="category" width="20%">
-		<?php echo $s_category ?>
+		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td class="category" width="15%">
-		<?php echo $s_severity ?>
+		<?php echo lang_get( 'severity' ) ?>
 	</td>
 	<td class="category" width="20%">
-		<?php echo $s_reproducibility ?>
+		<?php echo lang_get( 'reproducibility' ) ?>
 	</td>
 	<td class="category" width="15%">
-		<?php echo $s_date_submitted ?>
+		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
 	<td class="category" width="15%">
-		<?php echo $s_last_update ?>
+		<?php echo lang_get( 'last_update' ) ?>
 	</td>
 </tr>
 <tr class="row-2">
@@ -99,7 +99,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_reporter ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td colspan="5">
 		<?php print_user( $v_reporter_id ) ?>
@@ -107,7 +107,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_assigned_to ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td colspan="5">
 		<?php print_user( $v_handler_id ) ?>
@@ -115,13 +115,13 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_priority ?>
+		<?php echo lang_get( 'priority' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'priority', $v_priority ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_resolution ?>
+		<?php echo lang_get( 'resolution' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'resolution', $v_resolution ) ?>
@@ -132,13 +132,13 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_status ?>
+		<?php echo lang_get( 'status' ) ?>
 	</td>
 	<td bgcolor="<?php echo get_status_color( $v_status ) ?>">
 		<?php echo get_enum_element( 'status', $v_status ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_duplicate_id ?>
+		<?php echo lang_get( 'duplicate_id' ) ?>
 	</td>
 	<td>
 		<?php print_duplicate_id( $v_duplicate_id ) ?>
@@ -154,7 +154,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_summary ?>
+		<?php echo lang_get( 'summary' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v_summary ?>
@@ -162,7 +162,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_description ?>
+		<?php echo lang_get( 'description' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_description ?>
@@ -170,7 +170,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_additional_information ?>
+		<?php echo lang_get( 'additional_information' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_additional_information ?>
diff --git a/bug_view_page.php b/bug_view_page.php
index fcd69f4288..4246a1f48d 100644
--- a/bug_view_page.php
+++ b/bug_view_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_view_page.php,v 1.7 2002-10-27 23:35:40 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php require_once( 'core.php' ) ?>
 <?php login_cookie_check() ?>
@@ -11,7 +15,7 @@
 	$f_bug_id		= gpc_get_int( 'f_bug_id' );
 	$f_bug_id		= bug_format_id( $f_bug_id );
 
-	if ( ADVANCED_ONLY == $g_show_view ) {
+	if ( ADVANCED_ONLY == config_get( 'show_view' ) ) {
 		print_header_redirect ( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id );
 	}
 
@@ -20,9 +24,11 @@
 	$c_bug_id = (integer)$f_bug_id;
 	project_access_check( $f_bug_id );
 
-    $query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
-    		UNIX_TIMESTAMP(last_updated) as last_updated
-    		FROM $g_mantis_bug_table
+	$t_bug_table = config_get( 'mantis_bug_table' );
+
+	$query = "SELECT *, UNIX_TIMESTAMP(date_submitted) as date_submitted,
+			UNIX_TIMESTAMP(last_updated) as last_updated
+			FROM $t_bug_table
     		WHERE id='$c_bug_id'";
     $result = db_query( $query );
 
@@ -38,8 +44,10 @@
 	# if bug is private, make sure user can view private bugs
 	access_bug_check( $f_bug_id, $v_view_state );
 
-    $query = "SELECT *
-    		FROM $g_mantis_bug_text_table
+	$t_bug_text_table = config_get( 'mantis_bug_text_table' );
+
+	$query = "SELECT *
+    		FROM $t_bug_text_table
     		WHERE id='$v_bug_text_id'";
     $result = db_query( $query );
 	$row = db_fetch_array( $result );
@@ -63,35 +71,35 @@
 <table class="width100" cellspacing="1">
 <tr>
 	<td class="form-title" colspan="3">
-		<?php echo $s_viewing_bug_simple_details_title ?>
-		<span class="small"><?php print_bracket_link( "#bugnotes", $s_jump_to_bugnotes ) ?></span>
+		<?php echo lang_get( 'viewing_bug_simple_details_title' ) ?>
+		<span class="small"><?php print_bracket_link( "#bugnotes", lang_get( 'jump_to_bugnotes' ) ) ?></span>
 	</td>
 	<td class="right" colspan="3">
-<?php if ( BOTH == $g_show_view ) { ?>
-		<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id, $s_view_advanced_link )?></span>
+<?php if ( BOTH == config_get( 'show_view' ) ) { ?>
+		<span class="small"><?php print_bracket_link( 'bug_view_advanced_page.php?f_bug_id='.$f_bug_id, lang_get( 'view_advanced_link' ) )?></span>
 <?php }?>
-	<span class="small"><?php print_bracket_link( 'bug_view_page.php?f_bug_id='.$f_bug_id.'&amp;f_history=1#history', $s_bug_history ) ?></span>
-	<span class="small"><?php print_bracket_link( 'print_bug_page.php?f_bug_id='.$f_bug_id, $s_print ) ?></span>
+	<span class="small"><?php print_bracket_link( 'bug_view_page.php?f_bug_id='.$f_bug_id.'&amp;f_history=1#history', lang_get( 'bug_history' ) ) ?></span>
+	<span class="small"><?php print_bracket_link( 'print_bug_page.php?f_bug_id='.$f_bug_id, lang_get( 'print' ) ) ?></span>
 	</td>
 </tr>
 <tr class="row-category">
 	<td width="16%">
-		<?php echo $s_id ?>
+		<?php echo lang_get( 'id' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_category ?>
+		<?php echo lang_get( 'category' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_severity ?>
+		<?php echo lang_get( 'severity' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_reproducibility ?>
+		<?php echo lang_get( 'reproducibility' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_date_submitted ?>
+		<?php echo lang_get( 'date_submitted' ) ?>
 	</td>
 	<td width="16%">
-		<?php echo $s_last_update ?>
+		<?php echo lang_get( 'last_update' ) ?>
 	</td>
 </tr>
 <tr class="row-2">
@@ -121,13 +129,13 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_reporter ?>
+		<?php echo lang_get( 'reporter' ) ?>
 	</td>
 	<td>
 		<?php print_user_with_subject( $v_reporter_id, $f_bug_id ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_view_status ?>
+		<?php echo lang_get( 'view_status' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'project_view_state', $v_view_state ) ?>
@@ -138,7 +146,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_assigned_to ?>
+		<?php echo lang_get( 'assigned_to' ) ?>
 	</td>
 	<td colspan="5">
 		<?php print_user_with_subject( $v_handler_id, $f_bug_id ) ?>
@@ -146,13 +154,13 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_priority ?>
+		<?php echo lang_get( 'priority' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'priority', $v_priority ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_resolution ?>
+		<?php echo lang_get( 'resolution' ) ?>
 	</td>
 	<td>
 		<?php echo get_enum_element( 'resolution', $v_resolution ) ?>
@@ -163,13 +171,13 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_status ?>
+		<?php echo lang_get( 'status' ) ?>
 	</td>
 	<td bgcolor="<?php echo get_status_color( $v_status ) ?>">
 		<?php echo get_enum_element( 'status', $v_status ) ?>
 	</td>
 	<td class="category">
-		<?php echo $s_duplicate_id ?>
+		<?php echo lang_get( 'duplicate_id' ) ?>
 	</td>
 	<td>
 		<?php print_duplicate_id( $v_duplicate_id ) ?>
@@ -185,7 +193,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_summary ?>
+		<?php echo lang_get( 'summary' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v_summary ?>
@@ -193,7 +201,7 @@
 </tr>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_description ?>
+		<?php echo lang_get( 'description' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_description ?>
@@ -201,7 +209,7 @@
 </tr>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_additional_information ?>
+		<?php echo lang_get( 'additional_information' ) ?>
 	</td>
 	<td colspan="5">
 		<?php echo $v2_additional_information ?>
@@ -209,13 +217,13 @@
 </tr>
 <?php
 	$t_user_id = current_user_get_field ( 'id' );
-	$t_show_attachments = ( ( $v_reporter_id == $t_user_id ) || access_level_check_greater_or_equal( $g_view_attachments_threshold ) );
+	$t_show_attachments = ( ( $v_reporter_id == $t_user_id ) || access_level_check_greater_or_equal( config_get( 'view_attachments_threshold' ) ) );
 
 	if ( $t_show_attachments ) {
 ?>
 <tr class="row-2">
 	<td class="category">
-		<?php echo $s_attached_files ?>
+		<?php echo lang_get( 'attached_files' ) ?>
 	</td>
 	<td colspan="5">
 		<?php file_list_attachments ( $f_bug_id ); ?>
@@ -224,7 +232,7 @@
 <?php } ?>
 <tr class="row-1">
 	<td class="category">
-		<?php echo $s_bug_relationships ?>
+		<?php echo lang_get( 'bug_relationships' ) ?>
 	</td>
 	<td colspan="5">
 		<?php
@@ -236,13 +244,13 @@
 
 				$t_bug_link = string_get_bug_view_link( $v2_destination_bug_id );
 				switch ( $v2_relationship_type ) {
-				case BUG_DUPLICATE:	$t_description = str_replace( '%id', $t_bug_link, $s_duplicate_of );
+				case BUG_DUPLICATE:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
 									break;
-				case BUG_RELATED:	$t_description = str_replace( '%id', $t_bug_link, $s_related_to );
+				case BUG_RELATED:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
 									break;
-				case BUG_DEPENDANT:	$t_description = str_replace( '%id', $t_bug_link, $s_dependant_on );
+				case BUG_DEPENDANT:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'dependant_on' ) );
 									break;
-				default:			$t_description = str_replace( '%id', $t_bug_link, $s_duplicate_of );
+				default:			$t_description = str_replace( '%id', $t_bug_link, lang_get( 'duplicate_of' ) );
 				}
 
 				PRINT "$t_description<br />";
@@ -257,13 +265,13 @@
 
 				$t_bug_link = string_get_bug_view_link( $v2_source_bug_id );
 				switch ( $v2_relationship_type ) {
-				case BUG_DUPLICATE:	$t_description = str_replace( '%id', $t_bug_link, $s_has_duplicate );
+				case BUG_DUPLICATE:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
 									break;
-				case BUG_RELATED:	$t_description = str_replace( '%id', $t_bug_link, $s_related_to );
+				case BUG_RELATED:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'related_to' ) );
 									break;
-				case BUG_DEPENDANT:	$t_description = str_replace( '%id', $t_bug_link, $s_blocks );
+				case BUG_DEPENDANT:	$t_description = str_replace( '%id', $t_bug_link, lang_get( 'blocks' ) );
 									break;
-				default:			$t_description = str_replace( '%id', $t_bug_link, $s_has_duplicate );
+				default:			$t_description = str_replace( '%id', $t_bug_link, lang_get( 'has_duplicate' ) );
 				}
 
 				PRINT "$t_description<br />";
@@ -276,12 +284,12 @@
 		<table width="100%">
 			<tr align="center">
 <?php # UPDATE form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_update_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'update_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<form method="post" action="<?php echo string_get_bug_update_page() ?>">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_bug_text_id" value="<?php echo $v_bug_text_id ?>" />
-		<input type="submit" value="<?php echo $s_update_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'update_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -289,14 +297,14 @@
 	# UPDATE form END
 ?>
 <?php # ASSIGN form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_handle_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<?php #check if current user already assigned to the bug ?>
 		<?php if ( $t_user_id != $v_handler_id ) { ?>
 		<form method="post" action="bug_assign.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_date_submitted" value="<?php echo $v_date_submitted ?>" />
-		<input type="submit" value="<?php echo $s_bug_assign_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'bug_assign_button' ) ?>" />
 		</form>
 		<?php } #end of checking if current user already assigned ?>
 	</td>
@@ -304,11 +312,11 @@
 	} # ASSIGN form END
 ?>
 <?php # RESOLVE form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_handle_bug_threshold ) && ( $v_status < RESOLVED ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'handle_bug_threshold' ) ) && ( $v_status < RESOLVED ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_resolve_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_resolve_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'resolve_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -316,26 +324,26 @@
 ?>
 <?php # REOPEN form BEGIN ?>
 <?php if ( ( $v_status >= RESOLVED ) &&
-		( access_level_check_greater_or_equal( $g_reopen_bug_threshold ) ||
+		( access_level_check_greater_or_equal( config_get( 'reopen_bug_threshold' ) ) ||
 		( $v_reporter_id == $t_user_id  && ON == config_get( 'allow_reporter_reopen' ) ) ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_reopen_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_reopen_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'reopen_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
 	} # REOPEN form END
 ?>
 <?php # CLOSE form BEGIN ?>
-<?php if ( ( access_level_check_greater_or_equal( $g_close_bug_threshold ) ||
-		( ON == $g_allow_reporter_close &&
+<?php if ( ( access_level_check_greater_or_equal( config_get( 'close_bug_threshold' ) ) ||
+		( ON == config_get( 'allow_reporter_close' ) &&
 		  $v_reporter_id == $t_user_id ) ) &&
 		( RESOLVED == $v_status ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_close_page.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
-		<input type="submit" value="<?php echo $s_close_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'close_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -343,13 +351,13 @@
 ?>
 <?php # MONITOR form BEGIN ?>
 <?php
- if ( (( PUBLIC == $v_view_state && access_level_check_greater_or_equal( $g_monitor_bug_threshold ) ) || ( PRIVATE == $v_view_state && access_level_check_greater_or_equal( $g_private_bug_threshold ) )) && ! user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) {
+ if ( (( PUBLIC == $v_view_state && access_level_check_greater_or_equal( config_get( 'monitor_bug_threshold' ) ) ) || ( PRIVATE == $v_view_state && access_level_check_greater_or_equal( config_get( 'private_bug_threshold' ) ) )) && ! user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) {
 ?>
 	<td class="center">
 		<form method="post" action="bug_monitor.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_action" value="add" />
-		<input type="submit" value="<?php echo $s_monitor_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'monitor_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -357,12 +365,12 @@
 	# MONITOR form END
 ?>
 <?php # UNMONITOR form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_monitor_bug_threshold ) && user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'monitor_bug_threshold' ) ) && user_is_monitoring_bug( $t_user_id, $f_bug_id ) ) { ?>
 	<td class="center">
 		<form method="post" action="bug_monitor.php">
 		<input type="hidden" name="f_bug_id" value="<?php echo $f_bug_id ?>" />
 		<input type="hidden" name="f_action" value="delete" />
-		<input type="submit" value="<?php echo $s_unmonitor_bug_button ?>" />
+		<input type="submit" value="<?php echo lang_get( 'unmonitor_bug_button' ) ?>" />
 		</form>
 	</td>
 <?php
@@ -370,11 +378,11 @@
 	# MONITOR form END
 ?>
 <?php # DELETE form BEGIN ?>
-<?php if ( access_level_check_greater_or_equal( $g_allow_bug_delete_access_level ) ) { ?>
+<?php if ( access_level_check_greater_or_equal( config_get( 'allow_bug_delete_access_level' ) ) ) { ?>
 	<td class="center">
 		<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>
 	</td>
 <?php
@@ -388,13 +396,13 @@
 
 <?php
 	if ( empty( $f_check ) && $t_show_attachments && $v_status < RESOLVED && access_level_check_greater_or_equal( REPORTER ) ) {
-		include( $g_bug_file_upload_inc );
+		include( config_get( 'bug_file_upload_inc' ) );
 	}
 
-	include( $g_bugnote_include_file );
+	include( config_get( 'bugnote_include_file' ) );
 
 	if ( $f_history ) {
-		include( $g_history_include_file );
+		include( config_get( 'history_include_file' ) );
 	}
 ?>
 <?php print_page_bot1( __FILE__ ) ?>
diff --git a/bug_vote_add.php b/bug_vote_add.php
index 5546e125a9..703785d2e9 100644
--- a/bug_vote_add.php
+++ b/bug_vote_add.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_vote_add.php,v 1.14 2002-10-27 23:35:40 jfitzell Exp $
+	# --------------------------------------------------------
 ?>
 <?php die('Not in use.'); ?>
 <?php require_once( 'core.php' ) ?>
@@ -16,7 +20,10 @@
 
 	# increase vote count and update in table
 	$f_vote++;
-    $query = "UPDATE $g_mantis_bug_table
+
+	$t_bug_table = config_get( 'mantis_bug_table' );
+	
+	$query = "UPDATE $t_bug_table
     		SET votes=$c_vote
     		WHERE id='$c_bug_id'";
    	$result = db_query($query);