diff --git a/addressbook/inc/class.addressbook_sif.inc.php b/addressbook/inc/class.addressbook_sif.inc.php index a724ded2ef..c8e76e8d20 100644 --- a/addressbook/inc/class.addressbook_sif.inc.php +++ b/addressbook/inc/class.addressbook_sif.inc.php @@ -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); } diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php index 3352d69b76..7d2a8c9c1d 100644 --- a/addressbook/inc/class.addressbook_vcal.inc.php +++ b/addressbook/inc/class.addressbook_vcal.inc.php @@ -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)