Changeset 9336ba2 in github

Timestamp:

Apr 12, 2012 7:52:09 AM (13 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

373e3df

Parents:

28391b4

Message:

• Fix importing to LDAP addressbook when mail attribute is required by validating input data with autofix

Location:

program

Files:

• include/rcube_ldap.php (modified) (2 diffs)
• steps/addressbook/import.inc (modified) (2 diffs)

program/include/rcube_ldap.php

@@ -994 +994 @@
             // try to complete record automatically
             if ($autofix) {
+                $sn_field    = $this->fieldmap['surname'];
+                $fn_field    = $this->fieldmap['firstname'];
+                $mail_field  = $this->fieldmap['email'];
+
+                // try to extract surname and firstname from displayname
                 $reverse_map = array_flip($this->fieldmap);
                 $name_parts  = preg_split('/[\s,.]+/', $save_data['name']);
-                $sn_field    = $this->fieldmap['surname'];
-                $fn_field    = $this->fieldmap['firstname'];
 
                 if ($sn_field && $missing[$sn_field]) {
@@ -1007 +1010 @@
                     $save_data['firstname'] = array_shift($name_parts);
                     unset($missing[$fn_field]);
+                }
+
+                // try to fix missing e-mail, very often on import
+                // from vCard we have email:other only defined
+                if ($mail_field && $missing[$mail_field]) {
+                    $emails = $this->get_col_values('email', $save_data, true);
+                    if (!empty($emails) && ($email = array_shift($emails))) {
+                        $save_data['email'] = $email;
+                        unset($missing[$mail_field]);
+                    }
                 }
             }

program/steps/addressbook/import.inc

@@ -165 +165 @@
 
     foreach ($vcards as $vcard) {
-      $email = $vcard->email[0];
-
-      // skip entries without an e-mail address
-      if (empty($email)) {
+      $email    = $vcard->email[0];
+      $a_record = $vcard->get_assoc();
+
+      // skip entries without an e-mail address or invalid
+      if (empty($email) || !$CONTACTS->validate($a_record, true)) {
         $IMPORT_STATS->nomail++;
         continue;
@@ -189 +190 @@
       }
 
-      $a_record = $vcard->get_assoc();
       $a_record['vcard'] = $vcard->export();