Changed import to use process_email for contact rather than member_contact_email.

diff --git a/models/admin/management/contacts.php b/models/admin/management/contacts.php
index 76b0997..195c964 100644 (file)
--- a/models/admin/management/contacts.php
+++ b/models/admin/management/contacts.php
@@ -246,7 +246,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
      * Header line as follows. Data follows immediately below this line. this
      * line and all above it are ignored.
      *
-     *  'member_id','member_name','member_login','member_passwd','member_contact_email'
+     *  'member_id','member_name','member_login','member_passwd','contact_email'
      *
      * @param string $csv Temporary file name of csv file upload
      *
@@ -478,7 +478,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
 
         // Get list of contacts from specified database table
         $sql = "
-            SELECT member_id, member_name, member_login, member_passwd, member_contact_email,
+            SELECT member_id, member_name, member_login, member_passwd, process_email,
                    primary_contact, primary_contact_fname, primary_contact_lname
               FROM members.member
              WHERE member_login != '';
@@ -565,9 +565,9 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                     }
 
                     // Make sure there's no existing contact with the imported E-Mail address (if there is one, don't use that email address)
-                    if ($okToImport && trim($c['member_contact_email']) != '') {
+                    if ($okToImport && trim($c['process_email']) != '') {
 
-                        $matchingContact = $this->getSimplified("email = '".addslashes($c['member_contact_email'])."'");
+                        $matchingContact = $this->getSimplified("email = '".addslashes($c['process_email'])."'");
                         if ($matchingContact) {
 
                             $ret['exceptionTable'][] = array(
@@ -575,20 +575,20 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                                 'data' => $c['member_name']
                                     .", Username = ".$c['member_login']
                                     .", Old member id = ".$c['member_id']
-                                    .", E-Mail address = ".$c['member_contact_email']
+                                    .", E-Mail address = ".$c['process_email']
                                     ."<br>Contact created without an E-Mail address."
                             );
 
-                            $c['member_contact_email'] = '';
+                            $c['process_email'] = '';
                         }
 
                     }
 
                     // If contact has an E-Mail address
-                    if (trim($c['member_contact_email']) != '') {
+                    if (trim($c['process_email']) != '') {
 
                         // Check if there's an existing WordPress user with this E-Mail address and a different username
-                        $contactCheck = $this->checkContact($c['member_contact_email'], $c['member_login']);
+                        $contactCheck = $this->checkContact($c['process_email'], $c['member_login']);
                         if ($contactCheck['wordpressEmail'] && $contactCheck['wordpressLogin']
                             && $contactCheck['wpUserEmail']->ID != $contactCheck['wpUserLogin']->ID) {
 
@@ -623,7 +623,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                                 'lname' => $c['primary_contact_lname'],
                                 'contact_type' => $contactType,
                                 'contact_role' => $contactRoleNumb,
-                                'email' => $c['member_contact_email'],
+                                'email' => $c['process_email'],
                                 'username' => preg_replace('/[^a-zA-Z0-9_-]+/', '', $c['member_login']),
                                 'notes' => 'Imported from old Web site.',
                                 'create_time' => date('Y-m-d H:i:s', time()),
@@ -662,7 +662,7 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
                         } else {
 
                             // Assemble needed user information. We've already verified that they have an E-Mail address.
-                            $userEmail = $c['member_contact_email'];
+                            $userEmail = $c['process_email'];
                             $userLogin = false;
                             if (trim($c['member_login']) != '') {
                                 $userLogin = trim($c['member_login']);