grommunio / grommunio-sync

version.php

Indentation +9 added lines, -9 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	$branch = trim(exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \\(.*\\)/\\1/\""));
 	$version = exec("hash git 2>/dev/null && cd {$path} >/dev/null 2>&1 && git describe  --always 2>/dev/null");
 	if ($branch && $version) {
-		define("GROMMUNIOSYNC_VERSION", $branch . '-' . $version);
+		define("GROMMUNIOSYNC_VERSION", $branch.'-'.$version);
 	}
 	else {
 		define("GROMMUNIOSYNC_VERSION", "GIT");

Braces +1 added lines, -2 removed lines

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

mapi/class.meetingrequest.php

Indentation +3796 added lines, -3796 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 class Meetingrequest {
-	/*
+    /*
 	 * NOTE
 	 *
 	 * This class is designed to modify and update meeting request properties
@@ -22,7 +22,7 @@ 
 	 *
 	 */
 
-	/*
+    /*
 	 * How to use
 	 * ----------
 	 *
@@ -73,666 +73,666 @@ 
 	 *     meeting object from calendar
 	 */
 
-	// All properties for a recipient that are interesting
-	public $recipprops = [
-		PR_ENTRYID,
-		PR_DISPLAY_NAME,
-		PR_EMAIL_ADDRESS,
-		PR_RECIPIENT_ENTRYID,
-		PR_RECIPIENT_TYPE,
-		PR_SEND_INTERNET_ENCODING,
-		PR_SEND_RICH_INFO,
-		PR_RECIPIENT_DISPLAY_NAME,
-		PR_ADDRTYPE,
-		PR_DISPLAY_TYPE,
-		PR_DISPLAY_TYPE_EX,
-		PR_RECIPIENT_TRACKSTATUS,
-		PR_RECIPIENT_TRACKSTATUS_TIME,
-		PR_RECIPIENT_FLAGS,
-		PR_ROWID,
-		PR_OBJECT_TYPE,
-		PR_SEARCH_KEY,
-	];
-
-	/**
-	 * Indication whether the setting of resources in a Meeting Request is success (false) or if it
-	 * has failed (integer).
-	 */
-	public $errorSetResource;
-
-	private $proptags;
-	private $store;
-	private $message;
-	private $session;
-	private $meetingTimeInfo;
-	private $enableDirectBooking;
-	private $includesResources;
-	private $nonAcceptingResources;
-	private $recipientDisplayname;
-
-	/**
-	 * Constructor.
-	 *
-	 * Takes a store and a message. The message is an appointment item
-	 * that should be converted into a meeting request or an incoming
-	 * e-mail message that is a meeting request.
-	 *
-	 * The $session variable is optional, but required if the following features
-	 * are to be used:
-	 *
-	 * - Sending meeting requests for meetings that are not in your own store
-	 * - Sending meeting requests to resources, resource availability checking and resource freebusy updates
-	 *
-	 * @param mixed $store
-	 * @param mixed $message
-	 * @param mixed $session
-	 * @param mixed $enableDirectBooking
-	 */
-	public function __construct($store, $message, $session = false, $enableDirectBooking = true) {
-		$this->store = $store;
-		$this->message = $message;
-		$this->session = $session;
-		// This variable string saves time information for the MR.
-		$this->meetingTimeInfo = false;
-		$this->enableDirectBooking = $enableDirectBooking;
-
-		$properties['goid'] = 'PT_BINARY:PSETID_Meeting:0x3';
-		$properties['goid2'] = 'PT_BINARY:PSETID_Meeting:0x23';
-		$properties['type'] = 'PT_STRING8:PSETID_Meeting:0x24';
-		$properties['meetingrecurring'] = 'PT_BOOLEAN:PSETID_Meeting:0x5';
-		$properties['unknown2'] = 'PT_BOOLEAN:PSETID_Meeting:0xa';
-		$properties['attendee_critical_change'] = 'PT_SYSTIME:PSETID_Meeting:0x1';
-		$properties['owner_critical_change'] = 'PT_SYSTIME:PSETID_Meeting:0x1a';
-		$properties['meetingstatus'] = 'PT_LONG:PSETID_Appointment:0x8217';
-		$properties['responsestatus'] = 'PT_LONG:PSETID_Appointment:0x8218';
-		$properties['unknown6'] = 'PT_LONG:PSETID_Meeting:0x4';
-		$properties['replytime'] = 'PT_SYSTIME:PSETID_Appointment:0x8220';
-		$properties['usetnef'] = 'PT_BOOLEAN:PSETID_Common:0x8582';
-		$properties['recurrence_data'] = 'PT_BINARY:PSETID_Appointment:0x8216';
-		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
-		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
-		$properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201';                    // AppointmentSequenceNumber
-		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';            // AppointmentLastSequence
-		$properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
-		$properties['busystatus'] = 'PT_LONG:PSETID_Appointment:0x8205';
-		$properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:0x8224';
-		$properties['start'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
-		$properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
-		$properties['location'] = 'PT_STRING8:PSETID_Appointment:0x8208';
-		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';        // PidLidFInvited, MeetingRequestWasSent
-		$properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
-		$properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:0x820e';
-		$properties['flagdueby'] = 'PT_SYSTIME:PSETID_Common:0x8560';
-		$properties['commonstart'] = 'PT_SYSTIME:PSETID_Common:0x8516';
-		$properties['commonend'] = 'PT_SYSTIME:PSETID_Common:0x8517';
-		$properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:0x8223';
-		$properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:0x8235';
-		$properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:0x8236';
-		$properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD';                // StartRecurTime
-		$properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE';                // StartRecurTime
-		$properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF';                // EndRecurDate
-		$properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10';                // EndRecurTime
-		$properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA';                // LID_IS_EXCEPTION
-		$properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
-		// Propose new time properties
-		$properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8250';
-		$properties['proposed_end_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8251';
-		$properties['proposed_duration'] = 'PT_LONG:PSETID_Appointment:0x8256';
-		$properties['counter_proposal'] = 'PT_BOOLEAN:PSETID_Appointment:0x8257';
-		$properties['recurring_pattern'] = 'PT_STRING8:PSETID_Appointment:0x8232';
-		$properties['basedate'] = 'PT_SYSTIME:PSETID_Appointment:0x8228';
-		$properties['meetingtype'] = 'PT_LONG:PSETID_Meeting:0x26';
-		$properties['timezone_data'] = 'PT_BINARY:PSETID_Appointment:0x8233';
-		$properties['timezone'] = 'PT_STRING8:PSETID_Appointment:0x8234';
-		$properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
-		$properties['toattendeesstring'] = 'PT_STRING8:PSETID_Appointment:0x823B';
-		$properties['ccattendeesstring'] = 'PT_STRING8:PSETID_Appointment:0x823C';
-
-		$this->proptags = getPropIdsFromStrings($store, $properties);
-	}
-
-	/**
-	 * Sets the direct booking property. This is an alternative to the setting of the direct booking
-	 * property through the constructor. However, setting it in the constructor is preferred.
-	 *
-	 * @param bool $directBookingSetting
-	 */
-	public function setDirectBooking($directBookingSetting) {
-		$this->enableDirectBooking = $directBookingSetting;
-	}
-
-	/**
-	 * Returns TRUE if the message pointed to is an incoming meeting request and should
-	 * therefore be replied to with doAccept or doDecline().
-	 *
-	 * @param string $messageClass message class to use for checking
-	 *
-	 * @return bool returns true if this is a meeting request else false
-	 */
-	public function isMeetingRequest($messageClass = false) {
-		if ($messageClass === false) {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-			$messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
-		}
-
-		if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.request') === 0) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns TRUE if the message pointed to is a returning meeting request response.
-	 *
-	 * @param string $messageClass message class to use for checking
-	 *
-	 * @return bool returns true if this is a meeting request else false
-	 */
-	public function isMeetingRequestResponse($messageClass = false) {
-		if ($messageClass === false) {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-			$messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
-		}
-
-		if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.resp') === 0) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns TRUE if the message pointed to is a cancellation request.
-	 *
-	 * @param string $messageClass message class to use for checking
-	 *
-	 * @return bool returns true if this is a meeting request else false
-	 */
-	public function isMeetingCancellation($messageClass = false) {
-		if ($messageClass === false) {
-			$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
-			$messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
-		}
-
-		if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.canceled') === 0) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Function is used to get the last update counter of meeting request.
-	 *
-	 * @return bool|Number false when last_updatecounter not found else return last_updatecounter
-	 */
-	public function getLastUpdateCounter() {
-		$calendarItemProps = mapi_getprops($this->message, [$this->proptags['last_updatecounter']]);
-		if (isset($calendarItemProps) && !empty($calendarItemProps)) {
-			return $calendarItemProps[$this->proptags['last_updatecounter']];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Process an incoming meeting request response. This updates the appointment
-	 * in your calendar to show whether the user has accepted or declined.
-	 */
-	public function processMeetingRequestResponse() {
-		if (!$this->isMeetingRequestResponse()) {
-			return;
-		}
-
-		if (!$this->isLocalOrganiser()) {
-			return;
-		}
-
-		// Get information we need from the response message
-		$messageprops = mapi_getprops($this->message, [
-			$this->proptags['goid'],
-			$this->proptags['goid2'],
-			PR_OWNER_APPT_ID,
-			PR_SENT_REPRESENTING_EMAIL_ADDRESS,
-			PR_SENT_REPRESENTING_NAME,
-			PR_SENT_REPRESENTING_ADDRTYPE,
-			PR_SENT_REPRESENTING_ENTRYID,
-			PR_SENT_REPRESENTING_SEARCH_KEY,
-			PR_MESSAGE_DELIVERY_TIME,
-			PR_MESSAGE_CLASS,
-			PR_PROCESSED,
-			PR_RCVD_REPRESENTING_ENTRYID,
-			$this->proptags['proposed_start_whole'],
-			$this->proptags['proposed_end_whole'],
-			$this->proptags['proposed_duration'],
-			$this->proptags['counter_proposal'],
-			$this->proptags['attendee_critical_change'],
-		]);
-
-		$goid2 = $messageprops[$this->proptags['goid2']];
-
-		if (!isset($goid2) || !isset($messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS])) {
-			return;
-		}
-
-		// Find basedate in GlobalID(0x3), this can be a response for an occurrence
-		$basedate = $this->getBasedateFromGlobalID($messageprops[$this->proptags['goid']]);
-
-		// check if delegate is processing the response
-		if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$userStore = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$userStore = $this->store;
-			$calFolder = $this->openDefaultCalendar();
-		}
-
-		// check for calendar access
-		if ($this->checkCalendarWriteAccess($userStore) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// allow caller to fill the error message
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		$calendarItem = $this->getCorrespondentCalendarItem(true);
-
-		// Open the calendar items, and update all the recipients of the calendar item that match
-		// the email address of the response.
-		if ($calendarItem !== false) {
-			$this->processResponse($userStore, $calendarItem, $basedate, $messageprops);
-		}
-	}
-
-	/**
-	 * Process every incoming MeetingRequest response.This updates the appointment
-	 * in your calendar to show whether the user has accepted or declined.
-	 *
-	 * @param resource    $store        contains the userStore in which the meeting is created
-	 * @param MAPIMessage $calendarItem resource of the calendar item for which this response has arrived
-	 * @param bool        $basedate     if present the create an exception
-	 * @param array       $messageprops contains message properties
-	 */
-	public function processResponse($store, $calendarItem, $basedate, $messageprops) {
-		$senderentryid = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
-		$messageclass = $messageprops[PR_MESSAGE_CLASS];
-		$deliverytime = $messageprops[PR_MESSAGE_DELIVERY_TIME];
-
-		// Open the calendar item, find the sender in the recipient table and update all the recipients of the calendar item that match
-		// the email address of the response.
-		$calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['recurring'], PR_STORE_ENTRYID, PR_PARENT_ENTRYID, PR_ENTRYID, $this->proptags['updatecounter']]);
-
-		// check if meeting response is already processed
-		if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
-			// meeting is already processed
-			return;
-		}
-		mapi_setprops($this->message, [PR_PROCESSED => true]);
-		mapi_savechanges($this->message);
-
-		// if meeting is updated in organizer's calendar then we don't need to process
-		// old response
-		if ($this->isMeetingUpdated($basedate)) {
-			return;
-		}
-
-		// If basedate is found, then create/modify exception msg and do processing
-		if ($basedate && isset($calendarItemProps[$this->proptags['recurring']]) && $calendarItemProps[$this->proptags['recurring']] === true) {
-			$recurr = new Recurrence($store, $calendarItem);
-
-			// Copy properties from meeting request
-			$exception_props = mapi_getprops($this->message, [
-				PR_OWNER_APPT_ID,
-				$this->proptags['proposed_start_whole'],
-				$this->proptags['proposed_end_whole'],
-				$this->proptags['proposed_duration'],
-				$this->proptags['counter_proposal'],
-			]);
-
-			// Create/modify exception
-			if ($recurr->isException($basedate)) {
-				$recurr->modifyException($exception_props, $basedate);
-			}
-			else {
-				// When we are creating an exception we need copy recipients from main recurring item
-				$recipTable = mapi_message_getrecipienttable($calendarItem);
-				$recips = mapi_table_queryallrows($recipTable, $this->recipprops);
-
-				// Retrieve actual start/due dates from calendar item.
-				$exception_props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
-				$exception_props[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
-
-				$recurr->createException($exception_props, $basedate, false, $recips);
-			}
-
-			mapi_savechanges($calendarItem);
-
-			$attach = $recurr->getExceptionAttachment($basedate);
-			if ($attach) {
-				$recurringItem = $calendarItem;
-				$calendarItem = mapi_attach_openobj($attach, MAPI_MODIFY);
-			}
-			else {
-				return false;
-			}
-		}
-
-		// Get the recipients of the calendar item
-		$reciptable = mapi_message_getrecipienttable($calendarItem);
-		$recipients = mapi_table_queryallrows($reciptable, $this->recipprops);
-
-		// FIXME we should look at the updatecounter property and compare it
-		// to the counter in the recipient to see if this update is actually
-		// newer than the status in the calendar item
-		$found = false;
-
-		$totalrecips = 0;
-		$acceptedrecips = 0;
-		foreach ($recipients as $recipient) {
-			++$totalrecips;
-			if (isset($recipient[PR_ENTRYID]) && $this->compareABEntryIDs($recipient[PR_ENTRYID], $senderentryid)) {
-				$found = true;
-
-				/*
+    // All properties for a recipient that are interesting
+    public $recipprops = [
+        PR_ENTRYID,
+        PR_DISPLAY_NAME,
+        PR_EMAIL_ADDRESS,
+        PR_RECIPIENT_ENTRYID,
+        PR_RECIPIENT_TYPE,
+        PR_SEND_INTERNET_ENCODING,
+        PR_SEND_RICH_INFO,
+        PR_RECIPIENT_DISPLAY_NAME,
+        PR_ADDRTYPE,
+        PR_DISPLAY_TYPE,
+        PR_DISPLAY_TYPE_EX,
+        PR_RECIPIENT_TRACKSTATUS,
+        PR_RECIPIENT_TRACKSTATUS_TIME,
+        PR_RECIPIENT_FLAGS,
+        PR_ROWID,
+        PR_OBJECT_TYPE,
+        PR_SEARCH_KEY,
+    ];
+
+    /**
+     * Indication whether the setting of resources in a Meeting Request is success (false) or if it
+     * has failed (integer).
+     */
+    public $errorSetResource;
+
+    private $proptags;
+    private $store;
+    private $message;
+    private $session;
+    private $meetingTimeInfo;
+    private $enableDirectBooking;
+    private $includesResources;
+    private $nonAcceptingResources;
+    private $recipientDisplayname;
+
+    /**
+     * Constructor.
+     *
+     * Takes a store and a message. The message is an appointment item
+     * that should be converted into a meeting request or an incoming
+     * e-mail message that is a meeting request.
+     *
+     * The $session variable is optional, but required if the following features
+     * are to be used:
+     *
+     * - Sending meeting requests for meetings that are not in your own store
+     * - Sending meeting requests to resources, resource availability checking and resource freebusy updates
+     *
+     * @param mixed $store
+     * @param mixed $message
+     * @param mixed $session
+     * @param mixed $enableDirectBooking
+     */
+    public function __construct($store, $message, $session = false, $enableDirectBooking = true) {
+        $this->store = $store;
+        $this->message = $message;
+        $this->session = $session;
+        // This variable string saves time information for the MR.
+        $this->meetingTimeInfo = false;
+        $this->enableDirectBooking = $enableDirectBooking;
+
+        $properties['goid'] = 'PT_BINARY:PSETID_Meeting:0x3';
+        $properties['goid2'] = 'PT_BINARY:PSETID_Meeting:0x23';
+        $properties['type'] = 'PT_STRING8:PSETID_Meeting:0x24';
+        $properties['meetingrecurring'] = 'PT_BOOLEAN:PSETID_Meeting:0x5';
+        $properties['unknown2'] = 'PT_BOOLEAN:PSETID_Meeting:0xa';
+        $properties['attendee_critical_change'] = 'PT_SYSTIME:PSETID_Meeting:0x1';
+        $properties['owner_critical_change'] = 'PT_SYSTIME:PSETID_Meeting:0x1a';
+        $properties['meetingstatus'] = 'PT_LONG:PSETID_Appointment:0x8217';
+        $properties['responsestatus'] = 'PT_LONG:PSETID_Appointment:0x8218';
+        $properties['unknown6'] = 'PT_LONG:PSETID_Meeting:0x4';
+        $properties['replytime'] = 'PT_SYSTIME:PSETID_Appointment:0x8220';
+        $properties['usetnef'] = 'PT_BOOLEAN:PSETID_Common:0x8582';
+        $properties['recurrence_data'] = 'PT_BINARY:PSETID_Appointment:0x8216';
+        $properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
+        $properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
+        $properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
+        $properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201';                    // AppointmentSequenceNumber
+        $properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';            // AppointmentLastSequence
+        $properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
+        $properties['busystatus'] = 'PT_LONG:PSETID_Appointment:0x8205';
+        $properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:0x8224';
+        $properties['start'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
+        $properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
+        $properties['location'] = 'PT_STRING8:PSETID_Appointment:0x8208';
+        $properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';        // PidLidFInvited, MeetingRequestWasSent
+        $properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
+        $properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:0x820e';
+        $properties['flagdueby'] = 'PT_SYSTIME:PSETID_Common:0x8560';
+        $properties['commonstart'] = 'PT_SYSTIME:PSETID_Common:0x8516';
+        $properties['commonend'] = 'PT_SYSTIME:PSETID_Common:0x8517';
+        $properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:0x8223';
+        $properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:0x8235';
+        $properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:0x8236';
+        $properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD';                // StartRecurTime
+        $properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE';                // StartRecurTime
+        $properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF';                // EndRecurDate
+        $properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10';                // EndRecurTime
+        $properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA';                // LID_IS_EXCEPTION
+        $properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
+        // Propose new time properties
+        $properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8250';
+        $properties['proposed_end_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8251';
+        $properties['proposed_duration'] = 'PT_LONG:PSETID_Appointment:0x8256';
+        $properties['counter_proposal'] = 'PT_BOOLEAN:PSETID_Appointment:0x8257';
+        $properties['recurring_pattern'] = 'PT_STRING8:PSETID_Appointment:0x8232';
+        $properties['basedate'] = 'PT_SYSTIME:PSETID_Appointment:0x8228';
+        $properties['meetingtype'] = 'PT_LONG:PSETID_Meeting:0x26';
+        $properties['timezone_data'] = 'PT_BINARY:PSETID_Appointment:0x8233';
+        $properties['timezone'] = 'PT_STRING8:PSETID_Appointment:0x8234';
+        $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords";
+        $properties['toattendeesstring'] = 'PT_STRING8:PSETID_Appointment:0x823B';
+        $properties['ccattendeesstring'] = 'PT_STRING8:PSETID_Appointment:0x823C';
+
+        $this->proptags = getPropIdsFromStrings($store, $properties);
+    }
+
+    /**
+     * Sets the direct booking property. This is an alternative to the setting of the direct booking
+     * property through the constructor. However, setting it in the constructor is preferred.
+     *
+     * @param bool $directBookingSetting
+     */
+    public function setDirectBooking($directBookingSetting) {
+        $this->enableDirectBooking = $directBookingSetting;
+    }
+
+    /**
+     * Returns TRUE if the message pointed to is an incoming meeting request and should
+     * therefore be replied to with doAccept or doDecline().
+     *
+     * @param string $messageClass message class to use for checking
+     *
+     * @return bool returns true if this is a meeting request else false
+     */
+    public function isMeetingRequest($messageClass = false) {
+        if ($messageClass === false) {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+            $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
+        }
+
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.request') === 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns TRUE if the message pointed to is a returning meeting request response.
+     *
+     * @param string $messageClass message class to use for checking
+     *
+     * @return bool returns true if this is a meeting request else false
+     */
+    public function isMeetingRequestResponse($messageClass = false) {
+        if ($messageClass === false) {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+            $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
+        }
+
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.resp') === 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns TRUE if the message pointed to is a cancellation request.
+     *
+     * @param string $messageClass message class to use for checking
+     *
+     * @return bool returns true if this is a meeting request else false
+     */
+    public function isMeetingCancellation($messageClass = false) {
+        if ($messageClass === false) {
+            $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS]);
+            $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
+        }
+
+        if ($messageClass !== false && stripos($messageClass, 'ipm.schedule.meeting.canceled') === 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Function is used to get the last update counter of meeting request.
+     *
+     * @return bool|Number false when last_updatecounter not found else return last_updatecounter
+     */
+    public function getLastUpdateCounter() {
+        $calendarItemProps = mapi_getprops($this->message, [$this->proptags['last_updatecounter']]);
+        if (isset($calendarItemProps) && !empty($calendarItemProps)) {
+            return $calendarItemProps[$this->proptags['last_updatecounter']];
+        }
+
+        return false;
+    }
+
+    /**
+     * Process an incoming meeting request response. This updates the appointment
+     * in your calendar to show whether the user has accepted or declined.
+     */
+    public function processMeetingRequestResponse() {
+        if (!$this->isMeetingRequestResponse()) {
+            return;
+        }
+
+        if (!$this->isLocalOrganiser()) {
+            return;
+        }
+
+        // Get information we need from the response message
+        $messageprops = mapi_getprops($this->message, [
+            $this->proptags['goid'],
+            $this->proptags['goid2'],
+            PR_OWNER_APPT_ID,
+            PR_SENT_REPRESENTING_EMAIL_ADDRESS,
+            PR_SENT_REPRESENTING_NAME,
+            PR_SENT_REPRESENTING_ADDRTYPE,
+            PR_SENT_REPRESENTING_ENTRYID,
+            PR_SENT_REPRESENTING_SEARCH_KEY,
+            PR_MESSAGE_DELIVERY_TIME,
+            PR_MESSAGE_CLASS,
+            PR_PROCESSED,
+            PR_RCVD_REPRESENTING_ENTRYID,
+            $this->proptags['proposed_start_whole'],
+            $this->proptags['proposed_end_whole'],
+            $this->proptags['proposed_duration'],
+            $this->proptags['counter_proposal'],
+            $this->proptags['attendee_critical_change'],
+        ]);
+
+        $goid2 = $messageprops[$this->proptags['goid2']];
+
+        if (!isset($goid2) || !isset($messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS])) {
+            return;
+        }
+
+        // Find basedate in GlobalID(0x3), this can be a response for an occurrence
+        $basedate = $this->getBasedateFromGlobalID($messageprops[$this->proptags['goid']]);
+
+        // check if delegate is processing the response
+        if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $userStore = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $userStore = $this->store;
+            $calFolder = $this->openDefaultCalendar();
+        }
+
+        // check for calendar access
+        if ($this->checkCalendarWriteAccess($userStore) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // allow caller to fill the error message
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        $calendarItem = $this->getCorrespondentCalendarItem(true);
+
+        // Open the calendar items, and update all the recipients of the calendar item that match
+        // the email address of the response.
+        if ($calendarItem !== false) {
+            $this->processResponse($userStore, $calendarItem, $basedate, $messageprops);
+        }
+    }
+
+    /**
+     * Process every incoming MeetingRequest response.This updates the appointment
+     * in your calendar to show whether the user has accepted or declined.
+     *
+     * @param resource    $store        contains the userStore in which the meeting is created
+     * @param MAPIMessage $calendarItem resource of the calendar item for which this response has arrived
+     * @param bool        $basedate     if present the create an exception
+     * @param array       $messageprops contains message properties
+     */
+    public function processResponse($store, $calendarItem, $basedate, $messageprops) {
+        $senderentryid = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
+        $messageclass = $messageprops[PR_MESSAGE_CLASS];
+        $deliverytime = $messageprops[PR_MESSAGE_DELIVERY_TIME];
+
+        // Open the calendar item, find the sender in the recipient table and update all the recipients of the calendar item that match
+        // the email address of the response.
+        $calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['recurring'], PR_STORE_ENTRYID, PR_PARENT_ENTRYID, PR_ENTRYID, $this->proptags['updatecounter']]);
+
+        // check if meeting response is already processed
+        if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+            // meeting is already processed
+            return;
+        }
+        mapi_setprops($this->message, [PR_PROCESSED => true]);
+        mapi_savechanges($this->message);
+
+        // if meeting is updated in organizer's calendar then we don't need to process
+        // old response
+        if ($this->isMeetingUpdated($basedate)) {
+            return;
+        }
+
+        // If basedate is found, then create/modify exception msg and do processing
+        if ($basedate && isset($calendarItemProps[$this->proptags['recurring']]) && $calendarItemProps[$this->proptags['recurring']] === true) {
+            $recurr = new Recurrence($store, $calendarItem);
+
+            // Copy properties from meeting request
+            $exception_props = mapi_getprops($this->message, [
+                PR_OWNER_APPT_ID,
+                $this->proptags['proposed_start_whole'],
+                $this->proptags['proposed_end_whole'],
+                $this->proptags['proposed_duration'],
+                $this->proptags['counter_proposal'],
+            ]);
+
+            // Create/modify exception
+            if ($recurr->isException($basedate)) {
+                $recurr->modifyException($exception_props, $basedate);
+            }
+            else {
+                // When we are creating an exception we need copy recipients from main recurring item
+                $recipTable = mapi_message_getrecipienttable($calendarItem);
+                $recips = mapi_table_queryallrows($recipTable, $this->recipprops);
+
+                // Retrieve actual start/due dates from calendar item.
+                $exception_props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
+                $exception_props[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
+
+                $recurr->createException($exception_props, $basedate, false, $recips);
+            }
+
+            mapi_savechanges($calendarItem);
+
+            $attach = $recurr->getExceptionAttachment($basedate);
+            if ($attach) {
+                $recurringItem = $calendarItem;
+                $calendarItem = mapi_attach_openobj($attach, MAPI_MODIFY);
+            }
+            else {
+                return false;
+            }
+        }
+
+        // Get the recipients of the calendar item
+        $reciptable = mapi_message_getrecipienttable($calendarItem);
+        $recipients = mapi_table_queryallrows($reciptable, $this->recipprops);
+
+        // FIXME we should look at the updatecounter property and compare it
+        // to the counter in the recipient to see if this update is actually
+        // newer than the status in the calendar item
+        $found = false;
+
+        $totalrecips = 0;
+        $acceptedrecips = 0;
+        foreach ($recipients as $recipient) {
+            ++$totalrecips;
+            if (isset($recipient[PR_ENTRYID]) && $this->compareABEntryIDs($recipient[PR_ENTRYID], $senderentryid)) {
+                $found = true;
+
+                /*
 				 * If value of attendee_critical_change on meeting response mail is less than PR_RECIPIENT_TRACKSTATUS_TIME
 				 * on the corresponding recipientRow of meeting then we ignore this response mail.
 				 */
-				if (isset($recipient[PR_RECIPIENT_TRACKSTATUS_TIME]) && ($messageprops[$this->proptags['attendee_critical_change']] < $recipient[PR_RECIPIENT_TRACKSTATUS_TIME])) {
-					continue;
-				}
-
-				// The email address matches, update the row
-				$recipient[PR_RECIPIENT_TRACKSTATUS] = $this->getTrackStatus($messageclass);
-				$recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $messageprops[$this->proptags['attendee_critical_change']];
-
-				// If this is a counter proposal, set the proposal properties in the recipient row
-				if (isset($messageprops[$this->proptags['counter_proposal']]) && $messageprops[$this->proptags['counter_proposal']]) {
-					$recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
-					$recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
-					$recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
-				}
-
-				mapi_message_modifyrecipients($calendarItem, MODRECIP_MODIFY, [$recipient]);
-			}
-			if (isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
-				++$acceptedrecips;
-			}
-		}
-
-		// If the recipient was not found in the original calendar item,
-		// then add the recpient as a new optional recipient
-		if (!$found) {
-			$recipient = [];
-			$recipient[PR_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
-			$recipient[PR_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
-			$recipient[PR_DISPLAY_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
-			$recipient[PR_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
-			$recipient[PR_RECIPIENT_TYPE] = MAPI_CC;
-			$recipient[PR_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
-			$recipient[PR_RECIPIENT_TRACKSTATUS] = $this->getTrackStatus($messageclass);
-			$recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $deliverytime;
-
-			// If this is a counter proposal, set the proposal properties in the recipient row
-			if (isset($messageprops[$this->proptags['counter_proposal']])) {
-				$recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
-				$recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
-				$recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
-			}
-
-			mapi_message_modifyrecipients($calendarItem, MODRECIP_ADD, [$recipient]);
-			++$totalrecips;
-			if ($recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
-				++$acceptedrecips;
-			}
-		}
-
-		// TODO: Update counter proposal number property on message
-		/*
+                if (isset($recipient[PR_RECIPIENT_TRACKSTATUS_TIME]) && ($messageprops[$this->proptags['attendee_critical_change']] < $recipient[PR_RECIPIENT_TRACKSTATUS_TIME])) {
+                    continue;
+                }
+
+                // The email address matches, update the row
+                $recipient[PR_RECIPIENT_TRACKSTATUS] = $this->getTrackStatus($messageclass);
+                $recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $messageprops[$this->proptags['attendee_critical_change']];
+
+                // If this is a counter proposal, set the proposal properties in the recipient row
+                if (isset($messageprops[$this->proptags['counter_proposal']]) && $messageprops[$this->proptags['counter_proposal']]) {
+                    $recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
+                    $recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
+                    $recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
+                }
+
+                mapi_message_modifyrecipients($calendarItem, MODRECIP_MODIFY, [$recipient]);
+            }
+            if (isset($recipient[PR_RECIPIENT_TRACKSTATUS]) && $recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
+                ++$acceptedrecips;
+            }
+        }
+
+        // If the recipient was not found in the original calendar item,
+        // then add the recpient as a new optional recipient
+        if (!$found) {
+            $recipient = [];
+            $recipient[PR_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
+            $recipient[PR_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
+            $recipient[PR_DISPLAY_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
+            $recipient[PR_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
+            $recipient[PR_RECIPIENT_TYPE] = MAPI_CC;
+            $recipient[PR_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
+            $recipient[PR_RECIPIENT_TRACKSTATUS] = $this->getTrackStatus($messageclass);
+            $recipient[PR_RECIPIENT_TRACKSTATUS_TIME] = $deliverytime;
+
+            // If this is a counter proposal, set the proposal properties in the recipient row
+            if (isset($messageprops[$this->proptags['counter_proposal']])) {
+                $recipient[PR_PROPOSENEWTIME_START] = $messageprops[$this->proptags['proposed_start_whole']];
+                $recipient[PR_PROPOSENEWTIME_END] = $messageprops[$this->proptags['proposed_end_whole']];
+                $recipient[PR_PROPOSEDNEWTIME] = $messageprops[$this->proptags['counter_proposal']];
+            }
+
+            mapi_message_modifyrecipients($calendarItem, MODRECIP_ADD, [$recipient]);
+            ++$totalrecips;
+            if ($recipient[PR_RECIPIENT_TRACKSTATUS] == olRecipientTrackStatusAccepted) {
+                ++$acceptedrecips;
+            }
+        }
+
+        // TODO: Update counter proposal number property on message
+        /*
 		If it is the first time this attendee has proposed a new date/time, increment the value of the PidLidAppointmentProposalNumber property on the organizer's meeting object, by 0x00000001. If this property did not previously exist on the organizer's meeting object, it MUST be set with a value of 0x00000001.
 		*/
-		// If this is a counter proposal, set the counter proposal indicator boolean
-		if (isset($messageprops[$this->proptags['counter_proposal']])) {
-			$props = [];
-			if ($messageprops[$this->proptags['counter_proposal']]) {
-				$props[$this->proptags['counter_proposal']] = true;
-			}
-			else {
-				$props[$this->proptags['counter_proposal']] = false;
-			}
-
-			mapi_setprops($calendarItem, $props);
-		}
-
-		mapi_savechanges($calendarItem);
-		if (isset($attach)) {
-			mapi_savechanges($attach);
-			mapi_savechanges($recurringItem);
-		}
-	}
-
-	/**
-	 * Process an incoming meeting request cancellation. This updates the
-	 * appointment in your calendar to show that the meeting has been cancelled.
-	 */
-	public function processMeetingCancellation() {
-		if (!$this->isMeetingCancellation()) {
-			return;
-		}
-
-		if ($this->isLocalOrganiser()) {
-			return;
-		}
-
-		if (!$this->isInCalendar()) {
-			return;
-		}
-
-		$listProperties = $this->proptags;
-		$listProperties['subject'] = PR_SUBJECT;
-		$listProperties['sent_representing_name'] = PR_SENT_REPRESENTING_NAME;
-		$listProperties['sent_representing_address_type'] = PR_SENT_REPRESENTING_ADDRTYPE;
-		$listProperties['sent_representing_email_address'] = PR_SENT_REPRESENTING_EMAIL_ADDRESS;
-		$listProperties['sent_representing_entryid'] = PR_SENT_REPRESENTING_ENTRYID;
-		$listProperties['sent_representing_search_key'] = PR_SENT_REPRESENTING_SEARCH_KEY;
-		$listProperties['rcvd_representing_name'] = PR_RCVD_REPRESENTING_NAME;
-		$listProperties['rcvd_representing_address_type'] = PR_RCVD_REPRESENTING_ADDRTYPE;
-		$listProperties['rcvd_representing_email_address'] = PR_RCVD_REPRESENTING_EMAIL_ADDRESS;
-		$listProperties['rcvd_representing_entryid'] = PR_RCVD_REPRESENTING_ENTRYID;
-		$listProperties['rcvd_representing_search_key'] = PR_RCVD_REPRESENTING_SEARCH_KEY;
-		$messageProps = mapi_getprops($this->message, $listProperties);
-
-		$goid = $messageProps[$this->proptags['goid']];    // GlobalID (0x3)
-		if (!isset($goid)) {
-			return;
-		}
-
-		// get delegator store, if delegate is processing this cancellation
-		if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$store = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$store = $this->store;
-			$calFolder = $this->openDefaultCalendar();
-		}
-
-		// check for calendar access
-		if ($this->checkCalendarWriteAccess($store) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// allow caller to fill the error message
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		$calendarItem = $this->getCorrespondentCalendarItem(true);
-		$basedate = $this->getBasedateFromGlobalID($goid);
-
-		if ($calendarItem !== false) {
-			// if basedate is provided and we could not find the item then it could be that we are processing
-			// an exception so get the exception and process it
-			if ($basedate) {
-				$calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['recurring']]);
-				if ($calendarItemProps[$this->proptags['recurring']] === true) {
-					$recurr = new Recurrence($store, $calendarItem);
-
-					// Set message class
-					$messageProps[PR_MESSAGE_CLASS] = 'IPM.Appointment';
-
-					if ($recurr->isException($basedate)) {
-						$recurr->modifyException($messageProps, $basedate);
-					}
-					else {
-						$recurr->createException($messageProps, $basedate);
-					}
-				}
-			}
-			else {
-				// set the properties of the cancellation object
-				mapi_setprops($calendarItem, $messageProps);
-			}
-
-			mapi_savechanges($calendarItem);
-		}
-	}
-
-	/**
-	 * Returns true if the corresponding calendar items exists in the celendar folder for this
-	 * meeting request/response/cancellation.
-	 */
-	public function isInCalendar() {
-		// @TODO check for deleted exceptions
-		return $this->getCorrespondentCalendarItem(false) !== false;
-	}
-
-	/**
-	 * Accepts the meeting request by moving the item to the calendar
-	 * and sending a confirmation message back to the sender. If $tentative
-	 * is TRUE, then the item is accepted tentatively. After accepting, you
-	 * can't use this class instance any more. The message is closed. If you
-	 * specify TRUE for 'move', then the item is actually moved (from your
-	 * inbox probably) to the calendar. If you don't, it is copied into
-	 * your calendar.
-	 *
-	 * @param bool   $tentative            true if user as tentative accepted the meeting
-	 * @param bool   $sendresponse         true if a response has to be send to organizer
-	 * @param bool   $move                 true if the meeting request should be moved to the deleted items after processing
-	 * @param string $newProposedStartTime contains starttime if user has proposed other time
-	 * @param string $newProposedEndTime   contains endtime if user has proposed other time
-	 * @param string $basedate             start of day of occurrence for which user has accepted the recurrent meeting
-	 * @param bool   $isImported           true to indicate that MR is imported from .ics or .vcs file else it false.
-	 * @param mixed  $body
-	 * @param mixed  $userAction
-	 * @param mixed  $store
-	 *
-	 * @return string $entryid entryid of item which created/updated in calendar
-	 */
-	public function doAccept($tentative, $sendresponse, $move, $newProposedStartTime = false, $newProposedEndTime = false, $body = false, $userAction = false, $store = false, $basedate = false, $isImported = false) {
-		if ($this->isLocalOrganiser()) {
-			return false;
-		}
-
-		// Remove any previous calendar items with this goid and appt id
-		$messageprops = mapi_getprops($this->message, [PR_ENTRYID, PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['updatecounter'], PR_PROCESSED, PR_RCVD_REPRESENTING_ENTRYID, PR_SENDER_ENTRYID, PR_SENT_REPRESENTING_ENTRYID, PR_RECEIVED_BY_ENTRYID]);
-
-		// If this meeting request is received by a delegate then open delegator's store.
-		if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$store = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$calFolder = $this->openDefaultCalendar();
-			$store = $this->store;
-		}
-
-		// check for calendar access
-		if ($this->checkCalendarWriteAccess($store) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// allow caller to fill the error message
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		// if meeting is out dated then don't process it
-		if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $this->isMeetingOutOfDate()) {
-			return false;
-		}
-
-		/*
+        // If this is a counter proposal, set the counter proposal indicator boolean
+        if (isset($messageprops[$this->proptags['counter_proposal']])) {
+            $props = [];
+            if ($messageprops[$this->proptags['counter_proposal']]) {
+                $props[$this->proptags['counter_proposal']] = true;
+            }
+            else {
+                $props[$this->proptags['counter_proposal']] = false;
+            }
+
+            mapi_setprops($calendarItem, $props);
+        }
+
+        mapi_savechanges($calendarItem);
+        if (isset($attach)) {
+            mapi_savechanges($attach);
+            mapi_savechanges($recurringItem);
+        }
+    }
+
+    /**
+     * Process an incoming meeting request cancellation. This updates the
+     * appointment in your calendar to show that the meeting has been cancelled.
+     */
+    public function processMeetingCancellation() {
+        if (!$this->isMeetingCancellation()) {
+            return;
+        }
+
+        if ($this->isLocalOrganiser()) {
+            return;
+        }
+
+        if (!$this->isInCalendar()) {
+            return;
+        }
+
+        $listProperties = $this->proptags;
+        $listProperties['subject'] = PR_SUBJECT;
+        $listProperties['sent_representing_name'] = PR_SENT_REPRESENTING_NAME;
+        $listProperties['sent_representing_address_type'] = PR_SENT_REPRESENTING_ADDRTYPE;
+        $listProperties['sent_representing_email_address'] = PR_SENT_REPRESENTING_EMAIL_ADDRESS;
+        $listProperties['sent_representing_entryid'] = PR_SENT_REPRESENTING_ENTRYID;
+        $listProperties['sent_representing_search_key'] = PR_SENT_REPRESENTING_SEARCH_KEY;
+        $listProperties['rcvd_representing_name'] = PR_RCVD_REPRESENTING_NAME;
+        $listProperties['rcvd_representing_address_type'] = PR_RCVD_REPRESENTING_ADDRTYPE;
+        $listProperties['rcvd_representing_email_address'] = PR_RCVD_REPRESENTING_EMAIL_ADDRESS;
+        $listProperties['rcvd_representing_entryid'] = PR_RCVD_REPRESENTING_ENTRYID;
+        $listProperties['rcvd_representing_search_key'] = PR_RCVD_REPRESENTING_SEARCH_KEY;
+        $messageProps = mapi_getprops($this->message, $listProperties);
+
+        $goid = $messageProps[$this->proptags['goid']];    // GlobalID (0x3)
+        if (!isset($goid)) {
+            return;
+        }
+
+        // get delegator store, if delegate is processing this cancellation
+        if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $store = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $store = $this->store;
+            $calFolder = $this->openDefaultCalendar();
+        }
+
+        // check for calendar access
+        if ($this->checkCalendarWriteAccess($store) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // allow caller to fill the error message
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        $calendarItem = $this->getCorrespondentCalendarItem(true);
+        $basedate = $this->getBasedateFromGlobalID($goid);
+
+        if ($calendarItem !== false) {
+            // if basedate is provided and we could not find the item then it could be that we are processing
+            // an exception so get the exception and process it
+            if ($basedate) {
+                $calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['recurring']]);
+                if ($calendarItemProps[$this->proptags['recurring']] === true) {
+                    $recurr = new Recurrence($store, $calendarItem);
+
+                    // Set message class
+                    $messageProps[PR_MESSAGE_CLASS] = 'IPM.Appointment';
+
+                    if ($recurr->isException($basedate)) {
+                        $recurr->modifyException($messageProps, $basedate);
+                    }
+                    else {
+                        $recurr->createException($messageProps, $basedate);
+                    }
+                }
+            }
+            else {
+                // set the properties of the cancellation object
+                mapi_setprops($calendarItem, $messageProps);
+            }
+
+            mapi_savechanges($calendarItem);
+        }
+    }
+
+    /**
+     * Returns true if the corresponding calendar items exists in the celendar folder for this
+     * meeting request/response/cancellation.
+     */
+    public function isInCalendar() {
+        // @TODO check for deleted exceptions
+        return $this->getCorrespondentCalendarItem(false) !== false;
+    }
+
+    /**
+     * Accepts the meeting request by moving the item to the calendar
+     * and sending a confirmation message back to the sender. If $tentative
+     * is TRUE, then the item is accepted tentatively. After accepting, you
+     * can't use this class instance any more. The message is closed. If you
+     * specify TRUE for 'move', then the item is actually moved (from your
+     * inbox probably) to the calendar. If you don't, it is copied into
+     * your calendar.
+     *
+     * @param bool   $tentative            true if user as tentative accepted the meeting
+     * @param bool   $sendresponse         true if a response has to be send to organizer
+     * @param bool   $move                 true if the meeting request should be moved to the deleted items after processing
+     * @param string $newProposedStartTime contains starttime if user has proposed other time
+     * @param string $newProposedEndTime   contains endtime if user has proposed other time
+     * @param string $basedate             start of day of occurrence for which user has accepted the recurrent meeting
+     * @param bool   $isImported           true to indicate that MR is imported from .ics or .vcs file else it false.
+     * @param mixed  $body
+     * @param mixed  $userAction
+     * @param mixed  $store
+     *
+     * @return string $entryid entryid of item which created/updated in calendar
+     */
+    public function doAccept($tentative, $sendresponse, $move, $newProposedStartTime = false, $newProposedEndTime = false, $body = false, $userAction = false, $store = false, $basedate = false, $isImported = false) {
+        if ($this->isLocalOrganiser()) {
+            return false;
+        }
+
+        // Remove any previous calendar items with this goid and appt id
+        $messageprops = mapi_getprops($this->message, [PR_ENTRYID, PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['updatecounter'], PR_PROCESSED, PR_RCVD_REPRESENTING_ENTRYID, PR_SENDER_ENTRYID, PR_SENT_REPRESENTING_ENTRYID, PR_RECEIVED_BY_ENTRYID]);
+
+        // If this meeting request is received by a delegate then open delegator's store.
+        if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $store = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $calFolder = $this->openDefaultCalendar();
+            $store = $this->store;
+        }
+
+        // check for calendar access
+        if ($this->checkCalendarWriteAccess($store) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // allow caller to fill the error message
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        // if meeting is out dated then don't process it
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $this->isMeetingOutOfDate()) {
+            return false;
+        }
+
+        /*
 		 *    if this function is called automatically with meeting request object then there will be
 		 *    two possibilitites
 		 *    1) meeting request is opened first time, in this case make a tentative appointment in
 		 * recipient's calendar
 		 *    2) after this every subsequent request to open meeting request will not do any processing
 		 */
-		if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction == false) {
-			if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
-				// if meeting request is already processed then don't do anything
-				return false;
-			}
-
-			// if correspondent calendar item is already processed then don't do anything
-			$calendarItem = $this->getCorrespondentCalendarItem();
-			$calendarItemProps = mapi_getprops($calendarItem, [PR_PROCESSED]);
-			if (isset($calendarItemProps[PR_PROCESSED]) && $calendarItemProps[PR_PROCESSED] == true) {
-				// mark meeting-request mail as processed as well
-				mapi_setprops($this->message, [PR_PROCESSED => true]);
-				mapi_savechanges($this->message);
-
-				return false;
-			}
-		}
-
-		// Retrieve basedate from globalID, if it is not received as argument
-		if (!$basedate) {
-			$basedate = $this->getBasedateFromGlobalID($messageprops[$this->proptags['goid']]);
-		}
-
-		// set counter proposal properties in calendar item when proposing new time
-		$proposeNewTimeProps = [];
-		if ($newProposedStartTime && $newProposedEndTime) {
-			$proposeNewTimeProps[$this->proptags['proposed_start_whole']] = $newProposedStartTime;
-			$proposeNewTimeProps[$this->proptags['proposed_end_whole']] = $newProposedEndTime;
-			$proposeNewTimeProps[$this->proptags['proposed_duration']] = round($newProposedEndTime - $newProposedStartTime) / 60;
-			$proposeNewTimeProps[$this->proptags['counter_proposal']] = true;
-		}
-
-		// While sender is receiver then we have to process the meeting request as per the intended busy status
-		// instead of tentative, and accept the same as per the intended busystatus.
-		$senderEntryId = isset($messageprops[PR_SENT_REPRESENTING_ENTRYID]) ? $messageprops[PR_SENT_REPRESENTING_ENTRYID] : $messageprops[PR_SENDER_ENTRYID];
-		if (isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && MAPIUtils::CompareEntryIds($senderEntryId, $messageprops[PR_RECEIVED_BY_ENTRYID])) {
-			$entryid = $this->accept(false, $sendresponse, $move, $proposeNewTimeProps, $body, true, $store, $calFolder, $basedate);
-		}
-		else {
-			$entryid = $this->accept($tentative, $sendresponse, $move, $proposeNewTimeProps, $body, $userAction, $store, $calFolder, $basedate);
-		}
-
-		// if we have first time processed this meeting then set PR_PROCESSED property
-		if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction === false && $isImported === false) {
-			if (!isset($messageprops[PR_PROCESSED]) || $messageprops[PR_PROCESSED] != true) {
-				// set processed flag
-				mapi_setprops($this->message, [PR_PROCESSED => true]);
-				mapi_savechanges($this->message);
-			}
-		}
-
-		return $entryid;
-	}
-
-	public function accept($tentative, $sendresponse, $move, $proposeNewTimeProps = [], $body = false, $userAction = false, $store, $calFolder, $basedate = false) {
-		$messageprops = mapi_getprops($this->message);
-		$isDelegate = isset($messageprops[PR_RCVD_REPRESENTING_NAME]);
-
-		if ($sendresponse) {
-			$this->createResponse($tentative ? olResponseTentative : olResponseAccepted, $proposeNewTimeProps, $body, $store, $basedate, $calFolder);
-		}
-
-		/*
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction == false) {
+            if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+                // if meeting request is already processed then don't do anything
+                return false;
+            }
+
+            // if correspondent calendar item is already processed then don't do anything
+            $calendarItem = $this->getCorrespondentCalendarItem();
+            $calendarItemProps = mapi_getprops($calendarItem, [PR_PROCESSED]);
+            if (isset($calendarItemProps[PR_PROCESSED]) && $calendarItemProps[PR_PROCESSED] == true) {
+                // mark meeting-request mail as processed as well
+                mapi_setprops($this->message, [PR_PROCESSED => true]);
+                mapi_savechanges($this->message);
+
+                return false;
+            }
+        }
+
+        // Retrieve basedate from globalID, if it is not received as argument
+        if (!$basedate) {
+            $basedate = $this->getBasedateFromGlobalID($messageprops[$this->proptags['goid']]);
+        }
+
+        // set counter proposal properties in calendar item when proposing new time
+        $proposeNewTimeProps = [];
+        if ($newProposedStartTime && $newProposedEndTime) {
+            $proposeNewTimeProps[$this->proptags['proposed_start_whole']] = $newProposedStartTime;
+            $proposeNewTimeProps[$this->proptags['proposed_end_whole']] = $newProposedEndTime;
+            $proposeNewTimeProps[$this->proptags['proposed_duration']] = round($newProposedEndTime - $newProposedStartTime) / 60;
+            $proposeNewTimeProps[$this->proptags['counter_proposal']] = true;
+        }
+
+        // While sender is receiver then we have to process the meeting request as per the intended busy status
+        // instead of tentative, and accept the same as per the intended busystatus.
+        $senderEntryId = isset($messageprops[PR_SENT_REPRESENTING_ENTRYID]) ? $messageprops[PR_SENT_REPRESENTING_ENTRYID] : $messageprops[PR_SENDER_ENTRYID];
+        if (isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && MAPIUtils::CompareEntryIds($senderEntryId, $messageprops[PR_RECEIVED_BY_ENTRYID])) {
+            $entryid = $this->accept(false, $sendresponse, $move, $proposeNewTimeProps, $body, true, $store, $calFolder, $basedate);
+        }
+        else {
+            $entryid = $this->accept($tentative, $sendresponse, $move, $proposeNewTimeProps, $body, $userAction, $store, $calFolder, $basedate);
+        }
+
+        // if we have first time processed this meeting then set PR_PROCESSED property
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS]) && $userAction === false && $isImported === false) {
+            if (!isset($messageprops[PR_PROCESSED]) || $messageprops[PR_PROCESSED] != true) {
+                // set processed flag
+                mapi_setprops($this->message, [PR_PROCESSED => true]);
+                mapi_savechanges($this->message);
+            }
+        }
+
+        return $entryid;
+    }
+
+    public function accept($tentative, $sendresponse, $move, $proposeNewTimeProps = [], $body = false, $userAction = false, $store, $calFolder, $basedate = false) {
+        $messageprops = mapi_getprops($this->message);
+        $isDelegate = isset($messageprops[PR_RCVD_REPRESENTING_NAME]);
+
+        if ($sendresponse) {
+            $this->createResponse($tentative ? olResponseTentative : olResponseAccepted, $proposeNewTimeProps, $body, $store, $basedate, $calFolder);
+        }
+
+        /*
 		 * Further processing depends on what user is receiving. User can receive recurring item, a single occurrence or a normal meeting.
 		 * 1) If meeting req is of recurrence then we find all the occurrence in calendar because in past user might have received one or few occurrences.
 		 * 2) If single occurrence then find occurrence itself using globalID and if item is not found then use cleanGlobalID to find main recurring item
@@ -742,2394 +742,2394 @@ 
 		 * and that item is not found in calendar then item is move else item is opened and all properties, attachments and recipient are copied from meeting request.
 		 * If user is responding from calendar then item is opened and properties are set such as meetingstatus, responsestatus, busystatus etc.
 		 */
-		if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS])) {
-			// While processing the item mark it as read.
-			mapi_message_setreadflag($this->message, SUPPRESS_RECEIPT);
-
-			// This meeting request item is recurring, so find all occurrences and saves them all as exceptions to this meeting request item.
-			if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']] == true) {
-				$calendarItem = false;
-
-				// Find main recurring item based on GlobalID (0x3)
-				$items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
-				if (is_array($items)) {
-					foreach ($items as $key => $entryid) {
-						$calendarItem = mapi_msgstore_openentry($store, $entryid);
-					}
-				}
-
-				$processed = false;
-				if (!$calendarItem) {
-					// Recurring item not found, so create new meeting in Calendar
-					$calendarItem = mapi_folder_createmessage($calFolder);
-				}
-				else {
-					// we have found the main recurring item, check if this meeting request is already processed
-					if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
-						// only set required properties, other properties are already copied when processing this meeting request
-						// for the first time
-						$processed = true;
-					}
-				}
-
-				if (!$processed) {
-					// get all the properties and copy that to calendar item
-					$props = mapi_getprops($this->message);
-
-					/*
+        if ($this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS])) {
+            // While processing the item mark it as read.
+            mapi_message_setreadflag($this->message, SUPPRESS_RECEIPT);
+
+            // This meeting request item is recurring, so find all occurrences and saves them all as exceptions to this meeting request item.
+            if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']] == true) {
+                $calendarItem = false;
+
+                // Find main recurring item based on GlobalID (0x3)
+                $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
+                if (is_array($items)) {
+                    foreach ($items as $key => $entryid) {
+                        $calendarItem = mapi_msgstore_openentry($store, $entryid);
+                    }
+                }
+
+                $processed = false;
+                if (!$calendarItem) {
+                    // Recurring item not found, so create new meeting in Calendar
+                    $calendarItem = mapi_folder_createmessage($calFolder);
+                }
+                else {
+                    // we have found the main recurring item, check if this meeting request is already processed
+                    if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
+                        // only set required properties, other properties are already copied when processing this meeting request
+                        // for the first time
+                        $processed = true;
+                    }
+                }
+
+                if (!$processed) {
+                    // get all the properties and copy that to calendar item
+                    $props = mapi_getprops($this->message);
+
+                    /*
 					 * the client which has sent this meeting request can generate wrong flagdueby
 					 * time (mainly OL), so regenerate that property so we will always show reminder
 					 * on right time
 					 */
-					if (isset($props[$this->proptags['reminderminutes']])) {
-						$props[$this->proptags['flagdueby']] = $props[$this->proptags['startdate']] - ($props[$this->proptags['reminderminutes']] * 60);
-					}
-				}
-				else {
-					// only get required properties so we will not overwrite existing updated properties from calendar
-					$props = mapi_getprops($this->message, [PR_ENTRYID]);
-				}
-
-				// While we applying updates of MR then all local categories will be removed,
-				// So get the local categories of all occurrence before applying update from organiser.
-				$localCategories = $this->getLocalCategories($calendarItem, $store, $calFolder);
-
-				$props[PR_MESSAGE_CLASS] = 'IPM.Appointment';
-				// When meeting requests are generated by third-party solutions, we might be missing the updatecounter property.
-				if (!isset($props[$this->proptags['updatecounter']])) {
-					$props[$this->proptags['updatecounter']] = 0;
-				}
-				$props[$this->proptags['meetingstatus']] = olMeetingReceived;
-				// when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
-				$props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
-
-				if (isset($props[$this->proptags['intendedbusystatus']])) {
-					if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
-						$props[$this->proptags['busystatus']] = fbTentative;
-					}
-					else {
-						$props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
-					}
-					// we already have intendedbusystatus value in $props so no need to copy it
-				}
-				else {
-					$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
-				}
-
-				if ($userAction) {
-					$addrInfo = $this->getOwnerAddress($this->store);
-
-					// if user has responded then set replytime and name
-					$props[$this->proptags['replytime']] = time();
-					if (!empty($addrInfo)) {
-						// @FIXME conditionally set this property only for delegation case
-						$props[$this->proptags['apptreplyname']] = $addrInfo[0];
-					}
-				}
-
-				mapi_setprops($calendarItem, $props);
-
-				// we have already processed attachments and recipients, so no need to do it again
-				if (!$processed) {
-					// Copy attachments too
-					$this->replaceAttachments($this->message, $calendarItem);
-					// Copy recipients too
-					$this->replaceRecipients($this->message, $calendarItem, $isDelegate);
-				}
-
-				// Find all occurrences based on CleanGlobalID (0x23)
-				// there will be no exceptions left if $processed is true, but even if it doesn't hurt to recheck
-				$items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder, true);
-				if (is_array($items)) {
-					// Save all existing occurrence as exceptions
-					foreach ($items as $entryid) {
-						// Open occurrence
-						$occurrenceItem = mapi_msgstore_openentry($store, $entryid);
-
-						// Save occurrence into main recurring item as exception
-						if ($occurrenceItem) {
-							$occurrenceItemProps = mapi_getprops($occurrenceItem, [$this->proptags['goid'], $this->proptags['recurring']]);
-
-							// Find basedate of occurrence item
-							$basedate = $this->getBasedateFromGlobalID($occurrenceItemProps[$this->proptags['goid']]);
-							if ($basedate && $occurrenceItemProps[$this->proptags['recurring']] != true) {
-								$this->mergeException($calendarItem, $occurrenceItem, $basedate, $store);
-							}
-						}
-					}
-				}
-
-				mapi_savechanges($calendarItem);
-
-				// After applying update of organiser all local categories of occurrence was removed,
-				// So if local categories exist then apply it on respective occurrence.
-				if (!empty($localCategories)) {
-					$this->applyLocalCategories($calendarItem, $store, $localCategories);
-				}
-
-				if ($move) {
-					// open wastebasket of currently logged in user and move the meeting request to it
-					// for delegates this will be delegate's wastebasket folder
-					$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-					mapi_folder_copymessages($calFolder, [$props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-				}
-
-				$entryid = $props[PR_ENTRYID];
-			}
-			else {
-				/**
-				 * This meeting request is not recurring, so can be an exception or normal meeting.
-				 * If exception then find main recurring item and update exception
-				 * If main recurring item is not found then put exception into Calendar as normal meeting.
-				 */
-				$calendarItem = false;
-
-				// We found basedate in GlobalID of this meeting request, so this meeting request if for an occurrence.
-				if ($basedate) {
-					// Find main recurring item from CleanGlobalID of this meeting request
-					$items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
-					if (is_array($items)) {
-						foreach ($items as $key => $entryid) {
-							$calendarItem = mapi_msgstore_openentry($store, $entryid);
-						}
-					}
-
-					// Main recurring item is found, so now update exception
-					if ($calendarItem) {
-						$this->acceptException($calendarItem, $this->message, $basedate, $move, $tentative, $userAction, $store, $isDelegate);
-						$calendarItemProps = mapi_getprops($calendarItem, [PR_ENTRYID]);
-						$entryid = $calendarItemProps[PR_ENTRYID];
-					}
-				}
-
-				if (!$calendarItem) {
-					$items = $this->findCalendarItems($messageprops[$this->proptags['goid']], $calFolder);
-					if (is_array($items)) {
-						// Get local categories before deleting MR.
-						$message = mapi_msgstore_openentry($store, $items[0]);
-						$localCategories = mapi_getprops($message, [$this->proptags['categories']]);
-						mapi_folder_deletemessages($calFolder, $items);
-					}
-
-					if ($move) {
-						// All we have to do is open the default calendar,
-						// set the message class correctly to be an appointment item
-						// and move it to the calendar folder
-						$sourcefolder = $this->openParentFolder();
-
-						// create a new calendar message, and copy the message to there,
-						// since we want to delete (move to wastebasket) the original message
-						$old_entryid = mapi_getprops($this->message, [PR_ENTRYID]);
-						$calmsg = mapi_folder_createmessage($calFolder);
-						mapi_copyto($this->message, [], [], $calmsg); /* includes attachments and recipients */
-
-						// After creating new MR, If local categories exist then apply it on new MR.
-						if (!empty($localCategories)) {
-							mapi_setprops($calmsg, $localCategories);
-						}
-
-						$calItemProps = [];
-						$calItemProps[PR_MESSAGE_CLASS] = 'IPM.Appointment';
-
-						/*
+                    if (isset($props[$this->proptags['reminderminutes']])) {
+                        $props[$this->proptags['flagdueby']] = $props[$this->proptags['startdate']] - ($props[$this->proptags['reminderminutes']] * 60);
+                    }
+                }
+                else {
+                    // only get required properties so we will not overwrite existing updated properties from calendar
+                    $props = mapi_getprops($this->message, [PR_ENTRYID]);
+                }
+
+                // While we applying updates of MR then all local categories will be removed,
+                // So get the local categories of all occurrence before applying update from organiser.
+                $localCategories = $this->getLocalCategories($calendarItem, $store, $calFolder);
+
+                $props[PR_MESSAGE_CLASS] = 'IPM.Appointment';
+                // When meeting requests are generated by third-party solutions, we might be missing the updatecounter property.
+                if (!isset($props[$this->proptags['updatecounter']])) {
+                    $props[$this->proptags['updatecounter']] = 0;
+                }
+                $props[$this->proptags['meetingstatus']] = olMeetingReceived;
+                // when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
+                $props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
+
+                if (isset($props[$this->proptags['intendedbusystatus']])) {
+                    if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
+                        $props[$this->proptags['busystatus']] = fbTentative;
+                    }
+                    else {
+                        $props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
+                    }
+                    // we already have intendedbusystatus value in $props so no need to copy it
+                }
+                else {
+                    $props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
+                }
+
+                if ($userAction) {
+                    $addrInfo = $this->getOwnerAddress($this->store);
+
+                    // if user has responded then set replytime and name
+                    $props[$this->proptags['replytime']] = time();
+                    if (!empty($addrInfo)) {
+                        // @FIXME conditionally set this property only for delegation case
+                        $props[$this->proptags['apptreplyname']] = $addrInfo[0];
+                    }
+                }
+
+                mapi_setprops($calendarItem, $props);
+
+                // we have already processed attachments and recipients, so no need to do it again
+                if (!$processed) {
+                    // Copy attachments too
+                    $this->replaceAttachments($this->message, $calendarItem);
+                    // Copy recipients too
+                    $this->replaceRecipients($this->message, $calendarItem, $isDelegate);
+                }
+
+                // Find all occurrences based on CleanGlobalID (0x23)
+                // there will be no exceptions left if $processed is true, but even if it doesn't hurt to recheck
+                $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder, true);
+                if (is_array($items)) {
+                    // Save all existing occurrence as exceptions
+                    foreach ($items as $entryid) {
+                        // Open occurrence
+                        $occurrenceItem = mapi_msgstore_openentry($store, $entryid);
+
+                        // Save occurrence into main recurring item as exception
+                        if ($occurrenceItem) {
+                            $occurrenceItemProps = mapi_getprops($occurrenceItem, [$this->proptags['goid'], $this->proptags['recurring']]);
+
+                            // Find basedate of occurrence item
+                            $basedate = $this->getBasedateFromGlobalID($occurrenceItemProps[$this->proptags['goid']]);
+                            if ($basedate && $occurrenceItemProps[$this->proptags['recurring']] != true) {
+                                $this->mergeException($calendarItem, $occurrenceItem, $basedate, $store);
+                            }
+                        }
+                    }
+                }
+
+                mapi_savechanges($calendarItem);
+
+                // After applying update of organiser all local categories of occurrence was removed,
+                // So if local categories exist then apply it on respective occurrence.
+                if (!empty($localCategories)) {
+                    $this->applyLocalCategories($calendarItem, $store, $localCategories);
+                }
+
+                if ($move) {
+                    // open wastebasket of currently logged in user and move the meeting request to it
+                    // for delegates this will be delegate's wastebasket folder
+                    $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+                    mapi_folder_copymessages($calFolder, [$props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+                }
+
+                $entryid = $props[PR_ENTRYID];
+            }
+            else {
+                /**
+                 * This meeting request is not recurring, so can be an exception or normal meeting.
+                 * If exception then find main recurring item and update exception
+                 * If main recurring item is not found then put exception into Calendar as normal meeting.
+                 */
+                $calendarItem = false;
+
+                // We found basedate in GlobalID of this meeting request, so this meeting request if for an occurrence.
+                if ($basedate) {
+                    // Find main recurring item from CleanGlobalID of this meeting request
+                    $items = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
+                    if (is_array($items)) {
+                        foreach ($items as $key => $entryid) {
+                            $calendarItem = mapi_msgstore_openentry($store, $entryid);
+                        }
+                    }
+
+                    // Main recurring item is found, so now update exception
+                    if ($calendarItem) {
+                        $this->acceptException($calendarItem, $this->message, $basedate, $move, $tentative, $userAction, $store, $isDelegate);
+                        $calendarItemProps = mapi_getprops($calendarItem, [PR_ENTRYID]);
+                        $entryid = $calendarItemProps[PR_ENTRYID];
+                    }
+                }
+
+                if (!$calendarItem) {
+                    $items = $this->findCalendarItems($messageprops[$this->proptags['goid']], $calFolder);
+                    if (is_array($items)) {
+                        // Get local categories before deleting MR.
+                        $message = mapi_msgstore_openentry($store, $items[0]);
+                        $localCategories = mapi_getprops($message, [$this->proptags['categories']]);
+                        mapi_folder_deletemessages($calFolder, $items);
+                    }
+
+                    if ($move) {
+                        // All we have to do is open the default calendar,
+                        // set the message class correctly to be an appointment item
+                        // and move it to the calendar folder
+                        $sourcefolder = $this->openParentFolder();
+
+                        // create a new calendar message, and copy the message to there,
+                        // since we want to delete (move to wastebasket) the original message
+                        $old_entryid = mapi_getprops($this->message, [PR_ENTRYID]);
+                        $calmsg = mapi_folder_createmessage($calFolder);
+                        mapi_copyto($this->message, [], [], $calmsg); /* includes attachments and recipients */
+
+                        // After creating new MR, If local categories exist then apply it on new MR.
+                        if (!empty($localCategories)) {
+                            mapi_setprops($calmsg, $localCategories);
+                        }
+
+                        $calItemProps = [];
+                        $calItemProps[PR_MESSAGE_CLASS] = 'IPM.Appointment';
+
+                        /*
 						 * the client which has sent this meeting request can generate wrong flagdueby
 						 * time (mainly OL), so regenerate that property so we will always show reminder
 						 * on right time
 						 */
-						if (isset($messageprops[$this->proptags['reminderminutes']])) {
-							$calItemProps[$this->proptags['flagdueby']] = $messageprops[$this->proptags['startdate']] - ($messageprops[$this->proptags['reminderminutes']] * 60);
-						}
-
-						if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
-							if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
-								$calItemProps[$this->proptags['busystatus']] = fbTentative;
-							}
-							else {
-								$calItemProps[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-							}
-							$calItemProps[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-						}
-						else {
-							$calItemProps[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
-						}
-
-						// when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
-						$calItemProps[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
-						if ($userAction) {
-							$addrInfo = $this->getOwnerAddress($this->store);
-
-							// if user has responded then set replytime and name
-							$calItemProps[$this->proptags['replytime']] = time();
-							if (!empty($addrInfo)) {
-								$calItemProps[$this->proptags['apptreplyname']] = $addrInfo[0];
-							}
-						}
-
-						mapi_setprops($calmsg, $proposeNewTimeProps + $calItemProps);
-
-						// get properties which stores owner information in meeting request mails
-						$props = mapi_getprops($calmsg, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY]);
-
-						// add owner to recipient table
-						$recips = [];
-						$this->addOrganizer($props, $recips);
-						mapi_message_modifyrecipients($calmsg, MODRECIP_ADD, $recips);
-						mapi_savechanges($calmsg);
-
-						// Move the message to the wastebasket
-						$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-						mapi_folder_copymessages($sourcefolder, [$old_entryid[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-
-						$messageprops = mapi_getprops($calmsg, [PR_ENTRYID]);
-						$entryid = $messageprops[PR_ENTRYID];
-					}
-					else {
-						// Create a new appointment with duplicate properties and recipient, but as an IPM.Appointment
-						$new = mapi_folder_createmessage($calFolder);
-						$props = mapi_getprops($this->message);
-
-						$props[PR_MESSAGE_CLASS] = 'IPM.Appointment';
-
-						// After creating new MR, If local categories exist then apply it on new MR.
-						if (!empty($localCategories)) {
-							mapi_setprops($new, $localCategories);
-						}
-
-						/*
+                        if (isset($messageprops[$this->proptags['reminderminutes']])) {
+                            $calItemProps[$this->proptags['flagdueby']] = $messageprops[$this->proptags['startdate']] - ($messageprops[$this->proptags['reminderminutes']] * 60);
+                        }
+
+                        if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
+                            if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
+                                $calItemProps[$this->proptags['busystatus']] = fbTentative;
+                            }
+                            else {
+                                $calItemProps[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
+                            }
+                            $calItemProps[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
+                        }
+                        else {
+                            $calItemProps[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
+                        }
+
+                        // when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
+                        $calItemProps[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
+                        if ($userAction) {
+                            $addrInfo = $this->getOwnerAddress($this->store);
+
+                            // if user has responded then set replytime and name
+                            $calItemProps[$this->proptags['replytime']] = time();
+                            if (!empty($addrInfo)) {
+                                $calItemProps[$this->proptags['apptreplyname']] = $addrInfo[0];
+                            }
+                        }
+
+                        mapi_setprops($calmsg, $proposeNewTimeProps + $calItemProps);
+
+                        // get properties which stores owner information in meeting request mails
+                        $props = mapi_getprops($calmsg, [PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY]);
+
+                        // add owner to recipient table
+                        $recips = [];
+                        $this->addOrganizer($props, $recips);
+                        mapi_message_modifyrecipients($calmsg, MODRECIP_ADD, $recips);
+                        mapi_savechanges($calmsg);
+
+                        // Move the message to the wastebasket
+                        $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+                        mapi_folder_copymessages($sourcefolder, [$old_entryid[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+
+                        $messageprops = mapi_getprops($calmsg, [PR_ENTRYID]);
+                        $entryid = $messageprops[PR_ENTRYID];
+                    }
+                    else {
+                        // Create a new appointment with duplicate properties and recipient, but as an IPM.Appointment
+                        $new = mapi_folder_createmessage($calFolder);
+                        $props = mapi_getprops($this->message);
+
+                        $props[PR_MESSAGE_CLASS] = 'IPM.Appointment';
+
+                        // After creating new MR, If local categories exist then apply it on new MR.
+                        if (!empty($localCategories)) {
+                            mapi_setprops($new, $localCategories);
+                        }
+
+                        /*
 						 * the client which has sent this meeting request can generate wrong flagdueby
 						 * time (mainly OL), so regenerate that property so we will always show reminder
 						 * on right time
 						 */
-						if (isset($props[$this->proptags['reminderminutes']])) {
-							$props[$this->proptags['flagdueby']] = $props[$this->proptags['startdate']] - ($props[$this->proptags['reminderminutes']] * 60);
-						}
-
-						// When meeting requests are generated by third-party solutions, we might be missing the properties.
-						if (!isset($props[$this->proptags['updatecounter']])) {
-							$props[$this->proptags['updatecounter']] = 0;
-						}
-						if (!isset($props[$this->proptags['recurring']])) {
-							$props[$this->proptags['recurring']] = false;
-						}
-
-						// when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
-						$props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
-
-						if (isset($props[$this->proptags['intendedbusystatus']])) {
-							if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
-								$props[$this->proptags['busystatus']] = fbTentative;
-							}
-							else {
-								$props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
-							}
-							// we already have intendedbusystatus value in $props so no need to copy it
-						}
-						else {
-							$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
-						}
-
-						if ($userAction) {
-							$addrInfo = $this->getOwnerAddress($this->store);
-
-							// if user has responded then set replytime and name
-							$props[$this->proptags['replytime']] = time();
-							if (!empty($addrInfo)) {
-								$props[$this->proptags['apptreplyname']] = $addrInfo[0];
-							}
-						}
-
-						mapi_setprops($new, $proposeNewTimeProps + $props);
-
-						// Copy attachments too
-						$this->replaceAttachments($this->message, $new);
-
-						// get recipient table of source message
-						$recipientTable = mapi_message_getrecipienttable($this->message);
-
-						// If delegate, then do not add the delegate in recipients
-						if ($isDelegate) {
-							$delegate = mapi_getprops($this->message, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
-							$res = [RES_PROPERTY, [
-								RELOP => RELOP_NE,
-								ULPROPTAG => PR_EMAIL_ADDRESS,
-								VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
-							],
-							];
-							$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-						}
-						else {
-							$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
-						}
-						$this->addOrganizer($props, $recipients);
-						mapi_message_modifyrecipients($new, MODRECIP_ADD, $recipients);
-						mapi_savechanges($new);
-
-						$props = mapi_getprops($new, [PR_ENTRYID]);
-						$entryid = $props[PR_ENTRYID];
-					}
-				}
-			}
-		}
-		else {
-			// Here only properties are set on calendaritem, because user is responding from calendar.
-			$props = [];
-			$props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
-
-			if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
-				if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
-					$props[$this->proptags['busystatus']] = fbTentative;
-				}
-				else {
-					$props[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-				}
-				$props[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-			}
-			else {
-				$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
-			}
-
-			$props[$this->proptags['meetingstatus']] = olMeetingReceived;
-
-			$addrInfo = $this->getOwnerAddress($this->store);
-
-			// if user has responded then set replytime and name
-			$props[$this->proptags['replytime']] = time();
-			if (!empty($addrInfo)) {
-				$props[$this->proptags['apptreplyname']] = $addrInfo[0];
-			}
-
-			if ($basedate) {
-				$recurr = new Recurrence($store, $this->message);
-
-				// Copy recipients list
-				$reciptable = mapi_message_getrecipienttable($this->message);
-				$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
-
-				if ($recurr->isException($basedate)) {
-					$recurr->modifyException($proposeNewTimeProps + $props, $basedate, $recips);
-				}
-				else {
-					$props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
-					$props[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
-
-					$props[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
-					$props[PR_SENT_REPRESENTING_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
-					$props[PR_SENT_REPRESENTING_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
-					$props[PR_SENT_REPRESENTING_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
-					$props[PR_SENT_REPRESENTING_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
-
-					$recurr->createException($proposeNewTimeProps + $props, $basedate, false, $recips);
-				}
-			}
-			else {
-				mapi_setprops($this->message, $proposeNewTimeProps + $props);
-			}
-			mapi_savechanges($this->message);
-
-			$entryid = $messageprops[PR_ENTRYID];
-		}
-
-		return $entryid;
-	}
-
-	/**
-	 * Declines the meeting request by moving the item to the deleted
-	 * items folder and sending a decline message. After declining, you
-	 * can't use this class instance any more. The message is closed.
-	 * When an occurrence is decline then false is returned because that
-	 * occurrence is deleted not the recurring item.
-	 *
-	 * @param bool   $sendresponse true if a response has to be sent to organizer
-	 * @param string $basedate     if specified contains starttime of day of an occurrence
-	 * @param mixed  $body
-	 *
-	 * @return bool true if item is deleted from Calendar else false
-	 */
-	public function doDecline($sendresponse, $basedate = false, $body = false) {
-		if ($this->isLocalOrganiser()) {
-			return false;
-		}
-
-		$result = false;
-		$calendaritem = false;
-
-		// Remove any previous calendar items with this goid and appt id
-		$messageprops = mapi_getprops($this->message, [$this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_ENTRYID]);
-
-		// If this meeting request is received by a delegate then open delegator's store.
-		if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$store = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$calFolder = $this->openDefaultCalendar();
-			$store = $this->store;
-		}
-
-		// check for calendar access before deleting the calendar item
-		if ($this->checkCalendarWriteAccess($store) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// allow caller to fill the error message
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		$goid = $messageprops[$this->proptags['goid']];
-
-		// First, find the items in the calendar by GlobalObjid (0x3)
-		$entryids = $this->findCalendarItems($goid, $calFolder);
-
-		if (!$basedate) {
-			$basedate = $this->getBasedateFromGlobalID($goid);
-		}
-
-		if ($sendresponse) {
-			$this->createResponse(olResponseDeclined, [], $body, $store, $basedate, $calFolder);
-		}
-
-		if ($basedate) {
-			// use CleanGlobalObjid (0x23)
-			$calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
-
-			if (is_array($calendaritems)) {
-				foreach ($calendaritems as $entryid) {
-					// Open each calendar item and set the properties of the cancellation object
-					$calendaritem = mapi_msgstore_openentry($store, $entryid);
-
-					// Recurring item is found, now delete exception
-					if ($calendaritem) {
-						$this->doRemoveExceptionFromCalendar($basedate, $calendaritem, $store);
-						$result = true;
-					}
-				}
-			}
-
-			if ($this->isMeetingRequest()) {
-				$calendaritem = false;
-			}
-		}
-
-		if (!$calendaritem) {
-			$calendar = $this->openDefaultCalendar($store);
-
-			if (!empty($entryids)) {
-				mapi_folder_deletemessages($calendar, $entryids);
-			}
-
-			// All we have to do to decline, is to move the item to the waste basket
-			$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-			$sourcefolder = $this->openParentFolder();
-
-			$messageprops = mapi_getprops($this->message, [PR_ENTRYID]);
-
-			// Release the message
-			$this->message = null;
-
-			// Move the message to the waste basket
-			mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-
-			$result = true;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Removes a meeting request from the calendar when the user presses the
-	 * 'remove from calendar' button in response to a meeting cancellation.
-	 *
-	 * @param string $basedate if specified contains starttime of day of an occurrence
-	 */
-	public function doRemoveFromCalendar($basedate) {
-		if ($this->isLocalOrganiser()) {
-			return false;
-		}
-
-		$messageprops = mapi_getprops($this->message, [PR_ENTRYID, $this->proptags['goid'], PR_RCVD_REPRESENTING_ENTRYID, PR_MESSAGE_CLASS]);
-
-		$goid = $messageprops[$this->proptags['goid']];
-
-		if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$store = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$store = $this->store;
-			$calFolder = $this->openDefaultCalendar();
-		}
-
-		// check for calendar access before deleting the calendar item
-		if ($this->checkCalendarWriteAccess($store) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// allow caller to fill the error message
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-		// get the source folder of the meeting message
-		$sourcefolder = $this->openParentFolder();
-
-		// Check if the message is a meeting request in the inbox or a calendaritem by checking the message class
-		if ($this->isMeetingCancellation($messageprops[PR_MESSAGE_CLASS])) {
-			// get the basedate to check for exception
-			$basedate = $this->getBasedateFromGlobalID($goid);
-
-			$calendarItem = $this->getCorrespondentCalendarItem(true);
-
-			if ($calendarItem !== false) {
-				// basedate is provided so open exception
-				if ($basedate) {
-					$exception = $this->getExceptionItem($calendarItem, $basedate);
-
-					if ($exception !== false) {
-						// exception found, remove it from calendar
-						$this->doRemoveExceptionFromCalendar($basedate, $calendarItem, $store);
-					}
-				}
-				else {
-					// remove normal / recurring series from calendar
-					$entryids = mapi_getprops($calendarItem, [PR_ENTRYID]);
-
-					$entryids = [$entryids[PR_ENTRYID]];
-
-					mapi_folder_copymessages($calFolder, $entryids, $wastebasket, MESSAGE_MOVE);
-				}
-			}
-
-			// Release the message, because we are going to move it to wastebasket
-			$this->message = null;
-
-			// Move the cancellation mail to wastebasket
-			mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-		}
-		else {
-			// Here only properties are set on calendaritem, because user is responding from calendar.
-			if ($basedate) {
-				// remove the occurrence
-				$this->doRemoveExceptionFromCalendar($basedate, $this->message, $store);
-			}
-			else {
-				// remove normal/recurring meeting item.
-				// Move the message to the waste basket
-				mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-			}
-		}
-	}
-
-	/**
-	 * Function can be used to cancel any existing meeting and send cancellation mails to attendees.
-	 * Should only be called from meeting object from calendar.
-	 *
-	 * @param string $basedate (optional) basedate of occurrence which should be cancelled
-	 * @FIXME cancellation mail is also sent to attendee which has declined the meeting
-	 * @FIXME don't send canellation mail when cancelling meeting from past
-	 */
-	public function doCancelInvitation($basedate = false) {
-		if (!$this->isLocalOrganiser()) {
-			return;
-		}
-
-		// check write access for delegate
-		if ($this->checkCalendarWriteAccess($this->store) !== true) {
-			// Throw an exception that we don't have write permissions on calendar folder,
-			// error message will be filled by module
-			throw new MAPIException(null, MAPI_E_NO_ACCESS);
-		}
-
-		$messageProps = mapi_getprops($this->message, [PR_ENTRYID, $this->proptags['recurring']]);
-
-		if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
-			// cancellation of recurring series or one occurrence
-			$recurrence = new Recurrence($this->store, $this->message);
-
-			// if basedate is specified then we are cancelling only one occurrence, so create exception for that occurrence
-			if ($basedate) {
-				$recurrence->createException([], $basedate, true);
-			}
-
-			// update the meeting request
-			$this->updateMeetingRequest();
-
-			// send cancellation mails
-			$this->sendMeetingRequest(true, _('Canceled: '), $basedate);
-
-			// save changes in the message
-			mapi_savechanges($this->message);
-		}
-		else {
-			// cancellation of normal meeting request
-			// Send the cancellation
-			$this->updateMeetingRequest();
-			$this->sendMeetingRequest(true, _('Canceled: '));
-
-			// save changes in the message
-			mapi_savechanges($this->message);
-		}
-
-		// if basedate is specified then we have already created exception of it so nothing should be done now
-		// but when cancelling normal / recurring meeting request we need to remove meeting from calendar
-		if ($basedate === false) {
-			// get the wastebasket folder, for delegate this will give wastebasket of delegate
-			$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-
-			// get the source folder of the meeting message
-			$sourcefolder = $this->openParentFolder();
-
-			// Move the message to the deleted items
-			mapi_folder_copymessages($sourcefolder, [$messageProps[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-		}
-	}
-
-	/**
-	 * Convert epoch to MAPI FileTime, number of 100-nanosecond units since
-	 * the start of January 1, 1601.
-	 * https://msdn.microsoft.com/en-us/library/office/cc765906.aspx.
-	 *
-	 * @param int the current epoch
-	 * @param mixed $epoch
-	 *
-	 * @return the MAPI FileTime equalevent to the given epoch time
-	 */
-	public function epochToMapiFileTime($epoch) {
-		$nanoseconds_between_epoch = 116444736000000000;
-
-		return ($epoch * 10000000) + $nanoseconds_between_epoch;
-	}
-
-	/**
-	 * Sets the properties in the message so that is can be sent
-	 * as a meeting request. The caller has to submit the message. This
-	 * is only used for new MeetingRequests. Pass the appointment item as $message
-	 * in the constructor to do this.
-	 *
-	 * @param mixed $basedate
-	 */
-	public function setMeetingRequest($basedate = false) {
-		$props = mapi_getprops($this->message, [$this->proptags['updatecounter']]);
-
-		// Create a new global id for this item
-		// https://msdn.microsoft.com/en-us/library/ee160198(v=exchg.80).aspx
-		$goid = pack('H*', '040000008200E00074C5B7101A82E00800000000');
-		// Creation Time
-		$time = $this->epochToMapiFileTime(time());
-		$highdatetime = $time >> 32;
-		$lowdatetime = $time & 0xFFFFFFFF;
-		$goid .= pack('II', $lowdatetime, $highdatetime);
-		// 8 Zeros
-		$goid .= pack('P', 0);
-		// Length of the random data
-		$goid .= pack('V', 16);
-		// Random data.
-		for ($i = 0; $i < 16; ++$i) {
-			$goid .= chr(rand(0, 255));
-		}
-
-		// Create a new appointment id for this item
-		$apptid = rand();
-
-		$props[PR_OWNER_APPT_ID] = $apptid;
-		$props[PR_ICON_INDEX] = 1026;
-		$props[$this->proptags['goid']] = $goid;
-		$props[$this->proptags['goid2']] = $goid;
-
-		if (!isset($props[$this->proptags['updatecounter']])) {
-			$props[$this->proptags['updatecounter']] = 0;            // OL also starts sequence no with zero.
-			$props[$this->proptags['last_updatecounter']] = 0;
-		}
-
-		mapi_setprops($this->message, $props);
-	}
-
-	/**
-	 * Sends a meeting request by copying it to the outbox, converting
-	 * the message class, adding some properties that are required only
-	 * for sending the message and submitting the message. Set cancel to
-	 * true if you wish to completely cancel the meeting request. You can
-	 * specify an optional 'prefix' to prefix the sent message, which is normally
-	 * 'Canceled: '.
-	 *
-	 * @param mixed $cancel
-	 * @param mixed $prefix
-	 * @param mixed $basedate
-	 * @param mixed $modifiedRecips
-	 * @param mixed $deletedRecips
-	 */
-	public function sendMeetingRequest($cancel, $prefix = false, $basedate = false, $modifiedRecips = false, $deletedRecips = false) {
-		$this->includesResources = false;
-		$this->nonAcceptingResources = [];
-
-		// Get the properties of the message
-		$messageprops = mapi_getprops($this->message, [$this->proptags['recurring']]);
-
-		/*
+                        if (isset($props[$this->proptags['reminderminutes']])) {
+                            $props[$this->proptags['flagdueby']] = $props[$this->proptags['startdate']] - ($props[$this->proptags['reminderminutes']] * 60);
+                        }
+
+                        // When meeting requests are generated by third-party solutions, we might be missing the properties.
+                        if (!isset($props[$this->proptags['updatecounter']])) {
+                            $props[$this->proptags['updatecounter']] = 0;
+                        }
+                        if (!isset($props[$this->proptags['recurring']])) {
+                            $props[$this->proptags['recurring']] = false;
+                        }
+
+                        // when we are automatically processing the meeting request set responsestatus to olResponseNotResponded
+                        $props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
+
+                        if (isset($props[$this->proptags['intendedbusystatus']])) {
+                            if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
+                                $props[$this->proptags['busystatus']] = fbTentative;
+                            }
+                            else {
+                                $props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
+                            }
+                            // we already have intendedbusystatus value in $props so no need to copy it
+                        }
+                        else {
+                            $props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
+                        }
+
+                        if ($userAction) {
+                            $addrInfo = $this->getOwnerAddress($this->store);
+
+                            // if user has responded then set replytime and name
+                            $props[$this->proptags['replytime']] = time();
+                            if (!empty($addrInfo)) {
+                                $props[$this->proptags['apptreplyname']] = $addrInfo[0];
+                            }
+                        }
+
+                        mapi_setprops($new, $proposeNewTimeProps + $props);
+
+                        // Copy attachments too
+                        $this->replaceAttachments($this->message, $new);
+
+                        // get recipient table of source message
+                        $recipientTable = mapi_message_getrecipienttable($this->message);
+
+                        // If delegate, then do not add the delegate in recipients
+                        if ($isDelegate) {
+                            $delegate = mapi_getprops($this->message, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
+                            $res = [RES_PROPERTY, [
+                                RELOP => RELOP_NE,
+                                ULPROPTAG => PR_EMAIL_ADDRESS,
+                                VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
+                            ],
+                            ];
+                            $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
+                        }
+                        else {
+                            $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
+                        }
+                        $this->addOrganizer($props, $recipients);
+                        mapi_message_modifyrecipients($new, MODRECIP_ADD, $recipients);
+                        mapi_savechanges($new);
+
+                        $props = mapi_getprops($new, [PR_ENTRYID]);
+                        $entryid = $props[PR_ENTRYID];
+                    }
+                }
+            }
+        }
+        else {
+            // Here only properties are set on calendaritem, because user is responding from calendar.
+            $props = [];
+            $props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
+
+            if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
+                if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
+                    $props[$this->proptags['busystatus']] = fbTentative;
+                }
+                else {
+                    $props[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
+                }
+                $props[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
+            }
+            else {
+                $props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
+            }
+
+            $props[$this->proptags['meetingstatus']] = olMeetingReceived;
+
+            $addrInfo = $this->getOwnerAddress($this->store);
+
+            // if user has responded then set replytime and name
+            $props[$this->proptags['replytime']] = time();
+            if (!empty($addrInfo)) {
+                $props[$this->proptags['apptreplyname']] = $addrInfo[0];
+            }
+
+            if ($basedate) {
+                $recurr = new Recurrence($store, $this->message);
+
+                // Copy recipients list
+                $reciptable = mapi_message_getrecipienttable($this->message);
+                $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
+
+                if ($recurr->isException($basedate)) {
+                    $recurr->modifyException($proposeNewTimeProps + $props, $basedate, $recips);
+                }
+                else {
+                    $props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
+                    $props[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
+
+                    $props[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
+                    $props[PR_SENT_REPRESENTING_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
+                    $props[PR_SENT_REPRESENTING_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
+                    $props[PR_SENT_REPRESENTING_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
+                    $props[PR_SENT_REPRESENTING_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
+
+                    $recurr->createException($proposeNewTimeProps + $props, $basedate, false, $recips);
+                }
+            }
+            else {
+                mapi_setprops($this->message, $proposeNewTimeProps + $props);
+            }
+            mapi_savechanges($this->message);
+
+            $entryid = $messageprops[PR_ENTRYID];
+        }
+
+        return $entryid;
+    }
+
+    /**
+     * Declines the meeting request by moving the item to the deleted
+     * items folder and sending a decline message. After declining, you
+     * can't use this class instance any more. The message is closed.
+     * When an occurrence is decline then false is returned because that
+     * occurrence is deleted not the recurring item.
+     *
+     * @param bool   $sendresponse true if a response has to be sent to organizer
+     * @param string $basedate     if specified contains starttime of day of an occurrence
+     * @param mixed  $body
+     *
+     * @return bool true if item is deleted from Calendar else false
+     */
+    public function doDecline($sendresponse, $basedate = false, $body = false) {
+        if ($this->isLocalOrganiser()) {
+            return false;
+        }
+
+        $result = false;
+        $calendaritem = false;
+
+        // Remove any previous calendar items with this goid and appt id
+        $messageprops = mapi_getprops($this->message, [$this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_ENTRYID]);
+
+        // If this meeting request is received by a delegate then open delegator's store.
+        if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $store = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $calFolder = $this->openDefaultCalendar();
+            $store = $this->store;
+        }
+
+        // check for calendar access before deleting the calendar item
+        if ($this->checkCalendarWriteAccess($store) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // allow caller to fill the error message
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        $goid = $messageprops[$this->proptags['goid']];
+
+        // First, find the items in the calendar by GlobalObjid (0x3)
+        $entryids = $this->findCalendarItems($goid, $calFolder);
+
+        if (!$basedate) {
+            $basedate = $this->getBasedateFromGlobalID($goid);
+        }
+
+        if ($sendresponse) {
+            $this->createResponse(olResponseDeclined, [], $body, $store, $basedate, $calFolder);
+        }
+
+        if ($basedate) {
+            // use CleanGlobalObjid (0x23)
+            $calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
+
+            if (is_array($calendaritems)) {
+                foreach ($calendaritems as $entryid) {
+                    // Open each calendar item and set the properties of the cancellation object
+                    $calendaritem = mapi_msgstore_openentry($store, $entryid);
+
+                    // Recurring item is found, now delete exception
+                    if ($calendaritem) {
+                        $this->doRemoveExceptionFromCalendar($basedate, $calendaritem, $store);
+                        $result = true;
+                    }
+                }
+            }
+
+            if ($this->isMeetingRequest()) {
+                $calendaritem = false;
+            }
+        }
+
+        if (!$calendaritem) {
+            $calendar = $this->openDefaultCalendar($store);
+
+            if (!empty($entryids)) {
+                mapi_folder_deletemessages($calendar, $entryids);
+            }
+
+            // All we have to do to decline, is to move the item to the waste basket
+            $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+            $sourcefolder = $this->openParentFolder();
+
+            $messageprops = mapi_getprops($this->message, [PR_ENTRYID]);
+
+            // Release the message
+            $this->message = null;
+
+            // Move the message to the waste basket
+            mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+
+            $result = true;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Removes a meeting request from the calendar when the user presses the
+     * 'remove from calendar' button in response to a meeting cancellation.
+     *
+     * @param string $basedate if specified contains starttime of day of an occurrence
+     */
+    public function doRemoveFromCalendar($basedate) {
+        if ($this->isLocalOrganiser()) {
+            return false;
+        }
+
+        $messageprops = mapi_getprops($this->message, [PR_ENTRYID, $this->proptags['goid'], PR_RCVD_REPRESENTING_ENTRYID, PR_MESSAGE_CLASS]);
+
+        $goid = $messageprops[$this->proptags['goid']];
+
+        if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $store = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $store = $this->store;
+            $calFolder = $this->openDefaultCalendar();
+        }
+
+        // check for calendar access before deleting the calendar item
+        if ($this->checkCalendarWriteAccess($store) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // allow caller to fill the error message
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+        // get the source folder of the meeting message
+        $sourcefolder = $this->openParentFolder();
+
+        // Check if the message is a meeting request in the inbox or a calendaritem by checking the message class
+        if ($this->isMeetingCancellation($messageprops[PR_MESSAGE_CLASS])) {
+            // get the basedate to check for exception
+            $basedate = $this->getBasedateFromGlobalID($goid);
+
+            $calendarItem = $this->getCorrespondentCalendarItem(true);
+
+            if ($calendarItem !== false) {
+                // basedate is provided so open exception
+                if ($basedate) {
+                    $exception = $this->getExceptionItem($calendarItem, $basedate);
+
+                    if ($exception !== false) {
+                        // exception found, remove it from calendar
+                        $this->doRemoveExceptionFromCalendar($basedate, $calendarItem, $store);
+                    }
+                }
+                else {
+                    // remove normal / recurring series from calendar
+                    $entryids = mapi_getprops($calendarItem, [PR_ENTRYID]);
+
+                    $entryids = [$entryids[PR_ENTRYID]];
+
+                    mapi_folder_copymessages($calFolder, $entryids, $wastebasket, MESSAGE_MOVE);
+                }
+            }
+
+            // Release the message, because we are going to move it to wastebasket
+            $this->message = null;
+
+            // Move the cancellation mail to wastebasket
+            mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+        }
+        else {
+            // Here only properties are set on calendaritem, because user is responding from calendar.
+            if ($basedate) {
+                // remove the occurrence
+                $this->doRemoveExceptionFromCalendar($basedate, $this->message, $store);
+            }
+            else {
+                // remove normal/recurring meeting item.
+                // Move the message to the waste basket
+                mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+            }
+        }
+    }
+
+    /**
+     * Function can be used to cancel any existing meeting and send cancellation mails to attendees.
+     * Should only be called from meeting object from calendar.
+     *
+     * @param string $basedate (optional) basedate of occurrence which should be cancelled
+     * @FIXME cancellation mail is also sent to attendee which has declined the meeting
+     * @FIXME don't send canellation mail when cancelling meeting from past
+     */
+    public function doCancelInvitation($basedate = false) {
+        if (!$this->isLocalOrganiser()) {
+            return;
+        }
+
+        // check write access for delegate
+        if ($this->checkCalendarWriteAccess($this->store) !== true) {
+            // Throw an exception that we don't have write permissions on calendar folder,
+            // error message will be filled by module
+            throw new MAPIException(null, MAPI_E_NO_ACCESS);
+        }
+
+        $messageProps = mapi_getprops($this->message, [PR_ENTRYID, $this->proptags['recurring']]);
+
+        if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
+            // cancellation of recurring series or one occurrence
+            $recurrence = new Recurrence($this->store, $this->message);
+
+            // if basedate is specified then we are cancelling only one occurrence, so create exception for that occurrence
+            if ($basedate) {
+                $recurrence->createException([], $basedate, true);
+            }
+
+            // update the meeting request
+            $this->updateMeetingRequest();
+
+            // send cancellation mails
+            $this->sendMeetingRequest(true, _('Canceled: '), $basedate);
+
+            // save changes in the message
+            mapi_savechanges($this->message);
+        }
+        else {
+            // cancellation of normal meeting request
+            // Send the cancellation
+            $this->updateMeetingRequest();
+            $this->sendMeetingRequest(true, _('Canceled: '));
+
+            // save changes in the message
+            mapi_savechanges($this->message);
+        }
+
+        // if basedate is specified then we have already created exception of it so nothing should be done now
+        // but when cancelling normal / recurring meeting request we need to remove meeting from calendar
+        if ($basedate === false) {
+            // get the wastebasket folder, for delegate this will give wastebasket of delegate
+            $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+
+            // get the source folder of the meeting message
+            $sourcefolder = $this->openParentFolder();
+
+            // Move the message to the deleted items
+            mapi_folder_copymessages($sourcefolder, [$messageProps[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+        }
+    }
+
+    /**
+     * Convert epoch to MAPI FileTime, number of 100-nanosecond units since
+     * the start of January 1, 1601.
+     * https://msdn.microsoft.com/en-us/library/office/cc765906.aspx.
+     *
+     * @param int the current epoch
+     * @param mixed $epoch
+     *
+     * @return the MAPI FileTime equalevent to the given epoch time
+     */
+    public function epochToMapiFileTime($epoch) {
+        $nanoseconds_between_epoch = 116444736000000000;
+
+        return ($epoch * 10000000) + $nanoseconds_between_epoch;
+    }
+
+    /**
+     * Sets the properties in the message so that is can be sent
+     * as a meeting request. The caller has to submit the message. This
+     * is only used for new MeetingRequests. Pass the appointment item as $message
+     * in the constructor to do this.
+     *
+     * @param mixed $basedate
+     */
+    public function setMeetingRequest($basedate = false) {
+        $props = mapi_getprops($this->message, [$this->proptags['updatecounter']]);
+
+        // Create a new global id for this item
+        // https://msdn.microsoft.com/en-us/library/ee160198(v=exchg.80).aspx
+        $goid = pack('H*', '040000008200E00074C5B7101A82E00800000000');
+        // Creation Time
+        $time = $this->epochToMapiFileTime(time());
+        $highdatetime = $time >> 32;
+        $lowdatetime = $time & 0xFFFFFFFF;
+        $goid .= pack('II', $lowdatetime, $highdatetime);
+        // 8 Zeros
+        $goid .= pack('P', 0);
+        // Length of the random data
+        $goid .= pack('V', 16);
+        // Random data.
+        for ($i = 0; $i < 16; ++$i) {
+            $goid .= chr(rand(0, 255));
+        }
+
+        // Create a new appointment id for this item
+        $apptid = rand();
+
+        $props[PR_OWNER_APPT_ID] = $apptid;
+        $props[PR_ICON_INDEX] = 1026;
+        $props[$this->proptags['goid']] = $goid;
+        $props[$this->proptags['goid2']] = $goid;
+
+        if (!isset($props[$this->proptags['updatecounter']])) {
+            $props[$this->proptags['updatecounter']] = 0;            // OL also starts sequence no with zero.
+            $props[$this->proptags['last_updatecounter']] = 0;
+        }
+
+        mapi_setprops($this->message, $props);
+    }
+
+    /**
+     * Sends a meeting request by copying it to the outbox, converting
+     * the message class, adding some properties that are required only
+     * for sending the message and submitting the message. Set cancel to
+     * true if you wish to completely cancel the meeting request. You can
+     * specify an optional 'prefix' to prefix the sent message, which is normally
+     * 'Canceled: '.
+     *
+     * @param mixed $cancel
+     * @param mixed $prefix
+     * @param mixed $basedate
+     * @param mixed $modifiedRecips
+     * @param mixed $deletedRecips
+     */
+    public function sendMeetingRequest($cancel, $prefix = false, $basedate = false, $modifiedRecips = false, $deletedRecips = false) {
+        $this->includesResources = false;
+        $this->nonAcceptingResources = [];
+
+        // Get the properties of the message
+        $messageprops = mapi_getprops($this->message, [$this->proptags['recurring']]);
+
+        /*
 		 * Submit message to non-resource recipients
 		 */
-		// Set BusyStatus to olTentative (1)
-		// Set MeetingStatus to olMeetingReceived
-		// Set ResponseStatus to olResponseNotResponded
+        // Set BusyStatus to olTentative (1)
+        // Set MeetingStatus to olMeetingReceived
+        // Set ResponseStatus to olResponseNotResponded
 
-		/*
+        /*
 		 * While sending recurrence meeting exceptions are not send as attachments
 		 * because first all exceptions are send and then recurrence meeting is sent.
 		 */
-		if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']] && !$basedate) {
-			// Book resource
-			$resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
-
-			if (!$this->errorSetResource) {
-				$recurr = new Recurrence($this->openDefaultStore(), $this->message);
-
-				// First send meetingrequest for recurring item
-				$this->submitMeetingRequest($this->message, $cancel, $prefix, false, $recurr, false, $modifiedRecips, $deletedRecips);
-
-				// Then send all meeting request for all exceptions
-				$exceptions = $recurr->getAllExceptions();
-				if ($exceptions) {
-					foreach ($exceptions as $exceptionBasedate) {
-						$attach = $recurr->getExceptionAttachment($exceptionBasedate);
-
-						if ($attach) {
-							$occurrenceItem = mapi_attach_openobj($attach, MAPI_MODIFY);
-							$this->submitMeetingRequest($occurrenceItem, $cancel, false, $exceptionBasedate, $recurr, false, $modifiedRecips, $deletedRecips);
-							mapi_savechanges($attach);
-						}
-					}
-				}
-			}
-		}
-		else {
-			// Basedate found, an exception is to be send
-			if ($basedate) {
-				$recurr = new Recurrence($this->openDefaultStore(), $this->message);
-
-				if ($cancel) {
-					// @TODO: remove occurrence from Resource's Calendar if resource was booked for whole series
-					$this->submitMeetingRequest($this->message, $cancel, $prefix, $basedate, $recurr, false);
-				}
-				else {
-					$attach = $recurr->getExceptionAttachment($basedate);
-
-					if ($attach) {
-						$occurrenceItem = mapi_attach_openobj($attach, MAPI_MODIFY);
-
-						// Book resource for this occurrence
-						$resourceRecipData = $this->bookResources($occurrenceItem, $cancel, $prefix, $basedate);
-
-						if (!$this->errorSetResource) {
-							// Save all previous changes
-							mapi_savechanges($this->message);
-
-							$this->submitMeetingRequest($occurrenceItem, $cancel, $prefix, $basedate, $recurr, true, $modifiedRecips, $deletedRecips);
-							mapi_savechanges($occurrenceItem);
-							mapi_savechanges($attach);
-						}
-					}
-				}
-			}
-			else {
-				// This is normal meeting
-				$resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
-
-				if (!$this->errorSetResource) {
-					$this->submitMeetingRequest($this->message, $cancel, $prefix, false, false, false, $modifiedRecips, $deletedRecips);
-				}
-			}
-		}
-
-		if (isset($this->errorSetResource) && $this->errorSetResource) {
-			return [
-				'error' => $this->errorSetResource,
-				'displayname' => $this->recipientDisplayname,
-			];
-		}
-
-		return true;
-	}
-
-	/**
-	 * This function will get freebusy data for user based on the timeframe passed in arguments.
-	 *
-	 * @param {HexString} $entryID Entryid of the user for which we need to get freebusy data
-	 * @param {Number} $start start offset for freebusy publish range
-	 * @param {Number} $end end offset for freebusy publish range
-	 *
-	 * @return {Array} freebusy blocks for passed publish range
-	 */
-	public function getFreeBusyInfo($entryID, $start, $end) {
-		$result = [];
-		$fbsupport = mapi_freebusysupport_open($this->session);
-
-		$fbDataArray = mapi_freebusysupport_loaddata($fbsupport, [$entryID]);
-
-		if ($fbDataArray[0] != null) {
-			foreach ($fbDataArray as $fbDataUser) {
-				$rangeuser1 = mapi_freebusydata_getpublishrange($fbDataUser);
-				if ($rangeuser1 == null) {
-					return $result;
-				}
-
-				$enumblock = mapi_freebusydata_enumblocks($fbDataUser, $start, $end);
-				mapi_freebusyenumblock_reset($enumblock);
-
-				while (true) {
-					$blocks = mapi_freebusyenumblock_next($enumblock, 100);
-					if (!$blocks) {
-						break;
-					}
-
-					foreach ($blocks as $blockItem) {
-						$result[] = $blockItem;
-					}
-				}
-			}
-		}
-
-		mapi_freebusysupport_close($fbsupport);
-
-		return $result;
-	}
-
-	/**
-	 * Updates the message after an update has been performed (for example,
-	 * changing the time of the meeting). This must be called before re-sending
-	 * the meeting request. You can also call this function instead of 'setMeetingRequest()'
-	 * as it will automatically call setMeetingRequest on this object if it is the first
-	 * call to this function.
-	 *
-	 * @param mixed $basedate
-	 */
-	public function updateMeetingRequest($basedate = false) {
-		$messageprops = mapi_getprops($this->message, [$this->proptags['last_updatecounter'], $this->proptags['goid']]);
-
-		if (!isset($messageprops[$this->proptags['goid']])) {
-			$this->setMeetingRequest($basedate);
-		}
-		else {
-			$counter = $messageprops[$this->proptags['last_updatecounter']] + 1;
-
-			// increment value of last_updatecounter, last_updatecounter will be common for recurring series
-			// so even if you sending an exception only you need to update the last_updatecounter in the recurring series message
-			// this way we can make sure that every time we will be using a uniwue number for every operation
-			mapi_setprops($this->message, [$this->proptags['last_updatecounter'] => $counter]);
-		}
-	}
-
-	/**
-	 * Returns TRUE if we are the organiser of the meeting. Can be used with any type of meeting object.
-	 */
-	public function isLocalOrganiser() {
-		$props = mapi_getprops($this->message, [$this->proptags['goid'], PR_MESSAGE_CLASS]);
-
-		if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
-			// we are checking with calendar item
-			$calendarItem = $this->message;
-		}
-		else {
-			// we are checking with meeting request / response / cancellation mail
-			// get calendar items
-			$calendarItem = $this->getCorrespondentCalendarItem(true);
-		}
-
-		// even if we have received request/response for exception/occurrence then also
-		// we can check recurring series for organizer, no need to check with exception/occurrence
-
-		if ($calendarItem !== false) {
-			$messageProps = mapi_getprops($calendarItem, [$this->proptags['responsestatus']]);
-
-			if (isset($messageProps[$this->proptags['responsestatus']]) && $messageProps[$this->proptags['responsestatus']] === olResponseOrganized) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/*
+        if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']] && !$basedate) {
+            // Book resource
+            $resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
+
+            if (!$this->errorSetResource) {
+                $recurr = new Recurrence($this->openDefaultStore(), $this->message);
+
+                // First send meetingrequest for recurring item
+                $this->submitMeetingRequest($this->message, $cancel, $prefix, false, $recurr, false, $modifiedRecips, $deletedRecips);
+
+                // Then send all meeting request for all exceptions
+                $exceptions = $recurr->getAllExceptions();
+                if ($exceptions) {
+                    foreach ($exceptions as $exceptionBasedate) {
+                        $attach = $recurr->getExceptionAttachment($exceptionBasedate);
+
+                        if ($attach) {
+                            $occurrenceItem = mapi_attach_openobj($attach, MAPI_MODIFY);
+                            $this->submitMeetingRequest($occurrenceItem, $cancel, false, $exceptionBasedate, $recurr, false, $modifiedRecips, $deletedRecips);
+                            mapi_savechanges($attach);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            // Basedate found, an exception is to be send
+            if ($basedate) {
+                $recurr = new Recurrence($this->openDefaultStore(), $this->message);
+
+                if ($cancel) {
+                    // @TODO: remove occurrence from Resource's Calendar if resource was booked for whole series
+                    $this->submitMeetingRequest($this->message, $cancel, $prefix, $basedate, $recurr, false);
+                }
+                else {
+                    $attach = $recurr->getExceptionAttachment($basedate);
+
+                    if ($attach) {
+                        $occurrenceItem = mapi_attach_openobj($attach, MAPI_MODIFY);
+
+                        // Book resource for this occurrence
+                        $resourceRecipData = $this->bookResources($occurrenceItem, $cancel, $prefix, $basedate);
+
+                        if (!$this->errorSetResource) {
+                            // Save all previous changes
+                            mapi_savechanges($this->message);
+
+                            $this->submitMeetingRequest($occurrenceItem, $cancel, $prefix, $basedate, $recurr, true, $modifiedRecips, $deletedRecips);
+                            mapi_savechanges($occurrenceItem);
+                            mapi_savechanges($attach);
+                        }
+                    }
+                }
+            }
+            else {
+                // This is normal meeting
+                $resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
+
+                if (!$this->errorSetResource) {
+                    $this->submitMeetingRequest($this->message, $cancel, $prefix, false, false, false, $modifiedRecips, $deletedRecips);
+                }
+            }
+        }
+
+        if (isset($this->errorSetResource) && $this->errorSetResource) {
+            return [
+                'error' => $this->errorSetResource,
+                'displayname' => $this->recipientDisplayname,
+            ];
+        }
+
+        return true;
+    }
+
+    /**
+     * This function will get freebusy data for user based on the timeframe passed in arguments.
+     *
+     * @param {HexString} $entryID Entryid of the user for which we need to get freebusy data
+     * @param {Number} $start start offset for freebusy publish range
+     * @param {Number} $end end offset for freebusy publish range
+     *
+     * @return {Array} freebusy blocks for passed publish range
+     */
+    public function getFreeBusyInfo($entryID, $start, $end) {
+        $result = [];
+        $fbsupport = mapi_freebusysupport_open($this->session);
+
+        $fbDataArray = mapi_freebusysupport_loaddata($fbsupport, [$entryID]);
+
+        if ($fbDataArray[0] != null) {
+            foreach ($fbDataArray as $fbDataUser) {
+                $rangeuser1 = mapi_freebusydata_getpublishrange($fbDataUser);
+                if ($rangeuser1 == null) {
+                    return $result;
+                }
+
+                $enumblock = mapi_freebusydata_enumblocks($fbDataUser, $start, $end);
+                mapi_freebusyenumblock_reset($enumblock);
+
+                while (true) {
+                    $blocks = mapi_freebusyenumblock_next($enumblock, 100);
+                    if (!$blocks) {
+                        break;
+                    }
+
+                    foreach ($blocks as $blockItem) {
+                        $result[] = $blockItem;
+                    }
+                }
+            }
+        }
+
+        mapi_freebusysupport_close($fbsupport);
+
+        return $result;
+    }
+
+    /**
+     * Updates the message after an update has been performed (for example,
+     * changing the time of the meeting). This must be called before re-sending
+     * the meeting request. You can also call this function instead of 'setMeetingRequest()'
+     * as it will automatically call setMeetingRequest on this object if it is the first
+     * call to this function.
+     *
+     * @param mixed $basedate
+     */
+    public function updateMeetingRequest($basedate = false) {
+        $messageprops = mapi_getprops($this->message, [$this->proptags['last_updatecounter'], $this->proptags['goid']]);
+
+        if (!isset($messageprops[$this->proptags['goid']])) {
+            $this->setMeetingRequest($basedate);
+        }
+        else {
+            $counter = $messageprops[$this->proptags['last_updatecounter']] + 1;
+
+            // increment value of last_updatecounter, last_updatecounter will be common for recurring series
+            // so even if you sending an exception only you need to update the last_updatecounter in the recurring series message
+            // this way we can make sure that every time we will be using a uniwue number for every operation
+            mapi_setprops($this->message, [$this->proptags['last_updatecounter'] => $counter]);
+        }
+    }
+
+    /**
+     * Returns TRUE if we are the organiser of the meeting. Can be used with any type of meeting object.
+     */
+    public function isLocalOrganiser() {
+        $props = mapi_getprops($this->message, [$this->proptags['goid'], PR_MESSAGE_CLASS]);
+
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
+            // we are checking with calendar item
+            $calendarItem = $this->message;
+        }
+        else {
+            // we are checking with meeting request / response / cancellation mail
+            // get calendar items
+            $calendarItem = $this->getCorrespondentCalendarItem(true);
+        }
+
+        // even if we have received request/response for exception/occurrence then also
+        // we can check recurring series for organizer, no need to check with exception/occurrence
+
+        if ($calendarItem !== false) {
+            $messageProps = mapi_getprops($calendarItem, [$this->proptags['responsestatus']]);
+
+            if (isset($messageProps[$this->proptags['responsestatus']]) && $messageProps[$this->proptags['responsestatus']] === olResponseOrganized) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /*
 	 * Support functions - INTERNAL ONLY
 	 ***************************************************************************************************
 	 */
 
-	/**
-	 * Return the tracking status of a recipient based on the IPM class (passed).
-	 *
-	 * @param mixed $class
-	 */
-	public function getTrackStatus($class) {
-		$status = olRecipientTrackStatusNone;
-
-		switch ($class) {
-			case 'IPM.Schedule.Meeting.Resp.Pos':
-				$status = olRecipientTrackStatusAccepted;
-
-				break;
-
-			case 'IPM.Schedule.Meeting.Resp.Tent':
-				$status = olRecipientTrackStatusTentative;
-
-				break;
-
-			case 'IPM.Schedule.Meeting.Resp.Neg':
-				$status = olRecipientTrackStatusDeclined;
-
-				break;
-		}
-
-		return $status;
-	}
-
-	/**
-	 * Function returns MAPIFolder resource of the folder that currently holds this meeting/meeting request
-	 * object.
-	 */
-	public function openParentFolder() {
-		$messageprops = mapi_getprops($this->message, [PR_PARENT_ENTRYID]);
-
-		return mapi_msgstore_openentry($this->store, $messageprops[PR_PARENT_ENTRYID]);
-	}
-
-	/**
-	 * Function will return resource of the default calendar folder of store.
-	 *
-	 * @param MAPIStore $store {optional} user store whose default calendar should be opened
-	 *
-	 * @return MAPIFolder default calendar folder of store
-	 */
-	public function openDefaultCalendar($store = false) {
-		return $this->openDefaultFolder(PR_IPM_APPOINTMENT_ENTRYID, $store);
-	}
-
-	/**
-	 * Function will return resource of the default outbox folder of store.
-	 *
-	 * @param MAPIStore $store {optional} user store whose default outbox should be opened
-	 *
-	 * @return MAPIFolder default outbox folder of store
-	 */
-	public function openDefaultOutbox($store = false) {
-		return $this->openBaseFolder(PR_IPM_OUTBOX_ENTRYID, $store);
-	}
-
-	/**
-	 * Function will return resource of the default wastebasket folder of store.
-	 *
-	 * @param MAPIStore $store {optional} user store whose default wastebasket should be opened
-	 *
-	 * @return MAPIFolder default wastebasket folder of store
-	 */
-	public function openDefaultWastebasket($store = false) {
-		return $this->openBaseFolder(PR_IPM_WASTEBASKET_ENTRYID, $store);
-	}
-
-	/**
-	 * Function will return resource of the default calendar folder of store.
-	 *
-	 * @param MAPIStore $store {optional} user store whose default calendar should be opened
-	 *
-	 * @return MAPIFolder default calendar folder of store
-	 */
-	public function getDefaultWastebasketEntryID($store = false) {
-		return $this->getBaseEntryID(PR_IPM_WASTEBASKET_ENTRYID, $store);
-	}
-
-	/**
-	 * Function will return resource of the default sent mail folder of store.
-	 *
-	 * @param MAPIStore $store {optional} user store whose default sent mail should be opened
-	 *
-	 * @return MAPIFolder default sent mail folder of store
-	 */
-	public function getDefaultSentmailEntryID($store = false) {
-		return $this->getBaseEntryID(PR_IPM_SENTMAIL_ENTRYID, $store);
-	}
-
-	/**
-	 * Function will return entryid of any default folder of store. This method is useful when you want
-	 * to get entryid of folder which is stored as properties of inbox folder
-	 * (PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_JOURNAL_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_TASK_ENTRYID).
-	 *
-	 * @param PropTag   $prop  proptag of the folder for which we want to get entryid
-	 * @param MAPIStore $store {optional} user store from which we need to get entryid of default folder
-	 *
-	 * @return BinString entryid of folder pointed by $prop
-	 */
-	public function getDefaultFolderEntryID($prop, $store = false) {
-		try {
-			$inbox = mapi_msgstore_getreceivefolder($store ? $store : $this->store);
-			$inboxprops = mapi_getprops($inbox, [$prop]);
-			if (isset($inboxprops[$prop])) {
-				return $inboxprops[$prop];
-			}
-		}
-		catch (MAPIException $e) {
-			// public store doesn't support this method
-			if ($e->getCode() == MAPI_E_NO_SUPPORT) {
-				// don't propagate this error to parent handlers, if store doesn't support it
-				$e->setHandled();
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Function will return resource of any default folder of store.
-	 *
-	 * @param PropTag   $prop  proptag of the folder that we want to open
-	 * @param MAPIStore $store {optional} user store from which we need to open default folder
-	 *
-	 * @return MAPIFolder default folder of store
-	 */
-	public function openDefaultFolder($prop, $store = false) {
-		$folder = false;
-		$entryid = $this->getDefaultFolderEntryID($prop, $store);
-
-		if ($entryid !== false) {
-			$folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
-		}
-
-		return $folder;
-	}
-
-	/**
-	 * Function will return entryid of default folder from store. This method is useful when you want
-	 * to get entryid of folder which is stored as store properties
-	 * (PR_IPM_FAVORITES_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID).
-	 *
-	 * @param PropTag   $prop  proptag of the folder whose entryid we want to get
-	 * @param MAPIStore $store {optional} user store from which we need to get entryid of default folder
-	 *
-	 * @return BinString entryid of default folder from store
-	 */
-	public function getBaseEntryID($prop, $store = false) {
-		$storeprops = mapi_getprops($store ? $store : $this->store, [$prop]);
-		if (!isset($storeprops[$prop])) {
-			return false;
-		}
-
-		return $storeprops[$prop];
-	}
-
-	/**
-	 * Function will return resource of any default folder of store.
-	 *
-	 * @param PropTag   $prop  proptag of the folder that we want to open
-	 * @param MAPIStore $store {optional} user store from which we need to open default folder
-	 *
-	 * @return MAPIFolder default folder of store
-	 */
-	public function openBaseFolder($prop, $store = false) {
-		$folder = false;
-		$entryid = $this->getBaseEntryID($prop, $store);
-
-		if ($entryid !== false) {
-			$folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
-		}
-
-		return $folder;
-	}
-
-	/**
-	 * Function checks whether user has access over the specified folder or not.
-	 *
-	 * @param Binary    $entryid entryid The entryid of the folder to check
-	 * @param MAPIStore $store   (optional) store from which folder should be opened
-	 *
-	 * @return bool true if user has an access over the folder, false if not
-	 */
-	public function checkFolderWriteAccess($entryid, $store = false) {
-		$accessToFolder = false;
-
-		if (!empty($entryid)) {
-			if ($store === false) {
-				$store = $this->store;
-			}
-
-			try {
-				$folder = mapi_msgstore_openentry($store, $entryid);
-				$folderProps = mapi_getprops($folder, [PR_ACCESS]);
-				if (($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) {
-					$accessToFolder = true;
-				}
-			}
-			catch (MAPIException $e) {
-				// we don't have rights to open folder, so return false
-				if ($e->getCode() == MAPI_E_NO_ACCESS) {
-					return $accessToFolder;
-				}
-
-				// rethrow other errors
-				throw $e;
-			}
-		}
-
-		return $accessToFolder;
-	}
-
-	/**
-	 * Function checks whether user has access over the specified folder or not.
-	 *
-	 * @param object MAPI Message Store Object
-	 * @param mixed $store
-	 *
-	 * @return bool true if user has an access over the folder, false if not
-	 */
-	public function checkCalendarWriteAccess($store = false) {
-		if ($store === false) {
-			// If this meeting request is received by a delegate then open delegator's store.
-			$messageProps = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID]);
-			if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
-				$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID]);
-
-				$store = $delegatorStore['store'];
-			}
-			else {
-				$store = $this->store;
-			}
-		}
-
-		// If the store is a public folder, the calendar folder is the PARENT_ENTRYID of the calendar item
-		$provider = mapi_getprops($store, [PR_MDB_PROVIDER]);
-		if (isset($provider[PR_MDB_PROVIDER]) && $provider[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
-			$entryid = mapi_getprops($this->message, [PR_PARENT_ENTRYID]);
-			$entryid = $entryid[PR_PARENT_ENTRYID];
-		}
-		else {
-			$entryid = $this->getDefaultFolderEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
-			if ($entryid === false) {
-				$entryid = $this->getBaseEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
-			}
-
-			if ($entryid === false) {
-				return false;
-			}
-		}
-
-		return $this->checkFolderWriteAccess($entryid, $store);
-	}
-
-	/**
-	 * Function will resolve the user and open its store.
-	 *
-	 * @param string $ownerentryid the entryid of the user
-	 *
-	 * @return MAPIStore store of the user
-	 */
-	public function openCustomUserStore($ownerentryid) {
-		$ab = mapi_openaddressbook($this->session);
-
-		try {
-			$mailuser = mapi_ab_openentry($ab, $ownerentryid);
-		}
-		catch (MAPIException $e) {
-			return;
-		}
-
-		$mailuserprops = mapi_getprops($mailuser, [PR_EMAIL_ADDRESS]);
-		$storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
-
-		return mapi_openmsgstore($this->session, $storeid);
-	}
-
-	/**
-	 * Function which sends response to organizer when attendee accepts, declines or proposes new time to a received meeting request.
-	 *
-	 * @param int   $status              response status of attendee
-	 * @param array $proposeNewTimeProps properties of attendee's proposal
-	 * @param int   $basedate            date of occurrence which attendee has responded
-	 * @param mixed $body
-	 * @param mixed $store
-	 * @param mixed $calFolder
-	 */
-	public function createResponse($status, $proposeNewTimeProps = [], $body = false, $store, $basedate = false, $calFolder) {
-		$messageprops = mapi_getprops($this->message, [
-			PR_SENT_REPRESENTING_ENTRYID,
-			PR_SENT_REPRESENTING_EMAIL_ADDRESS,
-			PR_SENT_REPRESENTING_ADDRTYPE,
-			PR_SENT_REPRESENTING_NAME,
-			PR_SENT_REPRESENTING_SEARCH_KEY,
-			$this->proptags['goid'],
-			$this->proptags['goid2'],
-			$this->proptags['location'],
-			$this->proptags['startdate'],
-			$this->proptags['duedate'],
-			$this->proptags['recurring'],
-			$this->proptags['recurring_pattern'],
-			$this->proptags['recurrence_data'],
-			$this->proptags['timezone_data'],
-			$this->proptags['timezone'],
-			$this->proptags['updatecounter'],
-			PR_SUBJECT,
-			PR_MESSAGE_CLASS,
-			PR_OWNER_APPT_ID,
-			$this->proptags['is_exception'],
-		]);
-
-		if ($basedate && !$this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS])) {
-			// we are creating response from a recurring calendar item object
-			// We found basedate,so opened occurrence and get properties.
-			$recurr = new Recurrence($store, $this->message);
-			$exception = $recurr->getExceptionAttachment($basedate);
-
-			if ($exception) {
-				// Exception found, Now retrieve properties
-				$imessage = mapi_attach_openobj($exception, 0);
-				$imsgprops = mapi_getprops($imessage);
-
-				// If location is provided, copy it to the response
-				if (isset($imsgprops[$this->proptags['location']])) {
-					$messageprops[$this->proptags['location']] = $imsgprops[$this->proptags['location']];
-				}
-
-				// Update $messageprops with timings of occurrence
-				$messageprops[$this->proptags['startdate']] = $imsgprops[$this->proptags['startdate']];
-				$messageprops[$this->proptags['duedate']] = $imsgprops[$this->proptags['duedate']];
-
-				// Meeting related properties
-				$props[$this->proptags['meetingstatus']] = $imsgprops[$this->proptags['meetingstatus']];
-				$props[$this->proptags['responsestatus']] = $imsgprops[$this->proptags['responsestatus']];
-				$props[PR_SUBJECT] = $imsgprops[PR_SUBJECT];
-			}
-			else {
-				// Exceptions is deleted.
-				// Update $messageprops with timings of occurrence
-				$messageprops[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
-				$messageprops[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
-
-				$props[$this->proptags['meetingstatus']] = olNonMeeting;
-				$props[$this->proptags['responsestatus']] = olResponseNone;
-			}
-
-			$props[$this->proptags['recurring']] = false;
-			$props[$this->proptags['is_exception']] = true;
-		}
-		else {
-			// we are creating a response from meeting request mail (it could be recurring or non-recurring)
-			// Send all recurrence info in response, if this is a recurrence meeting.
-			$isRecurring = isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']];
-			$isException = isset($messageprops[$this->proptags['is_exception']]) && $messageprops[$this->proptags['is_exception']];
-			if ($isRecurring || $isException) {
-				if ($isRecurring) {
-					$props[$this->proptags['recurring']] = $messageprops[$this->proptags['recurring']];
-				}
-				if ($isException) {
-					$props[$this->proptags['is_exception']] = $messageprops[$this->proptags['is_exception']];
-				}
-				$calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
-
-				$calendaritem = mapi_msgstore_openentry($store, $calendaritems[0]);
-				$recurr = new Recurrence($store, $calendaritem);
-			}
-		}
-
-		// we are sending a response for recurring meeting request (or exception), so set some required properties
-		if (isset($recurr) && $recurr) {
-			if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
-				$props[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
-			}
-
-			if (!empty($messageprops[$this->proptags['recurrence_data']])) {
-				$props[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
-			}
-
-			$props[$this->proptags['timezone_data']] = $messageprops[$this->proptags['timezone_data']];
-			$props[$this->proptags['timezone']] = $messageprops[$this->proptags['timezone']];
-
-			$this->generateRecurDates($recurr, $messageprops, $props);
-		}
-
-		// Create a response message
-		$recip = [];
-		$recip[PR_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
-		$recip[PR_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
-		$recip[PR_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
-		$recip[PR_DISPLAY_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
-		$recip[PR_RECIPIENT_TYPE] = MAPI_TO;
-		$recip[PR_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
-
-		switch ($status) {
-			case olResponseAccepted:
-				$classpostfix = 'Pos';
-				$subjectprefix = _('Accepted');
-
-				break;
-
-			case olResponseDeclined:
-				$classpostfix = 'Neg';
-				$subjectprefix = _('Declined');
-
-				break;
-
-			case olResponseTentative:
-				$classpostfix = 'Tent';
-				$subjectprefix = _('Tentatively accepted');
-
-				break;
-		}
-
-		if (!empty($proposeNewTimeProps)) {
-			// if attendee has proposed new time then change subject prefix
-			$subjectprefix = _('New Time Proposed');
-		}
-
-		$props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
-
-		$props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.' . $classpostfix;
-		if (isset($messageprops[PR_OWNER_APPT_ID])) {
-			$props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
-		}
-
-		// Set GlobalId AND CleanGlobalId, if exception then also set basedate into GlobalId(0x3).
-		$props[$this->proptags['goid']] = $this->setBasedateInGlobalID($messageprops[$this->proptags['goid2']], $basedate);
-		$props[$this->proptags['goid2']] = $messageprops[$this->proptags['goid2']];
-		$props[$this->proptags['updatecounter']] = isset($messageprops[$this->proptags['updatecounter']]) ? $messageprops[$this->proptags['updatecounter']] : 0;
-
-		if (!empty($proposeNewTimeProps)) {
-			// merge proposal properties to message properties which will be sent to organizer
-			$props = $proposeNewTimeProps + $props;
-		}
-
-		// Set body message in Appointment
-		if (isset($body)) {
-			$props[PR_BODY] = $this->getMeetingTimeInfo() ? $this->getMeetingTimeInfo() : $body;
-		}
-
-		// PR_START_DATE/PR_END_DATE is used in the UI in Outlook on the response message
-		$props[PR_START_DATE] = $messageprops[$this->proptags['startdate']];
-		$props[PR_END_DATE] = $messageprops[$this->proptags['duedate']];
-
-		// Set startdate and duedate in response mail.
-		$props[$this->proptags['startdate']] = $messageprops[$this->proptags['startdate']];
-		$props[$this->proptags['duedate']] = $messageprops[$this->proptags['duedate']];
-
-		// responselocation is used in the UI in Outlook on the response message
-		if (isset($messageprops[$this->proptags['location']])) {
-			$props[$this->proptags['responselocation']] = $messageprops[$this->proptags['location']];
-			$props[$this->proptags['location']] = $messageprops[$this->proptags['location']];
-		}
-
-		$message = $this->createOutgoingMessage($store);
-
-		mapi_setprops($message, $props);
-		mapi_message_modifyrecipients($message, MODRECIP_ADD, [$recip]);
-		mapi_savechanges($message);
-		mapi_message_submitmessage($message);
-	}
-
-	/**
-	 * Function which finds items in calendar based on globalId and cleanGlobalId.
-	 *
-	 * @param binary     $goid             GlobalID(0x3) of item
-	 * @param MAPIFolder $calendar         MAPI_folder of user (optional)
-	 * @param bool       $useCleanGlobalId if true then search should be performed on cleanGlobalId(0x23) else globalId(0x3)
-	 */
-	public function findCalendarItems($goid, $calendar = false, $useCleanGlobalId = false) {
-		if ($calendar === false) {
-			// Open the Calendar
-			$calendar = $this->openDefaultCalendar();
-		}
-
-		// Find the item by restricting all items to the correct ID
-		$restrict = [
-			RES_AND,
-			[
-				[
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_EQ,
-						ULPROPTAG => ($useCleanGlobalId === true ? $this->proptags['goid2'] : $this->proptags['goid']),
-						VALUE => $goid,
-					],
-				],
-			], ];
-
-		$calendarcontents = mapi_folder_getcontentstable($calendar);
-
-		$rows = mapi_table_queryallrows($calendarcontents, [PR_ENTRYID], $restrict);
-
-		if (empty($rows)) {
-			return;
-		}
-
-		$calendaritems = [];
-
-		// In principle, there should only be one row, but we'll handle them all just in case
-		foreach ($rows as $row) {
-			$calendaritems[] = $row[PR_ENTRYID];
-		}
-
-		return $calendaritems;
-	}
-
-	// Returns TRUE if both entryid's are equal. Equality is defined by both entryid's pointing at the
-	// same SMTP address when converted to SMTP
-	public function compareABEntryIDs($entryid1, $entryid2) {
-		// If the session was not passed, just do a 'normal' compare.
-		if (!$this->session) {
-			return $entryid1 == $entryid2;
-		}
-
-		$smtp1 = $this->getSMTPAddress($entryid1);
-		$smtp2 = $this->getSMTPAddress($entryid2);
-
-		if ($smtp1 == $smtp2) {
-			return true;
-		}
-
-		return false;
-	}
-
-	// Gets the SMTP address of the passed addressbook entryid
-	public function getSMTPAddress($entryid) {
-		if (!$this->session) {
-			return false;
-		}
-
-		$ab = mapi_openaddressbook($this->session);
-
-		$abitem = mapi_ab_openentry($ab, $entryid);
-
-		if (!$abitem) {
-			return '';
-		}
-
-		$props = mapi_getprops($abitem, [PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS]);
-
-		if ($props[PR_ADDRTYPE] == 'SMTP') {
-			return $props[PR_EMAIL_ADDRESS];
-		}
-
-		return $props[PR_SMTP_ADDRESS];
-	}
-
-	/**
-	 * Gets the properties associated with the owner of the passed store:
-	 * PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_ADDRTYPE, PR_ENTRYID, PR_SEARCH_KEY.
-	 *
-	 * @param $store message store
-	 * @param $fallbackToLoggedInUser if true then return properties of logged in user instead of mailbox owner
-	 * not used when passed store is public store. for public store we are always returning logged in user's info.
-	 *
-	 * @return properties of logged in user in an array in sequence of display_name, email address, address type,
-	 *                    entryid and search key
-	 */
-	public function getOwnerAddress($store, $fallbackToLoggedInUser = true) {
-		if (!$this->session) {
-			return false;
-		}
-
-		$storeProps = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID, PR_USER_ENTRYID]);
-
-		$ownerEntryId = false;
-		if (isset($storeProps[PR_USER_ENTRYID]) && $storeProps[PR_USER_ENTRYID]) {
-			$ownerEntryId = $storeProps[PR_USER_ENTRYID];
-		}
-
-		if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID]) && $storeProps[PR_MAILBOX_OWNER_ENTRYID] && !$fallbackToLoggedInUser) {
-			$ownerEntryId = $storeProps[PR_MAILBOX_OWNER_ENTRYID];
-		}
-
-		if ($ownerEntryId) {
-			$ab = mapi_openaddressbook($this->session);
-
-			$zarafaUser = mapi_ab_openentry($ab, $ownerEntryId);
-			if (!$zarafaUser) {
-				return false;
-			}
-
-			$ownerProps = mapi_getprops($zarafaUser, [PR_ADDRTYPE, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SEARCH_KEY]);
-
-			$addrType = $ownerProps[PR_ADDRTYPE];
-			$name = $ownerProps[PR_DISPLAY_NAME];
-			$emailAddr = $ownerProps[PR_EMAIL_ADDRESS];
-			$searchKey = $ownerProps[PR_SEARCH_KEY];
-			$entryId = $ownerEntryId;
-
-			return [$name, $emailAddr, $addrType, $entryId, $searchKey];
-		}
-
-		return false;
-	}
-
-	// Opens this session's default message store
-	public function openDefaultStore() {
-		$storestable = mapi_getmsgstorestable($this->session);
-		$rows = mapi_table_queryallrows($storestable, [PR_ENTRYID, PR_DEFAULT_STORE]);
-
-		foreach ($rows as $row) {
-			if (isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE]) {
-				$entryid = $row[PR_ENTRYID];
-
-				break;
-			}
-		}
-
-		if (!$entryid) {
-			return false;
-		}
-
-		return mapi_openmsgstore($this->session, $entryid);
-	}
-
-	/**
-	 *  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);
-		}
-	}
-
-	/**
-	 * Function which removes an exception/occurrence from recurrencing meeting
-	 * when a meeting cancellation of an occurrence is processed.
-	 *
-	 * @param string   $basedate basedate of an occurrence
-	 * @param resource $message  recurring item from which occurrence has to be deleted
-	 * @param resource $store    MAPI_MSG_Store which contains the item
-	 */
-	public function doRemoveExceptionFromCalendar($basedate, $message, $store) {
-		$recurr = new Recurrence($store, $message);
-		$recurr->createException([], $basedate, true);
-		mapi_savechanges($message);
-	}
-
-	/**
-	 * Function which returns basedate of an changed occurrence from globalID of meeting request.
-	 *
-	 *@param binary $goid globalID
-	 *
-	 *@return bool true if basedate is found else false it not found
-	 */
-	public function getBasedateFromGlobalID($goid) {
-		$hexguid = bin2hex($goid);
-		$hexbase = substr($hexguid, 32, 8);
-		$day = hexdec(substr($hexbase, 6, 2));
-		$month = hexdec(substr($hexbase, 4, 2));
-		$year = hexdec(substr($hexbase, 0, 4));
-
-		if ($day && $month && $year) {
-			return gmmktime(0, 0, 0, $month, $day, $year);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Function which sets basedate in globalID of changed occurrence which is to be send.
-	 *
-	 *@param binary $goid globalID
-	 *@param string basedate of changed occurrence
-	 * @param mixed $basedate
-	 *
-	 *@return binary globalID with basedate in it
-	 */
-	public function setBasedateInGlobalID($goid, $basedate = false) {
-		$hexguid = bin2hex($goid);
-		$year = $basedate ? sprintf('%04s', dechex(gmdate('Y', $basedate))) : '0000';
-		$month = $basedate ? sprintf('%02s', dechex(gmdate('m', $basedate))) : '00';
-		$day = $basedate ? sprintf('%02s', dechex(gmdate('d', $basedate))) : '00';
-
-		return hex2bin(strtoupper(substr($hexguid, 0, 32) . $year . $month . $day . substr($hexguid, 40)));
-	}
-
-	/**
-	 * Function which replaces attachments with copy_from in copy_to.
-	 *
-	 * @param MAPIMessage $copy_from      MAPI_message from which attachments are to be copied
-	 * @param MAPIMessage $copy_to        MAPI_message to which attachment are to be copied
-	 * @param bool        $copyExceptions if true then all exceptions should also be sent as attachments
-	 * @param mixed       $copyFrom
-	 * @param mixed       $copyTo
-	 */
-	public function replaceAttachments($copyFrom, $copyTo, $copyExceptions = true) {
-		/* remove all old attachments */
-		$attachmentTable = mapi_message_getattachmenttable($copyTo);
-		if ($attachmentTable) {
-			$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME]);
-
-			foreach ($attachments as $attachProps) {
-				/* remove exceptions too? */
-				if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
-					continue;
-				}
-				mapi_message_deleteattach($copyTo, $attachProps[PR_ATTACH_NUM]);
-			}
-		}
-		$attachmentTable = false;
-
-		/* copy new attachments */
-		$attachmentTable = mapi_message_getattachmenttable($copyFrom);
-		if ($attachmentTable) {
-			$attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME]);
-
-			foreach ($attachments as $attachProps) {
-				if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
-					continue;
-				}
-
-				$attachOld = mapi_message_openattach($copyFrom, (int) $attachProps[PR_ATTACH_NUM]);
-				$attachNewResourceMsg = mapi_message_createattach($copyTo);
-				mapi_copyto($attachOld, [], [], $attachNewResourceMsg, 0);
-				mapi_savechanges($attachNewResourceMsg);
-			}
-		}
-	}
-
-	/**
-	 * Function which replaces recipients in copy_to with recipients from copyFrom.
-	 *
-	 * @param MAPIMessage $copyFrom   MAPI_message from which recipients are to be copied
-	 * @param MAPIMessage $copyTo     MAPI_message to which recipients are to be copied
-	 * @param bool        $isDelegate indicates delegate is processing
-	 *                                so don't copy delegate information to recipient table
-	 */
-	public function replaceRecipients($copyFrom, $copyTo, $isDelegate = false) {
-		$recipientTable = mapi_message_getrecipienttable($copyFrom);
-
-		// If delegate, then do not add the delegate in recipients
-		if ($isDelegate) {
-			$delegate = mapi_getprops($copyFrom, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
-			$res = [RES_PROPERTY, [
-				RELOP => RELOP_NE,
-				ULPROPTAG => PR_EMAIL_ADDRESS,
-				VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
-			],
-			];
-			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-		}
-		else {
-			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
-		}
-
-		$copyToRecipientTable = mapi_message_getrecipienttable($copyTo);
-		$copyToRecipientRows = mapi_table_queryallrows($copyToRecipientTable, [PR_ROWID]);
-
-		mapi_message_modifyrecipients($copyTo, MODRECIP_REMOVE, $copyToRecipientRows);
-		mapi_message_modifyrecipients($copyTo, MODRECIP_ADD, $recipients);
-	}
-
-	/**
-	 * Function creates meeting item in resource's calendar.
-	 *
-	 * @param resource $message  MAPI_message which is to create in resource's calendar
-	 * @param bool     $cancel   cancel meeting
-	 * @param string   $prefix   prefix for subject of meeting
-	 * @param mixed    $basedate
-	 */
-	public function bookResources($message, $cancel, $prefix, $basedate = false) {
-		if (!$this->enableDirectBooking) {
-			return [];
-		}
-
-		// Get the properties of the message
-		$messageprops = mapi_getprops($message);
-
-		if ($basedate) {
-			$recurrItemProps = mapi_getprops($this->message, [$this->proptags['goid'], $this->proptags['goid2'], $this->proptags['timezone_data'], $this->proptags['timezone'], PR_OWNER_APPT_ID]);
-
-			$messageprops[$this->proptags['goid']] = $this->setBasedateInGlobalID($recurrItemProps[$this->proptags['goid']], $basedate);
-			$messageprops[$this->proptags['goid2']] = $recurrItemProps[$this->proptags['goid2']];
-
-			// Delete properties which are not needed.
-			$deleteProps = [$this->proptags['basedate'], PR_DISPLAY_NAME, PR_ATTACHMENT_FLAGS, PR_ATTACHMENT_HIDDEN, PR_ATTACHMENT_LINKID, PR_ATTACH_FLAGS, PR_ATTACH_METHOD];
-			foreach ($deleteProps as $propID) {
-				if (isset($messageprops[$propID])) {
-					unset($messageprops[$propID]);
-				}
-			}
-
-			if (isset($messageprops[$this->proptags['recurring']])) {
-				$messageprops[$this->proptags['recurring']] = false;
-			}
-
-			// Set Outlook properties
-			$messageprops[$this->proptags['clipstart']] = $messageprops[$this->proptags['startdate']];
-			$messageprops[$this->proptags['clipend']] = $messageprops[$this->proptags['duedate']];
-			$messageprops[$this->proptags['timezone_data']] = $recurrItemProps[$this->proptags['timezone_data']];
-			$messageprops[$this->proptags['timezone']] = $recurrItemProps[$this->proptags['timezone']];
-			$messageprops[$this->proptags['attendee_critical_change']] = time();
-			$messageprops[$this->proptags['owner_critical_change']] = time();
-		}
-
-		// Get resource recipients
-		$getResourcesRestriction = [
-			RES_AND,
-			[
-				[
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
-						ULPROPTAG => PR_RECIPIENT_TYPE,
-						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
-					],
-				], ],
-		];
-		$recipienttable = mapi_message_getrecipienttable($message);
-		$resourceRecipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $getResourcesRestriction);
-
-		$this->errorSetResource = false;
-		$resourceRecipData = [];
-
-		// Put appointment into store resource users
-		$i = 0;
-		$len = count($resourceRecipients);
-		while (!$this->errorSetResource && $i < $len) {
-			$userStore = $this->openCustomUserStore($resourceRecipients[$i][PR_ENTRYID]);
-
-			// Open root folder
-			$userRoot = mapi_msgstore_openentry($userStore, null);
-
-			// Get calendar entryID
-			$userRootProps = mapi_getprops($userRoot, [PR_STORE_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_FREEBUSY_ENTRYIDS]);
-
-			// Open Calendar folder
-			$accessToFolder = false;
-
-			try {
-				// @FIXME this checks delegate has access to resource's calendar folder
-				// but it should use boss' credentials
-
-				$accessToFolder = $this->checkCalendarWriteAccess($this->store);
-				if ($accessToFolder) {
-					$calFolder = mapi_msgstore_openentry($userStore, $userRootProps[PR_IPM_APPOINTMENT_ENTRYID]);
-				}
-			}
-			catch (MAPIException $e) {
-				$e->setHandled();
-				$this->errorSetResource = 1; // No access
-			}
-
-			if ($accessToFolder) {
-				/**
-				 * Get the LocalFreebusy message that contains the properties that
-				 * are set to accept or decline resource meeting requests.
-				 */
-				// Use PR_FREEBUSY_ENTRYIDS[1] to open folder the LocalFreeBusy msg
-				$localFreebusyMsg = mapi_msgstore_openentry($userStore, $userRootProps[PR_FREEBUSY_ENTRYIDS][1]);
-				if ($localFreebusyMsg) {
-					$props = mapi_getprops($localFreebusyMsg, [PR_PROCESS_MEETING_REQUESTS, PR_DECLINE_RECURRING_MEETING_REQUESTS, PR_DECLINE_CONFLICTING_MEETING_REQUESTS]);
-
-					$acceptMeetingRequests = isset($props[PR_PROCESS_MEETING_REQUESTS]) ? $props[PR_PROCESS_MEETING_REQUESTS] : false;
-					$declineRecurringMeetingRequests = isset($props[PR_DECLINE_RECURRING_MEETING_REQUESTS]) ? $props[PR_DECLINE_RECURRING_MEETING_REQUESTS] : false;
-					$declineConflictingMeetingRequests = isset($props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS]) ? $props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS] : false;
-
-					if (!$acceptMeetingRequests) {
-						/*
+    /**
+     * Return the tracking status of a recipient based on the IPM class (passed).
+     *
+     * @param mixed $class
+     */
+    public function getTrackStatus($class) {
+        $status = olRecipientTrackStatusNone;
+
+        switch ($class) {
+            case 'IPM.Schedule.Meeting.Resp.Pos':
+                $status = olRecipientTrackStatusAccepted;
+
+                break;
+
+            case 'IPM.Schedule.Meeting.Resp.Tent':
+                $status = olRecipientTrackStatusTentative;
+
+                break;
+
+            case 'IPM.Schedule.Meeting.Resp.Neg':
+                $status = olRecipientTrackStatusDeclined;
+
+                break;
+        }
+
+        return $status;
+    }
+
+    /**
+     * Function returns MAPIFolder resource of the folder that currently holds this meeting/meeting request
+     * object.
+     */
+    public function openParentFolder() {
+        $messageprops = mapi_getprops($this->message, [PR_PARENT_ENTRYID]);
+
+        return mapi_msgstore_openentry($this->store, $messageprops[PR_PARENT_ENTRYID]);
+    }
+
+    /**
+     * Function will return resource of the default calendar folder of store.
+     *
+     * @param MAPIStore $store {optional} user store whose default calendar should be opened
+     *
+     * @return MAPIFolder default calendar folder of store
+     */
+    public function openDefaultCalendar($store = false) {
+        return $this->openDefaultFolder(PR_IPM_APPOINTMENT_ENTRYID, $store);
+    }
+
+    /**
+     * Function will return resource of the default outbox folder of store.
+     *
+     * @param MAPIStore $store {optional} user store whose default outbox should be opened
+     *
+     * @return MAPIFolder default outbox folder of store
+     */
+    public function openDefaultOutbox($store = false) {
+        return $this->openBaseFolder(PR_IPM_OUTBOX_ENTRYID, $store);
+    }
+
+    /**
+     * Function will return resource of the default wastebasket folder of store.
+     *
+     * @param MAPIStore $store {optional} user store whose default wastebasket should be opened
+     *
+     * @return MAPIFolder default wastebasket folder of store
+     */
+    public function openDefaultWastebasket($store = false) {
+        return $this->openBaseFolder(PR_IPM_WASTEBASKET_ENTRYID, $store);
+    }
+
+    /**
+     * Function will return resource of the default calendar folder of store.
+     *
+     * @param MAPIStore $store {optional} user store whose default calendar should be opened
+     *
+     * @return MAPIFolder default calendar folder of store
+     */
+    public function getDefaultWastebasketEntryID($store = false) {
+        return $this->getBaseEntryID(PR_IPM_WASTEBASKET_ENTRYID, $store);
+    }
+
+    /**
+     * Function will return resource of the default sent mail folder of store.
+     *
+     * @param MAPIStore $store {optional} user store whose default sent mail should be opened
+     *
+     * @return MAPIFolder default sent mail folder of store
+     */
+    public function getDefaultSentmailEntryID($store = false) {
+        return $this->getBaseEntryID(PR_IPM_SENTMAIL_ENTRYID, $store);
+    }
+
+    /**
+     * Function will return entryid of any default folder of store. This method is useful when you want
+     * to get entryid of folder which is stored as properties of inbox folder
+     * (PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_JOURNAL_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_TASK_ENTRYID).
+     *
+     * @param PropTag   $prop  proptag of the folder for which we want to get entryid
+     * @param MAPIStore $store {optional} user store from which we need to get entryid of default folder
+     *
+     * @return BinString entryid of folder pointed by $prop
+     */
+    public function getDefaultFolderEntryID($prop, $store = false) {
+        try {
+            $inbox = mapi_msgstore_getreceivefolder($store ? $store : $this->store);
+            $inboxprops = mapi_getprops($inbox, [$prop]);
+            if (isset($inboxprops[$prop])) {
+                return $inboxprops[$prop];
+            }
+        }
+        catch (MAPIException $e) {
+            // public store doesn't support this method
+            if ($e->getCode() == MAPI_E_NO_SUPPORT) {
+                // don't propagate this error to parent handlers, if store doesn't support it
+                $e->setHandled();
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Function will return resource of any default folder of store.
+     *
+     * @param PropTag   $prop  proptag of the folder that we want to open
+     * @param MAPIStore $store {optional} user store from which we need to open default folder
+     *
+     * @return MAPIFolder default folder of store
+     */
+    public function openDefaultFolder($prop, $store = false) {
+        $folder = false;
+        $entryid = $this->getDefaultFolderEntryID($prop, $store);
+
+        if ($entryid !== false) {
+            $folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Function will return entryid of default folder from store. This method is useful when you want
+     * to get entryid of folder which is stored as store properties
+     * (PR_IPM_FAVORITES_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID).
+     *
+     * @param PropTag   $prop  proptag of the folder whose entryid we want to get
+     * @param MAPIStore $store {optional} user store from which we need to get entryid of default folder
+     *
+     * @return BinString entryid of default folder from store
+     */
+    public function getBaseEntryID($prop, $store = false) {
+        $storeprops = mapi_getprops($store ? $store : $this->store, [$prop]);
+        if (!isset($storeprops[$prop])) {
+            return false;
+        }
+
+        return $storeprops[$prop];
+    }
+
+    /**
+     * Function will return resource of any default folder of store.
+     *
+     * @param PropTag   $prop  proptag of the folder that we want to open
+     * @param MAPIStore $store {optional} user store from which we need to open default folder
+     *
+     * @return MAPIFolder default folder of store
+     */
+    public function openBaseFolder($prop, $store = false) {
+        $folder = false;
+        $entryid = $this->getBaseEntryID($prop, $store);
+
+        if ($entryid !== false) {
+            $folder = mapi_msgstore_openentry($store ? $store : $this->store, $entryid);
+        }
+
+        return $folder;
+    }
+
+    /**
+     * Function checks whether user has access over the specified folder or not.
+     *
+     * @param Binary    $entryid entryid The entryid of the folder to check
+     * @param MAPIStore $store   (optional) store from which folder should be opened
+     *
+     * @return bool true if user has an access over the folder, false if not
+     */
+    public function checkFolderWriteAccess($entryid, $store = false) {
+        $accessToFolder = false;
+
+        if (!empty($entryid)) {
+            if ($store === false) {
+                $store = $this->store;
+            }
+
+            try {
+                $folder = mapi_msgstore_openentry($store, $entryid);
+                $folderProps = mapi_getprops($folder, [PR_ACCESS]);
+                if (($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) {
+                    $accessToFolder = true;
+                }
+            }
+            catch (MAPIException $e) {
+                // we don't have rights to open folder, so return false
+                if ($e->getCode() == MAPI_E_NO_ACCESS) {
+                    return $accessToFolder;
+                }
+
+                // rethrow other errors
+                throw $e;
+            }
+        }
+
+        return $accessToFolder;
+    }
+
+    /**
+     * Function checks whether user has access over the specified folder or not.
+     *
+     * @param object MAPI Message Store Object
+     * @param mixed $store
+     *
+     * @return bool true if user has an access over the folder, false if not
+     */
+    public function checkCalendarWriteAccess($store = false) {
+        if ($store === false) {
+            // If this meeting request is received by a delegate then open delegator's store.
+            $messageProps = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID]);
+            if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
+                $delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID]);
+
+                $store = $delegatorStore['store'];
+            }
+            else {
+                $store = $this->store;
+            }
+        }
+
+        // If the store is a public folder, the calendar folder is the PARENT_ENTRYID of the calendar item
+        $provider = mapi_getprops($store, [PR_MDB_PROVIDER]);
+        if (isset($provider[PR_MDB_PROVIDER]) && $provider[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
+            $entryid = mapi_getprops($this->message, [PR_PARENT_ENTRYID]);
+            $entryid = $entryid[PR_PARENT_ENTRYID];
+        }
+        else {
+            $entryid = $this->getDefaultFolderEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
+            if ($entryid === false) {
+                $entryid = $this->getBaseEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
+            }
+
+            if ($entryid === false) {
+                return false;
+            }
+        }
+
+        return $this->checkFolderWriteAccess($entryid, $store);
+    }
+
+    /**
+     * Function will resolve the user and open its store.
+     *
+     * @param string $ownerentryid the entryid of the user
+     *
+     * @return MAPIStore store of the user
+     */
+    public function openCustomUserStore($ownerentryid) {
+        $ab = mapi_openaddressbook($this->session);
+
+        try {
+            $mailuser = mapi_ab_openentry($ab, $ownerentryid);
+        }
+        catch (MAPIException $e) {
+            return;
+        }
+
+        $mailuserprops = mapi_getprops($mailuser, [PR_EMAIL_ADDRESS]);
+        $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
+
+        return mapi_openmsgstore($this->session, $storeid);
+    }
+
+    /**
+     * Function which sends response to organizer when attendee accepts, declines or proposes new time to a received meeting request.
+     *
+     * @param int   $status              response status of attendee
+     * @param array $proposeNewTimeProps properties of attendee's proposal
+     * @param int   $basedate            date of occurrence which attendee has responded
+     * @param mixed $body
+     * @param mixed $store
+     * @param mixed $calFolder
+     */
+    public function createResponse($status, $proposeNewTimeProps = [], $body = false, $store, $basedate = false, $calFolder) {
+        $messageprops = mapi_getprops($this->message, [
+            PR_SENT_REPRESENTING_ENTRYID,
+            PR_SENT_REPRESENTING_EMAIL_ADDRESS,
+            PR_SENT_REPRESENTING_ADDRTYPE,
+            PR_SENT_REPRESENTING_NAME,
+            PR_SENT_REPRESENTING_SEARCH_KEY,
+            $this->proptags['goid'],
+            $this->proptags['goid2'],
+            $this->proptags['location'],
+            $this->proptags['startdate'],
+            $this->proptags['duedate'],
+            $this->proptags['recurring'],
+            $this->proptags['recurring_pattern'],
+            $this->proptags['recurrence_data'],
+            $this->proptags['timezone_data'],
+            $this->proptags['timezone'],
+            $this->proptags['updatecounter'],
+            PR_SUBJECT,
+            PR_MESSAGE_CLASS,
+            PR_OWNER_APPT_ID,
+            $this->proptags['is_exception'],
+        ]);
+
+        if ($basedate && !$this->isMeetingRequest($messageprops[PR_MESSAGE_CLASS])) {
+            // we are creating response from a recurring calendar item object
+            // We found basedate,so opened occurrence and get properties.
+            $recurr = new Recurrence($store, $this->message);
+            $exception = $recurr->getExceptionAttachment($basedate);
+
+            if ($exception) {
+                // Exception found, Now retrieve properties
+                $imessage = mapi_attach_openobj($exception, 0);
+                $imsgprops = mapi_getprops($imessage);
+
+                // If location is provided, copy it to the response
+                if (isset($imsgprops[$this->proptags['location']])) {
+                    $messageprops[$this->proptags['location']] = $imsgprops[$this->proptags['location']];
+                }
+
+                // Update $messageprops with timings of occurrence
+                $messageprops[$this->proptags['startdate']] = $imsgprops[$this->proptags['startdate']];
+                $messageprops[$this->proptags['duedate']] = $imsgprops[$this->proptags['duedate']];
+
+                // Meeting related properties
+                $props[$this->proptags['meetingstatus']] = $imsgprops[$this->proptags['meetingstatus']];
+                $props[$this->proptags['responsestatus']] = $imsgprops[$this->proptags['responsestatus']];
+                $props[PR_SUBJECT] = $imsgprops[PR_SUBJECT];
+            }
+            else {
+                // Exceptions is deleted.
+                // Update $messageprops with timings of occurrence
+                $messageprops[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
+                $messageprops[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
+
+                $props[$this->proptags['meetingstatus']] = olNonMeeting;
+                $props[$this->proptags['responsestatus']] = olResponseNone;
+            }
+
+            $props[$this->proptags['recurring']] = false;
+            $props[$this->proptags['is_exception']] = true;
+        }
+        else {
+            // we are creating a response from meeting request mail (it could be recurring or non-recurring)
+            // Send all recurrence info in response, if this is a recurrence meeting.
+            $isRecurring = isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']];
+            $isException = isset($messageprops[$this->proptags['is_exception']]) && $messageprops[$this->proptags['is_exception']];
+            if ($isRecurring || $isException) {
+                if ($isRecurring) {
+                    $props[$this->proptags['recurring']] = $messageprops[$this->proptags['recurring']];
+                }
+                if ($isException) {
+                    $props[$this->proptags['is_exception']] = $messageprops[$this->proptags['is_exception']];
+                }
+                $calendaritems = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder);
+
+                $calendaritem = mapi_msgstore_openentry($store, $calendaritems[0]);
+                $recurr = new Recurrence($store, $calendaritem);
+            }
+        }
+
+        // we are sending a response for recurring meeting request (or exception), so set some required properties
+        if (isset($recurr) && $recurr) {
+            if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
+                $props[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
+            }
+
+            if (!empty($messageprops[$this->proptags['recurrence_data']])) {
+                $props[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
+            }
+
+            $props[$this->proptags['timezone_data']] = $messageprops[$this->proptags['timezone_data']];
+            $props[$this->proptags['timezone']] = $messageprops[$this->proptags['timezone']];
+
+            $this->generateRecurDates($recurr, $messageprops, $props);
+        }
+
+        // Create a response message
+        $recip = [];
+        $recip[PR_ENTRYID] = $messageprops[PR_SENT_REPRESENTING_ENTRYID];
+        $recip[PR_EMAIL_ADDRESS] = $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
+        $recip[PR_ADDRTYPE] = $messageprops[PR_SENT_REPRESENTING_ADDRTYPE];
+        $recip[PR_DISPLAY_NAME] = $messageprops[PR_SENT_REPRESENTING_NAME];
+        $recip[PR_RECIPIENT_TYPE] = MAPI_TO;
+        $recip[PR_SEARCH_KEY] = $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY];
+
+        switch ($status) {
+            case olResponseAccepted:
+                $classpostfix = 'Pos';
+                $subjectprefix = _('Accepted');
+
+                break;
+
+            case olResponseDeclined:
+                $classpostfix = 'Neg';
+                $subjectprefix = _('Declined');
+
+                break;
+
+            case olResponseTentative:
+                $classpostfix = 'Tent';
+                $subjectprefix = _('Tentatively accepted');
+
+                break;
+        }
+
+        if (!empty($proposeNewTimeProps)) {
+            // if attendee has proposed new time then change subject prefix
+            $subjectprefix = _('New Time Proposed');
+        }
+
+        $props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
+
+        $props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.' . $classpostfix;
+        if (isset($messageprops[PR_OWNER_APPT_ID])) {
+            $props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
+        }
+
+        // Set GlobalId AND CleanGlobalId, if exception then also set basedate into GlobalId(0x3).
+        $props[$this->proptags['goid']] = $this->setBasedateInGlobalID($messageprops[$this->proptags['goid2']], $basedate);
+        $props[$this->proptags['goid2']] = $messageprops[$this->proptags['goid2']];
+        $props[$this->proptags['updatecounter']] = isset($messageprops[$this->proptags['updatecounter']]) ? $messageprops[$this->proptags['updatecounter']] : 0;
+
+        if (!empty($proposeNewTimeProps)) {
+            // merge proposal properties to message properties which will be sent to organizer
+            $props = $proposeNewTimeProps + $props;
+        }
+
+        // Set body message in Appointment
+        if (isset($body)) {
+            $props[PR_BODY] = $this->getMeetingTimeInfo() ? $this->getMeetingTimeInfo() : $body;
+        }
+
+        // PR_START_DATE/PR_END_DATE is used in the UI in Outlook on the response message
+        $props[PR_START_DATE] = $messageprops[$this->proptags['startdate']];
+        $props[PR_END_DATE] = $messageprops[$this->proptags['duedate']];
+
+        // Set startdate and duedate in response mail.
+        $props[$this->proptags['startdate']] = $messageprops[$this->proptags['startdate']];
+        $props[$this->proptags['duedate']] = $messageprops[$this->proptags['duedate']];
+
+        // responselocation is used in the UI in Outlook on the response message
+        if (isset($messageprops[$this->proptags['location']])) {
+            $props[$this->proptags['responselocation']] = $messageprops[$this->proptags['location']];
+            $props[$this->proptags['location']] = $messageprops[$this->proptags['location']];
+        }
+
+        $message = $this->createOutgoingMessage($store);
+
+        mapi_setprops($message, $props);
+        mapi_message_modifyrecipients($message, MODRECIP_ADD, [$recip]);
+        mapi_savechanges($message);
+        mapi_message_submitmessage($message);
+    }
+
+    /**
+     * Function which finds items in calendar based on globalId and cleanGlobalId.
+     *
+     * @param binary     $goid             GlobalID(0x3) of item
+     * @param MAPIFolder $calendar         MAPI_folder of user (optional)
+     * @param bool       $useCleanGlobalId if true then search should be performed on cleanGlobalId(0x23) else globalId(0x3)
+     */
+    public function findCalendarItems($goid, $calendar = false, $useCleanGlobalId = false) {
+        if ($calendar === false) {
+            // Open the Calendar
+            $calendar = $this->openDefaultCalendar();
+        }
+
+        // Find the item by restricting all items to the correct ID
+        $restrict = [
+            RES_AND,
+            [
+                [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_EQ,
+                        ULPROPTAG => ($useCleanGlobalId === true ? $this->proptags['goid2'] : $this->proptags['goid']),
+                        VALUE => $goid,
+                    ],
+                ],
+            ], ];
+
+        $calendarcontents = mapi_folder_getcontentstable($calendar);
+
+        $rows = mapi_table_queryallrows($calendarcontents, [PR_ENTRYID], $restrict);
+
+        if (empty($rows)) {
+            return;
+        }
+
+        $calendaritems = [];
+
+        // In principle, there should only be one row, but we'll handle them all just in case
+        foreach ($rows as $row) {
+            $calendaritems[] = $row[PR_ENTRYID];
+        }
+
+        return $calendaritems;
+    }
+
+    // Returns TRUE if both entryid's are equal. Equality is defined by both entryid's pointing at the
+    // same SMTP address when converted to SMTP
+    public function compareABEntryIDs($entryid1, $entryid2) {
+        // If the session was not passed, just do a 'normal' compare.
+        if (!$this->session) {
+            return $entryid1 == $entryid2;
+        }
+
+        $smtp1 = $this->getSMTPAddress($entryid1);
+        $smtp2 = $this->getSMTPAddress($entryid2);
+
+        if ($smtp1 == $smtp2) {
+            return true;
+        }
+
+        return false;
+    }
+
+    // Gets the SMTP address of the passed addressbook entryid
+    public function getSMTPAddress($entryid) {
+        if (!$this->session) {
+            return false;
+        }
+
+        $ab = mapi_openaddressbook($this->session);
+
+        $abitem = mapi_ab_openentry($ab, $entryid);
+
+        if (!$abitem) {
+            return '';
+        }
+
+        $props = mapi_getprops($abitem, [PR_ADDRTYPE, PR_EMAIL_ADDRESS, PR_SMTP_ADDRESS]);
+
+        if ($props[PR_ADDRTYPE] == 'SMTP') {
+            return $props[PR_EMAIL_ADDRESS];
+        }
+
+        return $props[PR_SMTP_ADDRESS];
+    }
+
+    /**
+     * Gets the properties associated with the owner of the passed store:
+     * PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_ADDRTYPE, PR_ENTRYID, PR_SEARCH_KEY.
+     *
+     * @param $store message store
+     * @param $fallbackToLoggedInUser if true then return properties of logged in user instead of mailbox owner
+     * not used when passed store is public store. for public store we are always returning logged in user's info.
+     *
+     * @return properties of logged in user in an array in sequence of display_name, email address, address type,
+     *                    entryid and search key
+     */
+    public function getOwnerAddress($store, $fallbackToLoggedInUser = true) {
+        if (!$this->session) {
+            return false;
+        }
+
+        $storeProps = mapi_getprops($store, [PR_MAILBOX_OWNER_ENTRYID, PR_USER_ENTRYID]);
+
+        $ownerEntryId = false;
+        if (isset($storeProps[PR_USER_ENTRYID]) && $storeProps[PR_USER_ENTRYID]) {
+            $ownerEntryId = $storeProps[PR_USER_ENTRYID];
+        }
+
+        if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID]) && $storeProps[PR_MAILBOX_OWNER_ENTRYID] && !$fallbackToLoggedInUser) {
+            $ownerEntryId = $storeProps[PR_MAILBOX_OWNER_ENTRYID];
+        }
+
+        if ($ownerEntryId) {
+            $ab = mapi_openaddressbook($this->session);
+
+            $zarafaUser = mapi_ab_openentry($ab, $ownerEntryId);
+            if (!$zarafaUser) {
+                return false;
+            }
+
+            $ownerProps = mapi_getprops($zarafaUser, [PR_ADDRTYPE, PR_DISPLAY_NAME, PR_EMAIL_ADDRESS, PR_SEARCH_KEY]);
+
+            $addrType = $ownerProps[PR_ADDRTYPE];
+            $name = $ownerProps[PR_DISPLAY_NAME];
+            $emailAddr = $ownerProps[PR_EMAIL_ADDRESS];
+            $searchKey = $ownerProps[PR_SEARCH_KEY];
+            $entryId = $ownerEntryId;
+
+            return [$name, $emailAddr, $addrType, $entryId, $searchKey];
+        }
+
+        return false;
+    }
+
+    // Opens this session's default message store
+    public function openDefaultStore() {
+        $storestable = mapi_getmsgstorestable($this->session);
+        $rows = mapi_table_queryallrows($storestable, [PR_ENTRYID, PR_DEFAULT_STORE]);
+
+        foreach ($rows as $row) {
+            if (isset($row[PR_DEFAULT_STORE]) && $row[PR_DEFAULT_STORE]) {
+                $entryid = $row[PR_ENTRYID];
+
+                break;
+            }
+        }
+
+        if (!$entryid) {
+            return false;
+        }
+
+        return mapi_openmsgstore($this->session, $entryid);
+    }
+
+    /**
+     *  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);
+        }
+    }
+
+    /**
+     * Function which removes an exception/occurrence from recurrencing meeting
+     * when a meeting cancellation of an occurrence is processed.
+     *
+     * @param string   $basedate basedate of an occurrence
+     * @param resource $message  recurring item from which occurrence has to be deleted
+     * @param resource $store    MAPI_MSG_Store which contains the item
+     */
+    public function doRemoveExceptionFromCalendar($basedate, $message, $store) {
+        $recurr = new Recurrence($store, $message);
+        $recurr->createException([], $basedate, true);
+        mapi_savechanges($message);
+    }
+
+    /**
+     * Function which returns basedate of an changed occurrence from globalID of meeting request.
+     *
+     *@param binary $goid globalID
+     *
+     *@return bool true if basedate is found else false it not found
+     */
+    public function getBasedateFromGlobalID($goid) {
+        $hexguid = bin2hex($goid);
+        $hexbase = substr($hexguid, 32, 8);
+        $day = hexdec(substr($hexbase, 6, 2));
+        $month = hexdec(substr($hexbase, 4, 2));
+        $year = hexdec(substr($hexbase, 0, 4));
+
+        if ($day && $month && $year) {
+            return gmmktime(0, 0, 0, $month, $day, $year);
+        }
+
+        return false;
+    }
+
+    /**
+     * Function which sets basedate in globalID of changed occurrence which is to be send.
+     *
+     *@param binary $goid globalID
+     *@param string basedate of changed occurrence
+     * @param mixed $basedate
+     *
+     *@return binary globalID with basedate in it
+     */
+    public function setBasedateInGlobalID($goid, $basedate = false) {
+        $hexguid = bin2hex($goid);
+        $year = $basedate ? sprintf('%04s', dechex(gmdate('Y', $basedate))) : '0000';
+        $month = $basedate ? sprintf('%02s', dechex(gmdate('m', $basedate))) : '00';
+        $day = $basedate ? sprintf('%02s', dechex(gmdate('d', $basedate))) : '00';
+
+        return hex2bin(strtoupper(substr($hexguid, 0, 32) . $year . $month . $day . substr($hexguid, 40)));
+    }
+
+    /**
+     * Function which replaces attachments with copy_from in copy_to.
+     *
+     * @param MAPIMessage $copy_from      MAPI_message from which attachments are to be copied
+     * @param MAPIMessage $copy_to        MAPI_message to which attachment are to be copied
+     * @param bool        $copyExceptions if true then all exceptions should also be sent as attachments
+     * @param mixed       $copyFrom
+     * @param mixed       $copyTo
+     */
+    public function replaceAttachments($copyFrom, $copyTo, $copyExceptions = true) {
+        /* remove all old attachments */
+        $attachmentTable = mapi_message_getattachmenttable($copyTo);
+        if ($attachmentTable) {
+            $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME]);
+
+            foreach ($attachments as $attachProps) {
+                /* remove exceptions too? */
+                if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
+                    continue;
+                }
+                mapi_message_deleteattach($copyTo, $attachProps[PR_ATTACH_NUM]);
+            }
+        }
+        $attachmentTable = false;
+
+        /* copy new attachments */
+        $attachmentTable = mapi_message_getattachmenttable($copyFrom);
+        if ($attachmentTable) {
+            $attachments = mapi_table_queryallrows($attachmentTable, [PR_ATTACH_NUM, PR_ATTACH_METHOD, PR_EXCEPTION_STARTTIME]);
+
+            foreach ($attachments as $attachProps) {
+                if (!$copyExceptions && $attachProps[PR_ATTACH_METHOD] == ATTACH_EMBEDDED_MSG && isset($attachProps[PR_EXCEPTION_STARTTIME])) {
+                    continue;
+                }
+
+                $attachOld = mapi_message_openattach($copyFrom, (int) $attachProps[PR_ATTACH_NUM]);
+                $attachNewResourceMsg = mapi_message_createattach($copyTo);
+                mapi_copyto($attachOld, [], [], $attachNewResourceMsg, 0);
+                mapi_savechanges($attachNewResourceMsg);
+            }
+        }
+    }
+
+    /**
+     * Function which replaces recipients in copy_to with recipients from copyFrom.
+     *
+     * @param MAPIMessage $copyFrom   MAPI_message from which recipients are to be copied
+     * @param MAPIMessage $copyTo     MAPI_message to which recipients are to be copied
+     * @param bool        $isDelegate indicates delegate is processing
+     *                                so don't copy delegate information to recipient table
+     */
+    public function replaceRecipients($copyFrom, $copyTo, $isDelegate = false) {
+        $recipientTable = mapi_message_getrecipienttable($copyFrom);
+
+        // If delegate, then do not add the delegate in recipients
+        if ($isDelegate) {
+            $delegate = mapi_getprops($copyFrom, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
+            $res = [RES_PROPERTY, [
+                RELOP => RELOP_NE,
+                ULPROPTAG => PR_EMAIL_ADDRESS,
+                VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
+            ],
+            ];
+            $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
+        }
+        else {
+            $recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
+        }
+
+        $copyToRecipientTable = mapi_message_getrecipienttable($copyTo);
+        $copyToRecipientRows = mapi_table_queryallrows($copyToRecipientTable, [PR_ROWID]);
+
+        mapi_message_modifyrecipients($copyTo, MODRECIP_REMOVE, $copyToRecipientRows);
+        mapi_message_modifyrecipients($copyTo, MODRECIP_ADD, $recipients);
+    }
+
+    /**
+     * Function creates meeting item in resource's calendar.
+     *
+     * @param resource $message  MAPI_message which is to create in resource's calendar
+     * @param bool     $cancel   cancel meeting
+     * @param string   $prefix   prefix for subject of meeting
+     * @param mixed    $basedate
+     */
+    public function bookResources($message, $cancel, $prefix, $basedate = false) {
+        if (!$this->enableDirectBooking) {
+            return [];
+        }
+
+        // Get the properties of the message
+        $messageprops = mapi_getprops($message);
+
+        if ($basedate) {
+            $recurrItemProps = mapi_getprops($this->message, [$this->proptags['goid'], $this->proptags['goid2'], $this->proptags['timezone_data'], $this->proptags['timezone'], PR_OWNER_APPT_ID]);
+
+            $messageprops[$this->proptags['goid']] = $this->setBasedateInGlobalID($recurrItemProps[$this->proptags['goid']], $basedate);
+            $messageprops[$this->proptags['goid2']] = $recurrItemProps[$this->proptags['goid2']];
+
+            // Delete properties which are not needed.
+            $deleteProps = [$this->proptags['basedate'], PR_DISPLAY_NAME, PR_ATTACHMENT_FLAGS, PR_ATTACHMENT_HIDDEN, PR_ATTACHMENT_LINKID, PR_ATTACH_FLAGS, PR_ATTACH_METHOD];
+            foreach ($deleteProps as $propID) {
+                if (isset($messageprops[$propID])) {
+                    unset($messageprops[$propID]);
+                }
+            }
+
+            if (isset($messageprops[$this->proptags['recurring']])) {
+                $messageprops[$this->proptags['recurring']] = false;
+            }
+
+            // Set Outlook properties
+            $messageprops[$this->proptags['clipstart']] = $messageprops[$this->proptags['startdate']];
+            $messageprops[$this->proptags['clipend']] = $messageprops[$this->proptags['duedate']];
+            $messageprops[$this->proptags['timezone_data']] = $recurrItemProps[$this->proptags['timezone_data']];
+            $messageprops[$this->proptags['timezone']] = $recurrItemProps[$this->proptags['timezone']];
+            $messageprops[$this->proptags['attendee_critical_change']] = time();
+            $messageprops[$this->proptags['owner_critical_change']] = time();
+        }
+
+        // Get resource recipients
+        $getResourcesRestriction = [
+            RES_AND,
+            [
+                [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+                        ULPROPTAG => PR_RECIPIENT_TYPE,
+                        VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
+                    ],
+                ], ],
+        ];
+        $recipienttable = mapi_message_getrecipienttable($message);
+        $resourceRecipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $getResourcesRestriction);
+
+        $this->errorSetResource = false;
+        $resourceRecipData = [];
+
+        // Put appointment into store resource users
+        $i = 0;
+        $len = count($resourceRecipients);
+        while (!$this->errorSetResource && $i < $len) {
+            $userStore = $this->openCustomUserStore($resourceRecipients[$i][PR_ENTRYID]);
+
+            // Open root folder
+            $userRoot = mapi_msgstore_openentry($userStore, null);
+
+            // Get calendar entryID
+            $userRootProps = mapi_getprops($userRoot, [PR_STORE_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_FREEBUSY_ENTRYIDS]);
+
+            // Open Calendar folder
+            $accessToFolder = false;
+
+            try {
+                // @FIXME this checks delegate has access to resource's calendar folder
+                // but it should use boss' credentials
+
+                $accessToFolder = $this->checkCalendarWriteAccess($this->store);
+                if ($accessToFolder) {
+                    $calFolder = mapi_msgstore_openentry($userStore, $userRootProps[PR_IPM_APPOINTMENT_ENTRYID]);
+                }
+            }
+            catch (MAPIException $e) {
+                $e->setHandled();
+                $this->errorSetResource = 1; // No access
+            }
+
+            if ($accessToFolder) {
+                /**
+                 * Get the LocalFreebusy message that contains the properties that
+                 * are set to accept or decline resource meeting requests.
+                 */
+                // Use PR_FREEBUSY_ENTRYIDS[1] to open folder the LocalFreeBusy msg
+                $localFreebusyMsg = mapi_msgstore_openentry($userStore, $userRootProps[PR_FREEBUSY_ENTRYIDS][1]);
+                if ($localFreebusyMsg) {
+                    $props = mapi_getprops($localFreebusyMsg, [PR_PROCESS_MEETING_REQUESTS, PR_DECLINE_RECURRING_MEETING_REQUESTS, PR_DECLINE_CONFLICTING_MEETING_REQUESTS]);
+
+                    $acceptMeetingRequests = isset($props[PR_PROCESS_MEETING_REQUESTS]) ? $props[PR_PROCESS_MEETING_REQUESTS] : false;
+                    $declineRecurringMeetingRequests = isset($props[PR_DECLINE_RECURRING_MEETING_REQUESTS]) ? $props[PR_DECLINE_RECURRING_MEETING_REQUESTS] : false;
+                    $declineConflictingMeetingRequests = isset($props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS]) ? $props[PR_DECLINE_CONFLICTING_MEETING_REQUESTS] : false;
+
+                    if (!$acceptMeetingRequests) {
+                        /*
 						 * When a resource has not been set to automatically accept meeting requests,
 						 * the meeting request has to be sent to him rather than being put directly into
 						 * his calendar. No error should be returned.
 						 */
-						// $errorSetResource = 2;
-						$this->nonAcceptingResources[] = $resourceRecipients[$i];
-					}
-					else {
-						if ($declineRecurringMeetingRequests && !$cancel) {
-							// Check if appointment is recurring
-							if ($messageprops[$this->proptags['recurring']]) {
-								$this->errorSetResource = 3;
-							}
-						}
-						if ($declineConflictingMeetingRequests && !$cancel) {
-							// Check for conflicting items
-							if ($calFolder && $this->isMeetingConflicting($message, $userStore, $calFolder)) {
-								$this->errorSetResource = 4; // Conflict
-							}
-						}
-					}
-				}
-			}
-
-			if (!$this->errorSetResource && $accessToFolder) {
-				/**
-				 * First search on GlobalID(0x3)
-				 * If (recurring and occurrence) If Resource was booked for only this occurrence then Resource should have only this occurrence in Calendar and not whole series.
-				 * If (normal meeting) then GlobalID(0x3) and CleanGlobalID(0x23) are same, so doesn't matter if search is based on GlobalID.
-				 */
-				$rows = $this->findCalendarItems($messageprops[$this->proptags['goid']], $calFolder);
-
-				/*
+                        // $errorSetResource = 2;
+                        $this->nonAcceptingResources[] = $resourceRecipients[$i];
+                    }
+                    else {
+                        if ($declineRecurringMeetingRequests && !$cancel) {
+                            // Check if appointment is recurring
+                            if ($messageprops[$this->proptags['recurring']]) {
+                                $this->errorSetResource = 3;
+                            }
+                        }
+                        if ($declineConflictingMeetingRequests && !$cancel) {
+                            // Check for conflicting items
+                            if ($calFolder && $this->isMeetingConflicting($message, $userStore, $calFolder)) {
+                                $this->errorSetResource = 4; // Conflict
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (!$this->errorSetResource && $accessToFolder) {
+                /**
+                 * First search on GlobalID(0x3)
+                 * If (recurring and occurrence) If Resource was booked for only this occurrence then Resource should have only this occurrence in Calendar and not whole series.
+                 * If (normal meeting) then GlobalID(0x3) and CleanGlobalID(0x23) are same, so doesn't matter if search is based on GlobalID.
+                 */
+                $rows = $this->findCalendarItems($messageprops[$this->proptags['goid']], $calFolder);
+
+                /*
 				 * If no entry is found then
 				 * 1) Resource doesn't have meeting in Calendar. Seriously!!
 				 * OR
 				 * 2) We were looking for occurrence item but Resource has whole series
 				 */
-				if (empty($rows)) {
-					/**
-					 * Now search on CleanGlobalID(0x23) WHY???
-					 * Because we are looking recurring item.
-					 *
-					 * Possible results of this search
-					 * 1) If Resource was booked for more than one occurrences then this search will return all those occurrence because search is perform on CleanGlobalID
-					 * 2) If Resource was booked for whole series then it should return series.
-					 */
-					$rows = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder, true);
-
-					$newResourceMsg = false;
-					if (!empty($rows)) {
-						// Since we are looking for recurring item, open every result and check for 'recurring' property.
-						foreach ($rows as $row) {
-							$ResourceMsg = mapi_msgstore_openentry($userStore, $row);
-							$ResourceMsgProps = mapi_getprops($ResourceMsg, [$this->proptags['recurring']]);
-
-							if (isset($ResourceMsgProps[$this->proptags['recurring']]) && $ResourceMsgProps[$this->proptags['recurring']]) {
-								$newResourceMsg = $ResourceMsg;
-
-								break;
-							}
-						}
-					}
-
-					// Still no results found. I giveup, create new message.
-					if (!$newResourceMsg) {
-						$newResourceMsg = mapi_folder_createmessage($calFolder);
-					}
-				}
-				else {
-					$newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
-				}
-
-				// Prefix the subject if needed
-				if ($prefix && isset($messageprops[PR_SUBJECT])) {
-					$messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
-				}
-
-				// Set status to cancelled if needed
-				$messageprops[$this->proptags['busystatus']] = fbBusy; // The default status (Busy)
-				if ($cancel) {
-					$messageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // The meeting has been canceled
-					$messageprops[$this->proptags['busystatus']] = fbFree; // Free
-				}
-				else {
-					$messageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
-				}
-				$messageprops[$this->proptags['responsestatus']] = olResponseAccepted; // The resource automatically accepts the appointment
-
-				$messageprops[PR_MESSAGE_CLASS] = 'IPM.Appointment';
-
-				// Remove the PR_ICON_INDEX as it is not needed in the sent message.
-				$messageprops[PR_ICON_INDEX] = null;
-				$messageprops[PR_RESPONSE_REQUESTED] = true;
-
-				// get the store of organizer, in case of delegates it will be delegate store
-				$defaultStore = $this->openDefaultStore();
-
-				$storeProps = mapi_getprops($this->store, [PR_ENTRYID]);
-				$defaultStoreProps = mapi_getprops($defaultStore, [PR_ENTRYID]);
-
-				// @FIXME use entryid comparison functions here
-				if ($storeProps[PR_ENTRYID] !== $defaultStoreProps[PR_ENTRYID]) {
-					// get delegate information
-					$addrInfo = $this->getOwnerAddress($defaultStore, false);
-
-					if ($addrInfo) {
-						list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
-
-						$messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
-						$messageprops[PR_SENDER_NAME] = $ownername;
-						$messageprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
-						$messageprops[PR_SENDER_ENTRYID] = $ownerentryid;
-						$messageprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
-					}
-
-					// get delegator information
-					$addrInfo = $this->getOwnerAddress($this->store, false);
-
-					if ($addrInfo) {
-						list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
-
-						$messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
-						$messageprops[PR_SENT_REPRESENTING_NAME] = $ownername;
-						$messageprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
-						$messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
-						$messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
-					}
-				}
-				else {
-					// get organizer information
-					$addrinfo = $this->getOwnerAddress($this->store);
-
-					if ($addrinfo) {
-						list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrinfo;
-
-						$messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
-						$messageprops[PR_SENDER_NAME] = $ownername;
-						$messageprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
-						$messageprops[PR_SENDER_ENTRYID] = $ownerentryid;
-						$messageprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
-
-						$messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
-						$messageprops[PR_SENT_REPRESENTING_NAME] = $ownername;
-						$messageprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
-						$messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
-						$messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
-					}
-				}
-
-				$messageprops[$this->proptags['replytime']] = time();
-
-				if ($basedate && isset($ResourceMsgProps[$this->proptags['recurring']]) && $ResourceMsgProps[$this->proptags['recurring']]) {
-					$recurr = new Recurrence($userStore, $newResourceMsg);
-
-					// Copy recipients list
-					$reciptable = mapi_message_getrecipienttable($message);
-					$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
-
-					// add owner to recipient table
-					$this->addOrganizer($messageprops, $recips, true);
-
-					// Update occurrence
-					if ($recurr->isException($basedate)) {
-						$recurr->modifyException($messageprops, $basedate, $recips);
-					}
-					else {
-						$recurr->createException($messageprops, $basedate, false, $recips);
-					}
-				}
-				else {
-					mapi_setprops($newResourceMsg, $messageprops);
-
-					// Copy attachments
-					$this->replaceAttachments($message, $newResourceMsg);
-
-					// Copy all recipients too
-					$this->replaceRecipients($message, $newResourceMsg);
-
-					// Now add organizer also to recipient table
-					$recips = [];
-					$this->addOrganizer($messageprops, $recips);
-
-					mapi_message_modifyrecipients($newResourceMsg, MODRECIP_ADD, $recips);
-				}
-
-				mapi_savechanges($newResourceMsg);
-
-				$resourceRecipData[] = [
-					'store' => $userStore,
-					'folder' => $calFolder,
-					'msg' => $newResourceMsg,
-				];
-				$this->includesResources = true;
-			}
-			else {
-				/*
+                if (empty($rows)) {
+                    /**
+                     * Now search on CleanGlobalID(0x23) WHY???
+                     * Because we are looking recurring item.
+                     *
+                     * Possible results of this search
+                     * 1) If Resource was booked for more than one occurrences then this search will return all those occurrence because search is perform on CleanGlobalID
+                     * 2) If Resource was booked for whole series then it should return series.
+                     */
+                    $rows = $this->findCalendarItems($messageprops[$this->proptags['goid2']], $calFolder, true);
+
+                    $newResourceMsg = false;
+                    if (!empty($rows)) {
+                        // Since we are looking for recurring item, open every result and check for 'recurring' property.
+                        foreach ($rows as $row) {
+                            $ResourceMsg = mapi_msgstore_openentry($userStore, $row);
+                            $ResourceMsgProps = mapi_getprops($ResourceMsg, [$this->proptags['recurring']]);
+
+                            if (isset($ResourceMsgProps[$this->proptags['recurring']]) && $ResourceMsgProps[$this->proptags['recurring']]) {
+                                $newResourceMsg = $ResourceMsg;
+
+                                break;
+                            }
+                        }
+                    }
+
+                    // Still no results found. I giveup, create new message.
+                    if (!$newResourceMsg) {
+                        $newResourceMsg = mapi_folder_createmessage($calFolder);
+                    }
+                }
+                else {
+                    $newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
+                }
+
+                // Prefix the subject if needed
+                if ($prefix && isset($messageprops[PR_SUBJECT])) {
+                    $messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
+                }
+
+                // Set status to cancelled if needed
+                $messageprops[$this->proptags['busystatus']] = fbBusy; // The default status (Busy)
+                if ($cancel) {
+                    $messageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // The meeting has been canceled
+                    $messageprops[$this->proptags['busystatus']] = fbFree; // Free
+                }
+                else {
+                    $messageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
+                }
+                $messageprops[$this->proptags['responsestatus']] = olResponseAccepted; // The resource automatically accepts the appointment
+
+                $messageprops[PR_MESSAGE_CLASS] = 'IPM.Appointment';
+
+                // Remove the PR_ICON_INDEX as it is not needed in the sent message.
+                $messageprops[PR_ICON_INDEX] = null;
+                $messageprops[PR_RESPONSE_REQUESTED] = true;
+
+                // get the store of organizer, in case of delegates it will be delegate store
+                $defaultStore = $this->openDefaultStore();
+
+                $storeProps = mapi_getprops($this->store, [PR_ENTRYID]);
+                $defaultStoreProps = mapi_getprops($defaultStore, [PR_ENTRYID]);
+
+                // @FIXME use entryid comparison functions here
+                if ($storeProps[PR_ENTRYID] !== $defaultStoreProps[PR_ENTRYID]) {
+                    // get delegate information
+                    $addrInfo = $this->getOwnerAddress($defaultStore, false);
+
+                    if ($addrInfo) {
+                        list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
+
+                        $messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
+                        $messageprops[PR_SENDER_NAME] = $ownername;
+                        $messageprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
+                        $messageprops[PR_SENDER_ENTRYID] = $ownerentryid;
+                        $messageprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
+                    }
+
+                    // get delegator information
+                    $addrInfo = $this->getOwnerAddress($this->store, false);
+
+                    if ($addrInfo) {
+                        list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrInfo;
+
+                        $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
+                        $messageprops[PR_SENT_REPRESENTING_NAME] = $ownername;
+                        $messageprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
+                        $messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
+                        $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
+                    }
+                }
+                else {
+                    // get organizer information
+                    $addrinfo = $this->getOwnerAddress($this->store);
+
+                    if ($addrinfo) {
+                        list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $addrinfo;
+
+                        $messageprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
+                        $messageprops[PR_SENDER_NAME] = $ownername;
+                        $messageprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
+                        $messageprops[PR_SENDER_ENTRYID] = $ownerentryid;
+                        $messageprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
+
+                        $messageprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
+                        $messageprops[PR_SENT_REPRESENTING_NAME] = $ownername;
+                        $messageprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
+                        $messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
+                        $messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
+                    }
+                }
+
+                $messageprops[$this->proptags['replytime']] = time();
+
+                if ($basedate && isset($ResourceMsgProps[$this->proptags['recurring']]) && $ResourceMsgProps[$this->proptags['recurring']]) {
+                    $recurr = new Recurrence($userStore, $newResourceMsg);
+
+                    // Copy recipients list
+                    $reciptable = mapi_message_getrecipienttable($message);
+                    $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
+
+                    // add owner to recipient table
+                    $this->addOrganizer($messageprops, $recips, true);
+
+                    // Update occurrence
+                    if ($recurr->isException($basedate)) {
+                        $recurr->modifyException($messageprops, $basedate, $recips);
+                    }
+                    else {
+                        $recurr->createException($messageprops, $basedate, false, $recips);
+                    }
+                }
+                else {
+                    mapi_setprops($newResourceMsg, $messageprops);
+
+                    // Copy attachments
+                    $this->replaceAttachments($message, $newResourceMsg);
+
+                    // Copy all recipients too
+                    $this->replaceRecipients($message, $newResourceMsg);
+
+                    // Now add organizer also to recipient table
+                    $recips = [];
+                    $this->addOrganizer($messageprops, $recips);
+
+                    mapi_message_modifyrecipients($newResourceMsg, MODRECIP_ADD, $recips);
+                }
+
+                mapi_savechanges($newResourceMsg);
+
+                $resourceRecipData[] = [
+                    'store' => $userStore,
+                    'folder' => $calFolder,
+                    'msg' => $newResourceMsg,
+                ];
+                $this->includesResources = true;
+            }
+            else {
+                /*
 				 * If no other errors occurred and you have no access to the
 				 * folder of the resource, throw an error=1.
 				 */
-				if (!$this->errorSetResource) {
-					$this->errorSetResource = 1;
-				}
-
-				for ($j = 0, $len = count($resourceRecipData); $j < $len; ++$j) {
-					// Get the EntryID
-					$props = mapi_message_getprops($resourceRecipData[$j]['msg']);
-
-					mapi_folder_deletemessages($resourceRecipData[$j]['folder'], [$props[PR_ENTRYID]], DELETE_HARD_DELETE);
-				}
-				$this->recipientDisplayname = $resourceRecipients[$i][PR_DISPLAY_NAME];
-			}
-			++$i;
-		}
-
-		/*
+                if (!$this->errorSetResource) {
+                    $this->errorSetResource = 1;
+                }
+
+                for ($j = 0, $len = count($resourceRecipData); $j < $len; ++$j) {
+                    // Get the EntryID
+                    $props = mapi_message_getprops($resourceRecipData[$j]['msg']);
+
+                    mapi_folder_deletemessages($resourceRecipData[$j]['folder'], [$props[PR_ENTRYID]], DELETE_HARD_DELETE);
+                }
+                $this->recipientDisplayname = $resourceRecipients[$i][PR_DISPLAY_NAME];
+            }
+            ++$i;
+        }
+
+        /*
 		 * Set the BCC-recipients (resources) tackstatus to accepted.
 		 */
-		// Get resource recipients
-		$getResourcesRestriction = [
-			RES_AND,
-			[
-				[
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
-						ULPROPTAG => PR_RECIPIENT_TYPE,
-						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
-					],
-				], ],
-		];
-		$recipienttable = mapi_message_getrecipienttable($message);
-		$resourceRecipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $getResourcesRestriction);
-		if (!empty($resourceRecipients)) {
-			// Set Tracking status of resource recipients to olResponseAccepted (3)
-			for ($i = 0, $len = count($resourceRecipients); $i < $len; ++$i) {
-				$resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusAccepted;
-				$resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS_TIME] = time();
-			}
-			mapi_message_modifyrecipients($message, MODRECIP_MODIFY, $resourceRecipients);
-		}
-
-		// Publish updated free/busy information
-		if (!$this->errorSetResource) {
-			for ($i = 0, $len = count($resourceRecipData); $i < $len; ++$i) {
-				$storeProps = mapi_getprops($resourceRecipData[$i]['store'], [PR_MAILBOX_OWNER_ENTRYID]);
-				if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID])) {
-					$start = time() - 7 * 24 * 60 * 60;
-					$range = strtotime("+6 month");
-					$range = $range - (7 * 24 * 60 * 60);
-
-					$pub = new FreeBusyPublish($this->session, $resourceRecipData[$i]['store'], $resourceRecipData[$i]['folder'], $storeProps[PR_MAILBOX_OWNER_ENTRYID]);
-					$pub->publishFB($start, $range); // publish from one week ago, 6 months ahead
-				}
-			}
-		}
-
-		return $resourceRecipData;
-	}
-
-	/**
-	 * Function which save an exception into recurring item.
-	 *
-	 * @param resource $recurringItem  reference to MAPI_message of recurring item
-	 * @param resource $occurrenceItem reference to MAPI_message of occurrence
-	 * @param string   $basedate       basedate of occurrence
-	 * @param bool     $move           if true then occurrence item is deleted
-	 * @param bool     $tentative      true if user has tentatively accepted it or false if user has accepted it
-	 * @param bool     $userAction     true if user has manually responded to meeting request
-	 * @param resource $store          user store
-	 * @param bool     $isDelegate     true if delegate is processing this meeting request
-	 */
-	public function acceptException(&$recurringItem, &$occurrenceItem, $basedate, $move = false, $tentative, $userAction = false, $store, $isDelegate = false) {
-		$recurr = new Recurrence($store, $recurringItem);
-
-		// Copy properties from meeting request
-		$exception_props = mapi_getprops($occurrenceItem);
-
-		// Copy recipients list
-		$reciptable = mapi_message_getrecipienttable($occurrenceItem);
-		// If delegate, then do not add the delegate in recipients
-		if ($isDelegate) {
-			$delegate = mapi_getprops($this->message, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
-			$res = [RES_PROPERTY, [
-				RELOP => RELOP_NE,
-				ULPROPTAG => PR_EMAIL_ADDRESS,
-				VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
-			],
-			];
-			$recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
-		}
-		else {
-			$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
-		}
-
-		// add owner to recipient table
-		$this->addOrganizer($exception_props, $recips, true);
-
-		// add delegator to meetings
-		if ($isDelegate) {
-			$this->addDelegator($exception_props, $recips);
-		}
-
-		$exception_props[$this->proptags['meetingstatus']] = olMeetingReceived;
-		$exception_props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
-
-		if (isset($exception_props[$this->proptags['intendedbusystatus']])) {
-			if ($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
-				$exception_props[$this->proptags['busystatus']] = fbTentative;
-			}
-			else {
-				$exception_props[$this->proptags['busystatus']] = $exception_props[$this->proptags['intendedbusystatus']];
-			}
-			// we already have intendedbusystatus value in $exception_props so no need to copy it
-		}
-		else {
-			$exception_props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
-		}
-
-		if ($userAction) {
-			$addrInfo = $this->getOwnerAddress($this->store);
-
-			// if user has responded then set replytime and name
-			$exception_props[$this->proptags['replytime']] = time();
-			if (!empty($addrInfo)) {
-				$exception_props[$this->proptags['apptreplyname']] = $addrInfo[0];
-			}
-		}
-
-		if ($recurr->isException($basedate)) {
-			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
-			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
-		}
-
-		// Move the occurrenceItem to the waste basket
-		if ($move) {
-			$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-			$sourcefolder = mapi_msgstore_openentry($store, $exception_props[PR_PARENT_ENTRYID]);
-			mapi_folder_copymessages($sourcefolder, [$exception_props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-		}
-
-		mapi_savechanges($recurringItem);
-	}
-
-	/**
-	 * Function which merges an exception mapi message to recurring message.
-	 * This will be used when we receive recurring meeting request and we already have an exception message
-	 * of same meeting in calendar and we need to remove that exception message and add it to attachment table
-	 * of recurring meeting.
-	 *
-	 * @param resource $recurringItem  reference to MAPI_message of recurring item
-	 * @param resource $occurrenceItem reference to MAPI_message of occurrence
-	 * @param string   $basedate       basedate of occurrence
-	 * @param resource $store          user store
-	 */
-	public function mergeException(&$recurringItem, &$occurrenceItem, $basedate, $store) {
-		$recurr = new Recurrence($store, $recurringItem);
-
-		// Copy properties from meeting request
-		$exception_props = mapi_getprops($occurrenceItem);
-
-		// Get recipient list from message and add it to exception attachment
-		$reciptable = mapi_message_getrecipienttable($occurrenceItem);
-		$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
-
-		if ($recurr->isException($basedate)) {
-			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
-			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
-		}
-
-		// Move the occurrenceItem to the waste basket
-		$wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
-		$sourcefolder = mapi_msgstore_openentry($store, $exception_props[PR_PARENT_ENTRYID]);
-		mapi_folder_copymessages($sourcefolder, [$exception_props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-
-		mapi_savechanges($recurringItem);
-	}
-
-	/**
-	 * Function which submits meeting request based on arguments passed to it.
-	 *
-	 * @param resource $message        MAPI_message whose meeting request is to be send
-	 * @param bool     $cancel         if true send request, else send cancellation
-	 * @param string   $prefix         subject prefix
-	 * @param int      $basedate       basedate for an occurrence
-	 * @param object   $recurObject    recurrence object of mr
-	 * @param bool     $copyExceptions When sending update mail for recurring item then we dont send exceptions in attachments
-	 * @param mixed    $modifiedRecips
-	 * @param mixed    $deletedRecips
-	 */
-	public function submitMeetingRequest($message, $cancel, $prefix, $basedate = false, $recurObject = false, $copyExceptions = true, $modifiedRecips = false, $deletedRecips = false) {
-		$newmessageprops = $messageprops = mapi_getprops($this->message);
-		$new = $this->createOutgoingMessage();
-
-		// Copy the entire message into the new meeting request message
-		if ($basedate) {
-			// messageprops contains properties of whole recurring series
-			// and newmessageprops contains properties of exception item
-			$newmessageprops = mapi_getprops($message);
-
-			// Ensure that the correct basedate is set in the new message
-			$newmessageprops[$this->proptags['basedate']] = $basedate;
-
-			// Set isRecurring to false, because this is an exception
-			$newmessageprops[$this->proptags['recurring']] = false;
-
-			// set LID_IS_EXCEPTION to true
-			$newmessageprops[$this->proptags['is_exception']] = true;
-
-			// Set to high importance
-			if ($cancel) {
-				$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
-			}
-
-			// Set startdate and enddate of exception
-			if ($cancel && $recurObject) {
-				$newmessageprops[$this->proptags['startdate']] = $recurObject->getOccurrenceStart($basedate);
-				$newmessageprops[$this->proptags['duedate']] = $recurObject->getOccurrenceEnd($basedate);
-			}
-
-			// Set basedate in guid (0x3)
-			$newmessageprops[$this->proptags['goid']] = $this->setBasedateInGlobalID($messageprops[$this->proptags['goid2']], $basedate);
-			$newmessageprops[$this->proptags['goid2']] = $messageprops[$this->proptags['goid2']];
-			$newmessageprops[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
-
-			// Get deleted recipiets from exception msg
-			$restriction = [
-				RES_AND,
-				[
-					[
-						RES_BITMASK,
-						[
-							ULTYPE => BMR_NEZ,
-							ULPROPTAG => PR_RECIPIENT_FLAGS,
-							ULMASK => recipExceptionalDeleted,
-						],
-					],
-					[
-						RES_BITMASK,
-						[
-							ULTYPE => BMR_EQZ,
-							ULPROPTAG => PR_RECIPIENT_FLAGS,
-							ULMASK => recipOrganizer,
-						],
-					],
-				],
-			];
-
-			// In direct-booking mode, we don't need to send cancellations to resources
-			if ($this->enableDirectBooking) {
-				$restriction[1][] = [
-					RES_PROPERTY,
-					[
-						RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
-						ULPROPTAG => PR_RECIPIENT_TYPE,
-						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
-					],
-				];
-			}
-
-			$recipienttable = mapi_message_getrecipienttable($message);
-			$recipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $restriction);
-
-			if (!$deletedRecips) {
-				$deletedRecips = array_merge([], $recipients);
-			}
-			else {
-				$deletedRecips = array_merge($deletedRecips, $recipients);
-			}
-		}
-
-		// Remove the PR_ICON_INDEX as it is not needed in the sent message.
-		$newmessageprops[PR_ICON_INDEX] = null;
-		$newmessageprops[PR_RESPONSE_REQUESTED] = true;
-
-		// PR_START_DATE and PR_END_DATE will be used by outlook to show the position in the calendar
-		$newmessageprops[PR_START_DATE] = $newmessageprops[$this->proptags['startdate']];
-		$newmessageprops[PR_END_DATE] = $newmessageprops[$this->proptags['duedate']];
-
-		// Set updatecounter/AppointmentSequenceNumber
-		// get the value of latest updatecounter for the whole series and use it
-		$newmessageprops[$this->proptags['updatecounter']] = $messageprops[$this->proptags['last_updatecounter']];
-
-		$meetingTimeInfo = $this->getMeetingTimeInfo();
-
-		if ($meetingTimeInfo) {
-			$newmessageprops[PR_BODY] = $meetingTimeInfo;
-		}
-
-		// Send all recurrence info in mail, if this is a recurrence meeting.
-		if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']]) {
-			if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
-				$newmessageprops[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
-			}
-			$newmessageprops[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
-			$newmessageprops[$this->proptags['timezone_data']] = $messageprops[$this->proptags['timezone_data']];
-			$newmessageprops[$this->proptags['timezone']] = $messageprops[$this->proptags['timezone']];
-
-			if ($recurObject) {
-				$this->generateRecurDates($recurObject, $messageprops, $newmessageprops);
-			}
-		}
-
-		if (isset($newmessageprops[$this->proptags['counter_proposal']])) {
-			unset($newmessageprops[$this->proptags['counter_proposal']]);
-		}
-
-		// Prefix the subject if needed
-		if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
-			$newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
-		}
-
-		if (isset($newmessageprops[$this->proptags['categories']]) &&
-			!empty($newmessageprops[$this->proptags['categories']])) {
-			unset($newmessageprops[$this->proptags['categories']]);
-		}
-		mapi_setprops($new, $newmessageprops);
-
-		// Copy attachments
-		$this->replaceAttachments($message, $new, $copyExceptions);
-
-		// Retrieve only those recipient who should receive this meeting request.
-		$stripResourcesRestriction = [
-			RES_AND,
-			[
-				[
-					RES_BITMASK,
-					[
-						ULTYPE => BMR_EQZ,
-						ULPROPTAG => PR_RECIPIENT_FLAGS,
-						ULMASK => recipExceptionalDeleted,
-					],
-				],
-				[
-					RES_BITMASK,
-					[
-						ULTYPE => BMR_EQZ,
-						ULPROPTAG => PR_RECIPIENT_FLAGS,
-						ULMASK => recipOrganizer,
-					],
-				],
-			],
-		];
-
-		// In direct-booking mode, resources do not receive a meeting request
-		if ($this->enableDirectBooking) {
-			$stripResourcesRestriction[1][] =
-									[
-										RES_PROPERTY,
-										[
-											RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
-											ULPROPTAG => PR_RECIPIENT_TYPE,
-											VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
-										],
-									];
-		}
-
-		// If no recipients were explicitly provided, we will send the update to all
-		// recipients from the meeting.
-		if ($modifiedRecips === false) {
-			$recipienttable = mapi_message_getrecipienttable($message);
-			$modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops, $stripResourcesRestriction);
-
-			if ($basedate && empty($modifiedRecips)) {
-				// Retrieve full list
-				$recipienttable = mapi_message_getrecipienttable($this->message);
-				$modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops);
-
-				// Save recipients in exceptions
-				mapi_message_modifyrecipients($message, MODRECIP_ADD, $modifiedRecips);
-
-				// Now retrieve only those recipient who should receive this meeting request.
-				$modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops, $stripResourcesRestriction);
-			}
-		}
-
-		// @TODO: handle nonAcceptingResources
-		/*
+        // Get resource recipients
+        $getResourcesRestriction = [
+            RES_AND,
+            [
+                [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+                        ULPROPTAG => PR_RECIPIENT_TYPE,
+                        VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
+                    ],
+                ], ],
+        ];
+        $recipienttable = mapi_message_getrecipienttable($message);
+        $resourceRecipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $getResourcesRestriction);
+        if (!empty($resourceRecipients)) {
+            // Set Tracking status of resource recipients to olResponseAccepted (3)
+            for ($i = 0, $len = count($resourceRecipients); $i < $len; ++$i) {
+                $resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusAccepted;
+                $resourceRecipients[$i][PR_RECIPIENT_TRACKSTATUS_TIME] = time();
+            }
+            mapi_message_modifyrecipients($message, MODRECIP_MODIFY, $resourceRecipients);
+        }
+
+        // Publish updated free/busy information
+        if (!$this->errorSetResource) {
+            for ($i = 0, $len = count($resourceRecipData); $i < $len; ++$i) {
+                $storeProps = mapi_getprops($resourceRecipData[$i]['store'], [PR_MAILBOX_OWNER_ENTRYID]);
+                if (isset($storeProps[PR_MAILBOX_OWNER_ENTRYID])) {
+                    $start = time() - 7 * 24 * 60 * 60;
+                    $range = strtotime("+6 month");
+                    $range = $range - (7 * 24 * 60 * 60);
+
+                    $pub = new FreeBusyPublish($this->session, $resourceRecipData[$i]['store'], $resourceRecipData[$i]['folder'], $storeProps[PR_MAILBOX_OWNER_ENTRYID]);
+                    $pub->publishFB($start, $range); // publish from one week ago, 6 months ahead
+                }
+            }
+        }
+
+        return $resourceRecipData;
+    }
+
+    /**
+     * Function which save an exception into recurring item.
+     *
+     * @param resource $recurringItem  reference to MAPI_message of recurring item
+     * @param resource $occurrenceItem reference to MAPI_message of occurrence
+     * @param string   $basedate       basedate of occurrence
+     * @param bool     $move           if true then occurrence item is deleted
+     * @param bool     $tentative      true if user has tentatively accepted it or false if user has accepted it
+     * @param bool     $userAction     true if user has manually responded to meeting request
+     * @param resource $store          user store
+     * @param bool     $isDelegate     true if delegate is processing this meeting request
+     */
+    public function acceptException(&$recurringItem, &$occurrenceItem, $basedate, $move = false, $tentative, $userAction = false, $store, $isDelegate = false) {
+        $recurr = new Recurrence($store, $recurringItem);
+
+        // Copy properties from meeting request
+        $exception_props = mapi_getprops($occurrenceItem);
+
+        // Copy recipients list
+        $reciptable = mapi_message_getrecipienttable($occurrenceItem);
+        // If delegate, then do not add the delegate in recipients
+        if ($isDelegate) {
+            $delegate = mapi_getprops($this->message, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
+            $res = [RES_PROPERTY, [
+                RELOP => RELOP_NE,
+                ULPROPTAG => PR_EMAIL_ADDRESS,
+                VALUE => [PR_EMAIL_ADDRESS => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]],
+            ],
+            ];
+            $recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
+        }
+        else {
+            $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
+        }
+
+        // add owner to recipient table
+        $this->addOrganizer($exception_props, $recips, true);
+
+        // add delegator to meetings
+        if ($isDelegate) {
+            $this->addDelegator($exception_props, $recips);
+        }
+
+        $exception_props[$this->proptags['meetingstatus']] = olMeetingReceived;
+        $exception_props[$this->proptags['responsestatus']] = $userAction ? ($tentative ? olResponseTentative : olResponseAccepted) : olResponseNotResponded;
+
+        if (isset($exception_props[$this->proptags['intendedbusystatus']])) {
+            if ($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
+                $exception_props[$this->proptags['busystatus']] = fbTentative;
+            }
+            else {
+                $exception_props[$this->proptags['busystatus']] = $exception_props[$this->proptags['intendedbusystatus']];
+            }
+            // we already have intendedbusystatus value in $exception_props so no need to copy it
+        }
+        else {
+            $exception_props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
+        }
+
+        if ($userAction) {
+            $addrInfo = $this->getOwnerAddress($this->store);
+
+            // if user has responded then set replytime and name
+            $exception_props[$this->proptags['replytime']] = time();
+            if (!empty($addrInfo)) {
+                $exception_props[$this->proptags['apptreplyname']] = $addrInfo[0];
+            }
+        }
+
+        if ($recurr->isException($basedate)) {
+            $recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
+        }
+        else {
+            $recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
+        }
+
+        // Move the occurrenceItem to the waste basket
+        if ($move) {
+            $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+            $sourcefolder = mapi_msgstore_openentry($store, $exception_props[PR_PARENT_ENTRYID]);
+            mapi_folder_copymessages($sourcefolder, [$exception_props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+        }
+
+        mapi_savechanges($recurringItem);
+    }
+
+    /**
+     * Function which merges an exception mapi message to recurring message.
+     * This will be used when we receive recurring meeting request and we already have an exception message
+     * of same meeting in calendar and we need to remove that exception message and add it to attachment table
+     * of recurring meeting.
+     *
+     * @param resource $recurringItem  reference to MAPI_message of recurring item
+     * @param resource $occurrenceItem reference to MAPI_message of occurrence
+     * @param string   $basedate       basedate of occurrence
+     * @param resource $store          user store
+     */
+    public function mergeException(&$recurringItem, &$occurrenceItem, $basedate, $store) {
+        $recurr = new Recurrence($store, $recurringItem);
+
+        // Copy properties from meeting request
+        $exception_props = mapi_getprops($occurrenceItem);
+
+        // Get recipient list from message and add it to exception attachment
+        $reciptable = mapi_message_getrecipienttable($occurrenceItem);
+        $recips = mapi_table_queryallrows($reciptable, $this->recipprops);
+
+        if ($recurr->isException($basedate)) {
+            $recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
+        }
+        else {
+            $recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
+        }
+
+        // Move the occurrenceItem to the waste basket
+        $wastebasket = $this->openDefaultWastebasket($this->openDefaultStore());
+        $sourcefolder = mapi_msgstore_openentry($store, $exception_props[PR_PARENT_ENTRYID]);
+        mapi_folder_copymessages($sourcefolder, [$exception_props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
+
+        mapi_savechanges($recurringItem);
+    }
+
+    /**
+     * Function which submits meeting request based on arguments passed to it.
+     *
+     * @param resource $message        MAPI_message whose meeting request is to be send
+     * @param bool     $cancel         if true send request, else send cancellation
+     * @param string   $prefix         subject prefix
+     * @param int      $basedate       basedate for an occurrence
+     * @param object   $recurObject    recurrence object of mr
+     * @param bool     $copyExceptions When sending update mail for recurring item then we dont send exceptions in attachments
+     * @param mixed    $modifiedRecips
+     * @param mixed    $deletedRecips
+     */
+    public function submitMeetingRequest($message, $cancel, $prefix, $basedate = false, $recurObject = false, $copyExceptions = true, $modifiedRecips = false, $deletedRecips = false) {
+        $newmessageprops = $messageprops = mapi_getprops($this->message);
+        $new = $this->createOutgoingMessage();
+
+        // Copy the entire message into the new meeting request message
+        if ($basedate) {
+            // messageprops contains properties of whole recurring series
+            // and newmessageprops contains properties of exception item
+            $newmessageprops = mapi_getprops($message);
+
+            // Ensure that the correct basedate is set in the new message
+            $newmessageprops[$this->proptags['basedate']] = $basedate;
+
+            // Set isRecurring to false, because this is an exception
+            $newmessageprops[$this->proptags['recurring']] = false;
+
+            // set LID_IS_EXCEPTION to true
+            $newmessageprops[$this->proptags['is_exception']] = true;
+
+            // Set to high importance
+            if ($cancel) {
+                $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;
+            }
+
+            // Set startdate and enddate of exception
+            if ($cancel && $recurObject) {
+                $newmessageprops[$this->proptags['startdate']] = $recurObject->getOccurrenceStart($basedate);
+                $newmessageprops[$this->proptags['duedate']] = $recurObject->getOccurrenceEnd($basedate);
+            }
+
+            // Set basedate in guid (0x3)
+            $newmessageprops[$this->proptags['goid']] = $this->setBasedateInGlobalID($messageprops[$this->proptags['goid2']], $basedate);
+            $newmessageprops[$this->proptags['goid2']] = $messageprops[$this->proptags['goid2']];
+            $newmessageprops[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
+
+            // Get deleted recipiets from exception msg
+            $restriction = [
+                RES_AND,
+                [
+                    [
+                        RES_BITMASK,
+                        [
+                            ULTYPE => BMR_NEZ,
+                            ULPROPTAG => PR_RECIPIENT_FLAGS,
+                            ULMASK => recipExceptionalDeleted,
+                        ],
+                    ],
+                    [
+                        RES_BITMASK,
+                        [
+                            ULTYPE => BMR_EQZ,
+                            ULPROPTAG => PR_RECIPIENT_FLAGS,
+                            ULMASK => recipOrganizer,
+                        ],
+                    ],
+                ],
+            ];
+
+            // In direct-booking mode, we don't need to send cancellations to resources
+            if ($this->enableDirectBooking) {
+                $restriction[1][] = [
+                    RES_PROPERTY,
+                    [
+                        RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+                        ULPROPTAG => PR_RECIPIENT_TYPE,
+                        VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
+                    ],
+                ];
+            }
+
+            $recipienttable = mapi_message_getrecipienttable($message);
+            $recipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $restriction);
+
+            if (!$deletedRecips) {
+                $deletedRecips = array_merge([], $recipients);
+            }
+            else {
+                $deletedRecips = array_merge($deletedRecips, $recipients);
+            }
+        }
+
+        // Remove the PR_ICON_INDEX as it is not needed in the sent message.
+        $newmessageprops[PR_ICON_INDEX] = null;
+        $newmessageprops[PR_RESPONSE_REQUESTED] = true;
+
+        // PR_START_DATE and PR_END_DATE will be used by outlook to show the position in the calendar
+        $newmessageprops[PR_START_DATE] = $newmessageprops[$this->proptags['startdate']];
+        $newmessageprops[PR_END_DATE] = $newmessageprops[$this->proptags['duedate']];
+
+        // Set updatecounter/AppointmentSequenceNumber
+        // get the value of latest updatecounter for the whole series and use it
+        $newmessageprops[$this->proptags['updatecounter']] = $messageprops[$this->proptags['last_updatecounter']];
+
+        $meetingTimeInfo = $this->getMeetingTimeInfo();
+
+        if ($meetingTimeInfo) {
+            $newmessageprops[PR_BODY] = $meetingTimeInfo;
+        }
+
+        // Send all recurrence info in mail, if this is a recurrence meeting.
+        if (isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']]) {
+            if (!empty($messageprops[$this->proptags['recurring_pattern']])) {
+                $newmessageprops[$this->proptags['recurring_pattern']] = $messageprops[$this->proptags['recurring_pattern']];
+            }
+            $newmessageprops[$this->proptags['recurrence_data']] = $messageprops[$this->proptags['recurrence_data']];
+            $newmessageprops[$this->proptags['timezone_data']] = $messageprops[$this->proptags['timezone_data']];
+            $newmessageprops[$this->proptags['timezone']] = $messageprops[$this->proptags['timezone']];
+
+            if ($recurObject) {
+                $this->generateRecurDates($recurObject, $messageprops, $newmessageprops);
+            }
+        }
+
+        if (isset($newmessageprops[$this->proptags['counter_proposal']])) {
+            unset($newmessageprops[$this->proptags['counter_proposal']]);
+        }
+
+        // Prefix the subject if needed
+        if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
+            $newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+        }
+
+        if (isset($newmessageprops[$this->proptags['categories']]) &&
+            !empty($newmessageprops[$this->proptags['categories']])) {
+            unset($newmessageprops[$this->proptags['categories']]);
+        }
+        mapi_setprops($new, $newmessageprops);
+
+        // Copy attachments
+        $this->replaceAttachments($message, $new, $copyExceptions);
+
+        // Retrieve only those recipient who should receive this meeting request.
+        $stripResourcesRestriction = [
+            RES_AND,
+            [
+                [
+                    RES_BITMASK,
+                    [
+                        ULTYPE => BMR_EQZ,
+                        ULPROPTAG => PR_RECIPIENT_FLAGS,
+                        ULMASK => recipExceptionalDeleted,
+                    ],
+                ],
+                [
+                    RES_BITMASK,
+                    [
+                        ULTYPE => BMR_EQZ,
+                        ULPROPTAG => PR_RECIPIENT_FLAGS,
+                        ULMASK => recipOrganizer,
+                    ],
+                ],
+            ],
+        ];
+
+        // In direct-booking mode, resources do not receive a meeting request
+        if ($this->enableDirectBooking) {
+            $stripResourcesRestriction[1][] =
+                                    [
+                                        RES_PROPERTY,
+                                        [
+                                            RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+                                            ULPROPTAG => PR_RECIPIENT_TYPE,
+                                            VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
+                                        ],
+                                    ];
+        }
+
+        // If no recipients were explicitly provided, we will send the update to all
+        // recipients from the meeting.
+        if ($modifiedRecips === false) {
+            $recipienttable = mapi_message_getrecipienttable($message);
+            $modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops, $stripResourcesRestriction);
+
+            if ($basedate && empty($modifiedRecips)) {
+                // Retrieve full list
+                $recipienttable = mapi_message_getrecipienttable($this->message);
+                $modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops);
+
+                // Save recipients in exceptions
+                mapi_message_modifyrecipients($message, MODRECIP_ADD, $modifiedRecips);
+
+                // Now retrieve only those recipient who should receive this meeting request.
+                $modifiedRecips = mapi_table_queryallrows($recipienttable, $this->recipprops, $stripResourcesRestriction);
+            }
+        }
+
+        // @TODO: handle nonAcceptingResources
+        /*
 		 * Add resource recipients that did not automatically accept the meeting request.
 		 * (note: meaning that they did not decline the meeting request)
 		 */ /*
@@ -3137,803 +3137,803 @@ 
 			$recipients[] = $this->nonAcceptingResources[$i];
 		}*/
 
-		if (!empty($modifiedRecips)) {
-			// Strip out the sender/'owner' recipient
-			mapi_message_modifyrecipients($new, MODRECIP_ADD, $modifiedRecips);
-
-			// Set some properties that are different in the sent request than
-			// in the item in our calendar
-
-			// we should store busystatus value to intendedbusystatus property, because busystatus for outgoing meeting request
-			// should always be fbTentative
-			$newmessageprops[$this->proptags['intendedbusystatus']] = isset($newmessageprops[$this->proptags['busystatus']]) ? $newmessageprops[$this->proptags['busystatus']] : $messageprops[$this->proptags['busystatus']];
-			$newmessageprops[$this->proptags['busystatus']] = fbTentative; // The default status when not accepted
-			$newmessageprops[$this->proptags['responsestatus']] = olResponseNotResponded; // The recipient has not responded yet
-			$newmessageprops[$this->proptags['attendee_critical_change']] = time();
-			$newmessageprops[$this->proptags['owner_critical_change']] = time();
-			$newmessageprops[$this->proptags['meetingtype']] = mtgRequest;
-
-			if ($cancel) {
-				$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
-				$newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
-				$newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
-			}
-			else {
-				$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Request';
-				$newmessageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
-			}
-
-			mapi_setprops($new, $newmessageprops);
-			mapi_savechanges($new);
-
-			// Submit message to non-resource recipients
-			mapi_message_submitmessage($new);
-		}
-
-		// Search through the deleted recipients, and see if any of them is also
-		// listed as a recipient to whom we have send an update. As we don't
-		// want to send a cancellation message to recipients who will also receive
-		// an meeting update, we have to filter those recipients out.
-		if ($deletedRecips) {
-			$tmp = [];
-
-			foreach ($deletedRecips as $delRecip) {
-				$found = false;
-
-				// Search if the deleted recipient can be found inside
-				// the updated recipients as well.
-				foreach ($modifiedRecips as $recip) {
-					if ($this->compareABEntryIDs($recip[PR_ENTRYID], $delRecip[PR_ENTRYID])) {
-						$found = true;
-
-						break;
-					}
-				}
-
-				// If the recipient was not found, it truly is deleted,
-				// and we can safely send a cancellation message
-				if (!$found) {
-					$tmp[] = $delRecip;
-				}
-			}
-
-			$deletedRecips = $tmp;
-		}
-
-		// Send cancellation to deleted attendees
-		if ($deletedRecips && !empty($deletedRecips)) {
-			$new = $this->createOutgoingMessage();
-
-			mapi_message_modifyrecipients($new, MODRECIP_ADD, $deletedRecips);
-
-			$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
-			$newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
-			$newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
-			$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;    // HIGH Importance
-			if (isset($newmessageprops[PR_SUBJECT])) {
-				$newmessageprops[PR_SUBJECT] = _('Canceled: ') . $newmessageprops[PR_SUBJECT];
-			}
-
-			mapi_setprops($new, $newmessageprops);
-			mapi_savechanges($new);
-
-			// Submit message to non-resource recipients
-			mapi_message_submitmessage($new);
-		}
-
-		// Set properties on meeting object in calendar
-		// Set requestsent to 'true' (turns on 'tracking', etc)
-		$props = [];
-		$props[$this->proptags['meetingstatus']] = olMeeting;
-		$props[$this->proptags['responsestatus']] = olResponseOrganized;
-		// Only set the 'requestsent' property if it wasn't set previously yet,
-		// this ensures we will not accidentally set it from true to false.
-		if (!isset($messageprops[$this->proptags['requestsent']]) || $messageprops[$this->proptags['requestsent']] !== true) {
-			$props[$this->proptags['requestsent']] = !empty($modifiedRecips) || ($this->includesResources && !$this->errorSetResource);
-		}
-		$props[$this->proptags['attendee_critical_change']] = time();
-		$props[$this->proptags['owner_critical_change']] = time();
-		$props[$this->proptags['meetingtype']] = mtgRequest;
-		// save the new updatecounter to exception/recurring series/normal meeting
-		$props[$this->proptags['updatecounter']] = $newmessageprops[$this->proptags['updatecounter']];
-
-		// PR_START_DATE and PR_END_DATE will be used by outlook to show the position in the calendar
-		$props[PR_START_DATE] = $messageprops[$this->proptags['startdate']];
-		$props[PR_END_DATE] = $messageprops[$this->proptags['duedate']];
-
-		mapi_setprops($message, $props);
-
-		// saving of these properties on calendar item should be handled by caller function
-		// based on sending meeting request was successful or not
-	}
-
-	/**
-	 * OL2007 uses these 4 properties to specify occurrence that should be updated.
-	 * ical generates RECURRENCE-ID property based on exception's basedate (PidLidExceptionReplaceTime),
-	 * but OL07 doesn't send this property, so ical will generate RECURRENCE-ID property based on date
-	 * from GlobalObjId and time from StartRecurTime property, so we are sending basedate property and
-	 * also additionally we are sending these properties.
-	 * Ref: MS-OXCICAL 2.2.1.20.20 Property: RECURRENCE-ID.
-	 *
-	 * @param object $recurObject     instance of recurrence class for this message
-	 * @param array  $messageprops    properties of meeting object that is going to be send
-	 * @param array  $newmessageprops properties of meeting request/response that is going to be send
-	 */
-	public function generateRecurDates($recurObject, $messageprops, &$newmessageprops) {
-		if ($messageprops[$this->proptags['startdate']] && $messageprops[$this->proptags['duedate']]) {
-			$startDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['startdate']]));
-			$endDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['duedate']]));
-
-			$startDate = explode(':', $startDate);
-			$endDate = explode(':', $endDate);
-
-			// [0] => year, [1] => month, [2] => day, [3] => hour, [4] => minutes, [5] => seconds
-			// RecurStartDate = year * 512 + month_number * 32 + day_number
-			$newmessageprops[$this->proptags['start_recur_date']] = (((int) $startDate[0]) * 512) + (((int) $startDate[1]) * 32) + ((int) $startDate[2]);
-			// RecurStartTime = hour * 4096 + minutes * 64 + seconds
-			$newmessageprops[$this->proptags['start_recur_time']] = (((int) $startDate[3]) * 4096) + (((int) $startDate[4]) * 64) + ((int) $startDate[5]);
-
-			$newmessageprops[$this->proptags['end_recur_date']] = (((int) $endDate[0]) * 512) + (((int) $endDate[1]) * 32) + ((int) $endDate[2]);
-			$newmessageprops[$this->proptags['end_recur_time']] = (((int) $endDate[3]) * 4096) + (((int) $endDate[4]) * 64) + ((int) $endDate[5]);
-		}
-	}
-
-	/**
-	 * Function will create a new outgoing message that will be used to send meeting mail.
-	 *
-	 * @param MAPIStore $store (optional) store that is used when creating response, if delegate is creating outgoing mail
-	 *                         then this would point to delegate store
-	 *
-	 * @return MAPIMessage outgoing mail that is created and can be used for sending it
-	 */
-	public function createOutgoingMessage($store = false) {
-		// get logged in user's store that will be used to send mail, for delegate this will be
-		// delegate store
-		$userStore = $this->openDefaultStore();
-
-		$sentprops = [];
-		$outbox = $this->openDefaultOutbox($userStore);
-
-		$outgoing = mapi_folder_createmessage($outbox);
-
-		// check if $store is set and it is not equal to $defaultStore (means its the delegation case)
-		if ($store !== false) {
-			$storeProps = mapi_getprops($store, [PR_ENTRYID]);
-			$userStoreProps = mapi_getprops($userStore, [PR_ENTRYID]);
-
-			// @FIXME use entryid comparison functions here
-			if ($storeProps[PR_ENTRYID] !== $userStoreProps[PR_ENTRYID]) {
-				// get the delegator properties and set it into outgoing mail
-				$delegatorDetails = $this->getOwnerAddress($store, false);
-
-				if ($delegatorDetails) {
-					list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegatorDetails;
-					$sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
-					$sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
-					$sentprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
-					$sentprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
-					$sentprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
-				}
-
-				// get the delegate properties and set it into outgoing mail
-				$delegateDetails = $this->getOwnerAddress($userStore, false);
-
-				if ($delegateDetails) {
-					list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegateDetails;
-					$sentprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
-					$sentprops[PR_SENDER_NAME] = $ownername;
-					$sentprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
-					$sentprops[PR_SENDER_ENTRYID] = $ownerentryid;
-					$sentprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
-				}
-			}
-		}
-		else {
-			// normal user is sending mail, so both set of properties will be same
-			$userDetails = $this->getOwnerAddress($userStore);
-
-			if ($userDetails) {
-				list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $userDetails;
-				$sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
-				$sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
-				$sentprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
-				$sentprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
-				$sentprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
-
-				$sentprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
-				$sentprops[PR_SENDER_NAME] = $ownername;
-				$sentprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
-				$sentprops[PR_SENDER_ENTRYID] = $ownerentryid;
-				$sentprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
-			}
-		}
-
-		$sentprops[PR_SENTMAIL_ENTRYID] = $this->getDefaultSentmailEntryID($userStore);
-
-		mapi_setprops($outgoing, $sentprops);
-
-		return $outgoing;
-	}
-
-	/**
-	 * Function which checks that meeting in attendee's calendar is already updated
-	 * and we are checking an old meeting request. This function also will update property
-	 * meetingtype to indicate that its out of date meeting request.
-	 *
-	 * @return bool true if meeting request is outofdate else false if it is new
-	 */
-	public function isMeetingOutOfDate() {
-		$result = false;
-
-		$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], $this->proptags['updatecounter'], $this->proptags['meetingtype'], $this->proptags['owner_critical_change']]);
-
-		if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS])) {
-			return $result;
-		}
-
-		if (isset($props[$this->proptags['meetingtype']]) && ($props[$this->proptags['meetingtype']] & mtgOutOfDate) == mtgOutOfDate) {
-			return true;
-		}
-
-		// get the basedate to check for exception
-		$basedate = $this->getBasedateFromGlobalID($props[$this->proptags['goid']]);
-
-		$calendarItem = $this->getCorrespondentCalendarItem(true);
-
-		// if basedate is provided and we could not find the item then it could be that we are checking
-		// an exception so get the exception and check it
-		if ($basedate && $calendarItem !== false) {
-			$exception = $this->getExceptionItem($calendarItem, $basedate);
-
-			if ($exception !== false) {
-				// we are able to find the exception compare with it
-				$calendarItem = $exception;
-			}
-			// we are not able to find exception, could mean that a significant change has occurred on series
-				// and it deleted all exceptions, so compare with series
-				// $calendarItem already contains reference to series
-		}
-
-		if ($calendarItem !== false) {
-			$calendarItemProps = mapi_getprops($calendarItem, [
-				$this->proptags['owner_critical_change'],
-				$this->proptags['updatecounter'],
-			]);
-
-			$updateCounter = (isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]);
-
-			$criticalChange = (isset($calendarItemProps[$this->proptags['owner_critical_change']]) && $props[$this->proptags['owner_critical_change']] < $calendarItemProps[$this->proptags['owner_critical_change']]);
-
-			if ($updateCounter || $criticalChange) {
-				// meeting request is out of date, set properties to indicate this
-				mapi_setprops($this->message, [$this->proptags['meetingtype'] => mtgOutOfDate, PR_ICON_INDEX => 1033]);
-				mapi_savechanges($this->message);
-
-				$result = true;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Function which checks that if we have received a meeting response for an updated meeting in organizer's calendar.
-	 *
-	 * @param Number $basedate basedate of the exception if we want to compare with exception
-	 *
-	 * @return bool true if meeting request is updated later
-	 */
-	public function isMeetingUpdated($basedate = false) {
-		$result = false;
-
-		$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['updatecounter']]);
-
-		if (!$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS])) {
-			return $result;
-		}
-
-		$calendarItem = $this->getCorrespondentCalendarItem(true);
-
-		if ($calendarItem !== false) {
-			// basedate is provided so open exception
-			if ($basedate !== false) {
-				$exception = $this->getExceptionItem($calendarItem, $basedate);
-
-				if ($exception !== false) {
-					// we are able to find the exception compare with it
-					$calendarItem = $exception;
-				}
-				// we are not able to find exception, could mean that a significant change has occurred on series
-					// and it deleted all exceptions, so compare with series
-					// $calendarItem already contains reference to series
-			}
-
-			if ($calendarItem !== false) {
-				$calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['updatecounter']]);
-
-				/*
+        if (!empty($modifiedRecips)) {
+            // Strip out the sender/'owner' recipient
+            mapi_message_modifyrecipients($new, MODRECIP_ADD, $modifiedRecips);
+
+            // Set some properties that are different in the sent request than
+            // in the item in our calendar
+
+            // we should store busystatus value to intendedbusystatus property, because busystatus for outgoing meeting request
+            // should always be fbTentative
+            $newmessageprops[$this->proptags['intendedbusystatus']] = isset($newmessageprops[$this->proptags['busystatus']]) ? $newmessageprops[$this->proptags['busystatus']] : $messageprops[$this->proptags['busystatus']];
+            $newmessageprops[$this->proptags['busystatus']] = fbTentative; // The default status when not accepted
+            $newmessageprops[$this->proptags['responsestatus']] = olResponseNotResponded; // The recipient has not responded yet
+            $newmessageprops[$this->proptags['attendee_critical_change']] = time();
+            $newmessageprops[$this->proptags['owner_critical_change']] = time();
+            $newmessageprops[$this->proptags['meetingtype']] = mtgRequest;
+
+            if ($cancel) {
+                $newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
+                $newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
+                $newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
+            }
+            else {
+                $newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Request';
+                $newmessageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
+            }
+
+            mapi_setprops($new, $newmessageprops);
+            mapi_savechanges($new);
+
+            // Submit message to non-resource recipients
+            mapi_message_submitmessage($new);
+        }
+
+        // Search through the deleted recipients, and see if any of them is also
+        // listed as a recipient to whom we have send an update. As we don't
+        // want to send a cancellation message to recipients who will also receive
+        // an meeting update, we have to filter those recipients out.
+        if ($deletedRecips) {
+            $tmp = [];
+
+            foreach ($deletedRecips as $delRecip) {
+                $found = false;
+
+                // Search if the deleted recipient can be found inside
+                // the updated recipients as well.
+                foreach ($modifiedRecips as $recip) {
+                    if ($this->compareABEntryIDs($recip[PR_ENTRYID], $delRecip[PR_ENTRYID])) {
+                        $found = true;
+
+                        break;
+                    }
+                }
+
+                // If the recipient was not found, it truly is deleted,
+                // and we can safely send a cancellation message
+                if (!$found) {
+                    $tmp[] = $delRecip;
+                }
+            }
+
+            $deletedRecips = $tmp;
+        }
+
+        // Send cancellation to deleted attendees
+        if ($deletedRecips && !empty($deletedRecips)) {
+            $new = $this->createOutgoingMessage();
+
+            mapi_message_modifyrecipients($new, MODRECIP_ADD, $deletedRecips);
+
+            $newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
+            $newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
+            $newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
+            $newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;    // HIGH Importance
+            if (isset($newmessageprops[PR_SUBJECT])) {
+                $newmessageprops[PR_SUBJECT] = _('Canceled: ') . $newmessageprops[PR_SUBJECT];
+            }
+
+            mapi_setprops($new, $newmessageprops);
+            mapi_savechanges($new);
+
+            // Submit message to non-resource recipients
+            mapi_message_submitmessage($new);
+        }
+
+        // Set properties on meeting object in calendar
+        // Set requestsent to 'true' (turns on 'tracking', etc)
+        $props = [];
+        $props[$this->proptags['meetingstatus']] = olMeeting;
+        $props[$this->proptags['responsestatus']] = olResponseOrganized;
+        // Only set the 'requestsent' property if it wasn't set previously yet,
+        // this ensures we will not accidentally set it from true to false.
+        if (!isset($messageprops[$this->proptags['requestsent']]) || $messageprops[$this->proptags['requestsent']] !== true) {
+            $props[$this->proptags['requestsent']] = !empty($modifiedRecips) || ($this->includesResources && !$this->errorSetResource);
+        }
+        $props[$this->proptags['attendee_critical_change']] = time();
+        $props[$this->proptags['owner_critical_change']] = time();
+        $props[$this->proptags['meetingtype']] = mtgRequest;
+        // save the new updatecounter to exception/recurring series/normal meeting
+        $props[$this->proptags['updatecounter']] = $newmessageprops[$this->proptags['updatecounter']];
+
+        // PR_START_DATE and PR_END_DATE will be used by outlook to show the position in the calendar
+        $props[PR_START_DATE] = $messageprops[$this->proptags['startdate']];
+        $props[PR_END_DATE] = $messageprops[$this->proptags['duedate']];
+
+        mapi_setprops($message, $props);
+
+        // saving of these properties on calendar item should be handled by caller function
+        // based on sending meeting request was successful or not
+    }
+
+    /**
+     * OL2007 uses these 4 properties to specify occurrence that should be updated.
+     * ical generates RECURRENCE-ID property based on exception's basedate (PidLidExceptionReplaceTime),
+     * but OL07 doesn't send this property, so ical will generate RECURRENCE-ID property based on date
+     * from GlobalObjId and time from StartRecurTime property, so we are sending basedate property and
+     * also additionally we are sending these properties.
+     * Ref: MS-OXCICAL 2.2.1.20.20 Property: RECURRENCE-ID.
+     *
+     * @param object $recurObject     instance of recurrence class for this message
+     * @param array  $messageprops    properties of meeting object that is going to be send
+     * @param array  $newmessageprops properties of meeting request/response that is going to be send
+     */
+    public function generateRecurDates($recurObject, $messageprops, &$newmessageprops) {
+        if ($messageprops[$this->proptags['startdate']] && $messageprops[$this->proptags['duedate']]) {
+            $startDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['startdate']]));
+            $endDate = date('Y:n:j:G:i:s', $recurObject->fromGMT($recurObject->tz, $messageprops[$this->proptags['duedate']]));
+
+            $startDate = explode(':', $startDate);
+            $endDate = explode(':', $endDate);
+
+            // [0] => year, [1] => month, [2] => day, [3] => hour, [4] => minutes, [5] => seconds
+            // RecurStartDate = year * 512 + month_number * 32 + day_number
+            $newmessageprops[$this->proptags['start_recur_date']] = (((int) $startDate[0]) * 512) + (((int) $startDate[1]) * 32) + ((int) $startDate[2]);
+            // RecurStartTime = hour * 4096 + minutes * 64 + seconds
+            $newmessageprops[$this->proptags['start_recur_time']] = (((int) $startDate[3]) * 4096) + (((int) $startDate[4]) * 64) + ((int) $startDate[5]);
+
+            $newmessageprops[$this->proptags['end_recur_date']] = (((int) $endDate[0]) * 512) + (((int) $endDate[1]) * 32) + ((int) $endDate[2]);
+            $newmessageprops[$this->proptags['end_recur_time']] = (((int) $endDate[3]) * 4096) + (((int) $endDate[4]) * 64) + ((int) $endDate[5]);
+        }
+    }
+
+    /**
+     * Function will create a new outgoing message that will be used to send meeting mail.
+     *
+     * @param MAPIStore $store (optional) store that is used when creating response, if delegate is creating outgoing mail
+     *                         then this would point to delegate store
+     *
+     * @return MAPIMessage outgoing mail that is created and can be used for sending it
+     */
+    public function createOutgoingMessage($store = false) {
+        // get logged in user's store that will be used to send mail, for delegate this will be
+        // delegate store
+        $userStore = $this->openDefaultStore();
+
+        $sentprops = [];
+        $outbox = $this->openDefaultOutbox($userStore);
+
+        $outgoing = mapi_folder_createmessage($outbox);
+
+        // check if $store is set and it is not equal to $defaultStore (means its the delegation case)
+        if ($store !== false) {
+            $storeProps = mapi_getprops($store, [PR_ENTRYID]);
+            $userStoreProps = mapi_getprops($userStore, [PR_ENTRYID]);
+
+            // @FIXME use entryid comparison functions here
+            if ($storeProps[PR_ENTRYID] !== $userStoreProps[PR_ENTRYID]) {
+                // get the delegator properties and set it into outgoing mail
+                $delegatorDetails = $this->getOwnerAddress($store, false);
+
+                if ($delegatorDetails) {
+                    list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegatorDetails;
+                    $sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
+                    $sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
+                    $sentprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
+                    $sentprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
+                    $sentprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
+                }
+
+                // get the delegate properties and set it into outgoing mail
+                $delegateDetails = $this->getOwnerAddress($userStore, false);
+
+                if ($delegateDetails) {
+                    list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $delegateDetails;
+                    $sentprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
+                    $sentprops[PR_SENDER_NAME] = $ownername;
+                    $sentprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
+                    $sentprops[PR_SENDER_ENTRYID] = $ownerentryid;
+                    $sentprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
+                }
+            }
+        }
+        else {
+            // normal user is sending mail, so both set of properties will be same
+            $userDetails = $this->getOwnerAddress($userStore);
+
+            if ($userDetails) {
+                list($ownername, $owneremailaddr, $owneraddrtype, $ownerentryid, $ownersearchkey) = $userDetails;
+                $sentprops[PR_SENT_REPRESENTING_EMAIL_ADDRESS] = $owneremailaddr;
+                $sentprops[PR_SENT_REPRESENTING_NAME] = $ownername;
+                $sentprops[PR_SENT_REPRESENTING_ADDRTYPE] = $owneraddrtype;
+                $sentprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
+                $sentprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
+
+                $sentprops[PR_SENDER_EMAIL_ADDRESS] = $owneremailaddr;
+                $sentprops[PR_SENDER_NAME] = $ownername;
+                $sentprops[PR_SENDER_ADDRTYPE] = $owneraddrtype;
+                $sentprops[PR_SENDER_ENTRYID] = $ownerentryid;
+                $sentprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
+            }
+        }
+
+        $sentprops[PR_SENTMAIL_ENTRYID] = $this->getDefaultSentmailEntryID($userStore);
+
+        mapi_setprops($outgoing, $sentprops);
+
+        return $outgoing;
+    }
+
+    /**
+     * Function which checks that meeting in attendee's calendar is already updated
+     * and we are checking an old meeting request. This function also will update property
+     * meetingtype to indicate that its out of date meeting request.
+     *
+     * @return bool true if meeting request is outofdate else false if it is new
+     */
+    public function isMeetingOutOfDate() {
+        $result = false;
+
+        $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], $this->proptags['updatecounter'], $this->proptags['meetingtype'], $this->proptags['owner_critical_change']]);
+
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS])) {
+            return $result;
+        }
+
+        if (isset($props[$this->proptags['meetingtype']]) && ($props[$this->proptags['meetingtype']] & mtgOutOfDate) == mtgOutOfDate) {
+            return true;
+        }
+
+        // get the basedate to check for exception
+        $basedate = $this->getBasedateFromGlobalID($props[$this->proptags['goid']]);
+
+        $calendarItem = $this->getCorrespondentCalendarItem(true);
+
+        // if basedate is provided and we could not find the item then it could be that we are checking
+        // an exception so get the exception and check it
+        if ($basedate && $calendarItem !== false) {
+            $exception = $this->getExceptionItem($calendarItem, $basedate);
+
+            if ($exception !== false) {
+                // we are able to find the exception compare with it
+                $calendarItem = $exception;
+            }
+            // we are not able to find exception, could mean that a significant change has occurred on series
+                // and it deleted all exceptions, so compare with series
+                // $calendarItem already contains reference to series
+        }
+
+        if ($calendarItem !== false) {
+            $calendarItemProps = mapi_getprops($calendarItem, [
+                $this->proptags['owner_critical_change'],
+                $this->proptags['updatecounter'],
+            ]);
+
+            $updateCounter = (isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]);
+
+            $criticalChange = (isset($calendarItemProps[$this->proptags['owner_critical_change']]) && $props[$this->proptags['owner_critical_change']] < $calendarItemProps[$this->proptags['owner_critical_change']]);
+
+            if ($updateCounter || $criticalChange) {
+                // meeting request is out of date, set properties to indicate this
+                mapi_setprops($this->message, [$this->proptags['meetingtype'] => mtgOutOfDate, PR_ICON_INDEX => 1033]);
+                mapi_savechanges($this->message);
+
+                $result = true;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Function which checks that if we have received a meeting response for an updated meeting in organizer's calendar.
+     *
+     * @param Number $basedate basedate of the exception if we want to compare with exception
+     *
+     * @return bool true if meeting request is updated later
+     */
+    public function isMeetingUpdated($basedate = false) {
+        $result = false;
+
+        $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['updatecounter']]);
+
+        if (!$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS])) {
+            return $result;
+        }
+
+        $calendarItem = $this->getCorrespondentCalendarItem(true);
+
+        if ($calendarItem !== false) {
+            // basedate is provided so open exception
+            if ($basedate !== false) {
+                $exception = $this->getExceptionItem($calendarItem, $basedate);
+
+                if ($exception !== false) {
+                    // we are able to find the exception compare with it
+                    $calendarItem = $exception;
+                }
+                // we are not able to find exception, could mean that a significant change has occurred on series
+                    // and it deleted all exceptions, so compare with series
+                    // $calendarItem already contains reference to series
+            }
+
+            if ($calendarItem !== false) {
+                $calendarItemProps = mapi_getprops($calendarItem, [$this->proptags['updatecounter']]);
+
+                /*
 				 * if(message_counter < appointment_counter) meeting object is newer then meeting response (meeting is updated)
 				 * if(message_counter >= appointment_counter) meeting is not updated, do normal processing
 				 */
-				if (isset($calendarItemProps[$this->proptags['updatecounter']], $props[$this->proptags['updatecounter']])) {
-					if ($props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) {
-						$result = true;
-					}
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Checks if there has been any significant changes on appointment/meeting item.
-	 * Significant changes be:
-	 * 1) startdate has been changed
-	 * 2) duedate has been changed OR
-	 * 3) recurrence pattern has been created, modified or removed.
-	 *
-	 * @param array oldProps old props before an update
-	 * @param Number basedate basedate
-	 * @param bool isRecurrenceChanged for change in recurrence pattern.
-	 * isRecurrenceChanged true means Recurrence pattern has been changed, so clear all attendees response
-	 * @param mixed $oldProps
-	 * @param mixed $basedate
-	 * @param mixed $isRecurrenceChanged
-	 */
-	public function checkSignificantChanges($oldProps, $basedate, $isRecurrenceChanged = false) {
-		$message = null;
-		$attach = null;
-
-		// If basedate is specified then we need to open exception message to clear recipient responses
-		if ($basedate) {
-			$recurrence = new Recurrence($this->store, $this->message);
-			if ($recurrence->isException($basedate)) {
-				$attach = $recurrence->getExceptionAttachment($basedate);
-				if ($attach) {
-					$message = mapi_attach_openobj($attach, MAPI_MODIFY);
-				}
-			}
-		}
-		else {
-			// use normal message or recurring series message
-			$message = $this->message;
-		}
-
-		if (!$message) {
-			return;
-		}
-
-		$newProps = mapi_getprops($message, [$this->proptags['startdate'], $this->proptags['duedate'], $this->proptags['updatecounter']]);
-
-		// Check whether message is updated or not.
-		if (isset($newProps[$this->proptags['updatecounter']]) && $newProps[$this->proptags['updatecounter']] == 0) {
-			return;
-		}
-
-		if (($newProps[$this->proptags['startdate']] != $oldProps[$this->proptags['startdate']]) ||
-			($newProps[$this->proptags['duedate']] != $oldProps[$this->proptags['duedate']]) ||
-			$isRecurrenceChanged) {
-			$this->clearRecipientResponse($message);
-
-			mapi_setprops($message, [$this->proptags['owner_critical_change'] => time()]);
-
-			mapi_savechanges($message);
-			if ($attach) { // Also save attachment Object.
-				mapi_savechanges($attach);
-			}
-		}
-	}
-
-	/**
-	 * Clear responses of all attendees who have replied in past.
-	 *
-	 * @param MAPI_MESSAGE $message on which responses should be cleared
-	 */
-	public function clearRecipientResponse($message) {
-		$recipTable = mapi_message_getrecipienttable($message);
-		$recipsRows = mapi_table_queryallrows($recipTable, $this->recipprops);
-
-		foreach ($recipsRows as $recipient) {
-			if (($recipient[PR_RECIPIENT_FLAGS] & recipOrganizer) != recipOrganizer) {
-				// Recipient is attendee, set the trackstatus to 'Not Responded'
-				$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-			}
-			else {
-				// Recipient is organizer, this is not possible, but for safety
-				// it is best to clear the trackstatus for him as well by setting
-				// the trackstatus to 'Organized'.
-				$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-			}
-			mapi_message_modifyrecipients($message, MODRECIP_MODIFY, [$recipient]);
-		}
-	}
-
-	/**
-	 * Function returns correspondent calendar item attached with the meeting request/response/cancellation.
-	 * This will only check for actual MAPIMessages in calendar folder, so if a meeting request is
-	 * for exception then this function will return recurring series for that meeting request
-	 * after that you need to use getExceptionItem function to get exception item that will be
-	 * fetched from the attachment table of recurring series MAPIMessage.
-	 *
-	 * @param bool $open boolean to indicate the function should return entryid or MAPIMessage. Defaults to true.
-	 *
-	 * @return entryid or MAPIMessage resource of calendar item
-	 */
-	public function getCorrespondentCalendarItem($open = true) {
-		$props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_ENTRYID]);
-
-		if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
-			// can work only with meeting requests/responses/cancellations
-			return false;
-		}
-
-		$globalId = $props[$this->proptags['goid']];
-		$cleanGlobalId = $props[$this->proptags['goid2']];
-
-		// If Delegate is processing Meeting Request/Response for Delegator then retrieve Delegator's store and calendar.
-		if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
-			$delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-			$store = $delegatorStore['store'];
-			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
-			$store = $this->store;
-			$calFolder = $this->openDefaultCalendar();
-		}
-
-		$basedate = $this->getBasedateFromGlobalID($globalId);
-
-		/**
-		 * First search for any appointments which correspond to the $globalId,
-		 * this can be the entire series (if the Meeting Request refers to the
-		 * entire series), or an particular Occurrence (if the meeting Request
-		 * contains a basedate).
-		 *
-		 * If we cannot find a corresponding item, and the $globalId contains
-		 * a $basedate, it might imply that a new exception will have to be
-		 * created for a series which is present in the calendar, we can look
-		 * that one up by searching for the $cleanGlobalId.
-		 */
-		$entryids = $this->findCalendarItems($globalId, $calFolder);
-		if ($basedate && empty($entryids)) {
-			$entryids = $this->findCalendarItems($cleanGlobalId, $calFolder, true);
-		}
-
-		// there should be only one item returned
-		if (!empty($entryids) && count($entryids) === 1) {
-			// return only entryid
-			if ($open === false) {
-				return $entryids[0];
-			}
-
-			// open calendar item and return it
-			return mapi_msgstore_openentry($store, $entryids[0]);
-		}
-
-		// no items found in calendar
-		return false;
-	}
-
-	/**
-	 * Function returns exception item based on the basedate passed.
-	 *
-	 * @param MAPIMessage $recurringMessage Resource of Recurring meeting from calendar
-	 * @param Unixtime    $basedate         basedate of exception that needs to be returned
-	 * @param MAPIStore   $store            store that contains the recurring calendar item
-	 *
-	 * @return entryid or MAPIMessage resource of exception item
-	 */
-	public function getExceptionItem($recurringMessage, $basedate, $store = false) {
-		$occurItem = false;
-
-		$props = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID, $this->proptags['recurring']]);
-
-		// check if the passed item is recurring series
-		if ($props[$this->proptags['recurring']] !== false) {
-			return false;
-		}
-
-		if ($store === false) {
-			// If Delegate is processing Meeting Request/Response for Delegator then retrieve Delegator's store and calendar.
-			if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
-				$delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID]);
-				$store = $delegatorStore['store'];
-			}
-			else {
-				$store = $this->store;
-			}
-		}
-
-		$recurr = new Recurrence($store, $recurringMessage);
-		$attach = $recurr->getExceptionAttachment($basedate);
-		if ($attach) {
-			$occurItem = mapi_attach_openobj($attach);
-		}
-
-		return $occurItem;
-	}
-
-	/**
-	 * Function which checks whether received meeting request is either conflicting with other appointments or not.
-	 *
-	 * @param MAPIMessage $message   meeting request item that should be checked for conflicts in calendar
-	 * @param MAPIStore   $userStore store containing calendar folder that will be used for confilict checking
-	 * @param MAPIFolder  $calFolder calendar folder for conflict checking
-	 *
-	 * @return mixed(boolean/integer) true if normal meeting is conflicting or an integer which specifies no of instances
-	 * conflict of recurring meeting and false if meeting is not conflicting
-	 * @return mixed if boolean then true/false for indicating conflict, if number then items that are conflicting with the message
-	 */
-	public function isMeetingConflicting($message = false, $userStore = false, $calFolder = false) {
-		$returnValue = false;
-		$noOfInstances = 0;
-
-		if ($message === false) {
-			$message = $this->message;
-		}
-
-		$messageProps = mapi_getprops(
-			$message,
-			[
-				PR_MESSAGE_CLASS,
-				$this->proptags['goid'],
-				$this->proptags['goid2'],
-				$this->proptags['startdate'],
-				$this->proptags['duedate'],
-				$this->proptags['recurring'],
-				$this->proptags['clipstart'],
-				$this->proptags['clipend'],
-				PR_RCVD_REPRESENTING_ENTRYID,
-				$this->proptags['basedate'],
-				PR_RCVD_REPRESENTING_NAME,
-			]
-		);
-
-		if ($userStore === false) {
-			$userStore = $this->store;
-
-			// check if delegate is processing the response
-			if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
-				$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
-
-				$userStore = $delegatorStore['store'];
-				$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-			}
-		}
-
-		if ($calFolder === false) {
-			$calFolder = $this->openDefaultCalendar($userStore);
-		}
-
-		if ($calFolder) {
-			// Meeting request is recurring, so get all occurrence and check for each occurrence whether it conflicts with other appointments in Calendar.
-			if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
-				// Apply recurrence class and retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
-				$recurr = new Recurrence($userStore, $message);
-				$items = $recurr->getItems($messageProps[$this->proptags['clipstart']], $messageProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
-
-				foreach ($items as $item) {
-					// Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
-					$calendarItems = $recurr->getCalendarItems($userStore, $calFolder, $item[$this->proptags['startdate']], $item[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus']]);
-
-					foreach ($calendarItems as $calendarItem) {
-						if ($calendarItem[$this->proptags['busystatus']] !== fbFree) {
-							/*
+                if (isset($calendarItemProps[$this->proptags['updatecounter']], $props[$this->proptags['updatecounter']])) {
+                    if ($props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) {
+                        $result = true;
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if there has been any significant changes on appointment/meeting item.
+     * Significant changes be:
+     * 1) startdate has been changed
+     * 2) duedate has been changed OR
+     * 3) recurrence pattern has been created, modified or removed.
+     *
+     * @param array oldProps old props before an update
+     * @param Number basedate basedate
+     * @param bool isRecurrenceChanged for change in recurrence pattern.
+     * isRecurrenceChanged true means Recurrence pattern has been changed, so clear all attendees response
+     * @param mixed $oldProps
+     * @param mixed $basedate
+     * @param mixed $isRecurrenceChanged
+     */
+    public function checkSignificantChanges($oldProps, $basedate, $isRecurrenceChanged = false) {
+        $message = null;
+        $attach = null;
+
+        // If basedate is specified then we need to open exception message to clear recipient responses
+        if ($basedate) {
+            $recurrence = new Recurrence($this->store, $this->message);
+            if ($recurrence->isException($basedate)) {
+                $attach = $recurrence->getExceptionAttachment($basedate);
+                if ($attach) {
+                    $message = mapi_attach_openobj($attach, MAPI_MODIFY);
+                }
+            }
+        }
+        else {
+            // use normal message or recurring series message
+            $message = $this->message;
+        }
+
+        if (!$message) {
+            return;
+        }
+
+        $newProps = mapi_getprops($message, [$this->proptags['startdate'], $this->proptags['duedate'], $this->proptags['updatecounter']]);
+
+        // Check whether message is updated or not.
+        if (isset($newProps[$this->proptags['updatecounter']]) && $newProps[$this->proptags['updatecounter']] == 0) {
+            return;
+        }
+
+        if (($newProps[$this->proptags['startdate']] != $oldProps[$this->proptags['startdate']]) ||
+            ($newProps[$this->proptags['duedate']] != $oldProps[$this->proptags['duedate']]) ||
+            $isRecurrenceChanged) {
+            $this->clearRecipientResponse($message);
+
+            mapi_setprops($message, [$this->proptags['owner_critical_change'] => time()]);
+
+            mapi_savechanges($message);
+            if ($attach) { // Also save attachment Object.
+                mapi_savechanges($attach);
+            }
+        }
+    }
+
+    /**
+     * Clear responses of all attendees who have replied in past.
+     *
+     * @param MAPI_MESSAGE $message on which responses should be cleared
+     */
+    public function clearRecipientResponse($message) {
+        $recipTable = mapi_message_getrecipienttable($message);
+        $recipsRows = mapi_table_queryallrows($recipTable, $this->recipprops);
+
+        foreach ($recipsRows as $recipient) {
+            if (($recipient[PR_RECIPIENT_FLAGS] & recipOrganizer) != recipOrganizer) {
+                // Recipient is attendee, set the trackstatus to 'Not Responded'
+                $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
+            }
+            else {
+                // Recipient is organizer, this is not possible, but for safety
+                // it is best to clear the trackstatus for him as well by setting
+                // the trackstatus to 'Organized'.
+                $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
+            }
+            mapi_message_modifyrecipients($message, MODRECIP_MODIFY, [$recipient]);
+        }
+    }
+
+    /**
+     * Function returns correspondent calendar item attached with the meeting request/response/cancellation.
+     * This will only check for actual MAPIMessages in calendar folder, so if a meeting request is
+     * for exception then this function will return recurring series for that meeting request
+     * after that you need to use getExceptionItem function to get exception item that will be
+     * fetched from the attachment table of recurring series MAPIMessage.
+     *
+     * @param bool $open boolean to indicate the function should return entryid or MAPIMessage. Defaults to true.
+     *
+     * @return entryid or MAPIMessage resource of calendar item
+     */
+    public function getCorrespondentCalendarItem($open = true) {
+        $props = mapi_getprops($this->message, [PR_MESSAGE_CLASS, $this->proptags['goid'], $this->proptags['goid2'], PR_RCVD_REPRESENTING_ENTRYID]);
+
+        if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
+            // can work only with meeting requests/responses/cancellations
+            return false;
+        }
+
+        $globalId = $props[$this->proptags['goid']];
+        $cleanGlobalId = $props[$this->proptags['goid2']];
+
+        // If Delegate is processing Meeting Request/Response for Delegator then retrieve Delegator's store and calendar.
+        if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
+            $delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+            $store = $delegatorStore['store'];
+            $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+        }
+        else {
+            $store = $this->store;
+            $calFolder = $this->openDefaultCalendar();
+        }
+
+        $basedate = $this->getBasedateFromGlobalID($globalId);
+
+        /**
+         * First search for any appointments which correspond to the $globalId,
+         * this can be the entire series (if the Meeting Request refers to the
+         * entire series), or an particular Occurrence (if the meeting Request
+         * contains a basedate).
+         *
+         * If we cannot find a corresponding item, and the $globalId contains
+         * a $basedate, it might imply that a new exception will have to be
+         * created for a series which is present in the calendar, we can look
+         * that one up by searching for the $cleanGlobalId.
+         */
+        $entryids = $this->findCalendarItems($globalId, $calFolder);
+        if ($basedate && empty($entryids)) {
+            $entryids = $this->findCalendarItems($cleanGlobalId, $calFolder, true);
+        }
+
+        // there should be only one item returned
+        if (!empty($entryids) && count($entryids) === 1) {
+            // return only entryid
+            if ($open === false) {
+                return $entryids[0];
+            }
+
+            // open calendar item and return it
+            return mapi_msgstore_openentry($store, $entryids[0]);
+        }
+
+        // no items found in calendar
+        return false;
+    }
+
+    /**
+     * Function returns exception item based on the basedate passed.
+     *
+     * @param MAPIMessage $recurringMessage Resource of Recurring meeting from calendar
+     * @param Unixtime    $basedate         basedate of exception that needs to be returned
+     * @param MAPIStore   $store            store that contains the recurring calendar item
+     *
+     * @return entryid or MAPIMessage resource of exception item
+     */
+    public function getExceptionItem($recurringMessage, $basedate, $store = false) {
+        $occurItem = false;
+
+        $props = mapi_getprops($this->message, [PR_RCVD_REPRESENTING_ENTRYID, $this->proptags['recurring']]);
+
+        // check if the passed item is recurring series
+        if ($props[$this->proptags['recurring']] !== false) {
+            return false;
+        }
+
+        if ($store === false) {
+            // If Delegate is processing Meeting Request/Response for Delegator then retrieve Delegator's store and calendar.
+            if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
+                $delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID]);
+                $store = $delegatorStore['store'];
+            }
+            else {
+                $store = $this->store;
+            }
+        }
+
+        $recurr = new Recurrence($store, $recurringMessage);
+        $attach = $recurr->getExceptionAttachment($basedate);
+        if ($attach) {
+            $occurItem = mapi_attach_openobj($attach);
+        }
+
+        return $occurItem;
+    }
+
+    /**
+     * Function which checks whether received meeting request is either conflicting with other appointments or not.
+     *
+     * @param MAPIMessage $message   meeting request item that should be checked for conflicts in calendar
+     * @param MAPIStore   $userStore store containing calendar folder that will be used for confilict checking
+     * @param MAPIFolder  $calFolder calendar folder for conflict checking
+     *
+     * @return mixed(boolean/integer) true if normal meeting is conflicting or an integer which specifies no of instances
+     * conflict of recurring meeting and false if meeting is not conflicting
+     * @return mixed if boolean then true/false for indicating conflict, if number then items that are conflicting with the message
+     */
+    public function isMeetingConflicting($message = false, $userStore = false, $calFolder = false) {
+        $returnValue = false;
+        $noOfInstances = 0;
+
+        if ($message === false) {
+            $message = $this->message;
+        }
+
+        $messageProps = mapi_getprops(
+            $message,
+            [
+                PR_MESSAGE_CLASS,
+                $this->proptags['goid'],
+                $this->proptags['goid2'],
+                $this->proptags['startdate'],
+                $this->proptags['duedate'],
+                $this->proptags['recurring'],
+                $this->proptags['clipstart'],
+                $this->proptags['clipend'],
+                PR_RCVD_REPRESENTING_ENTRYID,
+                $this->proptags['basedate'],
+                PR_RCVD_REPRESENTING_NAME,
+            ]
+        );
+
+        if ($userStore === false) {
+            $userStore = $this->store;
+
+            // check if delegate is processing the response
+            if (isset($messageProps[PR_RCVD_REPRESENTING_ENTRYID])) {
+                $delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
+
+                $userStore = $delegatorStore['store'];
+                $calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
+            }
+        }
+
+        if ($calFolder === false) {
+            $calFolder = $this->openDefaultCalendar($userStore);
+        }
+
+        if ($calFolder) {
+            // Meeting request is recurring, so get all occurrence and check for each occurrence whether it conflicts with other appointments in Calendar.
+            if (isset($messageProps[$this->proptags['recurring']]) && $messageProps[$this->proptags['recurring']] === true) {
+                // Apply recurrence class and retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
+                $recurr = new Recurrence($userStore, $message);
+                $items = $recurr->getItems($messageProps[$this->proptags['clipstart']], $messageProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
+
+                foreach ($items as $item) {
+                    // Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
+                    $calendarItems = $recurr->getCalendarItems($userStore, $calFolder, $item[$this->proptags['startdate']], $item[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus']]);
+
+                    foreach ($calendarItems as $calendarItem) {
+                        if ($calendarItem[$this->proptags['busystatus']] !== fbFree) {
+                            /*
 							 * Only meeting requests have globalID, normal appointments do not have globalID
 							 * so if any normal appointment if found then it is assumed to be conflict.
 							 */
-							if (isset($calendarItem[$this->proptags['goid']])) {
-								if ($calendarItem[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']]) {
-									++$noOfInstances;
-
-									break;
-								}
-							}
-							else {
-								++$noOfInstances;
-
-								break;
-							}
-						}
-					}
-				}
-
-				if ($noOfInstances > 0) {
-					$returnValue = $noOfInstances;
-				}
-			}
-			else {
-				// Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
-				$items = getCalendarItems($userStore, $calFolder, $messageProps[$this->proptags['startdate']], $messageProps[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus']]);
-
-				if (isset($messageProps[$this->proptags['basedate']]) && !empty($messageProps[$this->proptags['basedate']])) {
-					$basedate = $messageProps[$this->proptags['basedate']];
-					// Get the goid2 from recurring MR which further used to
-					// check the resource conflicts item.
-					$recurrItemProps = mapi_getprops($this->message, [$this->proptags['goid2']]);
-					$messageProps[$this->proptags['goid']] = $this->setBasedateInGlobalID($recurrItemProps[$this->proptags['goid2']], $basedate);
-					$messageProps[$this->proptags['goid2']] = $recurrItemProps[$this->proptags['goid2']];
-				}
-
-				foreach ($items as $item) {
-					if ($item[$this->proptags['busystatus']] !== fbFree) {
-						if (isset($item[$this->proptags['goid']])) {
-							if (($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']]) &&
-								($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid2']])) {
-								$returnValue = true;
-
-								break;
-							}
-						}
-						else {
-							$returnValue = true;
-
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return $returnValue;
-	}
-
-	/**
-	 *  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 addDelegator($messageProps, &$recipients) {
-		$hasDelegator = false;
-		// Check if meeting already has an organizer.
-		foreach ($recipients as $key => $recipient) {
-			if (isset($messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) && $recipient[PR_EMAIL_ADDRESS] == $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) {
-				$hasDelegator = true;
-			}
-		}
-
-		if (!$hasDelegator) {
-			// Create delegator.
-			$delegator = [];
-			$delegator[PR_ENTRYID] = $messageProps[PR_RCVD_REPRESENTING_ENTRYID];
-			$delegator[PR_DISPLAY_NAME] = $messageProps[PR_RCVD_REPRESENTING_NAME];
-			$delegator[PR_EMAIL_ADDRESS] = $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS];
-			$delegator[PR_RECIPIENT_TYPE] = MAPI_TO;
-			$delegator[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_RCVD_REPRESENTING_NAME];
-			$delegator[PR_ADDRTYPE] = empty($messageProps[PR_RCVD_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_RCVD_REPRESENTING_ADDRTYPE];
-			$delegator[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-			$delegator[PR_RECIPIENT_FLAGS] = recipSendable;
-			$delegator[PR_SEARCH_KEY] = $messageProps[PR_RCVD_REPRESENTING_SEARCH_KEY];
-
-			// Add organizer to recipients list.
-			array_unshift($recipients, $delegator);
-		}
-	}
-
-	/**
-	 * Function will return delegator's store and calendar folder for processing meetings.
-	 *
-	 * @param string $receivedRepresentingEnryid  entryid of the delegator user
-	 * @param array  $foldersToOpen               contains list of folder types that should be returned in result
-	 * @param mixed  $receivedRepresentingEntryId
-	 *
-	 * @return array contains store of the delegator and resource of folders if $foldersToOpen is not empty
-	 */
-	public function getDelegatorStore($receivedRepresentingEntryId, $foldersToOpen = []) {
-		$returnData = [];
-
-		$delegatorStore = $this->openCustomUserStore($receivedRepresentingEntryId);
-		$returnData['store'] = $delegatorStore;
-
-		if (!empty($foldersToOpen)) {
-			for ($index = 0, $len = count($foldersToOpen); $index < $len; ++$index) {
-				$folderType = $foldersToOpen[$index];
-
-				// first try with default folders
-				$folder = $this->openDefaultFolder($folderType, $delegatorStore);
-
-				// if folder not found then try with base folders
-				if ($folder === false) {
-					$folder = $this->openBaseFolder($folderType, $delegatorStore);
-				}
-
-				if ($folder === false) {
-					// we are still not able to get the folder so give up
-					continue;
-				}
-
-				$returnData[$folderType] = $folder;
-			}
-		}
-
-		return $returnData;
-	}
-
-	/**
-	 * Function returns extra info about meeting timing along with message body
-	 * which will be included in body while sending meeting request/response.
-	 *
-	 * @return string $meetingTimeInfo info about meeting timing along with message body
-	 */
-	public function getMeetingTimeInfo() {
-		return $this->meetingTimeInfo;
-	}
-
-	/**
-	 * Function sets extra info about meeting timing along with message body
-	 * which will be included in body while sending meeting request/response.
-	 *
-	 * @param string $meetingTimeInfo info about meeting timing along with message body
-	 */
-	public function setMeetingTimeInfo($meetingTimeInfo) {
-		$this->meetingTimeInfo = $meetingTimeInfo;
-	}
-
-	/**
-	 * Helper function which is use to get local categories of all occurrence.
-	 *
-	 * @param MAPIMessage $calendarItem meeting request item
-	 * @param MAPIStore   $store        store containing calendar folder
-	 * @param MAPIFolder  $calFolder    calendar folder
-	 *
-	 * @return array $localCategories which contain array of basedate along with categories
-	 */
-	public function getLocalCategories($calendarItem, $store, $calFolder) {
-		$calendarItemProps = mapi_getprops($calendarItem);
-		$recurrence = new Recurrence($store, $calendarItem);
-
-		// Retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
-		$items = $recurrence->getItems($calendarItemProps[$this->proptags['clipstart']], $calendarItemProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
-		$localCategories = [];
-
-		foreach ($items as $item) {
-			$recurrenceItems = $recurrence->getCalendarItems($store, $calFolder, $item[$this->proptags['startdate']], $item[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus'], $this->proptags['categories']]);
-			foreach ($recurrenceItems as $recurrenceItem) {
-				// Check if occurrence is exception then get the local categories of that occurrence.
-				if (isset($recurrenceItem[$this->proptags['goid']]) && $recurrenceItem[$this->proptags['goid']] == $calendarItemProps[$this->proptags['goid']]) {
-					$exceptionAttach = $recurrence->getExceptionAttachment($recurrenceItem['basedate']);
-
-					if ($exceptionAttach) {
-						$exception = mapi_attach_openobj($exceptionAttach, 0);
-						$exceptionProps = mapi_getprops($exception, [$this->proptags['categories']]);
-						if (isset($exceptionProps[$this->proptags['categories']])) {
-							$localCategories[$recurrenceItem['basedate']] = $exceptionProps[$this->proptags['categories']];
-						}
-					}
-				}
-			}
-		}
-
-		return $localCategories;
-	}
-
-	/**
-	 * Helper function which is use to apply local categories on respective occurrences.
-	 *
-	 * @param MAPIMessage $calendarItem    meeting request item
-	 * @param MAPIStore   $store           store containing calendar folder
-	 * @param array       $localCategories array contains basedate and array of categories
-	 */
-	public function applyLocalCategories($calendarItem, $store, $localCategories) {
-		$calendarItemProps = mapi_getprops($calendarItem, [PR_PARENT_ENTRYID, PR_ENTRYID]);
-		$message = mapi_msgstore_openentry($store, $calendarItemProps[PR_ENTRYID]);
-		$recurrence = new Recurrence($store, $message);
-
-		// Check for all occurrence if it is exception then modify the exception by setting up categories,
-		// Otherwise create new exception with categories.
-		foreach ($localCategories as $key => $value) {
-			if ($recurrence->isException($key)) {
-				$recurrence->modifyException([$this->proptags['categories'] => $value], $key);
-			}
-			else {
-				$recurrence->createException([$this->proptags['categories'] => $value], $key, false);
-			}
-			mapi_savechanges($message);
-		}
-	}
+                            if (isset($calendarItem[$this->proptags['goid']])) {
+                                if ($calendarItem[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']]) {
+                                    ++$noOfInstances;
+
+                                    break;
+                                }
+                            }
+                            else {
+                                ++$noOfInstances;
+
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if ($noOfInstances > 0) {
+                    $returnValue = $noOfInstances;
+                }
+            }
+            else {
+                // Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
+                $items = getCalendarItems($userStore, $calFolder, $messageProps[$this->proptags['startdate']], $messageProps[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus']]);
+
+                if (isset($messageProps[$this->proptags['basedate']]) && !empty($messageProps[$this->proptags['basedate']])) {
+                    $basedate = $messageProps[$this->proptags['basedate']];
+                    // Get the goid2 from recurring MR which further used to
+                    // check the resource conflicts item.
+                    $recurrItemProps = mapi_getprops($this->message, [$this->proptags['goid2']]);
+                    $messageProps[$this->proptags['goid']] = $this->setBasedateInGlobalID($recurrItemProps[$this->proptags['goid2']], $basedate);
+                    $messageProps[$this->proptags['goid2']] = $recurrItemProps[$this->proptags['goid2']];
+                }
+
+                foreach ($items as $item) {
+                    if ($item[$this->proptags['busystatus']] !== fbFree) {
+                        if (isset($item[$this->proptags['goid']])) {
+                            if (($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid']]) &&
+                                ($item[$this->proptags['goid']] !== $messageProps[$this->proptags['goid2']])) {
+                                $returnValue = true;
+
+                                break;
+                            }
+                        }
+                        else {
+                            $returnValue = true;
+
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     *  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 addDelegator($messageProps, &$recipients) {
+        $hasDelegator = false;
+        // Check if meeting already has an organizer.
+        foreach ($recipients as $key => $recipient) {
+            if (isset($messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) && $recipient[PR_EMAIL_ADDRESS] == $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS]) {
+                $hasDelegator = true;
+            }
+        }
+
+        if (!$hasDelegator) {
+            // Create delegator.
+            $delegator = [];
+            $delegator[PR_ENTRYID] = $messageProps[PR_RCVD_REPRESENTING_ENTRYID];
+            $delegator[PR_DISPLAY_NAME] = $messageProps[PR_RCVD_REPRESENTING_NAME];
+            $delegator[PR_EMAIL_ADDRESS] = $messageProps[PR_RCVD_REPRESENTING_EMAIL_ADDRESS];
+            $delegator[PR_RECIPIENT_TYPE] = MAPI_TO;
+            $delegator[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_RCVD_REPRESENTING_NAME];
+            $delegator[PR_ADDRTYPE] = empty($messageProps[PR_RCVD_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_RCVD_REPRESENTING_ADDRTYPE];
+            $delegator[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
+            $delegator[PR_RECIPIENT_FLAGS] = recipSendable;
+            $delegator[PR_SEARCH_KEY] = $messageProps[PR_RCVD_REPRESENTING_SEARCH_KEY];
+
+            // Add organizer to recipients list.
+            array_unshift($recipients, $delegator);
+        }
+    }
+
+    /**
+     * Function will return delegator's store and calendar folder for processing meetings.
+     *
+     * @param string $receivedRepresentingEnryid  entryid of the delegator user
+     * @param array  $foldersToOpen               contains list of folder types that should be returned in result
+     * @param mixed  $receivedRepresentingEntryId
+     *
+     * @return array contains store of the delegator and resource of folders if $foldersToOpen is not empty
+     */
+    public function getDelegatorStore($receivedRepresentingEntryId, $foldersToOpen = []) {
+        $returnData = [];
+
+        $delegatorStore = $this->openCustomUserStore($receivedRepresentingEntryId);
+        $returnData['store'] = $delegatorStore;
+
+        if (!empty($foldersToOpen)) {
+            for ($index = 0, $len = count($foldersToOpen); $index < $len; ++$index) {
+                $folderType = $foldersToOpen[$index];
+
+                // first try with default folders
+                $folder = $this->openDefaultFolder($folderType, $delegatorStore);
+
+                // if folder not found then try with base folders
+                if ($folder === false) {
+                    $folder = $this->openBaseFolder($folderType, $delegatorStore);
+                }
+
+                if ($folder === false) {
+                    // we are still not able to get the folder so give up
+                    continue;
+                }
+
+                $returnData[$folderType] = $folder;
+            }
+        }
+
+        return $returnData;
+    }
+
+    /**
+     * Function returns extra info about meeting timing along with message body
+     * which will be included in body while sending meeting request/response.
+     *
+     * @return string $meetingTimeInfo info about meeting timing along with message body
+     */
+    public function getMeetingTimeInfo() {
+        return $this->meetingTimeInfo;
+    }
+
+    /**
+     * Function sets extra info about meeting timing along with message body
+     * which will be included in body while sending meeting request/response.
+     *
+     * @param string $meetingTimeInfo info about meeting timing along with message body
+     */
+    public function setMeetingTimeInfo($meetingTimeInfo) {
+        $this->meetingTimeInfo = $meetingTimeInfo;
+    }
+
+    /**
+     * Helper function which is use to get local categories of all occurrence.
+     *
+     * @param MAPIMessage $calendarItem meeting request item
+     * @param MAPIStore   $store        store containing calendar folder
+     * @param MAPIFolder  $calFolder    calendar folder
+     *
+     * @return array $localCategories which contain array of basedate along with categories
+     */
+    public function getLocalCategories($calendarItem, $store, $calFolder) {
+        $calendarItemProps = mapi_getprops($calendarItem);
+        $recurrence = new Recurrence($store, $calendarItem);
+
+        // Retrieve all occurrences(max: 30 occurrence because recurrence can also be set as 'no end date')
+        $items = $recurrence->getItems($calendarItemProps[$this->proptags['clipstart']], $calendarItemProps[$this->proptags['clipend']] * (24 * 24 * 60), 30);
+        $localCategories = [];
+
+        foreach ($items as $item) {
+            $recurrenceItems = $recurrence->getCalendarItems($store, $calFolder, $item[$this->proptags['startdate']], $item[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus'], $this->proptags['categories']]);
+            foreach ($recurrenceItems as $recurrenceItem) {
+                // Check if occurrence is exception then get the local categories of that occurrence.
+                if (isset($recurrenceItem[$this->proptags['goid']]) && $recurrenceItem[$this->proptags['goid']] == $calendarItemProps[$this->proptags['goid']]) {
+                    $exceptionAttach = $recurrence->getExceptionAttachment($recurrenceItem['basedate']);
+
+                    if ($exceptionAttach) {
+                        $exception = mapi_attach_openobj($exceptionAttach, 0);
+                        $exceptionProps = mapi_getprops($exception, [$this->proptags['categories']]);
+                        if (isset($exceptionProps[$this->proptags['categories']])) {
+                            $localCategories[$recurrenceItem['basedate']] = $exceptionProps[$this->proptags['categories']];
+                        }
+                    }
+                }
+            }
+        }
+
+        return $localCategories;
+    }
+
+    /**
+     * Helper function which is use to apply local categories on respective occurrences.
+     *
+     * @param MAPIMessage $calendarItem    meeting request item
+     * @param MAPIStore   $store           store containing calendar folder
+     * @param array       $localCategories array contains basedate and array of categories
+     */
+    public function applyLocalCategories($calendarItem, $store, $localCategories) {
+        $calendarItemProps = mapi_getprops($calendarItem, [PR_PARENT_ENTRYID, PR_ENTRYID]);
+        $message = mapi_msgstore_openentry($store, $calendarItemProps[PR_ENTRYID]);
+        $recurrence = new Recurrence($store, $message);
+
+        // Check for all occurrence if it is exception then modify the exception by setting up categories,
+        // Otherwise create new exception with categories.
+        foreach ($localCategories as $key => $value) {
+            if ($recurrence->isException($key)) {
+                $recurrence->modifyException([$this->proptags['categories'] => $value], $key);
+            }
+            else {
+                $recurrence->createException([$this->proptags['categories'] => $value], $key, false);
+            }
+            mapi_savechanges($message);
+        }
+    }
 }

Spacing +29 added lines, -29 removed lines

@@ -152,15 +152,15 @@ 
 		$properties['reminderminutes'] = 'PT_LONG:PSETID_Common:0x8501';
 		$properties['reminderset'] = 'PT_BOOLEAN:PSETID_Common:0x8503';
 		$properties['sendasical'] = 'PT_BOOLEAN:PSETID_Appointment:0x8200';
-		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201';                    // AppointmentSequenceNumber
-		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203';            // AppointmentLastSequence
+		$properties['updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8201'; // AppointmentSequenceNumber
+		$properties['last_updatecounter'] = 'PT_LONG:PSETID_Appointment:0x8203'; // AppointmentLastSequence
 		$properties['unknown7'] = 'PT_LONG:PSETID_Appointment:0x8202';
 		$properties['busystatus'] = 'PT_LONG:PSETID_Appointment:0x8205';
 		$properties['intendedbusystatus'] = 'PT_LONG:PSETID_Appointment:0x8224';
 		$properties['start'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
 		$properties['responselocation'] = 'PT_STRING8:PSETID_Meeting:0x2';
 		$properties['location'] = 'PT_STRING8:PSETID_Appointment:0x8208';
-		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229';        // PidLidFInvited, MeetingRequestWasSent
+		$properties['requestsent'] = 'PT_BOOLEAN:PSETID_Appointment:0x8229'; // PidLidFInvited, MeetingRequestWasSent
 		$properties['startdate'] = 'PT_SYSTIME:PSETID_Appointment:0x820d';
 		$properties['duedate'] = 'PT_SYSTIME:PSETID_Appointment:0x820e';
 		$properties['flagdueby'] = 'PT_SYSTIME:PSETID_Common:0x8560';
@@ -169,11 +169,11 @@ 
 		$properties['recurring'] = 'PT_BOOLEAN:PSETID_Appointment:0x8223';
 		$properties['clipstart'] = 'PT_SYSTIME:PSETID_Appointment:0x8235';
 		$properties['clipend'] = 'PT_SYSTIME:PSETID_Appointment:0x8236';
-		$properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD';                // StartRecurTime
-		$properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE';                // StartRecurTime
-		$properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF';                // EndRecurDate
-		$properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10';                // EndRecurTime
-		$properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA';                // LID_IS_EXCEPTION
+		$properties['start_recur_date'] = 'PT_LONG:PSETID_Meeting:0xD'; // StartRecurTime
+		$properties['start_recur_time'] = 'PT_LONG:PSETID_Meeting:0xE'; // StartRecurTime
+		$properties['end_recur_date'] = 'PT_LONG:PSETID_Meeting:0xF'; // EndRecurDate
+		$properties['end_recur_time'] = 'PT_LONG:PSETID_Meeting:0x10'; // EndRecurTime
+		$properties['is_exception'] = 'PT_BOOLEAN:PSETID_Meeting:0xA'; // LID_IS_EXCEPTION
 		$properties['apptreplyname'] = 'PT_STRING8:PSETID_Appointment:0x8230';
 		// Propose new time properties
 		$properties['proposed_start_whole'] = 'PT_SYSTIME:PSETID_Appointment:0x8250';
@@ -545,7 +545,7 @@ 
 		$listProperties['rcvd_representing_search_key'] = PR_RCVD_REPRESENTING_SEARCH_KEY;
 		$messageProps = mapi_getprops($this->message, $listProperties);
 
-		$goid = $messageProps[$this->proptags['goid']];    // GlobalID (0x3)
+		$goid = $messageProps[$this->proptags['goid']]; // GlobalID (0x3)
 		if (!isset($goid)) {
 			return;
 		}
@@ -1436,7 +1436,7 @@ 
 		$props[$this->proptags['goid2']] = $goid;
 
 		if (!isset($props[$this->proptags['updatecounter']])) {
-			$props[$this->proptags['updatecounter']] = 0;            // OL also starts sequence no with zero.
+			$props[$this->proptags['updatecounter']] = 0; // OL also starts sequence no with zero.
 			$props[$this->proptags['last_updatecounter']] = 0;
 		}
 
@@ -2074,9 +2074,9 @@ 
 			$subjectprefix = _('New Time Proposed');
 		}
 
-		$props[PR_SUBJECT] = $subjectprefix . ': ' . $messageprops[PR_SUBJECT];
+		$props[PR_SUBJECT] = $subjectprefix.': '.$messageprops[PR_SUBJECT];
 
-		$props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.' . $classpostfix;
+		$props[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Resp.'.$classpostfix;
 		if (isset($messageprops[PR_OWNER_APPT_ID])) {
 			$props[PR_OWNER_APPT_ID] = $messageprops[PR_OWNER_APPT_ID];
 		}
@@ -2285,12 +2285,12 @@ 
 		$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)) {
+			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;
+				$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
 			}
 		}
 
@@ -2304,7 +2304,7 @@ 
 			$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_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
 			$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
 
 			// Add organizer to recipients list.
@@ -2362,7 +2362,7 @@ 
 		$month = $basedate ? sprintf('%02s', dechex(gmdate('m', $basedate))) : '00';
 		$day = $basedate ? sprintf('%02s', dechex(gmdate('d', $basedate))) : '00';
 
-		return hex2bin(strtoupper(substr($hexguid, 0, 32) . $year . $month . $day . substr($hexguid, 40)));
+		return hex2bin(strtoupper(substr($hexguid, 0, 32).$year.$month.$day.substr($hexguid, 40)));
 	}
 
 	/**
@@ -2400,7 +2400,7 @@ 
 					continue;
 				}
 
-				$attachOld = mapi_message_openattach($copyFrom, (int) $attachProps[PR_ATTACH_NUM]);
+				$attachOld = mapi_message_openattach($copyFrom, (int)$attachProps[PR_ATTACH_NUM]);
 				$attachNewResourceMsg = mapi_message_createattach($copyTo);
 				mapi_copyto($attachOld, [], [], $attachNewResourceMsg, 0);
 				mapi_savechanges($attachNewResourceMsg);
@@ -2491,7 +2491,7 @@ 
 				[
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+						RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -2623,7 +2623,7 @@ 
 
 				// Prefix the subject if needed
 				if ($prefix && isset($messageprops[PR_SUBJECT])) {
-					$messageprops[PR_SUBJECT] = $prefix . $messageprops[PR_SUBJECT];
+					$messageprops[PR_SUBJECT] = $prefix.$messageprops[PR_SUBJECT];
 				}
 
 				// Set status to cancelled if needed
@@ -2773,7 +2773,7 @@ 
 				[
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_EQ,    // Equals recipient type 3: Resource
+						RELOP => RELOP_EQ, // Equals recipient type 3: Resource
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -3005,7 +3005,7 @@ 
 				$restriction[1][] = [
 					RES_PROPERTY,
 					[
-						RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+						RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
 						ULPROPTAG => PR_RECIPIENT_TYPE,
 						VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 					],
@@ -3061,7 +3061,7 @@ 
 
 		// Prefix the subject if needed
 		if ($prefix && isset($newmessageprops[PR_SUBJECT])) {
-			$newmessageprops[PR_SUBJECT] = $prefix . $newmessageprops[PR_SUBJECT];
+			$newmessageprops[PR_SUBJECT] = $prefix.$newmessageprops[PR_SUBJECT];
 		}
 
 		if (isset($newmessageprops[$this->proptags['categories']]) &&
@@ -3102,7 +3102,7 @@ 
 									[
 										RES_PROPERTY,
 										[
-											RELOP => RELOP_NE,    // Does not equal recipient type: MAPI_BCC (Resource)
+											RELOP => RELOP_NE, // Does not equal recipient type: MAPI_BCC (Resource)
 											ULPROPTAG => PR_RECIPIENT_TYPE,
 											VALUE => [PR_RECIPIENT_TYPE => MAPI_BCC],
 										],
@@ -3209,9 +3209,9 @@ 
 			$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
 			$newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
 			$newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
-			$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH;    // HIGH Importance
+			$newmessageprops[PR_IMPORTANCE] = IMPORTANCE_HIGH; // HIGH Importance
 			if (isset($newmessageprops[PR_SUBJECT])) {
-				$newmessageprops[PR_SUBJECT] = _('Canceled: ') . $newmessageprops[PR_SUBJECT];
+				$newmessageprops[PR_SUBJECT] = _('Canceled: ').$newmessageprops[PR_SUBJECT];
 			}
 
 			mapi_setprops($new, $newmessageprops);
@@ -3269,12 +3269,12 @@ 
 
 			// [0] => year, [1] => month, [2] => day, [3] => hour, [4] => minutes, [5] => seconds
 			// RecurStartDate = year * 512 + month_number * 32 + day_number
-			$newmessageprops[$this->proptags['start_recur_date']] = (((int) $startDate[0]) * 512) + (((int) $startDate[1]) * 32) + ((int) $startDate[2]);
+			$newmessageprops[$this->proptags['start_recur_date']] = (((int)$startDate[0]) * 512) + (((int)$startDate[1]) * 32) + ((int)$startDate[2]);
 			// RecurStartTime = hour * 4096 + minutes * 64 + seconds
-			$newmessageprops[$this->proptags['start_recur_time']] = (((int) $startDate[3]) * 4096) + (((int) $startDate[4]) * 64) + ((int) $startDate[5]);
+			$newmessageprops[$this->proptags['start_recur_time']] = (((int)$startDate[3]) * 4096) + (((int)$startDate[4]) * 64) + ((int)$startDate[5]);
 
-			$newmessageprops[$this->proptags['end_recur_date']] = (((int) $endDate[0]) * 512) + (((int) $endDate[1]) * 32) + ((int) $endDate[2]);
-			$newmessageprops[$this->proptags['end_recur_time']] = (((int) $endDate[3]) * 4096) + (((int) $endDate[4]) * 64) + ((int) $endDate[5]);
+			$newmessageprops[$this->proptags['end_recur_date']] = (((int)$endDate[0]) * 512) + (((int)$endDate[1]) * 32) + ((int)$endDate[2]);
+			$newmessageprops[$this->proptags['end_recur_time']] = (((int)$endDate[3]) * 4096) + (((int)$endDate[4]) * 64) + ((int)$endDate[5]);
 		}
 	}
 

Braces +69 added lines, -138 removed lines

@@ -326,8 +326,7 @@ 
 
 			$userStore = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$userStore = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -396,8 +395,7 @@ 
 			// Create/modify exception
 			if ($recurr->isException($basedate)) {
 				$recurr->modifyException($exception_props, $basedate);
-			}
-			else {
+			} else {
 				// When we are creating an exception we need copy recipients from main recurring item
 				$recipTable = mapi_message_getrecipienttable($calendarItem);
 				$recips = mapi_table_queryallrows($recipTable, $this->recipprops);
@@ -415,8 +413,7 @@ 
 			if ($attach) {
 				$recurringItem = $calendarItem;
 				$calendarItem = mapi_attach_openobj($attach, MAPI_MODIFY);
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -499,8 +496,7 @@ 
 			$props = [];
 			if ($messageprops[$this->proptags['counter_proposal']]) {
 				$props[$this->proptags['counter_proposal']] = true;
-			}
-			else {
+			} else {
 				$props[$this->proptags['counter_proposal']] = false;
 			}
 
@@ -556,8 +552,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$store = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -585,13 +580,11 @@ 
 
 					if ($recurr->isException($basedate)) {
 						$recurr->modifyException($messageProps, $basedate);
-					}
-					else {
+					} else {
 						$recurr->createException($messageProps, $basedate);
 					}
 				}
-			}
-			else {
+			} else {
 				// set the properties of the cancellation object
 				mapi_setprops($calendarItem, $messageProps);
 			}
@@ -645,8 +638,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -707,8 +699,7 @@ 
 		$senderEntryId = isset($messageprops[PR_SENT_REPRESENTING_ENTRYID]) ? $messageprops[PR_SENT_REPRESENTING_ENTRYID] : $messageprops[PR_SENDER_ENTRYID];
 		if (isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && MAPIUtils::CompareEntryIds($senderEntryId, $messageprops[PR_RECEIVED_BY_ENTRYID])) {
 			$entryid = $this->accept(false, $sendresponse, $move, $proposeNewTimeProps, $body, true, $store, $calFolder, $basedate);
-		}
-		else {
+		} else {
 			$entryid = $this->accept($tentative, $sendresponse, $move, $proposeNewTimeProps, $body, $userAction, $store, $calFolder, $basedate);
 		}
 
@@ -762,8 +753,7 @@ 
 				if (!$calendarItem) {
 					// Recurring item not found, so create new meeting in Calendar
 					$calendarItem = mapi_folder_createmessage($calFolder);
-				}
-				else {
+				} else {
 					// we have found the main recurring item, check if this meeting request is already processed
 					if (isset($messageprops[PR_PROCESSED]) && $messageprops[PR_PROCESSED] == true) {
 						// only set required properties, other properties are already copied when processing this meeting request
@@ -784,8 +774,7 @@ 
 					if (isset($props[$this->proptags['reminderminutes']])) {
 						$props[$this->proptags['flagdueby']] = $props[$this->proptags['startdate']] - ($props[$this->proptags['reminderminutes']] * 60);
 					}
-				}
-				else {
+				} else {
 					// only get required properties so we will not overwrite existing updated properties from calendar
 					$props = mapi_getprops($this->message, [PR_ENTRYID]);
 				}
@@ -806,13 +795,11 @@ 
 				if (isset($props[$this->proptags['intendedbusystatus']])) {
 					if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
 						$props[$this->proptags['busystatus']] = fbTentative;
-					}
-					else {
+					} else {
 						$props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
 					}
 					// we already have intendedbusystatus value in $props so no need to copy it
-				}
-				else {
+				} else {
 					$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
 				}
 
@@ -875,8 +862,7 @@ 
 				}
 
 				$entryid = $props[PR_ENTRYID];
-			}
-			else {
+			} else {
 				/**
 				 * This meeting request is not recurring, so can be an exception or normal meeting.
 				 * If exception then find main recurring item and update exception
@@ -943,13 +929,11 @@ 
 						if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
 							if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
 								$calItemProps[$this->proptags['busystatus']] = fbTentative;
-							}
-							else {
+							} else {
 								$calItemProps[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
 							}
 							$calItemProps[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-						}
-						else {
+						} else {
 							$calItemProps[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
 						}
 
@@ -982,8 +966,7 @@ 
 
 						$messageprops = mapi_getprops($calmsg, [PR_ENTRYID]);
 						$entryid = $messageprops[PR_ENTRYID];
-					}
-					else {
+					} else {
 						// Create a new appointment with duplicate properties and recipient, but as an IPM.Appointment
 						$new = mapi_folder_createmessage($calFolder);
 						$props = mapi_getprops($this->message);
@@ -1018,13 +1001,11 @@ 
 						if (isset($props[$this->proptags['intendedbusystatus']])) {
 							if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
 								$props[$this->proptags['busystatus']] = fbTentative;
-							}
-							else {
+							} else {
 								$props[$this->proptags['busystatus']] = $props[$this->proptags['intendedbusystatus']];
 							}
 							// we already have intendedbusystatus value in $props so no need to copy it
-						}
-						else {
+						} else {
 							$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
 						}
 
@@ -1056,8 +1037,7 @@ 
 							],
 							];
 							$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-						}
-						else {
+						} else {
 							$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
 						}
 						$this->addOrganizer($props, $recipients);
@@ -1069,8 +1049,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Here only properties are set on calendaritem, because user is responding from calendar.
 			$props = [];
 			$props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
@@ -1078,13 +1057,11 @@ 
 			if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
 				if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
 					$props[$this->proptags['busystatus']] = fbTentative;
-				}
-				else {
+				} else {
 					$props[$this->proptags['busystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
 				}
 				$props[$this->proptags['intendedbusystatus']] = $messageprops[$this->proptags['intendedbusystatus']];
-			}
-			else {
+			} else {
 				$props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
 			}
 
@@ -1107,8 +1084,7 @@ 
 
 				if ($recurr->isException($basedate)) {
 					$recurr->modifyException($proposeNewTimeProps + $props, $basedate, $recips);
-				}
-				else {
+				} else {
 					$props[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
 					$props[$this->proptags['duedate']] = $recurr->getOccurrenceEnd($basedate);
 
@@ -1120,8 +1096,7 @@ 
 
 					$recurr->createException($proposeNewTimeProps + $props, $basedate, false, $recips);
 				}
-			}
-			else {
+			} else {
 				mapi_setprops($this->message, $proposeNewTimeProps + $props);
 			}
 			mapi_savechanges($this->message);
@@ -1162,8 +1137,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -1255,8 +1229,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$store = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -1288,8 +1261,7 @@ 
 						// exception found, remove it from calendar
 						$this->doRemoveExceptionFromCalendar($basedate, $calendarItem, $store);
 					}
-				}
-				else {
+				} else {
 					// remove normal / recurring series from calendar
 					$entryids = mapi_getprops($calendarItem, [PR_ENTRYID]);
 
@@ -1304,14 +1276,12 @@ 
 
 			// Move the cancellation mail to wastebasket
 			mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
-		}
-		else {
+		} else {
 			// Here only properties are set on calendaritem, because user is responding from calendar.
 			if ($basedate) {
 				// remove the occurrence
 				$this->doRemoveExceptionFromCalendar($basedate, $this->message, $store);
-			}
-			else {
+			} else {
 				// remove normal/recurring meeting item.
 				// Move the message to the waste basket
 				mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
@@ -1358,8 +1328,7 @@ 
 
 			// save changes in the message
 			mapi_savechanges($this->message);
-		}
-		else {
+		} else {
 			// cancellation of normal meeting request
 			// Send the cancellation
 			$this->updateMeetingRequest();
@@ -1499,8 +1468,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Basedate found, an exception is to be send
 			if ($basedate) {
 				$recurr = new Recurrence($this->openDefaultStore(), $this->message);
@@ -1508,8 +1476,7 @@ 
 				if ($cancel) {
 					// @TODO: remove occurrence from Resource's Calendar if resource was booked for whole series
 					$this->submitMeetingRequest($this->message, $cancel, $prefix, $basedate, $recurr, false);
-				}
-				else {
+				} else {
 					$attach = $recurr->getExceptionAttachment($basedate);
 
 					if ($attach) {
@@ -1528,8 +1495,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// This is normal meeting
 				$resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
 
@@ -1606,8 +1572,7 @@ 
 
 		if (!isset($messageprops[$this->proptags['goid']])) {
 			$this->setMeetingRequest($basedate);
-		}
-		else {
+		} else {
 			$counter = $messageprops[$this->proptags['last_updatecounter']] + 1;
 
 			// increment value of last_updatecounter, last_updatecounter will be common for recurring series
@@ -1626,8 +1591,7 @@ 
 		if (!$this->isMeetingRequest($props[PR_MESSAGE_CLASS]) && !$this->isMeetingRequestResponse($props[PR_MESSAGE_CLASS]) && !$this->isMeetingCancellation($props[PR_MESSAGE_CLASS])) {
 			// we are checking with calendar item
 			$calendarItem = $this->message;
-		}
-		else {
+		} else {
 			// we are checking with meeting request / response / cancellation mail
 			// get calendar items
 			$calendarItem = $this->getCorrespondentCalendarItem(true);
@@ -1762,8 +1726,7 @@ 
 			if (isset($inboxprops[$prop])) {
 				return $inboxprops[$prop];
 			}
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			// public store doesn't support this method
 			if ($e->getCode() == MAPI_E_NO_SUPPORT) {
 				// don't propagate this error to parent handlers, if store doesn't support it
@@ -1853,8 +1816,7 @@ 
 				if (($folderProps[PR_ACCESS] & MAPI_ACCESS_CREATE_CONTENTS) === MAPI_ACCESS_CREATE_CONTENTS) {
 					$accessToFolder = true;
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				// we don't have rights to open folder, so return false
 				if ($e->getCode() == MAPI_E_NO_ACCESS) {
 					return $accessToFolder;
@@ -1884,8 +1846,7 @@ 
 				$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID]);
 
 				$store = $delegatorStore['store'];
-			}
-			else {
+			} else {
 				$store = $this->store;
 			}
 		}
@@ -1895,8 +1856,7 @@ 
 		if (isset($provider[PR_MDB_PROVIDER]) && $provider[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
 			$entryid = mapi_getprops($this->message, [PR_PARENT_ENTRYID]);
 			$entryid = $entryid[PR_PARENT_ENTRYID];
-		}
-		else {
+		} else {
 			$entryid = $this->getDefaultFolderEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
 			if ($entryid === false) {
 				$entryid = $this->getBaseEntryID(PR_IPM_APPOINTMENT_ENTRYID, $store);
@@ -1922,8 +1882,7 @@ 
 
 		try {
 			$mailuser = mapi_ab_openentry($ab, $ownerentryid);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			return;
 		}
 
@@ -1991,8 +1950,7 @@ 
 				$props[$this->proptags['meetingstatus']] = $imsgprops[$this->proptags['meetingstatus']];
 				$props[$this->proptags['responsestatus']] = $imsgprops[$this->proptags['responsestatus']];
 				$props[PR_SUBJECT] = $imsgprops[PR_SUBJECT];
-			}
-			else {
+			} else {
 				// Exceptions is deleted.
 				// Update $messageprops with timings of occurrence
 				$messageprops[$this->proptags['startdate']] = $recurr->getOccurrenceStart($basedate);
@@ -2004,8 +1962,7 @@ 
 
 			$props[$this->proptags['recurring']] = false;
 			$props[$this->proptags['is_exception']] = true;
-		}
-		else {
+		} else {
 			// we are creating a response from meeting request mail (it could be recurring or non-recurring)
 			// Send all recurrence info in response, if this is a recurrence meeting.
 			$isRecurring = isset($messageprops[$this->proptags['recurring']]) && $messageprops[$this->proptags['recurring']];
@@ -2287,8 +2244,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;
 			}
@@ -2429,8 +2385,7 @@ 
 			],
 			];
 			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
 		}
 
@@ -2526,8 +2481,7 @@ 
 				if ($accessToFolder) {
 					$calFolder = mapi_msgstore_openentry($userStore, $userRootProps[PR_IPM_APPOINTMENT_ENTRYID]);
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				$e->setHandled();
 				$this->errorSetResource = 1; // No access
 			}
@@ -2554,8 +2508,7 @@ 
 						 */
 						// $errorSetResource = 2;
 						$this->nonAcceptingResources[] = $resourceRecipients[$i];
-					}
-					else {
+					} else {
 						if ($declineRecurringMeetingRequests && !$cancel) {
 							// Check if appointment is recurring
 							if ($messageprops[$this->proptags['recurring']]) {
@@ -2616,8 +2569,7 @@ 
 					if (!$newResourceMsg) {
 						$newResourceMsg = mapi_folder_createmessage($calFolder);
 					}
-				}
-				else {
+				} else {
 					$newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
 				}
 
@@ -2631,8 +2583,7 @@ 
 				if ($cancel) {
 					$messageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // The meeting has been canceled
 					$messageprops[$this->proptags['busystatus']] = fbFree; // Free
-				}
-				else {
+				} else {
 					$messageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
 				}
 				$messageprops[$this->proptags['responsestatus']] = olResponseAccepted; // The resource automatically accepts the appointment
@@ -2676,8 +2627,7 @@ 
 						$messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
 						$messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
 					}
-				}
-				else {
+				} else {
 					// get organizer information
 					$addrinfo = $this->getOwnerAddress($this->store);
 
@@ -2713,12 +2663,10 @@ 
 					// Update occurrence
 					if ($recurr->isException($basedate)) {
 						$recurr->modifyException($messageprops, $basedate, $recips);
-					}
-					else {
+					} else {
 						$recurr->createException($messageprops, $basedate, false, $recips);
 					}
-				}
-				else {
+				} else {
 					mapi_setprops($newResourceMsg, $messageprops);
 
 					// Copy attachments
@@ -2742,8 +2690,7 @@ 
 					'msg' => $newResourceMsg,
 				];
 				$this->includesResources = true;
-			}
-			else {
+			} else {
 				/*
 				 * If no other errors occurred and you have no access to the
 				 * folder of the resource, throw an error=1.
@@ -2838,8 +2785,7 @@ 
 			],
 			];
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 		}
 
@@ -2857,13 +2803,11 @@ 
 		if (isset($exception_props[$this->proptags['intendedbusystatus']])) {
 			if ($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
 				$exception_props[$this->proptags['busystatus']] = fbTentative;
-			}
-			else {
+			} else {
 				$exception_props[$this->proptags['busystatus']] = $exception_props[$this->proptags['intendedbusystatus']];
 			}
 			// we already have intendedbusystatus value in $exception_props so no need to copy it
-		}
-		else {
+		} else {
 			$exception_props[$this->proptags['busystatus']] = $tentative ? fbTentative : fbBusy;
 		}
 
@@ -2879,8 +2823,7 @@ 
 
 		if ($recurr->isException($basedate)) {
 			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
+		} else {
 			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
 		}
 
@@ -2917,8 +2860,7 @@ 
 
 		if ($recurr->isException($basedate)) {
 			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
+		} else {
 			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
 		}
 
@@ -3017,8 +2959,7 @@ 
 
 			if (!$deletedRecips) {
 				$deletedRecips = array_merge([], $recipients);
-			}
-			else {
+			} else {
 				$deletedRecips = array_merge($deletedRecips, $recipients);
 			}
 		}
@@ -3157,8 +3098,7 @@ 
 				$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Canceled';
 				$newmessageprops[$this->proptags['meetingstatus']] = olMeetingCanceled; // It's a cancel request
 				$newmessageprops[$this->proptags['busystatus']] = fbFree; // set the busy status as free
-			}
-			else {
+			} else {
 				$newmessageprops[PR_MESSAGE_CLASS] = 'IPM.Schedule.Meeting.Request';
 				$newmessageprops[$this->proptags['meetingstatus']] = olMeetingReceived; // The recipient is receiving the request
 			}
@@ -3327,8 +3267,7 @@ 
 					$sentprops[PR_SENDER_SEARCH_KEY] = $ownersearchkey;
 				}
 			}
-		}
-		else {
+		} else {
 			// normal user is sending mail, so both set of properties will be same
 			$userDetails = $this->getOwnerAddress($userStore);
 
@@ -3494,8 +3433,7 @@ 
 					$message = mapi_attach_openobj($attach, MAPI_MODIFY);
 				}
 			}
-		}
-		else {
+		} else {
 			// use normal message or recurring series message
 			$message = $this->message;
 		}
@@ -3538,8 +3476,7 @@ 
 			if (($recipient[PR_RECIPIENT_FLAGS] & recipOrganizer) != recipOrganizer) {
 				// Recipient is attendee, set the trackstatus to 'Not Responded'
 				$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-			}
-			else {
+			} else {
 				// Recipient is organizer, this is not possible, but for safety
 				// it is best to clear the trackstatus for him as well by setting
 				// the trackstatus to 'Organized'.
@@ -3577,8 +3514,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$store = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -3640,8 +3576,7 @@ 
 			if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
 				$delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID]);
 				$store = $delegatorStore['store'];
-			}
-			else {
+			} else {
 				$store = $this->store;
 			}
 		}
@@ -3730,8 +3665,7 @@ 
 
 									break;
 								}
-							}
-							else {
+							} else {
 								++$noOfInstances;
 
 								break;
@@ -3743,8 +3677,7 @@ 
 				if ($noOfInstances > 0) {
 					$returnValue = $noOfInstances;
 				}
-			}
-			else {
+			} else {
 				// Get all items in the timeframe that we want to book, and get the goid and busystatus for each item
 				$items = getCalendarItems($userStore, $calFolder, $messageProps[$this->proptags['startdate']], $messageProps[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus']]);
 
@@ -3766,8 +3699,7 @@ 
 
 								break;
 							}
-						}
-						else {
+						} else {
 							$returnValue = true;
 
 							break;
@@ -3929,8 +3861,7 @@ 
 		foreach ($localCategories as $key => $value) {
 			if ($recurrence->isException($key)) {
 				$recurrence->modifyException([$this->proptags['categories'] => $value], $key);
-			}
-			else {
+			} else {
 				$recurrence->createException([$this->proptags['categories'] => $value], $key, false);
 			}
 			mapi_savechanges($message);

mapi/class.taskrecurrence.php

Indentation +405 added lines, -405 removed lines

@@ -5,411 +5,411 @@
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-	class TaskRecurrence extends BaseRecurrence {
-		/**
-		 * Timezone info which is always false for task.
-		 */
-		public $tz = false;
-
-		private $action;
-
-		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_occurrences"])) {
-				$this->recur["changed_occurrences"] = [];
-			}
-
-			if (!isset($this->recur["deleted_occurrences"])) {
-				$this->recur["deleted_occurrences"] = [];
-			}
-
-			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;
+
+        private $action;
+
+        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_occurrences"])) {
+                $this->recur["changed_occurrences"] = [];
+            }
+
+            if (!isset($this->recur["deleted_occurrences"])) {
+                $this->recur["deleted_occurrences"] = [];
+            }
+
+            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, STGM_TRANSACTED, 0);
-				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) {
-				$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, STGM_TRANSACTED, 0);
+                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) {
+                $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;
+        }
+    }

Spacing +2 added lines, -2 removed lines

@@ -284,7 +284,7 @@ 
 				$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_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);
@@ -301,7 +301,7 @@ 
 			$separator = "------------\r\n";
 
 			if (!empty($msgbody) && strrpos($msgbody, $separator) === false) {
-				$msgbody = $separator . $msgbody;
+				$msgbody = $separator.$msgbody;
 				$stream = mapi_openproperty($this->message, PR_BODY, IID_IStream, STGM_TRANSACTED, 0);
 				mapi_stream_setsize($stream, strlen($msgbody));
 				mapi_stream_write($stream, $msgbody);

Braces +3 added lines, -6 removed lines

@@ -172,8 +172,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']];
 				}
 
@@ -385,8 +383,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/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 */

Spacing +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/class.recurrence.php

Indentation +1267 added lines, -1267 removed lines

@@ -5,11 +5,11 @@ 
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-	/**
-	 * Recurrence.
-	 */
-	class Recurrence extends BaseRecurrence {
-		/*
+    /**
+     * Recurrence.
+     */
+    class Recurrence extends BaseRecurrence {
+        /*
 		 * ABOUT TIMEZONES
 		 *
 		 * Timezones are rather complicated here so here are some rules to think about:
@@ -21,1279 +21,1279 @@ 
 		 *   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,
-		];
-
-		/**
-		 * Constructor.
-		 *
-		 * @param resource $store    MAPI Message Store Object
-		 * @param resource $message  the MAPI (appointment) message
-		 * @param array    $proptags an associative array of protags and their values
-		 */
-		public function __construct($store, $message, $proptags = []) {
-			if ($proptags) {
-				$this->proptags = $proptags;
-			}
-			else {
-				$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);
-			$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) {
-			// 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 getOccurrenceStart($basedate) {
-			return $this->getOccurrenceStart($basedate);
-		}
-
-		public function getOccurrenceEnd($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,
+        ];
+
+        /**
+         * Constructor.
+         *
+         * @param resource $store    MAPI Message Store Object
+         * @param resource $message  the MAPI (appointment) message
+         * @param array    $proptags an associative array of protags and their values
+         */
+        public function __construct($store, $message, $proptags = []) {
+            if ($proptags) {
+                $this->proptags = $proptags;
+            }
+            else {
+                $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);
+            $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) {
+            // 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 getOccurrenceStart($basedate) {
+            return $this->getOccurrenceStart($basedate);
+        }
+
+        public function getOccurrenceEnd($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 = _('workday');
-						$occSingleDayRank = true;
-					}
-					elseif ($everyn == (24 * 60)) {
-						$type = _('day');
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn /= (24 * 60);
-						$type = _('days');
-						$occSingleDayRank = false;
-					}
-
-					break;
-				// Weekly
-				case 0x0B:
-					if ($everyn == 1) {
-						$type = _('week');
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = _('weeks');
-						$occSingleDayRank = false;
-					}
-
-					break;
-				// Monthly
-				case 0x0C:
-					if ($everyn == 1) {
-						$type = _('month');
-						$occSingleDayRank = true;
-					}
-					else {
-						$type = _('months');
-						$occSingleDayRank = false;
-					}
-
-					break;
-				// Yearly
-				case 0x0D:
-					if ($everyn <= 12) {
-						$everyn = 1;
-						$type = _('year');
-						$occSingleDayRank = true;
-					}
-					else {
-						$everyn = $everyn / 12;
-						$type = _('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(_('d-m-Y'), $firstoccstartdate);
-			$end = gmdate(_('d-m-Y'), $firstoccenddate);
-			$startocc = gmdate(_('G:i'), $firstoccstartdate);
-			$endocc = gmdate(_('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(_('Occurs every %s effective %s from %s to %s.'), $type, $start, $startocc, $endocc);
-					}
-					else {
-						$pattern = sprintf(_('Occurs every %s %s effective %s from %s to %s.'), $everyn, $type, $start, $startocc, $endocc);
-					}
-				}
-				else {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(_('Occurs every %s effective %s.'), $type, $start);
-					}
-					else {
-						$pattern = sprintf(_('Occurs every %s %s effective %s.'), $everyn, $type, $start);
-					}
-				}
-			}
-			elseif ($term == 0x22) {
-				// After a number of times
-				if ($occTimeRange) {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(ngettext(
-							'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(ngettext(
-							'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(ngettext(
-							'Occurs every %s effective %s for %s occurrence.',
-							'Occurs every %s effective %s for %s occurrences.',
-							$numocc
-						), $type, $start, $numocc);
-					}
-					else {
-						$pattern = sprintf(ngettext(
-							'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(_('Occurs every %s effective %s until %s from %s to %s.'), $type, $start, $end, $startocc, $endocc);
-					}
-					else {
-						$pattern = sprintf(_('Occurs every %s %s effective %s until %s from %s to %s.'), $everyn, $type, $start, $end, $startocc, $endocc);
-					}
-				}
-				else {
-					if ($occSingleDayRank) {
-						$pattern = sprintf(_('Occurs every %s effective %s until %s.'), $type, $start, $end);
-					}
-					else {
-						$pattern = sprintf(_('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 = _('workday');
+                        $occSingleDayRank = true;
+                    }
+                    elseif ($everyn == (24 * 60)) {
+                        $type = _('day');
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $everyn /= (24 * 60);
+                        $type = _('days');
+                        $occSingleDayRank = false;
+                    }
+
+                    break;
+                // Weekly
+                case 0x0B:
+                    if ($everyn == 1) {
+                        $type = _('week');
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $type = _('weeks');
+                        $occSingleDayRank = false;
+                    }
+
+                    break;
+                // Monthly
+                case 0x0C:
+                    if ($everyn == 1) {
+                        $type = _('month');
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $type = _('months');
+                        $occSingleDayRank = false;
+                    }
+
+                    break;
+                // Yearly
+                case 0x0D:
+                    if ($everyn <= 12) {
+                        $everyn = 1;
+                        $type = _('year');
+                        $occSingleDayRank = true;
+                    }
+                    else {
+                        $everyn = $everyn / 12;
+                        $type = _('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(_('d-m-Y'), $firstoccstartdate);
+            $end = gmdate(_('d-m-Y'), $firstoccenddate);
+            $startocc = gmdate(_('G:i'), $firstoccstartdate);
+            $endocc = gmdate(_('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(_('Occurs every %s effective %s from %s to %s.'), $type, $start, $startocc, $endocc);
+                    }
+                    else {
+                        $pattern = sprintf(_('Occurs every %s %s effective %s from %s to %s.'), $everyn, $type, $start, $startocc, $endocc);
+                    }
+                }
+                else {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(_('Occurs every %s effective %s.'), $type, $start);
+                    }
+                    else {
+                        $pattern = sprintf(_('Occurs every %s %s effective %s.'), $everyn, $type, $start);
+                    }
+                }
+            }
+            elseif ($term == 0x22) {
+                // After a number of times
+                if ($occTimeRange) {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(ngettext(
+                            '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(ngettext(
+                            '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(ngettext(
+                            'Occurs every %s effective %s for %s occurrence.',
+                            'Occurs every %s effective %s for %s occurrences.',
+                            $numocc
+                        ), $type, $start, $numocc);
+                    }
+                    else {
+                        $pattern = sprintf(ngettext(
+                            '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(_('Occurs every %s effective %s until %s from %s to %s.'), $type, $start, $end, $startocc, $endocc);
+                    }
+                    else {
+                        $pattern = sprintf(_('Occurs every %s %s effective %s until %s from %s to %s.'), $everyn, $type, $start, $end, $startocc, $endocc);
+                    }
+                }
+                else {
+                    if ($occSingleDayRank) {
+                        $pattern = sprintf(_('Occurs every %s effective %s until %s.'), $type, $start, $end);
+                    }
+                    else {
+                        $pattern = sprintf(_('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
-		 */
-		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) == 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 exceptions which are stored as 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"]])) {
-						// if no basedate found then it could be embedded message so ignore it
-						// we need proper restriction to exclude embedded messages as well
-						continue;
-					}
-
-					if ($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 occurrence 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 ((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($recip[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
+         */
+        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) == 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 exceptions which are stored as 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"]])) {
+                        // if no basedate found then it could be embedded message so ignore it
+                        // we need proper restriction to exclude embedded messages as well
+                        continue;
+                    }
+
+                    if ($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 occurrence 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 ((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($recip[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:
 

Spacing +15 added lines, -15 removed lines

@@ -598,8 +598,8 @@ 
 			}
 
 			// get timings of the first occurrence
-			$firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
-			$firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
+			$firstoccstartdate = isset($startocc) ? $start + (((int)$startocc) * 60) : $start;
+			$firstoccenddate = isset($endocc) ? $end + (((int)$endocc) * 60) : $end;
 
 			$start = gmdate(_('d-m-Y'), $firstoccstartdate);
 			$end = gmdate(_('d-m-Y'), $firstoccenddate);
@@ -743,7 +743,7 @@ 
 			$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);
+			$imessage = mapi_attach_openobj($attachment, MAPI_CREATE|MAPI_MODIFY);
 
 			if ($copy_attach_from) {
 				$attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
@@ -751,7 +751,7 @@ 
 					$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_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);
@@ -1123,13 +1123,13 @@ 
 			// Remove all deleted recipients
 			if (isset($exception_recips['remove'])) {
 				foreach ($exception_recips['remove'] as &$recip) {
-					if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-						$recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+					if (!isset($recip[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_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']);
@@ -1199,13 +1199,13 @@ 
 
 						// 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;
+							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_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
 							}
-							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;    // No Response required
+							$recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
 							$deletedRecipients[] = $recipient;
 						}
 					}
@@ -1265,12 +1265,12 @@ 
 			$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)) {
+				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;
+					$recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
 				}
 			}
 
@@ -1284,7 +1284,7 @@ 
 				$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_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
 				$organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
 
 				// Add organizer to recipients list.

Braces +28 added lines, -56 removed lines

@@ -51,8 +51,7 @@ 
 		public function __construct($store, $message, $proptags = []) {
 			if ($proptags) {
 				$this->proptags = $proptags;
-			}
-			else {
+			} else {
 				$properties = [];
 				$properties["entryid"] = PR_ENTRYID;
 				$properties["parent_entryid"] = PR_PARENT_ENTRYID;
@@ -192,8 +191,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);
 			}
@@ -290,12 +288,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
@@ -339,8 +335,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;
 			}
@@ -350,8 +345,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));
 			}
 
@@ -545,12 +539,10 @@ 
 					if ($everyn == 1) {
 						$type = _('workday');
 						$occSingleDayRank = true;
-					}
-					elseif ($everyn == (24 * 60)) {
+					} elseif ($everyn == (24 * 60)) {
 						$type = _('day');
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$everyn /= (24 * 60);
 						$type = _('days');
 						$occSingleDayRank = false;
@@ -562,8 +554,7 @@ 
 					if ($everyn == 1) {
 						$type = _('week');
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$type = _('weeks');
 						$occSingleDayRank = false;
 					}
@@ -574,8 +565,7 @@ 
 					if ($everyn == 1) {
 						$type = _('month');
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$type = _('months');
 						$occSingleDayRank = false;
 					}
@@ -587,8 +577,7 @@ 
 						$everyn = 1;
 						$type = _('year');
 						$occSingleDayRank = true;
-					}
-					else {
+					} else {
 						$everyn = $everyn / 12;
 						$type = _('years');
 						$occSingleDayRank = false;
@@ -618,21 +607,17 @@ 
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(_('Occurs every %s effective %s from %s to %s.'), $type, $start, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(_('Occurs every %s %s effective %s from %s to %s.'), $everyn, $type, $start, $startocc, $endocc);
 					}
-				}
-				else {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(_('Occurs every %s effective %s.'), $type, $start);
-					}
-					else {
+					} else {
 						$pattern = sprintf(_('Occurs every %s %s effective %s.'), $everyn, $type, $start);
 					}
 				}
-			}
-			elseif ($term == 0x22) {
+			} elseif ($term == 0x22) {
 				// After a number of times
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
@@ -641,24 +626,21 @@ 
 							'Occurs every %s effective %s for %s occurrences from %s to %s.',
 							$numocc
 						), $type, $start, $numocc, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(ngettext(
 							'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 {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(ngettext(
 							'Occurs every %s effective %s for %s occurrence.',
 							'Occurs every %s effective %s for %s occurrences.',
 							$numocc
 						), $type, $start, $numocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(ngettext(
 							'Occurs every %s %s effective %s for %s occurrence.',
 							'Occurs every %s %s effective %s for %s occurrences.',
@@ -666,22 +648,18 @@ 
 						), $everyn, $type, $start, $numocc);
 					}
 				}
-			}
-			elseif ($term == 0x21) {
+			} elseif ($term == 0x21) {
 				// After the given enddate
 				if ($occTimeRange) {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(_('Occurs every %s effective %s until %s from %s to %s.'), $type, $start, $end, $startocc, $endocc);
-					}
-					else {
+					} else {
 						$pattern = sprintf(_('Occurs every %s %s effective %s until %s from %s to %s.'), $everyn, $type, $start, $end, $startocc, $endocc);
 					}
-				}
-				else {
+				} else {
 					if ($occSingleDayRank) {
 						$pattern = sprintf(_('Occurs every %s effective %s until %s.'), $type, $start, $end);
-					}
-					else {
+					} else {
 						$pattern = sprintf(_('Occurs every %s %s effective %s until %s.'), $everyn, $type, $start, $end);
 					}
 				}
@@ -713,8 +691,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));
 				}
 			}
@@ -1083,8 +1060,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);
 			}
 		}
@@ -1125,8 +1101,7 @@ 
 				foreach ($exception_recips['remove'] as &$recip) {
 					if (!isset($recip[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
@@ -1201,8 +1176,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
@@ -1221,8 +1195,7 @@ 
 					}
 				}
 				$exception_recips = array_merge($exception_recips, $deletedRecipients);
-			}
-			else {
+			} else {
 				$exception_recips = $recipientRows;
 			}
 
@@ -1267,8 +1240,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/mapitags.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  */
 
 if (!function_exists("mapi_prop_tag")) {
-	throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
+    throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
 }
 
 define('PR_ACKNOWLEDGEMENT_MODE', mapi_prop_tag(PT_LONG, 0x0001));

mapi/class.freebusypublish.php

Indentation +389 added lines, -389 removed lines

@@ -6,393 +6,393 @@
  */
 
 class FreeBusyPublish {
-	public $session;
-	public $calendar;
-	public $entryid;
-	public $starttime;
-	public $length;
-	public $store;
-	public $proptags;
-
-	/**
-	 * Constructor.
-	 *
-	 * @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;
-	}
-
-	/**
-	 * Function is used to get the calendar data based on give date range.
-	 *
-	 * @param timestamp $starttime time from which to get the calendar data
-	 * @param timestamp $length    time up till now get the calendar data
-	 *
-	 * @return array return the calendar data array
-	 */
-	public function getCalendarData($starttime, $length) {
-		$start = $starttime;
-		$end = $length;
-
-		// Get all the items in the calendar that we need
-
-		$calendaritems = [];
-
-		$restrict = [
-			RES_OR,
-			[
-				// 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);
-
-		while (1) {
-			$rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
-
-			if (!is_array($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);
-
-					$occurrences = $recur->getItems($starttime, $length);
-				}
-				else {
-					$occurrences[] = $row;
-				}
-
-				$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)
-		return $this->mergeItemsFB($calendaritems);
-	}
-
-	/**
-	 * Publishes Free/Busy information of user.
-	 *
-	 * @param timestamp $starttime Time from which to publish data  (usually now)
-	 * @param timestamp $length    Time of seconds from $starttime we should publish
-	 * @param mixed     $start
-	 * @param mixed     $end
-	 */
-	public function publishFB($start, $end) {
-		$freebusy = $this->getCalendarData($start, $end);
-
-		// 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();
-				SLog::Write(LOGLEVEL_WARN, "Error in opening freebusysupport object.");
-			}
-		}
-
-		// Open updater for this user
-		if (isset($fbsupport) && $fbsupport) {
-			$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);
-
-			// We're finished
-			mapi_freebusysupport_close($fbsupport);
-		}
-		else {
-			SLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
-		}
-	}
-
-	/**
-	 * 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"]) {
-			if ($a["type"] < $b["type"]) {
-				return 1;
-			}
-			if ($a["type"] > $b["type"]) {
-				return -1;
-			}
-
-			return 0;
-		}
-
-		return $a["time"] > $b["time"] ? 1 : -1;
-	}
-
-	/**
-	 * 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"]] : fbFree; // 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"]] : fbFree; // ZP-197
-			$timestamps[] = $ts;
-		}
-
-		usort($timestamps, [$this, "cmp"]);
-		$laststart = 0; // seb added
-
-		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;
-			}
-		}
-
-		return $merged;
-	}
+    public $session;
+    public $calendar;
+    public $entryid;
+    public $starttime;
+    public $length;
+    public $store;
+    public $proptags;
+
+    /**
+     * Constructor.
+     *
+     * @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;
+    }
+
+    /**
+     * Function is used to get the calendar data based on give date range.
+     *
+     * @param timestamp $starttime time from which to get the calendar data
+     * @param timestamp $length    time up till now get the calendar data
+     *
+     * @return array return the calendar data array
+     */
+    public function getCalendarData($starttime, $length) {
+        $start = $starttime;
+        $end = $length;
+
+        // Get all the items in the calendar that we need
+
+        $calendaritems = [];
+
+        $restrict = [
+            RES_OR,
+            [
+                // 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);
+
+        while (1) {
+            $rows = mapi_table_queryrows($contents, array_values($this->proptags), 0, 50);
+
+            if (!is_array($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);
+
+                    $occurrences = $recur->getItems($starttime, $length);
+                }
+                else {
+                    $occurrences[] = $row;
+                }
+
+                $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)
+        return $this->mergeItemsFB($calendaritems);
+    }
+
+    /**
+     * Publishes Free/Busy information of user.
+     *
+     * @param timestamp $starttime Time from which to publish data  (usually now)
+     * @param timestamp $length    Time of seconds from $starttime we should publish
+     * @param mixed     $start
+     * @param mixed     $end
+     */
+    public function publishFB($start, $end) {
+        $freebusy = $this->getCalendarData($start, $end);
+
+        // 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();
+                SLog::Write(LOGLEVEL_WARN, "Error in opening freebusysupport object.");
+            }
+        }
+
+        // Open updater for this user
+        if (isset($fbsupport) && $fbsupport) {
+            $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);
+
+            // We're finished
+            mapi_freebusysupport_close($fbsupport);
+        }
+        else {
+            SLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
+        }
+    }
+
+    /**
+     * 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"]) {
+            if ($a["type"] < $b["type"]) {
+                return 1;
+            }
+            if ($a["type"] > $b["type"]) {
+                return -1;
+            }
+
+            return 0;
+        }
+
+        return $a["time"] > $b["time"] ? 1 : -1;
+    }
+
+    /**
+     * 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"]] : fbFree; // 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"]] : fbFree; // ZP-197
+            $timestamps[] = $ts;
+        }
+
+        usort($timestamps, [$this, "cmp"]);
+        $laststart = 0; // seb added
+
+        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;
+            }
+        }
+
+        return $merged;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 					],
 				], // EXISTS OR
 			],
-		];        // global OR
+		]; // global OR
 
 		$contents = mapi_folder_getcontentstable($this->calendar);
 		mapi_table_restrict($contents, $restrict);

Braces +3 added lines, -6 removed lines

@@ -240,8 +240,7 @@ 
 					$recur = new Recurrence($this->store, $row);
 
 					$occurrences = $recur->getItems($starttime, $length);
-				}
-				else {
+				} else {
 					$occurrences[] = $row;
 				}
 
@@ -269,8 +268,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();
 				SLog::Write(LOGLEVEL_WARN, "Error in opening freebusysupport object.");
@@ -290,8 +288,7 @@ 
 
 			// We're finished
 			mapi_freebusysupport_close($fbsupport);
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_WARN, "FreeBusyPublish is not available");
 		}
 	}

mapi/class.baserecurrence.php

Indentation +1978 added lines, -1978 removed lines

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

Switch Indentation +185 added lines, -185 removed lines

@@ -1739,193 +1739,193 @@
 				// Loop through the entire recurrence range of dates, and check for each occurrence whether it is in the view range.
 
 				switch ($this->recur["type"]) {
-				case 10:
-					// Daily
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1440;
-					}
-
-					if ($this->recur["subtype"] == 0) {
-						// Every Nth day
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-					}
-					else {
-						// Every workday
-						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
-							$nowtime = $this->gmtime($now);
-							if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
-								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-
-					break;
-
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
-
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
-
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
-						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						else {
-							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $now + $wday * 60 * 60 * 24;
-								// checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
-								if ($daynow <= $dayend) {
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-									if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
-										$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-									}
-								}
-							}
-						}
-					}
-
-					break;
-
-				case 12:
-					// Monthly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
-
-					// Loop through all months from start to end of occurrence, starting at beginning of first month
-					for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
-							$difference = 1;
-							if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
-								$difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
-							}
-							$daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
-							// checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
-							if ($daynow <= $dayend) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
-							// Sanitize input
-							if ($this->recur["weekdays"] == 0) {
-								$this->recur["weekdays"] = 1;
-							}
-
-							// If nday is not set to the last day in the month
-							if ($this->recur["nday"] < 5) {
-								// keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
-								$ndaycounter = 0;
-								// Find matching weekday in this month
-								for ($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; ++$day) {
-									$daynow = $now + $day * 60 * 60 * 24;
-									$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-										++$ndaycounter;
-									}
-									// check the selected pattern is same as asked Nth weekday,If so set the firstday
-									if ($this->recur["nday"] == $ndaycounter) {
-										$firstday = $day;
-
-										break;
-									}
-								}
-								// $firstday is the day of the month on which the asked pattern of nth weekday matches
-								$daynow = $now + $firstday * 60 * 60 * 24;
-							}
-							else {
-								// Find last day in the month ($now is the firstday of the month)
-								$NumDaysInMonth = $this->daysInMonth($now, 1);
-								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
-
-								$nowtime = $this->gmtime($daynow);
-								while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
-									$daynow -= 86400;
-									$nowtime = $this->gmtime($daynow);
-								}
-							}
-
-							/*
+				    case 10:
+					    // Daily
+					    if ($this->recur["everyn"] <= 0) {
+						    $this->recur["everyn"] = 1440;
+					    }
+
+					    if ($this->recur["subtype"] == 0) {
+						    // Every Nth day
+						    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
+							    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+					    }
+					    else {
+						    // Every workday
+						    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
+							    $nowtime = $this->gmtime($now);
+							    if ($nowtime["tm_wday"] > 0 && $nowtime["tm_wday"] < 6) { // only add items in the given timespace
+								    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
+
+					    break;
+
+				    case 11:
+					    // Weekly
+					    if ($this->recur["everyn"] <= 0) {
+						    $this->recur["everyn"] = 1;
+					    }
+
+					    // If sliding flag is set then move to 'n' weeks
+					    if ($this->recur['regen']) {
+						    $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
+					    }
+
+					    for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+						    if ($this->recur['regen']) {
+							    $this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+						    else {
+							    // Loop through the whole following week to the first occurrence of the week, add each day that is specified
+							    for ($wday = 0; $wday < 7; ++$wday) {
+								    $daynow = $now + $wday * 60 * 60 * 24;
+								    // checks weather the next coming day in recurring pattern is less than or equal to end day of the recurring item
+								    if ($daynow <= $dayend) {
+									    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+									    if (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"]))) { // Selected ?
+										    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+									    }
+								    }
+							    }
+						    }
+					    }
+
+					    break;
+
+				    case 12:
+					    // Monthly
+					    if ($this->recur["everyn"] <= 0) {
+						    $this->recur["everyn"] = 1;
+					    }
+
+					    // Loop through all months from start to end of occurrence, starting at beginning of first month
+					    for ($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+						    if (isset($this->recur["monthday"]) && ($this->recur['monthday'] != "undefined") && !$this->recur['regen']) { // Day M of every N months
+							    $difference = 1;
+							    if ($this->daysInMonth($now, $this->recur["everyn"]) < $this->recur["monthday"]) {
+								    $difference = $this->recur["monthday"] - $this->daysInMonth($now, $this->recur["everyn"]) + 1;
+							    }
+							    $daynow = $now + (($this->recur["monthday"] - $difference) * 24 * 60 * 60);
+							    // checks weather the next coming day in recurrence pattern is less than or equal to end day of the recurring item
+							    if ($daynow <= $dayend) {
+								    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+						    elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+							    // Sanitize input
+							    if ($this->recur["weekdays"] == 0) {
+								    $this->recur["weekdays"] = 1;
+							    }
+
+							    // If nday is not set to the last day in the month
+							    if ($this->recur["nday"] < 5) {
+								    // keep the track of no. of time correct selection pattern(like 2nd weekday, 4th fiday, etc.)is matched
+								    $ndaycounter = 0;
+								    // Find matching weekday in this month
+								    for ($day = 0, $total = $this->daysInMonth($now, 1); $day < $total; ++$day) {
+									    $daynow = $now + $day * 60 * 60 * 24;
+									    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+									    if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										    ++$ndaycounter;
+									    }
+									    // check the selected pattern is same as asked Nth weekday,If so set the firstday
+									    if ($this->recur["nday"] == $ndaycounter) {
+										    $firstday = $day;
+
+										    break;
+									    }
+								    }
+								    // $firstday is the day of the month on which the asked pattern of nth weekday matches
+								    $daynow = $now + $firstday * 60 * 60 * 24;
+							    }
+							    else {
+								    // Find last day in the month ($now is the firstday of the month)
+								    $NumDaysInMonth = $this->daysInMonth($now, 1);
+								    $daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
+
+								    $nowtime = $this->gmtime($daynow);
+								    while (($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) == 0) {
+									    $daynow -= 86400;
+									    $nowtime = $this->gmtime($daynow);
+								    }
+							    }
+
+							    /*
 							 * checks weather the next coming day in recurrence pattern is less than or equal to end day of the            * recurring item.Also check weather the coming day in recurrence pattern is greater than or equal to start * of recurring pattern, so that appointment that fall under the recurrence range are only displayed.
 							 */
-							if ($daynow <= $dayend && $daynow >= $daystart) {
-								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-						elseif ($this->recur['regen']) {
-							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
-							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
-
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
-
-					break;
-
-				case 13:
-					// Yearly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 12;
-					}
-
-					for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
-						if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
-							// recur["month"] is in minutes since the beginning of the year
-							$month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
-							$monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
-							$monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-							if ($monthday > $this->daysInMonth($monthstart, 1)) {
-								$monthday = $this->daysInMonth($monthstart, 1);
-							}    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
-							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
-							// Go the correct month
-							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
-
-							// Find first matching weekday in this month
-							for ($wday = 0; $wday < 7; ++$wday) {
-								$daynow = $monthnow + $wday * 60 * 60 * 24;
-								$nowtime = $this->gmtime($daynow); // Get the weekday of the current day
-
-								if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
-									$firstday = $wday;
-
-									break;
-								}
-							}
-
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
-
-							while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
-								$daynow -= 7 * 60 * 60 * 24;
-							}
-
-							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
-							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
-							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
-
-							if ($now <= $dayend) {
-								$this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-							}
-						}
-					}
+							    if ($daynow <= $dayend && $daynow >= $daystart) {
+								    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+						    elseif ($this->recur['regen']) {
+							    $next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
+							    $now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
+
+							    if ($now <= $dayend) {
+								    $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
+
+					    break;
+
+				    case 13:
+					    // Yearly
+					    if ($this->recur["everyn"] <= 0) {
+						    $this->recur["everyn"] = 12;
+					    }
+
+					    for ($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60) {
+						    if (isset($this->recur["monthday"]) && !$this->recur['regen']) { // same as monthly, but in a specific month
+							    // recur["month"] is in minutes since the beginning of the year
+							    $month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
+							    $monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
+							    $monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
+							    if ($monthday > $this->daysInMonth($monthstart, 1)) {
+								    $monthday = $this->daysInMonth($monthstart, 1);
+							    }    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
+							    $daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
+							    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+						    elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+							    // Go the correct month
+							    $monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
+
+							    // Find first matching weekday in this month
+							    for ($wday = 0; $wday < 7; ++$wday) {
+								    $daynow = $monthnow + $wday * 60 * 60 * 24;
+								    $nowtime = $this->gmtime($daynow); // Get the weekday of the current day
+
+								    if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+									    $firstday = $wday;
+
+									    break;
+								    }
+							    }
+
+							    // Same as above (monthly)
+							    $daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+
+							    while ($this->monthStartOf($daynow) != $this->monthStartOf($monthnow)) {
+								    $daynow -= 7 * 60 * 60 * 24;
+							    }
+
+							    $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+						    }
+						    elseif ($this->recur['regen']) {
+							    $year_starttime = $this->gmtime($now);
+							    $is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+							    $now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
+
+							    if ($now <= $dayend) {
+								    $this->processOccurrenceItem($items, $daystart, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							    }
+						    }
+					    }
 				}
 				// to get all exception items
 				if (!empty($this->recur['changed_occurrences'])) {

Spacing +78 added lines, -78 removed lines

@@ -573,14 +573,14 @@ 
 				return;
 			}
 
-			$rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int) $this->recur["type"], 0x20, (int) $this->recur["subtype"]);
+			$rdata = pack("CCCCCCV", 0x04, 0x30, 0x04, 0x30, (int)$this->recur["type"], 0x20, (int)$this->recur["subtype"]);
 
 			$weekstart = 1; // monday
 			$forwardcount = 0;
 			$restocc = 0;
-			$dayofweek = (int) gmdate("w", (int) $this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
+			$dayofweek = (int)gmdate("w", (int)$this->recur["start"]); // 0 (for Sunday) through 6 (for Saturday)
 
-			$term = (int) $this->recur["type"];
+			$term = (int)$this->recur["type"];
 
 			switch ($term) {
 				case 0x0A:
@@ -596,12 +596,12 @@ 
 					else {
 						// Daily every N days (everyN in minutes)
 
-						$everyn = ((int) $this->recur["everyn"]) / 1440;
+						$everyn = ((int)$this->recur["everyn"]) / 1440;
 
 						// Calc first occ
-						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
+						$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int)$this->recur["everyn"]);
 
-						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
+						$rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], $this->recur["regen"] ? 1 : 0);
 					}
 
 					break;
@@ -624,7 +624,7 @@ 
 						$daycount = 0;
 						$dayskip = -1;
 						for ($j = 0; $j < 7; ++$j) {
-							if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+							if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
 								if ($dayskip == -1) {
 									$dayskip = $j;
 								}
@@ -643,35 +643,35 @@ 
 
 						// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
 						// remaining occurrences based on the start of the recurrence.
-						if (((int) $this->recur["term"]) == 0x22) {
+						if (((int)$this->recur["term"]) == 0x22) {
 							// $weekskip is the amount of weeks to skip from the startdate before the first occurrence
 							// $forwardcount is the maximum number of week occurrences we can go ahead after the first occurrence that
 							// is still inside the recurrence. We subtract one to make sure that the last week is never forwarded over
 							// (eg when numoccur = 2, and daycount = 1)
-							$forwardcount = floor((int) ($this->recur["numoccur"] - 1) / $daycount);
+							$forwardcount = floor((int)($this->recur["numoccur"] - 1) / $daycount);
 
 							// $restocc is the number of occurrences left after $forwardcount whole weeks of occurrences, minus one
 							// for the occurrence on the first day
-							$restocc = ((int) $this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
+							$restocc = ((int)$this->recur["numoccur"]) - ($forwardcount * $daycount) - 1;
 
 							// $forwardcount is now the number of weeks we can go forward and still be inside the recurrence
-							$forwardcount *= (int) $this->recur["everyn"];
+							$forwardcount *= (int)$this->recur["everyn"];
 						}
 
 						// The real start is start + dayskip + weekskip-1 (since dayskip will already bring us into the next week)
-						$this->recur["start"] = ((int) $this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
+						$this->recur["start"] = ((int)$this->recur["start"]) + ($dayskip * 24 * 60 * 60) + ($weekskip * (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60);
 					}
 
 					// Calc first occ
-					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int) $this->recur["everyn"]) * 7 * 24 * 60);
+					$firstocc = ($this->unixDataToRecurData($this->recur["start"])) % (((int)$this->recur["everyn"]) * 7 * 24 * 60);
 
-					$firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
+					$firstocc -= (((int)gmdate("w", (int)$this->recur["start"])) - 1) * 24 * 60;
 
 					if ($this->recur["regen"]) {
-						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
+						$rdata .= pack("VVV", $firstocc, (int)$this->recur["everyn"], 1);
 					}
 					else {
-						$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+						$rdata .= pack("VVVV", $firstocc, (int)$this->recur["everyn"], 0, (int)$this->recur["weekdays"]);
 					}
 
 					break;
@@ -688,31 +688,31 @@ 
 					}
 
 					if ($term == 0x0C /* monthly */) {
-						$everyn = (int) $this->recur["everyn"];
+						$everyn = (int)$this->recur["everyn"];
 					}
 					else {
-						$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
+						$everyn = $this->recur["regen"] ? ((int)$this->recur["everyn"]) * 12 : 12;
 					}
 
 					// Get montday/month/year of original start
-					$curmonthday = gmdate("j", (int) $this->recur["start"]);
-					$curyear = gmdate("Y", (int) $this->recur["start"]);
-					$curmonth = gmdate("n", (int) $this->recur["start"]);
+					$curmonthday = gmdate("j", (int)$this->recur["start"]);
+					$curyear = gmdate("Y", (int)$this->recur["start"]);
+					$curmonth = gmdate("n", (int)$this->recur["start"]);
 
 					// Check if the recurrence ends after a number of occurrences, in that case we must calculate the
 					// remaining occurrences based on the start of the recurrence.
-					if (((int) $this->recur["term"]) == 0x22) {
+					if (((int)$this->recur["term"]) == 0x22) {
 						// $forwardcount is the number of occurrences we can skip and still be inside the recurrence range (minus
 						// one to make sure there are always at least one occurrence left)
-						$forwardcount = ((((int) $this->recur["numoccur"]) - 1) * $everyn);
+						$forwardcount = ((((int)$this->recur["numoccur"]) - 1) * $everyn);
 					}
 
 					// Get month for yearly on D'th day of month M
 					if ($term == 0x0D /* yearly */) {
-						$selmonth = floor(((int) $this->recur["month"]) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
+						$selmonth = floor(((int)$this->recur["month"]) / (24 * 60 * 29)) + 1; // 1=jan, 2=feb, eg
 					}
 
-					switch ((int) $this->recur["subtype"]) {
+					switch ((int)$this->recur["subtype"]) {
 						// on D day of every M month
 						case 2:
 							if (!isset($this->recur["monthday"])) {
@@ -725,11 +725,11 @@ 
 							// Go the beginning of the month
 							$this->recur["start"] -= ($curmonthday - 1) * 24 * 60 * 60;
 							// Go the the correct month day
-							$this->recur["start"] += (((int) $this->recur["monthday"]) - 1) * 24 * 60 * 60;
+							$this->recur["start"] += (((int)$this->recur["monthday"]) - 1) * 24 * 60 * 60;
 
 							// If the previous calculation gave us a start date different than the original start date, then we need to skip to the first occurrence
-							if (($term == 0x0C /* monthly */ && ((int) $this->recur["monthday"]) < $curmonthday) ||
-								($term == 0x0D /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int) $this->recur["monthday"]) < $curmonthday)))) {
+							if (($term == 0x0C /* monthly */ && ((int)$this->recur["monthday"]) < $curmonthday) ||
+								($term == 0x0D /* yearly */ && ($selmonth != $curmonth || ($selmonth == $curmonth && ((int)$this->recur["monthday"]) < $curmonthday)))) {
 								if ($term == 0x0D /* yearly */) {
 									if ($curmonth > $selmonth) {// go to next occurrence in 'everyn' months minus difference in first occurrence and original date
 										$count = $everyn - ($curmonth - $selmonth);
@@ -739,7 +739,7 @@ 
 									}
 									else {
 										// Go to next occurrence while recurrence start date is greater than occurrence date but within same month
-										if (((int) $this->recur["monthday"]) < $curmonthday) {
+										if (((int)$this->recur["monthday"]) < $curmonthday) {
 											$count = $everyn;
 										}
 									}
@@ -765,33 +765,33 @@ 
 							// of each month will overshoot in february (29 days). We compensate for that by checking
 							// if the day of the month we got is wrong, and then back up to the last day of the previous
 							// month.
-							if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-								gmdate("j", ((int) $this->recur["start"])) < ((int) $this->recur["monthday"])) {
-								$this->recur["start"] -= gmdate("j", ((int) $this->recur["start"])) * 24 * 60 * 60;
+							if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+								gmdate("j", ((int)$this->recur["start"])) < ((int)$this->recur["monthday"])) {
+								$this->recur["start"] -= gmdate("j", ((int)$this->recur["start"])) * 24 * 60 * 60;
 							}
 
 							// "start" is now the first occurrence
 
 							if ($term == 0x0C /* monthly */) {
 								// Calc first occ
-								$monthIndex = ((((12 % $everyn) * ((((int) gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								$monthIndex = ((((12 % $everyn) * ((((int)gmdate("Y", $this->recur["start"])) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
 								$firstocc = 0;
 								for ($i = 0; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
 								}
 
-								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
 							}
 							else {
 								// Calc first occ
 								$firstocc = 0;
-								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								$monthIndex = (int)gmdate("n", $this->recur["start"]);
 								for ($i = 1; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
 								}
 
-								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
+								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int)$this->recur["monthday"]);
 							}
 
 							break;
@@ -803,11 +803,11 @@ 
 								return;
 							}
 
-							$weekdays = (int) $this->recur["weekdays"];
-							$nday = (int) $this->recur["nday"];
+							$weekdays = (int)$this->recur["weekdays"];
+							$nday = (int)$this->recur["nday"];
 
 							// Calc startdate
-							$monthbegindow = (int) $this->recur["start"];
+							$monthbegindow = (int)$this->recur["start"];
 
 							if ($nday == 5) {
 								// Set date on the last day of the last month
@@ -842,12 +842,12 @@ 
 
 								$dayofweek = gmdate("w", $monthbegindow);
 								for ($i = 0; $i < 7; ++$i) {
-									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+									if ($nday == 5 && (($dayofweek - $i) % 7 >= 0) && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 										$day = gmdate("j", $monthbegindow) - $i;
 
 										break;
 									}
-									if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+									if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 										$day = (($nday - 1) * 7) + ($i + 1);
 
 										break;
@@ -855,7 +855,7 @@ 
 								}
 
 								// Goto the next X month
-								if (isset($day) && ($day < gmdate("j", (int) $this->recur["start"]))) {
+								if (isset($day) && ($day < gmdate("j", (int)$this->recur["start"]))) {
 									if ($nday == 5) {
 										$monthbegindow += 24 * 60 * 60;
 										if ($curmonth == 12) {
@@ -887,12 +887,12 @@ 
 							// Set start on the right day
 							$dayofweek = gmdate("w", $monthbegindow);
 							for ($i = 0; $i < 7; ++$i) {
-								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+								if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 									$day = $i;
 
 									break;
 								}
-								if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+								if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 									$day = ($nday - 1) * 7 + ($i + 1);
 
 									break;
@@ -909,7 +909,7 @@ 
 
 							if ($term == 0x0C /* monthly */) {
 								// Calc first occ
-								$monthIndex = ((((12 % $everyn) * (((int) gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int) gmdate("n", $this->recur["start"])) - 1)) % $everyn;
+								$monthIndex = ((((12 % $everyn) * (((int)gmdate("Y", $this->recur["start"]) - 1601) % $everyn)) % $everyn) + (((int)gmdate("n", $this->recur["start"])) - 1)) % $everyn;
 
 								for ($i = 0; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
@@ -919,7 +919,7 @@ 
 							}
 							else {
 								// Calc first occ
-								$monthIndex = (int) gmdate("n", $this->recur["start"]);
+								$monthIndex = (int)gmdate("n", $this->recur["start"]);
 
 								for ($i = 1; $i < $monthIndex; ++$i) {
 									$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), $i) / 60;
@@ -939,7 +939,7 @@ 
 			}
 
 			// Terminate
-			$term = (int) $this->recur["term"];
+			$term = (int)$this->recur["term"];
 			$rdata .= pack("CCCC", $term, 0x20, 0x00, 0x00);
 
 			switch ($term) {
@@ -954,7 +954,7 @@ 
 						return;
 					}
 
-					$rdata .= pack("V", (int) $this->recur["numoccur"]);
+					$rdata .= pack("V", (int)$this->recur["numoccur"]);
 
 					break;
 				// Never ends
@@ -965,7 +965,7 @@ 
 			}
 
 			// Strange little thing for the recurrence type "every workday"
-			if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
+			if (((int)$this->recur["type"]) == 0x0B && ((int)$this->recur["subtype"]) == 1) {
 				$rdata .= pack("V", 1);
 			}
 			else { // Other recurrences
@@ -1009,25 +1009,25 @@ 
 			}
 
 			// Set start date
-			$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
+			$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["start"]));
 
 			// Set enddate
 			switch ($term) {
 				// After the given enddate
 				case 0x21:
-					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+					$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
 
 					break;
 				// After a number of times
 				case 0x22:
 					// @todo: calculate enddate with intval($this->recur["startocc"]) + intval($this->recur["duration"]) > 24 hour
-					$occenddate = (int) $this->recur["start"];
+					$occenddate = (int)$this->recur["start"];
 
-					switch ((int) $this->recur["type"]) {
+					switch ((int)$this->recur["type"]) {
 						case 0x0A: // daily
 							if ($this->recur["subtype"] == 1) {
 								// Daily every workday
-								$restocc = (int) $this->recur["numoccur"];
+								$restocc = (int)$this->recur["numoccur"];
 
 								// Get starting weekday
 								$nowtime = $this->gmtime($occenddate);
@@ -1049,7 +1049,7 @@ 
 							}
 							else {
 								// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
-								$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
+								$occenddate += (((int)$this->recur["everyn"]) * 60 * (((int)$this->recur["numoccur"] - 1)));
 							}
 
 							break;
@@ -1068,11 +1068,11 @@ 
 							for ($j = 1; $restocc > 0; ++$j) {
 								// Jump to the next week (which may be N weeks away) when going over the week boundary
 								if ((($dayofweek + $j) % 7) == $weekstart) {
-									$occenddate += (((int) $this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
+									$occenddate += (((int)$this->recur["everyn"]) - 1) * 7 * 24 * 60 * 60;
 								}
 
 								// If this is a matching day, once less occurrence to process
-								if (((int) $this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
+								if (((int)$this->recur["weekdays"]) & (1 << (($dayofweek + $j) % 7))) {
 									--$restocc;
 								}
 
@@ -1084,11 +1084,11 @@ 
 
 						case 0x0C: // monthly
 						case 0x0D: // yearly
-							$curyear = gmdate("Y", (int) $this->recur["start"]);
-							$curmonth = gmdate("n", (int) $this->recur["start"]);
+							$curyear = gmdate("Y", (int)$this->recur["start"]);
+							$curmonth = gmdate("n", (int)$this->recur["start"]);
 							// $forwardcount = months
 
-							switch ((int) $this->recur["subtype"]) {
+							switch ((int)$this->recur["subtype"]) {
 								case 2: // on D day of every M month
 									while ($forwardcount > 0) {
 										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -1104,8 +1104,8 @@ 
 									}
 
 									// compensation between 28 and 31
-									if (((int) $this->recur["monthday"]) >= 28 && ((int) $this->recur["monthday"]) <= 31 &&
-										gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
+									if (((int)$this->recur["monthday"]) >= 28 && ((int)$this->recur["monthday"]) <= 31 &&
+										gmdate("j", $occenddate) < ((int)$this->recur["monthday"])) {
 										if (gmdate("j", $occenddate) < 28) {
 											$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
 										}
@@ -1117,8 +1117,8 @@ 
 									break;
 
 								case 3: // on Nth weekday of every M month
-									$nday = (int) $this->recur["nday"]; // 1 tot 5
-									$weekdays = (int) $this->recur["weekdays"];
+									$nday = (int)$this->recur["nday"]; // 1 tot 5
+									$weekdays = (int)$this->recur["weekdays"];
 
 									while ($forwardcount > 0) {
 										$occenddate += $this->getMonthInSeconds($curyear, $curmonth);
@@ -1144,12 +1144,12 @@ 
 
 									$dayofweek = gmdate("w", $occenddate);
 									for ($i = 0; $i < 7; ++$i) {
-										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7)) & $weekdays) {
+										if ($nday == 5 && (($dayofweek - $i) % 7) >= 0 && (1 << (($dayofweek - $i) % 7))&$weekdays) {
 											$occenddate -= $i * 24 * 60 * 60;
 
 											break;
 										}
-										if ($nday != 5 && (1 << (($dayofweek + $i) % 7)) & $weekdays) {
+										if ($nday != 5 && (1 << (($dayofweek + $i) % 7))&$weekdays) {
 											$occenddate += ($i + (($nday - 1) * 7)) * 24 * 60 * 60;
 
 											break;
@@ -1168,7 +1168,7 @@ 
 
 					$this->recur["end"] = $occenddate;
 
-					$rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["end"]));
+					$rdata .= pack("V", $this->unixDataToRecurData((int)$this->recur["end"]));
 
 					break;
 				// Never ends
@@ -1181,12 +1181,12 @@ 
 			}
 
 			// UTC date
-			$utcstart = $this->toGMT($this->tz, (int) $this->recur["start"]);
-			$utcend = $this->toGMT($this->tz, (int) $this->recur["end"]);
+			$utcstart = $this->toGMT($this->tz, (int)$this->recur["start"]);
+			$utcend = $this->toGMT($this->tz, (int)$this->recur["end"]);
 
 			// utc date+time
-			$utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int) $this->recur["startocc"]) * 60) : $utcstart;
-			$utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int) $this->recur["endocc"]) * 60) : $utcstart;
+			$utcfirstoccstartdatetime = (isset($this->recur["startocc"])) ? $utcstart + (((int)$this->recur["startocc"]) * 60) : $utcstart;
+			$utcfirstoccenddatetime = (isset($this->recur["endocc"])) ? $utcstart + (((int)$this->recur["endocc"]) * 60) : $utcstart;
 
 			$propsToSet = [];
 			// update reminder time
@@ -1204,7 +1204,7 @@ 
 
 				// recurrencetype
 				// Strange enough is the property recurrencetype, (type-0x9) and not the CDO recurrencetype
-				$propsToSet[$this->proptags["recurrencetype"]] = ((int) $this->recur["type"]) - 0x9;
+				$propsToSet[$this->proptags["recurrencetype"]] = ((int)$this->recur["type"]) - 0x9;
 
 				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
 				$propsToSet[$this->proptags["side_effects"]] = 369;
@@ -1253,7 +1253,7 @@ 
 
 			if (isset($this->recur["startocc"], $this->recur["endocc"])) {
 				// Set start and endtime in minutes
-				$rdata .= pack("VV", (int) $this->recur["startocc"], (int) $this->recur["endocc"]);
+				$rdata .= pack("VV", (int)$this->recur["startocc"], (int)$this->recur["endocc"]);
 			}
 
 			// Detailed exception data
@@ -1308,7 +1308,7 @@ 
 					$subject = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["subject"]);
 					$length = strlen($subject);
 					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $subject);
+					$rdata .= pack("a".$length, $subject);
 				}
 
 				if (isset($changed_item["remind_before"])) {
@@ -1323,7 +1323,7 @@ 
 					$location = iconv("UTF-8", "windows-1252//TRANSLIT", $changed_item["location"]);
 					$length = strlen($location);
 					$rdata .= pack("vv", $length + 1, $length);
-					$rdata .= pack("a" . $length, $location);
+					$rdata .= pack("a".$length, $location);
 				}
 
 				if (isset($changed_item["busystatus"])) {
@@ -1354,14 +1354,14 @@ 
 					$subject = iconv("UTF-8", "UCS-2LE", $changed_item["subject"]);
 					$length = iconv_strlen($subject, "UCS-2LE");
 					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $subject);
+					$rdata .= pack("a".$length * 2, $subject);
 				}
 
 				if (isset($changed_item["location"])) {
 					$location = iconv("UTF-8", "UCS-2LE", $changed_item["location"]);
 					$length = iconv_strlen($location, "UCS-2LE");
 					$rdata .= pack("v", $length);
-					$rdata .= pack("a" . $length * 2, $location);
+					$rdata .= pack("a".$length * 2, $location);
 				}
 
 				if (isset($changed_item["subject"]) || isset($changed_item["location"])) {
@@ -1918,7 +1918,7 @@ 
 						}
 						elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
-							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
+							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1); // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);
 
 							if ($now <= $dayend) {

Braces +35 added lines, -70 removed lines

@@ -53,8 +53,7 @@ 
 
 			if (is_array($message)) {
 				$this->messageprops = $message;
-			}
-			else {
+			} else {
 				$this->message = $message;
 				$this->messageprops = mapi_getprops($this->message, $this->proptags);
 			}
@@ -218,8 +217,7 @@ 
 
 					if ($ret["subtype"] == 3) {
 						$ret["weekdays"] = $data["monthday"];
-					}
-					else {
+					} else {
 						$ret["monthday"] = $data["monthday"];
 					}
 
@@ -247,8 +245,7 @@ 
 
 					if ($ret["subtype"] == 3) {
 						$ret["weekdays"] = $data["monthday"];
-					}
-					else {
+					} else {
 						$ret["monthday"] = $data["monthday"];
 					}
 
@@ -592,8 +589,7 @@ 
 					if ($this->recur["subtype"] == 1) {
 						// Daily every workday
 						$rdata .= pack("VVVV", (6 * 24 * 60), 1, 0, 0x3E);
-					}
-					else {
+					} else {
 						// Daily every N days (everyN in minutes)
 
 						$everyn = ((int) $this->recur["everyn"]) / 1440;
@@ -669,8 +665,7 @@ 
 
 					if ($this->recur["regen"]) {
 						$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-					}
-					else {
+					} else {
 						$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
 					}
 
@@ -689,8 +684,7 @@ 
 
 					if ($term == 0x0C /* monthly */) {
 						$everyn = (int) $this->recur["everyn"];
-					}
-					else {
+					} else {
 						$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
 					}
 
@@ -733,18 +727,15 @@ 
 								if ($term == 0x0D /* yearly */) {
 									if ($curmonth > $selmonth) {// go to next occurrence in 'everyn' months minus difference in first occurrence and original date
 										$count = $everyn - ($curmonth - $selmonth);
-									}
-									elseif ($curmonth < $selmonth) {// go to next occurrence upto difference in first occurrence and original date
+									} elseif ($curmonth < $selmonth) {// go to next occurrence upto difference in first occurrence and original date
 										$count = $selmonth - $curmonth;
-									}
-									else {
+									} else {
 										// Go to next occurrence while recurrence start date is greater than occurrence date but within same month
 										if (((int) $this->recur["monthday"]) < $curmonthday) {
 											$count = $everyn;
 										}
 									}
-								}
-								else {
+								} else {
 									$count = $everyn; // Monthly, go to next occurrence in 'everyn' months
 								}
 
@@ -782,8 +773,7 @@ 
 								}
 
 								$rdata .= pack("VVVV", $firstocc, $everyn, $this->recur["regen"], (int) $this->recur["monthday"]);
-							}
-							else {
+							} else {
 								// Calc first occ
 								$firstocc = 0;
 								$monthIndex = (int) gmdate("n", $this->recur["start"]);
@@ -812,8 +802,7 @@ 
 							if ($nday == 5) {
 								// Set date on the last day of the last month
 								$monthbegindow += (gmdate("t", $monthbegindow) - gmdate("j", $monthbegindow)) * 24 * 60 * 60;
-							}
-							else {
+							} else {
 								// Set on the first day of the month
 								$monthbegindow -= ((gmdate("j", $monthbegindow) - 1) * 24 * 60 * 60);
 							}
@@ -822,8 +811,7 @@ 
 								// Set on right month
 								if ($selmonth < $curmonth) {
 									$tmp = 12 - $curmonth + $selmonth;
-								}
-								else {
+								} else {
 									$tmp = ($selmonth - $curmonth);
 								}
 
@@ -836,8 +824,7 @@ 
 									}
 									++$curmonth;
 								}
-							}
-							else {
+							} else {
 								// Check or you exist in the right month
 
 								$dayofweek = gmdate("w", $monthbegindow);
@@ -900,8 +887,7 @@ 
 							}
 							if ($nday == 5) {
 								$monthbegindow -= $day * 24 * 60 * 60;
-							}
-							else {
+							} else {
 								$monthbegindow += ($day - 1) * 24 * 60 * 60;
 							}
 
@@ -916,8 +902,7 @@ 
 								}
 
 								$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-							}
-							else {
+							} else {
 								// Calc first occ
 								$monthIndex = (int) gmdate("n", $this->recur["start"]);
 
@@ -967,8 +952,7 @@ 
 			// Strange little thing for the recurrence type "every workday"
 			if (((int) $this->recur["type"]) == 0x0B && ((int) $this->recur["subtype"]) == 1) {
 				$rdata .= pack("V", 1);
-			}
-			else { // Other recurrences
+			} else { // Other recurrences
 				$rdata .= pack("V", 0);
 			}
 
@@ -1046,8 +1030,7 @@ 
 
 									$occenddate += 24 * 60 * 60;
 								}
-							}
-							else {
+							} else {
 								// -1 because the first day already counts (from 1-1-1980 to 1-1-1980 is 1 occurrence)
 								$occenddate += (((int) $this->recur["everyn"]) * 60 * (((int) $this->recur["numoccur"] - 1)));
 							}
@@ -1096,8 +1079,7 @@ 
 										if ($curmonth >= 12) {
 											$curmonth = 1;
 											++$curyear;
-										}
-										else {
+										} else {
 											++$curmonth;
 										}
 										--$forwardcount;
@@ -1108,8 +1090,7 @@ 
 										gmdate("j", $occenddate) < ((int) $this->recur["monthday"])) {
 										if (gmdate("j", $occenddate) < 28) {
 											$occenddate -= gmdate("j", $occenddate) * 24 * 60 * 60;
-										}
-										else {
+										} else {
 											$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
 										}
 									}
@@ -1125,8 +1106,7 @@ 
 										if ($curmonth >= 12) {
 											$curmonth = 1;
 											++$curyear;
-										}
-										else {
+										} else {
 											++$curmonth;
 										}
 
@@ -1136,8 +1116,7 @@ 
 									if ($nday == 5) {
 										// Set date on the last day of the last month
 										$occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 * 60;
-									}
-									else {
+									} else {
 										// Set date on the first day of the last month
 										$occenddate -= (gmdate("j", $occenddate) - 1) * 24 * 60 * 60;
 									}
@@ -1208,8 +1187,7 @@ 
 
 				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
 				$propsToSet[$this->proptags["side_effects"]] = 369;
-			}
-			else {
+			} else {
 				$propsToSet[$this->proptags["side_effects"]] = 3441;
 			}
 
@@ -1239,8 +1217,7 @@ 
 
 				if ($occ) {
 					$propsToSet[$this->proptags["flagdueby"]] = $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60);
-				}
-				else {
+				} else {
 					// Last reminder passed, no reminders any more.
 					$propsToSet[$this->proptags["reminder"]] = false;
 					$propsToSet[$this->proptags["flagdueby"]] = 0x7FF00000;
@@ -1459,11 +1436,9 @@ 
 		public function getMonthInSeconds($year, $month) {
 			if (in_array($month, [1, 3, 5, 7, 8, 10, 12])) {
 				$day = 31;
-			}
-			elseif (in_array($month, [4, 6, 9, 11])) {
+			} elseif (in_array($month, [4, 6, 9, 11])) {
 				$day = 30;
-			}
-			else {
+			} else {
 				$day = 28;
 				if ($this->isLeapYear($year) == 1) {
 					++$day;
@@ -1533,8 +1508,7 @@ 
 				if ($date > $dststart && $date < $dstend) {
 					$dst = true;
 				}
-			}
-			else {
+			} else {
 				// Southern hemisphere, eg DST is during Oct-Mar
 				if ($date < $dstend || $date > $dststart) {
 					$dst = true;
@@ -1720,8 +1694,7 @@ 
 				// TODO use one isset
 				if (isset($this->recur['regen'], $this->action['datecompleted']) && $this->recur['regen']) {
 					$daystart = $this->dayStartOf($this->action['datecompleted']);
-				}
-				else {
+				} else {
 					$daystart = $this->dayStartOf($this->recur["start"]); // start on first day of occurrence
 				}
 
@@ -1729,8 +1702,7 @@ 
 				// or the end of the recurrence, whichever comes first
 				if ($end > $this->toGMT($this->tz, $this->recur["end"])) {
 					$rangeend = $this->toGMT($this->tz, $this->recur["end"]);
-				}
-				else {
+				} else {
 					$rangeend = $end;
 				}
 
@@ -1750,8 +1722,7 @@ 
 						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
 							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 						}
-					}
-					else {
+					} else {
 						// Every workday
 						for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * 1440) {
 							$nowtime = $this->gmtime($now);
@@ -1777,8 +1748,7 @@ 
 					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
 						if ($this->recur['regen']) {
 							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						else {
+						} else {
 							// Loop through the whole following week to the first occurrence of the week, add each day that is specified
 							for ($wday = 0; $wday < 7; ++$wday) {
 								$daynow = $now + $wday * 60 * 60 * 24;
@@ -1813,8 +1783,7 @@ 
 							if ($daynow <= $dayend) {
 								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+						} elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
 							// Sanitize input
 							if ($this->recur["weekdays"] == 0) {
 								$this->recur["weekdays"] = 1;
@@ -1841,8 +1810,7 @@ 
 								}
 								// $firstday is the day of the month on which the asked pattern of nth weekday matches
 								$daynow = $now + $firstday * 60 * 60 * 24;
-							}
-							else {
+							} else {
 								// Find last day in the month ($now is the firstday of the month)
 								$NumDaysInMonth = $this->daysInMonth($now, 1);
 								$daynow = $now + (($NumDaysInMonth - 1) * 24 * 60 * 60);
@@ -1860,8 +1828,7 @@ 
 							if ($daynow <= $dayend && $daynow >= $daystart) {
 								$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
-						}
-						elseif ($this->recur['regen']) {
+						} elseif ($this->recur['regen']) {
 							$next_month_start = $now + ($this->daysInMonth($now, 1) * 24 * 60 * 60);
 							$now = $daystart + ($this->daysInMonth($next_month_start, $this->recur['everyn']) * 24 * 60 * 60);
 
@@ -1890,8 +1857,7 @@ 
 							}    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
 							$daynow = $monthstart + ($monthday - 1) * 24 * 60 * 60;
 							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+						} elseif (isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
 							// Go the correct month
 							$monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
 
@@ -1915,8 +1881,7 @@ 
 							}
 
 							$this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-						}
-						elseif ($this->recur['regen']) {
+						} elseif ($this->recur['regen']) {
 							$year_starttime = $this->gmtime($now);
 							$is_next_leapyear = $this->isLeapYear($year_starttime['tm_year'] + 1900 + 1);    // +1 next year
 							$now = $daystart + ($is_next_leapyear ? 31622400 /* Leap year in seconds */ : 31536000 /* year in seconds */);

mapi/class.baseexception.php

Indentation +125 added lines, -125 removed lines

@@ -17,129 +17,129 @@
  * getTraceAsString() - formated 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;
-
-	/**
-	 * Flag for allow to exception details message or not.
-	 */
-	public $allowToShowDetailsMessage = false;
-
-	/**
-	 * The exception title to show as a message box title at client side.
-	 */
-	public $title;
-
-	/**
-	 * Construct the exception.
-	 *
-	 * @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 title of an exception that will be sent to the client side
-	 * to show it to user.
-	 *
-	 * @param string $title title of an exception
-	 */
-	public function setTitle($title) {
-		$this->title = $title;
-	}
-
-	/**
-	 * @return string returns title that should be sent to client to display as a message box
-	 *                title
-	 */
-	public function getTitle() {
-		return $this->title;
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Name of the class of exception.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return get_class($this);
-	}
-
-	/**
-	 * It will return details error message if allowToShowDetailsMessage is set.
-	 *
-	 * @return string returns details error message
-	 */
-	public function getDetailsMessage() {
-		return $this->allowToShowDetailsMessage ? $this->__toString() : '';
-	}
-
-	// @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;
+
+    /**
+     * Flag for allow to exception details message or not.
+     */
+    public $allowToShowDetailsMessage = false;
+
+    /**
+     * The exception title to show as a message box title at client side.
+     */
+    public $title;
+
+    /**
+     * Construct the exception.
+     *
+     * @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 title of an exception that will be sent to the client side
+     * to show it to user.
+     *
+     * @param string $title title of an exception
+     */
+    public function setTitle($title) {
+        $this->title = $title;
+    }
+
+    /**
+     * @return string returns title that should be sent to client to display as a message box
+     *                title
+     */
+    public function getTitle() {
+        return $this->title;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Name of the class of exception.
+     *
+     * @return string
+     */
+    public function getName() {
+        return get_class($this);
+    }
+
+    /**
+     * It will return details error message if allowToShowDetailsMessage is set.
+     *
+     * @return string returns details error message
+     */
+    public function getDetailsMessage() {
+        return $this->allowToShowDetailsMessage ? $this->__toString() : '';
+    }
+
+    // @TODO getTrace and getTraceAsString
 }

Spacing +2 added lines, -2 removed lines

@@ -54,14 +54,14 @@
 		// assign display message
 		$this->displayMessage = $displayMessage;
 
-		parent::__construct($errorMessage, (int) $code, $previous);
+		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 $this->getBaseFile().':'.$this->getLine();
 	}
 
 	/**