Also changed it around a little bit so it's not tied down the search results function
Signed-off-by: Callan Barrett
---
web/html/index.php | 2 ++
web/html/packages.php | 1 +
web/template/pkg_search_form.php | 16 +++++++++-------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/web/html/index.php b/web/html/index.php
index e2c840a..5511d7e 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -12,6 +12,8 @@ include_lang('pkgfuncs_po.inc');
html_header( __("Home") );
+include('pkg_search_form.php');
+
$dbh = db_connect();
?>
diff --git a/web/html/packages.php b/web/html/packages.php
index 90ab72c..9805ee2 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -64,6 +64,7 @@ if ($output):
endif;
if (isset($_GET["ID"])) {
+ include('pkg_search_form.php');
if (!intval($_GET["ID"])) {
print __("Error trying to retrieve package details.")."<br />\n";
} else {
diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php
index edc8b38..952d45a 100644
--- a/web/template/pkg_search_form.php
+++ b/web/template/pkg_search_form.php
@@ -1,3 +1,5 @@
+<?php include_once('pkgfuncs.inc') ?>
+
<form action='packages.php' method='get'>
<input type='hidden' name='O' value='0'>
<center>
@@ -13,7 +15,7 @@
<label><?php print __("Keywords"); ?></label>
<?php if (!$_GET['detail']): ?><input type='submit' style='width:80px' class='button' name='do_Search' value='<?php print __("Go"); ?>' /><?php endif; ?>
- <a href="packages.php?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a>
+ <a href="?<?php print mkurl('detail=' . (($_GET['detail']) ? 0 : 1) ) ?>">Advanced</a>
<?php if ($_GET['detail']): ?>
<div id="advanced">
<input type="hidden" name="detail" value="1" />
@@ -23,15 +25,15 @@
<select name='L'>
<option value=0><?php print __("Any"); ?></option>
<?php
- while (list($id, $loc) = each($locs)):
- if (intval($_REQUEST["L"]) == $id):
+ foreach (pkgLocations() as $id => $loc):
+ if (intval($_GET["L"]) == $id):
?>
<option value="<?php print $id; ?>" selected="selected"><?php print $loc; ?></option>
<?php else: ?>
<option value="<?php print $id; ?>"><?php print $loc; ?></option>
<?php
endif;
- endwhile;
+ endforeach;
?>
</select>
</li>
@@ -40,15 +42,15 @@
<select name='C'>
<option value='0'><?php print __("Any"); ?></option>
<?php
- while (list($id, $cat) = each($cats)):
- if (intval($_REQUEST["C"]) == $id):
+ foreach (pkgCategories() as $id => $cat):
+ if (intval($_GET["C"]) == $id):
?>
<option value="<?php print $id ?>" selected="selected"><?php print $cat; ?></option>
<?php else: ?>
<option value="<?php print $id ?>"><?php print $cat; ?></option>
<?php
endif;
- endwhile;
+ endforeach;
?>
</select>
</li>
--
1.6.0.2