Skip to content

Z
z-push
Commit 1c52acb0 authored by Sebastian Kummer's avatar Sebastian Kummer
Browse files
Options

Merge pull request #673 in ZP/z-push from... 

Merge pull request #673 in ZP/z-push from feature/ZP-1382-caldav-out-of-office-tentative-workingelsewhere-status to develop

* commit '8608d3f9':
  ZP-1382 Caldav outofoffice tentative workingelsewhere status. Released under the Affero GNU General Public License (AGPL) version 3.
parents 23f23871 8608d3f9
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 7 deletions
src/backend/caldav/caldav.php
View file @ 1c52acb0
...@@ -662,6 +662,7 @@ class BackendCalDAV extends BackendDiff { ...@@ -662,6 +662,7 @@ class BackendCalDAV extends BackendDiff {
break; break;
case "TRANSP": case "TRANSP":
if(!isset($message->busystatus)){
switch ($property->Value()) { switch ($property->Value()) {
case "TRANSPARENT": case "TRANSPARENT":
$message->busystatus = "0"; $message->busystatus = "0";
...@@ -670,6 +671,27 @@ class BackendCalDAV extends BackendDiff { ...@@ -670,6 +671,27 @@ class BackendCalDAV extends BackendDiff {
$message->busystatus = "2"; $message->busystatus = "2";
break; break;
} }
}
break;
case "X-MICROSOFT-CDO-INTENDEDSTATUS":
switch ($property->Value()) {
case "FREE":
$message->busystatus = "0";
break;
case "TENTATIVE":
$message->busystatus = "1";
break;
case "BUSY":
$message->busystatus = "2";
break;
case "OOF":
$message->busystatus = "3";
break;
case "WORKINGELSEWHERE":
$message->busystatus = "4";
break;
}
break; break;
// SYNC_POOMCAL_MEETINGSTATUS // SYNC_POOMCAL_MEETINGSTATUS
...@@ -1022,13 +1044,25 @@ class BackendCalDAV extends BackendDiff { ...@@ -1022,13 +1044,25 @@ class BackendCalDAV extends BackendDiff {
} }
if (isset($data->busystatus)) { if (isset($data->busystatus)) {
switch ($data->busystatus) { switch ($data->busystatus) {
case "0": case "0": //Free
case "1":
$vevent->AddProperty("TRANSP", "TRANSPARENT"); $vevent->AddProperty("TRANSP", "TRANSPARENT");
$vevent->AddProperty("X-MICROSOFT-CDO-INTENDEDSTATUS", "FREE");
break; break;
case "2": case "1": //Tentative
case "3":
$vevent->AddProperty("TRANSP", "OPAQUE"); $vevent->AddProperty("TRANSP", "OPAQUE");
$vevent->AddProperty("X-MICROSOFT-CDO-INTENDEDSTATUS", "TENTATIVE");
break;
case "2": //Busy
$vevent->AddProperty("TRANSP", "OPAQUE");
$vevent->AddProperty("X-MICROSOFT-CDO-INTENDEDSTATUS", "BUSY");
break;
case "3": //Out of office
$vevent->AddProperty("TRANSP", "TRANSPARENT");
$vevent->AddProperty("X-MICROSOFT-CDO-INTENDEDSTATUS", "OOF");
break;
case "4": //Working elsewhere (not yet in Android)
$vevent->AddProperty("TRANSP", "TRANSPARENT");
$vevent->AddProperty("X-MICROSOFT-CDO-INTENDEDSTATUS", "WORKINGELSEWHERE");
break; break;
} }
} }
...@@ -1110,7 +1144,6 @@ class BackendCalDAV extends BackendDiff { ...@@ -1110,7 +1144,6 @@ class BackendCalDAV extends BackendDiff {
// X-MICROSOFT-CDO-APPT-SEQUENCE:0 // X-MICROSOFT-CDO-APPT-SEQUENCE:0
// X-MICROSOFT-CDO-OWNERAPPTID:2113393086 // X-MICROSOFT-CDO-OWNERAPPTID:2113393086
// X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
// X-MICROSOFT-CDO-IMPORTANCE:1 // X-MICROSOFT-CDO-IMPORTANCE:1
// X-MICROSOFT-CDO-INSTTYPE:0 // X-MICROSOFT-CDO-INSTTYPE:0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment