Fixed the city/county/region dropdown list referencing member ID instead of member...

diff --git a/functions.php b/functions.php
index 66626cf..78f7d53 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -48,19 +48,19 @@ add_filter('glm-member-db-front-search-query', function( $queryParts ) {
         }
     }
      if ( isset( $_REQUEST['cities'] ) && is_array( $_REQUEST['cities'] ) && !empty( $_REQUEST['cities'] ) && $_REQUEST['cities'][0] !== '' ) {
-        $catSelectedForQuery = implode( ',',array_filter( $_REQUEST['cities'] ));
+        $citySelectedForQuery = implode( ',',array_filter( $_REQUEST['cities'] ));
         $queryParts[] = " T.id in (
-                    SELECT DISTINCT(member)
+                    SELECT DISTINCT(id)
                       FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info M
-                     WHERE M.city = $catSelectedForQuery
+                     WHERE M.city = $citySelectedForQuery
             ) ";
     }
      if ( isset( $_REQUEST['counties'] ) && is_array( $_REQUEST['counties'] ) && !empty( $_REQUEST['counties'] ) && $_REQUEST['counties'][0] !== '' ) {
-        $catSelectedForQuery = implode( ',',array_filter( $_REQUEST['counties'] ));
+        $countySelectedForQuery = implode( ',',array_filter( $_REQUEST['counties'] ));
         $queryParts[] = " T.id in (
-                    SELECT DISTINCT(member)
+                    SELECT DISTINCT(id)
                       FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."member_info M
-                     WHERE M.county = $catSelectedForQuery
+                     WHERE M.county = $countySelectedForQuery
             ) ";
     }
     return $queryParts;
@@ -75,23 +75,23 @@ add_filter('glm-member-db-fields-front-list-query-params', function( $query ){
     }
     // This needs to be done for now until it is in the main plugin.
     if ( isset( $_REQUEST['counties'] ) && is_array( $_REQUEST['counties'] ) ) {
-        foreach ( $_REQUEST['counties'] as $cat ) {
-            $queryParams[] = "counties[]={$cat}";
+        foreach ( $_REQUEST['counties'] as $county ) {
+            $queryParams[] = "counties[]={$county}";
         }
     }
      if ( isset( $_REQUEST['cities'] ) && is_array( $_REQUEST['cities'] ) ) {
-        foreach ( $_REQUEST['cities'] as $cat ) {
-            $queryParams[] = "cities[]={$cat}";
+        foreach ( $_REQUEST['cities'] as $city ) {
+            $queryParams[] = "cities[]={$city}";
         }
     }
      if ( isset( $_REQUEST['regionUserSearch'] ) && is_array( $_REQUEST['regionUserSearch'] ) ) {
-        foreach ( $_REQUEST['regionUserSearch'] as $cat ) {
-            $queryParams[] = "regionUserSearch[]={$cat}";
+        foreach ( $_REQUEST['regionUserSearch'] as $region ) {
+            $queryParams[] = "regionUserSearch[]={$region}";
         }
     }
     if ( isset( $_REQUEST['textSearch'] )  ) {
-        $cat = filter_var($_REQUEST['textSearch']);
-        $queryParams[] = "textSearch={$cat}";
+        $textSearch = filter_var($_REQUEST['textSearch']);
+        $queryParams[] = "textSearch={$textSearch}";
     }
     return ( !empty( $queryParams ) ? $query . '&'.implode( '&', $queryParams): $query);
 },10, 1);
@@ -353,7 +353,7 @@ function remove_cat_from_shop_loop( $q ) {
     remove_action( 'pre_get_posts', 'remove_cat_from_shop_loop' );
 
 }
- function get_categories_array($category, $id_field){
+function make_array($category, $id_field){
     $new_array = array();
     foreach($category as $key=>$value){
         $new_array[$value[$id_field]] = $value;
@@ -362,9 +362,9 @@ function remove_cat_from_shop_loop( $q ) {
 }
 
 add_filter('member_list_header_search', function(){
-    $regions = get_categories_array( apply_filters('glm_getListForSearch', 'region'), 'region');
-    $cities = get_categories_array( apply_filters('glm_getListForSearch', 'city'), 'city');
-    $counties = get_categories_array( apply_filters('glm_getListForSearch', 'county'), 'county');
+    $regions = make_array( apply_filters('glm_getListForSearch', 'region'), 'region');
+    $cities = make_array( apply_filters('glm_getListForSearch', 'city'), 'city');
+    $counties = make_array( apply_filters('glm_getListForSearch', 'county'), 'county');
 
     uasort($regions, function ($item1, $item2) {
         if ($item1['name'] == $item2['name']) return 0;
@@ -379,9 +379,9 @@ add_filter('member_list_header_search', function(){
         return $item1['name'] < $item2['name'] ? -1 : 1;
     });
 
-    $parks = get_categories_array( apply_filters('glm_getListForSearch','category', "Parks"), 'category');
-    $activities = get_categories_array( apply_filters('glm_getListForSearch','category', "Activities"), 'category');
-    $destinations = get_categories_array( apply_filters('glm_getListForSearch','category', "Destinations"), 'category');
+    $parks = make_array( apply_filters('glm_getListForSearch','category', "Parks"), 'category');
+    $activities = make_array( apply_filters('glm_getListForSearch','category', "Activities"), 'category');
+    $destinations = make_array( apply_filters('glm_getListForSearch','category', "Destinations"), 'category');
     $search_array = array('regions'=>$regions, 'cities'=>$cities, 'counties'=>$counties, 'activities' => $activities, 'parks' => $parks, 'destinations' => $destinations);
     $search_array = json_encode($search_array);
     return $search_array;