From 826dd60aad60d8ea4863a6b6d582863f20eda6e0 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 24 Jun 2006 17:47:15 +0000
Subject: [PATCH] r871: Allow multiple selection of <select> fields in
 search.php

---
 docs/changes.txt     |  3 ++-
 docs/todo.txt        |  1 -
 search.php           | 25 +++++++++++++++----------
 templates/search.tpl | 10 +++++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index eb4c149..0c529c8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,5 @@
 1.1.0
 ==================
-- Added notification system (http://bugs.iris-studios.com/showreport.php?bugid=11)
 - If the first SQL query fails (datastore fetch), show a link to the installer (http://bugs.iris-studios.com/showreport.php?bugid=20)
 - Removed potential divide by 0 warnings in showreport.php under PHP5
 - No longer highlight the <title> and <input> tags when viewing a bug report (http://bugs.iris-studios.com/showreport.php?bugid=21)
@@ -8,6 +7,8 @@
 - When logging out, you will be redirected to the page you were previously viewing
 - Rewrote the logging mechanism
 - Usernames are now cached in the database for bug reports to remove the need to do complex joins at runtime
+- Added notification system (http://bugs.iris-studios.com/showreport.php?bugid=11)
+- When searching, you can now select multiple values for <select> menus (http://bugs.iris-studios.com/showreport.php?bugid=3)
 
 1.0.2
 ==================
diff --git a/docs/todo.txt b/docs/todo.txt
index 207f37f..f9883cc 100755
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -24,7 +24,6 @@ BUGTRACK 1.1
 - Have a favourite queries list
 - Mass updates and deletes
 - Search attachment filenames and descriptions
-- Allow multi selections for all select options
 - Key words should be applied to custom text fields so they won't have their own text box
 
 ----------------------------------------
diff --git a/search.php b/search.php
index 92bba58..9e5e5d9 100644
--- a/search.php
+++ b/search.php
@@ -134,31 +134,36 @@ if ($_REQUEST['do'] == 'process')
 	// severity
 	if ($bugsys->in['severity'])
 	{
-		$querybuild['severity'] = "AND bug.severity = " . intval($bugsys->in['severity']);
+		$bugsys->input_clean('severity', TYPE_UINT);
+		$querybuild['severity'] = "AND bug.severity IN (" . implode(',', $bugsys->in['severity']) . ")";
 	}
 	
 	// priority
 	if ($bugsys->in['priority'])
 	{
-		$querybuild['priority'] = "AND bug.priority = " . intval($bugsys->in['priority']);
+		$bugsys->input_clean('priority', TYPE_UINT);
+		$querybuild['priority'] = "AND bug.priority IN (" . implode(',', $bugsys->in['priority']) . ")";
 	}
 	
 	// status
 	if ($bugsys->in['status'])
 	{
-		$querybuild['status'] = "AND bug.status = " . intval($bugsys->in['status']);
+		$bugsys->input_clean('status', TYPE_UINT);
+		$querybuild['status'] = "AND bug.status IN (" . implode(',', $bugsys->in['status']) . ")";
 	}
 	
 	// resolution
 	if ($bugsys->in['resolution'])
 	{
-		$querybuild['resolution'] = "AND bug.resolution = " . intval($bugsys->in['resolution']);
+		$bugsys->input_clean('resolution', TYPE_UINT);
+		$querybuild['resolution'] = "AND bug.resolution IN (" . implode(',', $bugsys->in['resolution']) . ")";
 	}
 	
 	// assignment
 	if ($bugsys->in['assignedto'])
 	{
-		$querybuild['assignedto'] = "AND bug.assignedto = " . intval($bugsys->in['assignedto']);
+		$bugsys->input_clean('assignedto', TYPE_UINT);
+		$querybuild['assignedto'] = "AND bug.assignedto IN (" . implode(',', $bugsys->in['assignedto']) . ")";
 	}
 	
 	// -------------------------------------------------------------------
@@ -339,12 +344,12 @@ if ($_REQUEST['do'] == 'search')
 		
 		// -------------------------------------------------------------------
 		// built-in fields	
-		$select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', 0, true);
-		$select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', 0, true);
-		$select['status'] = construct_datastore_select('status', 'status', 'statusid', 0, true);
-		$select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid', 0, true);
+		$select['severity'] = construct_datastore_select('severity', 'severity', 'severityid');
+		$select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid');
+		$select['status'] = construct_datastore_select('status', 'status', 'statusid');
+		$select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid');
 		
-		$select['dev'] = '<option value="0" selected="selected"></option>';
+		$select['dev'] = '';
 		foreach ($bugsys->datastore['assignto'] AS $dev)
 		{
 			$value = $dev['userid'];
diff --git a/templates/search.tpl b/templates/search.tpl
index 1a5f501..491b75f 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -51,14 +51,14 @@ $header
 		<!-- status -->
 		<fieldset>
 			<legend>{@"Status"} $help[status]</legend>
-			<div class="field"><select name="status">$select[status]</select></div>
+			<div class="field"><select name="status[]" size="4" multiple="multiple">$select[status]</select></div>
 		</fieldset>
 		<!-- / status -->
 		
 		<!-- priority -->
 		<fieldset>
 			<legend>{@"Priority"} $help[priority]</legend>
-			<div class="field"><select name="priority">$select[priority]</select></div>
+			<div class="field"><select name="priority[]" size="4" multiple="multiple">$select[priority]</select></div>
 		</fieldset>
 		<!-- / priority -->
 		
@@ -122,21 +122,21 @@ $header
 		<!-- assignment -->
 		<fieldset>
 			<legend>{@"Assignment"} $help[assignedto]</legend>
-			<div class="field"><select name="assignedto">$select[dev]</select></div>
+			<div class="field"><select name="assignedto[]" size="4" multiple="multiple">$select[dev]</select></div>
 		</fieldset>
 		<!-- / assignment -->
 		
 		<!-- resolution -->
 		<fieldset>
 			<legend>{@"Resolution"} $help[resolution]</legend>
-			<div class="field"><select name="resolution">$select[resolution]</select></div>
+			<div class="field"><select name="resolution[]" size="4" multiple="multiple">$select[resolution]</select></div>
 		</fieldset>
 		<!-- / resolution -->
 		
 		<!-- severity -->
 		<fieldset>
 			<legend>{@"Severity"} $help[severity]</legend>
-			<div class="field"><select name="severity">$select[severity]</select></div>
+			<div class="field"><select name="severity[]" size="4" multiple="multiple">$select[severity]</select></div>
 		</fieldset>
 		<!-- / severity -->
 		
-- 
2.22.5