From 97e1449db68bda46a13febdcdb3ace61735b4431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= <jlehrke@noc.de>
Date: Sun, 19 Dec 2010 22:25:47 +0000
Subject: [PATCH] Fix SyncML addressbook handling

---
 addressbook/inc/class.addressbook_sif.inc.php  | 16 ----------------
 addressbook/inc/class.addressbook_vcal.inc.php | 17 -----------------
 2 files changed, 33 deletions(-)

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..3de0f5f8f8 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)
     	{