From 16366f9d03bac283db38337cbeb0a0dd0f7a6561 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Wed, 6 Dec 2006 01:43:10 +0000
Subject: [PATCH] r1333: Bringing search.php up-to-date to use the new product
 selection system

---
 search.php           | 15 ++++++++-------
 templates/search.tpl |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/search.php b/search.php
index 00110db..936f954 100644
--- a/search.php
+++ b/search.php
@@ -118,14 +118,15 @@ if ($_REQUEST['do'] == 'process')
 	
 	// -------------------------------------------------------------------
 	// product/component/version stuff
-	if (is_array($bugsys->in['pcv_select']))
+	if (is_array($bugsys->in['product']))
 	{
-		foreach ($bugsys->in['pcv_select'] AS $pcv)
+		foreach ($bugsys->in['product'] AS $prod)
 		{
-			$pcv = parse_pcv_select($pcv, true);
-			$products[] = $pcv['product'];
-			$components[] = $pcv['component'];
-			$versions[] = $pcv['version'];
+			$product = explode(',', $prod);
+			$product = $bugsys->clean($product, TYPE_UINT);
+			$products[] = $product[0];
+			$components[] = $product[1];
+			$versions[] = $product[2];
 		}
 		$querybuild['pcv'] = "AND bug.product IN (" . implode(',', $products) . ") AND bug.component IN (" . implode(',', $components) . ") AND bug.version IN (" . implode(',', $versions) . ")";
 	}
@@ -331,7 +332,7 @@ if ($_REQUEST['do'] == 'search')
 			$message->error(_('No versions have been added underneath your product(s), there can be no bugs and thus search cannot function.'));
 		}
 		
-		$pcv_select = construct_pcv_select();
+		$productSelect = ConstructProductSelect();
 		
 		// -------------------------------------------------------------------
 		// custom fields
diff --git a/templates/search.tpl b/templates/search.tpl
index 62d6083..de12897 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -44,7 +44,7 @@ $header
 		<!-- product & version -->
 		<fieldset>
 			<legend>{@"Product / Version"} $help[product]</legend>
-			<div class="field"><select name="pcv_select[]" size="10" multiple="multiple">$pcv_select</select></div>
+			<div class="field"><select name="product[]" size="10" multiple="multiple">$productSelect</select></div>
 		</fieldset>
 		<!-- / product & version -->
 		
-- 
2.22.5