c'est la merde..working

1 files changed, 29 insertions, 84 deletions

diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 1e988feab..11c9ca493 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -5,7 +5,7 @@
  | program/steps/addressbook/export.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
  | Copyright (C) 2011, Kolab Systems AG                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -21,46 +21,6 @@
  +-----------------------------------------------------------------------+
 */
 
-
-/**
- * Copy contact record properties into a vcard object
- */
-function prepare_for_export(&$record, $source = null)
-{
-    $groups = $source && $source->groups && $source->export_groups ? $source->get_record_groups($record['ID']) : null;
-
-    if (empty($record['vcard'])) {
-        $vcard = new rcube_vcard();
-        if ($source) {
-            $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));
-                }
-            }
-        }
-
-        // append group names
-        if ($groups) {
-            $vcard->set('groups', join(',', $groups), null);
-        }
-
-        $record['vcard'] = $vcard->export(true);
-    }
-    // patch categories to alread existing vcard block
-    else if ($record['vcard'] && !empty($groups) && !strpos($record['vcard'], 'CATEGORIES:')) {
-        $vgroups = 'CATEGORIES:' . rcube_vcard::vcard_quote(join(',', $groups));
-        $record['vcard'] = str_replace('END:VCARD', $vgroups . rcube_vcard::$eol . 'END:VCARD', $record['vcard']);
-    }
-}
-
-
 // Use search result
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
 {
@@ -80,15 +40,11 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
         // get records
         $result = $source->list_records();
 
-        while ($record = $result->next()) {
-            // because vcard_map is per-source we need to create vcard here
-            prepare_for_export($record, $source);
-
-            $record['sourceid'] = $s;
-            $key = rcube_addressbook::compose_contact_key($record, $sort_col);
-            $records[$key] = $record;
+        while ($row = $result->next()) {
+            $row['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
+            $records[$key] = $row;
         }
-
         unset($result);
     }
 
@@ -100,35 +56,6 @@ 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
-            prepare_for_export($record, $source);
-
-            $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);
@@ -141,15 +68,33 @@ else {
 
 // send downlaod headers
 header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
-header('Content-Disposition: attachment; filename="contacts.vcf"');
+header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
 
 while ($result && ($row = $result->next())) {
-    prepare_for_export($row, $CONTACTS);
+    // we already have a vcard record
+    if ($row['vcard'] && $row['name']) {
+        // 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
+    else {
+        $vcard = new rcube_vcard();
+        $vcard->extend_fieldmap($CONTACTS->vcard_map);
+        $vcard->load($row['vcard']);
+        $vcard->reset();
+
+        foreach ($row 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));
+            }
+        }
 
-    // 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;
+        echo $vcard->export(true) . rcube_vcard::$eol;
+    }
 }
 
 exit;