grommunio / grommunio-dav

server.php

Indentation +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 
 // don't log any Sabre asset requests (images etc)
 if (isset($_REQUEST['sabreAction']) && $_REQUEST['sabreAction'] == 'asset') {
-	$logger->resetConfiguration();
+    $logger->resetConfiguration();
 }
 
 // log the start data
@@ -39,9 +39,9 @@ 
 
 // Setting up the directory tree
 $nodes = [
-	new \Sabre\DAVACL\PrincipalCollection($principalBackend),
-	new \Sabre\CardDAV\AddressBookRoot($principalBackend, $gCarddavBackend),
-	new \Sabre\CalDAV\CalendarRoot($principalBackend, $gCaldavBackend),
+    new \Sabre\DAVACL\PrincipalCollection($principalBackend),
+    new \Sabre\CardDAV\AddressBookRoot($principalBackend, $gCarddavBackend),
+    new \Sabre\CalDAV\CalendarRoot($principalBackend, $gCaldavBackend),
 ];
 
 // initialize the server
@@ -76,11 +76,11 @@ 
 $server->addPlugin($caldavPlugin);
 
 if (strlen(SYNC_DB) > 0) {
-	$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+    $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 }
 
 if (DEVELOPER_MODE) {
-	$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false));
+    $server->addPlugin(new \Sabre\DAV\Browser\Plugin(false));
 }
 
 $server->exec();
@@ -89,10 +89,10 @@ 
 $logger->LogOutgoing($server->httpResponse);
 
 $logger->debug(
-	"httpcode='%s' memory='%s/%s' time='%ss'",
-	http_response_code(),
-	$logger->FormatBytes(memory_get_peak_usage(false)),
-	$logger->FormatBytes(memory_get_peak_usage(true)),
-	number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2)
+    "httpcode='%s' memory='%s/%s' time='%ss'",
+    http_response_code(),
+    $logger->FormatBytes(memory_get_peak_usage(false)),
+    $logger->FormatBytes(memory_get_peak_usage(true)),
+    number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2)
 );
 $logger->debug('------------------ End');

mapi/class.baseexception.php

Indentation +117 added lines, -117 removed lines

@@ -18,121 +18,121 @@
  * getTraceAsString() - formatted string of trace
  */
 class BaseException extends Exception {
-	/**
-	 * Base name of the file, so we don't have to use static path of the file.
-	 */
-	private $baseFile;
-
-	/**
-	 * Flag to check if exception is already handled or not.
-	 */
-	public $isHandled = false;
-
-	/**
-	 * The exception message to show at client side.
-	 */
-	public $displayMessage;
-
-	/**
-	 * @param string    $errorMessage
-	 * @param int       $code
-	 * @param Exception $previous
-	 * @param string    $displayMessage
-	 */
-	public function __construct($errorMessage, $code = 0, Exception $previous = null, $displayMessage = null) {
-		// assign display message
-		$this->displayMessage = $displayMessage;
-
-		parent::__construct($errorMessage, (int) $code, $previous);
-	}
-
-	/**
-	 * @return string returns file name and line number combined where exception occurred
-	 */
-	public function getFileLine() {
-		return $this->getBaseFile() . ':' . $this->getLine();
-	}
-
-	/**
-	 * @return string returns message that should be sent to client to display
-	 */
-	public function getDisplayMessage() {
-		if (!is_null($this->displayMessage)) {
-			return $this->displayMessage;
-		}
-
-		return $this->getMessage();
-	}
-
-	/**
-	 * Function sets display message of an exception that will be sent to the client side
-	 * to show it to user.
-	 *
-	 * @param string $message display message
-	 */
-	public function setDisplayMessage($message) {
-		$this->displayMessage = $message;
-	}
-
-	/**
-	 * Function sets a flag in exception class to indicate that exception is already handled
-	 * so if it is caught again in the top level of function stack then we have to silently
-	 * ignore it.
-	 */
-	public function setHandled() {
-		$this->isHandled = true;
-	}
-
-	/**
-	 * @return string returns base path of the file where exception occurred
-	 */
-	public function getBaseFile() {
-		if (is_null($this->baseFile)) {
-			$this->baseFile = basename(parent::getFile());
-		}
-
-		return $this->baseFile;
-	}
-
-	/**
-	 * Function will check for PHP version if it is greater than 5.3 then we can use its default implementation
-	 * otherwise we have to use our own implementation of chanining functionality.
-	 *
-	 * @return Exception returns previous exception
-	 */
-	public function _getPrevious() {
-		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-			return $this->_previous;
-		}
-
-		return parent::getPrevious();
-	}
-
-	/**
-	 * String representation of the exception, also handles previous exception.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-			if (($e = $this->getPrevious()) !== null) {
-				return $e->__toString() .
-						"\n\nNext " .
-						parent::__toString();
-			}
-		}
-
-		return parent::__toString();
-	}
-
-	/**
-	 * Name of the class of exception.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return get_class($this);
-	}
-
-	// @TODO getTrace and getTraceAsString
+    /**
+     * Base name of the file, so we don't have to use static path of the file.
+     */
+    private $baseFile;
+
+    /**
+     * Flag to check if exception is already handled or not.
+     */
+    public $isHandled = false;
+
+    /**
+     * The exception message to show at client side.
+     */
+    public $displayMessage;
+
+    /**
+     * @param string    $errorMessage
+     * @param int       $code
+     * @param Exception $previous
+     * @param string    $displayMessage
+     */
+    public function __construct($errorMessage, $code = 0, Exception $previous = null, $displayMessage = null) {
+        // assign display message
+        $this->displayMessage = $displayMessage;
+
+        parent::__construct($errorMessage, (int) $code, $previous);
+    }
+
+    /**
+     * @return string returns file name and line number combined where exception occurred
+     */
+    public function getFileLine() {
+        return $this->getBaseFile() . ':' . $this->getLine();
+    }
+
+    /**
+     * @return string returns message that should be sent to client to display
+     */
+    public function getDisplayMessage() {
+        if (!is_null($this->displayMessage)) {
+            return $this->displayMessage;
+        }
+
+        return $this->getMessage();
+    }
+
+    /**
+     * Function sets display message of an exception that will be sent to the client side
+     * to show it to user.
+     *
+     * @param string $message display message
+     */
+    public function setDisplayMessage($message) {
+        $this->displayMessage = $message;
+    }
+
+    /**
+     * Function sets a flag in exception class to indicate that exception is already handled
+     * so if it is caught again in the top level of function stack then we have to silently
+     * ignore it.
+     */
+    public function setHandled() {
+        $this->isHandled = true;
+    }
+
+    /**
+     * @return string returns base path of the file where exception occurred
+     */
+    public function getBaseFile() {
+        if (is_null($this->baseFile)) {
+            $this->baseFile = basename(parent::getFile());
+        }
+
+        return $this->baseFile;
+    }
+
+    /**
+     * Function will check for PHP version if it is greater than 5.3 then we can use its default implementation
+     * otherwise we have to use our own implementation of chanining functionality.
+     *
+     * @return Exception returns previous exception
+     */
+    public function _getPrevious() {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            return $this->_previous;
+        }
+
+        return parent::getPrevious();
+    }
+
+    /**
+     * String representation of the exception, also handles previous exception.
+     *
+     * @return string
+     */
+    public function __toString() {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            if (($e = $this->getPrevious()) !== null) {
+                return $e->__toString() .
+                        "\n\nNext " .
+                        parent::__toString();
+            }
+        }
+
+        return parent::__toString();
+    }
+
+    /**
+     * Name of the class of exception.
+     *
+     * @return string
+     */
+    public function getName() {
+        return get_class($this);
+    }
+
+    // @TODO getTrace and getTraceAsString
 }

mapi/class.freebusypublish.php

Indentation +238 added lines, -238 removed lines

@@ -6,271 +6,271 @@
  */
 
 class FreeBusyPublish {
-	public $session;
-	public $calendar;
-	public $entryid;
-	public $starttime;
-	public $length;
-	public $store;
-	public $proptags;
+    public $session;
+    public $calendar;
+    public $entryid;
+    public $starttime;
+    public $length;
+    public $store;
+    public $proptags;
 
-	/**
-	 * @param mapi_session $session  MAPI Session
-	 * @param mapi_folder  $calendar Calendar to publish
-	 * @param string       $entryid  AddressBook Entry ID for the user we're publishing for
-	 * @param mixed        $store
-	 */
-	public function __construct($session, $store, $calendar, $entryid) {
-		$properties["entryid"] = PR_ENTRYID;
-		$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-		$properties["message_class"] = PR_MESSAGE_CLASS;
-		$properties["icon_index"] = PR_ICON_INDEX;
-		$properties["subject"] = PR_SUBJECT;
-		$properties["display_to"] = PR_DISPLAY_TO;
-		$properties["importance"] = PR_IMPORTANCE;
-		$properties["sensitivity"] = PR_SENSITIVITY;
-		$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
-		$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
-		$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
-		$properties["recurring_data"] = "PT_BINARY:PSETID_Appointment:0x8216";
-		$properties["busystatus"] = "PT_LONG:PSETID_Appointment:0x8205";
-		$properties["label"] = "PT_LONG:PSETID_Appointment:0x8214";
-		$properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:0x8215";
-		$properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
-		$properties["meeting"] = "PT_LONG:PSETID_Appointment:0x8217";
-		$properties["startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";
-		$properties["enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236";
-		$properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208";
-		$properties["duration"] = "PT_LONG:PSETID_Appointment:0x8213";
-		$properties["responsestatus"] = "PT_LONG:PSETID_Appointment:0x8218";
-		$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
-		$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
-		$properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
-		$properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
-		$properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
-		$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
-		$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
-		$properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
-		$properties["basedate"] = "PT_SYSTIME:PSETID_Appointment:0x8228";
-		$properties["timezone_data"] = "PT_BINARY:PSETID_Appointment:0x8233";
-		$this->proptags = getPropIdsFromStrings($store, $properties);
+    /**
+     * @param mapi_session $session  MAPI Session
+     * @param mapi_folder  $calendar Calendar to publish
+     * @param string       $entryid  AddressBook Entry ID for the user we're publishing for
+     * @param mixed        $store
+     */
+    public function __construct($session, $store, $calendar, $entryid) {
+        $properties["entryid"] = PR_ENTRYID;
+        $properties["parent_entryid"] = PR_PARENT_ENTRYID;
+        $properties["message_class"] = PR_MESSAGE_CLASS;
+        $properties["icon_index"] = PR_ICON_INDEX;
+        $properties["subject"] = PR_SUBJECT;
+        $properties["display_to"] = PR_DISPLAY_TO;
+        $properties["importance"] = PR_IMPORTANCE;
+        $properties["sensitivity"] = PR_SENSITIVITY;
+        $properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
+        $properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
+        $properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
+        $properties["recurring_data"] = "PT_BINARY:PSETID_Appointment:0x8216";
+        $properties["busystatus"] = "PT_LONG:PSETID_Appointment:0x8205";
+        $properties["label"] = "PT_LONG:PSETID_Appointment:0x8214";
+        $properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:0x8215";
+        $properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
+        $properties["meeting"] = "PT_LONG:PSETID_Appointment:0x8217";
+        $properties["startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";
+        $properties["enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236";
+        $properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208";
+        $properties["duration"] = "PT_LONG:PSETID_Appointment:0x8213";
+        $properties["responsestatus"] = "PT_LONG:PSETID_Appointment:0x8218";
+        $properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
+        $properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
+        $properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
+        $properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
+        $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
+        $properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
+        $properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
+        $properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
+        $properties["basedate"] = "PT_SYSTIME:PSETID_Appointment:0x8228";
+        $properties["timezone_data"] = "PT_BINARY:PSETID_Appointment:0x8233";
+        $this->proptags = getPropIdsFromStrings($store, $properties);
 
-		$this->session = $session;
-		$this->calendar = $calendar;
-		$this->entryid = $entryid;
-		$this->store = $store;
-	}
+        $this->session = $session;
+        $this->calendar = $calendar;
+        $this->entryid = $entryid;
+        $this->store = $store;
+    }
 
-	/**
-	 * Publishes the information.
-	 *
-	 * @paam timestamp $starttime Time from which to publish data  (usually now)
-	 * @paam integer $length Amount of seconds from $starttime we should publish
-	 *
-	 * @param mixed $starttime
-	 * @param mixed $length
-	 */
-	public function publishFB($starttime, $length) {
-		$start = $starttime;
-		$end = $starttime + $length;
+    /**
+     * Publishes the information.
+     *
+     * @paam timestamp $starttime Time from which to publish data  (usually now)
+     * @paam integer $length Amount of seconds from $starttime we should publish
+     *
+     * @param mixed $starttime
+     * @param mixed $length
+     */
+    public function publishFB($starttime, $length) {
+        $start = $starttime;
+        $end = $starttime + $length;
 
-		// Get all the items in the calendar that we need
+        // Get all the items in the calendar that we need
 
-		$calendaritems = [];
+        $calendaritems = [];
 
-		$restrict = [RES_OR, [
-			// (item[start] >= start && item[start] <= end)
-			[RES_AND, [
-				[RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["startdate"], VALUE => $start]],
-				[RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["startdate"], VALUE => $end]],
-			]],
-			// OR
-			// (item[end] >= start && item[end] <= end)
-			[RES_AND, [
-				[RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["duedate"], VALUE => $start]],
-				[RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["duedate"], VALUE => $end]],
-			]],
-			// OR
-			// (item[start] < start && item[end] > end)
-			[RES_AND, [
-				[RES_PROPERTY, [RELOP => RELOP_LT, ULPROPTAG => $this->proptags["startdate"], VALUE => $start]],
-				[RES_PROPERTY, [RELOP => RELOP_GT, ULPROPTAG => $this->proptags["duedate"], VALUE => $end]],
-			]],
-			// OR
-			[RES_OR, [
-				// OR
-				// (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start)
-				[RES_AND, [
-					[RES_EXIST, [ULPROPTAG => $this->proptags["enddate_recurring"]]],
-					[RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->proptags["recurring"], VALUE => true]],
-					[RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["enddate_recurring"], VALUE => $start]],
-				]],
-				// OR
-				// (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
-				[RES_AND, [
-					[RES_NOT, [
-						[RES_EXIST, [ULPROPTAG => $this->proptags["enddate_recurring"]]],
-					]],
-					[RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["startdate"], VALUE => $end]],
-					[RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->proptags["recurring"], VALUE => true]],
-				]],
-			]], // EXISTS OR
-		]]; // global OR
+        $restrict = [RES_OR, [
+            // (item[start] >= start && item[start] <= end)
+            [RES_AND, [
+                [RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["startdate"], VALUE => $start]],
+                [RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["startdate"], VALUE => $end]],
+            ]],
+            // OR
+            // (item[end] >= start && item[end] <= end)
+            [RES_AND, [
+                [RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["duedate"], VALUE => $start]],
+                [RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["duedate"], VALUE => $end]],
+            ]],
+            // OR
+            // (item[start] < start && item[end] > end)
+            [RES_AND, [
+                [RES_PROPERTY, [RELOP => RELOP_LT, ULPROPTAG => $this->proptags["startdate"], VALUE => $start]],
+                [RES_PROPERTY, [RELOP => RELOP_GT, ULPROPTAG => $this->proptags["duedate"], VALUE => $end]],
+            ]],
+            // OR
+            [RES_OR, [
+                // OR
+                // (EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[end] >= start)
+                [RES_AND, [
+                    [RES_EXIST, [ULPROPTAG => $this->proptags["enddate_recurring"]]],
+                    [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->proptags["recurring"], VALUE => true]],
+                    [RES_PROPERTY, [RELOP => RELOP_GE, ULPROPTAG => $this->proptags["enddate_recurring"], VALUE => $start]],
+                ]],
+                // OR
+                // (!EXIST(ecurrence_enddate_property) && item[isRecurring] == true && item[start] <= end)
+                [RES_AND, [
+                    [RES_NOT, [
+                        [RES_EXIST, [ULPROPTAG => $this->proptags["enddate_recurring"]]],
+                    ]],
+                    [RES_PROPERTY, [RELOP => RELOP_LE, ULPROPTAG => $this->proptags["startdate"], VALUE => $end]],
+                    [RES_PROPERTY, [RELOP => RELOP_EQ, ULPROPTAG => $this->proptags["recurring"], VALUE => true]],
+                ]],
+            ]], // EXISTS OR
+        ]]; // global OR
 
-		$contents = mapi_folder_getcontentstable($this->calendar);
-		mapi_table_restrict($contents, $restrict);
+        $contents = mapi_folder_getcontentstable($this->calendar);
+        mapi_table_restrict($contents, $restrict);
 
-		while (1) {
-			$rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
+        while (1) {
+            $rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
 
-			if (!is_array($rows)) {
-				break;
-			}
+            if (!is_array($rows)) {
+                break;
+            }
 
-			if (empty($rows)) {
-				break;
-			}
+            if (empty($rows)) {
+                break;
+            }
 
-			foreach ($rows as $row) {
-				$occurrences = [];
-				if (isset($row[$this->proptags['recurring']]) && $row[$this->proptags['recurring']]) {
-					$recur = new Recurrence($this->store, $row);
+            foreach ($rows as $row) {
+                $occurrences = [];
+                if (isset($row[$this->proptags['recurring']]) && $row[$this->proptags['recurring']]) {
+                    $recur = new Recurrence($this->store, $row);
 
-					$occurrences = $recur->getItems($starttime, $starttime + $length);
-				}
-				else {
-					$occurrences[] = $row;
-				}
+                    $occurrences = $recur->getItems($starttime, $starttime + $length);
+                }
+                else {
+                    $occurrences[] = $row;
+                }
 
-				$calendaritems = array_merge($calendaritems, $occurrences);
-			}
-		}
+                $calendaritems = array_merge($calendaritems, $occurrences);
+            }
+        }
 
-		// $calendaritems now contains all the calendar items in the specified time
-		// frame. We now need to merge these into a flat array of begin/end/status
-		// objects. This also filters out all the 'free' items (status 0)
+        // $calendaritems now contains all the calendar items in the specified time
+        // frame. We now need to merge these into a flat array of begin/end/status
+        // objects. This also filters out all the 'free' items (status 0)
 
-		$freebusy = $this->mergeItemsFB($calendaritems);
+        $freebusy = $this->mergeItemsFB($calendaritems);
 
-		// $freebusy now contains the start, end and status of all items, merged.
+        // $freebusy now contains the start, end and status of all items, merged.
 
-		// Get the FB interface
-		try {
-			$fbsupport = mapi_freebusysupport_open($this->session, $this->store);
-		}
-		catch (MAPIException $e) {
-			if ($e->getCode() == MAPI_E_NOT_FOUND) {
-				$e->setHandled();
-				if (function_exists("dump")) {
-					dump("Error in opening freebusysupport object.");
-				}
-			}
-		}
+        // Get the FB interface
+        try {
+            $fbsupport = mapi_freebusysupport_open($this->session, $this->store);
+        }
+        catch (MAPIException $e) {
+            if ($e->getCode() == MAPI_E_NOT_FOUND) {
+                $e->setHandled();
+                if (function_exists("dump")) {
+                    dump("Error in opening freebusysupport object.");
+                }
+            }
+        }
 
-		// Open updater for this user
-		if (!isset($fbsupport) || !$fbsupport) {
-			return;
-		}
-		$updaters = mapi_freebusysupport_loadupdate($fbsupport, [$this->entryid]);
-		$updater = $updaters[0];
+        // Open updater for this user
+        if (!isset($fbsupport) || !$fbsupport) {
+            return;
+        }
+        $updaters = mapi_freebusysupport_loadupdate($fbsupport, [$this->entryid]);
+        $updater = $updaters[0];
 
-		// Send the data
-		mapi_freebusyupdate_reset($updater);
-		mapi_freebusyupdate_publish($updater, $freebusy);
-		mapi_freebusyupdate_savechanges($updater, $start - 24 * 60 * 60, $end);
+        // Send the data
+        mapi_freebusyupdate_reset($updater);
+        mapi_freebusyupdate_publish($updater, $freebusy);
+        mapi_freebusyupdate_savechanges($updater, $start - 24 * 60 * 60, $end);
 
-		// We're finished
-		mapi_freebusysupport_close($fbsupport);
-	}
+        // We're finished
+        mapi_freebusysupport_close($fbsupport);
+    }
 
