- Added searching in all addressbook sources (global-search)

- Added addressbook source selection in contacts import

1 files changed, 63 insertions, 22 deletions

diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index bfe8e996c..04b98a308 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -6,6 +6,7 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2011, Kolab Systems AG                                  |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -13,16 +14,56 @@
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
  +-----------------------------------------------------------------------+
 
- $Id:  $
+ $Id$
 
 */
 
-// get contacts for this user
-$CONTACTS->set_page(1);
-$CONTACTS->set_pagesize(99999);
-$result = $CONTACTS->list_records(null, 0, true);
+// Use search result
+if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
+{
+    $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
+    $records = array();
+
+    // Get records from all sources
+    foreach ($search as $s => $set) {
+        $source = $RCMAIL->get_address_book($s);
+
+        // reset page
+        $source->set_page(1);
+        $source->set_pagesize(99999);
+        $source->set_search_set($set);
+
+        // get records
+        $result = $source->list_records();
+
+        while ($row = $result->next()) {
+            $row['sourceid'] = $s;
+            $key = $row['name'] . ':' . $row['sourceid'];
+            $records[$key] = $row;
+        }
+        unset($result);
+    }
+
+    // sort the records
+    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);
+
+    // get contacts for this user
+    $CONTACTS->set_page(1);
+    $CONTACTS->set_pagesize(99999);
+    $result = $CONTACTS->list_records(null, 0, true);
+}
 
 // send downlaod headers
 send_nocacheing_headers();
@@ -30,25 +71,25 @@ header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
 header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
 
 while ($result && ($row = $result->next())) {
-  // we already have a vcard record
-  if ($row['vcard'] && $row['name']) {
-    echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n";
-  }
-  // copy values into vcard object
-  else {
-    $vcard = new rcube_vcard($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));
-      }
+    // we already have a vcard record
+    if ($row['vcard'] && $row['name']) {
+        echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n";
     }
+    // copy values into vcard object
+    else {
+        $vcard = new rcube_vcard($row['vcard']);
+        $vcard->reset();
 
-    echo $vcard->export(true) . "\n";
-  }
+        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));
+            }
+        }
+
+        echo $vcard->export(true) . "\n";
+    }
 }
 
 exit;
-