Fix SyncML addressbook handling

This commit is contained in:
Jörg Lehrke 2010-12-19 22:25:47 +00:00
parent d6141a6d18
commit 97e1449db6
2 changed files with 0 additions and 33 deletions

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)); $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); return $this->save($contact);
} }

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)); $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) if (isset($contact['owner']) && $contact['owner'] != $this->user)
{ {