grommunio / grommunio-sync

mapi/class.taskrequest.php

Spacing +33 added lines, -33 removed lines

@@ -23,12 +23,12 @@ 
 	 * carried in the IPM.TaskRequest item (although this information seems
 	 * redundant due to that information already being available in PR_MESSAGE_CLASS).
 	 */
-	define('tdmtNothing', 0);            // Value in IPM.Task items
-	define('tdmtTaskReq', 1);            // Assigner -> Assignee
-	define('tdmtTaskAcc', 2);            // Assignee -> Assigner
-	define('tdmtTaskDec', 3);            // Assignee -> Assigner
-	define('tdmtTaskUpd', 4);            // Assignee -> Assigner
-	define('tdmtTaskSELF', 5);            // Assigner -> Assigner (?)
+	define('tdmtNothing', 0); // Value in IPM.Task items
+	define('tdmtTaskReq', 1); // Assigner -> Assignee
+	define('tdmtTaskAcc', 2); // Assignee -> Assigner
+	define('tdmtTaskDec', 3); // Assignee -> Assigner
+	define('tdmtTaskUpd', 4); // Assignee -> Assigner
+	define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
 	/* The TaskHistory is used to show the last action on the task
 	 * on both the assigner and the assignee's side.
@@ -38,22 +38,22 @@ 
 	 * the format 'Accepted by <user> on 01-01-2010 11:00'.
 	 */
 	define('thNone', 0);
-	define('thAccepted', 1);            // Set by assignee
-	define('thDeclined', 2);            // Set by assignee
-	define('thUpdated', 3);                // Set by assignee
+	define('thAccepted', 1); // Set by assignee
+	define('thDeclined', 2); // Set by assignee
+	define('thUpdated', 3); // Set by assignee
 	define('thDueDateChanged', 4);
-	define('thAssigned', 5);            // Set by assigner
+	define('thAssigned', 5); // Set by assigner
 
 	/* The TaskState value is used to differentiate the version of a task
 	 * in the assigner's folder and the version in the
 	 * assignee's folder. The buttons shown depend on this and
 	 * the 'taskaccepted' boolean (for the assignee)
 	 */
-	define('tdsNOM', 0);        // Got a response to a deleted task, and re-created the task for the assigner
-	define('tdsOWNNEW', 1);        // Not assigned
-	define('tdsOWN', 2);        // Assignee version
-	define('tdsACC', 3);        // Assigner version
-	define('tdsDEC', 4);        // Assigner version, but assignee declined
+	define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+	define('tdsOWNNEW', 1); // Not assigned
+	define('tdsOWN', 2); // Assignee version
+	define('tdsACC', 3); // Assigner version
+	define('tdsDEC', 4); // Assigner version, but assignee declined
 
 	/* The TaskAcceptanceState is used for the assigner to indicate state */
 	define('olTaskNotDelegated', 0);
@@ -63,13 +63,13 @@ 
 
 	/* The task ownership indicates the role of the current user relative to the task. */
 	define('olNewTask', 0);
-	define('olDelegatedTask', 1);    // Task has been assigned
-	define('olOwnTask', 2);            // Task owned
+	define('olDelegatedTask', 1); // Task has been assigned
+	define('olOwnTask', 2); // Task owned
 
 	/* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
 	define('tmrNone', 0);
-	define('tmrSent', 1);        // Task has been sent to multiple assignee
-	define('tmrReceived', 2);    // Task Request received has multiple assignee
+	define('tmrSent', 1); // Task has been sent to multiple assignee
+	define('tmrReceived', 2); // Task Request received has multiple assignee
 
 	// Task icon index.
 	define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -307,7 +307,7 @@ 
 					VALUE => $goid, ],
 				];
 
-				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+				$table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
 				$softDeletedItems = mapi_table_queryallrows($table, [PR_ENTRYID], $restriction);
 				if (!empty($softDeletedItems)) {
 					return true;
@@ -515,14 +515,14 @@ 
 			// Set properties on Task Request
 			mapi_setprops($this->message, [
 				$this->props['task_goid'] => $taskid, /* our new task_goid */
-				$this->props['taskstate'] => tdsACC,         /* state for our outgoing request */
-				$this->props['taskmode'] => tdmtNothing,     /* we're not sending a change */
-				$this->props['updatecount'] => 2,            /* version 2 (no idea) */
+				$this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+				$this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+				$this->props['updatecount'] => 2, /* version 2 (no idea) */
 				$this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
 				$this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-				$this->props['taskhistory'] => thAssigned,    /* Task has been assigned */
+				$this->props['taskhistory'] => thAssigned, /* Task has been assigned */
 				PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
-				PR_ICON_INDEX => ICON_TASK_ASSIGNER,         /* Task request icon */
+				PR_ICON_INDEX => ICON_TASK_ASSIGNER, /* Task request icon */
 			]);
 			$this->setLastUser();
 			$this->setOwnerForAssignor();
@@ -537,10 +537,10 @@ 
 
 			// Make it a task request, and put it in sent items after it is sent
 			mapi_setprops($outgoing, [
-				PR_MESSAGE_CLASS => "IPM.TaskRequest",         /* class is task request */
-				$this->props['taskstate'] => tdsOWN,         /* for the recipient he is the task owner */
-				$this->props['taskmode'] => tdmtTaskReq,    /* for the recipient it's a request */
-				$this->props['updatecount'] => 1,            /* version 2 is in the attachment */
+				PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+				$this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+				$this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+				$this->props['updatecount'] => 1, /* version 2 is in the attachment */
 				PR_SUBJECT_PREFIX => $prefix,
 				PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT],
 			]);
