grommunio / grommunio-dav

mapi/mapitags.php

Indentation +1 added lines, -1 removed lines

@@ -903,5 +903,5 @@
 // ElementIDs for persist data of PR_IPM_OL2007_ENTRYIDS / PR_ADDITIONAL_REN_ENTRYIDS_EX
 define('RSF_ELID_HEADER', 0x0002); // 4 bytes Indicates that the ElementData field contains a 4-byte header value equal to 0x00000000.
 define('RSF_ELID_ENTRYID', 0x0001); // variable Indicates that the ElementData field contains the entry ID of the special folder
-																// that is of the type indicated by the value of the PersistID field of the PersistData structure.
+                                                                // that is of the type indicated by the value of the PersistID field of the PersistData structure.
 define('ELEMENT_SENTINEL', 0x0000); // 0 bytes Indicates that the PersistElement structure is the last one contained in the DataElements field of the PersistData structure.

mapi/class.taskrequest.php

Indentation +851 added lines, -851 removed lines

@@ -5,7 +5,7 @@ 
  * SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
  */
 
-	/*
+    /*
 	* In general
 	*
 	* This class never actually modifies a task item unless we receive a task request update. This means
@@ -17,63 +17,63 @@ 
 	* task request is sent via sendTaskRequest.
 	*/
 
-	/* The TaskMode value is only used for the IPM.TaskRequest items. It must 0 (tdmtNothing) on IPM.Task items.
+    /* The TaskMode value is only used for the IPM.TaskRequest items. It must 0 (tdmtNothing) on IPM.Task items.
 	*
 	* It is used to indicate the type of change that is being carried in the IPM.TaskRequest item (although this
 	* information seems redundant due to that information already being available in PR_MESSAGE_CLASS).
 	*/
-	define('tdmtNothing', 0);			// Value in IPM.Task items
-	define('tdmtTaskReq', 1);			// Assigner -> Assignee
-	define('tdmtTaskAcc', 2);			// Assignee -> Assigner
-	define('tdmtTaskDec', 3);			// Assignee -> Assigner
-	define('tdmtTaskUpd', 4);			// Assignee -> Assigner
-	define('tdmtTaskSELF', 5);			// Assigner -> Assigner (?)
-
-	/* The TaskHistory is used to show the last action on the task on both the assigner and the assignee's side.
+    define('tdmtNothing', 0);			// Value in IPM.Task items
+    define('tdmtTaskReq', 1);			// Assigner -> Assignee
+    define('tdmtTaskAcc', 2);			// Assignee -> Assigner
+    define('tdmtTaskDec', 3);			// Assignee -> Assigner
+    define('tdmtTaskUpd', 4);			// Assignee -> Assigner
+    define('tdmtTaskSELF', 5);			// Assigner -> Assigner (?)
+
+    /* The TaskHistory is used to show the last action on the task on both the assigner and the assignee's side.
 	*
 	* It is used in combination with 'AssignedTime' and 'tasklastdelegate' or 'tasklastuser' to show the information
 	* at the top of the task request in the format 'Accepted by <user> on 01-01-2010 11:00'.
 	*/
-	define('thNone', 0);
-	define('thAccepted', 1);			// Set by assignee
-	define('thDeclined', 2);			// Set by assignee
-	define('thUpdated', 3);				// Set by assignee
-	define('thDueDateChanged', 4);
-	define('thAssigned', 5);			// Set by assigner
-
-	/* The TaskState value is used to differentiate the version of a task in the assigner's folder and the version in the
+    define('thNone', 0);
+    define('thAccepted', 1);			// Set by assignee
+    define('thDeclined', 2);			// Set by assignee
+    define('thUpdated', 3);				// Set by assignee
+    define('thDueDateChanged', 4);
+    define('thAssigned', 5);			// Set by assigner
+
+    /* The TaskState value is used to differentiate the version of a task in the assigner's folder and the version in the
 	* assignee's folder. The buttons shown depend on this and the 'taskaccepted' boolean (for the assignee)
 	*/
-	define('tdsNOM', 0);		// Got a response to a deleted task, and re-created the task for the assigner
-	define('tdsOWNNEW', 1);		// Not assigned
-	define('tdsOWN', 2);		// Assignee version
-	define('tdsACC', 3);		// Assigner version
-	define('tdsDEC', 4);		// Assigner version, but assignee declined
+    define('tdsNOM', 0);		// Got a response to a deleted task, and re-created the task for the assigner
+    define('tdsOWNNEW', 1);		// Not assigned
+    define('tdsOWN', 2);		// Assignee version
+    define('tdsACC', 3);		// Assigner version
+    define('tdsDEC', 4);		// Assigner version, but assignee declined
 
-	/* The delegationstate is used for the assigner to indicate state
+    /* The delegationstate is used for the assigner to indicate state
 	*/
-	define('olTaskNotDelegated', 0);
-	define('olTaskDelegationUnknown', 1); // After sending req
-	define('olTaskDelegationAccepted', 2); // After receiving accept
-	define('olTaskDelegationDeclined', 3); // After receiving decline
+    define('olTaskNotDelegated', 0);
+    define('olTaskDelegationUnknown', 1); // After sending req
+    define('olTaskDelegationAccepted', 2); // After receiving accept
+    define('olTaskDelegationDeclined', 3); // After receiving decline
 
-	/* The task ownership indicates the role of the current user relative to the task.
+    /* The task ownership indicates the role of the current user relative to the task.
 	*/
-	define('olNewTask', 0);
-	define('olDelegatedTask', 1);	// Task has been assigned
-	define('olOwnTask', 2);			// Task owned
+    define('olNewTask', 0);
+    define('olDelegatedTask', 1);	// Task has been assigned
+    define('olOwnTask', 2);			// Task owned
 
-	/* taskmultrecips indicates whether the task request sent or received has multiple assignees or not.
+    /* taskmultrecips indicates whether the task request sent or received has multiple assignees or not.
 	*/
-	define('tmrNone', 0);
-	define('tmrSent', 1);		// Task has been sent to multiple assignee
-	define('tmrReceived', 2);	// Task Request received has multiple assignee
+    define('tmrNone', 0);
+    define('tmrSent', 1);		// Task has been sent to multiple assignee
+    define('tmrReceived', 2);	// Task Request received has multiple assignee
 
-	class TaskRequest {
-		// All recipient properties
-		public $recipprops = [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_RECIPIENT_ENTRYID, PR_RECIPIENT_TYPE, PR_SEND_INTERNET_ENCODING, PR_SEND_RICH_INFO, PR_RECIPIENT_DISPLAY_NAME, PR_ADDRTYPE, PR_DISPLAY_TYPE, PR_RECIPIENT_TRACKSTATUS, PR_RECIPIENT_TRACKSTATUS_TIME, PR_RECIPIENT_FLAGS, PR_ROWID, PR_SEARCH_KEY];
+    class TaskRequest {
+        // All recipient properties
+        public $recipprops = [PR_ENTRYID, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_RECIPIENT_ENTRYID, PR_RECIPIENT_TYPE, PR_SEND_INTERNET_ENCODING, PR_SEND_RICH_INFO, PR_RECIPIENT_DISPLAY_NAME, PR_ADDRTYPE, PR_DISPLAY_TYPE, PR_RECIPIENT_TRACKSTATUS, PR_RECIPIENT_TRACKSTATUS_TIME, PR_RECIPIENT_FLAGS, PR_ROWID, PR_SEARCH_KEY];
 
-		/*
+        /*
 		 * Constructs a TaskRequest object for the specified message. This can be either the task request
 		 * message itself (in the inbox) or the task in the tasks folder, depending on the action to be performed.
 		 *
@@ -84,307 +84,307 @@ 
 		 * @param $message message MAPI Message to which the task request refers to (can be an email or a task)
 		 * @param $session session MAPI Session which is used to open tasks folders for delegated task requests or responses
 		 */
-		public function __construct($store, $message, $session) {
-			$this->store = $store;
-			$this->message = $message;
-			$this->session = $session;
-
-			$properties["owner"] = "PT_STRING8:PSETID_Task:0x811f";
-			$properties["updatecount"] = "PT_LONG:PSETID_Task:0x8112";
-			$properties["taskstate"] = "PT_LONG:PSETID_Task:0x8113";
-			$properties["taskmultrecips"] = "PT_LONG:PSETID_Task:0x8120";
-			$properties["taskupdates"] = "PT_BOOLEAN:PSETID_Task:0x811b";
-			$properties["tasksoc"] = "PT_BOOLEAN:PSETID_Task:0x8119";
-			$properties["taskhistory"] = "PT_LONG:PSETID_Task:0x811a";
-			$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
-			$properties["taskglobalobjid"] = "PT_BINARY:PSETID_Common:0x8519";
-			$properties["complete"] = "PT_BOOLEAN:PSETID_Common:0x811c";
-			$properties["assignedtime"] = "PT_SYSTIME:PSETID_Task:0x8115";
-			$properties["taskfcreator"] = "PT_BOOLEAN:PSETID_Task:0x0x811e";
-			$properties["tasklastuser"] = "PT_STRING8:PSETID_Task:0x8122";
-			$properties["tasklastdelegate"] = "PT_STRING8:PSETID_Task:0x8125";
-			$properties["taskaccepted"] = "PT_BOOLEAN:PSETID_Task:0x8108";
-			$properties["delegationstate"] = "PT_LONG:PSETID_Task:0x812a";
-			$properties["ownership"] = "PT_LONG:PSETID_Task:0x8129";
-
-			$properties["complete"] = "PT_BOOLEAN:PSETID_Task:0x811c";
-			$properties["datecompleted"] = "PT_SYSTIME:PSETID_Task:0x810f";
-			$properties["recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";
-			$properties["startdate"] = "PT_SYSTIME:PSETID_Task:0x8104";
-			$properties["duedate"] = "PT_SYSTIME:PSETID_Task:0x8105";
-			$properties["status"] = "PT_LONG:PSETID_Task:0x8101";
-			$properties["percent_complete"] = "PT_DOUBLE:PSETID_Task:0x8102";
-			$properties["totalwork"] = "PT_LONG:PSETID_Task:0x8111";
-			$properties["actualwork"] = "PT_LONG:PSETID_Task:0x8110";
-			$properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
-			$properties["companies"] = "PT_MV_STRING8:PSETID_Common:0x8539";
-			$properties["mileage"] = "PT_STRING8:PSETID_Common:0x8534";
-			$properties["billinginformation"] = "PT_STRING8:PSETID_Common:0x8535";
-
-			$this->props = getPropIdsFromStrings($store, $properties);
-		}
-
-		// General functions
-
-		/* Return TRUE if the item is a task request message
+        public function __construct($store, $message, $session) {
+            $this->store = $store;
+            $this->message = $message;
+            $this->session = $session;
+
+            $properties["owner"] = "PT_STRING8:PSETID_Task:0x811f";
+            $properties["updatecount"] = "PT_LONG:PSETID_Task:0x8112";
+            $properties["taskstate"] = "PT_LONG:PSETID_Task:0x8113";
+            $properties["taskmultrecips"] = "PT_LONG:PSETID_Task:0x8120";
+            $properties["taskupdates"] = "PT_BOOLEAN:PSETID_Task:0x811b";
+            $properties["tasksoc"] = "PT_BOOLEAN:PSETID_Task:0x8119";
+            $properties["taskhistory"] = "PT_LONG:PSETID_Task:0x811a";
+            $properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
+            $properties["taskglobalobjid"] = "PT_BINARY:PSETID_Common:0x8519";
+            $properties["complete"] = "PT_BOOLEAN:PSETID_Common:0x811c";
+            $properties["assignedtime"] = "PT_SYSTIME:PSETID_Task:0x8115";
+            $properties["taskfcreator"] = "PT_BOOLEAN:PSETID_Task:0x0x811e";
+            $properties["tasklastuser"] = "PT_STRING8:PSETID_Task:0x8122";
+            $properties["tasklastdelegate"] = "PT_STRING8:PSETID_Task:0x8125";
+            $properties["taskaccepted"] = "PT_BOOLEAN:PSETID_Task:0x8108";
+            $properties["delegationstate"] = "PT_LONG:PSETID_Task:0x812a";
+            $properties["ownership"] = "PT_LONG:PSETID_Task:0x8129";
+
+            $properties["complete"] = "PT_BOOLEAN:PSETID_Task:0x811c";
+            $properties["datecompleted"] = "PT_SYSTIME:PSETID_Task:0x810f";
+            $properties["recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";
+            $properties["startdate"] = "PT_SYSTIME:PSETID_Task:0x8104";
+            $properties["duedate"] = "PT_SYSTIME:PSETID_Task:0x8105";
+            $properties["status"] = "PT_LONG:PSETID_Task:0x8101";
+            $properties["percent_complete"] = "PT_DOUBLE:PSETID_Task:0x8102";
+            $properties["totalwork"] = "PT_LONG:PSETID_Task:0x8111";
+            $properties["actualwork"] = "PT_LONG:PSETID_Task:0x8110";
+            $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
+            $properties["companies"] = "PT_MV_STRING8:PSETID_Common:0x8539";
+            $properties["mileage"] = "PT_STRING8:PSETID_Common:0x8534";
+            $properties["billinginformation"] = "PT_STRING8:PSETID_Common:0x8535";
+
+            $this->props = getPropIdsFromStrings($store, $properties);
+        }
+
+        // General functions
+
+        /* Return TRUE if the item is a task request message
 		 */
-		public function isTaskRequest() {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-			if (isset($props[PR_MESSAGE_CLASS]) && $props[PR_MESSAGE_CLASS] == "IPM.TaskRequest") {
-				return true;
-			}
-		}
-
-		/* Return TRUE if the item is a task response message
+        public function isTaskRequest() {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+            if (isset($props[PR_MESSAGE_CLASS]) && $props[PR_MESSAGE_CLASS] == "IPM.TaskRequest") {
+                return true;
+            }
+        }
+
+        /* Return TRUE if the item is a task response message
 		 */
-		public function isTaskRequestResponse() {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-			if (isset($props[PR_MESSAGE_CLASS]) && strpos($props[PR_MESSAGE_CLASS], "IPM.TaskRequest.") === 0) {
-				return true;
-			}
-		}
-
-		/*
+        public function isTaskRequestResponse() {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+            if (isset($props[PR_MESSAGE_CLASS]) && strpos($props[PR_MESSAGE_CLASS], "IPM.TaskRequest.") === 0) {
+                return true;
+            }
+        }
+
+        /*
 		 * Gets the task associated with an IPM.TaskRequest message
 		 *
 		 * If the task does not exist yet, it is created, using the attachment object in the
 		 * task request item.
 		 */
-		public function getAssociatedTask($create) {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->props['taskglobalobjid']]);
+        public function getAssociatedTask($create) {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->props['taskglobalobjid']]);
 
-			if ($props[PR_MESSAGE_CLASS] == "IPM.Task") {
-				return $this->message;
-			} // Message itself is task, so return that
+            if ($props[PR_MESSAGE_CLASS] == "IPM.Task") {
+                return $this->message;
+            } // Message itself is task, so return that
 
-			$tfolder = $this->getDefaultTasksFolder();
-			$globalobjid = $props[$this->props['taskglobalobjid']];
+            $tfolder = $this->getDefaultTasksFolder();
+            $globalobjid = $props[$this->props['taskglobalobjid']];
 
-			// Find the task by looking for the taskglobalobjid
-			$restriction = [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->props['taskglobalobjid'], VALUE => $globalobjid]];
-			$contents = mapi_folder_getcontentstable($tfolder);
-			$rows = mapi_table_queryallrows($contents, [PR_ENTRYID], $restriction);
-			if (!empty($rows)) {
-				// If there are multiple, just use the first
-				$entryid = $rows[0][PR_ENTRYID];
+            // Find the task by looking for the taskglobalobjid
+            $restriction = [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->props['taskglobalobjid'], VALUE => $globalobjid]];
+            $contents = mapi_folder_getcontentstable($tfolder);
+            $rows = mapi_table_queryallrows($contents, [PR_ENTRYID], $restriction);
+            if (!empty($rows)) {
+                // If there are multiple, just use the first
+                $entryid = $rows[0][PR_ENTRYID];
 
-				$store = $this->getTaskFolderStore();
+                $store = $this->getTaskFolderStore();
 
-				return mapi_msgstore_openentry($store, $entryid);
-			}
-			// None found, create one if possible
-			if (!$create) {
-				return false;
-			}
+                return mapi_msgstore_openentry($store, $entryid);
+            }
+            // None found, create one if possible
+            if (!$create) {
+                return false;
+            }
 
-			$task = mapi_folder_createmessage($tfolder);
+            $task = mapi_folder_createmessage($tfolder);
 
-			$sub = $this->getEmbeddedTask($this->message);
-			mapi_copyto($sub, [], [], $task);
+            $sub = $this->getEmbeddedTask($this->message);
+            mapi_copyto($sub, [], [], $task);
 
-			// Copy sender information from the e-mail
-			$senderprops = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY]);
-			mapi_setprops($task, $senderprops);
+            // Copy sender information from the e-mail
+            $senderprops = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY]);
+            mapi_setprops($task, $senderprops);
 
-			$senderprops = mapi_getprops($this->message, [PR_SENDER_NAME, PR_SENDER_EMAIL_ADDRESS, PR_SENDER_ENTRYID, PR_SENDER_ADDRTYPE, PR_SENDER_SEARCH_KEY]);
-			mapi_setprops($task, $senderprops);
+            $senderprops = mapi_getprops($this->message, [PR_SENDER_NAME, PR_SENDER_EMAIL_ADDRESS, PR_SENDER_ENTRYID, PR_SENDER_ADDRTYPE, PR_SENDER_SEARCH_KEY]);
+            mapi_setprops($task, $senderprops);
 
-			return $task;
-		}
+            return $task;
+        }
 
-		// Organizer functions (called by the organizer)
+        // Organizer functions (called by the organizer)
 
-		/* Processes a task request response, which can be any of the following:
+        /* Processes a task request response, which can be any of the following:
 		 * - Task accept (task history is marked as accepted)
 		 * - Task decline (task history is marked as declined)
 		 * - Task update (updates completion %, etc)
 		 */
-		public function processTaskResponse() {
-			$messageprops = mapi_getprops($this->message, [PR_PROCESSED]);
-			if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED]) {
-				return true;
-			}
-
-			// Get the task for this response
-			$task = $this->getAssociatedTask(false);
-
-			if (!$task) {
-				// Got a response for a task that has been deleted, create a new one and mark it as such
-				$task = $this->getAssociatedTask(true);
-
-				// tdsNOM indicates a task request that had gone missing
-				mapi_setprops($task, [$this->props['taskstate'] => tdsNOM]);
-			}
-
-			// Get the embedded task information and copy it into our task
-			$sub = $this->getEmbeddedTask($this->message);
-			mapi_copyto($sub, [], [$this->props['taskstate'], $this->props['taskhistory'], $this->props['taskmode'], $this->props['taskfcreator']], $task);
-
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-
-			// Set correct taskmode and taskhistory depending on response type
-			switch ($props[PR_MESSAGE_CLASS]) {
-				case 'IPM.TaskRequest.Accept':
-					$taskhistory = thAccepted;
-					$taskstate = tdsACC;
-					$delegationstate = olTaskDelegationAccepted;
-					break;
-
-				case 'IPM.TaskRequest.Decline':
-					$taskhistory = thDeclined;
-					$taskstate = tdsDEC;
-					$delegationstate = olTaskDelegationDeclined;
-					break;
-
-				case 'IPM.TaskRequest.Update':
-					$taskhistory = thUpdated;
-					$taskstate = tdsACC; // Doesn't actually change anything
-					$delegationstate = olTaskDelegationAccepted;
-					break;
-			}
-
-			// Update taskstate (what the task looks like) and task history (last action done by the assignee)
-			mapi_setprops($task, [$this->props['taskhistory'] => $taskhistory, $this->props['taskstate'] => $taskstate, $this->props['delegationstate'] => $delegationstate, $this->props['ownership'] => olDelegatedTask]);
-
-			mapi_setprops($this->message, [PR_PROCESSED => true]);
-			mapi_savechanges($task);
-
-			return true;
-		}
-
-		/* Create a new message in the current user's outbox and submit it
+        public function processTaskResponse() {
+            $messageprops = mapi_getprops($this->message, [PR_PROCESSED]);
+            if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED]) {
+                return true;
+            }
+
+            // Get the task for this response
+            $task = $this->getAssociatedTask(false);
+
+            if (!$task) {
+                // Got a response for a task that has been deleted, create a new one and mark it as such
+                $task = $this->getAssociatedTask(true);
+
+                // tdsNOM indicates a task request that had gone missing
+                mapi_setprops($task, [$this->props['taskstate'] => tdsNOM]);
+            }
+
+            // Get the embedded task information and copy it into our task
+            $sub = $this->getEmbeddedTask($this->message);
+            mapi_copyto($sub, [], [$this->props['taskstate'], $this->props['taskhistory'], $this->props['taskmode'], $this->props['taskfcreator']], $task);
+
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+
+            // Set correct taskmode and taskhistory depending on response type
+            switch ($props[PR_MESSAGE_CLASS]) {
+                case 'IPM.TaskRequest.Accept':
+                    $taskhistory = thAccepted;
+                    $taskstate = tdsACC;
+                    $delegationstate = olTaskDelegationAccepted;
+                    break;
+
+                case 'IPM.TaskRequest.Decline':
+                    $taskhistory = thDeclined;
+                    $taskstate = tdsDEC;
+                    $delegationstate = olTaskDelegationDeclined;
+                    break;
+
+                case 'IPM.TaskRequest.Update':
+                    $taskhistory = thUpdated;
+                    $taskstate = tdsACC; // Doesn't actually change anything
+                    $delegationstate = olTaskDelegationAccepted;
+                    break;
+            }
+
+            // Update taskstate (what the task looks like) and task history (last action done by the assignee)
+            mapi_setprops($task, [$this->props['taskhistory'] => $taskhistory, $this->props['taskstate'] => $taskstate, $this->props['delegationstate'] => $delegationstate, $this->props['ownership'] => olDelegatedTask]);
+
+            mapi_setprops($this->message, [PR_PROCESSED => true]);
+            mapi_savechanges($task);
+
+            return true;
+        }
+
+        /* Create a new message in the current user's outbox and submit it
 		 *
 		 * Takes the task passed in the constructor as the task to be sent; recipient should
 		 * be pre-existing. The task request will be sent to all recipients.
 		 */
-		public function sendTaskRequest($prefix) {
-			// Generate a TaskGlobalObjectId
-			$taskid = $this->createTGOID();
-			$messageprops = mapi_getprops($this->message, [PR_SUBJECT]);
-
-			// Set properties on Task Request
-			mapi_setprops($this->message, [
-				$this->props['taskglobalobjid'] => $taskid, /* our new taskglobalobjid */
-				$this->props['taskstate'] => tdsACC, 		/* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing, 	/* we're not sending a change */
-				$this->props['updatecount'] => 2,			/* version 2 (no idea) */
-				$this->props['delegationstate'] => olTaskDelegationUnknown, /* no reply yet */
-				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,	/* Task has been assigned */
-				PR_ICON_INDEX => 1283,						/* Task request icon */
-			]);
-			$this->setLastUser();
-			$this->setOwnerForAssignor();
-			mapi_savechanges($this->message);
-
-			// Create outgoing task request message
-			$outgoing = $this->createOutgoingMessage();
-			// No need to copy attachments as task will be attached as embedded message.
-			mapi_copyto($this->message, [], [PR_MESSAGE_ATTACHMENTS], $outgoing);
-
-			// Make it a task request, and put it in sent items after it is sent
-			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest", 		/* class is task request */
-				$this->props['taskstate'] => tdsOWNNEW, 	/* for the recipient the task is new */
-				$this->props['taskmode'] => tdmtTaskReq,	/* for the recipient, it is a request */
-				$this->props['updatecount'] => 1,			/* version 2 is in the attachment */
-				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => 0xFFFFFFFF,				/* show assigned icon */
-			]);
-
-			// Set Body
-			$body = $this->getBody();
-			$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
-			mapi_stream_setsize($stream, strlen($body));
-			mapi_stream_write($stream, $body);
-			mapi_stream_commit($stream);
-
-			$attach = mapi_message_createattach($outgoing);
-			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_SUBJECT]]);
-
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
-
-			mapi_copyto($this->message, [], [], $sub);
-			mapi_savechanges($sub);
-
-			mapi_savechanges($attach);
-
-			mapi_savechanges($outgoing);
-			mapi_message_submitmessage($outgoing);
-
-			return true;
-		}
-
-		// Assignee functions (called by the assignee)
-
-		/* Update task version counter
+        public function sendTaskRequest($prefix) {
+            // Generate a TaskGlobalObjectId
+            $taskid = $this->createTGOID();
+            $messageprops = mapi_getprops($this->message, [PR_SUBJECT]);
+
+            // Set properties on Task Request
+            mapi_setprops($this->message, [
+                $this->props['taskglobalobjid'] => $taskid, /* our new taskglobalobjid */
+                $this->props['taskstate'] => tdsACC, 		/* state for our outgoing request */
+                $this->props['taskmode'] => tdmtNothing, 	/* we're not sending a change */
+                $this->props['updatecount'] => 2,			/* version 2 (no idea) */
+                $this->props['delegationstate'] => olTaskDelegationUnknown, /* no reply yet */
+                $this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
+                $this->props['taskhistory'] => thAssigned,	/* Task has been assigned */
+                PR_ICON_INDEX => 1283,						/* Task request icon */
+            ]);
+            $this->setLastUser();
+            $this->setOwnerForAssignor();
+            mapi_savechanges($this->message);
+
+            // Create outgoing task request message
+            $outgoing = $this->createOutgoingMessage();
+            // No need to copy attachments as task will be attached as embedded message.
+            mapi_copyto($this->message, [], [PR_MESSAGE_ATTACHMENTS], $outgoing);
+
+            // Make it a task request, and put it in sent items after it is sent
+            mapi_setprops($outgoing, [
+                PR_MESSAGE_CLASS => "IPM.TaskRequest", 		/* class is task request */
+                $this->props['taskstate'] => tdsOWNNEW, 	/* for the recipient the task is new */
+                $this->props['taskmode'] => tdmtTaskReq,	/* for the recipient, it is a request */
+                $this->props['updatecount'] => 1,			/* version 2 is in the attachment */
+                PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
+                PR_ICON_INDEX => 0xFFFFFFFF,				/* show assigned icon */
+            ]);
+
+            // Set Body
+            $body = $this->getBody();
+            $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+            mapi_stream_setsize($stream, strlen($body));
+            mapi_stream_write($stream, $body);
+            mapi_stream_commit($stream);
+
+            $attach = mapi_message_createattach($outgoing);
+            mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_SUBJECT]]);
+
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+
+            mapi_copyto($this->message, [], [], $sub);
+            mapi_savechanges($sub);
+
+            mapi_savechanges($attach);
+
+            mapi_savechanges($outgoing);
+            mapi_message_submitmessage($outgoing);
+
+            return true;
+        }
+
+        // Assignee functions (called by the assignee)
+
+        /* Update task version counter
 		 *
 		 * Must be called before each update to increase counter
 		 */
-		public function updateTaskRequest() {
-			$messageprops = mapi_getprops($this->message, [$this->props['updatecount']]);
-			if (isset($messageprops)) {
-				++$messageprops[$this->props['updatecount']];
-			}
-			else {
-				$messageprops[$this->props['updatecount']] = 1;
-			}
-
-			mapi_setprops($this->message, $messageprops);
-		}
-
-		/* Process a task request
+        public function updateTaskRequest() {
+            $messageprops = mapi_getprops($this->message, [$this->props['updatecount']]);
+            if (isset($messageprops)) {
+                ++$messageprops[$this->props['updatecount']];
+            }
+            else {
+                $messageprops[$this->props['updatecount']] = 1;
+            }
+
+            mapi_setprops($this->message, $messageprops);
+        }
+
+        /* Process a task request
 		 *
 		 * Message passed should be an IPM.TaskRequest message. The task request is then processed to create
 		 * the task in the tasks folder if needed.
 		 */
-		public function processTaskRequest() {
-			if (!$this->isTaskRequest()) {
-				return false;
-			}
+        public function processTaskRequest() {
+            if (!$this->isTaskRequest()) {
+                return false;
+            }
 
-			$messageprops = mapi_getprops($this->message, [PR_PROCESSED]);
-			if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED]) {
-				return true;
-			}
+            $messageprops = mapi_getprops($this->message, [PR_PROCESSED]);
+            if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED]) {
+                return true;
+            }
 
-			$task = $this->getAssociatedTask(true);
-			$taskProps = mapi_getprops($task, [$this->props['taskmultrecips']]);
+            $task = $this->getAssociatedTask(true);
+            $taskProps = mapi_getprops($task, [$this->props['taskmultrecips']]);
 
-			// Set the task state to say that we're the attendee receiving the message, that we have not yet responded and that this message represents no change
-			$taskProps[$this->props["taskstate"]] = tdsOWN;
-			$taskProps[$this->props["taskhistory"]] = thAssigned;
-			$taskProps[$this->props["taskmode"]] = tdmtNothing;
-			$taskProps[$this->props["taskaccepted"]] = false;
-			$taskProps[$this->props["taskfcreator"]] = false;
-			$taskProps[$this->props["ownership"]] = olOwnTask;
-			$taskProps[$this->props["delegationstate"]] = olTaskNotDelegated;
-			$taskProps[PR_ICON_INDEX] = 1282;
+            // Set the task state to say that we're the attendee receiving the message, that we have not yet responded and that this message represents no change
+            $taskProps[$this->props["taskstate"]] = tdsOWN;
+            $taskProps[$this->props["taskhistory"]] = thAssigned;
+            $taskProps[$this->props["taskmode"]] = tdmtNothing;
+            $taskProps[$this->props["taskaccepted"]] = false;
+            $taskProps[$this->props["taskfcreator"]] = false;
+            $taskProps[$this->props["ownership"]] = olOwnTask;
+            $taskProps[$this->props["delegationstate"]] = olTaskNotDelegated;
+            $taskProps[PR_ICON_INDEX] = 1282;
 
-			// This task was assigned to multiple recips, so set this user as owner
-			if (isset($taskProps[$this->props['taskmultrecips']]) && $taskProps[$this->props['taskmultrecips']] == tmrSent) {
-				$loginUserData = $this->retrieveUserData();
+            // This task was assigned to multiple recips, so set this user as owner
+            if (isset($taskProps[$this->props['taskmultrecips']]) && $taskProps[$this->props['taskmultrecips']] == tmrSent) {
+                $loginUserData = $this->retrieveUserData();
 
-				if ($loginUserData) {
-					$taskProps[$this->props['owner']] = $loginUserData[PR_DISPLAY_NAME];
-					$taskProps[$this->props['taskmultrecips']] = tmrReceived;
-				}
-			}
-			mapi_setprops($task, $taskProps);
+                if ($loginUserData) {
+                    $taskProps[$this->props['owner']] = $loginUserData[PR_DISPLAY_NAME];
+                    $taskProps[$this->props['taskmultrecips']] = tmrReceived;
+                }
+            }
+            mapi_setprops($task, $taskProps);
 
-			$this->setAssignorInRecipients($task);
+            $this->setAssignorInRecipients($task);
 
-			mapi_savechanges($task);
+            mapi_savechanges($task);
 
-			$taskprops = mapi_getprops($task, [PR_ENTRYID]);
+            $taskprops = mapi_getprops($task, [PR_ENTRYID]);
 
-			mapi_setprops($this->message, [PR_PROCESSED => true]);
-			mapi_savechanges($this->message);
+            mapi_setprops($this->message, [PR_PROCESSED => true]);
+            mapi_savechanges($this->message);
 
-			return $taskprops[PR_ENTRYID];
-		}
+            return $taskprops[PR_ENTRYID];
+        }
 