-	/**
-	 * Sorts by timestamp, if equal, then end before start.
-	 *
-	 * @param mixed $a
-	 * @param mixed $b
-	 */
-	public function cmp($a, $b) {
-		if ($a["time"] != $b["time"]) {
-			return $a["time"] > $b["time"] ? 1 : -1;
-		}
-		if ($a["type"] < $b["type"]) {
-			return 1;
-		}
-		if ($a["type"] > $b["type"]) {
-			return -1;
-		}
+    /**
+     * Sorts by timestamp, if equal, then end before start.
+     *
+     * @param mixed $a
+     * @param mixed $b
+     */
+    public function cmp($a, $b) {
+        if ($a["time"] != $b["time"]) {
+            return $a["time"] > $b["time"] ? 1 : -1;
+        }
+        if ($a["type"] < $b["type"]) {
+            return 1;
+        }
+        if ($a["type"] > $b["type"]) {
+            return -1;
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Function mergeItems.
-	 *
-	 * @author Steve Hardy
-	 *
-	 * @param mixed $items
-	 */
-	public function mergeItemsFB($items) {
-		$merged = [];
-		$timestamps = [];
-		$csubj = [];
-		$cbusy = [];
-		$level = 0;
-		$laststart = null;
+    /**
+     * Function mergeItems.
+     *
+     * @author Steve Hardy
+     *
+     * @param mixed $items
+     */
+    public function mergeItemsFB($items) {
+        $merged = [];
+        $timestamps = [];
+        $csubj = [];
+        $cbusy = [];
+        $level = 0;
+        $laststart = null;
 
-		foreach ($items as $item) {
-			$ts["type"] = 0;
-			$ts["time"] = $item[$this->proptags["startdate"]];
-			$ts["subject"] = $item[PR_SUBJECT];
-			$ts["status"] = isset($item[$this->proptags["busystatus"]]) ? $item[$this->proptags["busystatus"]] : 0; // ZP-197
-			$timestamps[] = $ts;
+        foreach ($items as $item) {
+            $ts["type"] = 0;
+            $ts["time"] = $item[$this->proptags["startdate"]];
+            $ts["subject"] = $item[PR_SUBJECT];
+            $ts["status"] = isset($item[$this->proptags["busystatus"]]) ? $item[$this->proptags["busystatus"]] : 0; // ZP-197
+            $timestamps[] = $ts;
 
-			$ts["type"] = 1;
-			$ts["time"] = $item[$this->proptags["duedate"]];
-			$ts["subject"] = $item[PR_SUBJECT];
-			$ts["status"] = isset($item[$this->proptags["busystatus"]]) ? $item[$this->proptags["busystatus"]] : 0; // ZP-197
-			$timestamps[] = $ts;
-		}
+            $ts["type"] = 1;
+            $ts["time"] = $item[$this->proptags["duedate"]];
+            $ts["subject"] = $item[PR_SUBJECT];
+            $ts["status"] = isset($item[$this->proptags["busystatus"]]) ? $item[$this->proptags["busystatus"]] : 0; // ZP-197
+            $timestamps[] = $ts;
+        }
 
-		usort($timestamps, [$this, "cmp"]);
-		$laststart = 0;
+        usort($timestamps, [$this, "cmp"]);
+        $laststart = 0;
 
-		foreach ($timestamps as $ts) {
-			switch ($ts["type"]) {
-		case 0: // Start
-				if ($level != 0 && $laststart != $ts["time"]) {
-					$newitem["start"] = $laststart;
-					$newitem["end"] = $ts["time"];
-					$newitem["subject"] = join(",", $csubj);
-					$newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-					if ($newitem["status"] > 0) {
-						$merged[] = $newitem;
-					}
-				}
-			++$level;
-			$csubj[] = $ts["subject"];
-			$cbusy[] = $ts["status"];
-			$laststart = $ts["time"];
-			break;
+        foreach ($timestamps as $ts) {
+            switch ($ts["type"]) {
+        case 0: // Start
+                if ($level != 0 && $laststart != $ts["time"]) {
+                    $newitem["start"] = $laststart;
+                    $newitem["end"] = $ts["time"];
+                    $newitem["subject"] = join(",", $csubj);
+                    $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
+                    if ($newitem["status"] > 0) {
+                        $merged[] = $newitem;
+                    }
+                }
+            ++$level;
+            $csubj[] = $ts["subject"];
+            $cbusy[] = $ts["status"];
+            $laststart = $ts["time"];
+            break;
 
-		case 1: // End
-			if ($laststart != $ts["time"]) {
-				$newitem["start"] = $laststart;
-				$newitem["end"] = $ts["time"];
-				$newitem["subject"] = join(",", $csubj);
-				$newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
-				if ($newitem["status"] > 0) {
-					$merged[] = $newitem;
-				}
-			}
-			--$level;
-			array_splice($csubj, array_search($ts["subject"], $csubj, 1), 1);
-			array_splice($cbusy, array_search($ts["status"], $cbusy, 1), 1);
-			$laststart = $ts["time"];
-			break;
-			}
-		}
+        case 1: // End
+            if ($laststart != $ts["time"]) {
+                $newitem["start"] = $laststart;
+                $newitem["end"] = $ts["time"];
+                $newitem["subject"] = join(",", $csubj);
+                $newitem["status"] = !empty($cbusy) ? max($cbusy) : 0;
+                if ($newitem["status"] > 0) {
+                    $merged[] = $newitem;
+                }
+            }
+            --$level;
+            array_splice($csubj, array_search($ts["subject"], $csubj, 1), 1);
+            array_splice($cbusy, array_search($ts["status"], $cbusy, 1), 1);
+            $laststart = $ts["time"];
+            break;
+            }
+        }
 
-		return $merged;
-	}
+        return $merged;
+    }
 }

Braces +2 added lines, -4 removed lines

@@ -137,8 +137,7 @@ 
 					$recur = new Recurrence($this->store, $row);
 
 					$occurrences = $recur->getItems($starttime, $starttime + $length);
-				}
-				else {
+				} else {
 					$occurrences[] = $row;
 				}
 
@@ -157,8 +156,7 @@ 
 		// Get the FB interface
 		try {
 			$fbsupport = mapi_freebusysupport_open($this->session, $this->store);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			if ($e->getCode() == MAPI_E_NOT_FOUND) {
 				$e->setHandled();
 				if (function_exists("dump")) {

mapi/class.taskrecurrence.php

Indentation +403 added lines, -403 removed lines

@@ -5,409 +5,409 @@
  * SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
  */
 
-	class TaskRecurrence extends BaseRecurrence {
-		/**
-		 * Timezone info which is always false for task.
-		 */
-		public $tz = false;
-
-		public function __construct($store, $message) {
-			$this->store = $store;
-			$this->message = $message;
-
-			$properties = [];
-			$properties["entryid"] = PR_ENTRYID;
-			$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-			$properties["icon_index"] = PR_ICON_INDEX;
-			$properties["message_class"] = PR_MESSAGE_CLASS;
-			$properties["message_flags"] = PR_MESSAGE_FLAGS;
-			$properties["subject"] = PR_SUBJECT;
-			$properties["importance"] = PR_IMPORTANCE;
-			$properties["sensitivity"] = PR_SENSITIVITY;
-			$properties["last_modification_time"] = PR_LAST_MODIFICATION_TIME;
-			$properties["status"] = "PT_LONG:PSETID_Task:0x8101";
-			$properties["percent_complete"] = "PT_DOUBLE:PSETID_Task:0x8102";
-			$properties["startdate"] = "PT_SYSTIME:PSETID_Task:0x8104";
-			$properties["duedate"] = "PT_SYSTIME:PSETID_Task:0x8105";
-			$properties["reset_reminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";
-			$properties["dead_occurrence"] = "PT_BOOLEAN:PSETID_Task:0x8109";
-			$properties["datecompleted"] = "PT_SYSTIME:PSETID_Task:0x810f";
-			$properties["recurring_data"] = "PT_BINARY:PSETID_Task:0x8116";
-			$properties["actualwork"] = "PT_LONG:PSETID_Task:0x8110";
-			$properties["totalwork"] = "PT_LONG:PSETID_Task:0x8111";
-			$properties["complete"] = "PT_BOOLEAN:PSETID_Task:0x811c";
-			$properties["task_f_creator"] = "PT_BOOLEAN:PSETID_Task:0x811e";
-			$properties["owner"] = "PT_STRING8:PSETID_Task:0x811f";
-			$properties["recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";
-
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
-
-			$properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
-			$properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
-			$properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
-			$properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
-
-			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
-			$properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
-			$properties["commonassign"] = "PT_LONG:PSETID_Common:0x8518";
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560";
-			$properties["side_effects"] = "PT_LONG:PSETID_Common:0x8510";
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
-
-			$this->proptags = getPropIdsFromStrings($store, $properties);
-
-			parent::__construct($store, $message, $properties);
-		}
-
-		/**
-		 * Function which saves recurrence and also regenerates task if necessary.
-		 *
-		 *@param array $recur new recurrence properties
-		 *
-		 *@return array of properties of regenerated task else false
-		 */
-		public function setRecurrence(&$recur) {
-			$this->recur = $recur;
-			$this->action = &$recur;
-
-			if (!isset($this->recur["changed_occurences"])) {
-				$this->recur["changed_occurences"] = [];
-			}
-
-			if (!isset($this->recur["deleted_occurences"])) {
-				$this->recur["deleted_occurences"] = [];
-			}
-
-			if (!isset($this->recur['startocc'])) {
-				$this->recur['startocc'] = 0;
-			}
-			if (!isset($this->recur['endocc'])) {
-				$this->recur['endocc'] = 0;
-			}
-
-			// Save recurrence because we need proper startrecurrdate and endrecurrdate
-			$this->saveRecurrence();
-
-			// Update $this->recur with proper startrecurrdate and endrecurrdate updated after saving recurrence
-			$msgProps = mapi_getprops($this->message, [$this->proptags['recurring_data']]);
-			$recurring_data = $this->parseRecurrence($msgProps[$this->proptags['recurring_data']]);
-			foreach ($recurring_data as $key => $value) {
-				$this->recur[$key] = $value;
-			}
-
-			$this->setFirstOccurrence();
-
-			// Let's see if next occurrence has to be generated
-			return $this->moveToNextOccurrence();
-		}
-
-		/**
-		 * Sets task object to first occurrence if startdate/duedate of task object is different from first occurrence.
-		 */
-		public function setFirstOccurrence() {
-			// Check if it is already the first occurrence
-			if ($this->action['start'] == $this->recur["start"]) {
-				return;
-			}
-			$items = $this->getNextOccurrence();
-
-			$props = [];
-			$props[$this->proptags['startdate']] = $items[$this->proptags['startdate']];
-			$props[$this->proptags['commonstart']] = $items[$this->proptags['startdate']];
-
-			$props[$this->proptags['duedate']] = $items[$this->proptags['duedate']];
-			$props[$this->proptags['commonend']] = $items[$this->proptags['duedate']];
-
-			mapi_setprops($this->message, $props);
-		}
-
-		/**
-		 * Function which creates new task as current occurrence and moves the
-		 * existing task to next occurrence.
-		 *
-		 *@param array $recur $action from client
-		 *
-		 *@return bool if moving to next occurrence succeed then it returns
-		 *		properties of either newly created task or existing task ELSE
-		 *		false because that was last occurrence
-		 */
-		public function moveToNextOccurrence() {
-			$result = false;
-			/*
+    class TaskRecurrence extends BaseRecurrence {
+        /**
+         * Timezone info which is always false for task.
+         */
+        public $tz = false;
+
+        public function __construct($store, $message) {
+            $this->store = $store;
+            $this->message = $message;
+
+            $properties = [];
+            $properties["entryid"] = PR_ENTRYID;
+            $properties["parent_entryid"] = PR_PARENT_ENTRYID;
+            $properties["icon_index"] = PR_ICON_INDEX;
+            $properties["message_class"] = PR_MESSAGE_CLASS;
+            $properties["message_flags"] = PR_MESSAGE_FLAGS;
+            $properties["subject"] = PR_SUBJECT;
+            $properties["importance"] = PR_IMPORTANCE;
+            $properties["sensitivity"] = PR_SENSITIVITY;
+            $properties["last_modification_time"] = PR_LAST_MODIFICATION_TIME;
+            $properties["status"] = "PT_LONG:PSETID_Task:0x8101";
+            $properties["percent_complete"] = "PT_DOUBLE:PSETID_Task:0x8102";
+            $properties["startdate"] = "PT_SYSTIME:PSETID_Task:0x8104";
+            $properties["duedate"] = "PT_SYSTIME:PSETID_Task:0x8105";
+            $properties["reset_reminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";
+            $properties["dead_occurrence"] = "PT_BOOLEAN:PSETID_Task:0x8109";
+            $properties["datecompleted"] = "PT_SYSTIME:PSETID_Task:0x810f";
+            $properties["recurring_data"] = "PT_BINARY:PSETID_Task:0x8116";
+            $properties["actualwork"] = "PT_LONG:PSETID_Task:0x8110";
+            $properties["totalwork"] = "PT_LONG:PSETID_Task:0x8111";
+            $properties["complete"] = "PT_BOOLEAN:PSETID_Task:0x811c";
+            $properties["task_f_creator"] = "PT_BOOLEAN:PSETID_Task:0x811e";
+            $properties["owner"] = "PT_STRING8:PSETID_Task:0x811f";
+            $properties["recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";
+
+            $properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
+            $properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
+            $properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
+
+            $properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
+            $properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
+            $properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
+            $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
+
+            $properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
+            $properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
+            $properties["commonassign"] = "PT_LONG:PSETID_Common:0x8518";
+            $properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560";
+            $properties["side_effects"] = "PT_LONG:PSETID_Common:0x8510";
+            $properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
+            $properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
+
+            $this->proptags = getPropIdsFromStrings($store, $properties);
+
+            parent::__construct($store, $message, $properties);
+        }
+
+        /**
+         * Function which saves recurrence and also regenerates task if necessary.
+         *
+         *@param array $recur new recurrence properties
+         *
+         *@return array of properties of regenerated task else false
+         */
+        public function setRecurrence(&$recur) {
+            $this->recur = $recur;
+            $this->action = &$recur;
+
+            if (!isset($this->recur["changed_occurences"])) {
+                $this->recur["changed_occurences"] = [];
+            }
+
+            if (!isset($this->recur["deleted_occurences"])) {
+                $this->recur["deleted_occurences"] = [];
+            }
+
+            if (!isset($this->recur['startocc'])) {
+                $this->recur['startocc'] = 0;
+            }
+            if (!isset($this->recur['endocc'])) {
+                $this->recur['endocc'] = 0;
+            }
+
+            // Save recurrence because we need proper startrecurrdate and endrecurrdate
+            $this->saveRecurrence();
+
+            // Update $this->recur with proper startrecurrdate and endrecurrdate updated after saving recurrence
+            $msgProps = mapi_getprops($this->message, [$this->proptags['recurring_data']]);
+            $recurring_data = $this->parseRecurrence($msgProps[$this->proptags['recurring_data']]);
+            foreach ($recurring_data as $key => $value) {
+                $this->recur[$key] = $value;
+            }
+
+            $this->setFirstOccurrence();
+
+            // Let's see if next occurrence has to be generated
+            return $this->moveToNextOccurrence();
+        }
+
+        /**
+         * Sets task object to first occurrence if startdate/duedate of task object is different from first occurrence.
+         */
+        public function setFirstOccurrence() {
+            // Check if it is already the first occurrence
+            if ($this->action['start'] == $this->recur["start"]) {
+                return;
+            }
+            $items = $this->getNextOccurrence();
+
+            $props = [];
+            $props[$this->proptags['startdate']] = $items[$this->proptags['startdate']];
+            $props[$this->proptags['commonstart']] = $items[$this->proptags['startdate']];
+
+            $props[$this->proptags['duedate']] = $items[$this->proptags['duedate']];
+            $props[$this->proptags['commonend']] = $items[$this->proptags['duedate']];
+
+            mapi_setprops($this->message, $props);
+        }
+
+        /**
+         * Function which creates new task as current occurrence and moves the
+         * existing task to next occurrence.
+         *
+         *@param array $recur $action from client
+         *
+         *@return bool if moving to next occurrence succeed then it returns
+         *		properties of either newly created task or existing task ELSE
+         *		false because that was last occurrence
+         */
+        public function moveToNextOccurrence() {
+            $result = false;
+            /*
 			 * Every recurring task should have a 'duedate'. If a recurring task is created with no start/end date
 			 * then we create first two occurrence separately and for first occurrence recurrence has ended.
 			 */
-			if ((empty($this->action['startdate']) && empty($this->action['duedate'])) ||
-				($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])) {
-				$nextOccurrence = $this->getNextOccurrence();
-				$result = mapi_getprops($this->message, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID]);
-
-				$props = [];
-				if ($nextOccurrence) {
-					if (!isset($this->action['deleteOccurrence'])) {
-						// Create current occurrence as separate task
-						$result = $this->regenerateTask($this->action['complete']);
-					}
-
-					// Set reminder for next occurrence
-					$this->setReminder($nextOccurrence);
-
-					// Update properties for next occurrence
-					$this->action['duedate'] = $props[$this->proptags['duedate']] = $nextOccurrence[$this->proptags['duedate']];
-					$this->action['commonend'] = $props[$this->proptags['commonend']] = $nextOccurrence[$this->proptags['duedate']];
-
-					$this->action['startdate'] = $props[$this->proptags['startdate']] = $nextOccurrence[$this->proptags['startdate']];
-					$this->action['commonstart'] = $props[$this->proptags['commonstart']] = $nextOccurrence[$this->proptags['startdate']];
-
-					// If current task as been mark as 'Complete' then next occurrence should be incomplete.
-					if (isset($this->action['complete']) && $this->action['complete'] == 1) {
-						$this->action['status'] = $props[$this->proptags["status"]] = olTaskNotStarted;
-						$this->action['complete'] = $props[$this->proptags["complete"]] = false;
-						$this->action['percent_complete'] = $props[$this->proptags["percent_complete"]] = 0;
-					}
-
-					$props[$this->proptags["dead_occurrence"]] = false;
-				}
-				else {
-					if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
-						return false;
-					}
-
-					// Didn't get next occurrence, probably this is the last one, so recurrence ends here
-					$props[$this->proptags["dead_occurrence"]] = true;
-					$props[$this->proptags["datecompleted"]] = $this->action['datecompleted'];
-					$props[$this->proptags["task_f_creator"]] = true;
-
-					// OL props
-					$props[$this->proptags["side_effects"]] = 1296;
-					$props[$this->proptags["icon_index"]] = 1280;
-				}
-
-				mapi_setprops($this->message, $props);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Function which return properties of next occurrence.
-		 *
-		 *@return array startdate/enddate of next occurrence
-		 */
-		public function getNextOccurrence() {
-			if ($this->recur) {
-				$items = [];
-
-				// @TODO: fix start of range
-				$start = isset($this->messageprops[$this->proptags["duedate"]]) ? $this->messageprops[$this->proptags["duedate"]] : $this->action['start'];
-				$dayend = ($this->recur['term'] == 0x23) ? 0x7FFFFFFF : $this->dayStartOf($this->recur["end"]);
-
-				// Fix recur object
-				$this->recur['startocc'] = 0;
-				$this->recur['endocc'] = 0;
-
-				// Retrieve next occurrence
-				$items = $this->getItems($start, $dayend, 1);
-
-				return !empty($items) ? $items[0] : false;
-			}
-		}
-
-		/**
-		 * Function which clones current occurrence and sets appropriate properties.
-		 * The original recurring item is moved to next occurrence.
-		 *
-		 *@param bool $markComplete true if existing occurrence has to be mark complete else false
-		 */
-		public function regenerateTask($markComplete) {
-			// Get all properties
-			$taskItemProps = mapi_getprops($this->message);
-
-			if (isset($this->action["subject"])) {
-				$taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
-			}
-			if (isset($this->action["importance"])) {
-				$taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
-			}
-			if (isset($this->action["startdate"])) {
-				$taskItemProps[$this->proptags["startdate"]] = $this->action["startdate"];
-				$taskItemProps[$this->proptags["commonstart"]] = $this->action["startdate"];
-			}
-			if (isset($this->action["duedate"])) {
-				$taskItemProps[$this->proptags["duedate"]] = $this->action["duedate"];
-				$taskItemProps[$this->proptags["commonend"]] = $this->action["duedate"];
-			}
-
-			$folder = mapi_msgstore_openentry($this->store, $taskItemProps[PR_PARENT_ENTRYID]);
-			$newMessage = mapi_folder_createmessage($folder);
-
-			$taskItemProps[$this->proptags["status"]] = $markComplete ? olTaskComplete : olTaskNotStarted;
-			$taskItemProps[$this->proptags["complete"]] = $markComplete;
-			$taskItemProps[$this->proptags["percent_complete"]] = $markComplete ? 1 : 0;
-
-			// This occurrence has been marked as 'Complete' so disable reminder
-			if ($markComplete) {
-				$taskItemProps[$this->proptags["reset_reminder"]] = false;
-				$taskItemProps[$this->proptags["reminder"]] = false;
-				$taskItemProps[$this->proptags["datecompleted"]] = $this->action["datecompleted"];
-
-				unset($this->action[$this->proptags['datecompleted']]);
-			}
-
-			// Recurrence ends for this item
-			$taskItemProps[$this->proptags["dead_occurrence"]] = true;
-			$taskItemProps[$this->proptags["task_f_creator"]] = true;
-
-			// OL props
-			$taskItemProps[$this->proptags["side_effects"]] = 1296;
-			$taskItemProps[$this->proptags["icon_index"]] = 1280;
-
-			// Copy recipients
-			$recipienttable = mapi_message_getrecipienttable($this->message);
-			$recipients = mapi_table_queryallrows($recipienttable, [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]);
-
-			$copy_to_recipientTable = mapi_message_getrecipienttable($newMessage);
-			$copy_to_recipientRows = mapi_table_queryallrows($copy_to_recipientTable, [PR_ROWID]);
-			foreach ($copy_to_recipientRows as $recipient) {
-				mapi_message_modifyrecipients($newMessage, MODRECIP_REMOVE, [$recipient]);
-			}
-			mapi_message_modifyrecipients($newMessage, MODRECIP_ADD, $recipients);
-
-			// Copy attachments
-			$attachmentTable = mapi_message_getattachmenttable($this->message);
-			if ($attachmentTable) {
-				$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
-
-				foreach ($attachments as $attach_props) {
-					$attach_old = mapi_message_openattach($this->message, (int) $attach_props[PR_ATTACH_NUM]);
-					$attach_newResourceMsg = mapi_message_createattach($newMessage);
-
-					mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
-					mapi_savechanges($attach_newResourceMsg);
-				}
-			}
-
-			mapi_setprops($newMessage, $taskItemProps);
-			mapi_savechanges($newMessage);
-
-			// Update body of original message
-			$msgbody = mapi_openproperty($this->message, PR_BODY);
-			$msgbody = trim($msgbody, "\0");
-			$separator = "------------\r\n";
-
-			if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
-				$msgbody = $separator . $msgbody;
-				$stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
-				mapi_stream_setsize($stream, strlen($msgbody));
-				mapi_stream_write($stream, $msgbody);
-				mapi_stream_commit($stream);
-			}
-
-			// We need these properties to notify client
-			return mapi_getprops($newMessage, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID]);
-		}
-
-		/**
-		 * processOccurrenceItem, adds an item to a list of occurrences, but only if the
-		 * resulting occurrence starts or ends in the interval <$start, $end>.
-		 *
-		 * @param array $items    reference to the array to be added to
-		 * @param date  $start    start of timeframe in GMT TIME
-		 * @param date  $end      end of timeframe in GMT TIME
-		 * @param date  $basedate (hour/sec/min assumed to be 00:00:00) in LOCAL TIME OF THE OCCURRENCE
-		 * @param mixed $now
-		 */
-		public function processOccurrenceItem(&$items, $start, $end, $now) {
-			if ($now <= $start) {
-				return;
-			}
-			$newItem = [];
-			$newItem[$this->proptags['startdate']] = $now;
-
-			// If startdate and enddate are set on task, then slide enddate according to duration
-			if (isset($this->messageprops[$this->proptags["startdate"]], $this->messageprops[$this->proptags["duedate"]])) {
-				$newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']] + ($this->messageprops[$this->proptags["duedate"]] - $this->messageprops[$this->proptags["startdate"]]);
-			}
-			else {
-				$newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']];
-			}
-			$items[] = $newItem;
-		}
-
-		/**
-		 * Function which marks existing occurrence to 'Complete'.
-		 *
-		 *@param array $recur array action from client
-		 *
-		 *@return array of properties of regenerated task else false
-		 */
-		public function markOccurrenceComplete(&$recur) {
-			// Fix timezone object
-			$this->tz = false;
-			$this->action = &$recur;
-			$dead_occurrence = isset($this->messageprops[$this->proptags['dead_occurrence']]) ? $this->messageprops[$this->proptags['dead_occurrence']] : false;
-
-			if (!$dead_occurrence) {
-				return $this->moveToNextOccurrence();
-			}
-
-			return false;
-		}
-
-		/**
-		 * Function which sets reminder on recurring task after existing occurrence has been deleted or marked complete.
-		 *
-		 *@param array $nextOccurrence properties of next occurrence
-		 */
-		public function setReminder($nextOccurrence) {
-			$props = [];
-			if ($nextOccurrence) {
-				// Check if reminder is reset. Default is 'false'
-				$reset_reminder = isset($this->messageprops[$this->proptags['reset_reminder']]) ? $this->messageprops[$this->proptags['reset_reminder']] : false;
-				$reminder = $this->messageprops[$this->proptags['reminder']];
-
-				// Either reminder was already set OR reminder was set but was dismissed bty user
-				if ($reminder || $reset_reminder) {
-					// Reminder can be set at any time either before or after the duedate, so get duration between the reminder time and duedate
-					$reminder_time = isset($this->messageprops[$this->proptags['reminder_time']]) ? $this->messageprops[$this->proptags['reminder_time']] : 0;
-					$reminder_difference = isset($this->messageprops[$this->proptags['duedate']]) ? $this->messageprops[$this->proptags['duedate']] : 0;
-					$reminder_difference = $reminder_difference - $reminder_time;
-
-					// Apply duration to next calculated duedate
-					$next_reminder_time = $nextOccurrence[$this->proptags['duedate']] - $reminder_difference;
-
-					$props[$this->proptags['reminder_time']] = $next_reminder_time;
-					$props[$this->proptags['flagdueby']] = $next_reminder_time;
-					$this->action['reminder'] = $props[$this->proptags['reminder']] = true;
-				}
-			}
-			else {
-				// Didn't get next occurrence, probably this is the last occurrence
-				$props[$this->proptags['reminder']] = false;
-				$props[$this->proptags['reset_reminder']] = false;
-			}
-
-			if (!empty($props)) {
-				mapi_setprops($this->message, $props);
-			}
-		}
-
-		/**
-		 * Function which recurring task to next occurrence.
-		 * It simply doesn't regenerate task.
-		 *
-		 * @param array $action
-		 */
-		public function deleteOccurrence($action) {
-			$this->tz = false;
-			$this->action = $action;
-			$result = $this->moveToNextOccurrence();
-
-			mapi_savechanges($this->message);
-
-			return $result;
-		}
-	}
+            if ((empty($this->action['startdate']) && empty($this->action['duedate'])) ||
+                ($this->action['complete'] == 1) || (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])) {
+                $nextOccurrence = $this->getNextOccurrence();
+                $result = mapi_getprops($this->message, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID]);
+
+                $props = [];
+                if ($nextOccurrence) {
+                    if (!isset($this->action['deleteOccurrence'])) {
+                        // Create current occurrence as separate task
+                        $result = $this->regenerateTask($this->action['complete']);
+                    }
+
+                    // Set reminder for next occurrence
+                    $this->setReminder($nextOccurrence);
+
+                    // Update properties for next occurrence
+                    $this->action['duedate'] = $props[$this->proptags['duedate']] = $nextOccurrence[$this->proptags['duedate']];
+                    $this->action['commonend'] = $props[$this->proptags['commonend']] = $nextOccurrence[$this->proptags['duedate']];
+
+                    $this->action['startdate'] = $props[$this->proptags['startdate']] = $nextOccurrence[$this->proptags['startdate']];
+                    $this->action['commonstart'] = $props[$this->proptags['commonstart']] = $nextOccurrence[$this->proptags['startdate']];
+
+                    // If current task as been mark as 'Complete' then next occurrence should be incomplete.
+                    if (isset($this->action['complete']) && $this->action['complete'] == 1) {
+                        $this->action['status'] = $props[$this->proptags["status"]] = olTaskNotStarted;
+                        $this->action['complete'] = $props[$this->proptags["complete"]] = false;
+                        $this->action['percent_complete'] = $props[$this->proptags["percent_complete"]] = 0;
+                    }
+
+                    $props[$this->proptags["dead_occurrence"]] = false;
+                }
+                else {
+                    if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
+                        return false;
+                    }
+
+                    // Didn't get next occurrence, probably this is the last one, so recurrence ends here
+                    $props[$this->proptags["dead_occurrence"]] = true;
+                    $props[$this->proptags["datecompleted"]] = $this->action['datecompleted'];
+                    $props[$this->proptags["task_f_creator"]] = true;
+
+                    // OL props
+                    $props[$this->proptags["side_effects"]] = 1296;
+                    $props[$this->proptags["icon_index"]] = 1280;
+                }
+
+                mapi_setprops($this->message, $props);
+            }
+
+            return $result;
+        }
+
+        /**
+         * Function which return properties of next occurrence.
+         *
+         *@return array startdate/enddate of next occurrence
+         */
+        public function getNextOccurrence() {
+            if ($this->recur) {
+                $items = [];
+
+                // @TODO: fix start of range
+                $start = isset($this->messageprops[$this->proptags["duedate"]]) ? $this->messageprops[$this->proptags["duedate"]] : $this->action['start'];
+                $dayend = ($this->recur['term'] == 0x23) ? 0x7FFFFFFF : $this->dayStartOf($this->recur["end"]);
+
+                // Fix recur object
+                $this->recur['startocc'] = 0;
+                $this->recur['endocc'] = 0;
+
+                // Retrieve next occurrence
+                $items = $this->getItems($start, $dayend, 1);
+
+                return !empty($items) ? $items[0] : false;
+            }
+        }
+
+        /**
+         * Function which clones current occurrence and sets appropriate properties.
+         * The original recurring item is moved to next occurrence.
+         *
+         *@param bool $markComplete true if existing occurrence has to be mark complete else false
+         */
+        public function regenerateTask($markComplete) {
+            // Get all properties
+            $taskItemProps = mapi_getprops($this->message);
+
+            if (isset($this->action["subject"])) {
+                $taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
+            }
+            if (isset($this->action["importance"])) {
+                $taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
+            }
+            if (isset($this->action["startdate"])) {
+                $taskItemProps[$this->proptags["startdate"]] = $this->action["startdate"];
+                $taskItemProps[$this->proptags["commonstart"]] = $this->action["startdate"];
+            }
+            if (isset($this->action["duedate"])) {
+                $taskItemProps[$this->proptags["duedate"]] = $this->action["duedate"];
+                $taskItemProps[$this->proptags["commonend"]] = $this->action["duedate"];
+            }
+
+            $folder = mapi_msgstore_openentry($this->store, $taskItemProps[PR_PARENT_ENTRYID]);
+            $newMessage = mapi_folder_createmessage($folder);
+
+            $taskItemProps[$this->proptags["status"]] = $markComplete ? olTaskComplete : olTaskNotStarted;
+            $taskItemProps[$this->proptags["complete"]] = $markComplete;
+            $taskItemProps[$this->proptags["percent_complete"]] = $markComplete ? 1 : 0;
+
+            // This occurrence has been marked as 'Complete' so disable reminder
+            if ($markComplete) {
+                $taskItemProps[$this->proptags["reset_reminder"]] = false;
+                $taskItemProps[$this->proptags["reminder"]] = false;
+                $taskItemProps[$this->proptags["datecompleted"]] = $this->action["datecompleted"];
+
+                unset($this->action[$this->proptags['datecompleted']]);
+            }
+
+            // Recurrence ends for this item
+            $taskItemProps[$this->proptags["dead_occurrence"]] = true;
+            $taskItemProps[$this->proptags["task_f_creator"]] = true;
+
+            // OL props
+            $taskItemProps[$this->proptags["side_effects"]] = 1296;
+            $taskItemProps[$this->proptags["icon_index"]] = 1280;
+
+            // Copy recipients
+            $recipienttable = mapi_message_getrecipienttable($this->message);
+            $recipients = mapi_table_queryallrows($recipienttable, [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]);
+
+            $copy_to_recipientTable = mapi_message_getrecipienttable($newMessage);
+            $copy_to_recipientRows = mapi_table_queryallrows($copy_to_recipientTable, [PR_ROWID]);
+            foreach ($copy_to_recipientRows as $recipient) {
+                mapi_message_modifyrecipients($newMessage, MODRECIP_REMOVE, [$recipient]);
+            }
+            mapi_message_modifyrecipients($newMessage, MODRECIP_ADD, $recipients);
+
+            // Copy attachments
+            $attachmentTable = mapi_message_getattachmenttable($this->message);
+            if ($attachmentTable) {
+                $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
+
+                foreach ($attachments as $attach_props) {
+                    $attach_old = mapi_message_openattach($this->message, (int) $attach_props[PR_ATTACH_NUM]);
+                    $attach_newResourceMsg = mapi_message_createattach($newMessage);
+
+                    mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
+                    mapi_savechanges($attach_newResourceMsg);
+                }
+            }
+
+            mapi_setprops($newMessage, $taskItemProps);
+            mapi_savechanges($newMessage);
+
+            // Update body of original message
+            $msgbody = mapi_openproperty($this->message, PR_BODY);
+            $msgbody = trim($msgbody, "\0");
+            $separator = "------------\r\n";
+
+            if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
+                $msgbody = $separator . $msgbody;
+                $stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+                mapi_stream_setsize($stream, strlen($msgbody));
+                mapi_stream_write($stream, $msgbody);
+                mapi_stream_commit($stream);
+            }
+
+            // We need these properties to notify client
+            return mapi_getprops($newMessage, [PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID]);
+        }
+
+        /**
+         * processOccurrenceItem, adds an item to a list of occurrences, but only if the
+         * resulting occurrence starts or ends in the interval <$start, $end>.
+         *
+         * @param array $items    reference to the array to be added to
+         * @param date  $start    start of timeframe in GMT TIME
+         * @param date  $end      end of timeframe in GMT TIME
+         * @param date  $basedate (hour/sec/min assumed to be 00:00:00) in LOCAL TIME OF THE OCCURRENCE
+         * @param mixed $now
+         */
+        public function processOccurrenceItem(&$items, $start, $end, $now) {
+            if ($now <= $start) {
+                return;
+            }
+            $newItem = [];
+            $newItem[$this->proptags['startdate']] = $now;
+
+            // If startdate and enddate are set on task, then slide enddate according to duration
+            if (isset($this->messageprops[$this->proptags["startdate"]], $this->messageprops[$this->proptags["duedate"]])) {
+                $newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']] + ($this->messageprops[$this->proptags["duedate"]] - $this->messageprops[$this->proptags["startdate"]]);
+            }
+            else {
+                $newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']];
+            }
+            $items[] = $newItem;
+        }
+
+        /**
+         * Function which marks existing occurrence to 'Complete'.
+         *
+         *@param array $recur array action from client
+         *
+         *@return array of properties of regenerated task else false
+         */
+        public function markOccurrenceComplete(&$recur) {
+            // Fix timezone object
+            $this->tz = false;
+            $this->action = &$recur;
+            $dead_occurrence = isset($this->messageprops[$this->proptags['dead_occurrence']]) ? $this->messageprops[$this->proptags['dead_occurrence']] : false;
+
+            if (!$dead_occurrence) {
+                return $this->moveToNextOccurrence();
+            }
+
+            return false;
+        }
+
+        /**
+         * Function which sets reminder on recurring task after existing occurrence has been deleted or marked complete.
+         *
+         *@param array $nextOccurrence properties of next occurrence
+         */
+        public function setReminder($nextOccurrence) {
+            $props = [];
+            if ($nextOccurrence) {
+                // Check if reminder is reset. Default is 'false'
+                $reset_reminder = isset($this->messageprops[$this->proptags['reset_reminder']]) ? $this->messageprops[$this->proptags['reset_reminder']] : false;
+                $reminder = $this->messageprops[$this->proptags['reminder']];
+
+                // Either reminder was already set OR reminder was set but was dismissed bty user
+                if ($reminder || $reset_reminder) {
+                    // Reminder can be set at any time either before or after the duedate, so get duration between the reminder time and duedate
+                    $reminder_time = isset($this->messageprops[$this->proptags['reminder_time']]) ? $this->messageprops[$this->proptags['reminder_time']] : 0;
+                    $reminder_difference = isset($this->messageprops[$this->proptags['duedate']]) ? $this->messageprops[$this->proptags['duedate']] : 0;
+                    $reminder_difference = $reminder_difference - $reminder_time;
+
+                    // Apply duration to next calculated duedate
+                    $next_reminder_time = $nextOccurrence[$this->proptags['duedate']] - $reminder_difference;
+
+                    $props[$this->proptags['reminder_time']] = $next_reminder_time;
+                    $props[$this->proptags['flagdueby']] = $next_reminder_time;
+                    $this->action['reminder'] = $props[$this->proptags['reminder']] = true;
+                }
+            }
+            else {
+                // Didn't get next occurrence, probably this is the last occurrence
+                $props[$this->proptags['reminder']] = false;
+                $props[$this->proptags['reset_reminder']] = false;
+            }
+
+            if (!empty($props)) {
+                mapi_setprops($this->message, $props);
+            }
+        }
+
+        /**
+         * Function which recurring task to next occurrence.
+         * It simply doesn't regenerate task.
+         *
+         * @param array $action
+         */
+        public function deleteOccurrence($action) {
+            $this->tz = false;
+            $this->action = $action;
+            $result = $this->moveToNextOccurrence();
+
+            mapi_savechanges($this->message);
+
+            return $result;
+        }
+    }

