grommunio / grommunio-sync

version.php

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

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);

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.taskrecurrence.php

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;

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);

mapi/mapicode.php

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

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/class.freebusypublish.php

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

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 */);

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/mapi.util.php

Braces +5 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		return "NOERROR";
 	}
 
@@ -98,8 +97,7 @@ 
 
 			if (substr($split[2], 0, 2) == "0x") {
 				$id = hexdec(substr($split[2], 2));
-			}
-			else {
+			} else {
 				$id = $split[2];
 			}
 
@@ -109,8 +107,7 @@ 
 					$guids[$split[1]] = makeguid($split[1]);
 				}
 				$guid = $guids[$split[1]];
-			}
-			else {
+			} else {
 				$guid = constant($split[1]);
 			}
 
@@ -120,8 +117,7 @@ 
 			$ids["guid"][$num] = $guid;
 			$ids["type"][$num] = $split[0];
 			++$num;
-		}
-		else {
+		} else {
 			// not a named property
 			$props[$name] = $val;
 		}
@@ -280,8 +276,7 @@ 
 				$item = $occurrence + $row;
 				array_push($items, $item);
 			}
-		}
-		else {
+		} else {
 			// Normal item, it matched the search criteria and therefore overlaps the interval <$viewstart, $viewend>
 			array_push($items, $row);
 		}

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/mapidefs.php

Spacing +96 added lines, -96 removed lines

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