-		/* Accept a task request and send the response.
+        /* Accept a task request and send the response.
 		 *
 		 * Message passed should be an IPM.Task (eg the task from getAssociatedTask())
 		 *
@@ -393,28 +393,28 @@ 
 		 *
 		 * @return entryid EntryID of the accepted task
 		 */
-		public function doAccept($prefix) {
-			$messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
+        public function doAccept($prefix) {
+            $messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
 
-			if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
-				return false;
-			} // Can only accept assignee task
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+                return false;
+            } // Can only accept assignee task
 
-			$this->setLastUser();
-			$this->updateTaskRequest();
+            $this->setLastUser();
+            $this->updateTaskRequest();
 
-			// Set as accepted
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true,  $this->props['delegationstate'] => olTaskNotDelegated]);
+            // Set as accepted
+            mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true,  $this->props['delegationstate'] => olTaskNotDelegated]);
 
-			mapi_savechanges($this->message);
+            mapi_savechanges($this->message);
 
-			$this->sendResponse(tdmtTaskAcc, $prefix);
+            $this->sendResponse(tdmtTaskAcc, $prefix);
 
-			// @TODO: delete received task request from Inbox
-			return $this->deleteReceivedTR();
-		}
+            // @TODO: delete received task request from Inbox
+            return $this->deleteReceivedTR();
+        }
 
-		/* Decline a task request and send the response.
+        /* Decline a task request and send the response.
 		 *
 		 * Passed message must be a task request message, ie isTaskRequest() must return TRUE.
 		 *
@@ -422,590 +422,590 @@ 
 		 *
 		 * @return boolean TRUE on success, FALSE on failure
 		 */
-		public function doDecline($prefix) {
-			$messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
+        public function doDecline($prefix) {
+            $messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
 
-			if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
-				return false;
-			} // Can only decline assignee task
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+                return false;
+            } // Can only decline assignee task
 
-			$this->setLastUser();
-			$this->updateTaskRequest();
+            $this->setLastUser();
+            $this->updateTaskRequest();
 
-			// Set as declined
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined,  $this->props['delegationstate'] => olTaskDelegationDeclined]);
+            // Set as declined
+            mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined,  $this->props['delegationstate'] => olTaskDelegationDeclined]);
 
-			mapi_savechanges($this->message);
+            mapi_savechanges($this->message);
 
-			$this->sendResponse(tdmtTaskDec, $prefix);
+            $this->sendResponse(tdmtTaskDec, $prefix);
 
-			return $this->deleteReceivedTR();
-		}
+            return $this->deleteReceivedTR();
+        }
 
-		/* Send an update of the task if requested, and send the Status-On-Completion report if complete and requested
+        /* Send an update of the task if requested, and send the Status-On-Completion report if complete and requested
 		 *
 		 * If no updates were requested from the organizer, this function does nothing.
 		 *
 		 * @return boolean TRUE if the update succeeded, FALSE otherwise.
 		 */
-		public function doUpdate($prefix, $prefixComplete) {
-			$messageprops = mapi_getprops($this->message, [$this->props['taskstate'], PR_SUBJECT]);
+        public function doUpdate($prefix, $prefixComplete) {
+            $messageprops = mapi_getprops($this->message, [$this->props['taskstate'], PR_SUBJECT]);
 
-			if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
-				return false;
-			} // Can only update assignee task
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+                return false;
+            } // Can only update assignee task
 
-			$this->setLastUser();
-			$this->updateTaskRequest();
+            $this->setLastUser();
+            $this->updateTaskRequest();
 
-			// Set as updated
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thUpdated]);
+            // Set as updated
+            mapi_setprops($this->message, [$this->props['taskhistory'] => thUpdated]);
 
-			mapi_savechanges($this->message);
+            mapi_savechanges($this->message);
 
-			$props = mapi_getprops($this->message, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']]);
-			if ($props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
-				$this->sendResponse(tdmtTaskUpd, $prefix);
-			}
+            $props = mapi_getprops($this->message, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']]);
+            if ($props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
+                $this->sendResponse(tdmtTaskUpd, $prefix);
+            }
 
-			if ($props[$this->props['tasksoc']] && $props[$this->props['complete']]) {
-				$outgoing = $this->createOutgoingMessage();
+            if ($props[$this->props['tasksoc']] && $props[$this->props['complete']]) {
+                $outgoing = $this->createOutgoingMessage();
 
-				mapi_setprops($outgoing, [PR_SUBJECT => $prefixComplete . $messageprops[PR_SUBJECT]]);
+                mapi_setprops($outgoing, [PR_SUBJECT => $prefixComplete . $messageprops[PR_SUBJECT]]);
 
-				$this->setRecipientsForResponse($outgoing, tdmtTaskUpd, true);
-				$body = $this->getBody();
-				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
-				mapi_stream_setsize($stream, strlen($body));
-				mapi_stream_write($stream, $body);
-				mapi_stream_commit($stream);
+                $this->setRecipientsForResponse($outgoing, tdmtTaskUpd, true);
+                $body = $this->getBody();
+                $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+                mapi_stream_setsize($stream, strlen($body));
+                mapi_stream_write($stream, $body);
+                mapi_stream_commit($stream);
 
-				mapi_savechanges($outgoing);
-				mapi_message_submitmessage($outgoing);
-			}
-		}
+                mapi_savechanges($outgoing);
+                mapi_message_submitmessage($outgoing);
+            }
+        }
 
-		// Internal functions
+        // Internal functions
 
-		/* Get the store associated with the task
+        /* Get the store associated with the task
 		 *
 		 * Normally this will just open the store that the processed message is in. However, if the message is opened
 		 * by a delegate, this function opens the store that the message was delegated from.
 		 */
-		public function getTaskFolderStore() {
-			$ownerentryid = false;
-
-			$rcvdprops = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID]);
-			if (isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
-				$ownerentryid = $rcvdprops;
-			}
-			if (!$ownerentryid) {
-				return $this->store;
-			}
-			$ab = mapi_openaddressbook($session);
-			if (!$ab) {
-				return false;
-			}
-
-			$mailuser = mapi_ab_openentry($ab, $ownerentryid);
-			if (!$mailuser) {
-				return false;
-			}
-			$mailuserprops = mapi_getprops($mailuser, [PR_EMAIL_ADDRESS]);
-			if (!isset($mailuserprops[PR_EMAIL_ADDRESS])) {
-				return false;
-			}
-
-			$storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
-
-			return mapi_openmsgstore($this->session, $storeid);
-		}
-
-		/* Open the default task folder for the current user, or the specified user if passed
+        public function getTaskFolderStore() {
+            $ownerentryid = false;
+
+            $rcvdprops = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID]);
+            if (isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+                $ownerentryid = $rcvdprops;
+            }
+            if (!$ownerentryid) {
+                return $this->store;
+            }
+            $ab = mapi_openaddressbook($session);
+            if (!$ab) {
+                return false;
+            }
+
+            $mailuser = mapi_ab_openentry($ab, $ownerentryid);
+            if (!$mailuser) {
+                return false;
+            }
+            $mailuserprops = mapi_getprops($mailuser, [PR_EMAIL_ADDRESS]);
+            if (!isset($mailuserprops[PR_EMAIL_ADDRESS])) {
+                return false;
+            }
+
+            $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
+
+            return mapi_openmsgstore($this->session, $storeid);
+        }
+
+        /* Open the default task folder for the current user, or the specified user if passed
 		 *
 		 * @param $ownerentryid (Optional)EntryID of user for which we are opening the task folder
 		 */
-		public function getDefaultTasksFolder() {
-			$store = $this->getTaskFolderStore();
-
-			$inbox = mapi_msgstore_getreceivefolder($store);
-			$inboxprops = mapi_getprops($inbox, [PR_IPM_TASK_ENTRYID]);
-			if (!isset($inboxprops[PR_IPM_TASK_ENTRYID])) {
-				return false;
-			}
-
-			return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
-		}
-
-		public function getSentReprProps($store) {
-			$storeprops = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID]);
-			if (!isset($storeprops[PR_MAILBOX_OWNER_ENTRYID])) {
-				return false;
-			}
-
-			$ab = mapi_openaddressbook($this->session);
-			$mailuser = mapi_ab_openentry($ab, $storeprops[PR_MAILBOX_OWNER_ENTRYID]);
-			$mailuserprops = mapi_getprops($mailuser, [PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_DISPLAY_NAME, PR_SEARCH_KEY, PR_ENTRYID]);
-
-			$props = [];
-			$props[PR_SENT_REPRESENTING_ADDRTYPE] = $mailuserprops[PR_ADDRTYPE];
-			$props[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $mailuserprops[PR_EMAIL_ADDRESS];
-			$props[PR_SENT_REPRESENTING_NAME] = $mailuserprops[PR_DISPLAY_NAME];
-			$props[PR_SENT_REPRESENTING_SEARCH_KEY] = $mailuserprops[PR_SEARCH_KEY];
-			$props[PR_SENT_REPRESENTING_ENTRYID] = $mailuserprops[PR_ENTRYID];
-
-			return $props;
-		}
-
-		/*
+        public function getDefaultTasksFolder() {
+            $store = $this->getTaskFolderStore();
+
+            $inbox = mapi_msgstore_getreceivefolder($store);
+            $inboxprops = mapi_getprops($inbox, [PR_IPM_TASK_ENTRYID]);
+            if (!isset($inboxprops[PR_IPM_TASK_ENTRYID])) {
+                return false;
+            }
+
+            return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
+        }
+
+        public function getSentReprProps($store) {
+            $storeprops = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID]);
+            if (!isset($storeprops[PR_MAILBOX_OWNER_ENTRYID])) {
+                return false;
+            }
+
+            $ab = mapi_openaddressbook($this->session);
+            $mailuser = mapi_ab_openentry($ab, $storeprops[PR_MAILBOX_OWNER_ENTRYID]);
+            $mailuserprops = mapi_getprops($mailuser, [PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_DISPLAY_NAME, PR_SEARCH_KEY, PR_ENTRYID]);
+
+            $props = [];
+            $props[PR_SENT_REPRESENTING_ADDRTYPE] = $mailuserprops[PR_ADDRTYPE];
+            $props[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $mailuserprops[PR_EMAIL_ADDRESS];
+            $props[PR_SENT_REPRESENTING_NAME] = $mailuserprops[PR_DISPLAY_NAME];
+            $props[PR_SENT_REPRESENTING_SEARCH_KEY] = $mailuserprops[PR_SEARCH_KEY];
+            $props[PR_SENT_REPRESENTING_ENTRYID] = $mailuserprops[PR_ENTRYID];
+
+            return $props;
+        }
+
+        /*
 		 * Creates an outgoing message based on the passed message - will set delegate information
 		 * and sentmail folder
 		 */
-		public function createOutgoingMessage() {
-			// Open our default store for this user (that's the only store we can submit in)
-			$store = $this->getDefaultStore();
-			$storeprops = mapi_getprops($store, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID]);
+        public function createOutgoingMessage() {
+            // Open our default store for this user (that's the only store we can submit in)
+            $store = $this->getDefaultStore();
+            $storeprops = mapi_getprops($store, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID]);
 
-			$outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
-			if (!$outbox) {
-				return false;
-			}
+            $outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
+            if (!$outbox) {
+                return false;
+            }
 
-			$outgoing = mapi_folder_createmessage($outbox);
-			if (!$outgoing) {
-				return false;
-			}
+            $outgoing = mapi_folder_createmessage($outbox);
+            if (!$outgoing) {
+                return false;
+            }
 
-			// Set SENT_REPRESENTING in case we're sending as a delegate
-			$ownerstore = $this->getTaskFolderStore();
-			$sentreprprops = $this->getSentReprProps($ownerstore);
-			mapi_setprops($outgoing, $sentreprprops);
+            // Set SENT_REPRESENTING in case we're sending as a delegate
+            $ownerstore = $this->getTaskFolderStore();
+            $sentreprprops = $this->getSentReprProps($ownerstore);
+            mapi_setprops($outgoing, $sentreprprops);
 
-			mapi_setprops($outgoing, [PR_SENTMAIL_ENTRYID => $storeprops[PR_IPM_SENTMAIL_ENTRYID]]);
+            mapi_setprops($outgoing, [PR_SENTMAIL_ENTRYID => $storeprops[PR_IPM_SENTMAIL_ENTRYID]]);
 
-			return $outgoing;
-		}
+            return $outgoing;
+        }
 
-		/*
+        /*
 		 * Send a response message (from assignee back to organizer).
 		 *
 		 * @param $type int Type of response (tdmtTaskAcc, tdmtTaskDec, tdmtTaskUpd);
 		 * @return boolean TRUE on success
 		 */
-		public function sendResponse($type, $prefix) {
-			// Create a message in our outbox
-			$outgoing = $this->createOutgoingMessage();
-
-			$messageprops = mapi_getprops($this->message, [PR_SUBJECT]);
-
-			$attach = mapi_message_createattach($outgoing);
-			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], PR_ATTACHMENT_HIDDEN => true]);
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
-
-			mapi_copyto($this->message, [], [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_SEARCH_KEY], $outgoing);
-			mapi_copyto($this->message, [], [], $sub);
-
-			if (!$this->setRecipientsForResponse($outgoing, $type)) {
-				return false;
-			}
-
-			switch ($type) {
-				case tdmtTaskAcc:
-					$messageclass = "IPM.TaskRequest.Accept";
-					break;
-
-				case tdmtTaskDec:
-					$messageclass = "IPM.TaskRequest.Decline";
-					break;
-
-				case tdmtTaskUpd:
-					$messageclass = "IPM.TaskRequest.Update";
-					break;
-			}
-
-			mapi_savechanges($sub);
-			mapi_savechanges($attach);
-
-			// Set Body
-			$body = $this->getBody();
-			$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
-			mapi_stream_setsize($stream, strlen($body));
-			mapi_stream_write($stream, $body);
-			mapi_stream_commit($stream);
-
-			// Set subject, taskmode, message class, icon index, response time
-			mapi_setprops($outgoing, [PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
-				$this->props['taskmode'] => $type,
-				PR_MESSAGE_CLASS => $messageclass,
-				PR_ICON_INDEX => 0xFFFFFFFF,
-				$this->props['assignedtime'] => time(), ]);
-
-			mapi_savechanges($outgoing);
-			mapi_message_submitmessage($outgoing);
-
-			return true;
-		}
-
-		public function getDefaultStore() {
-			$table = mapi_getmsgstorestable($this->session);
-			$rows = mapi_table_queryallrows($table, [PR_DEFAULT_STORE, PR_ENTRYID]);
-			foreach ($rows as $row) {
-				if ($row[PR_DEFAULT_STORE]) {
-					return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
-				}
-			}
-
-			return false;
-		}
-
-		/* Creates a new TaskGlobalObjId
+        public function sendResponse($type, $prefix) {
+            // Create a message in our outbox
+            $outgoing = $this->createOutgoingMessage();
+
+            $messageprops = mapi_getprops($this->message, [PR_SUBJECT]);
+
+            $attach = mapi_message_createattach($outgoing);
+            mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], PR_ATTACHMENT_HIDDEN => true]);
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+
+            mapi_copyto($this->message, [], [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_SEARCH_KEY], $outgoing);
+            mapi_copyto($this->message, [], [], $sub);
+
+            if (!$this->setRecipientsForResponse($outgoing, $type)) {
+                return false;
+            }
+
+            switch ($type) {
+                case tdmtTaskAcc:
+                    $messageclass = "IPM.TaskRequest.Accept";
+                    break;
+
+                case tdmtTaskDec:
+                    $messageclass = "IPM.TaskRequest.Decline";
+                    break;
+
+                case tdmtTaskUpd:
+                    $messageclass = "IPM.TaskRequest.Update";
+                    break;
+            }
+
+            mapi_savechanges($sub);
+            mapi_savechanges($attach);
+
+            // Set Body
+            $body = $this->getBody();
+            $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+            mapi_stream_setsize($stream, strlen($body));
+            mapi_stream_write($stream, $body);
+            mapi_stream_commit($stream);
+
+            // Set subject, taskmode, message class, icon index, response time
+            mapi_setprops($outgoing, [PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
+                $this->props['taskmode'] => $type,
+                PR_MESSAGE_CLASS => $messageclass,
+                PR_ICON_INDEX => 0xFFFFFFFF,
+                $this->props['assignedtime'] => time(), ]);
+
+            mapi_savechanges($outgoing);
+            mapi_message_submitmessage($outgoing);
+
+            return true;
+        }
+
+        public function getDefaultStore() {
+            $table = mapi_getmsgstorestable($this->session);
+            $rows = mapi_table_queryallrows($table, [PR_DEFAULT_STORE, PR_ENTRYID]);
+            foreach ($rows as $row) {
+                if ($row[PR_DEFAULT_STORE]) {
+                    return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
+                }
+            }
+
+            return false;
+        }
+
+        /* Creates a new TaskGlobalObjId
 		 *
 		 * Just 16 bytes of random data
 		 */