Braces +3 added lines, -6 removed lines

@@ -170,8 +170,7 @@ 
 					}
 
 					$props[$this->proptags["dead_occurrence"]] = false;
-				}
-				else {
+				} else {
 					if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
 						return false;
 					}
@@ -330,8 +329,7 @@ 
 			// If startdate and enddate are set on task, then slide enddate according to duration
 			if (isset($this->messageprops[$this->proptags["startdate"]], $this->messageprops[$this->proptags["duedate"]])) {
 				$newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']] + ($this->messageprops[$this->proptags["duedate"]] - $this->messageprops[$this->proptags["startdate"]]);
-			}
-			else {
+			} else {
 				$newItem[$this->proptags['duedate']] = $newItem[$this->proptags['startdate']];
 			}
 			$items[] = $newItem;
@@ -383,8 +381,7 @@ 
 					$props[$this->proptags['flagdueby']] = $next_reminder_time;
 					$this->action['reminder'] = $props[$this->proptags['reminder']] = true;
 				}
-			}
-			else {
+			} else {
 				// Didn't get next occurrence, probably this is the last occurrence
 				$props[$this->proptags['reminder']] = false;
 				$props[$this->proptags['reset_reminder']] = false;

mapi/class.recurrence.php

Indentation +1232 added lines, -1232 removed lines

@@ -5,14 +5,14 @@ 
  * SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
  */
 
-	/**
-	 * Recurrence.
-	 *
-	 * @author Steve Hardy <steve@zarafa.com>
-	 * @author Michel de Ron <michel@zarafa.com>
-	 */
-	class Recurrence extends BaseRecurrence {
-		/*
+    /**
+     * Recurrence.
+     *
+     * @author Steve Hardy <steve@zarafa.com>
+     * @author Michel de Ron <michel@zarafa.com>
+     */
+    class Recurrence extends BaseRecurrence {
+        /*
 		 * ABOUT TIMEZONES
 		 *
 		 * Timezones are rather complicated here so here are some rules to think about:
@@ -24,1241 +24,1241 @@ 
 		 *   always in LOCAL time.
 		 */
 
-		// All properties for a recipient that are interesting
-		public $recipprops = [
-			PR_ENTRYID,
-			PR_SEARCH_KEY,
-			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_DISPLAY_TYPE_EX,
-			PR_RECIPIENT_TRACKSTATUS,
-			PR_RECIPIENT_TRACKSTATUS_TIME,
-			PR_RECIPIENT_FLAGS,
-			PR_ROWID,
-		];
-
-		/**
-		 * @param resource $store   MAPI Message Store Object
-		 * @param resource $message the MAPI (appointment) message
-		 */
-		public function __construct($store, $message) {
-			$properties = [];
-			$properties["entryid"] = PR_ENTRYID;
-			$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-			$properties["message_class"] = PR_MESSAGE_CLASS;
-			$properties["icon_index"] = PR_ICON_INDEX;
-			$properties["subject"] = PR_SUBJECT;
-			$properties["display_to"] = PR_DISPLAY_TO;
-			$properties["importance"] = PR_IMPORTANCE;
-			$properties["sensitivity"] = PR_SENSITIVITY;
-			$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
-			$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
-			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
-			$properties["recurring_data"] = "PT_BINARY:PSETID_Appointment:0x8216";
-			$properties["busystatus"] = "PT_LONG:PSETID_Appointment:0x8205";
-			$properties["label"] = "PT_LONG:PSETID_Appointment:0x8214";
-			$properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:0x8215";
-			$properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
-			$properties["meeting"] = "PT_LONG:PSETID_Appointment:0x8217";
-			$properties["startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";
-			$properties["enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236";
-			$properties["recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
-			$properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208";
-			$properties["duration"] = "PT_LONG:PSETID_Appointment:0x8213";
-			$properties["responsestatus"] = "PT_LONG:PSETID_Appointment:0x8218";
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
-			$properties["recurrencetype"] = "PT_LONG:PSETID_Appointment:0x8231";
-			$properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
-			$properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
-			$properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
-			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
-			$properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
-			$properties["basedate"] = "PT_SYSTIME:PSETID_Appointment:0x8228";
-			$properties["timezone_data"] = "PT_BINARY:PSETID_Appointment:0x8233";
-			$properties["timezone"] = "PT_STRING8:PSETID_Appointment:0x8234";
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560";
-			$properties["side_effects"] = "PT_LONG:PSETID_Common:0x8510";
-			$properties["hideattachments"] = "PT_BOOLEAN:PSETID_Common:0x8514";
-
-			$this->proptags = getPropIdsFromStrings($store, $properties);
-
-			parent::__construct($store, $message);
-		}
-
-		/**
-		 * Create an exception.
-		 *
-		 * @param array        $exception_props  the exception properties (same properties as normal recurring items)
-		 * @param date         $base_date        the base date of the exception (LOCAL time of non-exception occurrence)
-		 * @param bool         $delete           true - delete occurrence, false - create new exception or modify existing
-		 * @param array        $exception_recips true - delete occurrence, false - create new exception or modify existing
-		 * @param mapi_message $copy_attach_from mapi message from which attachments should be copied
-		 */
-		public function createException($exception_props, $base_date, $delete = false, $exception_recips = [], $copy_attach_from = false) {
-			$baseday = $this->dayStartOf($base_date);
-			$basetime = $baseday + $this->recur["startocc"] * 60;
-
-			// Remove any pre-existing exception on this base date
-			if ($this->isException($baseday)) {
-				$this->deleteException($baseday);
-			} // note that deleting an exception is different from creating a deleted exception (deleting an occurrence).
-
-			if (!$delete) {
-				if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
-					return false;
-				}
-				// Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
-				foreach (["subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus"] as $propname) {
-					if (isset($this->messageprops[$this->proptags[$propname]])) {
-						$props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
-					}
-				}
-
-				$props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
-				unset($exception_props[PR_MESSAGE_CLASS], $exception_props[PR_ICON_INDEX]);
-
-				$props = $exception_props + $props;
-
-				// Basedate in the exception attachment is the GMT time at which the original occurrence would have been
-				$props[$this->proptags["basedate"]] = $this->toGMT($this->tz, $basetime);
-
-				if (!isset($exception_props[$this->proptags["startdate"]])) {
-					$props[$this->proptags["startdate"]] = $this->getOccurrenceStart($base_date);
-				}
-				if (!isset($exception_props[$this->proptags["duedate"]])) {
-					$props[$this->proptags["duedate"]] = $this->getOccurrenceEnd($base_date);
-				}
-
-				// synchronize commonstart/commonend with startdate/duedate
-				if (isset($props[$this->proptags["startdate"]])) {
-					$props[$this->proptags["commonstart"]] = $props[$this->proptags["startdate"]];
-				}
-				if (isset($props[$this->proptags["duedate"]])) {
-					$props[$this->proptags["commonend"]] = $props[$this->proptags["duedate"]];
-				}
-
-				// Save the data into an attachment
-				$this->createExceptionAttachment($props, $exception_recips, $copy_attach_from);
-
-				$changed_item = [];
-
-				$changed_item["basedate"] = $baseday;
-				$changed_item["start"] = $this->fromGMT($this->tz, $props[$this->proptags["startdate"]]);
-				$changed_item["end"] = $this->fromGMT($this->tz, $props[$this->proptags["duedate"]]);
-
-				if (array_key_exists($this->proptags["subject"], $exception_props)) {
-					$changed_item["subject"] = $exception_props[$this->proptags["subject"]];
-				}
-				if (array_key_exists($this->proptags["location"], $exception_props)) {
-					$changed_item["location"] = $exception_props[$this->proptags["location"]];
-				}
-				if (array_key_exists($this->proptags["label"], $exception_props)) {
-					$changed_item["label"] = $exception_props[$this->proptags["label"]];
-				}
-				if (array_key_exists($this->proptags["reminder"], $exception_props)) {
-					$changed_item["reminder_set"] = $exception_props[$this->proptags["reminder"]];
-				}
-				if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
-					$changed_item["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
-				}
-				if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
-					$changed_item["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
-				}
-				if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
-					$changed_item["busystatus"] = $exception_props[$this->proptags["busystatus"]];
-				}
-
-				// Add the changed occurrence to the list
-				array_push($this->recur["changed_occurrences"], $changed_item);
-			}
-			else {
-				// Delete the occurrence by placing it in the deleted occurrences list
-				array_push($this->recur["deleted_occurrences"], $baseday);
-			}
-
-			// Turn on hideattachments, because the attachments in this item are the exceptions
-			mapi_setprops($this->message, [$this->proptags["hideattachments"] => true]);
-
-			// Save recurrence data to message
-			$this->saveRecurrence();
-
-			return true;
-		}
-
-		/**
-		 * Modifies an existing exception, but only updates the given properties
-		 * NOTE: You can't remove properties from an exception, only add new ones.
-		 *
-		 * @param mixed $exception_props
-		 * @param mixed $base_date
-		 * @param mixed $exception_recips
-		 * @param mixed $copy_attach_from
-		 */
-		public function modifyException($exception_props, $base_date, $exception_recips = [], $copy_attach_from = false) {
-			if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
-				return false;
-			}
-
-			$baseday = $this->dayStartOf($base_date);
-			$basetime = $baseday + $this->recur["startocc"] * 60;
-			$extomodify = false;
-
-			for ($i = 0, $len = count($this->recur["changed_occurrences"]); $i < $len; ++$i) {
-				if ($this->isSameDay($this->recur["changed_occurrences"][$i]["basedate"], $baseday)) {
-					$extomodify = &$this->recur["changed_occurrences"][$i];
-				}
-			}
-
-			if (!$extomodify) {
-				return false;
-			}
-
-			// remove basedate property as we want to preserve the old value
-			// client will send basedate with time part as zero, so discard that value
-			unset($exception_props[$this->proptags["basedate"]]);
-
-			if (array_key_exists($this->proptags["startdate"], $exception_props)) {
-				$extomodify["start"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
-			}
-			if (array_key_exists($this->proptags["duedate"], $exception_props)) {
-				$extomodify["end"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
-			}
-			if (array_key_exists($this->proptags["subject"], $exception_props)) {
-				$extomodify["subject"] = $exception_props[$this->proptags["subject"]];
-			}
-			if (array_key_exists($this->proptags["location"], $exception_props)) {
-				$extomodify["location"] = $exception_props[$this->proptags["location"]];
-			}
-			if (array_key_exists($this->proptags["label"], $exception_props)) {
-				$extomodify["label"] = $exception_props[$this->proptags["label"]];
-			}
-			if (array_key_exists($this->proptags["reminder"], $exception_props)) {
-				$extomodify["reminder_set"] = $exception_props[$this->proptags["reminder"]];
-			}
-			if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
-				$extomodify["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
-			}
-			if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
-				$extomodify["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
-			}
-			if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
-				$extomodify["busystatus"] = $exception_props[$this->proptags["busystatus"]];
-			}
-
-			$exception_props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
-
-			// synchronize commonstart/commonend with startdate/duedate
-			if (isset($exception_props[$this->proptags["startdate"]])) {
-				$exception_props[$this->proptags["commonstart"]] = $exception_props[$this->proptags["startdate"]];
-			}
-			if (isset($exception_props[$this->proptags["duedate"]])) {
-				$exception_props[$this->proptags["commonend"]] = $exception_props[$this->proptags["duedate"]];
-			}
-
-			$attach = $this->getExceptionAttachment($baseday);
-			if (!$attach) {
-				if ($copy_attach_from) {
-					$this->deleteExceptionAttachment($base_date);
-					$this->createException($exception_props, $base_date, false, $exception_recips, $copy_attach_from);
-				}
-				else {
-					$this->createExceptionAttachment($exception_props, $exception_recips, $copy_attach_from);
-				}
-			}
-			else {
-				$message = mapi_attach_openobj($attach, MAPI_MODIFY);
-
-				// Set exception properties on embedded message and save
-				mapi_setprops($message, $exception_props);
-				$this->setExceptionRecipients($message, $exception_recips, false);
-				mapi_savechanges($message);
-
-				// If a new start or duedate is provided, we update the properties 'PR_EXCEPTION_STARTTIME' and 'PR_EXCEPTION_ENDTIME'
-				// on the attachment which holds the embedded msg and save everything.
-				$props = [];
-				if (isset($exception_props[$this->proptags["startdate"]])) {
-					$props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
-				}
-				if (isset($exception_props[$this->proptags["duedate"]])) {
-					$props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
-				}
-				if (!empty($props)) {
-					mapi_setprops($attach, $props);
-				}
-				mapi_savechanges($attach);
-			}
-
-			// Save recurrence data to message
-			$this->saveRecurrence();
-
-			return true;
-		}
-
-		// Checks to see if the following is true:
-		// 1) The exception to be created doesn't create two exceptions starting on one day (however, they can END on the same day by modifying duration)
-		// 2) The exception to be created doesn't 'jump' over another occurrence (which may be an exception itself!)
-		//
-		// Both $basedate and $start are in LOCAL time
-		public function isValidExceptionDate($basedate, $start) {
-			// The way we do this is to look at the days that we're 'moving' the item in the exception. Each
-			// of these days may only contain the item that we're modifying. Any other item violates the rules.
-
-			if ($this->isException($basedate)) {
-				// If we're modifying an exception, we want to look at the days that we're 'moving' compared to where
-				// the exception used to be.
-				$oldexception = $this->getChangeException($basedate);
-				$prevday = $this->dayStartOf($oldexception["start"]);
-			}
-			else {
-				// If its a new exception, we want to look at the original placement of this item.
-				$prevday = $basedate;
-			}
-
-			$startday = $this->dayStartOf($start);
-
-			// Get all the occurrences on the days between the basedate (may be reversed)
-			if ($prevday < $startday) {
-				$items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
-			}
-			else {
-				$items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
-			}
-
-			// There should now be exactly one item, namely the item that we are modifying. If there are any other items in the range,
-			// then we abort the change, since one of the rules has been violated.
-			return count($items) == 1;
-		}
-
-		/**
-		 * Check to see if the exception proposed at a certain basedate is allowed concerning reminder times:.
-		 *
-		 * Both must be true:
-		 * - reminder time of this item is not before the starttime of the previous recurring item
-		 * - reminder time of the next item is not before the starttime of this item
-		 *
-		 * @param date   $basedate        the base date of the exception (LOCAL time of non-exception occurrence)
-		 * @param string $reminderminutes reminder minutes which is set of the item
-		 * @param date   $startdate       the startdate of the selected item
-		 * @returns boolean if the reminder minutes value valid (FALSE if either of the rules above are FALSE)
-		 */
-		public function isValidReminderTime($basedate, $reminderminutes, $startdate) {
-			$isreminderrangeset = false;
-
-			// get all occurrence items before the seleceted items occurrence starttime
-			$occitems = $this->getItems($this->messageprops[$this->proptags["startdate"]], $this->toGMT($this->tz, $basedate));
-
-			if (!empty($occitems)) {
-				// as occitems array is sorted in ascending order of startdate, to get the previous occurrence we take the last items in occitems .
-				$previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
-
-				// if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
-				if ($startdate - ($reminderminutes * 60) <= $previousitem_startdate) {
-					return false;
-				}
-			}
-
-			// Get the endtime of the current occurrence and find the next two occurrences (including the current occurrence)
-			$currentOcc = $this->getItems($this->toGMT($this->tz, $basedate), 0x7FF00000, 2, true);
-
-			// If there are another two occurrences, then the first is the current occurrence, and the one after that
-			// is the next occurrence.
-			if (count($currentOcc) > 1) {
-				$next = $currentOcc[1];
-				// Get reminder time of the next occurrence.
-				$nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
-				// If the reminder time of the next item is before the start of this item, then that's not allowed
-				if ($nextOccReminderTime <= $startdate) {
-					return false;
-				}
-			}
-
-			// All was ok
-			return true;
-		}
-
-		public function setRecurrence($tz, $recur) {
-			// only reset timezone if specified
-			if ($tz) {
-				$this->tz = $tz;
-			}
-
-			$this->recur = $recur;
-
-			if (!isset($this->recur["changed_occurrences"])) {
-				$this->recur["changed_occurrences"] = [];
-			}
-
-			if (!isset($this->recur["deleted_occurrences"])) {
-				$this->recur["deleted_occurrences"] = [];
-			}
-
-			$this->deleteAttachments();
-			$this->saveRecurrence();
-
-			// if client has not set the recurring_pattern then we should generate it and save it
-			$messageProps = mapi_getprops($this->message, [$this->proptags["recurring_pattern"]]);
-			if (empty($messageProps[$this->proptags["recurring_pattern"]])) {
-				$this->saveRecurrencePattern();
-			}
-		}
-
-		// Returns the start or end time of the occurrence on the given base date.
-		// This assumes that the basedate you supply is in LOCAL time
-		public function getOccurrenceStart($basedate) {
-			$daystart = $this->dayStartOf($basedate);
-
-			return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60);
-		}
-
-		public function getOccurrenceEnd($basedate) {
-			$daystart = $this->dayStartOf($basedate);
-
-			return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60);
-		}
-
-		// Backwards compatible code
-		public function getOccurenceStart($basedate) {
-			return $this->getOccurrenceStart($basedate);
-		}
-
-		public function getOccurenceEnd($basedate) {
-			return $this->getOccurrenceEnd($basedate);
-		}
-
-		/**
-		 * This function returns the next remindertime starting from $timestamp
-		 * When no next reminder exists, false is returned.
-		 *
-		 * Note: Before saving this new reminder time (when snoozing), you must check for
-		 *       yourself if this reminder time is earlier than your snooze time, else
-		 *       use your snooze time and not this reminder time.
-		 *
-		 * @param mixed $timestamp
-		 */
-		public function getNextReminderTime($timestamp) {
-			/**
-			 * Get next item from now until forever, but max 1 item with reminder set
-			 * Note 0x7ff00000 instead of 0x7fffffff because of possible overflow failures when converting to GMT....
-			 * Here for getting next 10 occurrences assuming that next here we will be able to find
-			 * nextreminder occurrence in 10 occureneces.
-			 */
-			$items = $this->getItems($timestamp, 0x7FF00000, 10, true);
-
-			// Initially setting nextreminder to false so when no next reminder exists, false is returned.
-			$nextreminder = false;
-			/*
+        // All properties for a recipient that are interesting
+        public $recipprops = [
+            PR_ENTRYID,
+            PR_SEARCH_KEY,
+            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_DISPLAY_TYPE_EX,
+            PR_RECIPIENT_TRACKSTATUS,
+            PR_RECIPIENT_TRACKSTATUS_TIME,
+            PR_RECIPIENT_FLAGS,
+            PR_ROWID,
+        ];
+
+        /**
+         * @param resource $store   MAPI Message Store Object
+         * @param resource $message the MAPI (appointment) message
+         */
+        public function __construct($store, $message) {
+            $properties = [];
+            $properties["entryid"] = PR_ENTRYID;
+            $properties["parent_entryid"] = PR_PARENT_ENTRYID;
+            $properties["message_class"] = PR_MESSAGE_CLASS;
+            $properties["icon_index"] = PR_ICON_INDEX;
+            $properties["subject"] = PR_SUBJECT;
+            $properties["display_to"] = PR_DISPLAY_TO;
+            $properties["importance"] = PR_IMPORTANCE;
+            $properties["sensitivity"] = PR_SENSITIVITY;
+            $properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:0x820d";
+            $properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:0x820e";
+            $properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:0x8223";
+            $properties["recurring_data"] = "PT_BINARY:PSETID_Appointment:0x8216";
+            $properties["busystatus"] = "PT_LONG:PSETID_Appointment:0x8205";
+            $properties["label"] = "PT_LONG:PSETID_Appointment:0x8214";
+            $properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:0x8215";
+            $properties["private"] = "PT_BOOLEAN:PSETID_Common:0x8506";
+            $properties["meeting"] = "PT_LONG:PSETID_Appointment:0x8217";
+            $properties["startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8235";
+            $properties["enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:0x8236";
+            $properties["recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
+            $properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208";
+            $properties["duration"] = "PT_LONG:PSETID_Appointment:0x8213";
+            $properties["responsestatus"] = "PT_LONG:PSETID_Appointment:0x8218";
+            $properties["reminder"] = "PT_BOOLEAN:PSETID_Common:0x8503";
+            $properties["reminder_minutes"] = "PT_LONG:PSETID_Common:0x8501";
+            $properties["recurrencetype"] = "PT_LONG:PSETID_Appointment:0x8231";
+            $properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853a";
+            $properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586";
+            $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
+            $properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502";
+            $properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
+            $properties["commonend"] = "PT_SYSTIME:PSETID_Common:0x8517";
+            $properties["basedate"] = "PT_SYSTIME:PSETID_Appointment:0x8228";
+            $properties["timezone_data"] = "PT_BINARY:PSETID_Appointment:0x8233";
+            $properties["timezone"] = "PT_STRING8:PSETID_Appointment:0x8234";
+            $properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:0x8560";
+            $properties["side_effects"] = "PT_LONG:PSETID_Common:0x8510";
+            $properties["hideattachments"] = "PT_BOOLEAN:PSETID_Common:0x8514";
+
+            $this->proptags = getPropIdsFromStrings($store, $properties);
+
+            parent::__construct($store, $message);
+        }
+
+        /**
+         * Create an exception.
+         *
+         * @param array        $exception_props  the exception properties (same properties as normal recurring items)
+         * @param date         $base_date        the base date of the exception (LOCAL time of non-exception occurrence)
+         * @param bool         $delete           true - delete occurrence, false - create new exception or modify existing
+         * @param array        $exception_recips true - delete occurrence, false - create new exception or modify existing
+         * @param mapi_message $copy_attach_from mapi message from which attachments should be copied
+         */
+        public function createException($exception_props, $base_date, $delete = false, $exception_recips = [], $copy_attach_from = false) {
+            $baseday = $this->dayStartOf($base_date);
+            $basetime = $baseday + $this->recur["startocc"] * 60;
+
+            // Remove any pre-existing exception on this base date
+            if ($this->isException($baseday)) {
+                $this->deleteException($baseday);
+            } // note that deleting an exception is different from creating a deleted exception (deleting an occurrence).
+
+            if (!$delete) {
+                if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+                    return false;
+                }
+                // Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
+                foreach (["subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus"] as $propname) {
+                    if (isset($this->messageprops[$this->proptags[$propname]])) {
+                        $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
+                    }
+                }
+
+                $props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
+                unset($exception_props[PR_MESSAGE_CLASS], $exception_props[PR_ICON_INDEX]);
+
+                $props = $exception_props + $props;
+
+                // Basedate in the exception attachment is the GMT time at which the original occurrence would have been
+                $props[$this->proptags["basedate"]] = $this->toGMT($this->tz, $basetime);
+
+                if (!isset($exception_props[$this->proptags["startdate"]])) {
+                    $props[$this->proptags["startdate"]] = $this->getOccurrenceStart($base_date);
+                }
+                if (!isset($exception_props[$this->proptags["duedate"]])) {
+                    $props[$this->proptags["duedate"]] = $this->getOccurrenceEnd($base_date);
+                }
+
+                // synchronize commonstart/commonend with startdate/duedate
+                if (isset($props[$this->proptags["startdate"]])) {
+                    $props[$this->proptags["commonstart"]] = $props[$this->proptags["startdate"]];
+                }
+                if (isset($props[$this->proptags["duedate"]])) {
+                    $props[$this->proptags["commonend"]] = $props[$this->proptags["duedate"]];
+                }
+
+                // Save the data into an attachment
+                $this->createExceptionAttachment($props, $exception_recips, $copy_attach_from);
+
+                $changed_item = [];
+
+                $changed_item["basedate"] = $baseday;
+                $changed_item["start"] = $this->fromGMT($this->tz, $props[$this->proptags["startdate"]]);
+                $changed_item["end"] = $this->fromGMT($this->tz, $props[$this->proptags["duedate"]]);
+
+                if (array_key_exists($this->proptags["subject"], $exception_props)) {
+                    $changed_item["subject"] = $exception_props[$this->proptags["subject"]];
+                }
+                if (array_key_exists($this->proptags["location"], $exception_props)) {
+                    $changed_item["location"] = $exception_props[$this->proptags["location"]];
+                }
+                if (array_key_exists($this->proptags["label"], $exception_props)) {
+                    $changed_item["label"] = $exception_props[$this->proptags["label"]];
+                }
+                if (array_key_exists($this->proptags["reminder"], $exception_props)) {
+                    $changed_item["reminder_set"] = $exception_props[$this->proptags["reminder"]];
+                }
+                if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+                    $changed_item["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
+                }
+                if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+                    $changed_item["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
+                }
+                if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
+                    $changed_item["busystatus"] = $exception_props[$this->proptags["busystatus"]];
+                }
+
+                // Add the changed occurrence to the list
+                array_push($this->recur["changed_occurrences"], $changed_item);
+            }
+            else {
+                // Delete the occurrence by placing it in the deleted occurrences list
+                array_push($this->recur["deleted_occurrences"], $baseday);
+            }
+
+            // Turn on hideattachments, because the attachments in this item are the exceptions
+            mapi_setprops($this->message, [$this->proptags["hideattachments"] => true]);
+
+            // Save recurrence data to message
+            $this->saveRecurrence();
+
+            return true;
+        }
+
+        /**
+         * Modifies an existing exception, but only updates the given properties
+         * NOTE: You can't remove properties from an exception, only add new ones.
+         *
+         * @param mixed $exception_props
+         * @param mixed $base_date
+         * @param mixed $exception_recips
+         * @param mixed $copy_attach_from
+         */
+        public function modifyException($exception_props, $base_date, $exception_recips = [], $copy_attach_from = false) {
+            if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+                return false;
+            }
+
+            $baseday = $this->dayStartOf($base_date);
+            $basetime = $baseday + $this->recur["startocc"] * 60;
+            $extomodify = false;
+
+            for ($i = 0, $len = count($this->recur["changed_occurrences"]); $i < $len; ++$i) {
+                if ($this->isSameDay($this->recur["changed_occurrences"][$i]["basedate"], $baseday)) {
+                    $extomodify = &$this->recur["changed_occurrences"][$i];
+                }
+            }
+
+            if (!$extomodify) {
+                return false;
+            }
+
+            // remove basedate property as we want to preserve the old value
+            // client will send basedate with time part as zero, so discard that value
+            unset($exception_props[$this->proptags["basedate"]]);
+
+            if (array_key_exists($this->proptags["startdate"], $exception_props)) {
+                $extomodify["start"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
+            }
+            if (array_key_exists($this->proptags["duedate"], $exception_props)) {
+                $extomodify["end"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
+            }
+            if (array_key_exists($this->proptags["subject"], $exception_props)) {
+                $extomodify["subject"] = $exception_props[$this->proptags["subject"]];
+            }
+            if (array_key_exists($this->proptags["location"], $exception_props)) {
+                $extomodify["location"] = $exception_props[$this->proptags["location"]];
+            }
+            if (array_key_exists($this->proptags["label"], $exception_props)) {
+                $extomodify["label"] = $exception_props[$this->proptags["label"]];
+            }
+            if (array_key_exists($this->proptags["reminder"], $exception_props)) {
+                $extomodify["reminder_set"] = $exception_props[$this->proptags["reminder"]];
+            }
+            if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+                $extomodify["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
+            }
+            if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+                $extomodify["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
+            }
+            if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
+                $extomodify["busystatus"] = $exception_props[$this->proptags["busystatus"]];
+            }
+
+            $exception_props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
+
+            // synchronize commonstart/commonend with startdate/duedate
+            if (isset($exception_props[$this->proptags["startdate"]])) {
+                $exception_props[$this->proptags["commonstart"]] = $exception_props[$this->proptags["startdate"]];
+            }
+            if (isset($exception_props[$this->proptags["duedate"]])) {
+                $exception_props[$this->proptags["commonend"]] = $exception_props[$this->proptags["duedate"]];
+            }
+
+            $attach = $this->getExceptionAttachment($baseday);
+            if (!$attach) {
+                if ($copy_attach_from) {
+                    $this->deleteExceptionAttachment($base_date);
+                    $this->createException($exception_props, $base_date, false, $exception_recips, $copy_attach_from);
+                }
+                else {
+                    $this->createExceptionAttachment($exception_props, $exception_recips, $copy_attach_from);
+                }
+            }
+            else {
+                $message = mapi_attach_openobj($attach, MAPI_MODIFY);
+
+                // Set exception properties on embedded message and save
+                mapi_setprops($message, $exception_props);
+                $this->setExceptionRecipients($message, $exception_recips, false);
+                mapi_savechanges($message);
+
+                // If a new start or duedate is provided, we update the properties 'PR_EXCEPTION_STARTTIME' and 'PR_EXCEPTION_ENDTIME'
+                // on the attachment which holds the embedded msg and save everything.
+                $props = [];
+                if (isset($exception_props[$this->proptags["startdate"]])) {
+                    $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
+                }
+                if (isset($exception_props[$this->proptags["duedate"]])) {
+                    $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
+                }
+                if (!empty($props)) {
+                    mapi_setprops($attach, $props);
+                }
+                mapi_savechanges($attach);
+            }
+
+            // Save recurrence data to message
+            $this->saveRecurrence();
+
+            return true;
+        }
+
+        // Checks to see if the following is true:
+        // 1) The exception to be created doesn't create two exceptions starting on one day (however, they can END on the same day by modifying duration)
+        // 2) The exception to be created doesn't 'jump' over another occurrence (which may be an exception itself!)
+        //
+        // Both $basedate and $start are in LOCAL time
+        public function isValidExceptionDate($basedate, $start) {
+            // The way we do this is to look at the days that we're 'moving' the item in the exception. Each
+            // of these days may only contain the item that we're modifying. Any other item violates the rules.
+
+            if ($this->isException($basedate)) {
+                // If we're modifying an exception, we want to look at the days that we're 'moving' compared to where
+                // the exception used to be.
+                $oldexception = $this->getChangeException($basedate);
+                $prevday = $this->dayStartOf($oldexception["start"]);
+            }
+            else {
+                // If its a new exception, we want to look at the original placement of this item.
+                $prevday = $basedate;
+            }
+
+            $startday = $this->dayStartOf($start);
+
+            // Get all the occurrences on the days between the basedate (may be reversed)
+            if ($prevday < $startday) {
+                $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
+            }
+            else {
+                $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
+            }
+
+            // There should now be exactly one item, namely the item that we are modifying. If there are any other items in the range,
+            // then we abort the change, since one of the rules has been violated.
+            return count($items) == 1;
+        }
+
+        /**
+         * Check to see if the exception proposed at a certain basedate is allowed concerning reminder times:.
+         *
+         * Both must be true:
+         * - reminder time of this item is not before the starttime of the previous recurring item
+         * - reminder time of the next item is not before the starttime of this item
+         *
+         * @param date   $basedate        the base date of the exception (LOCAL time of non-exception occurrence)
+         * @param string $reminderminutes reminder minutes which is set of the item
+         * @param date   $startdate       the startdate of the selected item
+         * @returns boolean if the reminder minutes value valid (FALSE if either of the rules above are FALSE)
+         */
+        public function isValidReminderTime($basedate, $reminderminutes, $startdate) {
+            $isreminderrangeset = false;
+
+            // get all occurrence items before the seleceted items occurrence starttime
+            $occitems = $this->getItems($this->messageprops[$this->proptags["startdate"]], $this->toGMT($this->tz, $basedate));
+
+            if (!empty($occitems)) {
+                // as occitems array is sorted in ascending order of startdate, to get the previous occurrence we take the last items in occitems .
+                $previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
+
+                // if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
+                if ($startdate - ($reminderminutes * 60) <= $previousitem_startdate) {
+                    return false;
+                }
+            }
+
+            // Get the endtime of the current occurrence and find the next two occurrences (including the current occurrence)
+            $currentOcc = $this->getItems($this->toGMT($this->tz, $basedate), 0x7FF00000, 2, true);
+
+            // If there are another two occurrences, then the first is the current occurrence, and the one after that
+            // is the next occurrence.
+            if (count($currentOcc) > 1) {
+                $next = $currentOcc[1];
+                // Get reminder time of the next occurrence.
+                $nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
+                // If the reminder time of the next item is before the start of this item, then that's not allowed
+                if ($nextOccReminderTime <= $startdate) {
+                    return false;
+                }
+            }
+
+            // All was ok
+            return true;
+        }
+
+        public function setRecurrence($tz, $recur) {
+            // only reset timezone if specified
+            if ($tz) {
+                $this->tz = $tz;
+            }
+
+            $this->recur = $recur;
+
+            if (!isset($this->recur["changed_occurrences"])) {
+                $this->recur["changed_occurrences"] = [];
+            }
+
+            if (!isset($this->recur["deleted_occurrences"])) {
+                $this->recur["deleted_occurrences"] = [];
+            }
+
+            $this->deleteAttachments();
+            $this->saveRecurrence();
+
+            // if client has not set the recurring_pattern then we should generate it and save it
+            $messageProps = mapi_getprops($this->message, [$this->proptags["recurring_pattern"]]);
+            if (empty($messageProps[$this->proptags["recurring_pattern"]])) {
+                $this->saveRecurrencePattern();
+            }
+        }
+
+        // Returns the start or end time of the occurrence on the given base date.
+        // This assumes that the basedate you supply is in LOCAL time
+        public function getOccurrenceStart($basedate) {
+            $daystart = $this->dayStartOf($basedate);
+
+            return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60);
+        }
+
+        public function getOccurrenceEnd($basedate) {
+            $daystart = $this->dayStartOf($basedate);
+
+            return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60);
+        }
+
+        // Backwards compatible code
+        public function getOccurenceStart($basedate) {
+            return $this->getOccurrenceStart($basedate);
+        }
+
+        public function getOccurenceEnd($basedate) {
+            return $this->getOccurrenceEnd($basedate);
+        }
+
+        /**
+         * This function returns the next remindertime starting from $timestamp
+         * When no next reminder exists, false is returned.
+         *
+         * Note: Before saving this new reminder time (when snoozing), you must check for
+         *       yourself if this reminder time is earlier than your snooze time, else
+         *       use your snooze time and not this reminder time.
+         *
+         * @param mixed $timestamp
+         */
+        public function getNextReminderTime($timestamp) {
+            /**
+             * Get next item from now until forever, but max 1 item with reminder set
+             * Note 0x7ff00000 instead of 0x7fffffff because of possible overflow failures when converting to GMT....
+             * Here for getting next 10 occurrences assuming that next here we will be able to find
+             * nextreminder occurrence in 10 occureneces.
+             */
+            $items = $this->getItems($timestamp, 0x7FF00000, 10, true);
+
+            // Initially setting nextreminder to false so when no next reminder exists, false is returned.
+            $nextreminder = false;
+            /*
 			 * Loop through all reminder which we get in items variable
 			 * and check whether the remindertime is greater than timestamp.
 			 * On the first occurrence of greater nextreminder break the loop
 			 * and return the value to calling function.
 			 */
-			for ($i = 0, $len = count($items); $i < $len; ++$i) {
-				$item = $items[$i];
-				$tempnextreminder = $item[$this->proptags["startdate"]] - ($item[$this->proptags["reminder_minutes"]] * 60);
-
-				// If tempnextreminder is greater than timestamp then save it in nextreminder and break from the loop.
-				if ($tempnextreminder > $timestamp) {
-					$nextreminder = $tempnextreminder;
-
-					break;
-				}
-			}
-
-			return $nextreminder;
-		}
-
-		/**
-		 * Note: Static function, more like a utility function.
-		 *
-		 * Gets all the items (including recurring items) in the specified calendar in the given timeframe. Items are
-		 * included as a whole if they overlap the interval <$start, $end> (non-inclusive). This means that if the interval
-		 * is <08:00 - 14:00>, the item [6:00 - 8:00> is NOT included, nor is the item [14:00 - 16:00>. However, the item
-		 * [7:00 - 9:00> is included as a whole, and is NOT capped to [8:00 - 9:00>.
-		 *
-		 * @param $store resource The store in which the calendar resides
-		 * @param $calendar resource The calendar to get the items from
-		 * @param $viewstart int Timestamp of beginning of view window
-		 * @param $viewend int Timestamp of end of view window
-		 * @param $propsrequested array Array of properties to return
-		 * @param $rows array Array of rowdata as if they were returned directly from mapi_table_queryrows. Each recurring item is
-		 *                    expanded so that it seems that there are only many single appointments in the table.
-		 */
-		public static function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested) {
-			return getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested);
-		}
-
-		/*
+            for ($i = 0, $len = count($items); $i < $len; ++$i) {
+                $item = $items[$i];
+                $tempnextreminder = $item[$this->proptags["startdate"]] - ($item[$this->proptags["reminder_minutes"]] * 60);
+
+                // If tempnextreminder is greater than timestamp then save it in nextreminder and break from the loop.
+                if ($tempnextreminder > $timestamp) {
+                    $nextreminder = $tempnextreminder;
+
+                    break;
+                }
+            }
+
+            return $nextreminder;
+        }
+
+        /**
+         * Note: Static function, more like a utility function.
+         *
+         * Gets all the items (including recurring items) in the specified calendar in the given timeframe. Items are
+         * included as a whole if they overlap the interval <$start, $end> (non-inclusive). This means that if the interval
+         * is <08:00 - 14:00>, the item [6:00 - 8:00> is NOT included, nor is the item [14:00 - 16:00>. However, the item
+         * [7:00 - 9:00> is included as a whole, and is NOT capped to [8:00 - 9:00>.
+         *
+         * @param $store resource The store in which the calendar resides
+         * @param $calendar resource The calendar to get the items from
+         * @param $viewstart int Timestamp of beginning of view window
+         * @param $viewend int Timestamp of end of view window
+         * @param $propsrequested array Array of properties to return
+         * @param $rows array Array of rowdata as if they were returned directly from mapi_table_queryrows. Each recurring item is
+         *                    expanded so that it seems that there are only many single appointments in the table.
+         */
+        public static function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested) {
+            return getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested);
+        }
+
+        /*
 		 * CODE BELOW THIS LINE IS FOR INTERNAL USE ONLY
 		 *****************************************************************************************************************
 		 */
 
