From 9273a135ce349761747dbbbf5ea3219089fc84af Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 24 Jul 2018 07:56:41 -0400
Subject: [PATCH] Renaming the view file for contact custom fields.

This was the same name as one in the members plugin so the members
plugin one was loaded. Changing the name of the view file to correct
this.
---
 models/admin/management/contacts.php          |  2 +-
 views/admin/management/contacts.html          | 48 +++++++++----------
 .../{custom.html => customFields.html}        |  0
 3 files changed, 25 insertions(+), 25 deletions(-)
 rename views/admin/management/{custom.html => customFields.html} (100%)

diff --git a/models/admin/management/contacts.php b/models/admin/management/contacts.php
index ea32539..007c9c4 100644
--- a/models/admin/management/contacts.php
+++ b/models/admin/management/contacts.php
@@ -441,7 +441,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                 break;
 
             case 'customfields':
-                $requestedView = 'custom.html';
+                $requestedView = 'customFields.html';
                 $content = apply_filters( 'glm-members-customfields-edit', '', GLM_MEMBERS_CONTACTS_PLUGIN_SLUG );
                 $thisOption = $option;
                 break;
diff --git a/views/admin/management/contacts.html b/views/admin/management/contacts.html
index 5435e55..bd52c1a 100644
--- a/views/admin/management/contacts.html
+++ b/views/admin/management/contacts.html
@@ -16,12 +16,12 @@
         <tr><th>Number of contacts from supplied CSV file:</th><td>{$importResult.numbContacts}</td></tr>
         <tr><th>Number of contacts Updated:</th><td>{$importResult.numbContactsUpdated}</td></tr>
         <tr><th>Number of contacts with WordPress users Updated:</th><td>{$importResult.numbWpUserUpdated}</td></tr>
-    {else}        
+    {else}
         <tr><th>Number of contacts from old database:</th><td>{$importResult.numbContacts}</td></tr>
     {/if}
         <tr><th>Number of contacts imported:</th><td>{$importResult.numbImported}</td></tr>
         <tr><th>Number of contacts with WordPress users created:</th><td>{$importResult.numbWpUsersCreated}</td></tr>
-    </table>    
+    </table>
     <a href="{$thisUrl}?page={$thisPage}&glm_action=contacts">Return to Import Events</a>
 {else}
 
@@ -29,9 +29,9 @@
         <input type="hidden" name="page" value="{$thisPage}">
         <input type="hidden" name="glm_action" value="contacts">
         <input type="hidden" name="option" value="clearContacts">
-    
+
         <h2>&nbsp;</th><th>Clear All Contacts</h2>
-    
+
         <table id="glm-table-contactImport" class="glm-admin-table glm-settings-table">
             <tr>
                 <th>Clear Contacts:</th>
@@ -52,18 +52,18 @@
                 <td><input type="submit" value="CLick Here to clear ALL contacts"></td>
             </tr>
         </table>
-        
+
     </form>
 
     <p>&nbsp;</p>
-    
+
     <h2>&nbsp;</th><th>Import from Gaslight Media Legacy Database</h2>
 
     <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="page" value="{$thisPage}">
         <input type="hidden" name="glm_action" value="contacts">
         <input type="hidden" name="option" value="doDbImport">
-    
+
         <table id="glm-table-contactImport" class="glm-admin-table glm-settings-table">
             <tr><th>&nbsp;</th><td>Please provide information on the database from which you will be importing data.</td></tr>
             <tr>
@@ -91,25 +91,25 @@
                 <td><input type="submit" value="Import Contacts"></td>
             </tr>
         </table>
-        
+
     </form>
-    
+
     <p>&nbsp;</p>
-    
+
     <h2>&nbsp;</th><th>Import/Update Contacts from CSV File</h2>
 
     <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="page" value="{$thisPage}">
         <input type="hidden" name="glm_action" value="contacts">
         <input type="hidden" name="option" value="doCsvImport">
-    
+
         <table id="glm-table-contactImport" class="glm-admin-table glm-settings-table">
             <tr>
                 <th>&nbsp;</th>
                 <td>
                     <p>
                         <b>File format must be as follows.</b><br>
-                        * Data must follow this header line.<br> 
+                        * Data must follow this header line.<br>
                         * Anything above this line is ignored.<br>
                         * Any line without at least this number of fields is ignored.<br>
                         * Any line with a non-numeric "member_id" is ignored.<br>
@@ -126,11 +126,11 @@
                 <td><input type="submit" value="Import Contacts"></td>
             </tr>
         </table>
-        
+
     </form>
-    
-    
-{/if}        
+
+
+{/if}
 
 {if $importResult.exceptionTable}
     <div style="border: 1px black solid; padding: 1em; margin-top: 2em;">
@@ -144,9 +144,9 @@
 {/if}
 
     <script type="text/javascript">
-        
+
         jQuery(document).ready(function($) {
-            
+
             /*
              * Edit area tabs
              */
@@ -155,21 +155,21 @@
                 // Clear tabl highlights and hide all tables
                 $('.glm-settings-tab').removeClass('nav-tab-active');
                 $('.glm-settings-table').addClass('glm-hidden');
-                
+
                 // Highlight selected tab
                 $(this).addClass('nav-tab-active');
-                
+
                 // Show selected table
                 var table = $(this).attr('data-show-table');
                 $('#' + table).removeClass('glm-hidden');
-                                
+
             });
 
-            // Flash certain elements for a short time after display      
+            // Flash certain elements for a short time after display
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
-                    
+
         });
     </script>
 
 {include file='admin/footer.html'}
-    
\ No newline at end of file
+
diff --git a/views/admin/management/custom.html b/views/admin/management/customFields.html
similarity index 100%
rename from views/admin/management/custom.html
rename to views/admin/management/customFields.html
-- 
2.17.1