extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-13 17:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

SyncML fixes

Browse Source
This commit is contained in:
Lars Kneschke 2007-01-23 17:34:24 +00:00
parent 3d6d20e3d8
commit 51b912557d
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
addressbook/inc/class.vcaladdressbook.inc.php
View File

@ -56,8 +56,8 @@ class vcaladdressbook extends bocontacts
if(!($entry = $this->read($_id))) { if(!($entry = $this->read($_id))) {
return false; return false;
} }
foreach($this->supportedFields as $vcardField => $databaseFields)
{ foreach($this->supportedFields as $vcardField => $databaseFields) {
$options = array(); $options = array();
$value = ''; $value = '';
foreach($databaseFields as $databaseField) { foreach($databaseFields as $databaseField) {
@ -70,8 +70,7 @@ class vcaladdressbook extends bocontacts
// remove the last ; // remove the last ;
$value = substr($value, 0, -1); $value = substr($value, 0, -1);
switch($vcardField) switch($vcardField) {
{
// TODO handle multiple categories // TODO handle multiple categories
case 'CATEGORIES': case 'CATEGORIES':
$catData = ExecMethod('phpgwapi.categories.return_single',$value); $catData = ExecMethod('phpgwapi.categories.return_single',$value);
@ -101,6 +100,7 @@ class vcaladdressbook extends bocontacts
if(preg_match('/([\177-\377])/',$value)) { if(preg_match('/([\177-\377])/',$value)) {
$options['CHARSET'] = 'UTF-8'; $options['CHARSET'] = 'UTF-8';
} }
$vCard->setParameter($vcardField, $options); $vCard->setParameter($vcardField, $options);
} }
@ -118,7 +118,23 @@ class vcaladdressbook extends bocontacts
unset($contact['private']); unset($contact['private']);
unset($contact['note']); unset($contact['note']);
unset($contact['n_fn']); unset($contact['n_fn']);
unset($contact['email']);
unset($contact['email_home']);
unset($contact['url']);
unset($contact['url_home']);
// some clients cut the values, because they do not support the same length of data like eGW
// at least the first 10 characters must match
$maybeCuttedFields = array('org_unit', 'org_name','title');
foreach($maybeCuttedFields as $fieldName) {
if(!empty($contact[$fieldName]) && strlen($contact[$fieldName]) > 10) {
$contact[$fieldName] .= '*';
}
}
error_log(print_r($contact, true));
#if($foundContacts = parent::search($contact, true, '', '', '%')) {
if($foundContacts = parent::search($contact)) { if($foundContacts = parent::search($contact)) {
return $foundContacts[0]['id']; return $foundContacts[0]['id'];
} }
@ -334,6 +350,10 @@ class vcaladdressbook extends bocontacts
case 'synthesis ag': case 'synthesis ag':
switch(strtolower($_productName)) switch(strtolower($_productName))
{ {
case 'sysync client pocketpc pro':
$this->supportedFields = $defaultFields[1];
#$this->supportedFields['PHOTO'] = array('jpegphoto');
break;
default: default:
$this->supportedFields = $defaultFields[0]; $this->supportedFields = $defaultFields[0];
break; break;
@ -367,8 +387,10 @@ class vcaladdressbook extends bocontacts
$vCard = Horde_iCalendar::newComponent('vcard', $container); $vCard = Horde_iCalendar::newComponent('vcard', $container);
if(!$vCard->parsevCalendar($_vcard,'VCARD')) // Unfold any folded lines.
{ $vCardUnfolded = preg_replace ('/(\r|\n)+ /', ' ', $_vcard);
if(!$vCard->parsevCalendar($vCardUnfolded, 'VCARD')) {
return False; return False;
} }
$vcardValues = $vCard->getAllAttributes(); $vcardValues = $vCard->getAllAttributes();
@ -495,7 +517,9 @@ class vcaladdressbook extends bocontacts
switch($fieldName) switch($fieldName)
{ {
case 'bday': case 'bday':
if(!empty($vcardValues[$vcardKey]['values'][$fieldKey])) {
$contact[$fieldName] = date('Y-m-d', $vcardValues[$vcardKey]['values'][$fieldKey]); $contact[$fieldName] = date('Y-m-d', $vcardValues[$vcardKey]['values'][$fieldKey]);
}
break; break;
case 'private': case 'private':
@ -503,25 +527,21 @@ class vcaladdressbook extends bocontacts
break; break;
case 'cat_id': case 'cat_id':
if (!is_object($this->cat)) if (!is_object($this->cat)) {
{ if (!is_object($GLOBALS['egw']->categories)) {
if (!is_object($GLOBALS['egw']->categories))
{
$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories',$GLOBALS['egw_info']['user']['account_id'],'addressbook'); $GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories',$GLOBALS['egw_info']['user']['account_id'],'addressbook');
} }
$this->cat =& $GLOBALS['egw']->categories; $this->cat =& $GLOBALS['egw']->categories;
} }
foreach(explode(',',$vcardValues[$vcardKey]['values'][$fieldKey]) as $cat_name) foreach(explode(',',$vcardValues[$vcardKey]['values'][$fieldKey]) as $cat_name) {
{ if (!($cat_id = $this->cat->name2id($cat_name))) {
if (!($cat_id = $this->cat->name2id($cat_name)))
{
$cat_id = $this->cat->add( array('name' => $cat_name, 'descr' => $cat_name )); $cat_id = $this->cat->add( array('name' => $cat_name, 'descr' => $cat_name ));
} }
$contact[$fieldName] = $cat_id; $contact[$fieldName] = $cat_id;
} }
break; break;
default: default:
$contact[$fieldName] = $vcardValues[$vcardKey]['values'][$fieldKey]; $contact[$fieldName] = trim($vcardValues[$vcardKey]['values'][$fieldKey]);
break; break;
} }
} }