-		/**
-		 * Generates and stores recurrence pattern string to recurring_pattern property.
-		 */
-		public function saveRecurrencePattern() {
-			// Start formatting the properties in such a way we can apply
-			// them directly into the recurrence pattern.
-			$type = $this->recur['type'];
-			$everyn = $this->recur['everyn'];
-			$start = $this->recur['start'];
-			$end = $this->recur['end'];
-			$term = $this->recur['term'];
-			$numocc = isset($this->recur['numoccur']) ? $this->recur['numoccur'] : false;
-			$startocc = $this->recur['startocc'];
-			$endocc = $this->recur['endocc'];
-			$pattern = '';
-			$occSingleDayRank = false;
-			$occTimeRange = ($startocc != 0 && $endocc != 0);
-
-			switch ($type) {
-				// Daily
-				case 0x0A:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "workday");
-						$occSingleDayRank = true;
-					}
-					elseif ($everyn == (24 * 60)) {
-						$type = dgettext("kopano", "day");
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn /= (24 * 60);
-						$type = dgettext("kopano", "days");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Weekly
-				case 0x0B:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "week");
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = dgettext("kopano", "weeks");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Monthly
-				case 0x0C:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "month");
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = dgettext("kopano", "months");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Yearly
-				case 0x0D:
-					if ($everyn <= 12) {
-						$everyn = 1;
-						$type = dgettext("kopano", "year");
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn = $everyn / 12;
-						$type = dgettext("kopano", "years");
-						$occSingleDayRank = false;
-					}
-					break;
-			}
-
-			// get timings of the first occurrence
-			$firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
-			$firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
-
-			$start = gmdate(dgettext("kopano", "d-m-Y"), $firstoccstartdate);
-			$end = gmdate(dgettext("kopano", "d-m-Y"), $firstoccenddate);
-			$startocc = gmdate(dgettext("kopano", "G:i"), $firstoccstartdate);
-			$endocc = gmdate(dgettext("kopano", "G:i"), $firstoccenddate);
-
-			// Based on the properties, we need to generate the recurrence pattern string.
-			// This is obviously very easy since we can simply concatenate a bunch of strings,
-			// however this messes up translations for languages which order their words
-			// differently.
-			// To improve translation quality we create a series of default strings, in which
-			// we only have to fill in the correct variables. The base string is thus selected
-			// based on the available properties.
-			if ($term == 0x23) {
-				// Never ends
-				if ($occTimeRange) {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s from %s to %s."), $type, $start, $startocc, $endocc);
-					}
-					else {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s from %s to %s."), $everyn, $type, $start, $startocc, $endocc);
-					}
-				}
-				else {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s."), $type, $start);
-					}
-					else {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s."), $everyn, $type, $start);
-					}
-				}
-			}
-			elseif ($term == 0x22) {
-				// After a number of times
-				if ($occTimeRange) {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dngettext(
-							"kopano",
-							"Occurs every %s effective %s for %s occurrence from %s to %s.",
-							"Occurs every %s effective %s for %s occurrences from %s to %s.",
-							$numocc
-						), $type, $start, $numocc, $startocc, $endocc);
-					}
-					else {
-						$pattern = sprintf(dngettext(
-							"kopano",
-							"Occurs every %s %s effective %s for %s occurrence from %s to %s.",
-							"Occurs every %s %s effective %s for %s occurrences %s to %s.",
-							$numocc
-						), $everyn, $type, $start, $numocc, $startocc, $endocc);
-					}
-				}
-				else {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dngettext(
-							"kopano",
-							"Occurs every %s effective %s for %s occurrence.",
-							"Occurs every %s effective %s for %s occurrences.",
-							$numocc
-						), $type, $start, $numocc);
-					}
-					else {
-						$pattern = sprintf(dngettext(
-							"kopano",
-							"Occurs every %s %s effective %s for %s occurrence.",
-							"Occurs every %s %s effective %s for %s occurrences.",
-							$numocc
-						), $everyn, $type, $start, $numocc);
-					}
-				}
-			}
-			elseif ($term == 0x21) {
-				// After the given enddate
-				if ($occTimeRange) {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s from %s to %s."), $type, $start, $end, $startocc, $endocc);
-					}
-					else {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s from %s to %s."), $everyn, $type, $start, $end, $startocc, $endocc);
-					}
-				}
-				else {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s."), $type, $start, $end);
-					}
-					else {
-						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s."), $everyn, $type, $start, $end);
-					}
-				}
-			}
-			if (!empty($pattern)) {
-				mapi_setprops($this->message, [$this->proptags["recurring_pattern"] => $pattern]);
-			}
-		}
-
-		/*
+        /**
+         * Generates and stores recurrence pattern string to recurring_pattern property.
+         */
+        public function saveRecurrencePattern() {
+            // Start formatting the properties in such a way we can apply
+            // them directly into the recurrence pattern.
+            $type = $this->recur['type'];
+            $everyn = $this->recur['everyn'];
+            $start = $this->recur['start'];
+            $end = $this->recur['end'];
+            $term = $this->recur['term'];
+            $numocc = isset($this->recur['numoccur']) ? $this->recur['numoccur'] : false;
+            $startocc = $this->recur['startocc'];
+            $endocc = $this->recur['endocc'];
+            $pattern = '';
+            $occSingleDayRank = false;
+            $occTimeRange = ($startocc != 0 && $endocc != 0);
+
+            switch ($type) {
+                // Daily
+                case 0x0A:
+                    if ($everyn == 1) {
+                        $type = dgettext("kopano", "workday");
+                        $occSingleDayRank = true;
+                    }
+                    elseif ($everyn == (24 * 60)) {
+                        $type = dgettext("kopano", "day");
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $everyn /= (24 * 60);
+                        $type = dgettext("kopano", "days");
+                        $occSingleDayRank = false;
+                    }
+                    break;
+                // Weekly
+                case 0x0B:
+                    if ($everyn == 1) {
+                        $type = dgettext("kopano", "week");
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $type = dgettext("kopano", "weeks");
+                        $occSingleDayRank = false;
+                    }
+                    break;
+                // Monthly
+                case 0x0C:
+                    if ($everyn == 1) {
+                        $type = dgettext("kopano", "month");
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $type = dgettext("kopano", "months");
+                        $occSingleDayRank = false;
+                    }
+                    break;
+                // Yearly
+                case 0x0D:
+                    if ($everyn <= 12) {
+                        $everyn = 1;
+                        $type = dgettext("kopano", "year");
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $everyn = $everyn / 12;
+                        $type = dgettext("kopano", "years");
+                        $occSingleDayRank = false;
+                    }
+                    break;
+            }
+
+            // get timings of the first occurrence
+            $firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
+            $firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
+
+            $start = gmdate(dgettext("kopano", "d-m-Y"), $firstoccstartdate);
+            $end = gmdate(dgettext("kopano", "d-m-Y"), $firstoccenddate);
+            $startocc = gmdate(dgettext("kopano", "G:i"), $firstoccstartdate);
+            $endocc = gmdate(dgettext("kopano", "G:i"), $firstoccenddate);
+
+            // Based on the properties, we need to generate the recurrence pattern string.
+            // This is obviously very easy since we can simply concatenate a bunch of strings,
+            // however this messes up translations for languages which order their words
+            // differently.
+            // To improve translation quality we create a series of default strings, in which
+            // we only have to fill in the correct variables. The base string is thus selected
+            // based on the available properties.
+            if ($term == 0x23) {
+                // Never ends
+                if ($occTimeRange) {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s from %s to %s."), $type, $start, $startocc, $endocc);
+                    }
+                    else {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s from %s to %s."), $everyn, $type, $start, $startocc, $endocc);
+                    }
+                }
+                else {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s."), $type, $start);
+                    }
+                    else {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s."), $everyn, $type, $start);
+                    }
+                }
+            }
+            elseif ($term == 0x22) {
+                // After a number of times
+                if ($occTimeRange) {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dngettext(
+                            "kopano",
+                            "Occurs every %s effective %s for %s occurrence from %s to %s.",
+                            "Occurs every %s effective %s for %s occurrences from %s to %s.",
+                            $numocc
+                        ), $type, $start, $numocc, $startocc, $endocc);
+                    }
+                    else {
+                        $pattern = sprintf(dngettext(
+                            "kopano",
+                            "Occurs every %s %s effective %s for %s occurrence from %s to %s.",
+                            "Occurs every %s %s effective %s for %s occurrences %s to %s.",
+                            $numocc
+                        ), $everyn, $type, $start, $numocc, $startocc, $endocc);
+                    }
+                }
+                else {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dngettext(
+                            "kopano",
+                            "Occurs every %s effective %s for %s occurrence.",
+                            "Occurs every %s effective %s for %s occurrences.",
+                            $numocc
+                        ), $type, $start, $numocc);
+                    }
+                    else {
+                        $pattern = sprintf(dngettext(
+                            "kopano",
+                            "Occurs every %s %s effective %s for %s occurrence.",
+                            "Occurs every %s %s effective %s for %s occurrences.",
+                            $numocc
+                        ), $everyn, $type, $start, $numocc);
+                    }
+                }
+            }
+            elseif ($term == 0x21) {
+                // After the given enddate
+                if ($occTimeRange) {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s from %s to %s."), $type, $start, $end, $startocc, $endocc);
+                    }
+                    else {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s from %s to %s."), $everyn, $type, $start, $end, $startocc, $endocc);
+                    }
+                }
+                else {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s."), $type, $start, $end);
+                    }
+                    else {
+                        $pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s."), $everyn, $type, $start, $end);
+                    }
+                }
+            }
+            if (!empty($pattern)) {
+                mapi_setprops($this->message, [$this->proptags["recurring_pattern"] => $pattern]);
+            }
+        }
+
+        /*
 		 * Remove an exception by base_date. This is the base date in local daystart time
 		 */
