Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix saving birthday date in XML after import from vCard

Browse source
This commit is contained in:
Aleksander Machniak 2012-12-31 17:41:30 +01:00
parent fdf9b884e7
commit 892d91af3e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -559,7 +559,7 @@ class rcube_kolab_contacts extends rcube_addressbook
// generate new Kolab contact item // generate new Kolab contact item
$object = $this->_from_rcube_contact($save_data); $object = $this->_from_rcube_contact($save_data);
$saved = $this->storagefolder->save($object, 'contact'); $saved = $this->storagefolder->save($object, 'contact');
if (!$saved) { if (!$saved) {
rcube::raise_error(array( rcube::raise_error(array(
@ -605,7 +605,7 @@ class rcube_kolab_contacts extends rcube_addressbook
else { else {
$this->contacts[$id] = $this->_to_rcube_contact($object); $this->contacts[$id] = $this->_to_rcube_contact($object);
$updated = true; $updated = true;
// TODO: update data in groups this contact is member of // TODO: update data in groups this contact is member of
} }
} }
@ -1163,6 +1163,14 @@ class rcube_kolab_contacts extends rcube_addressbook
$contact[$key] = $val; $contact[$key] = $val;
} }
// convert one-item-array elements into string element
// this is needed e.g. to properly import birthday field
foreach ($this->coltypes as $type => $col_def) {
if ($col_def['limit'] == 1 && is_array($contact[$type])) {
$contact[$type] = array_shift(array_filter($contact[$type]));
}
}
// add empty values for some fields which can be removed in the UI // add empty values for some fields which can be removed in the UI
return array_filter($contact) + array('nickname' => '', 'birthday' => '', 'anniversary' => '', 'freebusyurl' => '', 'photo' => $contact['photo']); return array_filter($contact) + array('nickname' => '', 'birthday' => '', 'anniversary' => '', 'freebusyurl' => '', 'photo' => $contact['photo']);
} }