@@ -551,7 +551,7 @@ 
 				PR_ATTACHMENT_HIDDEN => true,
 				PR_DISPLAY_NAME => $messageprops[PR_SUBJECT], ]);
 
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
 			mapi_copyto($this->message, [], [], $sub);
 			mapi_savechanges($sub);
@@ -890,7 +890,7 @@ 
 
 			$attach = mapi_message_createattach($outgoing);
 			mapi_setprops($attach, [PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true]);
-			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+			$sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
 			$message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -943,7 +943,7 @@ 
 			// edit response before sending task response.
 			if ($this->taskCommentsInfo) {
 				$comments = $this->getTaskCommentsInfo();
-				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+				$stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
 				mapi_stream_setsize($stream, strlen($comments));
 				mapi_stream_write($stream, $comments);
 				mapi_stream_commit($stream);
@@ -1206,7 +1206,7 @@ 
 				}
 
 				foreach ($recips as $recip) {
-					$recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+					$recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
 					mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, [$recip]);
 				}
 

mapi/mapi.util.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 			 * we have to manually typecast value to integer, so float will be converted in integer,
 			 * but still its out of bound for integer limit so it will be auto adjusted to minus value
 			 */
-			if ($errcode == (int) $value) {
+			if ($errcode == (int)$value) {
 				// Check that we have an actual MAPI error or warning definition
 				$prefix = substr($key, 0, 7);
 				if ($prefix == "MAPI_E_" || $prefix == "MAPI_W_") {
@@ -167,7 +167,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_REMOTE_VALID($value) {
-	return (bool) ($value & DTE_FLAG_REMOTE_VALID);
+	return (bool)($value & DTE_FLAG_REMOTE_VALID);
 }
 
 /**
@@ -176,7 +176,7 @@ 
  * @param mixed $value
  */
 function DTE_IS_ACL_CAPABLE($value) {
-	return (bool) ($value & DTE_FLAG_ACL_CAPABLE);
+	return (bool)($value & DTE_FLAG_ACL_CAPABLE);
 }
 
 function DTE_REMOTE($value) {
@@ -226,7 +226,7 @@ 
 			RES_OR,
 			[
 				[
-					RES_AND,    // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
+					RES_AND, // Normal items: itemEnd must be after viewStart, itemStart must be before viewEnd
 					[
 						[
 							RES_PROPERTY,
@@ -256,7 +256,7 @@ 
 					],
 				],
 			], // EXISTS OR
-		];        // global OR
+		]; // global OR
 
 	// Get requested properties, plus whatever we need
 	$proplist = [PR_ENTRYID, $properties["recurring"], $properties["recurring_data"], $properties["timezone_data"]];

mapi/class.meetingrequest.php

Spacing +23 added lines, -23 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;
 		}
 
@@ -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.
@@ -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],
 					],
@@ -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],
 					],
@@ -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,7 +3209,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
-			$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];
 			}
@@ -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]);
 		}
 	}
 

mapi/class.baserecurrence.php

Switch Indentation +143 added lines, -143 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);
+					case 10:
+						// Daily
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1440;
 						}
-					}
-					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
+
+						if ($this->recur["subtype"] == 0) {
+							// Every Nth day
+							for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += 60 * $this->recur["everyn"]) {
 								$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
 							}
 						}
-					}
-
-					break;
+						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);
+								}
+							}
+						}
 
-				case 11:
-					// Weekly
-					if ($this->recur["everyn"] <= 0) {
-						$this->recur["everyn"] = 1;
-					}
+						break;
 
-					// If sliding flag is set then move to 'n' weeks
-					if ($this->recur['regen']) {
-						$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
-					}
+					case 11:
+						// Weekly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
+						}
 
-					for ($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"])) {
+						// If sliding flag is set then move to 'n' weeks
 						if ($this->recur['regen']) {
-							$this->processOccurrenceItem($items, $start, $end, $now, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
+							$daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
 						}
-						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);
+
+						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;
-					}
+						break;
 
-					// 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);
-							}
+					case 12:
+						// Monthly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 1;
 						}
-						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
+						// 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 ($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;
+								// 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;
+											break;
+										}
 									}
+									// $firstday is the day of the month on which the asked pattern of nth weekday matches
+									$daynow = $now + $firstday * 60 * 60 * 24;
 								}
-								// $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);
+								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);
+									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);
+								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);
+							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);
+								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;
-					}
+						break;
 
-					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);
+					case 13:
+						// Yearly
+						if ($this->recur["everyn"] <= 0) {
+							$this->recur["everyn"] = 12;
 						}
-						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
+						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;
+									if ($this->recur["weekdays"] & (1 << $nowtime["tm_wday"])) { // Selected ?
+										$firstday = $wday;
 
-									break;
+										break;
+									}
 								}
-							}
 
-							// Same as above (monthly)
-							$daynow = $monthnow + ($firstday + ($this->recur["nday"] - 1) * 7) * 60 * 60 * 24;
+								// 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;
-							}
+								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 */);
+								$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 ($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 +74 added lines, -74 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
@@ -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) {

mapi/class.baseexception.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		// assign display message
 		$this->displayMessage = $displayMessage;
 
-		parent::__construct($errorMessage, (int) $code, $previous);
+		parent::__construct($errorMessage, (int)$code, $previous);
 	}
 
 	/**

mapi/class.taskrecurrence.php

Spacing +1 added lines, -1 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);