grommunio / mapi-header-php

class.freebusy.php

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
 
 		try {
 			return mapi_msgstore_openentry($store, $localFreeBusyEntryids[self::DELEGATE_PROPERTIES]);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			// Either user store have malformed entryid in PR_FREEBUSY_ENTRYIDS or
 			// No message found of given entryid in 'Freebusy Data' folder.
 			if ($e->getCode() == MAPI_E_NOT_FOUND || $e->getCode() == MAPI_E_INVALID_ENTRYID) {

class.taskrequest.php

Braces +6 added lines, -12 removed lines

@@ -291,8 +291,7 @@ 
 			$props = mapi_getprops($this->message, $senderProps);
 			$props[PR_MESSAGE_CLASS] = 'IPM.Task';
 			mapi_setprops($task, $props);
-		}
-		else {
+		} else {
 			// If there are multiple, just use the first
 			$entryid = $rows[0][PR_ENTRYID];
 
@@ -613,8 +612,7 @@ 
 
 		if (isset($messageprops)) {
 			++$messageprops[$this->props['updatecount']];
-		}
-		else {
+		} else {
 			$messageprops[$this->props['updatecount']] = 1;
 		}
 
@@ -797,8 +795,7 @@ 
 		$props = mapi_getprops($this->message, [$this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']]);
 		if (!$props[$this->props['complete']] && $props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
 			$this->sendResponse(tdmtTaskUpd, _("Task Updated:") . " ");
-		}
-		elseif ($props[$this->props['complete']]) {
+		} elseif ($props[$this->props['complete']]) {
 			$this->sendResponse(tdmtTaskUpd, _("Task Completed:") . " ");
 		}
 
@@ -821,8 +818,7 @@ 
 
 		if (!$ownerentryid) {
 			$store = $this->store;
-		}
-		else {
+		} else {
 			$ab = mapi_openaddressbook($this->session);
 			if (!$ab) {
 				return false;
@@ -964,8 +960,7 @@ 
 				mapi_setprops($sub, [PR_ICON_INDEX => ICON_TASK_ASSIGNER]);
 				if ($messageprops[$this->props['complete']]) {
 					$props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Complete";
-				}
-				else {
+				} else {
 					$props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Update";
 				}
 
@@ -1049,8 +1044,7 @@ 
 			try {
 				$attach = mapi_message_openattach($this->message, $row[PR_ATTACH_NUM]);
 				$task = mapi_attach_openobj($attach);
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				continue;
 			}
 

class.recurrence.php

Braces +28 added lines, -56 removed lines

@@ -51,8 +51,7 @@ 
 	public function __construct($store, $message, $proptags = []) {
 		if (!empty($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));
 		}
 
@@ -538,12 +532,10 @@ 
 				if ($everyn == 1) {
 					$type = dgettext('zarafa', 'workday');
 					$occSingleDayRank = true;
-				}
-				elseif ($everyn == (24 * 60)) {
+				} elseif ($everyn == (24 * 60)) {
 					$type = dgettext('zarafa', 'day');
 					$occSingleDayRank = true;
-				}
-				else {
+				} else {
 					$everyn /= (24 * 60);
 					$type = dgettext('zarafa', 'days');
 					$occSingleDayRank = false;
@@ -554,8 +546,7 @@ 
 				if ($everyn == 1) {
 					$type = dgettext('zarafa', 'week');
 					$occSingleDayRank = true;
-				}
-				else {
+				} else {
 					$type = dgettext('zarafa', 'weeks');
 					$occSingleDayRank = false;
 				}
@@ -565,8 +556,7 @@ 
 				if ($everyn == 1) {
 					$type = dgettext('zarafa', 'month');
 					$occSingleDayRank = true;
-				}
-				else {
+				} else {
 					$type = dgettext('zarafa', 'months');
 					$occSingleDayRank = false;
 				}
@@ -577,8 +567,7 @@ 
 					$everyn = 1;
 					$type = dgettext('zarafa', 'year');
 					$occSingleDayRank = true;
-				}
-				else {
+				} else {
 					$everyn = $everyn / 12;
 					$type = dgettext('zarafa', 'years');
 					$occSingleDayRank = false;
@@ -607,21 +596,17 @@ 
 			if ($occTimeRange) {
 				if ($occSingleDayRank) {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s effective %s from %s to %s.'), $type, $start, $startocc, $endocc);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s %s effective %s from %s to %s.'), $everyn, $type, $start, $startocc, $endocc);
 				}
-			}
-			else {
+			} else {
 				if ($occSingleDayRank) {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s effective %s.'), $type, $start);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s %s effective %s.'), $everyn, $type, $start);
 				}
 			}
-		}
-		elseif ($term == 0x22) {
+		} elseif ($term == 0x22) {
 			// After a number of times
 			if ($occTimeRange) {
 				if ($occSingleDayRank) {
@@ -631,8 +616,7 @@ 
 						'Occurs every %s effective %s for %s occurrences from %s to %s.',
 						$numocc
 					), $type, $start, $numocc, $startocc, $endocc);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dngettext(
 						'zarafa',
 						'Occurs every %s %s effective %s for %s occurrence from %s to %s.',
@@ -640,8 +624,7 @@ 
 						$numocc
 					), $everyn, $type, $start, $numocc, $startocc, $endocc);
 				}
-			}
-			else {
+			} else {
 				if ($occSingleDayRank) {
 					$pattern = sprintf(dngettext(
 						'zarafa',
@@ -649,8 +632,7 @@ 
 						'Occurs every %s effective %s for %s occurrences.',
 						$numocc
 					), $type, $start, $numocc);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dngettext(
 						'zarafa',
 						'Occurs every %s %s effective %s for %s occurrence.',
@@ -659,22 +641,18 @@ 
 					), $everyn, $type, $start, $numocc);
 				}
 			}
