From 1602ebc69d0a330b247f460aed2bc059a7cd12d0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 25 Jun 2007 16:16:55 +0000 Subject: [PATCH] "some fixes for syncml: - if no owner/addressbook set on update load owner AND private from the existing contact - if no owner/addressbook set for new entries, use the add_default prefs if set and the personal adb of the user if not" --- addressbook/inc/class.bocontacts.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.bocontacts.inc.php b/addressbook/inc/class.bocontacts.inc.php index 7d706060f7..35a6d52a77 100755 --- a/addressbook/inc/class.bocontacts.inc.php +++ b/addressbook/inc/class.bocontacts.inc.php @@ -442,6 +442,7 @@ class bocontacts extends socontacts if (($old = $this->read($contact['id']))) // --> try reading the old entry and set it from there { $contact['owner'] = $old['owner']; + $contact['private'] = $old['private']; } else // entry not found --> create a new one { @@ -449,8 +450,11 @@ class bocontacts extends socontacts } } } - if (!$isUpdate) { - if (!isset($contact['owner'])) $contact['owner'] = $this->user; // write to users personal addressbook + if (!$isUpdate) + { + // if no owner/addressbook set use the setting of the add_default prefs (if set, otherwise the users personal addressbook) + if (!isset($contact['owner'])) $contact['owner'] = (int)$this->prefs['add_default'] ? (int)$this->prefs['add_default'] : $this->user; + if (!isset($contact['private'])) $contact['private'] = (int)(substr($this->prefs['add_default'],-1) == 'p'); $contact['creator'] = $this->user; $contact['created'] = $this->now_su;