From e315f194542387542915a846e5e4924c69603ccb Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 11 Oct 2016 10:33:58 -0400
Subject: [PATCH] Updating the dashboard model and view

Making this one model and view work for both a member contact logged in
and a member manager.
---
 models/admin/dashboard/leads.php | 50 ++++++++++++++------------------
 setup/adminHooks.php             |  9 ++++++
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/models/admin/dashboard/leads.php b/models/admin/dashboard/leads.php
index 6286368..784901b 100644
--- a/models/admin/dashboard/leads.php
+++ b/models/admin/dashboard/leads.php
@@ -102,41 +102,35 @@ class GlmMembersAdmin_dashboard_leads // extends GlmDataEvents
         $hasLastDownload = false;
         $lastSearchDate  = '';
 
-        // Get list of member events.
-        if ( isset( $this->config['loggedInUser']['contactUser']['ref_dest'] )
-            && $memberID = filter_var( $this->config['loggedInUser']['contactUser']['ref_dest'], FILTER_VALIDATE_INT)
-        ) {
-            // See if this member has a saved search.
-            // If the do not then give message about it.
-            $user_id = $this->config['loggedInUser']['wpUser'];
-            if ( $user_id ) {
-                $last_search = $this->wpdb->get_row(
-                    $this->wpdb->prepare(
-                        "SELECT *
-                           FROM " . GLM_MEMBERS_LEADS_PLUGIN_DB_PREFIX . "searches
-                          WHERE user_id = %d",
-                        $user_id
-                    ),
-                    ARRAY_A
-                );
-                if ( $last_search ) {
-                    $hasLastDownload = true;
-                    $lastSearchDate  = $last_search['date_created'];
-                    //echo '<pre>$last_search: ' . print_r( $last_search, true ) . '</pre>';
-                    $last_search_params = $last_search['search'];
-                    //echo '<pre>$last_search_params: ' . print_r( $last_search_params, true ) . '</pre>';
-                    $search_params = unserialize( $last_search_params );
-                    //echo '<pre>$search_params: ' . print_r( $search_params, true ) . '</pre>';
-                }
+        // See if this member has a saved search.
+        // If the do not then give message about it.
+        $user_id = $this->config['loggedInUser']['wpUser'];
+        if ( $user_id ) {
+            $last_search = $this->wpdb->get_row(
+                $this->wpdb->prepare(
+                    "SELECT *
+                       FROM " . GLM_MEMBERS_LEADS_PLUGIN_DB_PREFIX . "searches
+                      WHERE user_id = %d",
+                    $user_id
+                ),
+                ARRAY_A
+            );
+            if ( $last_search ) {
+                $hasLastDownload = true;
+                $lastSearchDate  = $last_search['date_created'];
+                //echo '<pre>$last_search: ' . print_r( $last_search, true ) . '</pre>';
+                $last_search_params = $last_search['search'];
+                //echo '<pre>$last_search_params: ' . print_r( $last_search_params, true ) . '</pre>';
+                $search_params = unserialize( $last_search_params );
+                //echo '<pre>$search_params: ' . print_r( $search_params, true ) . '</pre>';
             }
-
         }
 
+
         // Compile template data.
         $templateData = array(
             'lastSearchDate'  => $lastSearchDate,
             'hasLastDownload' => $hasLastDownload,
-            'memberID'        => $memberID,
         );
 
         // Return status, suggested view, and data to controller.
diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index 400dad1..20c029e 100644
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -46,3 +46,12 @@ add_filter(
     11,
     1
 );
+add_filter(
+    'glm-member-db-dashboard-member-admin-widgets',
+    function ( $member = null ) {
+        $content = $this->controller( 'dashboard', 'leads', $member );
+        return $content;
+    },
+    11,
+    1
+);
-- 
2.17.1