ZP-575 #comment add working elsewhere status 4 to definitions, add conversion...

ZP-575 #comment add working elsewhere status 4 to definitions, add conversion to busy status -1 to 1

git-svn-id: https://z-push.org/svn/z-push/trunk@1935 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/zarafa/mapiprovider.php

@@ -321,6 +321,11 @@ class MAPIProvider {
             $message->busystatus = fbFree;
         }
 
+        // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+        if (isset($message->busystatus) && $message->busystatus == -1) {
+            $message->busystatus = fbTentative;
+        }
+
         return $message;
     }
 
@@ -470,6 +475,12 @@ class MAPIProvider {
             if (isset($exception->busystatus) && $exception->busystatus == fbWorkingElsewhere) {
                 $exception->busystatus = fbFree;
             }
+
+            // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+            if (isset($exception->busystatus) && $exception->busystatus == -1) {
+                $exception->busystatus = fbTentative;
+            }
+
             array_push($syncMessage->exceptions, $exception);
         }
 
@@ -624,6 +635,16 @@ class MAPIProvider {
             if(!isset($message->meetingrequest->sensitivity))
                 $message->meetingrequest->sensitivity = 0;
 
+            // If the user is working from a location other than the office the busystatus should be interpreted as free.
+            if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == fbWorkingElsewhere) {
+                $message->meetingrequest->busystatus = fbFree;
+            }
+
+            // If the busystatus has the value of -1, we should be interpreted as tentative (1) / ZP-581
+            if (isset($message->meetingrequest->busystatus) && $message->meetingrequest->busystatus == -1) {
+                $message->meetingrequest->busystatus = fbTentative;
+            }
+
             // if a meeting request response hasn't been processed yet,
             // do it so that the attendee status is updated on the mobile
             if(!isset($messageprops[$emailproperties["processed"]])) {

src/lib/syncobjects/syncappointment.php

@@ -123,6 +123,7 @@ class SyncAppointment extends SyncObject {
                     // 1 = Tentative
                     // 2 = Busy
                     // 3 = Out of office
+                    // 4 = Working Elsewhere
                     SYNC_POOMCAL_BUSYSTATUS                             => array (  self::STREAMER_VAR      => "busystatus",
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => self::STREAMER_CHECK_SETTWO,
                                                                                                                         self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3,4) )),

src/lib/syncobjects/syncappointmentexception.php

@@ -68,7 +68,7 @@ class SyncAppointmentException extends SyncAppointment {
         $this->mapping[SYNC_POOMCAL_STARTTIME][self::STREAMER_CHECKS]       = array(self::STREAMER_CHECK_CMPLOWER   => SYNC_POOMCAL_ENDTIME);
         $this->mapping[SYNC_POOMCAL_SUBJECT][self::STREAMER_CHECKS]         = array();
         $this->mapping[SYNC_POOMCAL_ENDTIME][self::STREAMER_CHECKS]         = array(self::STREAMER_CHECK_CMPHIGHER  => SYNC_POOMCAL_STARTTIME);
-        $this->mapping[SYNC_POOMCAL_BUSYSTATUS][self::STREAMER_CHECKS]      = array(self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3) );
+        $this->mapping[SYNC_POOMCAL_BUSYSTATUS][self::STREAMER_CHECKS]      = array(self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3,4) );
         $this->mapping[SYNC_POOMCAL_REMINDER][self::STREAMER_CHECKS]        = array(self::STREAMER_CHECK_CMPHIGHER  => -1);
         $this->mapping[SYNC_POOMCAL_EXCEPTIONS][self::STREAMER_CHECKS]      = array(self::STREAMER_CHECK_NOTALLOWED => true);
 

src/lib/syncobjects/syncmeetingrequest.php

@@ -119,9 +119,10 @@ class SyncMeetingRequest extends SyncObject {
                     // 1 = Tentative
                     // 2 = Busy
                     // 3 = Out of office
+                    // 4 = Working Elsewhere
                     SYNC_POOMMAIL_BUSYSTATUS                            => array (  self::STREAMER_VAR      => "busystatus",
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => self::STREAMER_CHECK_SETTWO,
-                                                                                                                        self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3)  )),
+                                                                                                                        self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3,4)  )),
 
                     SYNC_POOMMAIL_TIMEZONE                              => array (  self::STREAMER_VAR      => "timezone",
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_REQUIRED   => base64_encode(pack("la64vvvvvvvv"."la64vvvvvvvv"."l",0,"",0,0,0,0,0,0,0,0,0,"",0,0,0,0,0,0,0,0,0)) )),