-		public function createTGOID() {
-			$goid = "";
-			for ($i = 0; $i < 16; ++$i) {
-				$goid .= chr(rand(0, 255));
-			}
-
-			return $goid;
-		}
-
-		public function getEmbeddedTask($message) {
-			$table = mapi_message_getattachmenttable($message);
-			$rows = mapi_table_queryallrows($table, [PR_ATTACH_NUM]);
-
-			// Assume only one attachment
-			if (empty($rows)) {
-				return false;
-			}
-
-			$attach = mapi_message_openattach($message, $rows[0][PR_ATTACH_NUM]);
-
-			return mapi_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, 0);
-		}
-
-		public function setLastUser() {
-			$delegatestore = $this->getDefaultStore();
-			$taskstore = $this->getTaskFolderStore();
-
-			$delegateprops = mapi_getprops($delegatestore, [PR_MAILBOX_OWNER_NAME]);
-			$taskprops = mapi_getprops($taskstore, [PR_MAILBOX_OWNER_NAME]);
-
-			// The owner of the task
-			$username = $delegateprops[PR_MAILBOX_OWNER_NAME];
-			// This is me (the one calling the script)
-			$delegate = $taskprops[PR_MAILBOX_OWNER_NAME];
-
-			mapi_setprops($this->message, [$this->props["tasklastuser"] => $username, $this->props["tasklastdelegate"] => $delegate, $this->props['assignedtime'] => time()]);
-		}
-
-		/** Assignee becomes the owner when a user/assignor assigns any task to someone. Also there can be more than one assignee.
-		 * This function sets assignee as owner in the assignor's copy of task.
-		 */
-		public function setOwnerForAssignor() {
-			$recipTable = mapi_message_getrecipienttable($this->message);
-			$recips = mapi_table_queryallrows($recipTable, [PR_DISPLAY_NAME]);
-
-			if (!empty($recips)) {
-				$owner = [];
-				foreach ($recips as $value) {
-					$owner[] = $value[PR_DISPLAY_NAME];
-				}
-
-				$props = [$this->props['owner'] => implode("; ", $owner)];
-				mapi_setprops($this->message, $props);
-			}
-		}
-
-		/** Sets assignor as recipients in assignee's copy of task.
-		 *
-		 * If assignor has requested task updates then the assignor is added as recipient type MAPI_CC.
-		 *
-		 * Also if assignor has request SOC then the assignor is also add as recipient type MAPI_BCC
-		 *
-		 * @param $task message MAPI message which is the assignee's copy of the task
-		 */
-		public function setAssignorInRecipients($task) {
-			$recipTable = mapi_message_getrecipienttable($task);
-
-			// Delete all MAPI_TO recipients
-			$recips = mapi_table_queryallrows($recipTable, [PR_ROWID], [RES_PROPERTY,
-				[RELOP => RELOP_EQ,
-					ULPROPTAG => PR_RECIPIENT_TYPE,
-					VALUE => MAPI_TO,
-				], ]);
-			foreach ($recips as $recip) {
-				mapi_message_modifyrecipients($task, MODRECIP_REMOVE, [$recip]);
-			}
-
-			$recips = [];
-			$taskReqProps = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_ADDRTYPE]);
-			$associatedTaskProps = mapi_getprops($task, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['taskmultrecips']]);
-
-			// Build assignor info
-			$assignor = [PR_ENTRYID => $taskReqProps[PR_SENT_REPRESENTING_ENTRYID],
-				PR_DISPLAY_NAME => $taskReqProps[PR_SENT_REPRESENTING_NAME],
-				PR_EMAIL_ADDRESS => $taskReqProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS],
-				PR_RECIPIENT_DISPLAY_NAME => $taskReqProps[PR_SENT_REPRESENTING_NAME],
-				PR_ADDRTYPE => empty($taskReqProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $taskReqProps[PR_SENT_REPRESENTING_ADDRTYPE],
-				PR_RECIPIENT_FLAGS => recipSendable,
-			];
-
-			// Assignor has requested task updates, so set him/her as MAPI_CC in recipienttable.
-			if ((isset($associatedTaskProps[$this->props['taskupdates']]) && $associatedTaskProps[$this->props['taskupdates']]) &&
-				!(isset($associatedTaskProps[$this->props['taskmultrecips']]) && $associatedTaskProps[$this->props['taskmultrecips']] == tmrReceived)) {
-				$assignor[PR_RECIPIENT_TYPE] = MAPI_CC;
-				$recips[] = $assignor;
-			}
-
-			// Assignor wants to receive an email report when task is mark as 'Complete', so in recipients as MAPI_BCC
-			if (isset($associatedTaskProps[$this->props['taskupdates']]) && $associatedTaskProps[$this->props['tasksoc']]) {
-				$assignor[PR_RECIPIENT_TYPE] = MAPI_BCC;
-				$recips[] = $assignor;
-			}
-
-			if (!empty($recips)) {
-				mapi_message_modifyrecipients($task, MODRECIP_ADD, $recips);
-			}
-		}
-
-		/** Returns user information who has task request.
-		 */
-		public function retrieveUserData() {
-			// get user entryid
-			$storeProps = mapi_getprops($this->store, [PR_USER_ENTRYID]);
-			if (!$storeProps[PR_USER_ENTRYID]) {
-				return false;
-			}
-
-			$ab = mapi_openaddressbook($this->session);
-			// open the user entry
-			$user = mapi_ab_openentry($ab, $storeProps[PR_USER_ENTRYID]);
-			if (!$user) {
-				return false;
-			}
-
-			// receive userdata
-			$userProps = mapi_getprops($user, [PR_DISPLAY_NAME]);
-			if (!$userProps[PR_DISPLAY_NAME]) {
-				return false;
-			}
-
-			return $userProps;
-		}
-
-		/** Deletes incoming task request from Inbox.
-		 *
-		 * @returns array returns PR_ENTRYID, PR_STORE_ENTRYID and PR_PARENT_ENTRYID of the deleted task request
-		 */
-		public function deleteReceivedTR() {
-			$store = $this->getTaskFolderStore();
-			$inbox = mapi_msgstore_getreceivefolder($store);
-
-			$storeProps = mapi_getprops($store, [PR_IPM_WASTEBASKET_ENTRYID]);
-			$props = mapi_getprops($this->message, [$this->props['taskglobalobjid']]);
-			$globalobjid = $props[$this->props['taskglobalobjid']];
-
-			// Find the task by looking for the taskglobalobjid
-			$restriction = [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->props['taskglobalobjid'], VALUE => $globalobjid]];
-
-			$contents = mapi_folder_getcontentstable($inbox);
-
-			$rows = mapi_table_queryallrows($contents, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID], $restriction);
-
-			$taskrequest = false;
-			if (!empty($rows)) {
-				// If there are multiple, just use the first
-				$entryid = $rows[0][PR_ENTRYID];
-				$wastebasket = mapi_msgstore_openentry($store, $storeProps[PR_IPM_WASTEBASKET_ENTRYID]);
-				mapi_folder_copymessages($inbox, [$entryid], $wastebasket, MESSAGE_MOVE);
-
-				return [PR_ENTRYID => $entryid, PR_PARENT_ENTRYID => $rows[0][PR_PARENT_ENTRYID], PR_STORE_ENTRYID => $rows[0][PR_STORE_ENTRYID]];
-			}
-
-			return false;
-		}
-
-		/** Converts already sent task request to normal task.
-		 */
-		public function createUnassignedCopy() {
-			mapi_deleteprops($this->message, [$this->props['taskglobalobjid']]);
-			mapi_setprops($this->message, [$this->props['updatecount'] => 1]);
-
-			// Remove all recipents
-			$this->deleteAllRecipients($this->message);
-		}
-
-		/** Sets recipients for the outgoing message according to type of the response.
-		 *
-		 * If it is a task update, then only recipient type MAPI_CC are taken from the task message.
-		 *
-		 * If it is accept/decline response, then PR_SENT_REPRESENTATING_XXXX are taken as recipient.
-		 *
-		 *@param $outgoing MAPI_message outgoing mapi message
-		 *@param $responseType String response type
-		 *@param $sendSOC Boolean true if sending complete response else false
-		 */
-		public function setRecipientsForResponse($outgoing, $responseType, $sendSOC = false) {
-			// Clear recipients from outgoing msg
-			$this->deleteAllRecipients($outgoing);
-
-			// If it is a task update then get MAPI_CC recipients which are assignors who has asked for task update.
-			if ($responseType == tdmtTaskUpd) {
-				$recipTable = mapi_message_getrecipienttable($this->message);
-				$recips = mapi_table_queryallrows($recipTable, $this->recipprops, [RES_PROPERTY,
-					[RELOP => RELOP_EQ,
-						ULPROPTAG => PR_RECIPIENT_TYPE,
-						VALUE => ($sendSOC ? MAPI_BCC : MAPI_CC),
-					],
-				]);
-
-				// No recipients found, return error
-				if (empty($recips)) {
-					return false;
-				}
-
-				foreach ($recips as $recip) {
-					$recip[PR_RECIPIENT_TYPE] = MAPI_TO;	// Change recipient type to MAPI_TO
-					mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
-				}
-
-				return true;
-			}
-
-			$orgprops = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_ENTRYID, PR_SUBJECT]);
-			$recip = [PR_DISPLAY_NAME => $orgprops[PR_SENT_REPRESENTING_NAME], PR_EMAIL_ADDRESS => $orgprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS], PR_ADDRTYPE => $orgprops[PR_SENT_REPRESENTING_ADDRTYPE], PR_ENTRYID => $orgprops[PR_SENT_REPRESENTING_ENTRYID], PR_RECIPIENT_TYPE => MAPI_TO];
-
-			mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
-
-			return true;
-		}
-
-		/** Adds task details to message body and returns body.
-		 *
-		 *@return string constructed body with task details
-		 */
-		public function getBody() {
-			// @TODO: Fix translations
-
-			$msgProps = mapi_getprops($this->message);
-			$body = "";
-
-			if (isset($msgProps[PR_SUBJECT])) {
-				$body .= "\n" . dgettext("kopano", "Subject") . ":\t" . $msgProps[PR_SUBJECT];
-			}
-			if (isset($msgProps[$this->props['startdate']])) {
-				$body .= "\n" . dgettext("kopano", "Start Date") . ":\t" . strftime(dgettext("kopano", "%A, %B %d, %Y"), $msgProps[$this->props['startdate']]);
-			}
-			if (isset($msgProps[$this->props['duedate']])) {
-				$body .= "\n" . dgettext("kopano", "Due Date") . ":\t" . strftime(dgettext("kopano", "%A, %B %d, %Y"), $msgProps[$this->props['duedate']]);
-			}
-			$body .= "\n";
-
-			if (isset($msgProps[$this->props['status']])) {
-				$body .= "\n" . dgettext("kopano", "Status") . ":\t";
-				if ($msgProps[$this->props['status']] == 0) {
-					$body .= dgettext("kopano", "Not Started");
-				}
-				elseif ($msgProps[$this->props['status']] == 1) {
-					$body .= dgettext("kopano", "In Progress");
-				}
-				elseif ($msgProps[$this->props['status']] == 2) {
-					$body .= dgettext("kopano", "Complete");
-				}
-				elseif ($msgProps[$this->props['status']] == 3) {
-					$body .= dgettext("kopano", "Wait for other person");
-				}
-				elseif ($msgProps[$this->props['status']] == 4) {
-					$body .= dgettext("kopano", "Deferred");
-				}
-			}
-
-			if (isset($msgProps[$this->props['percent_complete']])) {
-				$body .= "\n" . dgettext("kopano", "Percent Complete") . ":\t" . ($msgProps[$this->props['percent_complete']] * 100) . '%';
-
-				if ($msgProps[$this->props['percent_complete']] == 1 && isset($msgProps[$this->props['datecompleted']])) {
-					$body .= "\n" . dgettext("kopano", "Date Completed") . ":\t" . strftime("%A, %B %d, %Y", $msgProps[$this->props['datecompleted']]);
-				}
-			}
-			$body .= "\n";
-
-			if (isset($msgProps[$this->props['totalwork']])) {
-				$body .= "\n" . dgettext("kopano", "Total Work") . ":\t" . ($msgProps[$this->props['totalwork']] / 60) . " " . dgettext("kopano", "hours");
-			}
-			if (isset($msgProps[$this->props['actualwork']])) {
-				$body .= "\n" . dgettext("kopano", "Actual Work") . ":\t" . ($msgProps[$this->props['actualwork']] / 60) . " " . dgettext("kopano", "hours");
-			}
-			$body .= "\n";
-
-			if (isset($msgProps[$this->props['owner']])) {
-				$body .= "\n" . dgettext("kopano", "Owner") . ":\t" . $msgProps[$this->props['owner']];
-			}
-			$body .= "\n";
-
-			if (isset($msgProps[$this->props['categories']]) && !empty($msgProps[$this->props['categories']])) {
-				$body .= "\nCategories:\t" . implode(', ', $msgProps[$this->props['categories']]);
-			}
-			if (isset($msgProps[$this->props['companies']]) && !empty($msgProps[$this->props['companies']])) {
-				$body .= "\nCompany:\t" . implode(', ', $msgProps[$this->props['companies']]);
-			}
-			if (isset($msgProps[$this->props['billinginformation']])) {
-				$body .= "\n" . dgettext("kopano", "Billing Information") . ":\t" . $msgProps[$this->props['billinginformation']];
-			}
-			if (isset($msgProps[$this->props['mileage']])) {
-				$body .= "\n" . dgettext("kopano", "Mileage") . ":\t" . $msgProps[$this->props['mileage']];
-			}
-			$body .= "\n";
-
-			$content = mapi_message_openproperty($this->message, PR_BODY);
-			$body .= "\n" . trim($content, "\0");
-
-			return $body;
-		}
-
-		/** Reclaims ownership of a decline task.
-		 *
-		 * Deletes taskrequest properties and recipients from the task message.
-		 */
-		public function reclaimownership() {
-			// Delete task request properties
-			mapi_deleteprops($this->message, [$this->props['taskglobalobjid'],
-				$this->props['tasklastuser'],
-				$this->props['tasklastdelegate'], ]);
-
-			mapi_setprops($this->message, [$this->props['updatecount'] => 2,
-				$this->props['taskfcreator'] => true, ]);
-
-			// Delete recipients
-			$this->deleteAllRecipients($this->message);
-		}
-
-		/** Deletes all recipients from given message object.
-		 *
-		 *@param $message MAPI message from which recipients are to be removed
-		 */
-		public function deleteAllRecipients($message) {
-			$recipTable = mapi_message_getrecipienttable($message);
-			$recipRows = mapi_table_queryallrows($recipTable, [PR_ROWID]);
-
-			foreach ($recipRows as $recipient) {
-				mapi_message_modifyrecipients($message, MODRECIP_REMOVE, [$recipient]);
-			}
-		}
-
-		public function sendCompleteUpdate($prefix, $action, $prefixComplete) {
-			$messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
-
-			if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
-				return false;
-			} // Can only decline assignee task
-
-			mapi_setprops($this->message, [$this->props['complete'] => true,
-				$this->props['datecompleted'] => $action["dateCompleted"],
-				$this->props['status'] => 2,
-				$this->props['percent_complete'] => 1, ]);
-
-			$this->doUpdate($prefix, $prefixComplete);
-		}
-	}
+        public function createTGOID() {
+            $goid = "";
+            for ($i = 0; $i < 16; ++$i) {
+                $goid .= chr(rand(0, 255));
+            }
+
+            return $goid;
+        }
+
+        public function getEmbeddedTask($message) {
+            $table = mapi_message_getattachmenttable($message);
+            $rows = mapi_table_queryallrows($table, [PR_ATTACH_NUM]);
+
+            // Assume only one attachment
+            if (empty($rows)) {
+                return false;
+            }
+
+            $attach = mapi_message_openattach($message, $rows[0][PR_ATTACH_NUM]);
+
+            return mapi_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, 0);
+        }
+
+        public function setLastUser() {
+            $delegatestore = $this->getDefaultStore();
+            $taskstore = $this->getTaskFolderStore();
+
+            $delegateprops = mapi_getprops($delegatestore, [PR_MAILBOX_OWNER_NAME]);
+            $taskprops = mapi_getprops($taskstore, [PR_MAILBOX_OWNER_NAME]);
+
+            // The owner of the task
+            $username = $delegateprops[PR_MAILBOX_OWNER_NAME];
+            // This is me (the one calling the script)
+            $delegate = $taskprops[PR_MAILBOX_OWNER_NAME];
+
+            mapi_setprops($this->message, [$this->props["tasklastuser"] => $username, $this->props["tasklastdelegate"] => $delegate, $this->props['assignedtime'] => time()]);
+        }
+
+        /** Assignee becomes the owner when a user/assignor assigns any task to someone. Also there can be more than one assignee.
+         * This function sets assignee as owner in the assignor's copy of task.
+         */
+        public function setOwnerForAssignor() {
+            $recipTable = mapi_message_getrecipienttable($this->message);
+            $recips = mapi_table_queryallrows($recipTable, [PR_DISPLAY_NAME]);
+
+            if (!empty($recips)) {
+                $owner = [];
+                foreach ($recips as $value) {
+                    $owner[] = $value[PR_DISPLAY_NAME];
+                }
+
+                $props = [$this->props['owner'] => implode("; ", $owner)];
+                mapi_setprops($this->message, $props);
+            }
+        }
+
+        /** Sets assignor as recipients in assignee's copy of task.
+         *
+         * If assignor has requested task updates then the assignor is added as recipient type MAPI_CC.
+         *
+         * Also if assignor has request SOC then the assignor is also add as recipient type MAPI_BCC
+         *
+         * @param $task message MAPI message which is the assignee's copy of the task
+         */
+        public function setAssignorInRecipients($task) {
+            $recipTable = mapi_message_getrecipienttable($task);
+
+            // Delete all MAPI_TO recipients
+            $recips = mapi_table_queryallrows($recipTable, [PR_ROWID], [RES_PROPERTY,
+                [RELOP => RELOP_EQ,
+                    ULPROPTAG => PR_RECIPIENT_TYPE,
+                    VALUE => MAPI_TO,
+                ], ]);
+            foreach ($recips as $recip) {
+                mapi_message_modifyrecipients($task, MODRECIP_REMOVE, [$recip]);
+            }
+
+            $recips = [];
+            $taskReqProps = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_ADDRTYPE]);
+            $associatedTaskProps = mapi_getprops($task, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['taskmultrecips']]);
+
+            // Build assignor info
+            $assignor = [PR_ENTRYID => $taskReqProps[PR_SENT_REPRESENTING_ENTRYID],
+                PR_DISPLAY_NAME => $taskReqProps[PR_SENT_REPRESENTING_NAME],
+                PR_EMAIL_ADDRESS => $taskReqProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS],
+                PR_RECIPIENT_DISPLAY_NAME => $taskReqProps[PR_SENT_REPRESENTING_NAME],
+                PR_ADDRTYPE => empty($taskReqProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $taskReqProps[PR_SENT_REPRESENTING_ADDRTYPE],
+                PR_RECIPIENT_FLAGS => recipSendable,
+            ];
+
+            // Assignor has requested task updates, so set him/her as MAPI_CC in recipienttable.
+            if ((isset($associatedTaskProps[$this->props['taskupdates']]) && $associatedTaskProps[$this->props['taskupdates']]) &&
+                !(isset($associatedTaskProps[$this->props['taskmultrecips']]) && $associatedTaskProps[$this->props['taskmultrecips']] == tmrReceived)) {
+                $assignor[PR_RECIPIENT_TYPE] = MAPI_CC;
+                $recips[] = $assignor;
+            }
+
+            // Assignor wants to receive an email report when task is mark as 'Complete', so in recipients as MAPI_BCC
+            if (isset($associatedTaskProps[$this->props['taskupdates']]) && $associatedTaskProps[$this->props['tasksoc']]) {
+                $assignor[PR_RECIPIENT_TYPE] = MAPI_BCC;
+                $recips[] = $assignor;
+            }
+
+            if (!empty($recips)) {
+                mapi_message_modifyrecipients($task, MODRECIP_ADD, $recips);
+            }
+        }
+
+        /** Returns user information who has task request.
+         */
+        public function retrieveUserData() {
+            // get user entryid
+            $storeProps = mapi_getprops($this->store, [PR_USER_ENTRYID]);
+            if (!$storeProps[PR_USER_ENTRYID]) {
+                return false;
+            }
+
+            $ab = mapi_openaddressbook($this->session);
+            // open the user entry
+            $user = mapi_ab_openentry($ab, $storeProps[PR_USER_ENTRYID]);
+            if (!$user) {
+                return false;
+            }
+
+            // receive userdata
+            $userProps = mapi_getprops($user, [PR_DISPLAY_NAME]);
+            if (!$userProps[PR_DISPLAY_NAME]) {
+                return false;
+            }
+
+            return $userProps;
+        }
+
+        /** Deletes incoming task request from Inbox.
+         *
+         * @returns array returns PR_ENTRYID, PR_STORE_ENTRYID and PR_PARENT_ENTRYID of the deleted task request
+         */
+        public function deleteReceivedTR() {
+            $store = $this->getTaskFolderStore();
+            $inbox = mapi_msgstore_getreceivefolder($store);
+
+            $storeProps = mapi_getprops($store, [PR_IPM_WASTEBASKET_ENTRYID]);
+            $props = mapi_getprops($this->message, [$this->props['taskglobalobjid']]);
+            $globalobjid = $props[$this->props['taskglobalobjid']];
+
+            // Find the task by looking for the taskglobalobjid
+            $restriction = [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->props['taskglobalobjid'], VALUE => $globalobjid]];
+
+            $contents = mapi_folder_getcontentstable($inbox);
+
+            $rows = mapi_table_queryallrows($contents, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID], $restriction);
+
+            $taskrequest = false;
+            if (!empty($rows)) {
+                // If there are multiple, just use the first
+                $entryid = $rows[0][PR_ENTRYID];
+                $wastebasket = mapi_msgstore_openentry($store, $storeProps[PR_IPM_WASTEBASKET_ENTRYID]);
+                mapi_folder_copymessages($inbox, [$entryid], $wastebasket, MESSAGE_MOVE);
+
+                return [PR_ENTRYID => $entryid, PR_PARENT_ENTRYID => $rows[0][PR_PARENT_ENTRYID], PR_STORE_ENTRYID => $rows[0][PR_STORE_ENTRYID]];
+            }
+
+            return false;
+        }
+
+        /** Converts already sent task request to normal task.
+         */
+        public function createUnassignedCopy() {
+            mapi_deleteprops($this->message, [$this->props['taskglobalobjid']]);
+            mapi_setprops($this->message, [$this->props['updatecount'] => 1]);
+
+            // Remove all recipents
+            $this->deleteAllRecipients($this->message);
+        }
+
+        /** Sets recipients for the outgoing message according to type of the response.
+         *
+         * If it is a task update, then only recipient type MAPI_CC are taken from the task message.
+         *
+         * If it is accept/decline response, then PR_SENT_REPRESENTATING_XXXX are taken as recipient.
+         *
+         *@param $outgoing MAPI_message outgoing mapi message
+         *@param $responseType String response type
+         *@param $sendSOC Boolean true if sending complete response else false
+         */
+        public function setRecipientsForResponse($outgoing, $responseType, $sendSOC = false) {
+            // Clear recipients from outgoing msg
+            $this->deleteAllRecipients($outgoing);
+
+            // If it is a task update then get MAPI_CC recipients which are assignors who has asked for task update.
+            if ($responseType == tdmtTaskUpd) {
+                $recipTable = mapi_message_getrecipienttable($this->message);
+                $recips = mapi_table_queryallrows($recipTable, $this->recipprops, [RES_PROPERTY,
+                    [RELOP => RELOP_EQ,
+                        ULPROPTAG => PR_RECIPIENT_TYPE,
+                        VALUE => ($sendSOC ? MAPI_BCC : MAPI_CC),
+                    ],
+                ]);
+
+                // No recipients found, return error
+                if (empty($recips)) {
+                    return false;
+                }
+
+                foreach ($recips as $recip) {
+                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;	// Change recipient type to MAPI_TO
+                    mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
+                }
+
+                return true;
+            }
+
+            $orgprops = mapi_getprops($this->message, [PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_ENTRYID, PR_SUBJECT]);
+            $recip = [PR_DISPLAY_NAME => $orgprops[PR_SENT_REPRESENTING_NAME], PR_EMAIL_ADDRESS => $orgprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS], PR_ADDRTYPE => $orgprops[PR_SENT_REPRESENTING_ADDRTYPE], PR_ENTRYID => $orgprops[PR_SENT_REPRESENTING_ENTRYID], PR_RECIPIENT_TYPE => MAPI_TO];
+
+            mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
+
+            return true;
+        }
+
+        /** Adds task details to message body and returns body.
+         *
+         *@return string constructed body with task details
+         */
+        public function getBody() {
+            // @TODO: Fix translations
+
+            $msgProps = mapi_getprops($this->message);
+            $body = "";
+
+            if (isset($msgProps[PR_SUBJECT])) {
+                $body .= "\n" . dgettext("kopano", "Subject") . ":\t" . $msgProps[PR_SUBJECT];
+            }
+            if (isset($msgProps[$this->props['startdate']])) {
+                $body .= "\n" . dgettext("kopano", "Start Date") . ":\t" . strftime(dgettext("kopano", "%A, %B %d, %Y"), $msgProps[$this->props['startdate']]);
+            }
+            if (isset($msgProps[$this->props['duedate']])) {
+                $body .= "\n" . dgettext("kopano", "Due Date") . ":\t" . strftime(dgettext("kopano", "%A, %B %d, %Y"), $msgProps[$this->props['duedate']]);
+            }
+            $body .= "\n";
+
+            if (isset($msgProps[$this->props['status']])) {
+                $body .= "\n" . dgettext("kopano", "Status") . ":\t";
+                if ($msgProps[$this->props['status']] == 0) {
+                    $body .= dgettext("kopano", "Not Started");
+                }
+                elseif ($msgProps[$this->props['status']] == 1) {
+                    $body .= dgettext("kopano", "In Progress");
+                }
+                elseif ($msgProps[$this->props['status']] == 2) {
+                    $body .= dgettext("kopano", "Complete");
+                }
+                elseif ($msgProps[$this->props['status']] == 3) {
+                    $body .= dgettext("kopano", "Wait for other person");
+                }
+                elseif ($msgProps[$this->props['status']] == 4) {
+                    $body .= dgettext("kopano", "Deferred");
+                }
+            }
+
+            if (isset($msgProps[$this->props['percent_complete']])) {
+                $body .= "\n" . dgettext("kopano", "Percent Complete") . ":\t" . ($msgProps[$this->props['percent_complete']] * 100) . '%';
+
+                if ($msgProps[$this->props['percent_complete']] == 1 && isset($msgProps[$this->props['datecompleted']])) {
+                    $body .= "\n" . dgettext("kopano", "Date Completed") . ":\t" . strftime("%A, %B %d, %Y", $msgProps[$this->props['datecompleted']]);
+                }
+            }
+            $body .= "\n";
+
+            if (isset($msgProps[$this->props['totalwork']])) {
+                $body .= "\n" . dgettext("kopano", "Total Work") . ":\t" . ($msgProps[$this->props['totalwork']] / 60) . " " . dgettext("kopano", "hours");
+            }
+            if (isset($msgProps[$this->props['actualwork']])) {
+                $body .= "\n" . dgettext("kopano", "Actual Work") . ":\t" . ($msgProps[$this->props['actualwork']] / 60) . " " . dgettext("kopano", "hours");
+            }
+            $body .= "\n";
+
+            if (isset($msgProps[$this->props['owner']])) {
+                $body .= "\n" . dgettext("kopano", "Owner") . ":\t" . $msgProps[$this->props['owner']];
+            }
+            $body .= "\n";
+
+            if (isset($msgProps[$this->props['categories']]) && !empty($msgProps[$this->props['categories']])) {
+                $body .= "\nCategories:\t" . implode(', ', $msgProps[$this->props['categories']]);
+            }
+            if (isset($msgProps[$this->props['companies']]) && !empty($msgProps[$this->props['companies']])) {
+                $body .= "\nCompany:\t" . implode(', ', $msgProps[$this->props['companies']]);
+            }
+            if (isset($msgProps[$this->props['billinginformation']])) {
+                $body .= "\n" . dgettext("kopano", "Billing Information") . ":\t" . $msgProps[$this->props['billinginformation']];
+            }
+            if (isset($msgProps[$this->props['mileage']])) {
+                $body .= "\n" . dgettext("kopano", "Mileage") . ":\t" . $msgProps[$this->props['mileage']];
+            }
+            $body .= "\n";
+
+            $content = mapi_message_openproperty($this->message, PR_BODY);
+            $body .= "\n" . trim($content, "\0");
+
+            return $body;
+        }
+
+        /** Reclaims ownership of a decline task.
+         *
+         * Deletes taskrequest properties and recipients from the task message.
+         */
+        public function reclaimownership() {
+            // Delete task request properties
+            mapi_deleteprops($this->message, [$this->props['taskglobalobjid'],
+                $this->props['tasklastuser'],
+                $this->props['tasklastdelegate'], ]);
+
+            mapi_setprops($this->message, [$this->props['updatecount'] => 2,
+                $this->props['taskfcreator'] => true, ]);
+
+            // Delete recipients
+            $this->deleteAllRecipients($this->message);
+        }
+
+        /** Deletes all recipients from given message object.
+         *
+         *@param $message MAPI message from which recipients are to be removed
+         */
+        public function deleteAllRecipients($message) {
+            $recipTable = mapi_message_getrecipienttable($message);
+            $recipRows = mapi_table_queryallrows($recipTable, [PR_ROWID]);
+
+            foreach ($recipRows as $recipient) {
+                mapi_message_modifyrecipients($message, MODRECIP_REMOVE, [$recipient]);
+            }
+        }
+
+        public function sendCompleteUpdate($prefix, $action, $prefixComplete) {
+            $messageprops = mapi_getprops($this->message, [$this->props['taskstate']]);
+
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+                return false;
+            } // Can only decline assignee task
+
+            mapi_setprops($this->message, [$this->props['complete'] => true,
+                $this->props['datecompleted'] => $action["dateCompleted"],
+                $this->props['status'] => 2,
+                $this->props['percent_complete'] => 1, ]);
+
+            $this->doUpdate($prefix, $prefixComplete);
+        }
+    }

Switch Indentation +24 added lines, -24 removed lines

@@ -224,23 +224,23 @@ 
 
 			// Set correct taskmode and taskhistory depending on response type
 			switch ($props[PR_MESSAGE_CLASS]) {
-				case 'IPM.TaskRequest.Accept':
-					$taskhistory = thAccepted;
-					$taskstate = tdsACC;
-					$delegationstate = olTaskDelegationAccepted;
-					break;
+			case 'IPM.TaskRequest.Accept':
+				$taskhistory = thAccepted;
+				$taskstate = tdsACC;
+				$delegationstate = olTaskDelegationAccepted;
+				break;
 
-				case 'IPM.TaskRequest.Decline':
-					$taskhistory = thDeclined;
-					$taskstate = tdsDEC;
-					$delegationstate = olTaskDelegationDeclined;
-					break;
+			case 'IPM.TaskRequest.Decline':
+				$taskhistory = thDeclined;
+				$taskstate = tdsDEC;
+				$delegationstate = olTaskDelegationDeclined;
+				break;
 
-				case 'IPM.TaskRequest.Update':
-					$taskhistory = thUpdated;
-					$taskstate = tdsACC; // Doesn't actually change anything
-					$delegationstate = olTaskDelegationAccepted;
-					break;
+			case 'IPM.TaskRequest.Update':
+				$taskhistory = thUpdated;
+				$taskstate = tdsACC; // Doesn't actually change anything
+				$delegationstate = olTaskDelegationAccepted;
+				break;
 			}
 
 			// Update taskstate (what the task looks like) and task history (last action done by the assignee)
@@ -610,17 +610,17 @@ 
 			}
 
 			switch ($type) {
-				case tdmtTaskAcc:
-					$messageclass = "IPM.TaskRequest.Accept";
-					break;
+			case tdmtTaskAcc:
+				$messageclass = "IPM.TaskRequest.Accept";
+				break;
 
-				case tdmtTaskDec:
-					$messageclass = "IPM.TaskRequest.Decline";
-					break;
+			case tdmtTaskDec:
+				$messageclass = "IPM.TaskRequest.Decline";
+				break;
 
-				case tdmtTaskUpd:
-					$messageclass = "IPM.TaskRequest.Update";
-					break;
+			case tdmtTaskUpd:
+				$messageclass = "IPM.TaskRequest.Update";
+				break;
 			}
 
 			mapi_savechanges($sub);

Spacing +32 added lines, -32 removed lines

@@ -22,12 +22,12 @@ 
 	* It is used to indicate the type of change that is being carried in the IPM.TaskRequest item (although this
 	* information seems redundant due to that information already being available in PR_MESSAGE_CLASS).
 	*/
-	define('tdmtNothing', 0);			// Value in IPM.Task items
-	define('tdmtTaskReq', 1);			// Assigner -> Assignee
-	define('tdmtTaskAcc', 2);			// Assignee -> Assigner
-	define('tdmtTaskDec', 3);			// Assignee -> Assigner
-	define('tdmtTaskUpd', 4);			// Assignee -> Assigner
-	define('tdmtTaskSELF', 5);			// Assigner -> Assigner (?)
+	define('tdmtNothing', 0); // Value in IPM.Task items
+	define('tdmtTaskReq', 1); // Assigner -> Assignee
+	define('tdmtTaskAcc', 2); // Assignee -> Assigner
+	define('tdmtTaskDec', 3); // Assignee -> Assigner
+	define('tdmtTaskUpd', 4); // Assignee -> Assigner
+	define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
 	/* The TaskHistory is used to show the last action on the task on both the assigner and the assignee's side.
 	*
@@ -35,20 +35,20 @@ 
 	* at the top of the task request in the format 'Accepted by <user> on 01-01-2010 11:00'.
 	*/
 	define('thNone', 0);
-	define('thAccepted', 1);			// Set by assignee
-	define('thDeclined', 2);			// Set by assignee
-	define('thUpdated', 3);				// Set by assignee
+	define('thAccepted', 1); // Set by assignee
+	define('thDeclined', 2); // Set by assignee
+	define('thUpdated', 3); // Set by assignee
 	define('thDueDateChanged', 4);
-	define('thAssigned', 5);			// Set by assigner
+	define('thAssigned', 5); // Set by assigner
 
 	/* The TaskState value is used to differentiate the version of a task in the assigner's folder and the version in the
 	* assignee's folder. The buttons shown depend on this and the 'taskaccepted' boolean (for the assignee)
 	*/
-	define('tdsNOM', 0);		// Got a response to a deleted task, and re-created the task for the assigner
-	define('tdsOWNNEW', 1);		// Not assigned
-	define('tdsOWN', 2);		// Assignee version
-	define('tdsACC', 3);		// Assigner version
-	define('tdsDEC', 4);		// Assigner version, but assignee declined
+	define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+	define('tdsOWNNEW', 1); // Not assigned
+	define('tdsOWN', 2); // Assignee version
+	define('tdsACC', 3); // Assigner version
+	define('tdsDEC', 4); // Assigner version, but assignee declined
 
 	/* The delegationstate is used for the assigner to indicate state
 	*/
@@ -60,14 +60,14 @@ 
 	/* The task ownership indicates the role of the current user relative to the task.
 	*/
 	define('olNewTask', 0);
-	define('olDelegatedTask', 1);	// Task has been assigned
-	define('olOwnTask', 2);			// Task owned
+	define('olDelegatedTask', 1); // Task has been assigned
+	define('olOwnTask', 2); // Task owned
 
 	/* taskmultrecips indicates whether the task request sent or received has multiple assignees or not.
 	*/
 	define('tmrNone', 0);
-	define('tmrSent', 1);		// Task has been sent to multiple assignee
-	define('tmrReceived', 2);	// Task Request received has multiple assignee
+	define('tmrSent', 1); // Task has been sent to multiple assignee
+	define('tmrReceived', 2); // Task Request received has multiple assignee
 
 	class TaskRequest {
 		// All recipient properties
@@ -265,13 +265,13 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['taskglobalobjid'] => $taskid, /* our new taskglobalobjid */
-				$this->props['taskstate'] => tdsACC, 		/* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing, 	/* we're not sending a change */
-				$this->props['updatecount'] => 2,			/* version 2 (no idea) */
+				$this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+				$this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+				$this->props['updatecount'] => 2, /* version 2 (no idea) */
 				$this->props['delegationstate'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,	/* Task has been assigned */
-				PR_ICON_INDEX => 1283,						/* Task request icon */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
+				PR_ICON_INDEX => 1283, /* Task request icon */
 			]);
 			$this->setLastUser();
 			$this->setOwnerForAssignor();
@@ -284,12 +284,12 @@ 
 
 			// Make it a task request, and put it in sent items after it is sent
 			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest", 		/* class is task request */
-				$this->props['taskstate'] => tdsOWNNEW, 	/* for the recipient the task is new */
-				$this->props['taskmode'] => tdmtTaskReq,	/* for the recipient, it is a request */
-				$this->props['updatecount'] => 1,			/* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWNNEW, /* for the recipient the task is new */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient, it is a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => 0xFFFFFFFF,				/* show assigned icon */
+				PR_ICON_INDEX => 0xFFFFFFFF, /* show assigned icon */
 			]);
 
 			// Set Body
@@ -404,7 +404,7 @@ 
 			$this->updateTaskRequest();
 
 			// Set as accepted
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true,  $this->props['delegationstate'] => olTaskNotDelegated]);
+			mapi_setprops($this->message, [$this->props['taskhistory'] => thAccepted, $this->props['assignedtime'] => time(), $this->props['taskaccepted'] => true, $this->props['delegationstate'] => olTaskNotDelegated]);
 
 			mapi_savechanges($this->message);
 
@@ -433,7 +433,7 @@ 
 			$this->updateTaskRequest();
 
 			// Set as declined
-			mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined,  $this->props['delegationstate'] => olTaskDelegationDeclined]);
+			mapi_setprops($this->message, [$this->props['taskhistory'] => thDeclined, $this->props['delegationstate'] => olTaskDelegationDeclined]);
 
 			mapi_savechanges($this->message);
 
@@ -867,7 +867,7 @@ 
 				}
 
 				foreach ($recips as $recip) {
-					$recip[PR_RECIPIENT_TYPE] = MAPI_TO;	// Change recipient type to MAPI_TO
+					$recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
 					mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
 				}
 

Braces +5 added lines, -10 removed lines

@@ -325,8 +325,7 @@ 
 			$messageprops = mapi_getprops($this->message, [$this->props['updatecount']]);
 			if (isset($messageprops)) {
 				++$messageprops[$this->props['updatecount']];
-			}
-			else {
+			} else {
 				$messageprops[$this->props['updatecount']] = 1;
 			}
 
@@ -907,17 +906,13 @@ 
 				$body .= "\n" . dgettext("kopano", "Status") . ":\t";
 				if ($msgProps[$this->props['status']] == 0) {
 					$body .= dgettext("kopano", "Not Started");
-				}
-				elseif ($msgProps[$this->props['status']] == 1) {
+				} elseif ($msgProps[$this->props['status']] == 1) {
 					$body .= dgettext("kopano", "In Progress");
-				}
-				elseif ($msgProps[$this->props['status']] == 2) {
+				} elseif ($msgProps[$this->props['status']] == 2) {
 					$body .= dgettext("kopano", "Complete");
-				}
-				elseif ($msgProps[$this->props['status']] == 3) {
+				} elseif ($msgProps[$this->props['status']] == 3) {
 					$body .= dgettext("kopano", "Wait for other person");
-				}
-				elseif ($msgProps[$this->props['status']] == 4) {
+				} elseif ($msgProps[$this->props['status']] == 4) {
 					$body .= dgettext("kopano", "Deferred");
 				}
 			}

mapi/class.baserecurrence.php

Indentation +1880 added lines, -1880 removed lines

@@ -5,1885 +5,1885 @@
  * SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
  */
 
