From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 22 Oct 2019 14:35:59 +0000 (-0400)
Subject: Code Improvements.
X-Git-Tag: v1.1.15^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=6bffd9bb351431c540f73598f8248b84e980bc15;p=WP-Plugins%2Fglm-member-db-contacts.git

Code Improvements.

Deal with php notices because of misspelled or not initialized variables
names.
---

diff --git a/models/admin/ajax/contactsListExport.php b/models/admin/ajax/contactsListExport.php
index e27d2f8..771166a 100644
--- a/models/admin/ajax/contactsListExport.php
+++ b/models/admin/ajax/contactsListExport.php
@@ -81,21 +81,25 @@ class GlmMembersAdmin_ajax_contactsListExport extends GlmDataContacts
         // When processing member info records, also get primary contact data
         $this->postProcessPrimaryContact = true;
 
-        $where          = ' true ';
-        $haveMembers    = false;
-        $list           = false;
-        $success        = false;
-        $haveFilter     = false;
-        $numbDisplayed  = false;
-        $lastDisplayed  = false;
-        $paging         = true;
-        $prevStart      = false;
-        $nextStart      = false;
-        $start          = 1;
-        $limit          = 20;        // Set to the number of listings per page
-        $namesList      = false;
-        $CFSelect       = false;
-        $CFHeaders      = false;
+        $where             = ' true ';
+        $haveMembers       = false;
+        $list              = false;
+        $success           = false;
+        $haveFilter        = false;
+        $numbDisplayed     = false;
+        $lastDisplayed     = false;
+        $paging            = true;
+        $prevStart         = false;
+        $nextStart         = false;
+        $start             = 1;
+        $limit             = 20;        // Set to the number of listings per page
+        $namesList         = false;
+        $CFSelect          = false;
+        $CFHeaders         = false;
+        $categories        = false;
+        $filterArchived    = false;
+        $filterPending     = false;
+        $filterMemberTypes = false;
 
         // Check selected fields
         $select = array(
diff --git a/views/admin/ajax/contactsListExport.html b/views/admin/ajax/contactsListExport.html
index 69d4072..ef1c55b 100644
--- a/views/admin/ajax/contactsListExport.html
+++ b/views/admin/ajax/contactsListExport.html
@@ -35,8 +35,8 @@
                 </tr>
             </thead>
             <tbody>
-    {if $haveMembers}
-        {foreach $contacts as $m}
+                {if $haveMembers}
+                    {foreach $contacts as $m}
                 <tr>
                     {if $select.exportId}<td>{$m.id}</td>{/if}
                     {if $select.exportFname}<td>{$m.fname}</td>{/if}
@@ -45,15 +45,15 @@
                     {if $select.exportAddr2}<td>{$m.addr2}</td>{/if}
                     {if $select.exportCity}<td>{$m.city}</td>{/if}
                     {if $select.exportCounty}<td>{$m.county}</td>{/if}
-                    {if $select.exportState}<td>{if $m.state}{$m.state.value}{/if}</td>{/if}
+                    {if $select.exportState}<td>{$m.state.value|default:''}</td>{/if}
                     {if $select.exportZip}<td>{$m.zip}</td>{/if}
-                    {if $select.exportCountry}<td>{if $m.country.value}{$m.country.value}{/if}</td>{/if}
+                    {if $select.exportCountry}<td>{$m.country.value|default:''}</td>{/if}
                     {if $select.exportOrg}<td>{$m.org}</td>{/if}
                     {if $select.exportTitle}<td>{$m.title}</td>{/if}
                     {if $select.exportOfficePhone}<td>{$m.office_phone}</td>{/if}
                     {if $select.exportHomePhone}<td>{$m.home_phone}</td>{/if}
                     {if $select.exportMobilePhone}<td>{$m.mobile_phone}</td>{/if}
-                    {if $select.exportAltPhone}<td>{$m.alt_phone.value}</td>{/if}
+                    {if $select.exportAltPhone}<td>{$m.alt_phone.value|default:''}</td>{/if}
                     {if $select.exportFax}<td>{$m.fax}</td>{/if}
                     {if $select.exportEmail}<td>{$m.email}</td>{/if}
                     {if $select.exportAltEmail}<td>{$m.alt_email}</td>{/if}
@@ -61,10 +61,10 @@
                     {if $CFHeaders}{foreach $CFHeaders as $cHead}<td>{$m[$cHead]}</td>{/foreach}{/if}
 
                 </tr>
-        {/foreach}
-    {else}
-                <tr class="alternate"><td colspan="2">(no Contacts listed)</td></tr>
-    {/if}
+                    {/foreach}
+                {else}
+                    <tr class="alternate"><td colspan="2">(no Contacts listed)</td></tr>
+                {/if}
             </tbody>
         </table>
 
diff --git a/views/admin/ajax/contactsListExportCsv.html b/views/admin/ajax/contactsListExportCsv.html
index b6cf197..b423935 100644
--- a/views/admin/ajax/contactsListExportCsv.html
+++ b/views/admin/ajax/contactsListExportCsv.html
@@ -35,7 +35,7 @@
 {if $select.exportOrg}"{$m.org}",{/if}
 {if $select.exportTitle}"{$m.title}",{/if}
 {if $select.exportOfficePhone}"{$m.office_phone}",{/if}
-{if $select.exportHomePhone}"{$m.home_phane}",{/if}
+{if $select.exportHomePhone}"{$m.home_phone}",{/if}
 {if $select.exportMobilePhone}"{$m.mobile_phone}",{/if}
 {if $select.exportAltPhone}"{$m.alt_phone}",{/if}
 {if $select.exportFax}"{$m.fax}",{/if}
diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index 0d53402..58db8e7 100644
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -132,8 +132,6 @@
         <a id="glm-contact-info-profile" data-show-table="glm-table-profile" class="glm-contact-info-tab nav-tab nav-tab-active">Profile Data</a>
         {apply_filters('glm-member-db-custom-fields-nav', '', 'contact-info')}
 
-        <!--{if $contactUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_contact_cap} Profile Update Error</span>{/if}-->
-        <!--{if $errorMessage}<span class="glm-error glm-flash-updated glm-right">{$errorMessage}</span>{/if}-->
         </h2>
 
         <div id="glm-table-custom-fields" class="glm-hidden glm-admin-table glm-table glm-contact-info-table">
@@ -147,7 +145,6 @@
         {/if}
         </div>
             <table id="glm-table-profile" class="glm-admin-table glm-admin-table-outer glm-hidden glm-contact-info-table">
-<!--            <table class="glm-admin-table glm-shrink">-->
                 <tr>
         {if $haveMember}
                     <th>Contact For:</th>
@@ -783,11 +780,11 @@
                 $("#deleteContactDialog").dialog("close");
             });
             $('#deleteContactSubmit').click( function() {
-{if $fromMemberMenu}
+            {if $fromMemberMenu}
                 window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=contacts&member={$memberID}&option=delete&contact={$contactID}");
-{else}
+            {else}
                 window.location.replace("{$thisUrl}?page=glm-members-admin-menu-contacts&glm_action=index&option=delete&contact={$contactID}");
-{/if}
+            {/if}
             });
 
             // Set required status for E-Mail field based on permission settings
@@ -811,7 +808,7 @@
             // 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);
 
-{if $membersList && apply_filters('glm_members_menu_members',true)}
+            {if $membersList && apply_filters('glm_members_menu_members',true)}
             // Action to select a member for the Other Members field
             $('#memberSelect').change( function() {
 
@@ -840,7 +837,7 @@
                 $('#memberSelect').val('');
 
             });
-{/if}
+            {/if}
 
             // Action to de-select a member from the Other Members filed
             $('.membDelete').live('click', function() {