From 1d374636d4780f4a0c93dd358d585d7f0d7cb78a Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Wed, 13 Jun 2012 09:47:36 +0000 Subject: [PATCH] * Calendar/esync: control skip notifications (server-side) on client-side calendar edits/add as we introduced the control of client - side notification --- calendar/inc/class.calendar_activesync.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php index 4a790352c9..4b399707cb 100644 --- a/calendar/inc/class.calendar_activesync.inc.php +++ b/calendar/inc/class.calendar_activesync.inc.php @@ -550,7 +550,13 @@ return array(); // temporary disabling meeting requests from calendar $event = $this->message2event($message, $account, $event); // store event, ignore conflicts and skip notifications, as AS clients do their own notifications - if (!($id = $this->calendar->update($event,$ignore_conflicts=true,$touch_modified=true,$ignore_acl=false,$updateTS=true,$messages=null, $skip_notification=true))) + $skip_notification = false; + if (isset($GLOBALS['egw_info']['user']['preferences']['activesync']['felamimail-allowSendingInvitations']) && + $GLOBALS['egw_info']['user']['preferences']['activesync']['felamimail-allowSendingInvitations']=='send') + { + $skip_notification = true; // to avoid double notification from client AND Server + } + if (!($id = $this->calendar->update($event,$ignore_conflicts=true,$touch_modified=true,$ignore_acl=false,$updateTS=true,$messages=null, $skip_notification))) { debugLog(__METHOD__."('$folderid',$id,...) error saving event=".array2string($event)."!"); return false;