Aleksander Machniak
2014-11-19 bb1398a54e8ba45f099435f6cc56c016f8662f65
Fix import of multiple contact groups from Google-csv format (#1490159)
4 files modified
8 ■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_csv2vcard.php 5 ●●●● patch | view | raw | blame | history
tests/src/Csv2vcard/gmail.csv patch | view | raw | blame | history
tests/src/Csv2vcard/gmail.vcf 2 ●●● patch | view | raw | blame | history
CHANGELOG
@@ -2,6 +2,7 @@
===========================
- 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 @@
        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.csv
Binary files differ
tests/src/Csv2vcard/gmail.vcf
@@ -5,7 +5,7 @@
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