- Add vCard import from multiple files at once (#1488015)

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add vCard import from multiple files at once (#1488015)
 - Roundcube Framework:
     Add possibility to replace IMAP driver with custom class
     Add IMAP auto-connection feature, improving performance with caching enabled

program/steps/addressbook/import.inc

@@ -35,7 +35,13 @@ function rcmail_import_form($attrib)
 
   $writable_books = $RCMAIL->get_address_sources(true);
 
-  $upload = new html_inputfield(array('type' => 'file', 'name' => '_file', 'id' => 'rcmimportfile', 'size' => 40));
+  $upload = new html_inputfield(array(
+    'type' => 'file',
+    'name' => '_file[]',
+    'id' => 'rcmimportfile',
+    'size' => 40,
+    'multiple' => 'multiple',
+  ));
   $form = html::p(null, html::label('rcmimportfile', rcube_label('importfromfile')) . $upload->show());
 
   // addressbook selector
@@ -135,23 +141,51 @@ function rcmail_import_buttons($attrib)
 
 $importstep = 'rcmail_import_form';
 
-if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'])) {
+if (is_array($_FILES['_file'])) {
     $replace  = (bool)get_input_value('_replace', RCUBE_INPUT_GPC);
     $target   = get_input_value('_target', RCUBE_INPUT_GPC);
+
+    $vcards       = array();
+    $upload_error = null;
+
     $CONTACTS = $RCMAIL->get_address_book($target, true);
 
+    if ($CONTACTS->readonly) {
+        $OUTPUT->show_message('addresswriterror', 'error');
+    }
+    else {
+        foreach ((array)$_FILES['_file']['tmp_name'] as $i => $filepath) {
+            // Process uploaded file if there is no error
+            $err = $_FILES['_file']['error'][$i];
+
+            if ($err) {
+                $upload_error = $err;
+            }
+            else {
                 // let rcube_vcard do the hard work :-)
                 $vcard_o = new rcube_vcard();
                 $vcard_o->extend_fieldmap($CONTACTS->vcard_map);
 
-  $vcards = $vcard_o->import(file_get_contents($_FILES['_file']['tmp_name']));
+                $v_list = $vcard_o->import(file_get_contents($filepath));
+
+                if (!empty($v_list)) {
+                    $vcards = array_merge($vcards, $v_list);
+                }
+            }
+        }
+    }
 
     // no vcards detected
     if (!count($vcards)) {
+        if ($upload_error == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+            $OUTPUT->show_message('filesizeerror', 'error', array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize')))));
+        }
+        else if ($upload_error) {
+            $OUTPUT->show_message('fileuploaderror', 'error');
+        }
+        else {
             $OUTPUT->show_message('importerror', 'error');
         }
-  else if ($CONTACTS->readonly) {
-    $OUTPUT->show_message('addresswriterror', 'error');
     }
     else {
         $IMPORT_STATS = new stdClass;
@@ -160,8 +194,9 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'
         $IMPORT_STATS->count = count($vcards);
         $IMPORT_STATS->inserted = $IMPORT_STATS->skipped = $IMPORT_STATS->nomail = $IMPORT_STATS->errors = 0;
 
-    if ($replace)
+        if ($replace) {
             $CONTACTS->delete_all();
+        }
 
         foreach ($vcards as $vcard) {
             $email    = $vcard->email[0];
@@ -191,7 +226,8 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'
 
             $a_record['vcard'] = $vcard->export();
 
-      $plugin = $RCMAIL->plugins->exec_hook('contact_create', array('record' => $a_record, 'source' => null));
+            $plugin = $RCMAIL->plugins->exec_hook('contact_create',
+                array('record' => $a_record, 'source' => null));
             $a_record = $plugin['record'];
 
             // insert record and send response
@@ -203,7 +239,8 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'
             if ($success) {
                 $IMPORT_STATS->inserted++;
                 $IMPORT_STATS->names[] = $vcard->displayname ? $vcard->displayname : $email;
-      } else {
+            }
+            else {
                 $IMPORT_STATS->errors++;
             }
         }
@@ -211,13 +248,6 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'
         $importstep = 'rcmail_import_confirm';
     }
 }
-else if ($err = $_FILES['_file']['error']) {
-  if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-    $OUTPUT->show_message('filesizeerror', 'error', array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize')))));
-  } else {
-    $OUTPUT->show_message('fileuploaderror', 'error');
-  }
-}
 
 
 $OUTPUT->set_pagetitle(rcube_label('importcontacts'));