-		public function deleteException($base_date) {
-			// Remove all exceptions on $base_date from the deleted and changed occurrences lists
-
-			// Remove all items in $todelete from deleted_occurrences
-			$new = [];
-
-			foreach ($this->recur["deleted_occurrences"] as $entry) {
-				if ($entry != $base_date) {
-					$new[] = $entry;
-				}
-			}
-
-			$this->recur["deleted_occurrences"] = $new;
-
-			$new = [];
-
-			foreach ($this->recur["changed_occurrences"] as $entry) {
-				if (!$this->isSameDay($entry["basedate"], $base_date)) {
-					$new[] = $entry;
-				}
-				else {
-					$this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
-				}
-			}
-
-			$this->recur["changed_occurrences"] = $new;
-		}
-
-		/**
-		 * Function which saves the exception data in an attachment.
-		 *
-		 * @param array        $exception_props  the exception data (like any other MAPI appointment)
-		 * @param array        $exception_recips list of recipients
-		 * @param mapi_message $copy_attach_from mapi message from which attachments should be copied
-		 *
-		 * @return array properties of the exception
-		 */
-		public function createExceptionAttachment($exception_props, $exception_recips = [], $copy_attach_from = false) {
-			// Create new attachment.
-			$attachment = mapi_message_createattach($this->message);
-			$props = [];
-			$props[PR_ATTACHMENT_FLAGS] = 2;
-			$props[PR_ATTACHMENT_HIDDEN] = true;
-			$props[PR_ATTACHMENT_LINKID] = 0;
-			$props[PR_ATTACH_FLAGS] = 0;
-			$props[PR_ATTACH_METHOD] = 5;
-			$props[PR_DISPLAY_NAME] = "Exception";
-			$props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
-			$props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
-			mapi_setprops($attachment, $props);
-
-			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
-
-			if ($copy_attach_from) {
-				$attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
-				if ($attachmentTable) {
-					$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
-
-					foreach ($attachments as $attach_props) {
-						$attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
-						$attach_newResourceMsg = mapi_message_createattach($imessage);
-						mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
-						mapi_savechanges($attach_newResourceMsg);
-					}
-				}
-			}
-
-			$props = $props + $exception_props;
-
-			// FIXME: the following piece of code is written to fix the creation
-			// of an exception. This is only a quickfix as it is not yet possible
-			// to change an existing exception.
-			// remove mv properties when needed
-			foreach ($props as $propTag => $propVal) {
-				if (mapi_prop_type($propTag) & MV_FLAG && is_null($propVal)) {
-					unset($props[$propTag]);
-				}
-			}
-
-			mapi_setprops($imessage, $props);
-
-			$this->setExceptionRecipients($imessage, $exception_recips, true);
-
-			mapi_savechanges($imessage);
-			mapi_savechanges($attachment);
-		}
-
-		/**
-		 * Function which deletes the attachment of an exception.
-		 *
-		 * @param date $base_date base date of the attachment. Should be in GMT. The attachment
-		 *                        actually saves the real time of the original date, so we have
-		 *                        to check whether it's on the same day.
-		 */
-		public function deleteExceptionAttachment($base_date) {
-			$attachments = mapi_message_getattachmenttable($this->message);
-			$attachTable = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM]);
-
-			foreach ($attachTable as $attachRow) {
-				$tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
-				$exception = mapi_attach_openobj($tempattach);
-
-				$data = mapi_message_getprops($exception, [$this->proptags["basedate"]]);
-				if ($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
-					mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
-				}
-			}
-		}
-
-		/**
-		 * Function which deletes all attachments of a message.
-		 */
-		public function deleteAttachments() {
-			$attachments = mapi_message_getattachmenttable($this->message);
-			$attachTable = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM, PR_ATTACHMENT_HIDDEN]);
-
-			foreach ($attachTable as $attachRow) {
-				if (isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
-					mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
-				}
-			}
-		}
-
-		/**
-		 * Get an exception attachment based on its basedate.
-		 *
-		 * @param mixed $base_date
-		 */
-		public function getExceptionAttachment($base_date) {
-			// Retrieve only embedded messages
-			$attach_res = [RES_AND,
-				[
-					[RES_PROPERTY,
-						[RELOP => RELOP_EQ,
-							ULPROPTAG => PR_ATTACH_METHOD,
-							VALUE => [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG],
-						],
-					],
-				],
-			];
-			$attachments = mapi_message_getattachmenttable($this->message);
-			$attachRows = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM], $attach_res);
-
-			if (is_array($attachRows)) {
-				foreach ($attachRows as $attachRow) {
-					$tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
-					$exception = mapi_attach_openobj($tempattach);
-
-					$data = mapi_message_getprops($exception, [$this->proptags["basedate"]]);
-
-					if (isset($data[$this->proptags["basedate"]]) && $this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
-						return $tempattach;
-					}
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * processOccurrenceItem, adds an item to a list of occurrences, but only if the following criteria are met:
-		 * - The resulting occurrence (or exception) starts or ends in the interval <$start, $end>
-		 * - The ocurrence isn't specified as a deleted occurrence.
-		 *
-		 * @param array $items        reference to the array to be added to
-		 * @param date  $start        start of timeframe in GMT TIME
-		 * @param date  $end          end of timeframe in GMT TIME
-		 * @param date  $basedate     (hour/sec/min assumed to be 00:00:00) in LOCAL TIME OF THE OCCURRENCE
-		 * @param int   $startocc     start of occurrence since beginning of day in minutes
-		 * @param int   $endocc       end of occurrence since beginning of day in minutes
-		 * @param int   $tz           the timezone info for this occurrence ( applied to $basedate / $startocc / $endocc )
-		 * @param bool  $reminderonly If TRUE, only add the item if the reminder is set
-		 */
-		public function processOccurrenceItem(&$items, $start, $end, $basedate, $startocc, $endocc, $tz, $reminderonly) {
-			$exception = $this->isException($basedate);
-			if ($exception) {
-				return false;
-			}
-			$occstart = $basedate + $startocc * 60;
-			$occend = $basedate + $endocc * 60;
-
-			// Convert to GMT
-			$occstart = $this->toGMT($tz, $occstart);
-			$occend = $this->toGMT($tz, $occend);
-
-			/**
-			 * FIRST PART : Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
-			 * see any part of the appointment. Partial overlaps DO match.
-			 *
-			 * SECOND PART : check if occurrence is not a zero duration occurrence which
-			 * starts at 00:00 and ends on 00:00. if it is so, then process
-			 * the occurrence and send it in response.
-			 */
-			if (($occstart >= $end || $occend <= $start) && !($occstart == $occend && $occstart == $start)) {
-				return;
-			}
-
-			// Properties for this occurrence are the same as the main object,
-			// With these properties overridden
-			$newitem = $this->messageprops;
-			$newitem[$this->proptags["startdate"]] = $occstart;
-			$newitem[$this->proptags["duedate"]] = $occend;
-			$newitem[$this->proptags["commonstart"]] = $occstart;
-			$newitem[$this->proptags["commonend"]] = $occend;
-			$newitem["basedate"] = $basedate;
-
-			// If reminderonly is set, only add reminders
-			if ($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false)) {
-				return;
-			}
-
-			$items[] = $newitem;
-		}
-
-		/**
-		 * processExceptionItem, adds an all exception item to a list of occurrences, without any constraint on timeframe.
-		 *
-		 * @param array $items reference to the array to be added to
-		 * @param date  $start start of timeframe in GMT TIME
-		 * @param date  $end   end of timeframe in GMT TIME
-		 */
-		public function processExceptionItems(&$items, $start, $end) {
-			$limit = 0;
-			foreach ($this->recur["changed_occurrences"] as $exception) {
-				// Convert to GMT
-				$occstart = $this->toGMT($this->tz, $exception["start"]);
-				$occend = $this->toGMT($this->tz, $exception["end"]);
-
-				// Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
-				// see any part of the appointment. Partial overlaps DO match.
-				if ($occstart >= $end || $occend <= $start) {
-					continue;
-				}
-
-				array_push($items, $this->getExceptionProperties($exception));
-				if ($limit && (count($items) == $limit)) {
-					break;
-				}
-			}
-		}
-
-		/**
-		 * Function which verifies if on the given date an exception, delete or change, occurs.
-		 *
-		 * @param date  $date     the date
-		 * @param mixed $basedate
-		 *
-		 * @return array the exception, true - if an occurrence is deleted on the given date, false - no exception occurs on the given date
-		 */
-		public function isException($basedate) {
-			if ($this->isDeleteException($basedate)) {
-				return true;
-			}
-
-			if ($this->getChangeException($basedate) != false) {
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Returns TRUE if there is a DELETE exception on the given base date.
-		 *
-		 * @param mixed $basedate
-		 */
-		public function isDeleteException($basedate) {
-			// Check if the occurrence is deleted on the specified date
-			foreach ($this->recur["deleted_occurrences"] as $deleted) {
-				if ($this->isSameDay($deleted, $basedate)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Returns the exception if there is a CHANGE exception on the given base date, or FALSE otherwise.
-		 *
-		 * @param mixed $basedate
-		 */
-		public function getChangeException($basedate) {
-			// Check if the occurrence is modified on the specified date
-			foreach ($this->recur["changed_occurrences"] as $changed) {
-				if ($this->isSameDay($changed["basedate"], $basedate)) {
-					return $changed;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * Function to see if two dates are on the same day.
-		 *
-		 * @param date  $time1 date 1
-		 * @param date  $time2 date 2
-		 * @param mixed $date1
-		 * @param mixed $date2
-		 *
-		 * @return bool Returns TRUE when both dates are on the same day
-		 */
-		public function isSameDay($date1, $date2) {
-			$time1 = $this->gmtime($date1);
-			$time2 = $this->gmtime($date2);
-
-			return $time1["tm_mon"] == $time2["tm_mon"] && $time1["tm_year"] == $time2["tm_year"] && $time1["tm_mday"] == $time2["tm_mday"];
-		}
-
-		/**
-		 * Function to get all properties of a single changed exception.
-		 *
-		 * @param date  $date      base date of exception
-		 * @param mixed $exception
-		 *
-		 * @return array associative array of properties for the exception, compatible with
-		 */
-		public function getExceptionProperties($exception) {
-			// Exception has same properties as main object, with some properties overridden:
-			$item = $this->messageprops;
-
-			// Special properties
-			$item["exception"] = true;
-			$item["basedate"] = $exception["basedate"]; // note that the basedate is always in local time !
-
-			// MAPI-compatible properties (you can handle an exception as a normal calendar item like this)
-			$item[$this->proptags["startdate"]] = $this->toGMT($this->tz, $exception["start"]);
-			$item[$this->proptags["duedate"]] = $this->toGMT($this->tz, $exception["end"]);
-			$item[$this->proptags["commonstart"]] = $item[$this->proptags["startdate"]];
-			$item[$this->proptags["commonend"]] = $item[$this->proptags["duedate"]];
-
-			if (isset($exception["subject"])) {
-				$item[$this->proptags["subject"]] = $exception["subject"];
-			}
-			if (isset($exception["label"])) {
-				$item[$this->proptags["label"]] = $exception["label"];
-			}
-			if (isset($exception["alldayevent"])) {
-				$item[$this->proptags["alldayevent"]] = $exception["alldayevent"];
-			}
-			if (isset($exception["location"])) {
-				$item[$this->proptags["location"]] = $exception["location"];
-			}
-			if (isset($exception["remind_before"])) {
-				$item[$this->proptags["reminder_minutes"]] = $exception["remind_before"];
-			}
-			if (isset($exception["reminder_set"])) {
-				$item[$this->proptags["reminder"]] = $exception["reminder_set"];
-			}
-			if (isset($exception["busystatus"])) {
-				$item[$this->proptags["busystatus"]] = $exception["busystatus"];
-			}
-
-			return $item;
-		}
-
-		/**
-		 * Function which sets recipients for an exception.
-		 *
-		 * The $exception_recips can be provided in 2 ways:
-		 *  - A delta which indicates which recipients must be added, removed or deleted.
-		 *  - A complete array of the recipients which should be applied to the message.
-		 *
-		 * The first option is preferred as it will require less work to be executed.
-		 *
-		 * @param resource $message          exception attachment of recurring item
-		 * @param array    $exception_recips list of recipients
-		 * @param bool     $copy_orig_recips True to copy all recipients which are on the original
-		 *                                   message to the attachment by default. False if only the $exception_recips changes should
-		 *                                   be applied.
-		 */
-		public function setExceptionRecipients($message, $exception_recips, $copy_orig_recips = true) {
-			if (isset($exception_recips['add']) || isset($exception_recips['remove']) || isset($exception_recips['modify'])) {
-				$this->setDeltaExceptionRecipients($message, $exception_recips, $copy_orig_recips);
-			}
-			else {
-				$this->setAllExceptionRecipients($message, $exception_recips);
-			}
-		}
-
-		/**
-		 * Function which applies the provided delta for recipients changes to the exception.
-		 *
-		 * The $exception_recips should be an array containing the following keys:
-		 *  - "add": this contains an array of recipients which must be added
-		 *  - "remove": This contains an array of recipients which must be removed
-		 *  - "modify": This contains an array of recipients which must be modified
-		 *
-		 * @param resource $message          exception attachment of recurring item
-		 * @param array    $exception_recips list of recipients
-		 * @param bool     $copy_orig_recips True to copy all recipients which are on the original
-		 *                                   message to the attachment by default. False if only the $exception_recips changes should
-		 *                                   be applied.
-		 * @param mixed    $exception
-		 */
-		public function setDeltaExceptionRecipients($exception, $exception_recips, $copy_orig_recips) {
-			// Check if the recipients from the original message should be copied,
-			// if so, open the recipient table of the parent message and apply all
-			// rows on the target recipient.
-			if ($copy_orig_recips === true) {
-				$origTable = mapi_message_getrecipienttable($this->message);
-				$recipientRows = mapi_table_queryallrows($origTable, $this->recipprops);
-				mapi_message_modifyrecipients($exception, MODRECIP_ADD, $recipientRows);
-			}
-
-			// Add organizer to meeting only if it is not organized.
-			$msgprops = mapi_getprops($exception, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']]);
-			if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
-				$this->addOrganizer($msgprops, $exception_recips['add']);
-			}
-
-			// Remove all deleted recipients
-			if (isset($exception_recips['remove'])) {
-				foreach ($exception_recips['remove'] as &$recip) {
-					if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
-					}
-					else {
-						$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
-					}
-					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
-				}
-				unset($recip);
-				mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
-			}
-
-			// Add all new recipients
-			if (isset($exception_recips['add'])) {
-				mapi_message_modifyrecipients($exception, MODRECIP_ADD, $exception_recips['add']);
-			}
-
-			// Modify the existing recipients
-			if (isset($exception_recips['modify'])) {
-				mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['modify']);
-			}
-		}
-
-		/**
-		 * Function which applies the provided recipients to the exception, also checks for deleted recipients.
-		 *
-		 * The $exception_recips should be an array containing all recipients which must be applied
-		 * to the exception. This will copy all recipients from the original message and then start filter
-		 * out all recipients which are not provided by the $exception_recips list.
-		 *
-		 * @param resource $message          exception attachment of recurring item
-		 * @param array    $exception_recips list of recipients
-		 */
-		public function setAllExceptionRecipients($message, $exception_recips) {
-			$deletedRecipients = [];
-			$useMessageRecipients = false;
-
-			$recipientTable = mapi_message_getrecipienttable($message);
-			$recipientRows = mapi_table_queryallrows($recipientTable, $this->recipprops);
-
-			if (empty($recipientRows)) {
-				$useMessageRecipients = true;
-				$recipientTable = mapi_message_getrecipienttable($this->message);
-				$recipientRows = mapi_table_queryallrows($recipientTable, $this->recipprops);
-			}
-
-			// Add organizer to meeting only if it is not organized.
-			$msgprops = mapi_getprops($message, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']]);
-			if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
-				$this->addOrganizer($msgprops, $exception_recips);
-			}
-
-			if (!empty($exception_recips)) {
-				foreach ($recipientRows as $key => $recipient) {
-					$found = false;
-					foreach ($exception_recips as $excep_recip) {
-						if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY]) {
-							$found = true;
-						}
-					}
-
-					if (!$found) {
-						$foundInDeletedRecipients = false;
-						// Look if the $recipient is in the list of deleted recipients
-						if (!empty($deletedRecipients)) {
-							foreach ($deletedRecipients as $recip) {
-								if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]) {
-									$foundInDeletedRecipients = true;
-
-									break;
-								}
-							}
-						}
-
-						// If recipient is not in list of deleted recipient, add him
-						if (!$foundInDeletedRecipients) {
-							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-								$recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
-							}
-							else {
-								$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
-							}
-							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
-							$deletedRecipients[] = $recipient;
-						}
-					}
-
-					// When $message contains a non-empty recipienttable, we must delete the recipients
-					// before re-adding them. However, when $message is doesn't contain any recipients,
-					// we are using the recipient table of the original message ($this->message)
-					// rather then $message. In that case, we don't need to remove the recipients
-					// from the $message, as the recipient table is already empty, and
-					// mapi_message_modifyrecipients() will throw an error.
-					if ($useMessageRecipients === false) {
-						mapi_message_modifyrecipients($message, MODRECIP_REMOVE, [$recipient]);
-					}
-				}
-				$exception_recips = array_merge($exception_recips, $deletedRecipients);
-			}
-			else {
-				$exception_recips = $recipientRows;
-			}
-			if (!empty($exception_recips)) {
-				// Set the new list of recipients on the exception message, this also removes the existing recipients
-				mapi_message_modifyrecipients($message, 0, $exception_recips);
-			}
-		}
-
-		/**
-		 * Function returns basedates of all changed occurrences.
-		 *
-		 *@return array array(
-		 * 0 => 123459321
-		 * )
-		 */
-		public function getAllExceptions() {
-			$result = false;
-			if (!empty($this->recur["changed_occurrences"])) {
-				$result = [];
-				foreach ($this->recur["changed_occurrences"] as $exception) {
-					$result[] = $exception["basedate"];
-				}
-
-				return $result;
-			}
-
-			return $result;
-		}
-
-		/**
-		 *  Function which adds organizer to recipient list which is passed.
-		 *  This function also checks if it has organizer.
-		 *
-		 * @param array $messageProps message properties
-		 * @param array $recipients   recipients list of message
-		 * @param bool  $isException  true if we are processing recipient of exception
-		 */
-		public function addOrganizer($messageProps, &$recipients, $isException = false) {
-			$hasOrganizer = false;
-			// Check if meeting already has an organizer.
-			foreach ($recipients as $key => $recipient) {
-				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
-					$hasOrganizer = true;
-				}
-				elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
-					// Recipients for an occurrence
-					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
-				}
-			}
-
-			if (!$hasOrganizer) {
-				// Create organizer.
-				$organizer = [];
-				$organizer[PR_ENTRYID] = $messageProps[PR_SENT_REPRESENTING_ENTRYID];
-				$organizer[PR_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
-				$organizer[PR_EMAIL_ADDRESS] = $messageProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
-				$organizer[PR_RECIPIENT_TYPE] = MAPI_TO;
-				$organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
-				$organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
-				$organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-				$organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
-				$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
-
-				// Add organizer to recipients list.
-				array_unshift($recipients, $organizer);
-			}
-		}
-	}
-
-	/*
+        public function deleteException($base_date) {
+            // Remove all exceptions on $base_date from the deleted and changed occurrences lists
+
+            // Remove all items in $todelete from deleted_occurrences
+            $new = [];
+
+            foreach ($this->recur["deleted_occurrences"] as $entry) {
+                if ($entry != $base_date) {
+                    $new[] = $entry;
+                }
+            }
+
+            $this->recur["deleted_occurrences"] = $new;
+
+            $new = [];
+
+            foreach ($this->recur["changed_occurrences"] as $entry) {
+                if (!$this->isSameDay($entry["basedate"], $base_date)) {
+                    $new[] = $entry;
+                }
+                else {
+                    $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
+                }
+            }
+
+            $this->recur["changed_occurrences"] = $new;
+        }
+
+        /**
+         * Function which saves the exception data in an attachment.
+         *
+         * @param array        $exception_props  the exception data (like any other MAPI appointment)
+         * @param array        $exception_recips list of recipients
+         * @param mapi_message $copy_attach_from mapi message from which attachments should be copied
+         *
+         * @return array properties of the exception
+         */
+        public function createExceptionAttachment($exception_props, $exception_recips = [], $copy_attach_from = false) {
+            // Create new attachment.
+            $attachment = mapi_message_createattach($this->message);
+            $props = [];
+            $props[PR_ATTACHMENT_FLAGS] = 2;
+            $props[PR_ATTACHMENT_HIDDEN] = true;
+            $props[PR_ATTACHMENT_LINKID] = 0;
+            $props[PR_ATTACH_FLAGS] = 0;
+            $props[PR_ATTACH_METHOD] = 5;
+            $props[PR_DISPLAY_NAME] = "Exception";
+            $props[PR_EXCEPTION_STARTTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
+            $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
+            mapi_setprops($attachment, $props);
+
+            $imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
+
+            if ($copy_attach_from) {
+                $attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
+                if ($attachmentTable) {
+                    $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD]);
+
+                    foreach ($attachments as $attach_props) {
+                        $attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
+                        $attach_newResourceMsg = mapi_message_createattach($imessage);
+                        mapi_copyto($attach_old, [], [], $attach_newResourceMsg, 0);
+                        mapi_savechanges($attach_newResourceMsg);
+                    }
+                }
+            }
+
+            $props = $props + $exception_props;
+
+            // FIXME: the following piece of code is written to fix the creation
+            // of an exception. This is only a quickfix as it is not yet possible
+            // to change an existing exception.
+            // remove mv properties when needed
+            foreach ($props as $propTag => $propVal) {
+                if (mapi_prop_type($propTag) & MV_FLAG && is_null($propVal)) {
+                    unset($props[$propTag]);
+                }
+            }
+
+            mapi_setprops($imessage, $props);
+
+            $this->setExceptionRecipients($imessage, $exception_recips, true);
+
+            mapi_savechanges($imessage);
+            mapi_savechanges($attachment);
+        }
+
+        /**
+         * Function which deletes the attachment of an exception.
+         *
+         * @param date $base_date base date of the attachment. Should be in GMT. The attachment
+         *                        actually saves the real time of the original date, so we have
+         *                        to check whether it's on the same day.
+         */
+        public function deleteExceptionAttachment($base_date) {
+            $attachments = mapi_message_getattachmenttable($this->message);
+            $attachTable = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM]);
+
+            foreach ($attachTable as $attachRow) {
+                $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
+                $exception = mapi_attach_openobj($tempattach);
+
+                $data = mapi_message_getprops($exception, [$this->proptags["basedate"]]);
+                if ($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
+                    mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
+                }
+            }
+        }
+
+        /**
+         * Function which deletes all attachments of a message.
+         */
+        public function deleteAttachments() {
+            $attachments = mapi_message_getattachmenttable($this->message);
+            $attachTable = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM, PR_ATTACHMENT_HIDDEN]);
+
+            foreach ($attachTable as $attachRow) {
+                if (isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
+                    mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
+                }
+            }
+        }
+
+        /**
+         * Get an exception attachment based on its basedate.
+         *
+         * @param mixed $base_date
+         */
+        public function getExceptionAttachment($base_date) {
+            // Retrieve only embedded messages
+            $attach_res = [RES_AND,
+                [
+                    [RES_PROPERTY,
+                        [RELOP => RELOP_EQ,
+                            ULPROPTAG => PR_ATTACH_METHOD,
+                            VALUE => [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG],
+                        ],
+                    ],
+                ],
+            ];
+            $attachments = mapi_message_getattachmenttable($this->message);
+            $attachRows = mapi_table_queryallrows($attachments, [PR_ATTACH_NUM], $attach_res);
+
+            if (is_array($attachRows)) {
+                foreach ($attachRows as $attachRow) {
+                    $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
+                    $exception = mapi_attach_openobj($tempattach);
+
+                    $data = mapi_message_getprops($exception, [$this->proptags["basedate"]]);
+
+                    if (isset($data[$this->proptags["basedate"]]) && $this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
+                        return $tempattach;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * processOccurrenceItem, adds an item to a list of occurrences, but only if the following criteria are met:
+         * - The resulting occurrence (or exception) starts or ends in the interval <$start, $end>
+         * - The ocurrence isn't specified as a deleted occurrence.
+         *
+         * @param array $items        reference to the array to be added to
+         * @param date  $start        start of timeframe in GMT TIME
+         * @param date  $end          end of timeframe in GMT TIME
+         * @param date  $basedate     (hour/sec/min assumed to be 00:00:00) in LOCAL TIME OF THE OCCURRENCE
+         * @param int   $startocc     start of occurrence since beginning of day in minutes
+         * @param int   $endocc       end of occurrence since beginning of day in minutes
+         * @param int   $tz           the timezone info for this occurrence ( applied to $basedate / $startocc / $endocc )
+         * @param bool  $reminderonly If TRUE, only add the item if the reminder is set
+         */
+        public function processOccurrenceItem(&$items, $start, $end, $basedate, $startocc, $endocc, $tz, $reminderonly) {
+            $exception = $this->isException($basedate);
+            if ($exception) {
+                return false;
+            }
+            $occstart = $basedate + $startocc * 60;
+            $occend = $basedate + $endocc * 60;
+
+            // Convert to GMT
+            $occstart = $this->toGMT($tz, $occstart);
+            $occend = $this->toGMT($tz, $occend);
+
+            /**
+             * FIRST PART : Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
+             * see any part of the appointment. Partial overlaps DO match.
+             *
+             * SECOND PART : check if occurrence is not a zero duration occurrence which
+             * starts at 00:00 and ends on 00:00. if it is so, then process
+             * the occurrence and send it in response.
+             */
+            if (($occstart >= $end || $occend <= $start) && !($occstart == $occend && $occstart == $start)) {
+                return;
+            }
+
+            // Properties for this occurrence are the same as the main object,
+            // With these properties overridden
+            $newitem = $this->messageprops;
+            $newitem[$this->proptags["startdate"]] = $occstart;
+            $newitem[$this->proptags["duedate"]] = $occend;
+            $newitem[$this->proptags["commonstart"]] = $occstart;
+            $newitem[$this->proptags["commonend"]] = $occend;
+            $newitem["basedate"] = $basedate;
+
+            // If reminderonly is set, only add reminders
+            if ($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false)) {
+                return;
+            }
+
+            $items[] = $newitem;
+        }
+
+        /**
+         * processExceptionItem, adds an all exception item to a list of occurrences, without any constraint on timeframe.
+         *
+         * @param array $items reference to the array to be added to
+         * @param date  $start start of timeframe in GMT TIME
+         * @param date  $end   end of timeframe in GMT TIME
+         */
+        public function processExceptionItems(&$items, $start, $end) {
+            $limit = 0;
+            foreach ($this->recur["changed_occurrences"] as $exception) {
+                // Convert to GMT
+                $occstart = $this->toGMT($this->tz, $exception["start"]);
+                $occend = $this->toGMT($this->tz, $exception["end"]);
+
+                // Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
+                // see any part of the appointment. Partial overlaps DO match.
+                if ($occstart >= $end || $occend <= $start) {
+                    continue;
+                }
+
+                array_push($items, $this->getExceptionProperties($exception));
+                if ($limit && (count($items) == $limit)) {
+                    break;
+                }
+            }
+        }
+
+        /**
+         * Function which verifies if on the given date an exception, delete or change, occurs.
+         *
+         * @param date  $date     the date
+         * @param mixed $basedate
+         *
+         * @return array the exception, true - if an occurrence is deleted on the given date, false - no exception occurs on the given date
+         */
+        public function isException($basedate) {
+            if ($this->isDeleteException($basedate)) {
+                return true;
+            }
+
+            if ($this->getChangeException($basedate) != false) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Returns TRUE if there is a DELETE exception on the given base date.
+         *
+         * @param mixed $basedate
+         */
+        public function isDeleteException($basedate) {
+            // Check if the occurrence is deleted on the specified date
+            foreach ($this->recur["deleted_occurrences"] as $deleted) {
+                if ($this->isSameDay($deleted, $basedate)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Returns the exception if there is a CHANGE exception on the given base date, or FALSE otherwise.
+         *
+         * @param mixed $basedate
+         */
+        public function getChangeException($basedate) {
+            // Check if the occurrence is modified on the specified date
+            foreach ($this->recur["changed_occurrences"] as $changed) {
+                if ($this->isSameDay($changed["basedate"], $basedate)) {
+                    return $changed;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * Function to see if two dates are on the same day.
+         *
+         * @param date  $time1 date 1
+         * @param date  $time2 date 2
+         * @param mixed $date1
+         * @param mixed $date2
+         *
+         * @return bool Returns TRUE when both dates are on the same day
+         */
+        public function isSameDay($date1, $date2) {
+            $time1 = $this->gmtime($date1);
+            $time2 = $this->gmtime($date2);
+
+            return $time1["tm_mon"] == $time2["tm_mon"] && $time1["tm_year"] == $time2["tm_year"] && $time1["tm_mday"] == $time2["tm_mday"];
+        }
+
+        /**
+         * Function to get all properties of a single changed exception.
+         *
+         * @param date  $date      base date of exception
+         * @param mixed $exception
+         *
+         * @return array associative array of properties for the exception, compatible with
+         */
+        public function getExceptionProperties($exception) {
+            // Exception has same properties as main object, with some properties overridden:
+            $item = $this->messageprops;
+
+            // Special properties
+            $item["exception"] = true;
+            $item["basedate"] = $exception["basedate"]; // note that the basedate is always in local time !
+
+            // MAPI-compatible properties (you can handle an exception as a normal calendar item like this)
+            $item[$this->proptags["startdate"]] = $this->toGMT($this->tz, $exception["start"]);
+            $item[$this->proptags["duedate"]] = $this->toGMT($this->tz, $exception["end"]);
+            $item[$this->proptags["commonstart"]] = $item[$this->proptags["startdate"]];
+            $item[$this->proptags["commonend"]] = $item[$this->proptags["duedate"]];
+
+            if (isset($exception["subject"])) {
+                $item[$this->proptags["subject"]] = $exception["subject"];
+            }
+            if (isset($exception["label"])) {
+                $item[$this->proptags["label"]] = $exception["label"];
+            }
+            if (isset($exception["alldayevent"])) {
+                $item[$this->proptags["alldayevent"]] = $exception["alldayevent"];
+            }
+            if (isset($exception["location"])) {
+                $item[$this->proptags["location"]] = $exception["location"];
+            }
+            if (isset($exception["remind_before"])) {
+                $item[$this->proptags["reminder_minutes"]] = $exception["remind_before"];
+            }
+            if (isset($exception["reminder_set"])) {
+                $item[$this->proptags["reminder"]] = $exception["reminder_set"];
+            }
+            if (isset($exception["busystatus"])) {
+                $item[$this->proptags["busystatus"]] = $exception["busystatus"];
+            }
+
+            return $item;
+        }
+
+        /**
+         * Function which sets recipients for an exception.
+         *
+         * The $exception_recips can be provided in 2 ways:
+         *  - A delta which indicates which recipients must be added, removed or deleted.
+         *  - A complete array of the recipients which should be applied to the message.
+         *
+         * The first option is preferred as it will require less work to be executed.
+         *
+         * @param resource $message          exception attachment of recurring item
+         * @param array    $exception_recips list of recipients
+         * @param bool     $copy_orig_recips True to copy all recipients which are on the original
+         *                                   message to the attachment by default. False if only the $exception_recips changes should
+         *                                   be applied.
+         */
+        public function setExceptionRecipients($message, $exception_recips, $copy_orig_recips = true) {
+            if (isset($exception_recips['add']) || isset($exception_recips['remove']) || isset($exception_recips['modify'])) {
+                $this->setDeltaExceptionRecipients($message, $exception_recips, $copy_orig_recips);
+            }
+            else {
+                $this->setAllExceptionRecipients($message, $exception_recips);
+            }
+        }
+
+        /**
+         * Function which applies the provided delta for recipients changes to the exception.
+         *
+         * The $exception_recips should be an array containing the following keys:
+         *  - "add": this contains an array of recipients which must be added
+         *  - "remove": This contains an array of recipients which must be removed
+         *  - "modify": This contains an array of recipients which must be modified
+         *
+         * @param resource $message          exception attachment of recurring item
+         * @param array    $exception_recips list of recipients
+         * @param bool     $copy_orig_recips True to copy all recipients which are on the original
+         *                                   message to the attachment by default. False if only the $exception_recips changes should
+         *                                   be applied.
+         * @param mixed    $exception
+         */
+        public function setDeltaExceptionRecipients($exception, $exception_recips, $copy_orig_recips) {
+            // Check if the recipients from the original message should be copied,
+            // if so, open the recipient table of the parent message and apply all
+            // rows on the target recipient.
+            if ($copy_orig_recips === true) {
+                $origTable = mapi_message_getrecipienttable($this->message);
+                $recipientRows = mapi_table_queryallrows($origTable, $this->recipprops);
+                mapi_message_modifyrecipients($exception, MODRECIP_ADD, $recipientRows);
+            }
+
+            // Add organizer to meeting only if it is not organized.
+            $msgprops = mapi_getprops($exception, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']]);
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
+                $this->addOrganizer($msgprops, $exception_recips['add']);
+            }
+
+            // Remove all deleted recipients
+            if (isset($exception_recips['remove'])) {
+                foreach ($exception_recips['remove'] as &$recip) {
+                    if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
+                        $recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+                    }
+                    else {
+                        $recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+                    }
+                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
+                }
+                unset($recip);
+                mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
+            }
+
+            // Add all new recipients
+            if (isset($exception_recips['add'])) {
+                mapi_message_modifyrecipients($exception, MODRECIP_ADD, $exception_recips['add']);
+            }
+
+            // Modify the existing recipients
+            if (isset($exception_recips['modify'])) {
+                mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['modify']);
+            }
+        }
+
+        /**
+         * Function which applies the provided recipients to the exception, also checks for deleted recipients.
+         *
+         * The $exception_recips should be an array containing all recipients which must be applied
+         * to the exception. This will copy all recipients from the original message and then start filter
+         * out all recipients which are not provided by the $exception_recips list.
+         *
+         * @param resource $message          exception attachment of recurring item
+         * @param array    $exception_recips list of recipients
+         */
+        public function setAllExceptionRecipients($message, $exception_recips) {
+            $deletedRecipients = [];
+            $useMessageRecipients = false;
+
+            $recipientTable = mapi_message_getrecipienttable($message);
+            $recipientRows = mapi_table_queryallrows($recipientTable, $this->recipprops);
+
+            if (empty($recipientRows)) {
+                $useMessageRecipients = true;
+                $recipientTable = mapi_message_getrecipienttable($this->message);
+                $recipientRows = mapi_table_queryallrows($recipientTable, $this->recipprops);
+            }
+
+            // Add organizer to meeting only if it is not organized.
+            $msgprops = mapi_getprops($message, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']]);
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
+                $this->addOrganizer($msgprops, $exception_recips);
+            }
+
+            if (!empty($exception_recips)) {
+                foreach ($recipientRows as $key => $recipient) {
+                    $found = false;
+                    foreach ($exception_recips as $excep_recip) {
+                        if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY]) {
+                            $found = true;
+                        }
+                    }
+
+                    if (!$found) {
+                        $foundInDeletedRecipients = false;
+                        // Look if the $recipient is in the list of deleted recipients
+                        if (!empty($deletedRecipients)) {
+                            foreach ($deletedRecipients as $recip) {
+                                if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]) {
+                                    $foundInDeletedRecipients = true;
+
+                                    break;
+                                }
+                            }
+                        }
+
+                        // If recipient is not in list of deleted recipient, add him
+                        if (!$foundInDeletedRecipients) {
+                            if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
+                                $recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+                            }
+                            else {
+                                $recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+                            }
+                            $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
+                            $deletedRecipients[] = $recipient;
+                        }
+                    }
+
+                    // When $message contains a non-empty recipienttable, we must delete the recipients
+                    // before re-adding them. However, when $message is doesn't contain any recipients,
+                    // we are using the recipient table of the original message ($this->message)
+                    // rather then $message. In that case, we don't need to remove the recipients
+                    // from the $message, as the recipient table is already empty, and
+                    // mapi_message_modifyrecipients() will throw an error.
+                    if ($useMessageRecipients === false) {
+                        mapi_message_modifyrecipients($message, MODRECIP_REMOVE, [$recipient]);
+                    }
+                }
+                $exception_recips = array_merge($exception_recips, $deletedRecipients);
+            }
+            else {
+                $exception_recips = $recipientRows;
+            }
+            if (!empty($exception_recips)) {
+                // Set the new list of recipients on the exception message, this also removes the existing recipients
+                mapi_message_modifyrecipients($message, 0, $exception_recips);
+            }
+        }
+
+        /**
+         * Function returns basedates of all changed occurrences.
+         *
+         *@return array array(
+         * 0 => 123459321
+         * )
+         */
+        public function getAllExceptions() {
+            $result = false;
+            if (!empty($this->recur["changed_occurrences"])) {
+                $result = [];
+                foreach ($this->recur["changed_occurrences"] as $exception) {
+                    $result[] = $exception["basedate"];
+                }
+
+                return $result;
+            }
+
+            return $result;
+        }
+
+        /**
+         *  Function which adds organizer to recipient list which is passed.
+         *  This function also checks if it has organizer.
+         *
+         * @param array $messageProps message properties
+         * @param array $recipients   recipients list of message
+         * @param bool  $isException  true if we are processing recipient of exception
+         */
+        public function addOrganizer($messageProps, &$recipients, $isException = false) {
+            $hasOrganizer = false;
+            // Check if meeting already has an organizer.
+            foreach ($recipients as $key => $recipient) {
+                if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
+                    $hasOrganizer = true;
+                }
+                elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
+                    // Recipients for an occurrence
+                    $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+                }
+            }
+
+            if (!$hasOrganizer) {
+                // Create organizer.
+                $organizer = [];
+                $organizer[PR_ENTRYID] = $messageProps[PR_SENT_REPRESENTING_ENTRYID];
+                $organizer[PR_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
+                $organizer[PR_EMAIL_ADDRESS] = $messageProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
+                $organizer[PR_RECIPIENT_TYPE] = MAPI_TO;
+                $organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
+                $organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
+                $organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
+                $organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
+                $organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
+
+                // Add organizer to recipients list.
+                array_unshift($recipients, $organizer);
+            }
+        }
+    }
+
+    /*
 
 	From http://www.ohelp-one.com/new-6765483-3268.html:
 

Switch Indentation +50 added lines, -50 removed lines

@@ -521,56 +521,56 @@
 
 			switch ($type) {
 				// Daily
-				case 0x0A:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "workday");
-						$occSingleDayRank = true;
-					}
-					elseif ($everyn == (24 * 60)) {
-						$type = dgettext("kopano", "day");
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn /= (24 * 60);
-						$type = dgettext("kopano", "days");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Weekly
-				case 0x0B:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "week");
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = dgettext("kopano", "weeks");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Monthly
-				case 0x0C:
-					if ($everyn == 1) {
-						$type = dgettext("kopano", "month");
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = dgettext("kopano", "months");
-						$occSingleDayRank = false;
-					}
-					break;
-				// Yearly
-				case 0x0D:
-					if ($everyn <= 12) {
-						$everyn = 1;
-						$type = dgettext("kopano", "year");
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn = $everyn / 12;
-						$type = dgettext("kopano", "years");
-						$occSingleDayRank = false;
-					}
-					break;
+			case 0x0A:
+				if ($everyn == 1) {
+					$type = dgettext("kopano", "workday");
+					$occSingleDayRank = true;
+				}
+				elseif ($everyn == (24 * 60)) {
+					$type = dgettext("kopano", "day");
+					$occSingleDayRank = true;
+				}
+				else {
+					$everyn /= (24 * 60);
+					$type = dgettext("kopano", "days");
+					$occSingleDayRank = false;
+				}
+				break;
+			// Weekly
+			case 0x0B:
+				if ($everyn == 1) {
+					$type = dgettext("kopano", "week");
+					$occSingleDayRank = true;
+				}
+				else {
+					$type = dgettext("kopano", "weeks");
+					$occSingleDayRank = false;
+				}
+				break;
+			// Monthly
+			case 0x0C:
+				if ($everyn == 1) {
+					$type = dgettext("kopano", "month");
+					$occSingleDayRank = true;
+				}
+				else {
+					$type = dgettext("kopano", "months");
+					$occSingleDayRank = false;
+				}
+				break;
+			// Yearly
+			case 0x0D:
+				if ($everyn <= 12) {
+					$everyn = 1;
+					$type = dgettext("kopano", "year");
+					$occSingleDayRank = true;
+				}
+				else {
+					$everyn = $everyn / 12;
+					$type = dgettext("kopano", "years");
+					$occSingleDayRank = false;
+				}
+				break;
 			}
 
 			// get timings of the first occurrence

Spacing +2 added lines, -2 removed lines

@@ -1095,7 +1095,7 @@ 
 					else {
 						$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 					}
-					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
+					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
 				}
 				unset($recip);
 				mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1171,7 +1171,7 @@ 
 							else {
 								$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 							}
-							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
+							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
 							$deletedRecipients[] = $recipient;
 						}
 					}

Braces +27 added lines, -54 removed lines

@@ -179,8 +179,7 @@ 
 
 				// Add the changed occurrence to the list
 				array_push($this->recur["changed_occurrences"], $changed_item);
-			}
-			else {
+			} else {
 				// Delete the occurrence by placing it in the deleted occurrences list
 				array_push($this->recur["deleted_occurrences"], $baseday);
 			}
@@ -269,12 +268,10 @@ 
 				if ($copy_attach_from) {
 					$this->deleteExceptionAttachment($base_date);
 					$this->createException($exception_props, $base_date, false, $exception_recips, $copy_attach_from);
-				}
-				else {
+				} else {
 					$this->createExceptionAttachment($exception_props, $exception_recips, $copy_attach_from);
 				}
-			}
-			else {
+			} else {
 				$message = mapi_attach_openobj($attach, MAPI_MODIFY);
 
 				// Set exception properties on embedded message and save
@@ -317,8 +314,7 @@ 
 				// the exception used to be.
 				$oldexception = $this->getChangeException($basedate);
 				$prevday = $this->dayStartOf($oldexception["start"]);
-			}
-			else {
+			} else {
 				// If its a new exception, we want to look at the original placement of this item.
 				$prevday = $basedate;
 			}
@@ -328,8 +324,7 @@ 
 			// Get all the occurrences on the days between the basedate (may be reversed)
 			if ($prevday < $startday) {
 				$items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
-			}
-			else {
+			} else {
 				$items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
 			}
 
@@ -525,12 +520,10 @@ 
 					if ($everyn == 1) {
 						$type = dgettext("kopano", "workday");
 						$occSingleDayRank = true;
-					}
-					elseif ($everyn == (24 * 60)) {
+					} elseif ($everyn == (24 * 60)) {
 						$type = dgettext("kopano", "day");
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$everyn /= (24 * 60);
 						$type = dgettext("kopano", "days");
 						$occSingleDayRank = false;
@@ -541,8 +534,7 @@ 
 					if ($everyn == 1) {
 						$type = dgettext("kopano", "week");
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$type = dgettext("kopano", "weeks");
 						$occSingleDayRank = false;
 					}
@@ -552,8 +544,7 @@ 
 					if ($everyn == 1) {
 						$type = dgettext("kopano", "month");
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$type = dgettext("kopano", "months");
 						$occSingleDayRank = false;
 					}
@@ -564,8 +555,7 @@ 
 						$everyn = 1;
 						$type = dgettext("kopano", "year");
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$everyn = $everyn / 12;
 						$type = dgettext("kopano", "years");
 						$occSingleDayRank = false;
@@ -594,21 +584,17 @@ 
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s from %s to %s."), $type, $start, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s from %s to %s."), $everyn, $type, $start, $startocc, $endocc);
 					}
-				}
-				else {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s."), $type, $start);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s."), $everyn, $type, $start);
 					}
 				}
-			}
-			elseif ($term == 0x22) {
+			} elseif ($term == 0x22) {
 				// After a number of times
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
@@ -618,8 +604,7 @@ 
 							"Occurs every %s effective %s for %s occurrences from %s to %s.",
 							$numocc
 						), $type, $start, $numocc, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dngettext(
 							"kopano",
 							"Occurs every %s %s effective %s for %s occurrence from %s to %s.",
@@ -627,8 +612,7 @@ 
 							$numocc
 						), $everyn, $type, $start, $numocc, $startocc, $endocc);
 					}
-				}
-				else {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(dngettext(
 							"kopano",
@@ -636,8 +620,7 @@ 
 							"Occurs every %s effective %s for %s occurrences.",
 							$numocc
 						), $type, $start, $numocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dngettext(
 							"kopano",
 							"Occurs every %s %s effective %s for %s occurrence.",
@@ -646,22 +629,18 @@ 
 						), $everyn, $type, $start, $numocc);
 					}
 				}
-			}
-			elseif ($term == 0x21) {
+			} elseif ($term == 0x21) {
 				// After the given enddate
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s from %s to %s."), $type, $start, $end, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s from %s to %s."), $everyn, $type, $start, $end, $startocc, $endocc);
 					}
-				}
-				else {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s effective %s until %s."), $type, $start, $end);
-					}
-					else {
+					} else {
 						$pattern = sprintf(dgettext("kopano", "Occurs every %s %s effective %s until %s."), $everyn, $type, $start, $end);
 					}
 				}
@@ -693,8 +672,7 @@ 
 			foreach ($this->recur["changed_occurrences"] as $entry) {
 				if (!$this->isSameDay($entry["basedate"], $base_date)) {
 					$new[] = $entry;
-				}
-				else {
+				} else {
 					$this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
 				}
 			}
@@ -1049,8 +1027,7 @@ 
 		public function setExceptionRecipients($message, $exception_recips, $copy_orig_recips = true) {
 			if (isset($exception_recips['add']) || isset($exception_recips['remove']) || isset($exception_recips['modify'])) {
 				$this->setDeltaExceptionRecipients($message, $exception_recips, $copy_orig_recips);
-			}
-			else {
+			} else {
 				$this->setAllExceptionRecipients($message, $exception_recips);
 			}
 		}
@@ -1091,8 +1068,7 @@ 
 				foreach ($exception_recips['remove'] as &$recip) {
 					if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
 						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
-					}
-					else {
+					} else {
 						$recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 					}
 					$recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;		// No Response required
@@ -1167,8 +1143,7 @@ 
 						if (!$foundInDeletedRecipients) {
 							if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
 								$recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
-							}
-							else {
+							} else {
 								$recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
 							}
 							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;	// No Response required
@@ -1187,8 +1162,7 @@ 
 					}
 				}
 				$exception_recips = array_merge($exception_recips, $deletedRecipients);
-			}
-			else {
+			} else {
 				$exception_recips = $recipientRows;
 			}
 			if (!empty($exception_recips)) {
@@ -1232,8 +1206,7 @@ 
 			foreach ($recipients as $key => $recipient) {
 				if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
 					$hasOrganizer = true;
-				}
-				elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
+				} elseif ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
 					// Recipients for an occurrence
 					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
 				}

mapi/mapi.util.php

Indentation +254 added lines, -254 removed lines

@@ -22,7 +22,7 @@ 
  * @param mixed $guid
  */
 function makeGuid($guid) {
-	return pack("vvvv", hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))) . hex2bin(substr($guid, 20, 4)) . hex2bin(substr($guid, 25, 12));
+    return pack("vvvv", hexdec(substr($guid, 5, 4)), hexdec(substr($guid, 1, 4)), hexdec(substr($guid, 10, 4)), hexdec(substr($guid, 15, 4))) . hex2bin(substr($guid, 20, 4)) . hex2bin(substr($guid, 25, 12));
 }
 
 /**
@@ -33,39 +33,39 @@ 
  *@return string The defined name for the MAPI error code
  */
 function get_mapi_error_name($errcode = null) {
-	if ($errcode === null) {
-		$errcode = mapi_last_hresult();
-	}
+    if ($errcode === null) {
+        $errcode = mapi_last_hresult();
+    }
 
-	if ($errcode === 0) {
-		return "NOERROR";
-	}
+    if ($errcode === 0) {
+        return "NOERROR";
+    }
 
-	// get_defined_constants(true) is preferred, but crashes PHP
-	// https://bugs.php.net/bug.php?id=61156
-	$allConstants = get_defined_constants();
+    // get_defined_constants(true) is preferred, but crashes PHP
+    // https://bugs.php.net/bug.php?id=61156
+    $allConstants = get_defined_constants();
 
-	foreach ($allConstants as $key => $value) {
-		/*
+    foreach ($allConstants as $key => $value) {
+        /*
 		 * If PHP encounters a number beyond the bounds of the integer type,
 		 * it will be interpreted as a float instead, so when comparing these error codes
 		 * we have to manually typecast value to integer, so float will be converted in integer,
 		 * but still its out of bound for integer limit so it will be auto adjusted to minus value
 		 */
-		if ($errcode != (int) $value) {
-			continue;
-		}
-		// Check that we have an actual MAPI error or warning definition
-		$prefix = substr($key, 0, 7);
-		if ($prefix == "MAPI_E_" || $prefix == "MAPI_W_") {
-			return $key;
-		}
-	}
-
-	// error code not found, return hex value (this is a fix for 64-bit systems, we can't use the dechex() function for this)
-	$result = unpack("H*", pack("N", $errcode));
-
-	return "0x" . $result[1];
+        if ($errcode != (int) $value) {
+            continue;
+        }
+        // Check that we have an actual MAPI error or warning definition
+        $prefix = substr($key, 0, 7);
+        if ($prefix == "MAPI_E_" || $prefix == "MAPI_W_") {
+            return $key;
+        }
+    }
+
+    // error code not found, return hex value (this is a fix for 64-bit systems, we can't use the dechex() function for this)
+    $result = unpack("H*", pack("N", $errcode));
+
+    return "0x" . $result[1];
 }
 
 /**
@@ -79,65 +79,65 @@ 
  * @param mixed $mapping
  */
 function getPropIdsFromStrings($store, $mapping) {
-	$props = [];
-
-	$ids = ["name" => [], "id" => [], "guid" => [], "type" => []]; // this array stores all the information needed to retrieve a named property
-	$num = 0;
-
-	// caching
-	$guids = [];
-
-	foreach ($mapping as $name => $val) {
-		if (!is_string($val)) {
-			// not a named property
-			$props[$name] = $val;
-
-			continue;
-		}
-		$split = explode(":", $val);
-		if (count($split) != 3) { // invalid string, ignore
-			trigger_error(sprintf("Invalid property: %s \"%s\"", $name, $val), E_USER_NOTICE);
-
-			continue;
-		}
-
-		if (substr($split[2], 0, 2) == "0x") {
-			$id = hexdec(substr($split[2], 2));
-		}
-		else {
-			$id = $split[2];
-		}
-
-		// have we used this guid before?
-		if (!defined($split[1])) {
-			if (!array_key_exists($split[1], $guids)) {
-				$guids[$split[1]] = makeguid($split[1]);
-			}
-			$guid = $guids[$split[1]];
-		}
-		else {
-			$guid = constant($split[1]);
-		}
-
-		// temp store info about named prop, so we have to call mapi_getidsfromnames just one time
-		$ids["name"][$num] = $name;
-		$ids["id"][$num] = $id;
-		$ids["guid"][$num] = $guid;
-		$ids["type"][$num] = $split[0];
-		++$num;
-	}
-
-	if (empty($ids["id"])) {
-		return $props;
-	}
-
-	// get the ids
-	$named = mapi_getidsfromnames($store, $ids["id"], $ids["guid"]);
-	foreach ($named as $num => $prop) {
-		$props[$ids["name"][$num]] = mapi_prop_tag(constant($ids["type"][$num]), mapi_prop_id($prop));
-	}
-
-	return $props;
+    $props = [];
+
+    $ids = ["name" => [], "id" => [], "guid" => [], "type" => []]; // this array stores all the information needed to retrieve a named property
+    $num = 0;
+
+    // caching
+    $guids = [];
+
+    foreach ($mapping as $name => $val) {
+        if (!is_string($val)) {
+            // not a named property
+            $props[$name] = $val;
+
+            continue;
+        }
+        $split = explode(":", $val);
+        if (count($split) != 3) { // invalid string, ignore
+            trigger_error(sprintf("Invalid property: %s \"%s\"", $name, $val), E_USER_NOTICE);
+
+            continue;
+        }
+
+        if (substr($split[2], 0, 2) == "0x") {
+            $id = hexdec(substr($split[2], 2));
+        }
+        else {
+            $id = $split[2];
+        }
+
+        // have we used this guid before?
+        if (!defined($split[1])) {
+            if (!array_key_exists($split[1], $guids)) {
+                $guids[$split[1]] = makeguid($split[1]);
+            }
+            $guid = $guids[$split[1]];
+        }
+        else {
+            $guid = constant($split[1]);
+        }
+
+        // temp store info about named prop, so we have to call mapi_getidsfromnames just one time
+        $ids["name"][$num] = $name;
+        $ids["id"][$num] = $id;
+        $ids["guid"][$num] = $guid;
+        $ids["type"][$num] = $split[0];
+        ++$num;
+    }
+
+    if (empty($ids["id"])) {
+        return $props;
+    }
+
+    // get the ids
+    $named = mapi_getidsfromnames($store, $ids["id"], $ids["guid"]);
+    foreach ($named as $num => $prop) {
+        $props[$ids["name"][$num]] = mapi_prop_tag(constant($ids["type"][$num]), mapi_prop_id($prop));
+    }
+
+    return $props;
 }
 
 /**
@@ -153,11 +153,11 @@ 
  * @return mixed Gives back false when there is no error, if there is, gives the error
  */
 function propIsError($property, $propArray) {
-	if (array_key_exists(mapi_prop_tag(PT_ERROR, mapi_prop_id($property)), $propArray)) {
-		return $propArray[mapi_prop_tag(PT_ERROR, mapi_prop_id($property))];
-	}
+    if (array_key_exists(mapi_prop_tag(PT_ERROR, mapi_prop_id($property)), $propArray)) {
+        return $propArray[mapi_prop_tag(PT_ERROR, mapi_prop_id($property))];
+    }
 
-	return false;
+    return false;
 }
 
 /* Macro Functions for PR_DISPLAY_TYPE_EX values */
