Fix import of multiple contact groups from Google-csv format (#1490159)

CHANGELOG

@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Fix drag-n-drop to folders expanded while dragging (#1490157)
+- Fix import of multiple contact groups from Google-csv format (#1490159)
 
 RELEASE 1.1-beta
 ----------------

program/lib/Roundcube/rcube_csv2vcard.php

@@ -584,11 +584,14 @@ class rcube_csv2vcard
 
         if (!empty($contact['groups'])) {
             // categories/groups separator in vCard is ',' not ';'
+            $contact['groups'] = str_replace(',', '', $contact['groups']);
             $contact['groups'] = str_replace(';', ',', $contact['groups']);
 
-            // remove "* " added by GMail
             if (!empty($this->gmail_map)) {
+                // remove "* " added by GMail
                 $contact['groups'] = str_replace('* ', '', $contact['groups']);
+                // replace strange delimiter
+                $contact['groups'] = str_replace(' ::: ', ',', $contact['groups']);
             }
         }
 

tests/src/Csv2vcard/gmail.vcf

@@ -5,7 +5,7 @@ N:Lastname;Firstname;Middle;Prefix;Suffix
 NICKNAME:nick
 BDAY;VALUE=date:1975-12-12
 NOTE:note"note
-CATEGORIES:My Contacts
+CATEGORIES:My Contacts,Test
 EMAIL;TYPE=INTERNET;TYPE=HOME:home@aaa.pl
 EMAIL;TYPE=INTERNET;TYPE=WORK:work@email.pl
 TEL;TYPE=pager:pager