From 69323a93000e7605f535944286f95c8bfa01bb1e Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 8 Aug 2019 13:36:09 -0400
Subject: [PATCH] Update admin email for pending updates

Adding link to pending page.
This will link right to the pending profile edit page.
---
 classes/helper/notification.php    | 12 ++++++++++--
 models/admin/member/memberInfo.php | 16 ++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/classes/helper/notification.php b/classes/helper/notification.php
index 0f54bb6b..b17d4f21 100644
--- a/classes/helper/notification.php
+++ b/classes/helper/notification.php
@@ -175,6 +175,7 @@ class GlmMembersAdmin_member_notification extends GlmDataMembers
      */
     public function sendAdminNotice( $memberId, $profile )
     {
+        // echo '<pre>$profile: ' . print_r( $profile, true ) . '</pre>';
         $member         = $this->getEntry( $memberId );
         $settings       = $this->config['memberNotifications'];
         $notify_to      = $settings['to_email'];
@@ -200,13 +201,20 @@ class GlmMembersAdmin_member_notification extends GlmDataMembers
         // Add standard parameters
         require GLM_MEMBERS_PLUGIN_SETUP_PATH.'/standardTemplateParams.php';
         $viewFile   = 'admin/member/ownerEmail.html';
-        $porfileList = GLM_MEMBERS_PLUGIN_ADMIN_URL . '?page=glm-members-admin-menu-members-list&glm_action=list&filterPending=true';
+        // Build the Admin url for this profile edit page
+        $urlParams = [
+            'page'       => 'glm-members-admin-menu-member',
+            'glm_action' => 'memberInfo',
+            'member'     => $memberId,
+            'memberInfo' => $profile['fieldData']['id'],
+        ];
+        $profileAdmin = GLM_MEMBERS_PLUGIN_ADMIN_URL . '?' . http_build_query( $urlParams );
         $smarty->templateAssign( 'notify_message', $notify_message);
         $smarty->templateAssign( 'location', $this->config['terms']['term_admin_menu_members'] );
         $smarty->templateAssign( 'member', $member );
         $smarty->templateAssign( 'profile', $profile );
         $smarty->templateAssign( 'memberTerm', $this->config['terms']['term_member_cap'] );
-        $smarty->templateAssign( 'pendingList', $porfileList );
+        $smarty->templateAssign( 'pendingList', $profileAdmin );
 
         // Generate output from model data and view
         $htmlMessage = $smarty->template->fetch( $viewFile );
diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php
index f3620992..4a894da9 100755
--- a/models/admin/member/memberInfo.php
+++ b/models/admin/member/memberInfo.php
@@ -371,20 +371,20 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                 $Files = new GlmDataFiles( $this->wpdb, $this->config );
 
                 // Update image gallery titles, descriptions, and image positions then return current image gallery
-                $this->imageGallery = $Images->galleryImageDataUpdate($this->config['ref_type_numb']['MemberInfo'], $this->memberInfoID, 'galleryPositionOrder');
-                $this->haveImageGallery = ($this->imageGallery != false);
+                $this->imageGallery     = $Images->galleryImageDataUpdate( $this->config['ref_type_numb']['MemberInfo'], $this->memberInfoID, 'galleryPositionOrder' );
+                $this->haveImageGallery = ( $this->imageGallery != false );
 
                 // Update file captions, descriptions, and file positions then
                 // return current files data.
                 $this->files     = $Files->filesDataUpdate( $this->config['ref_type_numb']['MemberInfo'], $this->memberInfoID, 'filePositionOrder' );
-                $this->haveFiles = ($this->files != false);
+                $this->haveFiles = ( $this->files != false );
 
-                if ($this->haveMemberInfo) {
+                if ( $this->haveMemberInfo ) {
 
                     // Update the member Info data
-                    $this->memberInfo = $this->updateEntry($this->memberInfoID, 'id', true);
+                    $this->memberInfo = $this->updateEntry( $this->memberInfoID, 'id', true );
 
-                    if ($this->memberInfo['status']) {
+                    if ( $this->memberInfo['status'] ) {
                         // Validate memberID
                         $member_id = filter_var( $this->memberID, FILTER_VALIDATE_INT );
                         // Send Notifications to Admin if user isModerated
@@ -410,10 +410,10 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
 
                         $customFieldResults = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
                         if(is_array($customFieldResults)){
-                            $memberUpdated = false;
+                            $memberUpdated     = false;
                             $memberUpdateError = true;
                         } else {
-                            $memberUpdated = true;
+                            $memberUpdated     = true;
                             $memberUpdateError = false;
                         }
 
-- 
2.17.1