@@ -167,7 +167,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_REMOTE_VALID($value) {
-	return (bool) ($value & DTE_FLAG_REMOTE_VALID);
+    return (bool) ($value & DTE_FLAG_REMOTE_VALID);
 }
 
 /**
@@ -176,15 +176,15 @@ 
  * @param mixed $value
  */
 function DTE_IS_ACL_CAPABLE($value) {
-	return (bool) ($value & DTE_FLAG_ACL_CAPABLE);
+    return (bool) ($value & DTE_FLAG_ACL_CAPABLE);
 }
 
 function DTE_REMOTE($value) {
-	return ($value & DTE_MASK_REMOTE) >> 8;
+    return ($value & DTE_MASK_REMOTE) >> 8;
 }
 
 function DTE_LOCAL($value) {
-	return $value & DTE_MASK_LOCAL;
+    return $value & DTE_MASK_LOCAL;
 }
 
 /**
@@ -204,86 +204,86 @@ 
  *                    expanded so that it seems that there are only many single appointments in the table.
  */
 function getCalendarItems($store, $calendar, $viewstart, $viewend, $propsrequested) {
-	$result = [];
-	$properties = getPropIdsFromStrings($store, ["duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e",
-		"startdate" => "PT_SYSTIME:PSETID_Appointment:0x820d",
-		"enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236",
-		"recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
-		"recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216",
-		"timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233",
-		"label" => "PT_LONG:PSETID_Appointment:0x8214",
-	]);
-
-	// Create a restriction that will discard rows of appointments that are definitely not in our
-	// requested time frame
-
-	$table = mapi_folder_getcontentstable($calendar);
-
-	$restriction =
-		// OR
-		[RES_OR,
-			[
-				[RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
-					[
-						[RES_PROPERTY,
-							[RELOP => RELOP_GT,
-								ULPROPTAG => $properties["duedate"],
-								VALUE => $viewstart,
-							],
-						],
-						[RES_PROPERTY,
-							[RELOP => RELOP_LT,
-								ULPROPTAG => $properties["startdate"],
-								VALUE => $viewend,
-							],
-						],
-					],
-				],
-				// OR
-				[RES_PROPERTY,
-					[RELOP => RELOP_EQ,
-						ULPROPTAG => $properties["recurring"],
-						VALUE => true,
-					],
-				],
-			], // EXISTS OR
-		];        // global OR
-
-	// Get requested properties, plus whatever we need
-	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];
-	$proplist = array_merge($proplist, $propsrequested);
-	$propslist = array_unique($proplist);
-
-	$rows = mapi_table_queryallrows($table, $proplist, $restriction);
-
-	// $rows now contains all the items that MAY be in the window; a recurring item needs expansion before including in the output.
-
-	foreach ($rows as $row) {
-		$items = [];
-
-		if (isset($row[$properties["recurring"]]) && $row[$properties["recurring"]]) {
-			// Recurring item
-			$rec = new Recurrence($store, $row);
-
-			// GetItems guarantees that the item overlaps the interval <$viewstart, $viewend>
-			$occurrences = $rec->getItems($viewstart, $viewend);
-			foreach ($occurrences as $occurrence) {
-				// The occurrence takes all properties from the main row, but overrides some properties (like start and end obviously)
-				$item = $occurrence + $row;
-				array_push($items, $item);
-			}
-		}
-		else {
-			// Normal item, it matched the search criteria and therefore overlaps the interval <$viewstart, $viewend>
-			array_push($items, $row);
-		}
-
-		$result = array_merge($result, $items);
-	}
-
-	// All items are guaranteed to overlap the interval <$viewstart, $viewend>. Note that we may be returning a few extra
-	// properties that the caller did not request (recurring, etc). This shouldn't be a problem though.
-	return $result;
+    $result = [];
+    $properties = getPropIdsFromStrings($store, ["duedate" => "PT_SYSTIME:PSETID_Appointment:0x820e",
+        "startdate" => "PT_SYSTIME:PSETID_Appointment:0x820d",
+        "enddate_recurring" => "PT_SYSTIME:PSETID_Appointment:0x8236",
+        "recurring" => "PT_BOOLEAN:PSETID_Appointment:0x8223",
+        "recurring_data" => "PT_BINARY:PSETID_Appointment:0x8216",
+        "timezone_data" => "PT_BINARY:PSETID_Appointment:0x8233",
+        "label" => "PT_LONG:PSETID_Appointment:0x8214",
+    ]);
+
+    // Create a restriction that will discard rows of appointments that are definitely not in our
+    // requested time frame
+
+    $table = mapi_folder_getcontentstable($calendar);
+
+    $restriction =
+        // OR
+        [RES_OR,
+            [
+                [RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+                    [
+                        [RES_PROPERTY,
+                            [RELOP => RELOP_GT,
+                                ULPROPTAG => $properties["duedate"],
+                                VALUE => $viewstart,
+                            ],
+                        ],
+                        [RES_PROPERTY,
+                            [RELOP => RELOP_LT,
+                                ULPROPTAG => $properties["startdate"],
+                                VALUE => $viewend,
+                            ],
+                        ],
+                    ],
+                ],
+                // OR
+                [RES_PROPERTY,
+                    [RELOP => RELOP_EQ,
+                        ULPROPTAG => $properties["recurring"],
+                        VALUE => true,
+                    ],
+                ],
+            ], // EXISTS OR
+        ];        // global OR
+
+    // Get requested properties, plus whatever we need
+    $proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];
+    $proplist = array_merge($proplist, $propsrequested);
+    $propslist = array_unique($proplist);
+
+    $rows = mapi_table_queryallrows($table, $proplist, $restriction);
+
+    // $rows now contains all the items that MAY be in the window; a recurring item needs expansion before including in the output.
+
+    foreach ($rows as $row) {
+        $items = [];
+
+        if (isset($row[$properties["recurring"]]) && $row[$properties["recurring"]]) {
+            // Recurring item
+            $rec = new Recurrence($store, $row);
+
+            // GetItems guarantees that the item overlaps the interval <$viewstart, $viewend>
+            $occurrences = $rec->getItems($viewstart, $viewend);
+            foreach ($occurrences as $occurrence) {
+                // The occurrence takes all properties from the main row, but overrides some properties (like start and end obviously)
+                $item = $occurrence + $row;
+                array_push($items, $item);
+            }
+        }
+        else {
+            // Normal item, it matched the search criteria and therefore overlaps the interval <$viewstart, $viewend>
+            array_push($items, $row);
+        }
+
+        $result = array_merge($result, $items);
+    }
+
+    // All items are guaranteed to overlap the interval <$viewstart, $viewend>. Note that we may be returning a few extra
+    // properties that the caller did not request (recurring, etc). This shouldn't be a problem though.
+    return $result;
 }
 
 /**
@@ -292,14 +292,14 @@ 
  * @param mixed $store
  */
 function getCalendar($store) {
-	$inbox = mapi_msgstore_getreceivefolder($store);
-	$inboxprops = mapi_getprops($inbox, [PR_IPM_APPOINTMENT_ENTRYID]);
+    $inbox = mapi_msgstore_getreceivefolder($store);
+    $inboxprops = mapi_getprops($inbox, [PR_IPM_APPOINTMENT_ENTRYID]);
 
-	if (!isset($inboxprops[PR_IPM_APPOINTMENT_ENTRYID])) {
-		return false;
-	}
+    if (!isset($inboxprops[PR_IPM_APPOINTMENT_ENTRYID])) {
+        return false;
+    }
 
-	return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_APPOINTMENT_ENTRYID]);
+    return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_APPOINTMENT_ENTRYID]);
 }
 
 /**
@@ -308,97 +308,97 @@ 
  * @param mixed $session
  */
 function getDefaultStore($session) {
-	$msgstorestable = mapi_getmsgstorestable($session);
+    $msgstorestable = mapi_getmsgstorestable($session);
 
-	$msgstores = mapi_table_queryallrows($msgstorestable, [PR_DEFAULT_STORE, PR_ENTRYID]);
+    $msgstores = mapi_table_queryallrows($msgstorestable, [PR_DEFAULT_STORE, PR_ENTRYID]);
 
-	foreach ($msgstores as $row) {
-		if ($row[PR_DEFAULT_STORE]) {
-			$storeentryid = $row[PR_ENTRYID];
+    foreach ($msgstores as $row) {
+        if ($row[PR_DEFAULT_STORE]) {
+            $storeentryid = $row[PR_ENTRYID];
 
-			break;
-		}
-	}
+            break;
+        }
+    }
 
-	if (!$storeentryid) {
-		echo "Can't find default store\n";
+    if (!$storeentryid) {
+        echo "Can't find default store\n";
 
-		return false;
-	}
+        return false;
+    }
 
-	return mapi_openmsgstore($session, $storeentryid);
+    return mapi_openmsgstore($session, $storeentryid);
 }
 
 function forceUTF8($category) {
-	$old_locale = setlocale($category, "");
-	if (!isset($old_locale) || !$old_locale) {
-		echo "Unable to initialize locale\n";
-
-		exit(1);
-	}
-	$dot = strpos($old_locale, ".");
-	if ($dot) {
-		if (strrchr($old_locale, ".") == ".UTF-8" || strrchr($old_locale, ".") == ".utf8") {
-			return true;
-		}
-		$old_locale = substr($old_locale, 0, $dot);
-	}
-	$new_locale = $old_locale . ".UTF-8";
-	$old_locale = setlocale($category, $new_locale);
-	if (!$old_locale) {
-		$new_locale = "en_US.UTF-8";
-		$old_locale = setlocale($category, $new_locale);
-	}
-	if (!$old_locale) {
-		echo "Unable to set locale {$new_locale}\n";
-
-		exit(1);
-	}
-
-	return true;
+    $old_locale = setlocale($category, "");
+    if (!isset($old_locale) || !$old_locale) {
+        echo "Unable to initialize locale\n";
+
+        exit(1);
+    }
+    $dot = strpos($old_locale, ".");
+    if ($dot) {
+        if (strrchr($old_locale, ".") == ".UTF-8" || strrchr($old_locale, ".") == ".utf8") {
+            return true;
+        }
+        $old_locale = substr($old_locale, 0, $dot);
+    }
+    $new_locale = $old_locale . ".UTF-8";
+    $old_locale = setlocale($category, $new_locale);
+    if (!$old_locale) {
+        $new_locale = "en_US.UTF-8";
+        $old_locale = setlocale($category, $new_locale);
+    }
+    if (!$old_locale) {
+        echo "Unable to set locale {$new_locale}\n";
+
+        exit(1);
+    }
+
+    return true;
 }
 
 if (!function_exists('mapi_zarafa_getuser_by_name')) {
-	/**
-	 * Retrieve the user information.
-	 *
-	 * @param MAPIResource $store
-	 * @param string       $username
-	 *
-	 * @returns array
-	 */
-	function mapi_zarafa_getuser_by_name($store, $username) {
-		$userInfo = get_user_info_by_name($username);
-
-		if (!is_array($userInfo)) {
-			return false;
-		}
-
-		return [
-			'userid' => $userInfo['uid'],
-			'username' => $username,
-			'fullname' => $userInfo['real_name'],
-			'emailaddress' => $username,
-			'admin' => 0,
-			'nonactive' => 0,
-		];
-	}
+    /**
+     * Retrieve the user information.
+     *
+     * @param MAPIResource $store
+     * @param string       $username
+     *
+     * @returns array
+     */
+    function mapi_zarafa_getuser_by_name($store, $username) {
+        $userInfo = get_user_info_by_name($username);
+
+        if (!is_array($userInfo)) {
+            return false;
+        }
+
+        return [
+            'userid' => $userInfo['uid'],
+            'username' => $username,
+            'fullname' => $userInfo['real_name'],
+            'emailaddress' => $username,
+            'admin' => 0,
+            'nonactive' => 0,
+        ];
+    }
 }
 
 function getGoidFromUid($uid) {
-	return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000" .
-				bin2hex(pack("V", 12 + strlen($uid)) . "vCal-Uid" . pack("V", 1) . $uid));
+    return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000" .
+                bin2hex(pack("V", 12 + strlen($uid)) . "vCal-Uid" . pack("V", 1) . $uid));
 }
 
 function getUidFromGoid($goid) {
-	// check if "vCal-Uid" is somewhere in outlookid case-insensitive
-	$uid = stristr($goid, "vCal-Uid");
-	if ($uid !== false) {
-		// get the length of the ical id - go back 4 position from where "vCal-Uid" was found
-		$begin = unpack("V", substr($goid, strlen($uid) * (-1) - 4, 4));
-		// remove "vCal-Uid" and packed "1" and use the ical id length
-		return substr($uid, 12, ($begin[1] - 12));
-	}
-
-	return null;
+    // check if "vCal-Uid" is somewhere in outlookid case-insensitive
+    $uid = stristr($goid, "vCal-Uid");
+    if ($uid !== false) {
+        // get the length of the ical id - go back 4 position from where "vCal-Uid" was found
+        $begin = unpack("V", substr($goid, strlen($uid) * (-1) - 4, 4));
+        // remove "vCal-Uid" and packed "1" and use the ical id length
+        return substr($uid, 12, ($begin[1] - 12));
+    }
+
+    return null;
 }

