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

Add support for some Vcard 4.0 contact properties

Browse source
This commit is contained in:
Thomas Bruederli 2014-08-13 15:54:52 +02:00
parent 21136d8334
commit bcfb008dce
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
plugins/libkolab/lib/kolab_format_contact.php
View file

@ -203,6 +203,8 @@ class kolab_format_contact extends kolab_format
$this->obj->setNote($object['notes']); $this->obj->setNote($object['notes']);
if (isset($object['freebusyurl'])) if (isset($object['freebusyurl']))
$this->obj->setFreeBusyUrl($object['freebusyurl']); $this->obj->setFreeBusyUrl($object['freebusyurl']);
if (isset($object['lang']))
$this->obj->setLanguages(self::array2vector($object['lang']));
if (isset($object['birthday'])) if (isset($object['birthday']))
$this->obj->setBDay(self::get_datetime($object['birthday'], false, true)); $this->obj->setBDay(self::get_datetime($object['birthday'], false, true));
if (isset($object['anniversary'])) if (isset($object['anniversary']))
@ -227,6 +229,12 @@ class kolab_format_contact extends kolab_format
} }
} }
} }
// add other relateds
if (is_array($object['related'])) {
foreach ($object['related'] as $value) {
$rels->push(new Related(Related::Text, $value));
}
}
$this->obj->setRelateds($rels); $this->obj->setRelateds($rels);
// insert/replace crypto keys // insert/replace crypto keys
@ -346,6 +354,7 @@ class kolab_format_contact extends kolab_format
$object['notes'] = $this->obj->note(); $object['notes'] = $this->obj->note();
$object['freebusyurl'] = $this->obj->freeBusyUrl(); $object['freebusyurl'] = $this->obj->freeBusyUrl();
$object['lang'] = self::vector2array($this->obj->languages());
if ($bday = self::php_datetime($this->obj->bDay())) if ($bday = self::php_datetime($this->obj->bDay()))
$object['birthday'] = $bday; $object['birthday'] = $bday;
@ -363,7 +372,7 @@ class kolab_format_contact extends kolab_format
$object['photo'] = $photo_name; $object['photo'] = $photo_name;
// relateds -> spouse, children // relateds -> spouse, children
$this->read_relateds($this->obj->relateds(), $object); $this->read_relateds($this->obj->relateds(), $object, 'related');
// crypto settings: currently only key values are supported // crypto settings: currently only key values are supported
$keys = $this->obj->keys(); $keys = $this->obj->keys();
@ -446,7 +455,7 @@ class kolab_format_contact extends kolab_format
/** /**
* Helper method to map contents of a Related vector to the contact data object * Helper method to map contents of a Related vector to the contact data object
*/ */
private function read_relateds($rels, &$object) private function read_relateds($rels, &$object, $catchall = null)
{ {
$typemap = array_flip($this->relatedmap); $typemap = array_flip($this->relatedmap);
@ -455,13 +464,19 @@ class kolab_format_contact extends kolab_format
if ($rel->type() != Related::Text) // we can't handle UID relations yet if ($rel->type() != Related::Text) // we can't handle UID relations yet
continue; continue;
$known = false;
$types = $rel->relationTypes(); $types = $rel->relationTypes();
foreach ($typemap as $t => $field) { foreach ($typemap as $t => $field) {
if ($types & $t) { if ($types & $t) {
$object[$field][] = $rel->text(); $object[$field][] = $rel->text();
$known = true;
break; break;
} }
} }
if (!$known && $catchall) {
$object[$catchall][] = $rel->text();
}
} }
} }
} }