-	/**
-	 * BaseRecurrence
-	 * this class is superclass for recurrence for appointments and tasks. This class provides all
-	 * basic features of recurrence.
-	 */
-	class BaseRecurrence {
-		/**
-		 * @var object Mapi Message Store (may be null if readonly)
-		 */
-		public $store;
-
-		/**
-		 * @var object Mapi Message (may be null if readonly)
-		 */
-		public $message;
-
-		/**
-		 * @var array Message Properties
-		 */
-		public $messageprops;
-
-		/**
-		 * @var array list of property tags
-		 */
-		public $proptags;
-
-		/**
-		 * @var recurrence data of this calendar item
-		 */
-		public $recur;
-
-		/**
-		 * @var Timezone data of this calendar item
-		 */
-		public $tz;
-
-		/**
-		 * @param resource $store      MAPI Message Store Object
-		 * @param resource $message    the MAPI (appointment) message
-		 * @param array    $properties the list of MAPI properties the message has
-		 */
-		public function __construct($store, $message) {
-			$this->store = $store;
-
-			if (is_array($message)) {
-				$this->messageprops = $message;
-			}
-			else {
-				$this->message = $message;
-				$this->messageprops = mapi_getprops($this->message, $this->proptags);
-			}
-
-			if (isset($this->messageprops[$this->proptags["recurring_data"]])) {
-				// There is a possibility that recurr blob can be more than 255 bytes so get full blob through stream interface
-				if (strlen($this->messageprops[$this->proptags["recurring_data"]]) >= 255) {
-					$this->getFullRecurrenceBlob();
-				}
-
-				$this->recur = $this->parseRecurrence($this->messageprops[$this->proptags["recurring_data"]]);
-			}
-			if (isset($this->proptags["timezone_data"], $this->messageprops[$this->proptags["timezone_data"]])) {
-				$this->tz = $this->parseTimezone($this->messageprops[$this->proptags["timezone_data"]]);
-			}
-		}
-
-		public function getRecurrence() {
-			return $this->recur;
-		}
-
-		public function getFullRecurrenceBlob() {
-			$message = mapi_msgstore_openentry($this->store, $this->messageprops[PR_ENTRYID]);
-
-			$recurrBlob = '';
-			$stream = mapi_openproperty($message, $this->proptags["recurring_data"], IID_IStream, 0, 0);
-			$stat = mapi_stream_stat($stream);
-
-			for ($i = 0; $i < $stat['cb']; $i += 1024) {
-				$recurrBlob .= mapi_stream_read($stream, 1024);
-			}
-			if (!empty($recurrBlob)) {
-				$this->messageprops[$this->proptags["recurring_data"]] = $recurrBlob;
-			}
-		}
-
-		/**
-		 * Function for parsing the Recurrence value of a Calendar item.
-		 *
-		 * Retrieve it from Named Property 0x8216 as a PT_BINARY and pass the
-		 * data to this function
-		 *
-		 * Returns a structure containing the data:
-		 *
-		 * type		- type of recurrence: day=10, week=11, month=12, year=13
-		 * subtype	- type of day recurrence: 2=monthday (ie 21st day of month), 3=nday'th weekdays (i.e. 2nd Tuesday and Wednesday)
-		 * start	- Unix timestamp of first occurrence
-		 * end		- Unix timestamp of last occurrence (up to and including), so when start == end -> occurrences = 1
-		 * numoccur     - occurrences (may be very large when there is no end data)
-		 *
-		 * then, for each type:
-		 *
-		 * Daily:
-		 *  everyn	- every [everyn] days in minutes
-		 *  regen	- regenerating event (like tasks)
-		 *
-		 * Weekly:
-		 *  everyn	- every [everyn] weeks in weeks
-		 *  regen	- regenerating event (like tasks)
-		 *  weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
-		 *
-		 * Monthly:
-		 *  everyn	- every [everyn] months
-		 *  regen	- regenerating event (like tasks)
-		 *
-		 *  subtype 2:
-		 *	  monthday - on day [monthday] of the month
-		 *
-		 *  subtype 3:
-		 *	  weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
-		 *   nday	- on [nday]'th [weekdays] of the month
-		 *
-		 * Yearly:
-		 *  everyn	- every [everyn] months (12, 24, 36, ...)
-		 *  month	- in month [month] (although the month is encoded in minutes since the startning of the year ........)
-		 *  regen	- regenerating event (like tasks)
-		 *
-		 *  subtype 2:
-		 *   monthday - on day [monthday] of the month
-		 *
-		 *  subtype 3:
-		 *   weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
-		 *	  nday	- on [nday]'th [weekdays] of the month [month]
-		 *
-		 * @param string $rdata Binary string
-		 *
-		 * @return array recurrence data
-		 */
-		public function parseRecurrence($rdata) {
-			if (strlen($rdata) < 10) {
-				return;
-			}
-
-			$ret["changed_occurrences"] = [];
-			$ret["deleted_occurrences"] = [];
-
-			$data = unpack("Vconst1/Crtype/Cconst2/Vrtype2", $rdata);
-
-			$ret["type"] = $data["rtype"];
-			$ret["subtype"] = $data["rtype2"];
-			$rdata = substr($rdata, 10);
-
-			switch ($data["rtype"]) {
-			case 0x0A:
-				// Daily
-				if (strlen($rdata) < 12) {
-					return $ret;
-				}
-				$data = unpack("Vunknown/Veveryn/Vregen", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-
-				switch ($ret["subtype"]) {
-				case 0:
-					$rdata = substr($rdata, 12);
-					break;
-
-				case 1:
-					$rdata = substr($rdata, 16);
-					break;
-				}
-				break;
-
-			case 0x0B:
-				// Weekly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
-
-				$data = unpack("Vconst1/Veveryn/Vregen", $rdata);
-				$rdata = substr($rdata, 12);
-
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				$ret["weekdays"] = 0;
-
-				if ($data["regen"] == 0) {
-					$data = unpack("Vweekdays", $rdata);
-					$rdata = substr($rdata, 4);
-					$ret["weekdays"] = $data["weekdays"];
-				}
-				break;
-
-			case 0x0C:
-				// Monthly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
-
-				$data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
-
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
-
-			case 0x0D:
-				// Yearly
-				if (strlen($rdata) < 16) {
-					return $ret;
-				}
-
-				$data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
-				$ret["month"] = $data["month"];
-				$ret["everyn"] = $data["everyn"];
-				$ret["regen"] = $data["regen"];
-				if ($ret["subtype"] == 3) {
-					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
-					$ret["monthday"] = $data["monthday"];
-				}
-
-				$rdata = substr($rdata, 16);
-				if ($ret["subtype"] == 3) {
-					$data = unpack("Vnday", $rdata);
-					$ret["nday"] = $data["nday"];
-					$rdata = substr($rdata, 4);
-				}
-				break;
-			}
-
-			if (strlen($rdata) < 16) {
-				return $ret;
-			}
-
-			$data = unpack("Cterm/C3const1/Vnumoccur/Vconst2/Vnumexcept", $rdata);
-
-			$rdata = substr($rdata, 16);
-
-			$ret["term"] = $data["term"];
-			$ret["numoccur"] = $data["numoccur"];
-			$ret["numexcept"] = $data["numexcept"];
-
-			// exc_base_dates are *all* the base dates that have been either deleted or modified
-			$exc_base_dates = [];
-			for ($i = 0; $i < $ret["numexcept"]; ++$i) {
-				if (strlen($rdata) < 4) {
-					// We shouldn't arrive here, because that implies
-					// numexcept does not match the amount of data
-					// which is available for the exceptions.
-					return $ret;
-				}
-				$data = unpack("Vbasedate", $rdata);
-				$rdata = substr($rdata, 4);
-				$exc_base_dates[] = $this->recurDataToUnixData($data["basedate"]);
-			}
-
-			if (strlen($rdata) < 4) {
-				return $ret;
-			}
-			$data = unpack("Vnumexceptmod", $rdata);
-			$rdata = substr($rdata, 4);
-
-			$ret["numexceptmod"] = $data["numexceptmod"];
-
-			// exc_changed are the base dates of *modified* occurrences. exactly what is modified
-			// is in the attachments *and* in the data further down this function.
-			$exc_changed = [];
-			for ($i = 0; $i < $ret["numexceptmod"]; ++$i) {
-				if (strlen($rdata) < 4) {
-					// We shouldn't arrive here, because that implies
-					// numexceptmod does not match the amount of data
-					// which is available for the exceptions.
-					return $ret;
-				}
-				$data = unpack("Vstartdate", $rdata);
-				$rdata = substr($rdata, 4);
-				$exc_changed[] = $this->recurDataToUnixData($data["startdate"]);
-			}
-
-			if (strlen($rdata) < 8) {
-				return $ret;
-			}
-			$data = unpack("Vstart/Vend", $rdata);
-			$rdata = substr($rdata, 8);
-
-			$ret["start"] = $this->recurDataToUnixData($data["start"]);
-			$ret["end"] = $this->recurDataToUnixData($data["end"]);
-
-			// this is where task recurrence stop
-			if (strlen($rdata) < 16) {
-				return $ret;
-			}
-			$data = unpack("Vreaderversion/Vwriterversion/Vstartmin/Vendmin", $rdata);
-			$rdata = substr($rdata, 16);
-
-			$ret["startocc"] = $data["startmin"];
-			$ret["endocc"] = $data["endmin"];
-			$readerversion = $data["readerversion"];
-			$writerversion = $data["writerversion"];
-
-			$data = unpack("vnumber", $rdata);
-			$rdata = substr($rdata, 2);
-
-			$nexceptions = $data["number"];
-			$exc_changed_details = [];
-
-			// Parse n modified exceptions
-			for ($i = 0; $i < $nexceptions; ++$i) {
-				$item = [];
-
-				// Get exception startdate, enddate and basedate (the date at which the occurrence would have started)
-				$data = unpack("Vstartdate/Venddate/Vbasedate", $rdata);
-				$rdata = substr($rdata, 12);
-
-				// Convert recurtimestamp to Unix timestamp
-				$startdate = $this->recurDataToUnixData($data["startdate"]);
-				$enddate = $this->recurDataToUnixData($data["enddate"]);
-				$basedate = $this->recurDataToUnixData($data["basedate"]);
-
-				// Set the right properties
-				$item["basedate"] = $this->dayStartOf($basedate);
-				$item["start"] = $startdate;
-				$item["end"] = $enddate;
-
-				$data = unpack("vbitmask", $rdata);
-				$rdata = substr($rdata, 2);
-				$item["bitmask"] = $data["bitmask"]; // save bitmask for extended exceptions
-
-				// Bitmask to verify what properties are changed
-				$bitmask = $data["bitmask"];
-
-				// ARO_SUBJECT: 0x0001
-				// Look for field: SubjectLength (2b), SubjectLength2 (2b) and Subject
-				if (($bitmask & (1 << 0))) {
-					$data = unpack("vnull_length/vlength", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$length = $data["length"];
-					$item["subject"] = ""; // Normalized subject
-					for ($j = 0; $j < $length && strlen($rdata); ++$j) {
-						$data = unpack("Cchar", $rdata);
-						$rdata = substr($rdata, 1);
-
-						$item["subject"] .= chr($data["char"]);
-					}
-				}
-
-				// ARO_MEETINGTYPE: 0x0002
-				if (($bitmask & (1 << 1))) {
-					$rdata = substr($rdata, 4);
-				}
-				// Attendees modified: no data here (only in attachment)
-
-				// ARO_REMINDERDELTA: 0x0004
-				// Look for field: ReminderDelta (4b)
-				if (($bitmask & (1 << 2))) {
-					$data = unpack("Vremind_before", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["remind_before"] = $data["remind_before"];
-				}
-
-				// ARO_REMINDER: 0x0008
-				// Look field: ReminderSet (4b)
-				if (($bitmask & (1 << 3))) {
-					$data = unpack("Vreminder_set", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["reminder_set"] = $data["reminder_set"];
-				}
-
-				// ARO_LOCATION: 0x0010
-				// Look for fields: LocationLength (2b), LocationLength2 (2b) and Location
-				// Similar to ARO_SUBJECT above.
-				if (($bitmask & (1 << 4))) {
-					$data = unpack("vnull_length/vlength", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["location"] = "";
-
-					$length = $data["length"];
-					$data = substr($rdata, 0, $length);
-					$rdata = substr($rdata, $length);
-
-					$item["location"] .= $data;
-				}
-
-				// ARO_BUSYSTATUS: 0x0020
-				// Look for field: BusyStatus (4b)
-				if (($bitmask & (1 << 5))) {
-					$data = unpack("Vbusystatus", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["busystatus"] = $data["busystatus"];
-				}
-
-				// ARO_ATTACHMENT: 0x0040
-				if (($bitmask & (1 << 6))) {
-					// no data: RESERVED
-					$rdata = substr($rdata, 4);
-				}
-
-				// ARO_SUBTYPE: 0x0080
-				// Look for field: SubType (4b). Determines whether it is an allday event.
-				if (($bitmask & (1 << 7))) {
-					$data = unpack("Vallday", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["alldayevent"] = $data["allday"];
-				}
-
-				// ARO_APPTCOLOR: 0x0100
-				// Look for field: AppointmentColor (4b)
-				if (($bitmask & (1 << 8))) {
-					$data = unpack("Vlabel", $rdata);
-					$rdata = substr($rdata, 4);
-
-					$item["label"] = $data["label"];
-				}
-
-				// ARO_EXCEPTIONAL_BODY: 0x0200
-				if (($bitmask & (1 << 9)))
-					/* nothing */; // Notes or Attachments modified: no data here (only in attachment)
-
-				array_push($exc_changed_details, $item);
-			}
-
-			/**
-			 * We now have $exc_changed, $exc_base_dates and $exc_changed_details
-			 * We will ignore $exc_changed, as this information is available in $exc_changed_details
-			 * also. If an item is in $exc_base_dates and NOT in $exc_changed_details, then the item
-			 * has been deleted.
-			 */
-
-			// Find deleted occurrences
-			$deleted_occurrences = [];
-
-			foreach ($exc_base_dates as $base_date) {
-				$found = false;
-
-				foreach ($exc_changed_details as $details) {
-					if ($details["basedate"] == $base_date) {
-						$found = true;
-
-						break;
-					}
-				}
-				if (!$found) {
-					// item was not in exc_changed_details, so it must be deleted
-					$deleted_occurrences[] = $base_date;
-				}
-			}
-
-			$ret["deleted_occurrences"] = $deleted_occurrences;
-			$ret["changed_occurrences"] = $exc_changed_details;
-
-			// enough data for normal exception (no extended data)
-			if (strlen($rdata) < 16) {
-				return $ret;
-			}
-
-			$data = unpack("Vreservedsize", $rdata);
-			$rdata = substr($rdata, 4 + $data["reservedsize"]);
-
-			for ($i = 0; $i < $nexceptions; ++$i) {
-				// subject and location in UCS-2 to UTF-8
-				if ($writerversion >= 0x3009) {
-					$data = unpack("Vsize/Vvalue", $rdata); // size includes sizeof(value)==4
-					$rdata = substr($rdata, 4 + $data["size"]);
-				}
-
-				$data = unpack("Vreservedsize", $rdata);
-				$rdata = substr($rdata, 4 + $data["reservedsize"]);
-
-				// ARO_SUBJECT(0x01) | ARO_LOCATION(0x10)
-				if ($exc_changed_details[$i]["bitmask"] & 0x11) {
-					$data = unpack("Vstart/Vend/Vorig", $rdata);
-					$rdata = substr($rdata, 4 * 3);
-
-					$exc_changed_details[$i]["ex_start_datetime"] = $data["start"];
-					$exc_changed_details[$i]["ex_end_datetime"] = $data["end"];
-					$exc_changed_details[$i]["ex_orig_date"] = $data["orig"];
-				}
-
-				// ARO_SUBJECT
-				if ($exc_changed_details[$i]["bitmask"] & 0x01) {
-					// decode UCS-2 string to UTF-8
-					$data = unpack("vlength", $rdata);
-					$rdata = substr($rdata, 2);
-					$length = $data["length"];
-					$data = substr($rdata, 0, $length * 2);
-					$rdata = substr($rdata, $length * 2);
-					$subject = iconv("UCS-2LE", "UTF-8", $data);
-					// replace subject with unicode subject
-					$exc_changed_details[$i]["subject"] = $subject;
-				}
-
-				// ARO_LOCATION
-				if ($exc_changed_details[$i]["bitmask"] & 0x10) {
-					// decode UCS-2 string to UTF-8
-					$data = unpack("vlength", $rdata);
-					$rdata = substr($rdata, 2);
-					$length = $data["length"];
-					$data = substr($rdata, 0, $length * 2);
-					$rdata = substr($rdata, $length * 2);
-					$location = iconv("UCS-2LE", "UTF-8", $data);
-					// replace subject with unicode subject
-					$exc_changed_details[$i]["location"] = $location;
-				}
-
-				// ARO_SUBJECT(0x01) | ARO_LOCATION(0x10)
-				if ($exc_changed_details[$i]["bitmask"] & 0x11) {
-					$data = unpack("Vreservedsize", $rdata);
-					$rdata = substr($rdata, 4 + $data["reservedsize"]);
-				}
-			}
-
-			// update with extended data
-			$ret["changed_occurrences"] = $exc_changed_details;
-
-			return $ret;
-		}
-
-		/**
-		 * Saves the recurrence data to the recurrence property.
-		 *
-		 * @param array $properties the recurrence data
-		 *
-		 * @return string binary string
-		 */
-		public function saveRecurrence() {
-			// Only save if a message was passed
-			if (!isset($this->message)) {
-				return;
-			}
-
-			// Abort if no recurrence was set
-			if (!isset($this->recur["type"]) && !isset($this->recur["subtype"])) {
-				return;
-			}
-			if (!isset($this->recur["start"]) && !isset($this->recur["end"])) {
-				return;
-			}
-			if (!isset($this->recur["startocc"]) && !isset($this->recur["endocc"])) {
-				return;
-			}
-
-			$rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int) $this->recur["type"], 0x20, (int) $this->recur["subtype"]);
-
-			$weekstart = 1; // monday
-			$forwardcount = 0;
-			$restocc = 0;
-			$dayofweek = (int) gmdate("w", (int) $this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
-
-			$term = (int) $this->recur["type"];
-
-			switch ($term) {
-			case 0x0A:
-				// Daily
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-
-				if ($this->recur["subtype"] == 1) {
-					// Daily every workday
-					$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
-				}
-				else {
-					// Daily every N days (everyN in minutes)
-					$everyn = ((int) $this->recur["everyn"]) / 1440;
-					// Calc first occ
-					$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
-				}
-				break;
-
-			case 0x0B:
-				// Weekly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
-					return;
-				}
-
-				// No need to calculate startdate if sliding flag was set.
-				if (!$this->recur['regen']) {
-					// Calculate start date of recurrence
-
-					// Find the first day that matches one of the weekdays selected
-					$daycount = 0;
-					$dayskip = -1;
-					for ($j = 0; $j < 7; ++$j) {
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							if ($dayskip == -1) {
-								$dayskip = $j;
-							}
-							++$daycount;
-						}
-					}
-
-					// $dayskip is the number of days to skip from the startdate until the first occurrence
-					// $daycount is the number of days per week that an occurrence occurs
-					$weekskip = 0;
-					if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
-						$weekskip = 1;
-					}
-
-					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-					// remaining occurrences based on the start of the recurrence.
-					if (((int) $this->recur["term"]) == 0x22) {
-						// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
-						// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
-						// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
-						// (eg when numoccur = 2, and daycount = 1)
-						$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
-
-						// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
-						// for the occurrence on the first day
-						$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
-
-						// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-						$forwardcount *= (int) $this->recur["everyn"];
-					}
-
-					// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-					$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
-				}
-
-				// Calc first occ
-				$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
-				$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
-
-				if ($this->recur["regen"]) {
-					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-				}
-				else {
-					$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
-				}
-				break;
-
-			case 0x0C:
-				// Monthly
-			case 0x0D:
-				// Yearly
-				if (!isset($this->recur["everyn"])) {
-					return;
-				}
-				if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
-					return;
-				}
-				if ($term == 0x0C /* monthly */) {
-					$everyn = (int) $this->recur["everyn"];
-				}
-				else {
-					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
-				}
-
-				// Get montday/month/year of original start
-				$curmonthday = gmdate("j", (int) $this->recur["start"]);
-				$curyear = gmdate("Y", (int) $this->recur["start"]);
-				$curmonth = gmdate("n", (int) $this->recur["start"]);
-
-				// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
-				// remaining occurrences based on the start of the recurrence.
-				if (((int) $this->recur["term"]) == 0x22) {
-					// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
-					// one to make sure there are always at least one occurrence left)
-					$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
-				}
-
-				// Get month for yearly on D'th day of month M
-				if ($term == 0x0D /* yearly */) {
-					$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
-				} // 1=jan, 2=feb, eg
-
-				switch ((int) $this->recur["subtype"]) {
-				// on D day of every M month
-				case 2:
-					if (!isset($this->recur["monthday"])) {
-						return;
-					}
-					// Recalc startdate
-					// Set on the right begin day
-					// Go the beginning of the month
-					$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
-					// Go the the correct month day
-					$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
-
-					// If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
-					if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-						($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
-						if ($term == 0x0D /* yearly */) {
-							$count = ($everyn - ($curmonth - $selmonth));
-						} // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
-						else {
-							$count = $everyn;
-						} // Monthly, go to next occurrence in 'everyn' months
-
-						// Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
-						for ($i = 0; $i < $count; ++$i) {
-							$this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
-							}
-							++$curmonth;
-						}
-					}
-
-					// "start" is now pointing to the first occurrence, except that it will overshoot if the
-					// month in which it occurs has less days than specified as the day of the month. So 31st
-					// of each month will overshoot in february (29 days). We compensate for that by checking
-					// if the day of the month we got is wrong, and then back up to the last day of the previous
-					// month.
-					if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-						gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
-						$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
-					}
-
-					// "start" is now the first occurrence
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
-
-						$firstocc = 0;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
-					}
-					else {
-						// Calc first occ
-						$firstocc = 0;
-						$monthIndex = (int) gmdate("n", $this->recur["start"]);
-						for ($i = 1; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
-						}
-						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
-					}
-					break;
-
-				case 3:
-					// monthly: on Nth weekday of every M month
-					// yearly: on Nth weekday of M month
-					if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
-						return;
-					}
-
-					$weekdays = (int) $this->recur["weekdays"];
-					$nday = (int) $this->recur["nday"];
-
-					// Calc startdate
-					$monthbegindow = (int) $this->recur["start"];
-
-					if ($nday == 5) {
-						// Set date on the last day of the last month
-						$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
-					}
-					else {
-						// Set on the first day of the month
-						$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
-					}
-
-					if ($term == 0x0D /* yearly */) {
-						// Set on right month
-						if ($selmonth < $curmonth) {
-							$tmp = 12 - $curmonth + $selmonth;
-						}
-						else {
-							$tmp = ($selmonth - $curmonth);
-						}
-
-						for ($i = 0; $i < $tmp; ++$i) {
-							$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth == 12) {
-								++$curyear;
-								$curmonth = 0;
-							}
-							++$curmonth;
-						}
-					}
-					else {
-						// Check or you exist in the right month
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-								$day = gmdate("j", $monthbegindow) - $i;
-
-								break;
-							}
-							if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-								$day = (($nday - 1) * 7) + ($i + 1);
-
-								break;
-							}
-						}
-
-						// Goto the next X month
-						if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
-							if ($nday == 5) {
-								$monthbegindow += 24 * 60 * 60;
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
-								}
-								++$curmonth;
-							}
-
-							for ($i = 0; $i < $everyn; ++$i) {
-								$monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
-								if ($curmonth == 12) {
-									++$curyear;
-									$curmonth = 0;
-								}
-								++$curmonth;
-							}
-							if ($nday == 5) {
-								$monthbegindow -= 24 * 60 * 60;
-							}
-						}
-					}
-
-					// FIXME: weekstart?
-
-					$day = 0;
-					// Set start on the right day
-					for ($i = 0; $i < 7; ++$i) {
-						if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
-							$day = $i;
-
-							break;
-						}
-						if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
-							$day = ($nday - 1) * 7 + ($i + 1);
-
-							break;
-						}
-					}
-					if ($nday == 5) {
-						$monthbegindow -= $day * 24 * 60 * 60;
-					}
-					else {
-						$monthbegindow += ($day - 1) * 24 * 60 * 60;
-					}
-
-					$firstocc = 0;
-					if ($term == 0x0C /* monthly */) {
-						// Calc first occ
-						$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
-						for ($i = 0; $i < $monthIndex; ++$i) {
-							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
-						}
-						$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-						break;
-					}
-					// Calc first occ
-					$monthIndex = (int) gmdate("n", $this->recur["start"]);
-					for ($i = 1; $i < $monthIndex; ++$i) {
-						$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
-					}
-					$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-					break;
-				}
-				break;
-			}
-
-			if (!isset($this->recur["term"])) {
-				return;
-			}
-
-			// Terminate
-			$term = (int) $this->recur["term"];
-			$rdata .= pack("CCCC", $term, 0x20, 0x00, 0x00);
-
-			switch ($term) {
-			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", 10);
-				break;
-			// After a number of times
-			case 0x22:
-				if (!isset($this->recur["numoccur"])) {
-					return;
-				}
-				$rdata .= pack("V", (int) $this->recur["numoccur"]);
-				break;
-			// Never ends
-			case 0x23:
-				$rdata .= pack("V", 0);
-				break;
-			}
-
-			// Strange little thing for the recurrence type "every workday"
-			if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
-				$rdata .= pack("V", 1);
-			}
-			else { // Other recurrences
-				$rdata .= pack("V", 0);
-			}
-
-			// Exception data
-
-			// Get all exceptions
-			$deleted_items = $this->recur["deleted_occurrences"];
-			$changed_items = $this->recur["changed_occurrences"];
-
-			// Merge deleted and changed items into one list
-			$items = $deleted_items;
-
-			foreach ($changed_items as $changed_item) {
-				array_push($items, $changed_item["basedate"]);
-			}
-
-			sort($items);
-
-			// Add the merged list in to the rdata
-			$rdata .= pack("V", count($items));
-			foreach ($items as $item) {
-				$rdata .= pack("V", $this->unixDataToRecurData($item));
-			}
-
-			// Loop through the changed exceptions (not deleted)
-			$rdata .= pack("V", count($changed_items));
-			$items = [];
-
-			foreach ($changed_items as $changed_item) {
-				$items[] = $this->dayStartOf($changed_item["start"]);
-			}
-
-			sort($items);
-
-			// Add the changed items list int the rdata
-			foreach ($items as $item) {
-				$rdata .= pack("V", $this->unixDataToRecurData($item));
-			}
-
-			// Set start date
-			$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
-
-			// Set enddate
-			switch ($term) {
-			// After the given enddate
-			case 0x21:
-				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
-				break;
-			// After a number of times
-			case 0x22:
-				// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-				$occenddate = (int) $this->recur["start"];
-
-				switch ((int) $this->recur["type"]) {
-				case 0x0A: // daily
-					if ($this->recur["subtype"] != 1) {
-						// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-						$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
-						break;
-					}
-					// Daily every workday
-					$restocc = (int) $this->recur["numoccur"];
-					// Get starting weekday
-					$nowtime = $this->gmtime($occenddate);
-					$j = $nowtime["tm_wday"];
-
-					while (1) {
-						if (($j % 7) > 0 && ($j % 7) < 6) {
-							--$restocc;
-						}
-						++$j;
-						if ($restocc <= 0) {
-							break;
-						}
-						$occenddate += 24 * 60 * 60;
-					}
-					break;
-
-				case 0x0B: // weekly
-					// Needed values
-					// $forwardcount - number of weeks we can skip forward
-					// $restocc - number of remaining occurrences after the week skip
-
-					// Add the weeks till the last item
-					$occenddate += ($forwardcount * 7 * 24 * 60 * 60);
-					$dayofweek = gmdate("w", $occenddate);
-
-					// Loop through the last occurrences until we have had them all
-					for ($j = 1; $restocc > 0; ++$j) {
-						// Jump to the next week (which may be N weeks away) when going over the week boundary
-						if ((($dayofweek + $j) % 7) == $weekstart) {
-							$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
-						}
-
-						// If this is a matching day, once less occurrence to process
-						if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
-							--$restocc;
-						}
-
-						// Next day
-						$occenddate += 24 * 60 * 60;
-					}
-					break;
-
-				case 0x0C: // monthly
-				case 0x0D: // yearly
-					$curyear = gmdate("Y", (int) $this->recur["start"]);
-					$curmonth = gmdate("n", (int) $this->recur["start"]);
-					// $forwardcount = months
-
-					switch ((int) $this->recur["subtype"]) {
-					case 2: // on D day of every M month
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
-							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
-
-						// compensation between 28 and 31
-						if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-							gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
-							if (gmdate("j", $occenddate) < 28) {
-								$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
-							}
-							else {
-								$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-							}
-						}
-						break;
-
-					case 3: // on Nth weekday of every M month
-						$nday = (int) $this->recur["nday"]; // 1 tot 5
-						$weekdays = (int) $this->recur["weekdays"];
-						while ($forwardcount > 0) {
-							$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
-							if ($curmonth >= 12) {
-								$curmonth = 1;
-								++$curyear;
-							}
-							else {
-								++$curmonth;
-							}
-							--$forwardcount;
-						}
-						if ($nday == 5) {
-							// Set date on the last day of the last month
-							$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-						}
-						else {
-							// Set date on the first day of the last month
-							$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
-						}
-
-						for ($i = 0; $i < 7; ++$i) {
-							if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
-								$occenddate -= $i * 24 * 60 * 60;
-
-								break;
-							}
-							if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
-								$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
-
-								break;
-							}
-						}
-						break; // case 3:
-					}
-					break;
-				}
-
-				if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX) {
-					$occenddate = PHP_INT_MAX;
-				}
-
-				$this->recur["end"] = $occenddate;
-				$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
-				break;
-			// Never ends
-			case 0x23:
-			default:
-				$this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
-				$rdata .= pack("V", 0x5AE980DF);
-				break;
-			}
-
-			// UTC date
-			$utcstart = $this->toGMT($this->tz, (int) $this->recur["start"]);
-			$utcend = $this->toGMT($this->tz, (int) $this->recur["end"]);
-
-			// utc date+time
-			$utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int) $this->recur["startocc"]) * 60) : $utcstart;
-			$utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int) $this->recur["endocc"]) * 60) : $utcstart;
-
-			// update reminder time
-			mapi_setprops($this->message, [$this->proptags["reminder_time"] => $utcfirstoccstartdatetime]);
-
-			// update first occurrence date
-			mapi_setprops($this->message, [$this->proptags["startdate"] => $utcfirstoccstartdatetime]);
-			mapi_setprops($this->message, [$this->proptags["duedate"] => $utcfirstoccenddatetime]);
-			mapi_setprops($this->message, [$this->proptags["commonstart"] => $utcfirstoccstartdatetime]);
-			mapi_setprops($this->message, [$this->proptags["commonend"] => $utcfirstoccenddatetime]);
-
-			// Set Outlook properties, if it is an appointment
-			if (isset($this->recur["message_class"]) && $this->recur["message_class"] == "IPM.Appointment") {
-				// update real begin and real end date
-				mapi_setprops($this->message, [$this->proptags["startdate_recurring"] => $utcstart]);
-				mapi_setprops($this->message, [$this->proptags["enddate_recurring"] => $utcend]);
-
-				// recurrencetype
-				// Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
-				mapi_setprops($this->message, [$this->proptags["recurrencetype"] => ((int) $this->recur["type"]) - 0x9]);
-
-				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
-				mapi_setprops($this->message, [$this->proptags["side_effects"] => 369]);
-			}
-			else {
-				mapi_setprops($this->message, [$this->proptags["side_effects"] => 3441]);
-			}
-
-			// FlagDueBy is datetime of the first reminder occurrence. Outlook gives on this time a reminder popup dialog
-			// Any change of the recurrence (including changing and deleting exceptions) causes the flagdueby to be reset
-			// to the 'next' occurrence; this makes sure that deleting the next occurrence will correctly set the reminder to
-			// the occurrence after that. The 'next' occurrence is defined as being the first occurrence that starts at moment X (server time)
-			// with the reminder flag set.
-			$reminderprops = mapi_getprops($this->message, [$this->proptags["reminder_minutes"]]);
-			if (isset($reminderprops[$this->proptags["reminder_minutes"]])) {
-				$occ = false;
-				$occurrences = $this->getItems(time(), 0x7FF00000, 3, true);
-
-				for ($i = 0, $len = count($occurrences); $i < $len; ++$i) {
-					// This will actually also give us appointments that have already started, but not yet ended. Since we want the next
-					// reminder that occurs after time(), we may have to skip the first few entries. We get 3 entries since that is the maximum
-					// number that would be needed (assuming reminder for item X cannot be before the previous occurrence starts). Worst case:
-					// time() is currently after start but before end of item, but reminder of next item has already passed (reminder for next item
-					// can be DURING the previous item, eg daily allday events). In that case, the first and second items must be skipped.
-
-					if (($occurrences[$i][$this->proptags["startdate"]] - $reminderprops[$this->proptags["reminder_minutes"]] * 60) > time()) {
-						$occ = $occurrences[$i];
-
-						break;
-					}
-				}
-
-				if ($occ) {
-					mapi_setprops($this->message, [$this->proptags["flagdueby"] => $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60)]);
-				}
-				else {
-					// Last reminder passed, no reminders any more.
-					mapi_setprops($this->message, [$this->proptags["reminder"] => false, $this->proptags["flagdueby"] => 0x7FF00000]);
-				}
-			}
-
-			// Default data
-			// Second item (0x08) indicates the Outlook version (see documentation at the bottom of this file for more information)
-			$rdata .= pack("VCCCC", 0x00003006, 0x08, 0x30, 0x00, 0x00);
-
-			if (isset($this->recur["startocc"], $this->recur["endocc"])) {
-				// Set start and endtime in minutes
-				$rdata .= pack("VV", (int) $this->recur["startocc"], (int) $this->recur["endocc"]);
-			}
-
-			// Detailed exception data
-
-			$changed_items = $this->recur["changed_occurrences"];
-
-			$rdata .= pack("v", count($changed_items));
-
-			foreach ($changed_items as $changed_item) {
-				// Set start and end time of exception
-				$rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
-				$rdata .= pack("V", $this->unixDataToRecurData($changed_item["end"]));
-				$rdata .= pack("V", $this->unixDataToRecurData($changed_item["basedate"]));
-
-				// Bitmask
-				$bitmask = 0;
-
-				// Check for changed strings
-				if (isset($changed_item["subject"])) {
-					$bitmask |= 1 << 0;
-				}
-				if (isset($changed_item["remind_before"])) {
-					$bitmask |= 1 << 2;
-				}
-				if (isset($changed_item["reminder_set"])) {
-					$bitmask |= 1 << 3;
-				}
-				if (isset($changed_item["location"])) {
-					$bitmask |= 1 << 4;
-				}
-				if (isset($changed_item["busystatus"])) {
-					$bitmask |= 1 << 5;
-				}
-				if (isset($changed_item["alldayevent"])) {
-					$bitmask |= 1 << 7;
-				}
-				if (isset($changed_item["label"])) {
-					$bitmask |= 1 << 8;
-				}
-
-				$rdata .= pack("v", $bitmask);
-
-				// Set "subject"
-				if (isset($changed_item["subject"])) {
-					// convert UTF-8 to non-unicode blob string (US-ASCII?)
-					$subject = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["subject"]);
-					$length = strlen($subject);
-					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $subject);
-				}
-				if (isset($changed_item["remind_before"])) {
-					$rdata .= pack("V", $changed_item["remind_before"]);
-				}
-				if (isset($changed_item["reminder_set"])) {
-					$rdata .= pack("V", $changed_item["reminder_set"]);
-				}
-				if (isset($changed_item["location"])) {
-					$location = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["location"]);
-					$length = strlen($location);
-					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $location);
-				}
-				if (isset($changed_item["busystatus"])) {
-					$rdata .= pack("V", $changed_item["busystatus"]);
-				}
-				if (isset($changed_item["alldayevent"])) {
-					$rdata .= pack("V", $changed_item["alldayevent"]);
-				}
-				if (isset($changed_item["label"])) {
-					$rdata .= pack("V", $changed_item["label"]);
-				}
-			}
-
-			$rdata .= pack("V", 0);
-
-			// write extended data
-			foreach ($changed_items as $changed_item) {
-				$rdata .= pack("V", 0);
-				if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
-					$rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
-					$rdata .= pack("V", $this->unixDataToRecurData($changed_item["end"]));
-					$rdata .= pack("V", $this->unixDataToRecurData($changed_item["basedate"]));
-				}
-
-				if (isset($changed_item["subject"])) {
-					$subject = iconv("UTF-8", "UCS-2LE", $changed_item["subject"]);
-					$length = iconv_strlen($subject, "UCS-2LE");
-					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $subject);
-				}
-
-				if (isset($changed_item["location"])) {
-					$location = iconv("UTF-8", "UCS-2LE", $changed_item["location"]);
-					$length = iconv_strlen($location, "UCS-2LE");
-					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $location);
-				}
-				if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
-					$rdata .= pack("V", 0);
-				}
-			}
-
-			$rdata .= pack("V", 0);
-
-			// Set props
-			mapi_setprops($this->message, [$this->proptags["recurring_data"] => $rdata, $this->proptags["recurring"] => true]);
-			if (isset($this->tz) && $this->tz) {
-				$timezone = "GMT";
-				if ($this->tz["timezone"] != 0) {
-					// Create user readable timezone information
-					$timezone = sprintf(
-						"(GMT %s%02d:%02d)",
-						(-$this->tz["timezone"] > 0 ? "+" : "-"),
-						abs($this->tz["timezone"] / 60),
-						abs($this->tz["timezone"] % 60)
-					);
-				}
-				mapi_setprops($this->message, [$this->proptags["timezone_data"] => $this->getTimezoneData($this->tz),
-					$this->proptags["timezone"] => $timezone, ]);
-			}
-		}
-
-		/**
-		 * Function which converts a recurrence date timestamp to an Unix date timestamp.
-		 *
-		 * @author Steve Hardy
-		 *
-		 * @param int $rdate the date which will be converted
-		 *
-		 * @return int the converted date
-		 */
-		public function recurDataToUnixData($rdate) {
-			return ($rdate - 194074560) * 60;
-		}
-
-		/**
-		 * Function which converts an Unix date timestamp to recurrence date timestamp.
-		 *
-		 * @author Johnny Biemans
-		 *
-		 * @param Date $date the date which will be converted
-		 *
-		 * @return int the converted date in minutes
-		 */
-		public function unixDataToRecurData($date) {
-			return ($date / 60) + 194074560;
-		}
-
-		/**
-		 * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves.
-		 *
-		 * @author Steve Hardy
-		 *
-		 * @param mixed $ts
-		 */
-		public function GetTZOffset($ts) {
-			$Offset = date("O", $ts);
-
-			$Parity = $Offset < 0 ? -1 : 1;
-			$Offset = $Parity * $Offset;
-			$Offset = ($Offset - ($Offset % 100)) / 100 * 60 + $Offset % 100;
-
-			return $Parity * $Offset;
-		}
-
-		/**
-		 * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves.
-		 *
-		 * @author Steve Hardy
-		 *
-		 * @param Date $time
-		 *
-		 * @return Date GMT Time
-		 */
-		public function gmtime($time) {
-			$TZOffset = $this->GetTZOffset($time);
-
-			$t_time = $time - $TZOffset * 60; # Counter adjust for localtime()
-
-			return localtime($t_time, 1);
-		}
-
-		public function isLeapYear($year) {
-			return $year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0);
-		}
-
-		public function getMonthInSeconds($year, $month) {
-			if (in_array($month, [1, 3, 5, 7, 8, 10, 12])) {
-				$day = 31;
-			}
-			elseif (in_array($month, [4, 6, 9, 11])) {
-				$day = 30;
-			}
-			else {
-				$day = 28;
-				if ($this->isLeapYear($year) == 1) {
-					++$day;
-				}
-			}
-
-			return $day * 24 * 60 * 60;
-		}
-
-		/**
-		 * Function to get a date by Year Nr, Month Nr, Week Nr, Day Nr, and hour.
-		 *
-		 * @param int $year
-		 * @param int $month
-		 * @param int $week
-		 * @param int $day
-		 * @param int $hour
-		 *
-		 * @return returns the timestamp of the given date, timezone independent
-		 */
-		public function getDateByYearMonthWeekDayHour($year, $month, $week, $day, $hour) {
-			// get first day of month
-			$date = gmmktime(0, 0, 0, $month, 0, $year + 1900);
-
-			// get wday info
-			$gmdate = $this->gmtime($date);
-
-			$date -= $gmdate["tm_wday"] * 24 * 60 * 60; // back up to start of week
-
-			$date += $week * 7 * 24 * 60 * 60; // go to correct week nr
-			$date += $day * 24 * 60 * 60;
-			$date += $hour * 60 * 60;
-
-			$gmdate = $this->gmtime($date);
-
-			// if we are in the next month, then back up a week, because week '5' means
-			// 'last week of month'
-
-			if ($month != $gmdate["tm_mon"] + 1) {
-				$date -= 7 * 24 * 60 * 60;
-			}
-
-			return $date;
-		}
-
-		/**
-		 * getTimezone gives the timezone offset (in minutes) of the given
-		 * local date/time according to the given TZ info.
-		 *
-		 * @param mixed $tz
-		 * @param mixed $date
-		 */
-		public function getTimezone($tz, $date) {
-			// No timezone -> GMT (+0)
-			if (!isset($tz["timezone"])) {
-				return 0;
-			}
-
-			$dst = false;
-			$gmdate = $this->gmtime($date);
-
-			$dststart = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dststartmonth"], $tz["dststartweek"], 0, $tz["dststarthour"]);
-			$dstend = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dstendmonth"], $tz["dstendweek"], 0, $tz["dstendhour"]);
-
-			if ($dststart <= $dstend) {
-				// Northern hemisphere, eg DST is during Mar-Oct
-				if ($date > $dststart && $date < $dstend) {
-					$dst = true;
-				}
-			}
-			else {
-				// Southern hemisphere, eg DST is during Oct-Mar
-				if ($date < $dstend || $date > $dststart) {
-					$dst = true;
-				}
-			}
-
-			if ($dst) {
-				return $tz["timezone"] + $tz["timezonedst"];
-			}
-
-			return $tz["timezone"];
-		}
-
-		/**
-		 * getWeekNr() returns the week nr of the month (ie first week of february is 1).
-		 *
-		 * @param mixed $date
-		 */
-		public function getWeekNr($date) {
-			$gmdate = gmtime($date);
-			$gmdate["tm_mday"] = 0;
-
-			return strftime("%W", $date) - strftime("%W", gmmktime($gmdate)) + 1;
-		}
-
-		/**
-		 * parseTimezone parses the timezone as specified in named property 0x8233
-		 * in Outlook calendar messages. Returns the timezone in minutes negative
-		 * offset (GMT +2:00 -> -120).
-		 *
-		 * @param mixed $data
-		 */
-		public function parseTimezone($data) {
-			if (strlen($data) < 48) {
-				return;
-			}
-
-			return unpack("ltimezone/lunk/ltimezonedst/lunk/ldstendmonth/vdstendweek/vdstendhour/lunk/lunk/vunk/ldststartmonth/vdststartweek/vdststarthour/lunk/vunk", $data);
-		}
-
-		public function getTimezoneData($tz) {
-			return pack("lllllvvllvlvvlv", $tz["timezone"], 0, $tz["timezonedst"], 0, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendhour"], 0, 0, 0, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststarthour"], 0, 0);
-		}
-
-		/**
-		 * createTimezone creates the timezone as specified in the named property 0x8233
-		 * see also parseTimezone()
-		 * $tz is an array with the timezone data.
-		 *
-		 * @param mixed $tz
-		 */
-		public function createTimezone($tz) {
-			return pack(
-				"lxxxxlxxxxlvvxxxxxxxxxxlvvxxxxxx",
-				$tz["timezone"],
-				array_key_exists("timezonedst", $tz) ? $tz["timezonedst"] : 0,
-				array_key_exists("dstendmonth", $tz) ? $tz["dstendmonth"] : 0,
-				array_key_exists("dstendweek", $tz) ? $tz["dstendweek"] : 0,
-				array_key_exists("dstendhour", $tz) ? $tz["dstendhour"] : 0,
-				array_key_exists("dststartmonth", $tz) ? $tz["dststartmonth"] : 0,
-				array_key_exists("dststartweek", $tz) ? $tz["dststartweek"] : 0,
-				array_key_exists("dststarthour", $tz) ? $tz["dststarthour"] : 0
-			);
-		}
-
-		/**
-		 * toGMT returns a timestamp in GMT time for the time and timezone given.
-		 *
-		 * @param mixed $tz
-		 * @param mixed $date
-		 */
-		public function toGMT($tz, $date) {
-			if (!isset($tz['timezone'])) {
-				return $date;
-			}
-			$offset = $this->getTimezone($tz, $date);
-
-			return $date + $offset * 60;
-		}
-
-		/**
-		 * fromGMT returns a timestamp in the local timezone given from the GMT time given.
-		 *
-		 * @param mixed $tz
-		 * @param mixed $date
-		 */
-		public function fromGMT($tz, $date) {
-			$offset = $this->getTimezone($tz, $date);
-
-			return $date - $offset * 60;
-		}
-
-		/**
-		 * Function to get timestamp of the beginning of the day of the timestamp given.
-		 *
-		 * @param date $date
-		 *
-		 * @return date timestamp referring to same day but at 00:00:00
-		 */
-		public function dayStartOf($date) {
-			$time1 = $this->gmtime($date);
-
-			return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, $time1["tm_mday"], $time1["tm_year"] + 1900);
-		}
-
-		/**
-		 * Function to get timestamp of the beginning of the month of the timestamp given.
-		 *
-		 * @param date $date
-		 *
-		 * @return date Timestamp referring to same month but on the first day, and at 00:00:00
-		 */
-		public function monthStartOf($date) {
-			$time1 = $this->gmtime($date);
-
-			return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, 1, $time1["tm_year"] + 1900);
-		}
-
-		/**
-		 * Function to get timestamp of the beginning of the year of the timestamp given.
-		 *
-		 * @param date $date
-		 *
-		 * @return date Timestamp referring to the same year but on Jan 01, at 00:00:00
-		 */
-		public function yearStartOf($date) {
-			$time1 = $this->gmtime($date);
-
-			return gmmktime(0, 0, 0, 1, 1, $time1["tm_year"] + 1900);
-		}
-
-		/**
-		 * Function which returns the items in a given interval. This included expansion of the recurrence and
-		 * processing of exceptions (modified and deleted).
-		 *
-		 * @param string $entryid       the entryid of the message
-		 * @param array  $props         the properties of the message
-		 * @param date   $start         start time of the interval (GMT)
-		 * @param date   $end           end time of the interval (GMT)
-		 * @param mixed  $limit
-		 * @param mixed  $remindersonly
-		 */
-		public function getItems($start, $end, $limit = 0, $remindersonly = false) {
-			$items = [];
-
-			if (isset($this->recur)) {
-				// Optimization: remindersonly and default reminder is off; since only exceptions with reminder set will match, just look which
-				// exceptions are in range and have a reminder set
-				if ($remindersonly && (!isset($this->messageprops[$this->proptags["reminder"]]) || $this->messageprops[$this->proptags["reminder"]] == false)) {
-					// Sort exceptions by start time
-					uasort($this->recur["changed_occurrences"], [$this, "sortExceptionStart"]);
-
-					// Loop through all changed exceptions
-					foreach ($this->recur["changed_occurrences"] as $exception) {
-						// Check reminder set
-						if (!isset($exception["reminder"]) || $exception["reminder"] == false) {
-							continue;
-						}
-
-						// Convert to GMT
-						$occstart = $this->toGMT($this->tz, $exception["start"]);
-						$occend = $this->toGMT($this->tz, $exception["end"]);
-
-						// Check range criterium
-						if ($occstart > $end || $occend < $start) {
-							continue;
-						}
-
-						// OK, add to items.
-						array_push($items, $this->getExceptionProperties($exception));
-						if ($limit && (count($items) == $limit)) {
-							break;
-						}
-					}
-
-					uasort($items, [$this, "sortStarttime"]);
-
-					return $items;
-				}
-
-				// From here on, the dates of the occurrences are calculated in local time, so the days we're looking
-				// at are calculated from the local time dates of $start and $end
-
-				if ($this->recur['regen'] && isset($this->action['datecompleted'])) {
-					$daystart = $this->dayStartOf($this->action['datecompleted']);
-				}
-				else {
-					$daystart = $this->dayStartOf($this->recur["start"]);
-				} // start on first day of occurrence
-
-				// Calculate the last day on which we want to be looking at a recurrence; this is either the end of the view
-				// or the end of the recurrence, whichever comes first
-				if ($end > $this->toGMT($this->tz, $this->recur["end"])) {
-					$rangeend = $this->toGMT($this->tz, $this->recur["end"]);
-				}
-				else {
-					$rangeend = $end;
-				}
-
-				$dayend = $this->dayStartOf($this->fromGMT($this->tz, $rangeend));
-
-				// Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
-
-				switch ($this->recur["type"]) {
-				case 10:
-					// Daily
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1440;
-					}
-
-					if ($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						break;
-					}
-					// Every workday
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
-						$nowtime = $this->gmtime($now);
-						if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-					}
-					break;
-
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
-
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
-
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
-						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-
-							break;
-						}
-						// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-						for ($wday = 0; $wday < 7; ++$wday) {
-							$daynow = $now + $wday * 60 * 60 * 24;
-							// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-							if ($daynow > $dayend) {
-								continue;
-							}
-							$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-							if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
-
-				case 12:
-					// Monthly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
-
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
-							}
-
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
-							// Sanitize input
-							if ($this->recur["weekdays"] == 0) {
-								$this->recur["weekdays"] = 1;
-							}
-
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										++$ndaycounter;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if ($this->recur["nday"] == $ndaycounter) {
-										$firstday = $day;
-
-										break;
-									}
-								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
-							}
-							else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth = $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
-
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
-									$daynow -= 86400;
-									$nowtime = $this->gmtime($daynow);
-								}
-							}
-
-							/*
+    /**
+     * BaseRecurrence
+     * this class is superclass for recurrence for appointments and tasks. This class provides all
+     * basic features of recurrence.
+     */
+    class BaseRecurrence {
+        /**
+         * @var object Mapi Message Store (may be null if readonly)
+         */
+        public $store;
+
+        /**
+         * @var object Mapi Message (may be null if readonly)
+         */
+        public $message;
+
+        /**
+         * @var array Message Properties
+         */
+        public $messageprops;
+
+        /**
+         * @var array list of property tags
+         */
+        public $proptags;
+
+        /**
+         * @var recurrence data of this calendar item
+         */
+        public $recur;
+
+        /**
+         * @var Timezone data of this calendar item
+         */
+        public $tz;
+
+        /**
+         * @param resource $store      MAPI Message Store Object
+         * @param resource $message    the MAPI (appointment) message
+         * @param array    $properties the list of MAPI properties the message has
+         */
+        public function __construct($store, $message) {
+            $this->store = $store;
+
+            if (is_array($message)) {
+                $this->messageprops = $message;
+            }
+            else {
+                $this->message = $message;
+                $this->messageprops = mapi_getprops($this->message, $this->proptags);
+            }
+
+            if (isset($this->messageprops[$this->proptags["recurring_data"]])) {
+                // There is a possibility that recurr blob can be more than 255 bytes so get full blob through stream interface
+                if (strlen($this->messageprops[$this->proptags["recurring_data"]]) >= 255) {
+                    $this->getFullRecurrenceBlob();
+                }
+
+                $this->recur = $this->parseRecurrence($this->messageprops[$this->proptags["recurring_data"]]);
+            }
+            if (isset($this->proptags["timezone_data"], $this->messageprops[$this->proptags["timezone_data"]])) {
+                $this->tz = $this->parseTimezone($this->messageprops[$this->proptags["timezone_data"]]);
+            }
+        }
+
+        public function getRecurrence() {
+            return $this->recur;
+        }
+
+        public function getFullRecurrenceBlob() {
+            $message = mapi_msgstore_openentry($this->store, $this->messageprops[PR_ENTRYID]);
+
+            $recurrBlob = '';
+            $stream = mapi_openproperty($message, $this->proptags["recurring_data"], IID_IStream, 0, 0);
+            $stat = mapi_stream_stat($stream);
+
+            for ($i = 0; $i < $stat['cb']; $i += 1024) {
+                $recurrBlob .= mapi_stream_read($stream, 1024);
+            }
+            if (!empty($recurrBlob)) {
+                $this->messageprops[$this->proptags["recurring_data"]] = $recurrBlob;
+            }
+        }
+
+        /**
+         * Function for parsing the Recurrence value of a Calendar item.
+         *
+         * Retrieve it from Named Property 0x8216 as a PT_BINARY and pass the
+         * data to this function
+         *
+         * Returns a structure containing the data:
+         *
+         * type		- type of recurrence: day=10, week=11, month=12, year=13
+         * subtype	- type of day recurrence: 2=monthday (ie 21st day of month), 3=nday'th weekdays (i.e. 2nd Tuesday and Wednesday)
+         * start	- Unix timestamp of first occurrence
+         * end		- Unix timestamp of last occurrence (up to and including), so when start == end -> occurrences = 1
+         * numoccur     - occurrences (may be very large when there is no end data)
+         *
+         * then, for each type:
+         *
+         * Daily:
+         *  everyn	- every [everyn] days in minutes
+         *  regen	- regenerating event (like tasks)
+         *
+         * Weekly:
+         *  everyn	- every [everyn] weeks in weeks
+         *  regen	- regenerating event (like tasks)
+         *  weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
+         *
+         * Monthly:
+         *  everyn	- every [everyn] months
+         *  regen	- regenerating event (like tasks)
+         *
+         *  subtype 2:
+         *	  monthday - on day [monthday] of the month
+         *
+         *  subtype 3:
+         *	  weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
+         *   nday	- on [nday]'th [weekdays] of the month
+         *
+         * Yearly:
+         *  everyn	- every [everyn] months (12, 24, 36, ...)
+         *  month	- in month [month] (although the month is encoded in minutes since the startning of the year ........)
+         *  regen	- regenerating event (like tasks)
+         *
+         *  subtype 2:
+         *   monthday - on day [monthday] of the month
+         *
+         *  subtype 3:
+         *   weekdays - bitmask of week days, where each bit is one weekday (weekdays & 1 = Sunday, weekdays & 2 = Monday, etc)
+         *	  nday	- on [nday]'th [weekdays] of the month [month]
+         *
+         * @param string $rdata Binary string
+         *
+         * @return array recurrence data
+         */
+        public function parseRecurrence($rdata) {
+            if (strlen($rdata) < 10) {
+                return;
+            }
+
+            $ret["changed_occurrences"] = [];
+            $ret["deleted_occurrences"] = [];
+
+            $data = unpack("Vconst1/Crtype/Cconst2/Vrtype2", $rdata);
+
+            $ret["type"] = $data["rtype"];
+            $ret["subtype"] = $data["rtype2"];
+            $rdata = substr($rdata, 10);
+
+            switch ($data["rtype"]) {
+            case 0x0A:
+                // Daily
+                if (strlen($rdata) < 12) {
+                    return $ret;
+                }
+                $data = unpack("Vunknown/Veveryn/Vregen", $rdata);
+                $ret["everyn"] = $data["everyn"];
+                $ret["regen"] = $data["regen"];
+
+                switch ($ret["subtype"]) {
+                case 0:
+                    $rdata = substr($rdata, 12);
+                    break;
+
+                case 1:
+                    $rdata = substr($rdata, 16);
+                    break;
+                }
+                break;
+
+            case 0x0B:
+                // Weekly
+                if (strlen($rdata) < 16) {
+                    return $ret;
+                }
+
+                $data = unpack("Vconst1/Veveryn/Vregen", $rdata);
+                $rdata = substr($rdata, 12);
+
+                $ret["everyn"] = $data["everyn"];
+                $ret["regen"] = $data["regen"];
+                $ret["weekdays"] = 0;
+
+                if ($data["regen"] == 0) {
+                    $data = unpack("Vweekdays", $rdata);
+                    $rdata = substr($rdata, 4);
+                    $ret["weekdays"] = $data["weekdays"];
+                }
+                break;
+
+            case 0x0C:
+                // Monthly
+                if (strlen($rdata) < 16) {
+                    return $ret;
+                }
+
+                $data = unpack("Vconst1/Veveryn/Vregen/Vmonthday", $rdata);
+                $ret["everyn"] = $data["everyn"];
+                $ret["regen"] = $data["regen"];
+                if ($ret["subtype"] == 3) {
+                    $ret["weekdays"] = $data["monthday"];
+                }
+                else {
+                    $ret["monthday"] = $data["monthday"];
+                }
+
+                $rdata = substr($rdata, 16);
+                if ($ret["subtype"] == 3) {
+                    $data = unpack("Vnday", $rdata);
+                    $ret["nday"] = $data["nday"];
+                    $rdata = substr($rdata, 4);
+                }
+                break;
+
+            case 0x0D:
+                // Yearly
+                if (strlen($rdata) < 16) {
+                    return $ret;
+                }
+
+                $data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
+                $ret["month"] = $data["month"];
+                $ret["everyn"] = $data["everyn"];
+                $ret["regen"] = $data["regen"];
+                if ($ret["subtype"] == 3) {
+                    $ret["weekdays"] = $data["monthday"];
+                }
+                else {
+                    $ret["monthday"] = $data["monthday"];
+                }
+
+                $rdata = substr($rdata, 16);
+                if ($ret["subtype"] == 3) {
+                    $data = unpack("Vnday", $rdata);
+                    $ret["nday"] = $data["nday"];
+                    $rdata = substr($rdata, 4);
+                }
+                break;
+            }
+
+            if (strlen($rdata) < 16) {
+                return $ret;
+            }
+
+            $data = unpack("Cterm/C3const1/Vnumoccur/Vconst2/Vnumexcept", $rdata);
+
+            $rdata = substr($rdata, 16);
+
+            $ret["term"] = $data["term"];
+            $ret["numoccur"] = $data["numoccur"];
+            $ret["numexcept"] = $data["numexcept"];
+
+            // exc_base_dates are *all* the base dates that have been either deleted or modified
+            $exc_base_dates = [];
+            for ($i = 0; $i < $ret["numexcept"]; ++$i) {
+                if (strlen($rdata) < 4) {
+                    // We shouldn't arrive here, because that implies
+                    // numexcept does not match the amount of data
+                    // which is available for the exceptions.
+                    return $ret;
+                }
+                $data = unpack("Vbasedate", $rdata);
+                $rdata = substr($rdata, 4);
+                $exc_base_dates[] = $this->recurDataToUnixData($data["basedate"]);
+            }
+
+            if (strlen($rdata) < 4) {
+                return $ret;
+            }
+            $data = unpack("Vnumexceptmod", $rdata);
+            $rdata = substr($rdata, 4);
+
+            $ret["numexceptmod"] = $data["numexceptmod"];
+
+            // exc_changed are the base dates of *modified* occurrences. exactly what is modified
+            // is in the attachments *and* in the data further down this function.
+            $exc_changed = [];
+            for ($i = 0; $i < $ret["numexceptmod"]; ++$i) {
+                if (strlen($rdata) < 4) {
+                    // We shouldn't arrive here, because that implies
+                    // numexceptmod does not match the amount of data
+                    // which is available for the exceptions.
+                    return $ret;
+                }
+                $data = unpack("Vstartdate", $rdata);
+                $rdata = substr($rdata, 4);
+                $exc_changed[] = $this->recurDataToUnixData($data["startdate"]);
+            }
+
+            if (strlen($rdata) < 8) {
+                return $ret;
+            }
+            $data = unpack("Vstart/Vend", $rdata);
+            $rdata = substr($rdata, 8);
+
+            $ret["start"] = $this->recurDataToUnixData($data["start"]);
+            $ret["end"] = $this->recurDataToUnixData($data["end"]);
+
+            // this is where task recurrence stop
+            if (strlen($rdata) < 16) {
+                return $ret;
+            }
+            $data = unpack("Vreaderversion/Vwriterversion/Vstartmin/Vendmin", $rdata);
+            $rdata = substr($rdata, 16);
+
+            $ret["startocc"] = $data["startmin"];
+            $ret["endocc"] = $data["endmin"];
+            $readerversion = $data["readerversion"];
+            $writerversion = $data["writerversion"];
+
+            $data = unpack("vnumber", $rdata);
+            $rdata = substr($rdata, 2);
+
+            $nexceptions = $data["number"];
+            $exc_changed_details = [];
+
+            // Parse n modified exceptions
+            for ($i = 0; $i < $nexceptions; ++$i) {
+                $item = [];
+
+                // Get exception startdate, enddate and basedate (the date at which the occurrence would have started)
+                $data = unpack("Vstartdate/Venddate/Vbasedate", $rdata);
+                $rdata = substr($rdata, 12);
+
+                // Convert recurtimestamp to Unix timestamp
+                $startdate = $this->recurDataToUnixData($data["startdate"]);
+                $enddate = $this->recurDataToUnixData($data["enddate"]);
+                $basedate = $this->recurDataToUnixData($data["basedate"]);
+
+                // Set the right properties
+                $item["basedate"] = $this->dayStartOf($basedate);
+                $item["start"] = $startdate;
+                $item["end"] = $enddate;
+
+                $data = unpack("vbitmask", $rdata);
+                $rdata = substr($rdata, 2);
+                $item["bitmask"] = $data["bitmask"]; // save bitmask for extended exceptions
+
+                // Bitmask to verify what properties are changed
+                $bitmask = $data["bitmask"];
+
+                // ARO_SUBJECT: 0x0001
+                // Look for field: SubjectLength (2b), SubjectLength2 (2b) and Subject
+                if (($bitmask & (1 << 0))) {
+                    $data = unpack("vnull_length/vlength", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $length = $data["length"];
+                    $item["subject"] = ""; // Normalized subject
+                    for ($j = 0; $j < $length && strlen($rdata); ++$j) {
+                        $data = unpack("Cchar", $rdata);
+                        $rdata = substr($rdata, 1);
+
+                        $item["subject"] .= chr($data["char"]);
+                    }
+                }
+
+                // ARO_MEETINGTYPE: 0x0002
+                if (($bitmask & (1 << 1))) {
+                    $rdata = substr($rdata, 4);
+                }
+                // Attendees modified: no data here (only in attachment)
+
+                // ARO_REMINDERDELTA: 0x0004
+                // Look for field: ReminderDelta (4b)
+                if (($bitmask & (1 << 2))) {
+                    $data = unpack("Vremind_before", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["remind_before"] = $data["remind_before"];
+                }
+
+                // ARO_REMINDER: 0x0008
+                // Look field: ReminderSet (4b)
+                if (($bitmask & (1 << 3))) {
+                    $data = unpack("Vreminder_set", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["reminder_set"] = $data["reminder_set"];
+                }
+
+                // ARO_LOCATION: 0x0010
+                // Look for fields: LocationLength (2b), LocationLength2 (2b) and Location
+                // Similar to ARO_SUBJECT above.
+                if (($bitmask & (1 << 4))) {
+                    $data = unpack("vnull_length/vlength", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["location"] = "";
+
+                    $length = $data["length"];
+                    $data = substr($rdata, 0, $length);
+                    $rdata = substr($rdata, $length);
+
+                    $item["location"] .= $data;
+                }
+
+                // ARO_BUSYSTATUS: 0x0020
+                // Look for field: BusyStatus (4b)
+                if (($bitmask & (1 << 5))) {
+                    $data = unpack("Vbusystatus", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["busystatus"] = $data["busystatus"];
+                }
+
+                // ARO_ATTACHMENT: 0x0040
+                if (($bitmask & (1 << 6))) {
+                    // no data: RESERVED
+                    $rdata = substr($rdata, 4);
+                }
+
+                // ARO_SUBTYPE: 0x0080
+                // Look for field: SubType (4b). Determines whether it is an allday event.
+                if (($bitmask & (1 << 7))) {
+                    $data = unpack("Vallday", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["alldayevent"] = $data["allday"];
+                }
+
+                // ARO_APPTCOLOR: 0x0100
+                // Look for field: AppointmentColor (4b)
+                if (($bitmask & (1 << 8))) {
+                    $data = unpack("Vlabel", $rdata);
+                    $rdata = substr($rdata, 4);
+
+                    $item["label"] = $data["label"];
+                }
+
+                // ARO_EXCEPTIONAL_BODY: 0x0200
+                if (($bitmask & (1 << 9)))
+                    /* nothing */; // Notes or Attachments modified: no data here (only in attachment)
+
+                array_push($exc_changed_details, $item);
+            }
+
+            /**
+             * We now have $exc_changed, $exc_base_dates and $exc_changed_details
+             * We will ignore $exc_changed, as this information is available in $exc_changed_details
+             * also. If an item is in $exc_base_dates and NOT in $exc_changed_details, then the item
+             * has been deleted.
+             */
+
+            // Find deleted occurrences
+            $deleted_occurrences = [];
+
+            foreach ($exc_base_dates as $base_date) {
+                $found = false;
+
+                foreach ($exc_changed_details as $details) {
+                    if ($details["basedate"] == $base_date) {
+                        $found = true;
+
+                        break;
+                    }
+                }
+                if (!$found) {
+                    // item was not in exc_changed_details, so it must be deleted
+                    $deleted_occurrences[] = $base_date;
+                }
+            }
+
+            $ret["deleted_occurrences"] = $deleted_occurrences;
+            $ret["changed_occurrences"] = $exc_changed_details;
+
+            // enough data for normal exception (no extended data)
+            if (strlen($rdata) < 16) {
+                return $ret;
+            }
+
+            $data = unpack("Vreservedsize", $rdata);
+            $rdata = substr($rdata, 4 + $data["reservedsize"]);
+
+            for ($i = 0; $i < $nexceptions; ++$i) {
+                // subject and location in UCS-2 to UTF-8
+                if ($writerversion >= 0x3009) {
+                    $data = unpack("Vsize/Vvalue", $rdata); // size includes sizeof(value)==4
+                    $rdata = substr($rdata, 4 + $data["size"]);
+                }
+
+                $data = unpack("Vreservedsize", $rdata);
+                $rdata = substr($rdata, 4 + $data["reservedsize"]);
+
+                // ARO_SUBJECT(0x01) | ARO_LOCATION(0x10)
+                if ($exc_changed_details[$i]["bitmask"] & 0x11) {
+                    $data = unpack("Vstart/Vend/Vorig", $rdata);
+                    $rdata = substr($rdata, 4 * 3);
+
+                    $exc_changed_details[$i]["ex_start_datetime"] = $data["start"];
+                    $exc_changed_details[$i]["ex_end_datetime"] = $data["end"];
+                    $exc_changed_details[$i]["ex_orig_date"] = $data["orig"];
+                }
+
+                // ARO_SUBJECT
+                if ($exc_changed_details[$i]["bitmask"] & 0x01) {
+                    // decode UCS-2 string to UTF-8
+                    $data = unpack("vlength", $rdata);
+                    $rdata = substr($rdata, 2);
+                    $length = $data["length"];
+                    $data = substr($rdata, 0, $length * 2);
+                    $rdata = substr($rdata, $length * 2);
+                    $subject = iconv("UCS-2LE", "UTF-8", $data);
+                    // replace subject with unicode subject
+                    $exc_changed_details[$i]["subject"] = $subject;
+                }
+
+                // ARO_LOCATION
+                if ($exc_changed_details[$i]["bitmask"] & 0x10) {
+                    // decode UCS-2 string to UTF-8
+                    $data = unpack("vlength", $rdata);
+                    $rdata = substr($rdata, 2);
+                    $length = $data["length"];
+                    $data = substr($rdata, 0, $length * 2);
+                    $rdata = substr($rdata, $length * 2);
+                    $location = iconv("UCS-2LE", "UTF-8", $data);
+                    // replace subject with unicode subject
+                    $exc_changed_details[$i]["location"] = $location;
+                }
+
+                // ARO_SUBJECT(0x01) | ARO_LOCATION(0x10)
+                if ($exc_changed_details[$i]["bitmask"] & 0x11) {
+                    $data = unpack("Vreservedsize", $rdata);
+                    $rdata = substr($rdata, 4 + $data["reservedsize"]);
+                }
+            }
+
+            // update with extended data
+            $ret["changed_occurrences"] = $exc_changed_details;
+
+            return $ret;
+        }
+
+        /**
+         * Saves the recurrence data to the recurrence property.
+         *
+         * @param array $properties the recurrence data
+         *
+         * @return string binary string
+         */
+        public function saveRecurrence() {
+            // Only save if a message was passed
+            if (!isset($this->message)) {
+                return;
+            }
+
+            // Abort if no recurrence was set
+            if (!isset($this->recur["type"]) && !isset($this->recur["subtype"])) {
+                return;
+            }
+            if (!isset($this->recur["start"]) && !isset($this->recur["end"])) {
+                return;
+            }
+            if (!isset($this->recur["startocc"]) && !isset($this->recur["endocc"])) {
+                return;
+            }
+
+            $rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int) $this->recur["type"], 0x20, (int) $this->recur["subtype"]);
+
+            $weekstart = 1; // monday
+            $forwardcount = 0;
+            $restocc = 0;
+            $dayofweek = (int) gmdate("w", (int) $this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
+
+            $term = (int) $this->recur["type"];
+
+            switch ($term) {
+            case 0x0A:
+                // Daily
+                if (!isset($this->recur["everyn"])) {
+                    return;
+                }
+
+                if ($this->recur["subtype"] == 1) {
+                    // Daily every workday
+                    $rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
+                }
+                else {
+                    // Daily every N days (everyN in minutes)
+                    $everyn = ((int) $this->recur["everyn"]) / 1440;
+                    // Calc first occ
+                    $firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+                    $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
+                }
+                break;
+
+            case 0x0B:
+                // Weekly
+                if (!isset($this->recur["everyn"])) {
+                    return;
+                }
+                if (!$this->recur["regen"] && !isset($this->recur["weekdays"])) {
+                    return;
+                }
+
+                // No need to calculate startdate if sliding flag was set.
+                if (!$this->recur['regen']) {
+                    // Calculate start date of recurrence
+
+                    // Find the first day that matches one of the weekdays selected
+                    $daycount = 0;
+                    $dayskip = -1;
+                    for ($j = 0; $j < 7; ++$j) {
+                        if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+                            if ($dayskip == -1) {
+                                $dayskip = $j;
+                            }
+                            ++$daycount;
+                        }
+                    }
+
+                    // $dayskip is the number of days to skip from the startdate until the first occurrence
+                    // $daycount is the number of days per week that an occurrence occurs
+                    $weekskip = 0;
+                    if (($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek + $dayskip) > 6) {
+                        $weekskip = 1;
+                    }
+
+                    // Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+                    // remaining occurrences based on the start of the recurrence.
+                    if (((int) $this->recur["term"]) == 0x22) {
+                        // $weekskip is the amount of weeks to skip from the startdate before the first occurrence
+                        // $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
+                        // is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
+                        // (eg when numoccur = 2, and daycount = 1)
+                        $forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
+
+                        // $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
+                        // for the occurrence on the first day
+                        $restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
+
+                        // $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
+                        $forwardcount *= (int) $this->recur["everyn"];
+                    }
+
+                    // The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
+                    $this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
+                }
+
+                // Calc first occ
+                $firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
+                $firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
+
+                if ($this->recur["regen"]) {
+                    $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
+                }
+                else {
+                    $rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+                }
+                break;
+
+            case 0x0C:
+                // Monthly
+            case 0x0D:
+                // Yearly
+                if (!isset($this->recur["everyn"])) {
+                    return;
+                }
+                if ($term == 0x0D /* yearly */ && !isset($this->recur["month"])) {
+                    return;
+                }
+                if ($term == 0x0C /* monthly */) {
+                    $everyn = (int) $this->recur["everyn"];
+                }
+                else {
+                    $everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+                }
+
+                // Get montday/month/year of original start
+                $curmonthday = gmdate("j", (int) $this->recur["start"]);
+                $curyear = gmdate("Y", (int) $this->recur["start"]);
+                $curmonth = gmdate("n", (int) $this->recur["start"]);
+
+                // Check if the recurrence ends after a number of occurrences, in that case we must calculate the
+                // remaining occurrences based on the start of the recurrence.
+                if (((int) $this->recur["term"]) == 0x22) {
+                    // $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
+                    // one to make sure there are always at least one occurrence left)
+                    $forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
+                }
+
+                // Get month for yearly on D'th day of month M
+                if ($term == 0x0D /* yearly */) {
+                    $selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1;
+                } // 1=jan, 2=feb, eg
+
+                switch ((int) $this->recur["subtype"]) {
+                // on D day of every M month
+                case 2:
+                    if (!isset($this->recur["monthday"])) {
+                        return;
+                    }
+                    // Recalc startdate
+                    // Set on the right begin day
+                    // Go the beginning of the month
+                    $this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
+                    // Go the the correct month day
+                    $this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
+
+                    // If the previous calculation gave us a start date *before* the original start date, then we need to skip to the next occurrence
+                    if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
+                        ($term == 0x0D /* yearly */ && ($selmonth < $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
+                        if ($term == 0x0D /* yearly */) {
+                            $count = ($everyn - ($curmonth - $selmonth));
+                        } // Yearly, go to next occurrence in 'everyn' months minus difference in first occurrence and original date
+                        else {
+                            $count = $everyn;
+                        } // Monthly, go to next occurrence in 'everyn' months
+
+                        // Forward by $count months. This is done by getting the number of days in that month and forwarding that many days
+                        for ($i = 0; $i < $count; ++$i) {
+                            $this->recur["start"] += $this->getMonthInSeconds($curyear, $curmonth);
+                            if ($curmonth == 12) {
+                                ++$curyear;
+                                $curmonth = 0;
+                            }
+                            ++$curmonth;
+                        }
+                    }
+
+                    // "start" is now pointing to the first occurrence, except that it will overshoot if the
+                    // month in which it occurs has less days than specified as the day of the month. So 31st
+                    // of each month will overshoot in february (29 days). We compensate for that by checking
+                    // if the day of the month we got is wrong, and then back up to the last day of the previous
+                    // month.
+                    if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+                        gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
+                        $this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
+                    }
+
+                    // "start" is now the first occurrence
+                    if ($term == 0x0C /* monthly */) {
+                        // Calc first occ
+                        $monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+
+                        $firstocc = 0;
+                        for ($i = 0; $i < $monthIndex; ++$i) {
+                            $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+                        }
+                        $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+                    }
+                    else {
+                        // Calc first occ
+                        $firstocc = 0;
+                        $monthIndex = (int) gmdate("n", $this->recur["start"]);
+                        for ($i = 1; $i < $monthIndex; ++$i) {
+                            $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+                        }
+                        $rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+                    }
+                    break;
+
+                case 3:
+                    // monthly: on Nth weekday of every M month
+                    // yearly: on Nth weekday of M month
+                    if (!isset($this->recur["weekdays"]) && !isset($this->recur["nday"])) {
+                        return;
+                    }
+
+                    $weekdays = (int) $this->recur["weekdays"];
+                    $nday = (int) $this->recur["nday"];
+
+                    // Calc startdate
+                    $monthbegindow = (int) $this->recur["start"];
+
+                    if ($nday == 5) {
+                        // Set date on the last day of the last month
+                        $monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
+                    }
+                    else {
+                        // Set on the first day of the month
+                        $monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
+                    }
+
+                    if ($term == 0x0D /* yearly */) {
+                        // Set on right month
+                        if ($selmonth < $curmonth) {
+                            $tmp = 12 - $curmonth + $selmonth;
+                        }
+                        else {
+                            $tmp = ($selmonth - $curmonth);
+                        }
+
+                        for ($i = 0; $i < $tmp; ++$i) {
+                            $monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+                            if ($curmonth == 12) {
+                                ++$curyear;
+                                $curmonth = 0;
+                            }
+                            ++$curmonth;
+                        }
+                    }
+                    else {
+                        // Check or you exist in the right month
+                        for ($i = 0; $i < 7; ++$i) {
+                            if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+                                $day = gmdate("j", $monthbegindow) - $i;
+
+                                break;
+                            }
+                            if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+                                $day = (($nday - 1) * 7) + ($i + 1);
+
+                                break;
+                            }
+                        }
+
+                        // Goto the next X month
+                        if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+                            if ($nday == 5) {
+                                $monthbegindow += 24 * 60 * 60;
+                                if ($curmonth == 12) {
+                                    ++$curyear;
+                                    $curmonth = 0;
+                                }
+                                ++$curmonth;
+                            }
+
+                            for ($i = 0; $i < $everyn; ++$i) {
+                                $monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
+                                if ($curmonth == 12) {
+                                    ++$curyear;
+                                    $curmonth = 0;
+                                }
+                                ++$curmonth;
+                            }
+                            if ($nday == 5) {
+                                $monthbegindow -= 24 * 60 * 60;
+                            }
+                        }
+                    }
+
+                    // FIXME: weekstart?
+
+                    $day = 0;
+                    // Set start on the right day
+                    for ($i = 0; $i < 7; ++$i) {
+                        if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
+                            $day = $i;
+
+                            break;
+                        }
+                        if ($nday != 5 && (1 << ((gmdate("w", $monthbegindow) + $i) % 7)) & $weekdays) {
+                            $day = ($nday - 1) * 7 + ($i + 1);
+
+                            break;
+                        }
+                    }
+                    if ($nday == 5) {
+                        $monthbegindow -= $day * 24 * 60 * 60;
+                    }
+                    else {
+                        $monthbegindow += ($day - 1) * 24 * 60 * 60;
+                    }
+
+                    $firstocc = 0;
+                    if ($term == 0x0C /* monthly */) {
+                        // Calc first occ
+                        $monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+                        for ($i = 0; $i < $monthIndex; ++$i) {
+                            $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
+                        }
+                        $rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+                        break;
+                    }
+                    // Calc first occ
+                    $monthIndex = (int) gmdate("n", $this->recur["start"]);
+                    for ($i = 1; $i < $monthIndex; ++$i) {
+                        $firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
+                    }
+                    $rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
+                    break;
+                }
+                break;
+            }
+
+            if (!isset($this->recur["term"])) {
+                return;
+            }
+
+            // Terminate
+            $term = (int) $this->recur["term"];
+            $rdata .= pack("CCCC", $term, 0x20, 0x00, 0x00);
+
+            switch ($term) {
+            // After the given enddate
+            case 0x21:
+                $rdata .= pack("V", 10);
+                break;
+            // After a number of times
+            case 0x22:
+                if (!isset($this->recur["numoccur"])) {
+                    return;
+                }
+                $rdata .= pack("V", (int) $this->recur["numoccur"]);
+                break;
+            // Never ends
+            case 0x23:
+                $rdata .= pack("V", 0);
+                break;
+            }
+
+            // Strange little thing for the recurrence type "every workday"
+            if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
+                $rdata .= pack("V", 1);
+            }
+            else { // Other recurrences
+                $rdata .= pack("V", 0);
+            }
+
+            // Exception data
+
+            // Get all exceptions
+            $deleted_items = $this->recur["deleted_occurrences"];
+            $changed_items = $this->recur["changed_occurrences"];
+
+            // Merge deleted and changed items into one list
+            $items = $deleted_items;
+
+            foreach ($changed_items as $changed_item) {
+                array_push($items, $changed_item["basedate"]);
+            }
+
+            sort($items);
+
+            // Add the merged list in to the rdata
+            $rdata .= pack("V", count($items));
+            foreach ($items as $item) {
+                $rdata .= pack("V", $this->unixDataToRecurData($item));
+            }
+
+            // Loop through the changed exceptions (not deleted)
+            $rdata .= pack("V", count($changed_items));
+            $items = [];
+
+            foreach ($changed_items as $changed_item) {
+                $items[] = $this->dayStartOf($changed_item["start"]);
+            }
+
+            sort($items);
+
+            // Add the changed items list int the rdata
+            foreach ($items as $item) {
+                $rdata .= pack("V", $this->unixDataToRecurData($item));
+            }
+
+            // Set start date
+            $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
+
+            // Set enddate
+            switch ($term) {
+            // After the given enddate
+            case 0x21:
+                $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+                break;
+            // After a number of times
+            case 0x22:
+                // @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
+                $occenddate = (int) $this->recur["start"];
+
+                switch ((int) $this->recur["type"]) {
+                case 0x0A: // daily
+                    if ($this->recur["subtype"] != 1) {
+                        // -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
+                        $occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
+                        break;
+                    }
+                    // Daily every workday
+                    $restocc = (int) $this->recur["numoccur"];
+                    // Get starting weekday
+                    $nowtime = $this->gmtime($occenddate);
+                    $j = $nowtime["tm_wday"];
+
+                    while (1) {
+                        if (($j % 7) > 0 && ($j % 7) < 6) {
+                            --$restocc;
+                        }
+                        ++$j;
+                        if ($restocc <= 0) {
+                            break;
+                        }
+                        $occenddate += 24 * 60 * 60;
+                    }
+                    break;
+
+                case 0x0B: // weekly
+                    // Needed values
+                    // $forwardcount - number of weeks we can skip forward
+                    // $restocc - number of remaining occurrences after the week skip
+
+                    // Add the weeks till the last item
+                    $occenddate += ($forwardcount * 7 * 24 * 60 * 60);
+                    $dayofweek = gmdate("w", $occenddate);
+
+                    // Loop through the last occurrences until we have had them all
+                    for ($j = 1; $restocc > 0; ++$j) {
+                        // Jump to the next week (which may be N weeks away) when going over the week boundary
+                        if ((($dayofweek + $j) % 7) == $weekstart) {
+                            $occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
+                        }
+
+                        // If this is a matching day, once less occurrence to process
+                        if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+                            --$restocc;
+                        }
+
+                        // Next day
+                        $occenddate += 24 * 60 * 60;
+                    }
+                    break;
+
+                case 0x0C: // monthly
+                case 0x0D: // yearly
+                    $curyear = gmdate("Y", (int) $this->recur["start"]);
+                    $curmonth = gmdate("n", (int) $this->recur["start"]);
+                    // $forwardcount = months
+
+                    switch ((int) $this->recur["subtype"]) {
+                    case 2: // on D day of every M month
+                        while ($forwardcount > 0) {
+                            $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+                            if ($curmonth >= 12) {
+                                $curmonth = 1;
+                                ++$curyear;
+                            }
+                            else {
+                                ++$curmonth;
+                            }
+                            --$forwardcount;
+                        }
+
+                        // compensation between 28 and 31
+                        if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
+                            gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
+                            if (gmdate("j", $occenddate) < 28) {
+                                $occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
+                            }
+                            else {
+                                $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+                            }
+                        }
+                        break;
+
+                    case 3: // on Nth weekday of every M month
+                        $nday = (int) $this->recur["nday"]; // 1 tot 5
+                        $weekdays = (int) $this->recur["weekdays"];
+                        while ($forwardcount > 0) {
+                            $occenddate += $this->getMonthInSeconds($curyear, $curmonth);
+                            if ($curmonth >= 12) {
+                                $curmonth = 1;
+                                ++$curyear;
+                            }
+                            else {
+                                ++$curmonth;
+                            }
+                            --$forwardcount;
+                        }
+                        if ($nday == 5) {
+                            // Set date on the last day of the last month
+                            $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
+                        }
+                        else {
+                            // Set date on the first day of the last month
+                            $occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
+                        }
+
+                        for ($i = 0; $i < 7; ++$i) {
+                            if ($nday == 5 && (1 << ((gmdate("w", $occenddate) - $i) % 7)) & $weekdays) {
+                                $occenddate -= $i * 24 * 60 * 60;
+
+                                break;
+                            }
+                            if ($nday != 5 && (1 << ((gmdate("w", $occenddate) + $i) % 7)) & $weekdays) {
+                                $occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
+
+                                break;
+                            }
+                        }
+                        break; // case 3:
+                    }
+                    break;
+                }
+
+                if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX) {
+                    $occenddate = PHP_INT_MAX;
+                }
+
+                $this->recur["end"] = $occenddate;
+                $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+                break;
+            // Never ends
+            case 0x23:
+            default:
+                $this->recur["end"] = 0x7FFFFFFF; // max date -> 2038
+                $rdata .= pack("V", 0x5AE980DF);
+                break;
+            }
+
+            // UTC date
+            $utcstart = $this->toGMT($this->tz, (int) $this->recur["start"]);
+            $utcend = $this->toGMT($this->tz, (int) $this->recur["end"]);
+
+            // utc date+time
+            $utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int) $this->recur["startocc"]) * 60) : $utcstart;
+            $utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int) $this->recur["endocc"]) * 60) : $utcstart;
+
+            // update reminder time
+            mapi_setprops($this->message, [$this->proptags["reminder_time"] => $utcfirstoccstartdatetime]);
+
+            // update first occurrence date
+            mapi_setprops($this->message, [$this->proptags["startdate"] => $utcfirstoccstartdatetime]);
+            mapi_setprops($this->message, [$this->proptags["duedate"] => $utcfirstoccenddatetime]);
+            mapi_setprops($this->message, [$this->proptags["commonstart"] => $utcfirstoccstartdatetime]);
+            mapi_setprops($this->message, [$this->proptags["commonend"] => $utcfirstoccenddatetime]);
+
+            // Set Outlook properties, if it is an appointment
+            if (isset($this->recur["message_class"]) && $this->recur["message_class"] == "IPM.Appointment") {
+                // update real begin and real end date
+                mapi_setprops($this->message, [$this->proptags["startdate_recurring"] => $utcstart]);
+                mapi_setprops($this->message, [$this->proptags["enddate_recurring"] => $utcend]);
+
+                // recurrencetype
+                // Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
+                mapi_setprops($this->message, [$this->proptags["recurrencetype"] => ((int) $this->recur["type"]) - 0x9]);
+
+                // set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
+                mapi_setprops($this->message, [$this->proptags["side_effects"] => 369]);
+            }
+            else {
+                mapi_setprops($this->message, [$this->proptags["side_effects"] => 3441]);
+            }
+
+            // FlagDueBy is datetime of the first reminder occurrence. Outlook gives on this time a reminder popup dialog
+            // Any change of the recurrence (including changing and deleting exceptions) causes the flagdueby to be reset
+            // to the 'next' occurrence; this makes sure that deleting the next occurrence will correctly set the reminder to
+            // the occurrence after that. The 'next' occurrence is defined as being the first occurrence that starts at moment X (server time)
+            // with the reminder flag set.
+            $reminderprops = mapi_getprops($this->message, [$this->proptags["reminder_minutes"]]);
+            if (isset($reminderprops[$this->proptags["reminder_minutes"]])) {
+                $occ = false;
+                $occurrences = $this->getItems(time(), 0x7FF00000, 3, true);
+
+                for ($i = 0, $len = count($occurrences); $i < $len; ++$i) {
+                    // This will actually also give us appointments that have already started, but not yet ended. Since we want the next
+                    // reminder that occurs after time(), we may have to skip the first few entries. We get 3 entries since that is the maximum
+                    // number that would be needed (assuming reminder for item X cannot be before the previous occurrence starts). Worst case:
+                    // time() is currently after start but before end of item, but reminder of next item has already passed (reminder for next item
+                    // can be DURING the previous item, eg daily allday events). In that case, the first and second items must be skipped.
+
+                    if (($occurrences[$i][$this->proptags["startdate"]] - $reminderprops[$this->proptags["reminder_minutes"]] * 60) > time()) {
+                        $occ = $occurrences[$i];
+
+                        break;
+                    }
+                }
+
+                if ($occ) {
+                    mapi_setprops($this->message, [$this->proptags["flagdueby"] => $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60)]);
+                }
+                else {
+                    // Last reminder passed, no reminders any more.
+                    mapi_setprops($this->message, [$this->proptags["reminder"] => false, $this->proptags["flagdueby"] => 0x7FF00000]);
+                }
+            }
+
+            // Default data
+            // Second item (0x08) indicates the Outlook version (see documentation at the bottom of this file for more information)
+            $rdata .= pack("VCCCC", 0x00003006, 0x08, 0x30, 0x00, 0x00);
+
+            if (isset($this->recur["startocc"], $this->recur["endocc"])) {
+                // Set start and endtime in minutes
+                $rdata .= pack("VV", (int) $this->recur["startocc"], (int) $this->recur["endocc"]);
+            }
+
+            // Detailed exception data
+
+            $changed_items = $this->recur["changed_occurrences"];
+
+            $rdata .= pack("v", count($changed_items));
+
+            foreach ($changed_items as $changed_item) {
+                // Set start and end time of exception
+                $rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
+                $rdata .= pack("V", $this->unixDataToRecurData($changed_item["end"]));
+                $rdata .= pack("V", $this->unixDataToRecurData($changed_item["basedate"]));
+
+                // Bitmask
+                $bitmask = 0;
+
+                // Check for changed strings
+                if (isset($changed_item["subject"])) {
+                    $bitmask |= 1 << 0;
+                }
+                if (isset($changed_item["remind_before"])) {
+                    $bitmask |= 1 << 2;
+                }
+                if (isset($changed_item["reminder_set"])) {
+                    $bitmask |= 1 << 3;
+                }
+                if (isset($changed_item["location"])) {
+                    $bitmask |= 1 << 4;
+                }
+                if (isset($changed_item["busystatus"])) {
+                    $bitmask |= 1 << 5;
+                }
+                if (isset($changed_item["alldayevent"])) {
+                    $bitmask |= 1 << 7;
+                }
+                if (isset($changed_item["label"])) {
+                    $bitmask |= 1 << 8;
+                }
+
+                $rdata .= pack("v", $bitmask);
+
+                // Set "subject"
+                if (isset($changed_item["subject"])) {
+                    // convert UTF-8 to non-unicode blob string (US-ASCII?)
+                    $subject = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["subject"]);
+                    $length = strlen($subject);
+                    $rdata .= pack("vv", $length + 1, $length);
+                    $rdata .= pack("a" . $length, $subject);
+                }
+                if (isset($changed_item["remind_before"])) {
+                    $rdata .= pack("V", $changed_item["remind_before"]);
+                }
+                if (isset($changed_item["reminder_set"])) {
+                    $rdata .= pack("V", $changed_item["reminder_set"]);
+                }
+                if (isset($changed_item["location"])) {
+                    $location = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["location"]);
+                    $length = strlen($location);
+                    $rdata .= pack("vv", $length + 1, $length);
+                    $rdata .= pack("a" . $length, $location);
+                }
+                if (isset($changed_item["busystatus"])) {
+                    $rdata .= pack("V", $changed_item["busystatus"]);
+                }
+                if (isset($changed_item["alldayevent"])) {
+                    $rdata .= pack("V", $changed_item["alldayevent"]);
+                }
+                if (isset($changed_item["label"])) {
+                    $rdata .= pack("V", $changed_item["label"]);
+                }
+            }
+
+            $rdata .= pack("V", 0);
+
+            // write extended data
+            foreach ($changed_items as $changed_item) {
+                $rdata .= pack("V", 0);
+                if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
+                    $rdata .= pack("V", $this->unixDataToRecurData($changed_item["start"]));
+                    $rdata .= pack("V", $this->unixDataToRecurData($changed_item["end"]));
+                    $rdata .= pack("V", $this->unixDataToRecurData($changed_item["basedate"]));
+                }
+
+                if (isset($changed_item["subject"])) {
+                    $subject = iconv("UTF-8", "UCS-2LE", $changed_item["subject"]);
+                    $length = iconv_strlen($subject, "UCS-2LE");
+                    $rdata .= pack("v", $length);
+                    $rdata .= pack("a" . $length * 2, $subject);
+                }
+
+                if (isset($changed_item["location"])) {
+                    $location = iconv("UTF-8", "UCS-2LE", $changed_item["location"]);
+                    $length = iconv_strlen($location, "UCS-2LE");
+                    $rdata .= pack("v", $length);
+                    $rdata .= pack("a" . $length * 2, $location);
+                }
+                if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
+                    $rdata .= pack("V", 0);
+                }
+            }
+
+            $rdata .= pack("V", 0);
+
+            // Set props
+            mapi_setprops($this->message, [$this->proptags["recurring_data"] => $rdata, $this->proptags["recurring"] => true]);
+            if (isset($this->tz) && $this->tz) {
+                $timezone = "GMT";
+                if ($this->tz["timezone"] != 0) {
+                    // Create user readable timezone information
+                    $timezone = sprintf(
+                        "(GMT %s%02d:%02d)",
+                        (-$this->tz["timezone"] > 0 ? "+" : "-"),
+                        abs($this->tz["timezone"] / 60),
+                        abs($this->tz["timezone"] % 60)
+                    );
+                }
+                mapi_setprops($this->message, [$this->proptags["timezone_data"] => $this->getTimezoneData($this->tz),
+                    $this->proptags["timezone"] => $timezone, ]);
+            }
+        }
+
+        /**
+         * Function which converts a recurrence date timestamp to an Unix date timestamp.
+         *
+         * @author Steve Hardy
+         *
+         * @param int $rdate the date which will be converted
+         *
+         * @return int the converted date
+         */
+        public function recurDataToUnixData($rdate) {
+            return ($rdate - 194074560) * 60;
+        }
+
+        /**
+         * Function which converts an Unix date timestamp to recurrence date timestamp.
+         *
+         * @author Johnny Biemans
+         *
+         * @param Date $date the date which will be converted
+         *
+         * @return int the converted date in minutes
+         */
+        public function unixDataToRecurData($date) {
+            return ($date / 60) + 194074560;
+        }
+
+        /**
+         * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves.
+         *
+         * @author Steve Hardy
+         *
+         * @param mixed $ts
+         */
+        public function GetTZOffset($ts) {
+            $Offset = date("O", $ts);
+
+            $Parity = $Offset < 0 ? -1 : 1;
+            $Offset = $Parity * $Offset;
+            $Offset = ($Offset - ($Offset % 100)) / 100 * 60 + $Offset % 100;
+
+            return $Parity * $Offset;
+        }
+
+        /**
+         * gmtime() doesn't exist in standard PHP, so we have to implement it ourselves.
+         *
+         * @author Steve Hardy
+         *
+         * @param Date $time
+         *
+         * @return Date GMT Time
+         */
+        public function gmtime($time) {
+            $TZOffset = $this->GetTZOffset($time);
+
+            $t_time = $time - $TZOffset * 60; # Counter adjust for localtime()
+
+            return localtime($t_time, 1);
+        }
+
+        public function isLeapYear($year) {
+            return $year % 4 == 0 && ($year % 100 != 0 || $year % 400 == 0);
+        }
+
+        public function getMonthInSeconds($year, $month) {
+            if (in_array($month, [1, 3, 5, 7, 8, 10, 12])) {
+                $day = 31;
+            }
+            elseif (in_array($month, [4, 6, 9, 11])) {
+                $day = 30;
+            }
+            else {
+                $day = 28;
+                if ($this->isLeapYear($year) == 1) {
+                    ++$day;
+                }
+            }
+
+            return $day * 24 * 60 * 60;
+        }
+
+        /**
+         * Function to get a date by Year Nr, Month Nr, Week Nr, Day Nr, and hour.
+         *
+         * @param int $year
+         * @param int $month
+         * @param int $week
+         * @param int $day
+         * @param int $hour
+         *
+         * @return returns the timestamp of the given date, timezone independent
+         */
+        public function getDateByYearMonthWeekDayHour($year, $month, $week, $day, $hour) {
+            // get first day of month
+            $date = gmmktime(0, 0, 0, $month, 0, $year + 1900);
+
+            // get wday info
+            $gmdate = $this->gmtime($date);
+
+            $date -= $gmdate["tm_wday"] * 24 * 60 * 60; // back up to start of week
+
+            $date += $week * 7 * 24 * 60 * 60; // go to correct week nr
+            $date += $day * 24 * 60 * 60;
+            $date += $hour * 60 * 60;
+
+            $gmdate = $this->gmtime($date);
+
+            // if we are in the next month, then back up a week, because week '5' means
+            // 'last week of month'
+
+            if ($month != $gmdate["tm_mon"] + 1) {
+                $date -= 7 * 24 * 60 * 60;
+            }
+
+            return $date;
+        }
+
+        /**
+         * getTimezone gives the timezone offset (in minutes) of the given
+         * local date/time according to the given TZ info.
+         *
+         * @param mixed $tz
+         * @param mixed $date
+         */
+        public function getTimezone($tz, $date) {
+            // No timezone -> GMT (+0)
+            if (!isset($tz["timezone"])) {
+                return 0;
+            }
+
+            $dst = false;
+            $gmdate = $this->gmtime($date);
+
+            $dststart = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dststartmonth"], $tz["dststartweek"], 0, $tz["dststarthour"]);
+            $dstend = $this->getDateByYearMonthWeekDayHour($gmdate["tm_year"], $tz["dstendmonth"], $tz["dstendweek"], 0, $tz["dstendhour"]);
+
+            if ($dststart <= $dstend) {
+                // Northern hemisphere, eg DST is during Mar-Oct
+                if ($date > $dststart && $date < $dstend) {
+                    $dst = true;
+                }
+            }
+            else {
+                // Southern hemisphere, eg DST is during Oct-Mar
+                if ($date < $dstend || $date > $dststart) {
+                    $dst = true;
+                }
+            }
+
+            if ($dst) {
+                return $tz["timezone"] + $tz["timezonedst"];
+            }
+
+            return $tz["timezone"];
+        }
+
+        /**
+         * getWeekNr() returns the week nr of the month (ie first week of february is 1).
+         *
+         * @param mixed $date
+         */
+        public function getWeekNr($date) {
+            $gmdate = gmtime($date);
+            $gmdate["tm_mday"] = 0;
+
+            return strftime("%W", $date) - strftime("%W", gmmktime($gmdate)) + 1;
+        }
+
+        /**
+         * parseTimezone parses the timezone as specified in named property 0x8233
+         * in Outlook calendar messages. Returns the timezone in minutes negative
+         * offset (GMT +2:00 -> -120).
+         *
+         * @param mixed $data
+         */
+        public function parseTimezone($data) {
+            if (strlen($data) < 48) {
+                return;
+            }
+
+            return unpack("ltimezone/lunk/ltimezonedst/lunk/ldstendmonth/vdstendweek/vdstendhour/lunk/lunk/vunk/ldststartmonth/vdststartweek/vdststarthour/lunk/vunk", $data);
+        }
+
+        public function getTimezoneData($tz) {
+            return pack("lllllvvllvlvvlv", $tz["timezone"], 0, $tz["timezonedst"], 0, $tz["dstendmonth"], $tz["dstendweek"], $tz["dstendhour"], 0, 0, 0, $tz["dststartmonth"], $tz["dststartweek"], $tz["dststarthour"], 0, 0);
+        }
+
+        /**
+         * createTimezone creates the timezone as specified in the named property 0x8233
+         * see also parseTimezone()
+         * $tz is an array with the timezone data.
+         *
+         * @param mixed $tz
+         */
+        public function createTimezone($tz) {
+            return pack(
+                "lxxxxlxxxxlvvxxxxxxxxxxlvvxxxxxx",
+                $tz["timezone"],
+                array_key_exists("timezonedst", $tz) ? $tz["timezonedst"] : 0,
+                array_key_exists("dstendmonth", $tz) ? $tz["dstendmonth"] : 0,
+                array_key_exists("dstendweek", $tz) ? $tz["dstendweek"] : 0,
+                array_key_exists("dstendhour", $tz) ? $tz["dstendhour"] : 0,
+                array_key_exists("dststartmonth", $tz) ? $tz["dststartmonth"] : 0,
+                array_key_exists("dststartweek", $tz) ? $tz["dststartweek"] : 0,
+                array_key_exists("dststarthour", $tz) ? $tz["dststarthour"] : 0
+            );
+        }
+
+        /**
+         * toGMT returns a timestamp in GMT time for the time and timezone given.
+         *
+         * @param mixed $tz
+         * @param mixed $date
+         */
+        public function toGMT($tz, $date) {
+            if (!isset($tz['timezone'])) {
+                return $date;
+            }
+            $offset = $this->getTimezone($tz, $date);
+
+            return $date + $offset * 60;
+        }
+
+        /**
+         * fromGMT returns a timestamp in the local timezone given from the GMT time given.
+         *
+         * @param mixed $tz
+         * @param mixed $date
+         */
+        public function fromGMT($tz, $date) {
+            $offset = $this->getTimezone($tz, $date);
+
+            return $date - $offset * 60;
+        }
+
+        /**
+         * Function to get timestamp of the beginning of the day of the timestamp given.
+         *
+         * @param date $date
+         *
+         * @return date timestamp referring to same day but at 00:00:00
+         */
+        public function dayStartOf($date) {
+            $time1 = $this->gmtime($date);
+
+            return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, $time1["tm_mday"], $time1["tm_year"] + 1900);
+        }
+
+        /**
+         * Function to get timestamp of the beginning of the month of the timestamp given.
+         *
+         * @param date $date
+         *
+         * @return date Timestamp referring to same month but on the first day, and at 00:00:00
+         */
+        public function monthStartOf($date) {
+            $time1 = $this->gmtime($date);
+
+            return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, 1, $time1["tm_year"] + 1900);
+        }
+
+        /**
+         * Function to get timestamp of the beginning of the year of the timestamp given.
+         *
+         * @param date $date
+         *
+         * @return date Timestamp referring to the same year but on Jan 01, at 00:00:00
+         */
+        public function yearStartOf($date) {
+            $time1 = $this->gmtime($date);
+
+            return gmmktime(0, 0, 0, 1, 1, $time1["tm_year"] + 1900);
+        }
+
+        /**
+         * Function which returns the items in a given interval. This included expansion of the recurrence and
+         * processing of exceptions (modified and deleted).
+         *
+         * @param string $entryid       the entryid of the message
+         * @param array  $props         the properties of the message
+         * @param date   $start         start time of the interval (GMT)
+         * @param date   $end           end time of the interval (GMT)
+         * @param mixed  $limit
+         * @param mixed  $remindersonly
+         */
+        public function getItems($start, $end, $limit = 0, $remindersonly = false) {
+            $items = [];
+
+            if (isset($this->recur)) {
+                // Optimization: remindersonly and default reminder is off; since only exceptions with reminder set will match, just look which
+                // exceptions are in range and have a reminder set
+                if ($remindersonly && (!isset($this->messageprops[$this->proptags["reminder"]]) || $this->messageprops[$this->proptags["reminder"]] == false)) {
+                    // Sort exceptions by start time
+                    uasort($this->recur["changed_occurrences"], [$this, "sortExceptionStart"]);
+
+                    // Loop through all changed exceptions
+                    foreach ($this->recur["changed_occurrences"] as $exception) {
+                        // Check reminder set
+                        if (!isset($exception["reminder"]) || $exception["reminder"] == false) {
+                            continue;
+                        }
+
+                        // Convert to GMT
+                        $occstart = $this->toGMT($this->tz, $exception["start"]);
+                        $occend = $this->toGMT($this->tz, $exception["end"]);
+
+                        // Check range criterium
+                        if ($occstart > $end || $occend < $start) {
+                            continue;
+                        }
+
+                        // OK, add to items.
+                        array_push($items, $this->getExceptionProperties($exception));
+                        if ($limit && (count($items) == $limit)) {
+                            break;
+                        }
+                    }
+
+                    uasort($items, [$this, "sortStarttime"]);
+
+                    return $items;
+                }
+
+                // From here on, the dates of the occurrences are calculated in local time, so the days we're looking
+                // at are calculated from the local time dates of $start and $end
+
+                if ($this->recur['regen'] && isset($this->action['datecompleted'])) {
+                    $daystart = $this->dayStartOf($this->action['datecompleted']);
+                }
+                else {
+                    $daystart = $this->dayStartOf($this->recur["start"]);
+                } // start on first day of occurrence
+
+                // Calculate the last day on which we want to be looking at a recurrence; this is either the end of the view
+                // or the end of the recurrence, whichever comes first
+                if ($end > $this->toGMT($this->tz, $this->recur["end"])) {
+                    $rangeend = $this->toGMT($this->tz, $this->recur["end"]);
+                }
+                else {
+                    $rangeend = $end;
+                }
+
+                $dayend = $this->dayStartOf($this->fromGMT($this->tz, $rangeend));
+
+                // Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
+
+                switch ($this->recur["type"]) {
+                case 10:
+                    // Daily
+                    if ($this->recur["everyn"] <= 0) {
+                        $this->recur["everyn"] = 1440;
+                    }
+
+                    if ($this->recur["subtype"] == 0) {
+                        // Every Nth day
+                        for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+                            $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                        }
+                        break;
+                    }
+                    // Every workday
+                    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
+                        $nowtime = $this->gmtime($now);
+                        if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+                            $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                        }
+                    }
+                    break;
+
+                case 11:
+                    // Weekly
+                    if ($this->recur["everyn"] <= 0) {
+                        $this->recur["everyn"] = 1;
+                    }
+
+                    // If sliding flag is set then move to 'n' weeks
+                    if ($this->recur['regen']) {
+                        $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
+                    }
+
+                    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+                        if ($this->recur['regen']) {
+                            $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+
+                            break;
+                        }
+                        // Loop through the whole following week to the first occurrence of the week, add each day that is specified
+                        for ($wday = 0; $wday < 7; ++$wday) {
+                            $daynow = $now + $wday * 60 * 60 * 24;
+                            // checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+                            if ($daynow > $dayend) {
+                                continue;
+                            }
+                            $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+                            if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
+                                $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                            }
+                        }
+                    }
+                    break;
+
+                case 12:
+                    // Monthly
+                    if ($this->recur["everyn"] <= 0) {
+                        $this->recur["everyn"] = 1;
+                    }
+
+                    // Loop through all months from start to end of occurrence, starting at beginning of first month
+                    for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+                        if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+                            $difference = 1;
+                            if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+                                $difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+                            }
+
+                            $daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+                            // checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+                            if ($daynow <= $dayend) {
+                                $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                            }
+                        }
+                        elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+                            // Sanitize input
+                            if ($this->recur["weekdays"] == 0) {
+                                $this->recur["weekdays"] = 1;
+                            }
+
+                            // If nday is not set to the last day in the month
+                            if ($this->recur["nday"] < 5) {
+                                // keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+                                $ndaycounter = 0;
+                                // Find matching weekday in this month
+                                for ($day = 0; $day < $this->daysInMonth($now, 1); ++$day) {
+                                    $daynow = $now + $day * 60 * 60 * 24;
+                                    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+                                    if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+                                        ++$ndaycounter;
+                                    }
+                                    // check the selected pattern is same as asked Nth weekday,If so set the firstday
+                                    if ($this->recur["nday"] == $ndaycounter) {
+                                        $firstday = $day;
+
+                                        break;
+                                    }
+                                }
+                                // $firstday is the day of the month on which the asked pattern of nth weekday matches
+                                $daynow = $now + $firstday * 60 * 60 * 24;
+                            }
+                            else {
+                                // Find last day in the month ($now is the firstday of the month)
+                                $NumDaysInMonth = $this->daysInMonth($now, 1);
+                                $daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
+
+                                $nowtime = $this->gmtime($daynow);
+                                while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
+                                    $daynow -= 86400;
+                                    $nowtime = $this->gmtime($daynow);
+                                }
+                            }
+
+                            /*
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the			* recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-						elseif ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-					break;
-
-				case 13:
-					// Yearly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 12;
-					}
-
-					for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if ($monthday > $this->daysInMonth($monthstart, 1)) {
-								$monthday = $this->daysInMonth($monthstart, 1);
-							}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
-
-							// Find first matching weekday in this month
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-								if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
-
-									break;
-								}
-							}
-
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
-							while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
-
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
-							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-				}
-				// to get all exception items
-				if (!empty($this->recur['changed_occurrences'])) {
-					$this->processExceptionItems($items, $start, $end);
-				}
-			}
-
-			// sort items on starttime
-			usort($items, [$this, "sortStarttime"]);
-
-			// Return the MAPI-compatible list of items for this object
-			return $items;
-		}
-
-		public function sortStarttime($a, $b) {
-			$aTime = $a[$this->proptags["startdate"]];
-			$bTime = $b[$this->proptags["startdate"]];
-
-			return $aTime == $bTime ? 0 : ($aTime > $bTime ? 1 : -1);
-		}
-
-		/**
-		 * daysInMonth.
-		 *
-		 * Returns the number of days in the upcoming number of months. If you specify 1 month as
-		 * $months it will give you the number of days in the month of $date. If you specify more it
-		 * will also count the days in the upcoming months and add that to the number of days. So
-		 * if you have a date in march and you specify $months as 2 it will return 61.
-		 *
-		 * @param int $date   specified date as timestamp from which you want to know the number
-		 *                    of days in the month
-		 * @param int $months number of months you want to know the number of days in
-		 * @returns Integer Number of days in the specified amount of months.
-		 */
-		public function daysInMonth($date, $months) {
-			$days = 0;
-			for ($i = 0; $i < $months; ++$i) {
-				$days += date("t", $date + $days * 24 * 60 * 60);
-			}
-
-			return $days;
-		}
-
-		// Converts MAPI-style 'minutes' into the month of the year [0..11]
-		public function monthOfYear($minutes) {
-			$d = gmmktime(0, 0, 0, 1, 1, 2001); // The year 2001 was a non-leap year, and the minutes provided are always in non-leap-year-minutes
-
-			$d += $minutes * 60;
-
-			$dtime = $this->gmtime($d);
-
-			return $dtime["tm_mon"];
-		}
-
-		public function sortExceptionStart($a, $b) {
-			return $a["start"] == $b["start"] ? 0 : ($a["start"] > $b["start"] ? 1 : -1);
-		}
-	}
+                            if ($daynow <= $dayend && $daynow >= $daystart) {
+                                $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                            }
+                        }
+                        elseif ($this->recur['regen']) {
+                            $next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+                            $now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+                            if ($now <= $dayend) {
+                                $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                            }
+                        }
+                    }
+                    break;
+
+                case 13:
+                    // Yearly
+                    if ($this->recur["everyn"] <= 0) {
+                        $this->recur["everyn"] = 12;
+                    }
+
+                    for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+                        if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+                            // recur["month"] is in minutes since the beginning of the year
+                            $month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+                            $monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+                            $monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+                            if ($monthday > $this->daysInMonth($monthstart, 1)) {
+                                $monthday = $this->daysInMonth($monthstart, 1);
+                            }	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
+                            $daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
+                            $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                        }
+                        elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+                            // Go the correct month
+                            $monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
+
+                            // Find first matching weekday in this month
+                            for ($wday = 0; $wday < 7; ++$wday) {
+                                $daynow = $monthnow + $wday * 60 * 60 * 24;
+                                $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+                                if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+                                    $firstday = $wday;
+
+                                    break;
+                                }
+                            }
+
+                            // Same as above (monthly)
+                            $daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+                            while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+                                $daynow -= 7 * 60 * 60 * 24;
+                            }
+
+                            $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                        }
+                        elseif ($this->recur['regen']) {
+                            $year_starttime = $this->gmtime($now);
+                            $is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
+                            $now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
+                            if ($now <= $dayend) {
+                                $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+                            }
+                        }
+                    }
+                }
+                // to get all exception items
+                if (!empty($this->recur['changed_occurrences'])) {
+                    $this->processExceptionItems($items, $start, $end);
+                }
+            }
+
+            // sort items on starttime
+            usort($items, [$this, "sortStarttime"]);
+
+            // Return the MAPI-compatible list of items for this object
+            return $items;
+        }
+
+        public function sortStarttime($a, $b) {
+            $aTime = $a[$this->proptags["startdate"]];
+            $bTime = $b[$this->proptags["startdate"]];
+
+            return $aTime == $bTime ? 0 : ($aTime > $bTime ? 1 : -1);
+        }
+
+        /**
+         * daysInMonth.
+         *
+         * Returns the number of days in the upcoming number of months. If you specify 1 month as
+         * $months it will give you the number of days in the month of $date. If you specify more it
+         * will also count the days in the upcoming months and add that to the number of days. So
+         * if you have a date in march and you specify $months as 2 it will return 61.
+         *
+         * @param int $date   specified date as timestamp from which you want to know the number
+         *                    of days in the month
+         * @param int $months number of months you want to know the number of days in
+         * @returns Integer Number of days in the specified amount of months.
+         */
+        public function daysInMonth($date, $months) {
+            $days = 0;
+            for ($i = 0; $i < $months; ++$i) {
+                $days += date("t", $date + $days * 24 * 60 * 60);
+            }
+
+            return $days;
+        }
+
+        // Converts MAPI-style 'minutes' into the month of the year [0..11]
+        public function monthOfYear($minutes) {
+            $d = gmmktime(0, 0, 0, 1, 1, 2001); // The year 2001 was a non-leap year, and the minutes provided are always in non-leap-year-minutes
+
+            $d += $minutes * 60;
+
+            $dtime = $this->gmtime($d);
+
+            return $dtime["tm_mon"];
+        }
+
+        public function sortExceptionStart($a, $b) {
+            return $a["start"] == $b["start"] ? 0 : ($a["start"] > $b["start"] ? 1 : -1);
+        }
+    }