Spacing +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
 		// OR
 		[RES_OR,
 			[
-				[RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+				[RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
 					[
 						[RES_PROPERTY,
 							[RELOP => RELOP_GT,
@@ -247,7 +247,7 @@ 
 					],
 				],
 			], // EXISTS OR
-		];        // global OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

Braces +3 added lines, -6 removed lines

@@ -103,8 +103,7 @@ 
 
 		if (substr($split[2], 0, 2) == "0x") {
 			$id = hexdec(substr($split[2], 2));
-		}
-		else {
+		} else {
 			$id = $split[2];
 		}
 
@@ -114,8 +113,7 @@ 
 				$guids[$split[1]] = makeguid($split[1]);
 			}
 			$guid = $guids[$split[1]];
-		}
-		else {
+		} else {
 			$guid = constant($split[1]);
 		}
 
@@ -272,8 +270,7 @@ 
 				$item = $occurrence + $row;
 				array_push($items, $item);
 			}
-		}
-		else {
+		} else {
 			// Normal item, it matched the search criteria and therefore overlaps the interval <$viewstart, $viewend>
 			array_push($items, $row);
 		}

mapi/mapicode.php

Indentation +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
  * @param mixed $code
  */
 function make_mapi_e($code) {
-	return (int) mapi_make_scode(1, $code);
+    return (int) mapi_make_scode(1, $code);
 }
 
 /**
@@ -36,7 +36,7 @@ 
  * @param mixed $code
  */
 function make_mapi_s($code) {
-	return (int) mapi_make_scode(0, $code);
+    return (int) mapi_make_scode(0, $code);
 }
 
 /* From mapicode.h */

