From f864495b7b7ab577e3aba5f06b34f92649de4a4b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 1 Dec 2014 14:26:52 +0100
Subject: Fix import of multiple contact email addresses from Outlook-csv
 format (#1490169)

---
 program/lib/Roundcube/rcube_csv2vcard.php | 16 +++++++++++-----
 program/localization/de_DE/csv2vcard.inc  |  2 ++
 program/localization/en_US/csv2vcard.inc  |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'program')

diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index 8eff4d56c..5f6ccd128 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -52,9 +52,9 @@ class rcube_csv2vcard
         'company'               => 'organization',
         //'company_main_phone'    => '',
         'department'            => 'department',
-        //'email_2_address'       => '', //@TODO
+        'email_2_address'       => 'email:other',
         //'email_2_type'          => '',
-        //'email_3_address'       => '', //@TODO
+        'email_3_address'       => 'email:other',
         //'email_3_type'          => '',
         'email_address'         => 'email:pref',
         //'email_type'            => '',
@@ -186,9 +186,9 @@ class rcube_csv2vcard
         //'company_main_phone' => "Company Main Phone",
         'department'        => "Department",
         //'directory_server'  => "Directory Server",
-        //'email_2_address'   => "E-mail 2 Address",
+        'email_2_address'   => "E-mail 2 Address",
         //'email_2_type'      => "E-mail 2 Type",
-        //'email_3_address'   => "E-mail 3 Address",
+        'email_3_address'   => "E-mail 3 Address",
         //'email_3_type'      => "E-mail 3 Type",
         'email_address'     => "E-mail Address",
         //'email_type'        => "E-mail Type",
@@ -554,7 +554,13 @@ class rcube_csv2vcard
         foreach ($this->map as $idx => $name) {
             $value = $data[$idx];
             if ($value !== null && $value !== '') {
-                $contact[$name] = $value;
+                if (!empty($contact[$name])) {
+                    $contact[$name]   = (array) $contact[$name];
+                    $contact[$name][] = $value;
+                }
+                else {
+                   $contact[$name] = $value;
+                }
             }
         }
 
diff --git a/program/localization/de_DE/csv2vcard.inc b/program/localization/de_DE/csv2vcard.inc
index fa3317bab..73341f751 100644
--- a/program/localization/de_DE/csv2vcard.inc
+++ b/program/localization/de_DE/csv2vcard.inc
@@ -33,6 +33,8 @@ $map['categories'] = "Kategorien";
 $map['company'] = "Firma";
 $map['department'] = "Abteilung";
 $map['email_address'] = "E-Mail-Adresse";
+$map['email_2_address'] = "E-Mail 2: Adresse";
+$map['email_3_address'] = "E-Mail 3: Adresse";
 $map['first_name'] = "Vorname";
 $map['gender'] = "Geschlecht";
 $map['home_city'] = "Ort privat";
diff --git a/program/localization/en_US/csv2vcard.inc b/program/localization/en_US/csv2vcard.inc
index e7b86795b..a2a0c3f9d 100644
--- a/program/localization/en_US/csv2vcard.inc
+++ b/program/localization/en_US/csv2vcard.inc
@@ -40,6 +40,8 @@ $map['categories'] = "Categories";
 $map['company'] = "Company";
 $map['department'] = "Department";
 $map['email_address'] = "E-mail Address";
+$map['email_2_address'] = "E-mail 2 Address";
+$map['email_3_address'] = "E-mail 3 Address";
 $map['first_name'] = "First Name";
 $map['gender'] = "Gender";
 $map['home_city'] = "Home City";
-- 
cgit v1.2.3