Spacing +1 added lines, -1 removed lines

@@ -1822,7 +1822,7 @@
 						}
 						elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
+							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 							if ($now <= $dayend) {
 								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);

Braces +28 added lines, -56 removed lines

@@ -51,8 +51,7 @@ 
 
 			if (is_array($message)) {
 				$this->messageprops = $message;
-			}
-			else {
+			} else {
 				$this->message = $message;
 				$this->messageprops = mapi_getprops($this->message, $this->proptags);
 			}
@@ -207,8 +206,7 @@ 
 				$ret["regen"] = $data["regen"];
 				if ($ret["subtype"] == 3) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -232,8 +230,7 @@ 
 				$ret["regen"] = $data["regen"];
 				if ($ret["subtype"] == 3) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -582,8 +579,7 @@ 
 				if ($this->recur["subtype"] == 1) {
 					// Daily every workday
 					$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
-				}
-				else {
+				} else {
 					// Daily every N days (everyN in minutes)
 					$everyn = ((int) $this->recur["everyn"]) / 1440;
 					// Calc first occ
@@ -651,8 +647,7 @@ 
 
 				if ($this->recur["regen"]) {
 					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-				}
-				else {
+				} else {
 					$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
 				}
 				break;
@@ -669,8 +664,7 @@ 
 				}
 				if ($term == 0x0C /* monthly */) {
 					$everyn = (int) $this->recur["everyn"];
-				}
-				else {
+				} else {
 					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
 				}
 
