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

Handle contact photos in new format

Browse source
This commit is contained in:
Thomas B 2012-03-14 11:22:42 +01:00
parent 7bc509a2cd
commit 4353615709
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/libkolab/lib/kolab_format.php
View file

@ -179,4 +179,10 @@ abstract class kolab_format
*/
abstract public function to_array();
/**
* Load object data from Kolab2 format
*
* @param array Hash array with object properties (produced by Horde Kolab_Format classes)
*/
abstract public function fromkolab2($object);
}

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

@ -202,6 +202,21 @@ class kolab_format_contact extends kolab_format
if ($object['anniversary'])
$this->obj->setAnniversary(self::get_datetime($object['anniversary'], null, true));
if (!empty($object['photo'])) {
if (strlen($object['photo']) < 255 && ($att = $object['_attachments'][$object['photo']])) {
if ($att['content'])
$this->obj->setPhoto($att['content'], $att['type']);
$object['_attachments'][$object['photo']] = false;
}
else if ($type = rc_image_content_type($object['photo'])) {
$this->obj->setPhoto($object['photo'], $type);
$object['_attachments']['photo.attachment'] = false;
}
}
else if (isset($object['photo'])) {
$this->obj->setPhoto('','');
}
// handle spouse, children, profession, initials, pgppublickey, etc.
// cache this data
@ -292,12 +307,17 @@ class kolab_format_contact extends kolab_format
if ($g = $this->obj->gender())
$object['gender'] = $g == Contact::Female ? 'female' : 'male';
if ($this->obj->photoMimetype())
$object['photo'] = $this->obj->photo();
$this->data = $object;
return $this->data;
}
/**
* Load data from old Kolab2 format
*
* @param array Hash array with object properties
*/
public function fromkolab2($record)
{

3
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -314,6 +314,9 @@ class kolab_storage_folder
if (!isset($object['_attachments'][$name])) {
$object['_attachments'][$name] = $old['_attachments'][$name];
}
// load photo.attachment contents to be directly embedded in xcard block
if ($name == 'photo.attachment' && !$object['_attachments'][$name]['content'] && $att['key'])
$object['_attachments'][$name]['content'] = $this->get_attachment($object['_msguid'], $att['key'], $object['_mailbox']);
}
}