update for regions

make sure that only regions that have members
go into the select field

diff --git a/Toolkit/Members/UserSearchForm.php b/Toolkit/Members/UserSearchForm.php
index e7589e7..39f6a63 100644 (file)
--- a/Toolkit/Members/UserSearchForm.php
+++ b/Toolkit/Members/UserSearchForm.php
@@ -581,7 +581,8 @@ class Toolkit_Members_UserSearchForm
         $activity  = $this->getActivities();
         $amenities = $this->getMemberAmenities($this->dbh);
         $parks     = $this->getParks();
-        $regions   = $this->memberRegionsAssignedToPage;
+        $regions   = $this->getAvailableRegions($this->dbh);
+//        $regions   = $this->memberRegionsAssignedToPage;
         $counties  = $this->getCounties();
 
         $page             = new stdClass();
@@ -779,32 +780,52 @@ class Toolkit_Members_UserSearchForm
        public function setPageMemberRegions(
                Toolkit_Toolbox_GatewayAbstract $gateway
        ) {
-           $page = $gateway->find($this->_catid);
-               $memberRegionsAssignedToPage = array() + $page['member_regions'];
+        $page                           = $gateway->find($this->_catid);
+               $this->memberRegionsAssignedToPage = $page['member_regions'];
+
                // If no regions specified then use all regions
         if (count($this->memberRegionsAssignedToPage) == 0) {
             $sql .= "
-            SELECT DISTINCT region
-              FROM member
-             WHERE active
-               AND region is not null;";
+                       SELECT DISTINCT region
+                         FROM member
+                        WHERE active
+                          AND region is not null;";
             $stmt = $this->dbh->prepare($sql);
             $stmt->execute();
             while ($row = $stmt->fetch()) {
-                $memberRegionsAssignedToPage[] = $row['region'];
+                $this->memberRegionsAssignedToPage[] = $row['region'];
             }
+            $page['member_regions'] = $this->memberRegionsAssignedToPage;
         }
-        $sql = "
-        SELECT region_name
-          FROM region
-         WHERE region_id = :id";
-        $getRegionName = $this->dbh->prepare($sql);
-        foreach ($memberRegionsAssignedToPage as $region) {
-            $getRegionName->bindParam(':id', $region, PDO::PARAM_INT);
-            $getRegionName->execute();
-            $this->memberRegionsAssignedToPage[$region]
-                = $getRegionName->fetchColumn();
-        }
+
+               return $page['member_regions'];
+
+//         $page = $gateway->find($this->_catid);
+//             $memberRegionsAssignedToPage = array() + $page['member_regions'];
+//             // If no regions specified then use all regions
+//        if (count($this->memberRegionsAssignedToPage) == 0) {
+//            $sql .= "
+//            SELECT DISTINCT region
+//              FROM member
+//             WHERE active
+//               AND region is not null;";
+//            $stmt = $this->dbh->prepare($sql);
+//            $stmt->execute();
+//            while ($row = $stmt->fetch()) {
+//                $memberRegionsAssignedToPage[] = $row['region'];
+//            }
+//        }
+//        $sql = "
+//        SELECT region_name
+//          FROM region
+//         WHERE region_id = :id";
+//        $getRegionName = $this->dbh->prepare($sql);
+//        foreach ($memberRegionsAssignedToPage as $region) {
+//            $getRegionName->bindParam(':id', $region, PDO::PARAM_INT);
+//            $getRegionName->execute();
+//            $this->memberRegionsAssignedToPage[$region]
+//                = $getRegionName->fetchColumn();
+//        }
        }
 
        //      }}}