1 files changed, 73 insertions, 6 deletions

diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 850795c85..761f26b75 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -40,11 +40,31 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
         // get records
         $result = $source->list_records();
 
-        while ($row = $result->next()) {
-            $row['sourceid'] = $s;
-            $key = rcmail_contact_key($row, $sort_col);
-            $records[$key] = $row;
+        while ($record = $result->next()) {
+            // because vcard_map is per-source we need to create vcard here
+            if (empty($record['vcard']) || empty($record['name'])) {
+                $vcard = new rcube_vcard();
+                $vcard->extend_fieldmap($source->vcard_map);
+                $vcard->load($record['vcard']);
+                $vcard->reset();
+
+                foreach ($record as $key => $values) {
+                    list($field, $section) = explode(':', $key);
+                    foreach ((array)$values as $value) {
+                        if (is_array($value) || @strlen($value)) {
+                            $vcard->set($field, $value, strtoupper($section));
+                        }
+                    }
+                }
+
+                $record['vcard'] = $vcard->export(true);
+            }
+
+            $record['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($record, $sort_col);
+            $records[$key] = $record;
         }
+
         unset($result);
     }
 
@@ -56,6 +76,51 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
     $result = new rcube_result_set($count);
     $result->records = array_values($records);
 }
+// selected contacts
+else if (!empty($_REQUEST['_cid'])) {
+    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
+    $records  = array();
+
+    // Selected contact IDs (with multi-source support)
+    $cids = rcmail_get_cids();
+
+    foreach ($cids as $s => $ids) {
+        $source = $RCMAIL->get_address_book($s);
+        $result = $source->search('ID', $ids, 1, true, true);
+
+        while ($record = $result->next()) {
+            // because vcard_map is per-source we need to create vcard here
+            if (empty($record['vcard']) || empty($record['name'])) {
+                $vcard = new rcube_vcard();
+                $vcard->extend_fieldmap($source->vcard_map);
+                $vcard->load($record['vcard']);
+                $vcard->reset();
+
+                foreach ($record as $key => $values) {
+                    list($field, $section) = explode(':', $key);
+                    foreach ((array)$values as $value) {
+                        if (is_array($value) || @strlen($value)) {
+                            $vcard->set($field, $value, strtoupper($section));
+                        }
+                    }
+                }
+
+                $record['vcard'] = $vcard->export(true);
+            }
+
+            $record['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($record, $sort_col);
+            $records[$key] = $record;
+        }
+    }
+
+    ksort($records, SORT_LOCALE_STRING);
+
+    // create resultset object
+    $count  = count($records);
+    $result = new rcube_result_set($count);
+    $result->records = array_values($records);
+}
 // selected directory/group
 else {
     $CONTACTS = rcmail_contact_source(null, true);
@@ -68,12 +133,14 @@ else {
 
 // send downlaod headers
 header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
-header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
+header('Content-Disposition: attachment; filename="contacts.vcf"');
 
 while ($result && ($row = $result->next())) {
     // we already have a vcard record
     if ($row['vcard'] && $row['name']) {
-        $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
+        // fix folding and end-of-line chars
+        $row['vcard'] = preg_replace('/\r|\n\s+/', '', $row['vcard']);
+        $row['vcard'] = preg_replace('/\n/', rcube_vcard::$eol, $row['vcard']);
         echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
     }
     // copy values into vcard object