-		}
-		elseif ($term == 0x21) {
+		} elseif ($term == 0x21) {
 			// After the given enddate
 			if ($occTimeRange) {
 				if ($occSingleDayRank) {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s effective %s until %s from %s to %s.'), $type, $start, $end, $startocc, $endocc);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s %s effective %s until %s from %s to %s.'), $everyn, $type, $start, $end, $startocc, $endocc);
 				}
-			}
-			else {
+			} else {
 				if ($occSingleDayRank) {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s effective %s until %s.'), $type, $start, $end);
-				}
-				else {
+				} else {
 					$pattern = sprintf(dgettext('zarafa', 'Occurs every %s %s effective %s until %s.'), $everyn, $type, $start, $end);
 				}
 			}
@@ -709,8 +687,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));
 			}
 		}
@@ -1031,8 +1008,7 @@ 
 	public function setExceptionRecipients($message, $exception_recips, $copy_orig_recips = true): void {
 		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);
 		}
 	}
@@ -1073,8 +1049,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
@@ -1148,8 +1123,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
@@ -1168,8 +1142,7 @@ 
 				}
 			}
 			$exception_recips = array_merge($exception_recips, $deletedRecipients);
-		}
-		else {
+		} else {
 			$exception_recips = $recipientRows;
 		}
 
@@ -1213,8 +1186,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.util.php

Braces +6 added lines, -12 removed lines

@@ -67,8 +67,7 @@ 
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		return "NOERROR";
 	}
 
@@ -109,11 +108,9 @@ 
 
 			if (substr($split[2], 0, 2) == "0x") {
 				$id = hexdec(substr($split[2], 2));
-			}
-			elseif (preg_match('/^[1-9][0-9]{0,12}$/', $split[2])) {
+			} elseif (preg_match('/^[1-9][0-9]{0,12}$/', $split[2])) {
 				$id = (int) $split[2];
-			}
-			else {
+			} else {
 				$id = $split[2];
 			}
 
@@ -123,8 +120,7 @@ 
 					$guids[$split[1]] = makeguid($split[1]);
 				}
 				$guid = $guids[$split[1]];
-			}
-			else {
+			} else {
 				$guid = constant($split[1]);
 			}
 
@@ -134,8 +130,7 @@ 
 			$ids["guid"][$num] = $guid;
 			$ids["type"][$num] = $split[0];
 			++$num;
-		}
-		else {
+		} else {
 			// not a named property
 			$props[$name] = $val;
 		}
@@ -266,8 +261,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);
 		}

class.meetingrequest.php

Braces +70 added lines, -140 removed lines