@@ -746,8 +740,7 @@ 
 							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
 						}
 						$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
-					}
-					else {
+					} else {
 						// Calc first occ
 						$firstocc = 0;
 						$monthIndex = (int) gmdate("n", $this->recur["start"]);
@@ -774,8 +767,7 @@ 
 					if ($nday == 5) {
 						// Set date on the last day of the last month
 						$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
-					}
-					else {
+					} else {
 						// Set on the first day of the month
 						$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
 					}
@@ -784,8 +776,7 @@ 
 						// Set on right month
 						if ($selmonth < $curmonth) {
 							$tmp = 12 - $curmonth + $selmonth;
-						}
-						else {
+						} else {
 							$tmp = ($selmonth - $curmonth);
 						}
 
@@ -797,8 +788,7 @@ 
 							}
 							++$curmonth;
 						}
-					}
-					else {
+					} else {
 						// Check or you exist in the right month
 						for ($i = 0; $i < 7; ++$i) {
 							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
@@ -856,8 +846,7 @@ 
 					}
 					if ($nday == 5) {
 						$monthbegindow -= $day * 24 * 60 * 60;
-					}
-					else {
+					} else {
 						$monthbegindow += ($day - 1) * 24 * 60 * 60;
 					}
 
@@ -911,8 +900,7 @@ 
 			// Strange little thing for the recurrence type "every workday"
 			if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
 				$rdata .= pack("V", 1);
-			}
-			else { // Other recurrences
+			} else { // Other recurrences
 				$rdata .= pack("V", 0);
 			}
 
