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

- supporting AS busystatus (0=free --> non_blocking=1, 1=tentative,2=busy,3=out-of-office --> non_blocking=0)

Browse Source 
- fixed whole day events been transmitted 1 sec short from EGw to the device (#2903)
This commit is contained in:
Ralf Becker 2011-03-25 08:24:02 +00:00
parent cd4ff32143
commit 649861a7a8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,6 +381,12 @@ class calendar_activesync implements activesync_plugin_write
$event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential $event['public'] = (int)($message->sensitivity < 1); // 0=normal, 1=personal, 2=private, 3=confidential
// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
if (isset($message->busystatus))
{
$event['non_blocking'] = $message->busystatus ? 0 : 1;
}
if (($event['whole_day'] = $message->alldayevent)) if (($event['whole_day'] = $message->alldayevent))
{ {
$event['end']--; // otherwise our whole-day event code in save makes it one more day! $event['end']--; // otherwise our whole-day event code in save makes it one more day!
@ -700,6 +706,10 @@ class calendar_activesync implements activesync_plugin_write
{ {
if (!empty($event[$key])) $message->$attr = $event[$key]; if (!empty($event[$key])) $message->$attr = $event[$key];
} }
if (($message->alldayevent = (int)calendar_bo::isWholeDay($event)))
{
++$message->endtime; // EGw all-day-events are 1 sec shorter!
}
// copying strings // copying strings
foreach(array( foreach(array(
'title' => 'subject', 'title' => 'subject',
@ -729,7 +739,9 @@ class calendar_activesync implements activesync_plugin_write
$message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email'); $message->organizeremail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
$message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential $message->sensitivity = $event['public'] ? 0 : 2; // 0=normal, 1=personal, 2=private, 3=confidential
$message->alldayevent = (int)calendar_bo::isWholeDay($event);
// busystatus=(0=free|1=tentative|2=busy|3=out-of-office), EGw has non_blocking=0|1
$message->busystatus = $event['non_blocking'] ? 0 : 2;
$message->attendees = array(); $message->attendees = array();
foreach($event['participants'] as $uid => $status) foreach($event['participants'] as $uid => $status)
@ -862,7 +874,6 @@ class calendar_activesync implements activesync_plugin_write
} }
} }
} }
//$message->busystatus;
//$message->meetingstatus; //$message->meetingstatus;
return $message; return $message;