@@ -339,8 +339,7 @@ 
 		if (isset($messageprops[PR_RCVD_REPRESENTING_ENTRYID])) {
 			$delegatorStore = $this->getDelegatorStore($messageprops[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
 			$userStore = $delegatorStore['store'];
-		}
-		else {
+		} else {
 			$userStore = $this->store;
 		}
 
@@ -410,8 +409,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);
@@ -429,8 +427,7 @@ 
 			if ($attach) {
 				$recurringItem = $calendarItem;
 				$calendarItem = mapi_attach_openobj($attach, MAPI_MODIFY);
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -517,8 +514,7 @@ 
 			$props = [];
 			if ($messageprops[$this->proptags['counter_proposal']]) {
 				$props[$this->proptags['counter_proposal']] = true;
-			}
-			else {
+			} else {
 				$props[$this->proptags['counter_proposal']] = false;
 			}
 
@@ -573,8 +569,7 @@ 
 			$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID], [PR_IPM_APPOINTMENT_ENTRYID]);
 
 			$store = $delegatorStore['store'];
-		}
-		else {
+		} else {
 			$store = $this->store;
 		}
 
@@ -601,13 +596,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);
 			}
@@ -661,8 +654,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -725,8 +717,7 @@ 
 		$senderEntryId = isset($messageprops[PR_SENT_REPRESENTING_ENTRYID]) ? $messageprops[PR_SENT_REPRESENTING_ENTRYID] : $messageprops[PR_SENDER_ENTRYID];
 		if (isset($messageprops[PR_RECEIVED_BY_ENTRYID]) && 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);
 		}
 
@@ -789,8 +780,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
@@ -812,8 +802,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]);
 				}
@@ -834,13 +823,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;
 				}
 
@@ -903,8 +890,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
@@ -977,13 +963,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;
 						}
 
@@ -1033,8 +1017,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);
@@ -1080,13 +1063,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;
 						}
 
@@ -1117,8 +1098,7 @@ 
 								],
 							];
 							$recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
-						}
-						else {
+						} else {
 							$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 						}
 
@@ -1131,8 +1111,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Here only properties are set on calendaritem, because user is responding from calendar.
 			$props = [];
 			$props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
@@ -1140,13 +1119,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;
 			}
 
@@ -1169,8 +1146,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);
 
@@ -1182,8 +1158,7 @@ 
 
 					$recurr->createException($proposeNewTimeProps + $props, $basedate, false, $recips);
 				}
-			}
-			else {
+			} else {
 				mapi_setprops($this->message, $proposeNewTimeProps + $props);
 			}
 			mapi_savechanges($this->message);
@@ -1224,8 +1199,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -1319,8 +1293,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$store = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -1352,8 +1325,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]);
 
@@ -1368,14 +1340,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);
@@ -1423,8 +1393,7 @@ 
 
 			// save changes in the message
 			mapi_savechanges($this->message);
-		}
-		else {
+		} else {
 			// cancellation of normal meeting request
 			// Send the cancellation
 			$this->updateMeetingRequest();
@@ -1574,8 +1543,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Basedate found, an exception is to be sent
 			if ($basedate) {
 				$recurr = new Recurrence($this->openDefaultStore(), $this->message);
@@ -1583,8 +1551,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) {
@@ -1603,8 +1570,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// This is normal meeting
 				$resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
 
@@ -1638,8 +1604,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
@@ -1658,8 +1623,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);
@@ -1791,8 +1755,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
@@ -1882,8 +1845,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;
@@ -1912,8 +1874,7 @@ 
 				$delegatorStore = $this->getDelegatorStore($messageProps[PR_RCVD_REPRESENTING_ENTRYID]);
 
 				$store = $delegatorStore['store'];
-			}
-			else {
+			} else {
 				$store = $this->store;
 			}
 		}
@@ -1923,8 +1884,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);
@@ -1950,8 +1910,7 @@ 
 
 		try {
 			$mailuser = mapi_ab_openentry($ab, $ownerentryid);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			return;
 		}
 
@@ -2021,8 +1980,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);
@@ -2034,8 +1992,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']];
@@ -2221,8 +2178,7 @@ 
 			if (!$abitem) {
 				return '';
 			}
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			return '';
 		}
 
@@ -2319,8 +2275,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;
 			}
@@ -2459,8 +2414,7 @@ 
 				],
 			];
 			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recipients = mapi_table_queryallrows($recipientTable, $this->recipprops);
 		}
 
@@ -2556,8 +2510,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
 			}
@@ -2583,8 +2536,7 @@ 
 						 */
 						// $errorSetResource = 2;
 						$this->nonAcceptingResources[] = $resourceRecipients[$i];
