CHANGELOG | ●●●●● patch | view | raw | blame | history | |
program/lib/Roundcube/rcube_contacts.php | ●●●●● patch | view | raw | blame | history | |
program/lib/Roundcube/rcube_vcard.php | ●●●●● patch | view | raw | blame | history | |
program/steps/addressbook/export.inc | ●●●●● patch | view | raw | blame | history |
CHANGELOG
@@ -4,6 +4,7 @@ - Make SMTP error log more verbose - include server response and error code - Fix security issue in DBMail driver of password plugin (#1490261) - Fix handling of some improper constructs in format=flowed text as per the RFC3676[4.5] (#1490284) - Fix missing or not up-to-date CATEGORIES entry in vCard export (#1490277) RELEASE 1.0.5 ------------- program/lib/Roundcube/rcube_contacts.php
@@ -716,6 +716,11 @@ // copy values into vcard object $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard'], RCUBE_CHARSET, false, $this->vcard_fieldmap); $vcard->reset(); // don't store groups in vCard (#1490277) $vcard->set('groups', null); unset($save_data['groups']); foreach ($save_data as $key => $values) { list($field, $section) = explode(':', $key); $fulltext = in_array($field, $this->fulltext_cols); program/lib/Roundcube/rcube_vcard.php
@@ -393,6 +393,10 @@ $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type_uc] ? $typemap[$type_uc] : $type)); } } else { unset($this->raw[$tag]); } break; } } program/steps/addressbook/export.inc
@@ -119,14 +119,11 @@ */ function prepare_for_export(&$record, $source = null) { $groups = $source && $source->groups && $source->export_groups ? $source->get_record_groups($record['ID']) : null; $groups = $source && $source->groups && $source->export_groups ? $source->get_record_groups($record['ID']) : null; $fieldmap = $source ? $source->vcard_map : null; if (empty($record['vcard'])) { $vcard = new rcube_vcard(); if ($source) { $vcard->extend_fieldmap($source->vcard_map); } $vcard->load($record['vcard']); $vcard = new rcube_vcard($record['vcard'], RCUBE_CHARSET, false, $fieldmap); $vcard->reset(); foreach ($record as $key => $values) { @@ -148,11 +145,19 @@ $vcard->set('groups', join(',', $groups), null); } $record['vcard'] = $vcard->export(true); $record['vcard'] = $vcard->export(); } // 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']); else if ($record['vcard']) { $vcard = new rcube_vcard($record['vcard'], RCUBE_CHARSET, false, $fieldmap); // unset CATEGORIES entry, it might be not up-to-date (#1490277) $vcard->set('groups', null); $record['vcard'] = $vcard->export(); if (!empty($groups)) { $vgroups = 'CATEGORIES:' . rcube_vcard::vcard_quote($groups, ','); $record['vcard'] = str_replace('END:VCARD', $vgroups . rcube_vcard::$eol . 'END:VCARD', $record['vcard']); } } }