@@ -1030,8 +1018,7 @@ 
 							if ($curmonth >= 12) {
 								$curmonth = 1;
 								++$curyear;
-							}
-							else {
+							} else {
 								++$curmonth;
 							}
 							--$forwardcount;
@@ -1042,8 +1029,7 @@ 
 							gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
 							if (gmdate("j", $occenddate) < 28) {
 								$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
-							}
-							else {
+							} else {
 								$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
 							}
 						}
@@ -1057,8 +1043,7 @@ 
 							if ($curmonth >= 12) {
 								$curmonth = 1;
 								++$curyear;
-							}
-							else {
+							} else {
 								++$curmonth;
 							}
 							--$forwardcount;
@@ -1066,8 +1051,7 @@ 
 						if ($nday == 5) {
 							// Set date on the last day of the last month
 							$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-						}
-						else {
+						} else {
 							// Set date on the first day of the last month
 							$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
 						}
@@ -1133,8 +1117,7 @@ 
 
 				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
 				mapi_setprops($this->message, [$this->proptags["side_effects"] => 369]);
-			}
-			else {
+			} else {
 				mapi_setprops($this->message, [$this->proptags["side_effects"] => 3441]);
 			}
 
@@ -1164,8 +1147,7 @@ 
 
 				if ($occ) {
 					mapi_setprops($this->message, [$this->proptags["flagdueby"] => $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60)]);
-				}
-				else {
+				} else {
 					// Last reminder passed, no reminders any more.
 					mapi_setprops($this->message, [$this->proptags["reminder"] => false, $this->proptags["flagdueby"] => 0x7FF00000]);
 				}
@@ -1367,11 +1349,9 @@ 
 		public function getMonthInSeconds($year, $month) {
 			if (in_array($month, [1, 3, 5, 7, 8, 10, 12])) {
 				$day = 31;
-			}
-			elseif (in_array($month, [4, 6, 9, 11])) {
+			} elseif (in_array($month, [4, 6, 9, 11])) {
 				$day = 30;
-			}
-			else {
+			} else {
 				$day = 28;
 				if ($this->isLeapYear($year) == 1) {
 					++$day;
@@ -1441,8 +1421,7 @@ 
 				if ($date > $dststart && $date < $dstend) {
 					$dst = true;
 				}
-			}
-			else {
+			} else {
 				// Southern hemisphere, eg DST is during Oct-Mar
 				if ($date < $dstend || $date > $dststart) {
 					$dst = true;
@@ -1628,8 +1607,7 @@ 
 
 				if ($this->recur['regen'] && isset($this->action['datecompleted'])) {
 					$daystart = $this->dayStartOf($this->action['datecompleted']);
-				}
-				else {
+				} else {
 					$daystart = $this->dayStartOf($this->recur["start"]);
 				} // start on first day of occurrence
 
@@ -1637,8 +1615,7 @@ 
 				// or the end of the recurrence, whichever comes first
 				if ($end > $this->toGMT($this->tz, $this->recur["end"])) {
 					$rangeend = $this->toGMT($this->tz, $this->recur["end"]);
-				}
-				else {
+				} else {
 					$rangeend = $end;
 				}
 
@@ -1720,8 +1697,7 @@ 
 							if ($daynow <= $dayend) {
 								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+						} elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
 							// Sanitize input
 							if ($this->recur["weekdays"] == 0) {
 								$this->recur["weekdays"] = 1;
@@ -1748,8 +1724,7 @@ 
 								}
 								// $firstday is the day of the month on which the asked pattern of nth weekday matches
 								$daynow = $now + $firstday * 60 * 60 * 24;
-							}
-							else {
+							} else {
 								// Find last day in the month ($now is the firstday of the month)
 								$NumDaysInMonth = $this->daysInMonth($now, 1);
 								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
@@ -1767,8 +1742,7 @@ 
 							if ($daynow <= $dayend && $daynow >= $daystart) {
 								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
-						}
-						elseif ($this->recur['regen']) {
+						} elseif ($this->recur['regen']) {
 							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
 							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
 							if ($now <= $dayend) {
@@ -1795,8 +1769,7 @@ 
 							}	// Cap $monthday on month length (eg 28 feb instead of 29 feb)
 							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
 							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+						} elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
 							// Go the correct month
 							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
@@ -1819,8 +1792,7 @@ 
 							}
 
 							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
+						} elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
 							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);	// +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);

version.php

Indentation +9 added lines, -9 removed lines

@@ -8,13 +8,13 @@
  */
 
 if (!defined("GDAV_VERSION")) {
-	$path = escapeshellarg(dirname(realpath($_SERVER['SCRIPT_FILENAME'])));
-	$branch = trim(exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \\(.*\\)/\\1/\""));
-	$version = exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git describe  --always 2>/dev/null");
-	if ($branch && $version) {
-		define("GDAV_VERSION", $branch . '-' . $version);
-	}
-	else {
-		define("GDAV_VERSION", "GIT");
-	}
+    $path = escapeshellarg(dirname(realpath($_SERVER['SCRIPT_FILENAME'])));
+    $branch = trim(exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \\(.*\\)/\\1/\""));
+    $version = exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git describe  --always 2>/dev/null");
+    if ($branch && $version) {
+        define("GDAV_VERSION", $branch . '-' . $version);
+    }
+    else {
+        define("GDAV_VERSION", "GIT");
+    }
 }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
 	$version = exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git describe  --always 2>/dev/null");
 	if ($branch && $version) {
 		define("GDAV_VERSION", $branch . '-' . $version);
-	}
-	else {
+	} else {
 		define("GDAV_VERSION", "GIT");
 	}
 }

lib/PHPWrapper.php

Indentation +155 added lines, -155 removed lines

@@ -10,159 +10,159 @@
 namespace grommunio\DAV;
 
 class PHPWrapper {
-	private $store;
-	private $logger;
-	private $props;
-	private $fileext;
-	private $added;
-	private $modified;
-	private $deleted;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param MAPIStore          $store
-	 * @param GLogger            $logger
-	 * @param mixed              $props
-	 * @param string             $fileext
-	 * @param GrommunioSyncState $syncstate
-	 * @param string             $folderid
-	 */
-	public function __construct($store, $logger, $props, $fileext, $syncstate, $folderid) {
-		$this->store = $store;
-		$this->logger = $logger;
-		$this->props = $props;
-		$this->fileext = $fileext;
-		$this->syncstate = $syncstate;
-		$this->folderid = $folderid;
-
-		$this->added = [];
-		$this->modified = [];
-		$this->deleted = [];
-	}
-
-	/**
-	 * Accessor for $this->added.
-	 *
-	 * @return array
-	 */
-	public function GetAdded() {
-		return $this->added;
-	}
-
-	/**
-	 * Accessor for $this->modified.
-	 *
-	 * @return array
-	 */
-	public function GetModified() {
-		return $this->modified;
-	}
-
-	/**
-	 * Accessor for $this->deleted.
-	 *
-	 * @return array
-	 */
-	public function GetDeleted() {
-		return $this->deleted;
-	}
-
-	/**
-	 * Returns total changes.
-	 *
-	 * @return int
-	 */
-	public function Total() {
-		return count($this->added) + count($this->modified) + count($this->deleted);
-	}
-
-	/**
-	 * Imports a single message.
-	 *
-	 * @param array  $props
-	 * @param long   $flags
-	 * @param object $retmapimessage
-	 *
-	 * @return long
-	 */
-	public function ImportMessageChange($props, $flags, $retmapimessage) {
-		// if the entryid is not available, do the fallback to the sourcekey
-		if (isset($props[PR_ENTRYID])) {
-			$entryid = $props[PR_ENTRYID];
-		}
-		elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
-			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
-		}
-		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
-		$messageProps = mapi_getprops($mapimessage, [PR_SOURCE_KEY, $this->props["goid"]]);
-
-		$url = null;
-		if (isset($messageProps[$this->props["goid"]])) {
-			// get uid from goid and check if it's a valid one
-			$url = getUidFromGoid($messageProps[$this->props["goid"]]);
-			if ($url != null) {
-				$this->logger->trace("got %s (goid: %s uid: %s), flags: %d", bin2hex($messageProps[PR_SOURCE_KEY]), bin2hex($messageProps[$this->props["goid"]]), $url, $flags);
-				$this->syncstate->rememberAppttsref($this->folderid, bin2hex($messageProps[PR_SOURCE_KEY]), $url);
-			}
-		}
-		if (!$url) {
-			$this->logger->trace("got %s (PR_SOURCE_KEY), flags: %d", bin2hex($messageProps[PR_SOURCE_KEY]), $flags);
-			$url = bin2hex($messageProps[PR_SOURCE_KEY]);
-		}
-
-		if ($flags == SYNC_NEW_MESSAGE) {
-			$this->added[] = $url . $this->fileext;
-		}
-		else {
-			$this->modified[] = $url . $this->fileext;
-		}
-
-		return SYNC_E_IGNORE;
-	}
-
-	/**
-	 * Imports a list of messages to be deleted.
-	 *
-	 * @param long  $flags
-	 * @param array $sourcekeys array with sourcekeys
-	 *
-	 * @return
-	 */
-	public function ImportMessageDeletion($flags, $sourcekeys) {
-		foreach ($sourcekeys as $sourcekey) {
-			$this->logger->trace("got %s", bin2hex($sourcekey));
-			$appttsref = $this->syncstate->getAppttsref($this->folderid, bin2hex($sourcekey));
-			if ($appttsref != null) {
-				$this->deleted[] = $appttsref . $this->fileext;
-			}
-			else {
-				$this->deleted[] = bin2hex($sourcekey) . $this->fileext;
-			}
-		}
-	}
-
-	/** Implement MAPI interface */
-	public function Config($stream, $flags = 0) {
-	}
-
-	public function GetLastError($hresult, $ulflags, &$lpmapierror) {
-	}
-
-	public function UpdateState($stream) {
-	}
-
-	public function ImportMessageMove($sourcekeysrcfolder, $sourcekeysrcmessage, $message, $sourcekeydestmessage, $changenumdestmessage) {
-	}
-
-	public function ImportPerUserReadStateChange($readstates) {
-	}
-
-	public function ImportFolderChange($props) {
-		return 0;
-	}
-
-	public function ImportFolderDeletion($flags, $sourcekeys) {
-		return 0;
-	}
+    private $store;
+    private $logger;
+    private $props;
+    private $fileext;
+    private $added;
+    private $modified;
+    private $deleted;
+
+    /**
+     * Constructor.
+     *
+     * @param MAPIStore          $store
+     * @param GLogger            $logger
+     * @param mixed              $props
+     * @param string             $fileext
+     * @param GrommunioSyncState $syncstate
+     * @param string             $folderid
+     */
+    public function __construct($store, $logger, $props, $fileext, $syncstate, $folderid) {
+        $this->store = $store;
+        $this->logger = $logger;
+        $this->props = $props;
+        $this->fileext = $fileext;
+        $this->syncstate = $syncstate;
+        $this->folderid = $folderid;
+
+        $this->added = [];
+        $this->modified = [];
+        $this->deleted = [];
+    }
+
+    /**
+     * Accessor for $this->added.
+     *
+     * @return array
+     */
+    public function GetAdded() {
+        return $this->added;
+    }
+
+    /**
+     * Accessor for $this->modified.
+     *
+     * @return array
+     */
+    public function GetModified() {
+        return $this->modified;
+    }
+
+    /**
+     * Accessor for $this->deleted.
+     *
+     * @return array
+     */
+    public function GetDeleted() {
+        return $this->deleted;
+    }
+
+    /**
+     * Returns total changes.
+     *
+     * @return int
+     */
+    public function Total() {
+        return count($this->added) + count($this->modified) + count($this->deleted);
+    }
+
+    /**
+     * Imports a single message.
+     *
+     * @param array  $props
+     * @param long   $flags
+     * @param object $retmapimessage
+     *
+     * @return long
+     */
+    public function ImportMessageChange($props, $flags, $retmapimessage) {
+        // if the entryid is not available, do the fallback to the sourcekey
+        if (isset($props[PR_ENTRYID])) {
+            $entryid = $props[PR_ENTRYID];
+        }
+        elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
+            $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
+        }
+        $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
+        $messageProps = mapi_getprops($mapimessage, [PR_SOURCE_KEY, $this->props["goid"]]);
+
+        $url = null;
+        if (isset($messageProps[$this->props["goid"]])) {
+            // get uid from goid and check if it's a valid one
+            $url = getUidFromGoid($messageProps[$this->props["goid"]]);
+            if ($url != null) {
+                $this->logger->trace("got %s (goid: %s uid: %s), flags: %d", bin2hex($messageProps[PR_SOURCE_KEY]), bin2hex($messageProps[$this->props["goid"]]), $url, $flags);
+                $this->syncstate->rememberAppttsref($this->folderid, bin2hex($messageProps[PR_SOURCE_KEY]), $url);
+            }
+        }
+        if (!$url) {
+            $this->logger->trace("got %s (PR_SOURCE_KEY), flags: %d", bin2hex($messageProps[PR_SOURCE_KEY]), $flags);
+            $url = bin2hex($messageProps[PR_SOURCE_KEY]);
+        }
+
+        if ($flags == SYNC_NEW_MESSAGE) {
+            $this->added[] = $url . $this->fileext;
+        }
+        else {
+            $this->modified[] = $url . $this->fileext;
+        }
+
+        return SYNC_E_IGNORE;
+    }
+
+    /**
+     * Imports a list of messages to be deleted.
+     *
+     * @param long  $flags
+     * @param array $sourcekeys array with sourcekeys
+     *
+     * @return
+     */
+    public function ImportMessageDeletion($flags, $sourcekeys) {
+        foreach ($sourcekeys as $sourcekey) {
+            $this->logger->trace("got %s", bin2hex($sourcekey));
+            $appttsref = $this->syncstate->getAppttsref($this->folderid, bin2hex($sourcekey));
+            if ($appttsref != null) {
+                $this->deleted[] = $appttsref . $this->fileext;
+            }
+            else {
+                $this->deleted[] = bin2hex($sourcekey) . $this->fileext;
+            }
+        }
+    }
+
+    /** Implement MAPI interface */
+    public function Config($stream, $flags = 0) {
+    }
+
+    public function GetLastError($hresult, $ulflags, &$lpmapierror) {
+    }
+
+    public function UpdateState($stream) {
+    }
+
+    public function ImportMessageMove($sourcekeysrcfolder, $sourcekeysrcmessage, $message, $sourcekeydestmessage, $changenumdestmessage) {
+    }
+
+    public function ImportPerUserReadStateChange($readstates) {
+    }
+
+    public function ImportFolderChange($props) {
+        return 0;
+    }
+
+    public function ImportFolderDeletion($flags, $sourcekeys) {
+        return 0;
+    }
 }

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 		// if the entryid is not available, do the fallback to the sourcekey
 		if (isset($props[PR_ENTRYID])) {
 			$entryid = $props[PR_ENTRYID];
-		}
-		elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
+		} elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
 			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
 		}
 		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
@@ -113,8 +112,7 @@ 
 
 		if ($flags == SYNC_NEW_MESSAGE) {
 			$this->added[] = $url . $this->fileext;
-		}
-		else {
+		} else {
 			$this->modified[] = $url . $this->fileext;
 		}
 
@@ -135,8 +133,7 @@ 
 			$appttsref = $this->syncstate->getAppttsref($this->folderid, bin2hex($sourcekey));
 			if ($appttsref != null) {
 				$this->deleted[] = $appttsref . $this->fileext;
-			}
-			else {
+			} else {
 				$this->deleted[] = bin2hex($sourcekey) . $this->fileext;
 			}
 		}

lib/AuthBasicBackend.php

Indentation +23 added lines, -23 removed lines

@@ -10,29 +10,29 @@
 namespace grommunio\DAV;
 
 class AuthBasicBackend extends \Sabre\DAV\Auth\Backend\AbstractBasic {
-	protected $gDavBackend;
+    protected $gDavBackend;
 
-	/**
-	 * Constructor.
-	 */
-	public function __construct(GrommunioDavBackend $gDavBackend) {
-		$this->gDavBackend = $gDavBackend;
-	}
+    /**
+     * Constructor.
+     */
+    public function __construct(GrommunioDavBackend $gDavBackend) {
+        $this->gDavBackend = $gDavBackend;
+    }
 
-	/**
-	 * Validates a username and password.
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @see \Sabre\DAV\Auth\Backend\AbstractBasic::validateUserPass()
-	 *
-	 * @param string $username
-	 * @param string $password
-	 *
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password) {
-		return $this->gDavBackend->Logon($username, $password);
-	}
+    /**
+     * Validates a username and password.
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @see \Sabre\DAV\Auth\Backend\AbstractBasic::validateUserPass()
+     *
+     * @param string $username
+     * @param string $password
+     *
+     * @return bool
+     */
+    protected function validateUserPass($username, $password) {
+        return $this->gDavBackend->Logon($username, $password);
+    }
 }

lib/GrommunioSchedulePlugin.php

Indentation +49 added lines, -49 removed lines