-					}
-					else {
+					} else {
 						if ($declineRecurringMeetingRequests && !$cancel) {
 							// Check if appointment is recurring
 							if ($messageprops[$this->proptags['recurring']]) {
@@ -2644,8 +2596,7 @@ 
 					if (!$newResourceMsg) {
 						$newResourceMsg = mapi_folder_createmessage($calFolder);
 					}
-				}
-				else {
+				} else {
 					$newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
 				}
 
@@ -2659,8 +2610,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
@@ -2704,8 +2654,7 @@ 
 						$messageprops[PR_SENT_REPRESENTING_ENTRYID] = $ownerentryid;
 						$messageprops[PR_SENT_REPRESENTING_SEARCH_KEY] = $ownersearchkey;
 					}
-				}
-				else {
+				} else {
 					// get organizer information
 					$addrInfo = $this->getOwnerAddress($this->store);
 
@@ -2741,12 +2690,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
@@ -2770,8 +2717,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.
@@ -2849,8 +2795,7 @@ 
 				],
 			];
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 		}
 
@@ -2868,13 +2813,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;
 		}
 
@@ -2890,8 +2833,7 @@ 
 
 		if ($recurr->isException($basedate)) {
 			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
+		} else {
 			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
 		}
 
@@ -2928,8 +2870,7 @@ 
 
 		if ($recurr->isException($basedate)) {
 			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
+		} else {
 			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
 		}
 
@@ -3028,8 +2969,7 @@ 
 
 			if (!$deletedRecips) {
 				$deletedRecips = array_merge([], $recipients);
-			}
-			else {
+			} else {
 				$deletedRecips = array_merge($deletedRecips, $recipients);
 			}
 		}
@@ -3174,8 +3114,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
 			}
@@ -3343,8 +3282,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);
 
@@ -3508,8 +3446,7 @@ 
 					$message = mapi_attach_openobj($attach, MAPI_MODIFY);
 				}
 			}
-		}
-		else {
+		} else {
 			// use normal message or recurring series message
 			$message = $this->message;
 		}
@@ -3552,8 +3489,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'.
@@ -3591,8 +3527,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore[PR_IPM_APPOINTMENT_ENTRYID];
-		}
-		else {
+		} else {
 			$store = $this->store;
 			$calFolder = $this->openDefaultCalendar();
 		}
@@ -3654,8 +3589,7 @@ 
 			if (isset($props[PR_RCVD_REPRESENTING_ENTRYID])) {
 				$delegatorStore = $this->getDelegatorStore($props[PR_RCVD_REPRESENTING_ENTRYID]);
 				$store = $delegatorStore['store'];
-			}
-			else {
+			} else {
 				$store = $this->store;
 			}
 		}
@@ -3743,8 +3677,7 @@ 
 									++$noOfInstances;
 									break;
 								}
-							}
-							else {
+							} else {
 								++$noOfInstances;
 								break;
 							}
@@ -3755,8 +3688,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']]);
 
@@ -3777,8 +3709,7 @@ 
 								$returnValue = true;
 								break;
 							}
-						}
-						else {
+						} else {
 							$returnValue = true;
 							break;
 						}
@@ -3939,8 +3870,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);

class.baserecurrence.php

Braces +36 added lines, -72 removed lines

@@ -52,8 +52,7 @@ 
 
 		if (is_array($message)) {
 			$this->messageprops = $message;
-		}
-		else {
+		} else {
 			$this->message = $message;
 			$this->messageprops = mapi_getprops($this->message, $this->proptags);
 		}
@@ -241,8 +240,7 @@ 
 
 				if ($ret["subtype"] == rptMonthNth) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -274,8 +272,7 @@ 
 
 				if ($ret["subtype"] == rptMonthNth) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -636,8 +633,7 @@ 
 				if ($this->recur["subtype"] == rptWeek) {
 					// Daily every workday
 					$rdata .= pack("VVVV", 6 * 24 * 60, 1, 0, 0x3E);
-				}
-				else {
+				} else {
 					// Calc first occ
 					$firstocc = $this->unixDataToRecurData($this->recur["start"]) % ((int) $this->recur["everyn"]);
 
@@ -707,8 +703,7 @@ 
 
 				if ($this->recur["regen"]) {
 					$rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-				}
-				else {
+				} else {
 					$rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
 				}
 				break;
@@ -727,8 +722,7 @@ 
 					if ($everyn > 99 || $everyn < 0) {
 						return;
 					}
-				}
-				else {
+				} else {
 					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
 				}
 
