holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar/esync: control skip notifications (server-side) on client-side calendar edits/add as we introduced the control of client - side notification

Browse Source
This commit is contained in:
Klaus Leithoff 2012-06-13 09:47:36 +00:00
parent 3364d1a1df
commit 1d374636d4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_activesync.inc.php
View File

@ -550,7 +550,13 @@ return array(); // temporary disabling meeting requests from calendar
$event = $this->message2event($message, $account, $event); $event = $this->message2event($message, $account, $event);
// store event, ignore conflicts and skip notifications, as AS clients do their own notifications // 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)."!"); debugLog(__METHOD__."('$folderid',$id,...) error saving event=".array2string($event)."!");
return false; return false;