From e304dab7668f1541bc1966d699bbb2938f8785b3 Mon Sep 17 00:00:00 2001
From: Kenzaburo Ito <prescience@users.sourceforge.net>
Date: Thu, 28 Mar 2002 23:14:00 +0000
Subject: [PATCH] Modified print_enum_string_option_list() to work better.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@822 f5dc347c-c33d-0410-90a0-b07cc1902cb9
---
 bug_resolve_page.php         |  2 +-
 bug_update_advanced_page.php | 12 ++++++------
 bug_update_page.php          |  8 ++++----
 core_print_API.php           | 17 ++++++++++++-----
 doc/ChangeLog                |  1 +
 manage_create_user_page.php  |  2 +-
 manage_proj_edit_page.php    |  2 +-
 manage_proj_menu_page.php    |  2 +-
 manage_user_page.php         |  2 +-
 print_all_bug_page.php       |  4 ++--
 report_bug_advanced_page.php |  4 ++--
 report_bug_page.php          |  4 ++--
 view_all_inc.php             |  4 ++--
 13 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/bug_resolve_page.php b/bug_resolve_page.php
index 758bdac3e5..558f3444e7 100644
--- a/bug_resolve_page.php
+++ b/bug_resolve_page.php
@@ -32,7 +32,7 @@
 	</td>
 	<td>
 		<select name="f_resolution">
-			<?php print_enum_string_option_list( $s_resolution_enum_string, FIXED ) ?>
+			<?php print_enum_string_option_list( "resolution", FIXED ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 7703975673..0220eb9b9e 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -105,12 +105,12 @@
 	</td>
 	<td>
 		<select name="f_severity">
-			<?php print_enum_string_option_list( $s_severity_enum_string, $v_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $v_severity ) ?>
 		</select>
 	</td>
 	<td>
 		<select name="f_reproducibility">
-			<?php print_enum_string_option_list( $s_reproducibility_enum_string, $v_reproducibility ) ?>
+			<?php print_enum_string_option_list( "reproducibility", $v_reproducibility ) ?>
 		</select>
 	</td>
 	<td>
@@ -150,7 +150,7 @@
 	</td>
 	<td align="left">
 		<select name="f_priority">
-			<?php print_enum_string_option_list( $s_priority_enum_string, $v_priority ) ?>
+			<?php print_enum_string_option_list( "priority", $v_priority ) ?>
 		</select>
 	</td>
 	<td class="category">
@@ -172,7 +172,7 @@
 	</td>
 	<td>
 		<select name="f_status">
-			<?php print_enum_string_option_list( $s_status_enum_string, $v_status ) ?>
+			<?php print_enum_string_option_list( "status", $v_status ) ?>
 		</select>
 	</td>
 	<td class="category">
@@ -194,7 +194,7 @@
 	</td>
 	<td>
 		<select name="f_projection">
-			<?php print_enum_string_option_list( $s_projection_enum_string, $v_projection ) ?>
+			<?php print_enum_string_option_list( "projection", $v_projection ) ?>
 		</select>
 	</td>
 	<td colspan="2">
@@ -213,7 +213,7 @@
 	</td>
 	<td>
 		<select name="f_eta">
-			<?php print_enum_string_option_list( $s_eta_enum_string, $v_eta ) ?>
+			<?php print_enum_string_option_list( "eta", $v_eta ) ?>
 		</select>
 	</td>
 	<td colspan="2">
diff --git a/bug_update_page.php b/bug_update_page.php
index 7e0053eb09..a165ed92c1 100644
--- a/bug_update_page.php
+++ b/bug_update_page.php
@@ -114,12 +114,12 @@
 	</td>
 	<td>
 		<select name="f_severity">
-			<?php print_enum_string_option_list( $s_severity_enum_string, $v_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $v_severity ) ?>
 		</select>
 	</td>
 	<td>
 		<select name="f_reproducibility">
-			<?php print_enum_string_option_list( $s_reproducibility_enum_string, $v_reproducibility ) ?>
+			<?php print_enum_string_option_list( "reproducibility", $v_reproducibility ) ?>
 		</select>
 	</td>
 	<td>
@@ -159,7 +159,7 @@
 	</td>
 	<td>
 		<select name="f_priority">
-			<?php print_enum_string_option_list( $s_priority_enum_string, $v_priority ) ?>
+			<?php print_enum_string_option_list( "priority", $v_priority ) ?>
 		</select>
 	</td>
 	<td class="category">
@@ -178,7 +178,7 @@
 	</td>
 	<td>
 		<select name="f_status">
-			<?php print_enum_string_option_list( $s_status_enum_string, $v_status ) ?>
+			<?php print_enum_string_option_list( "status", $v_status ) ?>
 		</select>
 	</td>
 	<td class="category">
diff --git a/core_print_API.php b/core_print_API.php
index 5e3b49ed4a..9287b9b49b 100644
--- a/core_print_API.php
+++ b/core_print_API.php
@@ -407,15 +407,22 @@ function print_version_option_list( $p_version="" ) {
 		}
 	}
 	# --------------------