@@ -10,58 +10,58 @@
 namespace grommunio\DAV;
 
 class GrommunioSchedulePlugin extends \Sabre\CalDAV\Schedule\Plugin {
-	/**
-	 * Constructor.
-	 */
-	public function __construct(GrommunioDavBackend $gDavBackend, GLogger $glogger) {
-		$this->gDavBackend = $gDavBackend;
-		$this->logger = $glogger;
-	}
+    /**
+     * Constructor.
+     */
+    public function __construct(GrommunioDavBackend $gDavBackend, GLogger $glogger) {
+        $this->gDavBackend = $gDavBackend;
+        $this->logger = $glogger;
+    }
 
-	/**
-	 * Get the Free/Busy information for a recipient.
-	 *
-	 * Given email, start and end time the function will return
-	 * the freebusy blocks.
-	 *
-	 * @param string $email
-	 *
-	 * @return array
-	 */
-	protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateTimeInterface $end, \Sabre\VObject\Component $request) {
-		$this->logger->trace("email: %s - start: %d - end: %d", $email, $start->getTimestamp(), $end->getTimestamp());
+    /**
+     * Get the Free/Busy information for a recipient.
+     *
+     * Given email, start and end time the function will return
+     * the freebusy blocks.
+     *
+     * @param string $email
+     *
+     * @return array
+     */
+    protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateTimeInterface $end, \Sabre\VObject\Component $request) {
+        $this->logger->trace("email: %s - start: %d - end: %d", $email, $start->getTimestamp(), $end->getTimestamp());
 
-		$addrbook = $this->gDavBackend->GetAddressBook();
-		$fbsupport = mapi_freebusysupport_open($this->gDavBackend->GetSession());
-		$email = preg_replace('!^mailto:!i', '', $email);
-		$search = [[PR_DISPLAY_NAME => $email]];
-		$userarr = mapi_ab_resolvename($addrbook, $search, EMS_AB_ADDRESS_LOOKUP);
-		if (!$userarr) {
-			return [
-				'request-status' => '3.7;Could not find principal',
-				'href' => 'mailto:' . $email,
-			];
-		}
+        $addrbook = $this->gDavBackend->GetAddressBook();
+        $fbsupport = mapi_freebusysupport_open($this->gDavBackend->GetSession());
+        $email = preg_replace('!^mailto:!i', '', $email);
+        $search = [[PR_DISPLAY_NAME => $email]];
+        $userarr = mapi_ab_resolvename($addrbook, $search, EMS_AB_ADDRESS_LOOKUP);
+        if (!$userarr) {
+            return [
+                'request-status' => '3.7;Could not find principal',
+                'href' => 'mailto:' . $email,
+            ];
+        }
 
-		$fbDataArray = mapi_freebusysupport_loaddata($fbsupport, [$userarr[0][PR_ENTRYID]]);
-		if (!$fbDataArray || !$fbDataArray[0]) {
-			return [
-				'calendar-data' => null,
-				'request-status' => '2.0;Success',
-				'href' => 'mailto:' . $email,
-			];
-		}
+        $fbDataArray = mapi_freebusysupport_loaddata($fbsupport, [$userarr[0][PR_ENTRYID]]);
+        if (!$fbDataArray || !$fbDataArray[0]) {
+            return [
+                'calendar-data' => null,
+                'request-status' => '2.0;Success',
+                'href' => 'mailto:' . $email,
+            ];
+        }
 
-		$enumblock = mapi_freebusydata_enumblocks($fbDataArray[0], $start->getTimestamp(), $end->getTimestamp());
-		$result = mapi_freebusyenumblock_ical($addrbook, $enumblock, 100, $start->getTimestamp(), $end->getTimestamp(), $email, $email, "");
-		if ($result) {
-			$vcalendar = \Sabre\VObject\Reader::read($result, \Sabre\VObject\Reader::OPTION_FORGIVING);
+        $enumblock = mapi_freebusydata_enumblocks($fbDataArray[0], $start->getTimestamp(), $end->getTimestamp());
+        $result = mapi_freebusyenumblock_ical($addrbook, $enumblock, 100, $start->getTimestamp(), $end->getTimestamp(), $email, $email, "");
+        if ($result) {
+            $vcalendar = \Sabre\VObject\Reader::read($result, \Sabre\VObject\Reader::OPTION_FORGIVING);
 
-			return [
-				'calendar-data' => $vcalendar,
-				'request-status' => '2.0;Success',
-				'href' => 'mailto:' . $email,
-			];
-		}
-	}
+            return [
+                'calendar-data' => $vcalendar,
+                'request-status' => '2.0;Success',
+                'href' => 'mailto:' . $email,
+            ];
+        }
+    }
 }

lib/GLogger.php

Indentation +390 added lines, -390 removed lines

@@ -19,394 +19,394 @@
  * If you want other methods of Logger please add a wrapper method to this class.
  */
 class GLogger {
-	protected static $listOfLoggers = [];
-	protected $logger;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param mixed $name
-	 */
-	public function __construct($name) {
-		$this->logger = \Logger::getLogger($name);
-
-		// keep an output puffer in case we do debug logging
-		if ($this->logger->isDebugEnabled()) {
-			ob_start();
-		}
-
-		// let GLogger handle error messages
-		set_error_handler('\\grommunio\\DAV\\GLogger::ErrorHandler');
-	}
-
-	/**
-	 * Configures log4php.
-	 *
-	 * This method needs to be called before the first logging event has
-	 * occurred. If this method is not called before then the default
-	 * configuration will be used.
-	 *
-	 * @param array|string              $configuration either a path to the configuration
-	 *                                                 file, or a configuration array
-	 * @param LoggerConfigurator|string $configurator  A custom
-	 *                                                 configurator class: either a class name (string), or an object which
-	 *                                                 implements the LoggerConfigurator interface. If left empty, the default
-	 *                                                 configurator implementation will be used.
-	 */
-	public static function configure($configuration = null, $configurator = null) {
-		\Logger::configure($configuration, $configurator);
-	}
-
-	/**
-	 * Destroy configurations for logger definitions.
-	 */
-	public function resetConfiguration() {
-		\Logger::resetConfiguration();
-	}
-
-	/**
-	 * Returns a GLogger by name. If it does not exist, it will be created.
-	 *
-	 * @param string $name  The logger name
-	 * @param mixed  $class
-	 *
-	 * @return Logger
-	 */
-	public static function GetLogger($class) {
-		if (!isset(static::$listOfLoggers[$class])) {
-			static::$listOfLoggers[$class] = new GLogger(static::GetClassnameOnly($class));
-		}
-
-		return static::$listOfLoggers[$class];
-	}
-
-	/**
-	 * Cuts of the namespace and returns just the classname.
-	 *
-	 * @param string $namespaceWithClass
-	 *
-	 * @return string
-	 */
-	protected static function GetClassnameOnly($namespaceWithClass) {
-		if (strpos($namespaceWithClass, '\\') == false) {
-			return $namespaceWithClass;
-		}
-
-		return substr(strrchr($namespaceWithClass, '\\'), 1);
-	}
-
-	/**
-	 * Logs the incoming data (headers + body) to debug.
-	 */
-	public function LogIncoming(\Sabre\HTTP\RequestInterface $request) {
-		// only do any of this is we are looking for debug messages
-		if ($this->logger->isDebugEnabled()) {
-			$inputHeader = $request->getMethod() . ' ' . $request->getUrl() . ' HTTP/' . $request->getHTTPVersion() . "\r\n";
-			foreach ($request->getHeaders() as $key => $value) {
-				if ($key === 'Authorization') {
-					list($value) = explode(' ', implode(',', $value), 2);
-					$value = [$value . ' REDACTED'];
-				}
-				$inputHeader .= $key . ": " . implode(',', $value) . "\r\n";
-			}
-			// reopen the input so we can read it (again)
-			$inputBody = stream_get_contents(fopen('php://input', 'r'));
-			// format incoming xml to be better human readable
-			if (stripos($inputBody, '<?xml') === 0) {
-				$dom = new \DOMDocument('1.0', 'utf-8');
-				$dom->preserveWhiteSpace = false;
-				$dom->formatOutput = true;
-				$dom->recover = true;
-				$dom->loadXML($inputBody);
-				$inputBody = $dom->saveXML();
-			}
-			// log incoming data
-			$this->debug("INPUT\n" . $inputHeader . "\n" . $inputBody);
-		}
-	}
-
-	/**
-	 * Logs the outgoing data (headers + body) to debug.
-	 */
-	public function LogOutgoing(\Sabre\HTTP\ResponseInterface $response) {
-		// only do any of this is we are looking for debug messages
-		if ($this->logger->isDebugEnabled()) {
-			$output = 'HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText() . "\n";
-			foreach ($response->getHeaders() as $key => $value) {
-				$output .= $key . ": " . implode(',', $value) . "\n";
-			}
-			$outputBody = ob_get_contents();
-			if (stripos($outputBody, '<?xml') === 0) {
-				$dom = new \DOMDocument('1.0', 'utf-8');
-				$dom->preserveWhiteSpace = false;
-				$dom->formatOutput = true;
-				$dom->recover = true;
-				$dom->loadXML($outputBody);
-				$outputBody = $dom->saveXML();
-			}
-			$this->debug("OUTPUT:\n" . $output . "\n" . $outputBody);
-
-			ob_end_flush();
-		}
-	}
-
-	/**
-	 * Runs the arguments through sprintf() and sends it to the logger.
-	 *
-	 * @param \LoggerLevel $level
-	 * @param array        $args
-	 * @param string       $suffix an optional suffix that is appended to the message
-	 */
-	protected function writeLog($level, $args, $suffix = '') {
-		$outArgs = [];
-		foreach ($args as $arg) {
-			if (is_array($arg)) {
-				$outArgs[] = print_r($arg, true);
-			}
-			$outArgs[] = $arg;
-		}
-		// Call sprintf() with the arguments only if there are format parameters because
-		// otherwise sprintf will complain about too few arguments.
-		// This also prevents throwing errors if there are %-chars in the $outArgs.
-		$message = (count($outArgs) > 1) ? call_user_func_array('sprintf', $outArgs) : $outArgs[0];
-		// prepend class+method and log the message
-		$this->logger->log($level, $this->getCaller(2) . $message . $suffix, null);
-	}
-
-	/**
-	 * Verifies if the dynamic amount of logging arguments matches the amount of variables (%) in the message.
-	 *
-	 * @param array $arguments
-	 *
-	 * @return bool
-	 */
-	protected function verifyLogSyntax($arguments) {
-		$count = count($arguments);
-		$quoted_procent = substr_count($arguments[0], "%%");
-		$t = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-
-		if ($count == 0) {
-			$this->logger->error(sprintf("No arguments in %s->%s() logging to '%s' in %s:%d", static::GetClassnameOnly($t[2]['class']), $t[2]['function'], $t[1]['function'], $t[1]['file'], $t[1]['line']));
-
-			return false;
-		}
-		// Only check formatting if there are format parameters. Otherwise there will be
-		// an error log if the $arguments[0] contain %-chars.
-		if (($count > 1) && ((substr_count($arguments[0], "%") - $quoted_procent * 2) !== $count - 1)) {
-			$this->logger->error(sprintf("Wrong number of arguments in %s->%s() logging to '%s' in %s:%d", static::GetClassnameOnly($t[2]['class']), $t[2]['function'], $t[1]['function'], $t[1]['file'], $t[1]['line']));
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns a string in the form of "Class->Method(): " or "file:line" if requested.
-	 *
-	 * @param number $level    the level you want the info from, default 1
-	 * @param bool   $fileline returns "file:line" if set to true
-	 *
-	 * @return string
-	 */
-	protected function getCaller($level = 1, $fileline = false) {
-		$wlevel = $level + 1;
-		$t = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $wlevel + 1);
-		if (isset($t[$wlevel]['function'])) {
-			if ($fileline) {
-				return $t[$wlevel]['file'] . ":" . $t[$wlevel]['line'];
-			}
-
-			return $this->GetClassnameOnly($t[$wlevel]['class']) . '->' . $t[$wlevel]['function'] . '(): ';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Format bytes to a more human readable value.
-	 *
-	 * @param int $bytes
-	 * @param int $precision
-	 *
-	 * @return string
-	 */
-	public function FormatBytes($bytes, $precision = 2) {
-		if ($bytes <= 0) {
-			return '0 B';
-		}
-
-		$units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB'];
-		$base = log($bytes, 1024);
-		$fBase = floor($base);
-		$pow = pow(1024, $base - $fBase);
-
-		return sprintf("%.{$precision}f %s", $pow, $units[$fBase]);
-	}
-
-	/**
-	 * The GrommunioDav error handler.
-	 *
-	 * @param int    $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int    $errline
-	 * @param mixed  $errcontext
-	 */
-	public static function ErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
-		// this is from Z-Push but might be helpful in the future: https://wiki.z-hub.io/x/sIEa
-		if (defined('LOG_ERROR_MASK')) {
-			$errno &= LOG_ERROR_MASK;
-		}
-
-		switch ($errno) {
-			case 0:
-				// logging disabled by LOG_ERROR_MASK
-				break;
-
-			case E_DEPRECATED:
-				// do not handle this message
-				break;
-
-			case E_NOTICE:
-			case E_WARNING:
-				$logger = \Logger::getLogger('error');
-				$logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
-				break;
-
-			default:
-				$bt = debug_backtrace();
-				$logger = \Logger::getLogger('error');
-				$logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . " steps");
-				for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
-					$file = $line = "unknown";
-					if (isset($bt[$i]['file'])) {
-						$file = $bt[$i]['file'];
-					}
-					if (isset($bt[$i]['line'])) {
-						$line = $bt[$i]['line'];
-					}
-					$logger->error("trace: {$i}:" . $file . ":" . $line . " - " . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : "") . $bt[$i]['function'] . "()");
-				}
-				break;
-		}
-	}
-
-	/**
-	 * Wrapper of the \Logger class.
-	 */
-
-	/**
-	 * Log a message object with the TRACE level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function trace() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isTraceEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelTrace(), func_get_args());
-		}
-	}
-
-	/**
-	 * Log a message object with the DEBUG level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function debug() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isDebugEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelDebug(), func_get_args());
-		}
-	}
-
-	/**
-	 * Log a message object with the INFO level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function info() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isInfoEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelInfo(), func_get_args());
-		}
-	}
-
-	/**
-	 * Log a message object with the WARN level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function warn() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isWarnEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelWarn(), func_get_args(), ' - ' . $this->getCaller(1, true));
-		}
-	}
-
-	/**
-	 * Log a message object with the ERROR level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function error() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isErrorEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelError(), func_get_args(), ' - ' . $this->getCaller(1, true));
-		}
-	}
-
-	/**
-	 * Log a message object with the FATAL level.
-	 * It has the same footprint as sprintf(), but arguments are only processed
-	 * if the loglevel is activated.
-	 *
-	 * @param mixed $message message
-	 * @param mixed ...params
-	 */
-	public function fatal() {
-		if (DEVELOPER_MODE) {
-			if (!$this->verifyLogSyntax(func_get_args())) {
-				return;
-			}
-		}
-		if ($this->logger->isFatalEnabled()) {
-			$this->writeLog(\LoggerLevel::getLevelFatal(), func_get_args(), ' - ' . $this->getCaller(1, true));
-		}
-	}
+    protected static $listOfLoggers = [];
+    protected $logger;
+
+    /**
+     * Constructor.
+     *
+     * @param mixed $name
+     */
+    public function __construct($name) {
+        $this->logger = \Logger::getLogger($name);
+
+        // keep an output puffer in case we do debug logging
+        if ($this->logger->isDebugEnabled()) {
+            ob_start();
+        }
+
+        // let GLogger handle error messages
+        set_error_handler('\\grommunio\\DAV\\GLogger::ErrorHandler');
+    }
+
+    /**
+     * Configures log4php.
+     *
+     * This method needs to be called before the first logging event has
+     * occurred. If this method is not called before then the default
+     * configuration will be used.
+     *
+     * @param array|string              $configuration either a path to the configuration
+     *                                                 file, or a configuration array
+     * @param LoggerConfigurator|string $configurator  A custom
+     *                                                 configurator class: either a class name (string), or an object which
+     *                                                 implements the LoggerConfigurator interface. If left empty, the default
+     *                                                 configurator implementation will be used.
+     */
+    public static function configure($configuration = null, $configurator = null) {
+        \Logger::configure($configuration, $configurator);
+    }
+
+    /**
+     * Destroy configurations for logger definitions.
+     */
+    public function resetConfiguration() {
+        \Logger::resetConfiguration();
+    }
+
+    /**
+     * Returns a GLogger by name. If it does not exist, it will be created.
+     *
+     * @param string $name  The logger name
+     * @param mixed  $class
+     *
+     * @return Logger
+     */
+    public static function GetLogger($class) {
+        if (!isset(static::$listOfLoggers[$class])) {
+            static::$listOfLoggers[$class] = new GLogger(static::GetClassnameOnly($class));
+        }
+
+        return static::$listOfLoggers[$class];
+    }
+
+    /**
+     * Cuts of the namespace and returns just the classname.
+     *
+     * @param string $namespaceWithClass
+     *
+     * @return string
+     */
+    protected static function GetClassnameOnly($namespaceWithClass) {
+        if (strpos($namespaceWithClass, '\\') == false) {
+            return $namespaceWithClass;
+        }
+
+        return substr(strrchr($namespaceWithClass, '\\'), 1);
+    }
+
+    /**
+     * Logs the incoming data (headers + body) to debug.
+     */
+    public function LogIncoming(\Sabre\HTTP\RequestInterface $request) {
+        // only do any of this is we are looking for debug messages
+        if ($this->logger->isDebugEnabled()) {
+            $inputHeader = $request->getMethod() . ' ' . $request->getUrl() . ' HTTP/' . $request->getHTTPVersion() . "\r\n";
+            foreach ($request->getHeaders() as $key => $value) {
+                if ($key === 'Authorization') {
+                    list($value) = explode(' ', implode(',', $value), 2);
+                    $value = [$value . ' REDACTED'];
+                }
+                $inputHeader .= $key . ": " . implode(',', $value) . "\r\n";
+            }
+            // reopen the input so we can read it (again)
+            $inputBody = stream_get_contents(fopen('php://input', 'r'));
+            // format incoming xml to be better human readable
+            if (stripos($inputBody, '<?xml') === 0) {
+                $dom = new \DOMDocument('1.0', 'utf-8');
+                $dom->preserveWhiteSpace = false;
+                $dom->formatOutput = true;
+                $dom->recover = true;
+                $dom->loadXML($inputBody);
+                $inputBody = $dom->saveXML();
+            }
+            // log incoming data
+            $this->debug("INPUT\n" . $inputHeader . "\n" . $inputBody);
+        }
+    }
+
+    /**
+     * Logs the outgoing data (headers + body) to debug.
+     */
+    public function LogOutgoing(\Sabre\HTTP\ResponseInterface $response) {
+        // only do any of this is we are looking for debug messages
+        if ($this->logger->isDebugEnabled()) {
+            $output = 'HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText() . "\n";
+            foreach ($response->getHeaders() as $key => $value) {
+                $output .= $key . ": " . implode(',', $value) . "\n";
+            }
+            $outputBody = ob_get_contents();
+            if (stripos($outputBody, '<?xml') === 0) {
+                $dom = new \DOMDocument('1.0', 'utf-8');
+                $dom->preserveWhiteSpace = false;
+                $dom->formatOutput = true;
+                $dom->recover = true;
+                $dom->loadXML($outputBody);
+                $outputBody = $dom->saveXML();
+            }
+            $this->debug("OUTPUT:\n" . $output . "\n" . $outputBody);
+
+            ob_end_flush();
+        }
+    }
+
+    /**
+     * Runs the arguments through sprintf() and sends it to the logger.
+     *
+     * @param \LoggerLevel $level
+     * @param array        $args
+     * @param string       $suffix an optional suffix that is appended to the message
+     */
+    protected function writeLog($level, $args, $suffix = '') {
+        $outArgs = [];
+        foreach ($args as $arg) {
+            if (is_array($arg)) {
+                $outArgs[] = print_r($arg, true);
+            }
+            $outArgs[] = $arg;
+        }
+        // Call sprintf() with the arguments only if there are format parameters because
+        // otherwise sprintf will complain about too few arguments.
+        // This also prevents throwing errors if there are %-chars in the $outArgs.
+        $message = (count($outArgs) > 1) ? call_user_func_array('sprintf', $outArgs) : $outArgs[0];
+        // prepend class+method and log the message
+        $this->logger->log($level, $this->getCaller(2) . $message . $suffix, null);
+    }
+
+    /**
+     * Verifies if the dynamic amount of logging arguments matches the amount of variables (%) in the message.
+     *
+     * @param array $arguments
+     *
+     * @return bool
+     */
+    protected function verifyLogSyntax($arguments) {
+        $count = count($arguments);
+        $quoted_procent = substr_count($arguments[0], "%%");
+        $t = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+
+        if ($count == 0) {
+            $this->logger->error(sprintf("No arguments in %s->%s() logging to '%s' in %s:%d", static::GetClassnameOnly($t[2]['class']), $t[2]['function'], $t[1]['function'], $t[1]['file'], $t[1]['line']));
+
+            return false;
+        }
+        // Only check formatting if there are format parameters. Otherwise there will be
+        // an error log if the $arguments[0] contain %-chars.
+        if (($count > 1) && ((substr_count($arguments[0], "%") - $quoted_procent * 2) !== $count - 1)) {
+            $this->logger->error(sprintf("Wrong number of arguments in %s->%s() logging to '%s' in %s:%d", static::GetClassnameOnly($t[2]['class']), $t[2]['function'], $t[1]['function'], $t[1]['file'], $t[1]['line']));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns a string in the form of "Class->Method(): " or "file:line" if requested.
+     *
+     * @param number $level    the level you want the info from, default 1
+     * @param bool   $fileline returns "file:line" if set to true
+     *
+     * @return string
+     */
+    protected function getCaller($level = 1, $fileline = false) {
+        $wlevel = $level + 1;
+        $t = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $wlevel + 1);
+        if (isset($t[$wlevel]['function'])) {
+            if ($fileline) {
+                return $t[$wlevel]['file'] . ":" . $t[$wlevel]['line'];
+            }
+
+            return $this->GetClassnameOnly($t[$wlevel]['class']) . '->' . $t[$wlevel]['function'] . '(): ';
+        }
+
+        return '';
+    }
+
+    /**
+     * Format bytes to a more human readable value.
+     *
+     * @param int $bytes
+     * @param int $precision
+     *
+     * @return string
+     */
+    public function FormatBytes($bytes, $precision = 2) {
+        if ($bytes <= 0) {
+            return '0 B';
+        }
+
+        $units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB'];
+        $base = log($bytes, 1024);
+        $fBase = floor($base);
+        $pow = pow(1024, $base - $fBase);
+
+        return sprintf("%.{$precision}f %s", $pow, $units[$fBase]);
+    }
+
+    /**
+     * The GrommunioDav error handler.
+     *
+     * @param int    $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int    $errline
+     * @param mixed  $errcontext
+     */
+    public static function ErrorHandler($errno, $errstr, $errfile, $errline, $errcontext) {
+        // this is from Z-Push but might be helpful in the future: https://wiki.z-hub.io/x/sIEa
+        if (defined('LOG_ERROR_MASK')) {
+            $errno &= LOG_ERROR_MASK;
+        }
+
+        switch ($errno) {
+            case 0:
+                // logging disabled by LOG_ERROR_MASK
+                break;
+
+            case E_DEPRECATED:
+                // do not handle this message
+                break;
+
+            case E_NOTICE:
+            case E_WARNING:
+                $logger = \Logger::getLogger('error');
+                $logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
+                break;
+
+            default:
+                $bt = debug_backtrace();
+                $logger = \Logger::getLogger('error');
+                $logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . " steps");
+                for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
+                    $file = $line = "unknown";
+                    if (isset($bt[$i]['file'])) {
+                        $file = $bt[$i]['file'];
+                    }
+                    if (isset($bt[$i]['line'])) {
+                        $line = $bt[$i]['line'];
+                    }
+                    $logger->error("trace: {$i}:" . $file . ":" . $line . " - " . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : "") . $bt[$i]['function'] . "()");
+                }
+                break;
+        }
+    }
+
+    /**
+     * Wrapper of the \Logger class.
+     */
+
+    /**
+     * Log a message object with the TRACE level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function trace() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isTraceEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelTrace(), func_get_args());
+        }
+    }
+
+    /**
+     * Log a message object with the DEBUG level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function debug() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isDebugEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelDebug(), func_get_args());
+        }
+    }
+
+    /**
+     * Log a message object with the INFO level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function info() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isInfoEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelInfo(), func_get_args());
+        }
+    }
+
+    /**
+     * Log a message object with the WARN level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function warn() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isWarnEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelWarn(), func_get_args(), ' - ' . $this->getCaller(1, true));
+        }
+    }
+
+    /**
+     * Log a message object with the ERROR level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function error() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isErrorEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelError(), func_get_args(), ' - ' . $this->getCaller(1, true));
+        }
+    }
+
+    /**
+     * Log a message object with the FATAL level.
+     * It has the same footprint as sprintf(), but arguments are only processed
+     * if the loglevel is activated.
+     *
+     * @param mixed $message message
+     * @param mixed ...params
+     */
+    public function fatal() {
+        if (DEVELOPER_MODE) {
+            if (!$this->verifyLogSyntax(func_get_args())) {
+                return;
+            }
+        }
+        if ($this->logger->isFatalEnabled()) {
+            $this->writeLog(\LoggerLevel::getLevelFatal(), func_get_args(), ' - ' . $this->getCaller(1, true));
+        }
+    }
 }

Switch Indentation +28 added lines, -28 removed lines

@@ -260,35 +260,35 @@
 		}
 
 		switch ($errno) {
-			case 0:
-				// logging disabled by LOG_ERROR_MASK
-				break;
-
-			case E_DEPRECATED:
-				// do not handle this message
-				break;
-
-			case E_NOTICE:
-			case E_WARNING:
-				$logger = \Logger::getLogger('error');
-				$logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
-				break;
-
-			default:
-				$bt = debug_backtrace();
-				$logger = \Logger::getLogger('error');
-				$logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . " steps");
-				for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
-					$file = $line = "unknown";
-					if (isset($bt[$i]['file'])) {
-						$file = $bt[$i]['file'];
-					}
-					if (isset($bt[$i]['line'])) {
-						$line = $bt[$i]['line'];
-					}
-					$logger->error("trace: {$i}:" . $file . ":" . $line . " - " . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : "") . $bt[$i]['function'] . "()");
+		case 0:
+			// logging disabled by LOG_ERROR_MASK
+			break;
+
+		case E_DEPRECATED:
+			// do not handle this message
+			break;
+
+		case E_NOTICE:
+		case E_WARNING:
+			$logger = \Logger::getLogger('error');
+			$logger->warn("{$errfile}:{$errline} {$errstr} ({$errno})");
+			break;
+
+		default:
+			$bt = debug_backtrace();
+			$logger = \Logger::getLogger('error');
+			$logger->error("trace error: {$errfile}:{$errline} {$errstr} ({$errno}) - backtrace: " . (count($bt) - 1) . " steps");
+			for ($i = 1, $bt_length = count($bt); $i < $bt_length; ++$i) {
+				$file = $line = "unknown";
+				if (isset($bt[$i]['file'])) {
+					$file = $bt[$i]['file'];
 				}
-				break;
+				if (isset($bt[$i]['line'])) {
+					$line = $bt[$i]['line'];
+				}
+				$logger->error("trace: {$i}:" . $file . ":" . $line . " - " . ((isset($bt[$i]['class'])) ? $bt[$i]['class'] . $bt[$i]['type'] : "") . $bt[$i]['function'] . "()");
+			}
+			break;
 		}
 	}
 

lib/MapiProps.php

Indentation +44 added lines, -44 removed lines

@@ -10,49 +10,49 @@
 namespace grommunio\DAV;
 
 class MapiProps {
-	public const PROP_VCARDUID = "PT_UNICODE:PSETID_GROMOX:vcarduid";
+    public const PROP_VCARDUID = "PT_UNICODE:PSETID_GROMOX:vcarduid";
 
-	/**
-	 * Returns appointment specific MAPI properties
-	 * Origins: Z-Push.
-	 *
-	 * @return array
-	 */
-	public static function GetAppointmentProperties() {
-		return [
-			"sourcekey" => PR_SOURCE_KEY,
-			"representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
-			"representingname" => PR_SENT_REPRESENTING_NAME,
-			"sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
-			"sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
-			"sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
-			"reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
-			"remindertime" => "PT_LONG:PSETID_Common:0x8501",
-			"meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
-			"isrecurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-			"recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
-			"timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
-			"timezonedesc" => "PT_STRING8:PSETID_Appointment:0x8234",
-			"recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
-			"responsestatus" => "PT_LONG:PSETID_Appointment:0x8218",
-			"commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
-			"commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
-			"reminderstart" => "PT_SYSTIME:PSETID_Common:0x8502",
-			"duration" => "PT_LONG:PSETID_Appointment:0x8213",
-			"private" => "PT_BOOLEAN:PSETID_Common:0x8506",
-			"uid" => "PT_BINARY:PSETID_Meeting:0x23",
-			"sideeffects" => "PT_LONG:PSETID_Common:0x8510",
-			"flagdueby" => "PT_SYSTIME:PSETID_Common:0x8560",
-			"icon" => PR_ICON_INDEX,
-			"mrwassent" => "PT_BOOLEAN:PSETID_Appointment:0x8229",
-			"endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e", // this is here for calendar restriction, tnef and ical
-			"starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d", // this is here for calendar restriction, tnef and ical
-			"clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
-			"recurrencetype" => "PT_LONG:PSETID_Appointment:0x8231",
-			"body" => PR_BODY,
-			"rtfcompressed" => PR_RTF_COMPRESSED,
-			"html" => PR_HTML,
-			"rtfinsync" => PR_RTF_IN_SYNC,
-		];
-	}
+    /**
+     * Returns appointment specific MAPI properties
+     * Origins: Z-Push.
+     *
+     * @return array
+     */
+    public static function GetAppointmentProperties() {
+        return [
+            "sourcekey" => PR_SOURCE_KEY,
+            "representingentryid" => PR_SENT_REPRESENTING_ENTRYID,
+            "representingname" => PR_SENT_REPRESENTING_NAME,
+            "sentrepresentingemail" => PR_SENT_REPRESENTING_EMAIL_ADDRESS,
+            "sentrepresentingaddt" => PR_SENT_REPRESENTING_ADDRTYPE,
+            "sentrepresentinsrchk" => PR_SENT_REPRESENTING_SEARCH_KEY,
+            "reminderset" => "PT_BOOLEAN:PSETID_Common:0x8503",
+            "remindertime" => "PT_LONG:PSETID_Common:0x8501",
+            "meetingstatus" => "PT_LONG:PSETID_Appointment:0x8217",
+            "isrecurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+            "recurringstate" => "PT_BINARY:PSETID_Appointment:0x8216",
+            "timezonetag" => "PT_BINARY:PSETID_Appointment:0x8233",
+            "timezonedesc" => "PT_STRING8:PSETID_Appointment:0x8234",
+            "recurrenceend" => "PT_SYSTIME:PSETID_Appointment:0x8236",
+            "responsestatus" => "PT_LONG:PSETID_Appointment:0x8218",
+            "commonstart" => "PT_SYSTIME:PSETID_Common:0x8516",
+            "commonend" => "PT_SYSTIME:PSETID_Common:0x8517",
+            "reminderstart" => "PT_SYSTIME:PSETID_Common:0x8502",
+            "duration" => "PT_LONG:PSETID_Appointment:0x8213",
+            "private" => "PT_BOOLEAN:PSETID_Common:0x8506",
+            "uid" => "PT_BINARY:PSETID_Meeting:0x23",
+            "sideeffects" => "PT_LONG:PSETID_Common:0x8510",
+            "flagdueby" => "PT_SYSTIME:PSETID_Common:0x8560",
+            "icon" => PR_ICON_INDEX,
+            "mrwassent" => "PT_BOOLEAN:PSETID_Appointment:0x8229",
+            "endtime" => "PT_SYSTIME:PSETID_Appointment:0x820e", // this is here for calendar restriction, tnef and ical
+            "starttime" => "PT_SYSTIME:PSETID_Appointment:0x820d", // this is here for calendar restriction, tnef and ical
+            "clipstart" => "PT_SYSTIME:PSETID_Appointment:0x8235", // ical only
+            "recurrencetype" => "PT_LONG:PSETID_Appointment:0x8231",
+            "body" => PR_BODY,
+            "rtfcompressed" => PR_RTF_COMPRESSED,
+            "html" => PR_HTML,
+            "rtfinsync" => PR_RTF_IN_SYNC,
+        ];
+    }
 }