mapi/mapidefs.php

Spacing +77 added lines, -77 removed lines

@@ -16,40 +16,40 @@ 
 
 /* Object type */
 
-define('MAPI_STORE', 0x00000001);    /* Message Store */
-define('MAPI_ADDRBOOK', 0x00000002);    /* Address Book */
-define('MAPI_FOLDER', 0x00000003);    /* Folder */
-define('MAPI_ABCONT', 0x00000004);    /* Address Book Container */
-define('MAPI_MESSAGE', 0x00000005);    /* Message */
-define('MAPI_MAILUSER', 0x00000006);    /* Individual Recipient */
-define('MAPI_ATTACH', 0x00000007);    /* Attachment */
-define('MAPI_DISTLIST', 0x00000008);    /* Distribution List Recipient */
-define('MAPI_PROFSECT', 0x00000009);    /* Profile Section */
-define('MAPI_STATUS', 0x0000000A);    /* Status Object */
-define('MAPI_SESSION', 0x0000000B);    /* Session */
-define('MAPI_FORMINFO', 0x0000000C);    /* Form Information */
+define('MAPI_STORE', 0x00000001); /* Message Store */
+define('MAPI_ADDRBOOK', 0x00000002); /* Address Book */
+define('MAPI_FOLDER', 0x00000003); /* Folder */
+define('MAPI_ABCONT', 0x00000004); /* Address Book Container */
+define('MAPI_MESSAGE', 0x00000005); /* Message */
+define('MAPI_MAILUSER', 0x00000006); /* Individual Recipient */
+define('MAPI_ATTACH', 0x00000007); /* Attachment */
+define('MAPI_DISTLIST', 0x00000008); /* Distribution List Recipient */
+define('MAPI_PROFSECT', 0x00000009); /* Profile Section */
+define('MAPI_STATUS', 0x0000000A); /* Status Object */
+define('MAPI_SESSION', 0x0000000B); /* Session */
+define('MAPI_FORMINFO', 0x0000000C); /* Form Information */
 
 define('MV_FLAG', 0x1000);
 define('MV_INSTANCE', 0x2000);
 define('MVI_FLAG', MV_FLAG | MV_INSTANCE);
 
-define('PT_UNSPECIFIED', 0);    /* (Reserved for interface use) type doesn't matter to caller */
-define('PT_NULL', 1);    /* NULL property value */
-define('PT_I2', 2);    /* Signed 16-bit value */
-define('PT_LONG', 3);    /* Signed 32-bit value */
-define('PT_R4', 4);    /* 4-byte floating point */
-define('PT_DOUBLE', 5);    /* Floating point double */
-define('PT_CURRENCY', 6);    /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
-define('PT_APPTIME', 7);    /* Application time */
-define('PT_ERROR', 10);    /* 32-bit error value */
-define('PT_BOOLEAN', 11);    /* 16-bit boolean (non-zero true) */
-define('PT_OBJECT', 13);    /* Embedded object in a property */
-define('PT_I8', 20);    /* 8-byte signed integer */
-define('PT_STRING8', 30);    /* Null terminated 8-bit character string */
-define('PT_UNICODE', 31);    /* Null terminated Unicode string */
-define('PT_SYSTIME', 64);    /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
-define('PT_CLSID', 72);    /* OLE GUID */
-define('PT_BINARY', 258);   /* Uninterpreted (counted byte array) */
+define('PT_UNSPECIFIED', 0); /* (Reserved for interface use) type doesn't matter to caller */
+define('PT_NULL', 1); /* NULL property value */
+define('PT_I2', 2); /* Signed 16-bit value */
+define('PT_LONG', 3); /* Signed 32-bit value */
+define('PT_R4', 4); /* 4-byte floating point */
+define('PT_DOUBLE', 5); /* Floating point double */
+define('PT_CURRENCY', 6); /* Signed 64-bit int (decimal w/    4 digits right of decimal pt) */
+define('PT_APPTIME', 7); /* Application time */
+define('PT_ERROR', 10); /* 32-bit error value */
+define('PT_BOOLEAN', 11); /* 16-bit boolean (non-zero true) */
+define('PT_OBJECT', 13); /* Embedded object in a property */
+define('PT_I8', 20); /* 8-byte signed integer */
+define('PT_STRING8', 30); /* Null terminated 8-bit character string */
+define('PT_UNICODE', 31); /* Null terminated Unicode string */
+define('PT_SYSTIME', 64); /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */
+define('PT_CLSID', 72); /* OLE GUID */
+define('PT_BINARY', 258); /* Uninterpreted (counted byte array) */
 /* Changes are likely to these numbers, and to their structures. */
 
 /* Alternate property type names for ease of use */
@@ -190,14 +190,14 @@ 
 
 /* Values for PR_RESOURCE_TYPE, _METHODS, _FLAGS */
 
-define('MAPI_STORE_PROVIDER', 33);    /* Message Store */
-define('MAPI_AB', 34);    /* Address Book */
-define('MAPI_AB_PROVIDER', 35);    /* Address Book Provider */
-define('MAPI_TRANSPORT_PROVIDER', 36);    /* Transport Provider */
-define('MAPI_SPOOLER', 37);    /* Message Spooler */
-define('MAPI_PROFILE_PROVIDER', 38);    /* Profile Provider */
-define('MAPI_SUBSYSTEM', 39);    /* Overall Subsystem Status */
-define('MAPI_HOOK_PROVIDER', 40);    /* Spooler Hook */
+define('MAPI_STORE_PROVIDER', 33); /* Message Store */
+define('MAPI_AB', 34); /* Address Book */
+define('MAPI_AB_PROVIDER', 35); /* Address Book Provider */
+define('MAPI_TRANSPORT_PROVIDER', 36); /* Transport Provider */
+define('MAPI_SPOOLER', 37); /* Message Spooler */
+define('MAPI_PROFILE_PROVIDER', 38); /* Profile Provider */
+define('MAPI_SUBSYSTEM', 39); /* Overall Subsystem Status */
+define('MAPI_HOOK_PROVIDER', 40); /* Spooler Hook */
 define('STATUS_VALIDATE_STATE', 0x00000001);
 define('STATUS_SETTINGS_DIALOG', 0x00000002);
 define('STATUS_CHANGE_PASSWORD', 0x00000004);
@@ -243,10 +243,10 @@ 
 define('MODRECIP_MODIFY', 0x00000004);
 define('MODRECIP_REMOVE', 0x00000008);
 
-define('MAPI_ORIG', 0);          /* Recipient is message originator */
-define('MAPI_TO', 1);          /* Recipient is a primary recipient */
-define('MAPI_CC', 2);          /* Recipient is a copy recipient */
-define('MAPI_BCC', 3);          /* Recipient is blind copy recipient */
+define('MAPI_ORIG', 0); /* Recipient is message originator */
+define('MAPI_TO', 1); /* Recipient is a primary recipient */
+define('MAPI_CC', 2); /* Recipient is a copy recipient */
+define('MAPI_BCC', 3); /* Recipient is blind copy recipient */
 
 /* IAttach Interface ------------------------------------------------------- */
 
@@ -438,28 +438,28 @@ 
 define('BMR_NEZ', 0x00000001);
 
 /* array index values of restrictions -- same values are used in php-ext/main.cpp::PHPArraytoSRestriction() */
-define('VALUE', 0);        // propval
-define('RELOP', 1);        // compare method
-define('FUZZYLEVEL', 2);        // string search flags
-define('CB', 3);        // size restriction
-define('ULTYPE', 4);        // bit mask restriction type BMR_xxx
-define('ULMASK', 5);        // bitmask
-define('ULPROPTAG', 6);        // property
-define('ULPROPTAG1', 7);        // RES_COMPAREPROPS 1st property
-define('ULPROPTAG2', 8);        // RES_COMPAREPROPS 2nd property
-define('PROPS', 9);        // RES_COMMENT properties
-define('RESTRICTION', 10);        // RES_COMMENT and RES_SUBRESTRICTION restriction
+define('VALUE', 0); // propval
+define('RELOP', 1); // compare method
+define('FUZZYLEVEL', 2); // string search flags
+define('CB', 3); // size restriction
+define('ULTYPE', 4); // bit mask restriction type BMR_xxx
+define('ULMASK', 5); // bitmask
+define('ULPROPTAG', 6); // property
+define('ULPROPTAG1', 7); // RES_COMPAREPROPS 1st property
+define('ULPROPTAG2', 8); // RES_COMPAREPROPS 2nd property
+define('PROPS', 9); // RES_COMMENT properties
+define('RESTRICTION', 10); // RES_COMMENT and RES_SUBRESTRICTION restriction
 
 /* GUIDs for PR_MDB_PROVIDER */
-define("KOPANO_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}"));    // default store
-define("KOPANO_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}"));    // public store
-define("KOPANO_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}"));    // other store
-define("KOPANO_STORE_ARCHIVER_GUID", makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
+define("KOPANO_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}")); // default store
+define("KOPANO_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}")); // public store
+define("KOPANO_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}")); // other store
+define("KOPANO_STORE_ARCHIVER_GUID", makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}")); // archive store
 /* webapp depends on these yet */
-define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}"));    // default store
-define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}"));    // public store
-define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}"));    // other store
-define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}"));    // archive store
+define("ZARAFA_SERVICE_GUID", makeGuid("{3C253DCA-D227-443C-94FE-425FAB958C19}")); // default store
+define("ZARAFA_STORE_PUBLIC_GUID", makeGuid("{D47F4A09-D3BD-493C-B2FC-3C90BBCB48D4}")); // public store
+define("ZARAFA_STORE_DELEGATE_GUID", makeGuid("{7C7C1085-BC6D-4E53-9DAB-8A53F8DEF808}")); // other store
+define('ZARAFA_STORE_ARCHIVER_GUID', makeGuid("{BC8953AD-2E3F-4172-9404-896FF459870F}")); // archive store
 
 /* global profile section guid */
 define('pbGlobalProfileSectionGuid', makeGuid("{C8B0DB13-05AA-1A10-9BB0-00AA002FC45A}"));
@@ -576,11 +576,11 @@ 
 define('SYNC_NO_FOREIGN_KEYS', 0x100);
 define('SYNC_LIMITED_IMESSAGE', 0x200);
 define('SYNC_CATCHUP', 0x400);
-define('SYNC_NEW_MESSAGE', 0x800);   // only applicable to ImportMessageChange()
-define('SYNC_MSG_SELECTIVE', 0x1000);  // Used internally.      Will reject if used by clients.
+define('SYNC_NEW_MESSAGE', 0x800); // only applicable to ImportMessageChange()
+define('SYNC_MSG_SELECTIVE', 0x1000); // Used internally.      Will reject if used by clients.
 define('SYNC_BEST_BODY', 0x2000);
 define('SYNC_IGNORE_SPECIFIED_ON_ASSOCIATED', 0x4000);
-define('SYNC_PROGRESS_MODE', 0x8000);  // AirMapi progress mode
+define('SYNC_PROGRESS_MODE', 0x8000); // AirMapi progress mode
 define('SYNC_FXRECOVERMODE', 0x10000);
 define('SYNC_DEFER_CONFIG', 0x20000);
 define('SYNC_FORCE_UNICODE', 0x40000); // Forces server to return Unicode properties
@@ -591,23 +591,23 @@ 
 define('TBL_BATCH', 0x00000002); // Batch multiple table commands
 
 /* Flags for recipients in exceptions */
-define('recipSendable', 0x00000001);	// sendable attendee.
-define('recipOrganizer', 0x00000002);	// meeting organizer
-define('recipExceptionalResponse', 0x00000010);	// attendee gave a response for the exception
-define('recipExceptionalDeleted', 0x00000020);	// recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
-define('recipOriginal', 0x00000100);	// recipient is an original Attendee
+define('recipSendable', 0x00000001); // sendable attendee.
+define('recipOrganizer', 0x00000002); // meeting organizer
+define('recipExceptionalResponse', 0x00000010); // attendee gave a response for the exception
+define('recipExceptionalDeleted', 0x00000020); // recipientRow exists, but it is treated as if the corresponding recipient is deleted from meeting
+define('recipOriginal', 0x00000100); // recipient is an original Attendee
 define('recipReserved', 0x00000200);
 
 /* Flags which indicates type of Meeting Object */
-define('mtgEmpty', 0x00000000);	// Unspecified.
-define('mtgRequest', 0x00000001);	// Initial meeting request.
-define('mtgFull', 0x00010000);	// Full update.
-define('mtgInfo', 0x00020000);	// Informational update.
-define('mtgOutOfDate', 0x00080000);	// A newer Meeting Request object or Meeting Update object was received after this one.
-define('mtgDelegatorCopy', 0x00100000);	// This is set on the delegator's copy when a delegate will handle meeting-related objects.
-
-define('MAPI_ONE_OFF_UNICODE', 0x8000);		// the flag that defines whether the embedded strings are Unicode in one off entryids.
-define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001);		// the flag that specifies whether the recipient gets TNEF or not.
+define('mtgEmpty', 0x00000000); // Unspecified.
+define('mtgRequest', 0x00000001); // Initial meeting request.
+define('mtgFull', 0x00010000); // Full update.
+define('mtgInfo', 0x00020000); // Informational update.
+define('mtgOutOfDate', 0x00080000); // A newer Meeting Request object or Meeting Update object was received after this one.
+define('mtgDelegatorCopy', 0x00100000); // This is set on the delegator's copy when a delegate will handle meeting-related objects.
+
+define('MAPI_ONE_OFF_UNICODE', 0x8000); // the flag that defines whether the embedded strings are Unicode in one off entryids.
+define('MAPI_ONE_OFF_NO_RICH_INFO', 0x0001); // the flag that specifies whether the recipient gets TNEF or not.
 
 /* Mask flags for mapi_msgstore_advise */
 define('fnevCriticalError', 0x00000001);

mapi/class.mapiexception.php

Indentation +51 added lines, -51 removed lines

@@ -5,62 +5,62 @@
  * SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
  */
 
-	/**
-	 * MAPIException
-	 * if enabled using mapi_enable_exceptions then php-ext can throw exceptions when
-	 * any error occurs in mapi calls. this exception will only be thrown when severity bit is set in
-	 * error code that means it will be thrown only for mapi errors not for mapi warnings.
-	 */
-	class MAPIException extends BaseException {
-		/**
-		 * Function will return display message of exception if its set by the callee.
-		 * if it is not set then we are generating some default display messages based
-		 * on mapi error code.
-		 *
-		 * @return string returns error-message that should be sent to client to display
-		 */
-		public function getDisplayMessage() {
-			if (!empty($this->displayMessage)) {
-				return $this->displayMessage;
-			}
+    /**
+     * MAPIException
+     * if enabled using mapi_enable_exceptions then php-ext can throw exceptions when
+     * any error occurs in mapi calls. this exception will only be thrown when severity bit is set in
+     * error code that means it will be thrown only for mapi errors not for mapi warnings.
+     */
+    class MAPIException extends BaseException {
+        /**
+         * Function will return display message of exception if its set by the callee.
+         * if it is not set then we are generating some default display messages based
+         * on mapi error code.
+         *
+         * @return string returns error-message that should be sent to client to display
+         */
+        public function getDisplayMessage() {
+            if (!empty($this->displayMessage)) {
+                return $this->displayMessage;
+            }
 
-			switch ($this->getCode()) {
-			case MAPI_E_NO_ACCESS:
-				return dgettext("kopano", "You have insufficient privileges to open this object.");
+            switch ($this->getCode()) {
+            case MAPI_E_NO_ACCESS:
+                return dgettext("kopano", "You have insufficient privileges to open this object.");
 
-			case MAPI_E_LOGON_FAILED:
-			case MAPI_E_UNCONFIGURED:
-				return dgettext("kopano", "Logon Failed. Please check your username/password.");
+            case MAPI_E_LOGON_FAILED:
+            case MAPI_E_UNCONFIGURED:
+                return dgettext("kopano", "Logon Failed. Please check your username/password.");
 
-			case MAPI_E_NETWORK_ERROR:
-				return dgettext("kopano", "Can not connect to Kopano server.");
+            case MAPI_E_NETWORK_ERROR:
+                return dgettext("kopano", "Can not connect to Kopano server.");
 
-			case MAPI_E_UNKNOWN_ENTRYID:
-				return dgettext("kopano", "Can not open object with provided id.");
+            case MAPI_E_UNKNOWN_ENTRYID:
+                return dgettext("kopano", "Can not open object with provided id.");
 
-			case MAPI_E_NO_RECIPIENTS:
-				return dgettext("kopano", "There are no recipients in the message.");
+            case MAPI_E_NO_RECIPIENTS:
+                return dgettext("kopano", "There are no recipients in the message.");
 
-			case MAPI_E_NOT_FOUND:
-				return dgettext("kopano", "Can not find object.");
+            case MAPI_E_NOT_FOUND:
+                return dgettext("kopano", "Can not find object.");
 
-			case MAPI_E_INTERFACE_NOT_SUPPORTED:
-			case MAPI_E_INVALID_PARAMETER:
-			case MAPI_E_INVALID_ENTRYID:
-			case MAPI_E_INVALID_OBJECT:
-			case MAPI_E_TOO_COMPLEX:
-			case MAPI_E_CORRUPT_DATA:
-			case MAPI_E_END_OF_SESSION:
-			case MAPI_E_AMBIGUOUS_RECIP:
-			case MAPI_E_COLLISION:
-			case MAPI_E_UNCONFIGURED:
-			default:
-				return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
-			}
-		}
-	}
+            case MAPI_E_INTERFACE_NOT_SUPPORTED:
+            case MAPI_E_INVALID_PARAMETER:
+            case MAPI_E_INVALID_ENTRYID:
+            case MAPI_E_INVALID_OBJECT:
+            case MAPI_E_TOO_COMPLEX:
+            case MAPI_E_CORRUPT_DATA:
+            case MAPI_E_END_OF_SESSION:
+            case MAPI_E_AMBIGUOUS_RECIP:
+            case MAPI_E_COLLISION:
+            case MAPI_E_UNCONFIGURED:
+            default:
+                return sprintf(dgettext("kopano", "Unknown MAPI Error: %s"), get_mapi_error_name($this->getCode()));
+            }
+        }
+    }
 
-	// Tell the PHP extension which exception class to instantiate
-	if (function_exists('mapi_enable_exceptions')) {
-		mapi_enable_exceptions("mapiexception");
-	}
+    // Tell the PHP extension which exception class to instantiate
+    if (function_exists('mapi_enable_exceptions')) {
+        mapi_enable_exceptions("mapiexception");
+    }