r1333: Bringing search.php up-to-date to use the new product selection system

diff --git a/search.php b/search.php
index 00110dba04a3d94c853a58ff1d92177b0925b68c..936f954d5b3162b2dafd8372848a015334233297 100644 (file)
--- 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 62d60839c66c8251d9e5a5393a09553be821c8fd..de128975fd113d57952b234d0dd1a02456de5f95 100644 (file)
--- 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 -->