extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 11:23:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SyncML addressbook handling

Browse Source
This commit is contained in:
Jörg Lehrke 2010-12-19 22:25:30 +00:00
parent de8e93cfe9
commit 66e60ff200
2 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addressbook/inc/class.addressbook_sif.inc.php
View File

@ -247,22 +247,6 @@ class addressbook_sif extends addressbook_bo
{
$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
}
if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook']))
{
$owner = $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];
switch ($owner)
{
case 'G':
$contact['owner'] = $GLOBALS['egw_info']['user']['account_primary_group'];
break;
case 'P':
case 0:
$contact['owner'] = $this->user;
break;
default:
$contact['owner'] = (int)$owner;
}
}
}
return $this->save($contact);
}

24
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -175,23 +175,6 @@ class addressbook_vcal extends addressbook_bo
{
$contact['cat_id'] = implode(',',$this->find_or_add_categories($contact['cat_id'], -1));
}
if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook']))
{
$owner = $GLOBALS['egw_info']['user']['preferences']['syncml']['filter_addressbook'];
switch ($owner)
{
case 'G':
$contact['owner'] = $GLOBALS['egw_info']['user']['account_primary_group'];
break;
case 'P':
case 'N':
case 0:
$contact['owner'] = $this->user;
break;
default:
$contact['owner'] = (int)$owner;
}
}
}
if (isset($contact['owner']) && $contact['owner'] != $this->user)
{
@ -612,11 +595,13 @@ class addressbook_vcal extends addressbook_bo
foreach($vcardValues as $key => $vcardRow)
{
$rowName = strtoupper($vcardRow['name']);
/*
if ($vcardRow['value'] == '' && implode('', $vcardRow['values']) == '')
{
unset($vcardRow);
continue;
}
*/
$rowTypes = array();
$vcardRow['uparams'] = array();
@ -625,8 +610,7 @@ class addressbook_vcal extends addressbook_bo
$pname = strtoupper($pname);
$vcardRow['uparams'][$pname] = $params;
}
// expand 3.0 TYPE paramters to 2.1 qualifiers
$vcardRow['tparams'] = array();
foreach ($vcardRow['uparams'] as $pname => $params)
@ -680,7 +664,7 @@ class addressbook_vcal extends addressbook_bo
$vcardRow['uparams'] += $vcardRow['tparams'];
ksort($vcardRow['uparams']);
foreach ($vcardRow['uparams'] as $pname => $params)
{
switch ($pname)