From fb775dbffdece83b3ca32533337c79581b4747fd Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 26 Oct 2017 08:03:43 -0400
Subject: [PATCH] adding fieldFail array to the memberinfo model

fieldfail data is passed from the model to the view which is in turn used by
the fields plugin model when it is called by the controller in the form filter
---
 models/admin/member/memberInfo.php | 19 ++++++++++++-------
 views/admin/member/memberInfo.html |  5 +++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php
index d1952776..0d93e624 100644
--- a/models/admin/member/memberInfo.php
+++ b/models/admin/member/memberInfo.php
@@ -216,6 +216,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
         $memberUpdateError                 = false;
         $categories                        = false;
         $errorMessage                      = false;
+        $customFieldResults                = false;
         $multipleProfileEnabeled           = $this->config['settings']['enable_multiple_profiles'];
 
         // Check for action option - Should be one of the values in the "switch" statement below
@@ -349,9 +350,13 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                     $this->memberInfo = $this->updateEntry($this->memberInfoID, 'id', true);
 
                     if ($this->memberInfo['status']) {
-                        $successfulCustomField = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
-                        echo "Status of save-custom-fields(hardcoded atm): $successfulCustomField";
-                        $memberUpdated = true;
+                        $customFieldResults = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
+//                        echo '<pre>', print_r($this->memberInfo), '</pre>';
+                        if(is_array($customFieldResults)){
+                            $memberUpdated = false;
+                            $memberUpdateError = true;
+                        }
+                        
                     } else {
                         $memberUpdateError = true;
                     }
@@ -359,7 +364,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                 } else {
 
                 }
-
+//                print_r($customFieldResults);
                 glmClearShortcodeCache();
 
                 break;
@@ -395,8 +400,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                     $this->memberInfo = $this->editEntry($this->memberInfoID);
 
                     if ($this->memberInfo['status']) {
-                        $successfulCustomField = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
-                        echo "Status of save-custom-fields(hardcoded atm): $successfulCustomField";
+                        $customFieldResults = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
                         $errorMessage = "Test";
                     }
                 }
@@ -527,7 +531,8 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
             'files'               => $this->files,
             'noActive'            => $this->noActiveInfoRecord(),
             'time'                => time(),
-            'slug'                => GLM_MEMBERS_PLUGIN_SLUG
+            'slug'                => GLM_MEMBERS_PLUGIN_SLUG,
+            'customFieldResults'  => $customFieldResults
         );
 
         // Return status, suggested view, and data to controller
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 528891e3..51bd7ba8 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -130,9 +130,10 @@
       {if $memberInfoID && $memberInfo}
         {$prefix = $slug|cat:'_'}
         {$uid = $prefix|cat:$memberInfoID}
+        
         <div id="glm-table-custom-fields" class="glm-hidden glm-admin-table glm-table glm-member-info-table">
-            {apply_filters('glm-members-custom-fields-form', '', $slug,$memberInfoID)}
-            {apply_filters('glm-members-custom-fields-form', '', $uid,$memberInfoID)}
+            {apply_filters('glm-members-custom-fields-form', '', $slug,$memberInfoID,$customFieldResults)}
+            {apply_filters('glm-members-custom-fields-form', '', $uid,$memberInfoID,$customFieldResults)}
         </div>
       {else}
         {apply_filters('glm-members-custom-fields-form', '', '')}
-- 
2.17.1