From: Steve Sutton Date: Wed, 24 Jul 2013 15:20:49 +0000 (+0000) Subject: Upddate the search forms X-Git-Tag: v1.0~66 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=251113b5dbfe979952b4c3c92dd232ed6da9eaf5;p=web%2FMichiganTrailMaps.git Upddate the search forms Need to use get as the form method for the forms to work with the paging and alpha buttons. --- diff --git a/Toolkit/Members/SearchQueryGenerator.php b/Toolkit/Members/SearchQueryGenerator.php index 30b5cc6..5d5ae8e 100644 --- a/Toolkit/Members/SearchQueryGenerator.php +++ b/Toolkit/Members/SearchQueryGenerator.php @@ -79,7 +79,7 @@ class Toolkit_Members_SearchQueryGenerator WHERE page = :catid"; $stmt = $dbh->prepare($sql); - $stmt->bindParam(':catid', $_GET['catid'], PDO::PARAM_INT); + $stmt->bindParam(':catid', $_REQUEST['catid'], PDO::PARAM_INT); $stmt->execute(); $stmt->bindColumn('category', $category); @@ -136,7 +136,7 @@ class Toolkit_Members_SearchQueryGenerator WHERE page = :catid"; $stmt = $dbh->prepare($sql); - $stmt->bindParam(':catid', $_GET['catid'], PDO::PARAM_INT); + $stmt->bindParam(':catid', $_REQUEST['catid'], PDO::PARAM_INT); $stmt->execute(); $stmt->bindColumn('region', $region); @@ -186,10 +186,10 @@ class Toolkit_Members_SearchQueryGenerator 'emn.mid = m.member_id'); // Limit to members whose first letter starts with the letter // a user clicked in the narrow alphabetically list. - if (isset($_GET['alpha']) && $_GET['alpha'] == '0-9') { + if (isset($_REQUEST['alpha']) && $_REQUEST['alpha'] == '0-9') { $params[] = "substr(m.member_name, 1, 1) ~ '[0-9]'"; - } elseif (isset($_GET['alpha']) && ctype_alpha($_GET['alpha'])) { - $letter = $_GET['alpha'][0]; + } elseif (isset($_REQUEST['alpha']) && ctype_alpha($_REQUEST['alpha'])) { + $letter = $_REQUEST['alpha'][0]; $params[] = "upper(substr(m.member_name, 1, 1)) = upper(" . $dbh->quote($letter) . ')'; } @@ -365,15 +365,15 @@ class Toolkit_Members_SearchQueryGenerator // Limit to members who have the amenities that a user // checked off. - if (isset($_GET['amenities']) && !empty($_GET['amenities'])) { - if ( isset($_GET['search_all_amenity']) - && isset($_GET['amenities']) - && is_array($_GET['amenities']) - && !empty($_GET['amenities']) + if (isset($_REQUEST['amenities']) && !empty($_REQUEST['amenities'])) { + if ( isset($_REQUEST['search_all_amenity']) + && isset($_REQUEST['amenities']) + && is_array($_REQUEST['amenities']) + && !empty($_REQUEST['amenities']) ) { // Member must have ALL of the selected amenities. $innerSql = array(); - foreach ($_GET['amenities'] as $k => $v) { + foreach ($_REQUEST['amenities'] as $k => $v) { if (ctype_digit((string)$k)) { $innerSql[] = " SELECT member_id @@ -386,9 +386,9 @@ class Toolkit_Members_SearchQueryGenerator $innerSql = "m.member_id in ($innerSql)"; $params[] = $innerSql; - } elseif (is_array($_GET['amenities'])) { + } elseif (is_array($_REQUEST['amenities'])) { $addParam = true; - foreach ($_GET['amenities'] as $key => $value) { + foreach ($_REQUEST['amenities'] as $key => $value) { if (!filter_var($key, FILTER_VALIDATE_INT)) { $addParam = false; } @@ -399,7 +399,7 @@ class Toolkit_Members_SearchQueryGenerator member_id in ( SELECT member_id FROM member_amenity - WHERE amenity_id in(".implode(', ', array_keys($_GET['amenities']))."))"; + WHERE amenity_id in(".implode(', ', array_keys($_REQUEST['amenities']))."))"; } } } diff --git a/Toolkit/Members/UserSearchForm.php b/Toolkit/Members/UserSearchForm.php index 501b7d6..42de817 100644 --- a/Toolkit/Members/UserSearchForm.php +++ b/Toolkit/Members/UserSearchForm.php @@ -579,7 +579,10 @@ class Toolkit_Members_UserSearchForm $counties = $this->getCounties(); $page = new stdClass(); - $page->formURL = BASE_URL . 'index.php?catid=' . $this->_catid; + $page->formURL + = BASE_URL + . 'index.php?_qf__SearchForm=&catid=' . $this->_catid + . '&search=1'; $page->activities = (!empty($activity) && count($activity) > 1) ? $activity diff --git a/Toolkit/Members/templates/userSearchForm.html b/Toolkit/Members/templates/userSearchForm.html index 38e946e..3e7df1e 100644 --- a/Toolkit/Members/templates/userSearchForm.html +++ b/Toolkit/Members/templates/userSearchForm.html @@ -171,8 +171,10 @@ flexy:ignore="yes" action="{formURL:h}" id="trail-form-name" - method="post"> + method="get"> + +
Search by Name:
@@ -192,8 +194,10 @@ flexy:ignore="yes" action="{formURL:h}" id="trail-form-ap" - method="post"> + method="get"> + +
Search by Activities & Parks:
@@ -230,8 +234,10 @@ flexy:ignore="yes" action="{formURL:h}" id="trail-form-rc" - method="post"> + method="get"> + +
Search by Regions & Counties:
@@ -268,8 +274,10 @@ flexy:ignore="yes" action="{formURL:h}" id="trail-form-am" - method="post"> + method="get"> + + '; diff --git a/Toolkit/Template/Page/Member.php b/Toolkit/Template/Page/Member.php index bf965b7..a2d0397 100644 --- a/Toolkit/Template/Page/Member.php +++ b/Toolkit/Template/Page/Member.php @@ -371,10 +371,8 @@ class Toolkit_Template_Page_Member extends Toolkit_Template_Page_Toolbox } elseif (filter_var($_REQUEST['search'], FILTER_VALIDATE_INT)) { $breadCrumbs = $breadCrumbsBuilder->toHtml($this->id); $searchResults = $this->_getMemberSearchResults($this->id); - $searchForm = $this->_getMemberSearchForm($this->id); return $breadCrumbs . - $searchForm . $searchResults; } else { $breadCrumbs = $breadCrumbsBuilder->toHtml($this->id);