@@ -771,18 +765,15 @@ 
 							if ($rtype == IDC_RCEV_PAT_ORB_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
 							}
 
@@ -819,8 +810,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"]);
@@ -848,8 +838,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);
 						}
@@ -858,8 +847,7 @@ 
 							// Set on right month
 							if ($selmonth < $curmonth) {
 								$tmp = 12 - $curmonth + $selmonth;
-							}
-							else {
+							} else {
 								$tmp = ($selmonth - $curmonth);
 							}
 
@@ -872,8 +860,7 @@ 
 								}
 								++$curmonth;
 							}
-						}
-						else {
+						} else {
 							// Check or you exist in the right month
 
 							$dayofweek = gmdate("w", $monthbegindow);
@@ -932,8 +919,7 @@ 
 						}
 						if ($nday == 5) {
 							$monthbegindow -= $day * 24 * 60 * 60;
-						}
-						else {
+						} else {
 							$monthbegindow += ($day - 1) * 24 * 60 * 60;
 						}
 
@@ -947,8 +933,7 @@ 
 							}
 
 							$rdata .= pack("VVVVV", $firstocc, $everyn, 0, $weekdays, $nday);
-						}
-						else {
+						} else {
 							// Calc first occ
 							$monthIndex = (int) gmdate("n", $this->recur["start"]);
 
@@ -991,8 +976,7 @@ 
 		// Strange little thing for the recurrence type "every workday"
 		if ($rtype == IDC_RCEV_PAT_ORB_WEEKLY && ((int) $this->recur["subtype"]) == 1) {
 			$rdata .= pack("V", 1);
-		}
-		else { // Other recurrences
+		} else { // Other recurrences
 			$rdata .= pack("V", 0);
 		}
 
@@ -1069,8 +1053,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));
 						}
@@ -1118,8 +1101,7 @@ 
 									if ($curmonth >= 12) {
 										$curmonth = 1;
 										++$curyear;
-									}
-									else {
+									} else {
 										++$curmonth;
 									}
 									--$forwardcount;
@@ -1130,8 +1112,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;
 									}
 								}
@@ -1147,8 +1128,7 @@ 
 									if ($curmonth >= 12) {
 										$curmonth = 1;
 										++$curyear;
-									}
-									else {
+									} else {
 										++$curmonth;
 									}
 
@@ -1158,8 +1138,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;
 								}
@@ -1226,8 +1205,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;
 		}
 
@@ -1257,12 +1235,10 @@ 
 			if ($occ) {
 				if (isset($reminderprops[$this->proptags["flagdueby"]])) {
 					$propsToSet[$this->proptags["flagdueby"]] = $reminderprops[$this->proptags["flagdueby"]];
-				}
-				else {
+				} else {
 					$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;
@@ -1487,11 +1463,9 @@ 
 	public function getMonthInSeconds($year, $month): int {
 		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;
@@ -1561,8 +1535,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;
@@ -1761,8 +1734,7 @@ 
 
 			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
 			}
 
@@ -1770,8 +1742,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;
 			}
 
@@ -1791,8 +1762,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);
@@ -1816,8 +1786,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;
@@ -1850,8 +1819,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;
@@ -1877,8 +1845,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);
@@ -1896,8 +1863,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);
 
@@ -1924,8 +1890,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;
 
@@ -1948,8 +1913,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 */);

class.taskrecurrence.php

Braces +3 added lines, -6 removed lines

@@ -169,8 +169,7 @@ 
 				}
 
 				$props[$this->proptags["dead_occurrence"]] = false;
-			}
-			else {
+			} else {
 				if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
 					return false;
 				}
@@ -328,8 +327,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']];
 			}
 
@@ -383,8 +381,7 @@ 
 				$props[$this->proptags['flagdueby']] = $next_reminder_time;
 				$this->action['reminder'] = $props[$this->proptags['reminder']] = true;
 			}
-		}
-		else {
+		} else {
 			// Didn't get next occurrence, probably this is the last occurrence
 			$props[$this->proptags['reminder']] = false;
 			$props[$this->proptags['reset_reminder']] = false;