From a39444974552640c0e0203dbeb9d6a7aa9f639a8 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 3 Nov 2016 08:04:27 -0400
Subject: [PATCH] Adding new field into dataEvents.

This is to get the actual ref id stored in other_ref_dest field.
---
 classes/data/dataEvents.php        | 12 +++++++++---
 models/front/events/baseAction.php |  2 +-
 models/front/events/list.php       |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index e0de2f8..c048930 100644
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -411,6 +411,13 @@ class GlmDataEvents extends GlmDataAbstract
                 'use' => 'a'
             ),
 
+            'other_ref_dest_id' => array(
+                'field' => 'other_ref_dest',
+                'as' => 'other_ref_dest_id',
+                'type' => 'integer',
+                'use' => 'lged'
+            ),
+
             // Admin Reference Type
             'admin_ref_type' => array (
                 'field' => 'admin_ref_type',
@@ -543,12 +550,11 @@ class GlmDataEvents extends GlmDataAbstract
                 $memberData = new GlmDataMemberInfo( $this->wpdb, $this->config );
                 $member = $memberData->getActiveInfoForMember((int)$r['ref_dest_id']);
                 $r['member'] = $member;
-            } else if ( $r['other_ref_dest'] ) {
+            } else if ( $r['other_ref_dest_id'] ) {
                 // get member id from the name
-                $memberId = get_member_id_by_name( $r['other_ref_dest'], '');
                 include_once  GLM_MEMBERS_PLUGIN_CLASS_PATH . '/data/dataMemberInfo.php';
                 $memberData = new GlmDataMemberInfo( $this->wpdb, $this->config );
-                $member = $memberData->getActiveInfoForMember( (int)$memberId );
+                $member = $memberData->getActiveInfoForMember( (int)$r['other_ref_dest_id'] );
                 $r['member'] = $member;
             } else {
                 include_once  GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataLocations.php';
diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php
index 3fb764d..2c6f6a4 100644
--- a/models/front/events/baseAction.php
+++ b/models/front/events/baseAction.php
@@ -133,7 +133,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
 
         $this->postAddTimes = true;
         $whereParts = array();
-        $where = '';
+        $where = $order = '';
 
         if ($memberId = filter_var( $memberId, FILTER_VALIDATE_INT )) {
             $whereParts[] = "T.ref_type = ".$this->config['ref_type_numb']['Member']." and T.ref_dest = $memberId ";
diff --git a/models/front/events/list.php b/models/front/events/list.php
index fb6e47e..7f3935c 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -714,7 +714,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     SELECT event
                       FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times
                      WHERE DATE(start_time) >= %s)";
-        return $this->wpdb->get_var( $this->wpdb->prepare( $sql, $from, $to ) );
+        return $this->wpdb->get_var( $this->wpdb->prepare( $sql, $from ) );
     }
     /**
      * getEventCountForWeekRange
-- 
2.17.1