-	function print_enum_string_option_list( $p_enum_string, $p_val=0 ) {
-		$t_arr = explode_enum_string( $p_enum_string);
+	# select the proper enum values based on the input parameter
+	# we use variable variables in order to achieve this
+	function print_enum_string_option_list( $p_enum_name, $p_val=0 ) {
+		$g_var = "g_".$p_enum_name."_enum_string";
+		$s_var = "s_".$p_enum_name."_enum_string";
+		global $$g_var, $$s_var;
+
+		$t_arr  = explode_enum_string( $$g_var );
 		$enum_count = count( $t_arr );
 		for ($i=0;$i<$enum_count;$i++) {
-			$t_elem = explode_enum_arr( $t_arr[$i] );
+			$t_elem  = explode_enum_arr( $t_arr[$i] );
+			$t_elem2 = get_enum_element( $$s_var, $t_elem[0] );
 			if ( $t_elem[0] == $p_val ) {
-				PRINT "<option value=\"$t_elem[0]\" SELECTED>$t_elem[1]</option>";
+				PRINT "<option value=\"$t_elem[0]\" SELECTED>$t_elem2</option>";
 			} else {
-				PRINT "<option value=\"$t_elem[0]\">$t_elem[1]</option>";
+				PRINT "<option value=\"$t_elem[0]\">$t_elem2</option>";
 			}
 		} # end for
 	}
diff --git a/doc/ChangeLog b/doc/ChangeLog
index cb2ff567e5..2831db54c8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -15,6 +15,7 @@ Mantis
  * Modified news posting to properly limit project lists for non Administrators.
  * Modified reset password functionality to use g_send_reset_password to determine whether a password is set to blank or emailed to the user.
  * Modified color legend is now generated form the $g_status_enum_string variable.
+ * Modified print_enum_string_option_list() to work better.
  * Added Hungarian translation.
  * Added g_bug_link_tag to let users customize how to create bug links.
  * Added a "jump to bugnotes" quicklink at the top of the view bug pages.
diff --git a/manage_create_user_page.php b/manage_create_user_page.php
index f03dc03125..613fdcdfe6 100644
--- a/manage_create_user_page.php
+++ b/manage_create_user_page.php
@@ -62,7 +62,7 @@
 	</td>
 	<td>
 		<select name="f_access_level">
-			<?php print_enum_string_option_list( $s_access_levels_enum_string, REPORTER ) ?>
+			<?php print_enum_string_option_list( "access_levels", REPORTER ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/manage_proj_edit_page.php b/manage_proj_edit_page.php
index 0fc43ca8e6..9cf765c617 100644
--- a/manage_proj_edit_page.php
+++ b/manage_proj_edit_page.php
@@ -59,7 +59,7 @@
 	</td>
 	<td>
 		<select name="f_status">
-		<?php print_enum_string_option_list( $s_project_status_enum_string, $v_status ) ?>
+		<?php print_enum_string_option_list( "project_status", $v_status ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/manage_proj_menu_page.php b/manage_proj_menu_page.php
index fac3f9cad2..5e59e4bec3 100644
--- a/manage_proj_menu_page.php
+++ b/manage_proj_menu_page.php
@@ -57,7 +57,7 @@
 	</td>
 	<td>
 		<select name="f_status">
-		<?php print_enum_string_option_list( $s_project_status_enum_string ) ?>
+		<?php print_enum_string_option_list( "project_status" ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/manage_user_page.php b/manage_user_page.php
index e2685f1878..32fcb8913a 100644
--- a/manage_user_page.php
+++ b/manage_user_page.php
@@ -55,7 +55,7 @@
 	</td>
 	<td colspan="2">
 		<select name="f_access_level">
-			<?php print_enum_string_option_list( $s_access_levels_enum_string, $u_access_level ) ?>
+			<?php print_enum_string_option_list( "access_levels", $u_access_level ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/print_all_bug_page.php b/print_all_bug_page.php
index 6bbfbc2eee..1498284ad8 100644
--- a/print_all_bug_page.php
+++ b/print_all_bug_page.php
@@ -282,14 +282,14 @@
 		<select name="f_show_severity">
 			<option value="any"><?php echo $s_any ?></option>
 			<option value="any"></option>
-			<?php print_enum_string_option_list( $s_severity_enum_string, $f_show_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $f_show_severity ) ?>
 		</select>
 	</td>
 	<td>
 		<select name="f_show_status">
 			<option value="any"><?php echo $s_any ?></option>
 			<option value="any"></option>
-			<?php print_enum_string_option_list( $s_status_enum_string, $f_show_status ) ?>
+			<?php print_enum_string_option_list( "status", $f_show_status ) ?>
 		</select>
 	</td>
 	<td>
diff --git a/report_bug_advanced_page.php b/report_bug_advanced_page.php
index 8d96160ae1..41eaa6d094 100644
--- a/report_bug_advanced_page.php
+++ b/report_bug_advanced_page.php
@@ -120,7 +120,7 @@
 	<td>
 		<select name="f_reproducibility">
 			<option value="" SELECTED><?php echo $s_select_reproducibility ?></option>
-			<?php print_enum_string_option_list( $s_reproducibility_enum_string, $f_reproducibility ) ?>
+			<?php print_enum_string_option_list( "reproducibility", $f_reproducibility ) ?>
 		</select>
 	</td>
 </tr>
@@ -132,7 +132,7 @@
 	<td>
 		<select name="f_severity">
 			<option value="" SELECTED><?php echo $s_select_severity ?></option>
-			<?php print_enum_string_option_list( $s_severity_enum_string, $f_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $f_severity ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/report_bug_page.php b/report_bug_page.php
index 91ea7e416b..cc949f03ad 100644
--- a/report_bug_page.php
+++ b/report_bug_page.php
@@ -86,7 +86,7 @@
 	<td>
 		<select name="f_reproducibility">
 			<option value="" SELECTED><?php echo $s_select_reproducibility ?></option>
-			<?php print_enum_string_option_list( $s_reproducibility_enum_string, $f_reproducibility ) ?>
+			<?php print_enum_string_option_list( "reproducibility", $f_reproducibility ) ?>
 		</select>
 	</td>
 </tr>
@@ -97,7 +97,7 @@
 	<td>
 		<select name="f_severity">
 			<option value="" selected><?php echo $s_select_severity ?></option>
-			<?php print_enum_string_option_list( $s_severity_enum_string, $f_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $f_severity ) ?>
 		</select>
 	</td>
 </tr>
diff --git a/view_all_inc.php b/view_all_inc.php
index 31fe73e343..a5dd6acd66 100644
--- a/view_all_inc.php
+++ b/view_all_inc.php
@@ -60,14 +60,14 @@
 		<select name="f_show_severity">
 			<option value="any"><?php echo $s_any ?></option>
 			<option value="any"></option>
-			<?php print_enum_string_option_list( $s_severity_enum_string, $f_show_severity ) ?>
+			<?php print_enum_string_option_list( "severity", $f_show_severity ) ?>
 		</select>
 	</td>
 	<td>
 		<select name="f_show_status">
 			<option value="any"><?php echo $s_any ?></option>
 			<option value="any"></option>
-			<?php print_enum_string_option_list( $s_status_enum_string, $f_show_status ) ?>
+			<?php print_enum_string_option_list( "status", $f_show_status ) ?>
 		</select>
 	</td>
 	<td>