Redo the featured method for date range search.

Need to have the featured events filtered by the date range also.

diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php
index 851e5de..3723bd7 100644 (file)
--- a/models/front/events/baseAction.php
+++ b/models/front/events/baseAction.php
@@ -159,11 +159,21 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
     public function getFeaturedEventsData( $featured )
     {
         $this->postAddTimes = true;
+        $where_parts = array();
         if ( $featured ) {
-            $where .= "T.featured = 1";
+            $where_parts[] = "T.featured = 1";
         } else {
             //$where .= "T.featured = 0";
         }
+        $where_parts[] = "T.status = " . $this->config['status_numb']['Active'] . "
+            AND T.id IN (
+                    SELECT event
+                      FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times AS ET
+                     WHERE active
+                       AND " . $this->dateRange . "
+                )
+            ";
+        $where = implode( ' AND ', $where_parts );
         $events = $this->getList( $where );
         $this->postAddTimes = false;
         return $events;
@@ -220,12 +230,8 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
      * @return string
      * @access public
      */
-    function getEventDate(
-        $sdate,
-        $edate,
-        $dateType,
-        $microFormat = false
-    ) {
+    function getEventDate( $sdate, $edate, $dateType, $microFormat = false )
+    {
         switch($dateType) {
             case "Postgres":
             $postgresPattern = "/([0-9]{1,2})[/-]([0-9]{1,2})[/-]([0-9]{4})/";