From 83afc0681b75efba8c4e2663cddeef0aa8abedae Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 22 Jul 2006 18:15:23 +0000
Subject: [PATCH] r933: - Adding a setting to control status displays -
 Updating construct_option_select()

---
 admin/setting.php      |  5 +++++
 includes/functions.php | 35 ++++++++++++++++++++++++++++-------
 includes/settings.php  |  6 ++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/admin/setting.php b/admin/setting.php
index 99961b2..0af6ec4 100755
--- a/admin/setting.php
+++ b/admin/setting.php
@@ -45,6 +45,11 @@ if ($_POST['do'] == 'update')
 {
 	foreach ($bugsys->in['setting'] AS $varname => $value)
 	{
+		if (is_array($value))
+		{
+			$value = implode(',', $value);
+		}
+		
 		$db->query("REPLACE INTO " . TABLE_PREFIX . "setting (varname, value) VALUES ('" . $bugsys->escape($varname) . "', '" . $bugsys->escape($value) . "')");
 	}
 	
diff --git a/includes/functions.php b/includes/functions.php
index 2593aa5..2207ae9 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -19,23 +19,44 @@
 || ###################################################################
 \*=====================================================================*/
 
-// ################## Start construct_option_select ##################
-// creates a <select> menu from an array
-// key vars are used when you need to get data out of the $label array
-function construct_option_select($name, $array, $selected = 0, $valuekey = '', $labelkey = '', $includenil = false)
+// ###################################################################
+/**
+* Constructs HTML code <select>s from an array. You use they keys when
+* you need to access a multi-dimensional array of data.
+*
+* @access	public
+*
+* @param	string	HTML name of the select
+* @param	array	Array of <option>s
+* @param	integer	ID of the selected item, 0 for none
+* @param	string	Name of the index where values are stored in the $array
+* @param	string	Name of the iddex where the labels are stored in $array
+* @param	bool	Value of the blank option, FALSE turns it off
+* @param	bool	Construct a multiple-selection <select> menu and append "[]" to the end of the name
+*
+* @return	string	Constructed HTML output
+*/
+function construct_option_select($name, $array, $selected = 0, $valuekey = '', $labelkey = '', $includenil = false, $multiple = false)
 {
 	global $bugsys;
 	
+	if ($multiple)
+	{
+		$selected = explode(',', $selected);
+	}
+	
 	// if we're not working on a boolean false, we use it for the value (allows -1 and 0)
 	if ($includenil !== false)
 	{
-		$opts[] = '<option value="' . $includenil . '"' . ((!$selected) ? ' selected="selected"' : '') . '>' . $bugsys->lang->string('Not Selected') . '</option>';
+		$opts[] = '<option value="' . $includenil . '"' . ((!$selected OR (is_array($selected) AND in_array($includenil, $selected))) ? ' selected="selected"' : '') . '> ---------</option>';
 	}
 	foreach ($array AS $value => $label)
 	{
-		$opts[] = '<option value="' . (($valuekey) ? $label["$valuekey"] : $value) . '"' . (($selected == (($valuekey) ? $label["$valuekey"] : $value)) ? ' selected="selected"' : '') . '>' . (($labelkey) ? $label["$labelkey"] : $label) . '</option>';
+		$newval = ($valuekey ? $label["$valuekey"] : $value);
+		$newlab = ($labelkey ? $label["$labelkey"] : $label);
+		$opts[] = '<option value="' . $newval . '"' . (($selected == $newval OR (is_array($selected) AND in_array($newval, $selected))) ? ' selected="selected"' : '') . '>' . $newlab . '</option>';
 	}
-	return '<select class="input" name="' . $name . '">' . implode("\n\t", $opts) . "\r</select>";
+	return '<select class="input" name="' . $name . ($multiple ? '[]' : '') . '"' . ($multiple ? ' multiple="multiple" size="' . (sizeof($array) < 8 ? sizeof($array) + 1 : 8) . '"' : '') . '>' . implode("\n\t", $opts) . "\r</select>";
 }
 
 // ################### Start construct_user_display ##################
diff --git a/includes/settings.php b/includes/settings.php
index cc74982..e782c04 100755
--- a/includes/settings.php
+++ b/includes/settings.php
@@ -62,6 +62,12 @@ $settings = array(
 	'defaultcomment'	=> array('textarea', '', false, $lang->string('Default Comment Text'), $lang->string('If you wish to set a template for entering the initial comment of a bug report, then you may specify this here. However, the template will only take effect on the initial report/comment. Note: the template cannot be forced on the user as there is no way to validate it.'))
 ),
 
+'display' => array(
+	':lang'				=> $lang->string('Bug Listing Display Options'),
+	
+	'hidestatuses'		=> array('" . construct_option_select("setting[hidestatuses]", $bugsys->datastore["status"], $bugsys->options["hidestatuses"], "statusid", "status", 0, true) . "', '', false, $lang->string('Hide Statuses on Bug Listings'), $lang->string('Here you can specify which statuses to hide on the bug list displays. Users have options in their controls to change this from these values, and this does not affect searches or the favourites list.')),
+),
+
 'pagination' => array(
 	':lang'				=> $lang->string('Pagination Options'),
 	
-- 
2.22.5