grommunio / grommunio-dav

mapi/class.freebusypublish.php

Braces +2 added lines, -4 removed lines

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

mapi/class.taskrecurrence.php

Braces +3 added lines, -6 removed lines

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

mapi/class.recurrence.php

Braces +27 added lines, -54 removed lines

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

mapi/mapi.util.php

Braces +3 added lines, -6 removed lines

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

mapi/class.meetingrequest.php

Braces +57 added lines, -114 removed lines

@@ -376,8 +376,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);
@@ -477,8 +476,7 @@ 
 			$props = [];
 			if ($messageprops[$this->proptags['counter_proposal']]) {
 				$props[$this->proptags['counter_proposal']] = true;
-			}
-			else {
+			} else {
 				$props[$this->proptags['counter_proposal']] = false;
 			}
 			mapi_setprops($calendaritem, $props);
@@ -530,8 +528,7 @@ 
 			$delegatorStore = $this->getDelegatorStore($messageprops);
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 		}
 
@@ -561,8 +558,7 @@ 
 
 							if ($recurr->isException($basedate)) {
 								$recurr->modifyException($messageprops, $basedate);
-							}
-							else {
+							} else {
 								$recurr->createException($messageprops, $basedate);
 							}
 						}
@@ -597,8 +593,7 @@ 
 		if (isset($messageprops[PR_RCVD_REPRESENTING_NAME])) {
 			$delegatorStore = $this->getDelegatorStore($messageprops);
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 		}
 		/*
@@ -613,11 +608,9 @@ 
 			if (!is_array($entryid) && isset($goid2)) {
 				$entryid = $this->findCalendarItems($goid2, $calFolder);
 			}
-		}
-		elseif (isset($goid2)) {
+		} elseif (isset($goid2)) {
 			$entryid = $this->findCalendarItems($goid2, $calFolder);
-		}
-		else {
+		} else {
 			return false;
 		}
 
@@ -675,8 +668,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -783,13 +775,11 @@ 
 				if (isset($props[$this->proptags['intendedbusystatus']])) {
 					if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
 						$props[$this->proptags['busystatus']] = $tentative;
-					}
-					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;
 				}
 				if ($userAction) {
@@ -837,8 +827,7 @@ 
 					mapi_folder_copymessages($calFolder, [$props[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
 				}
 				$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
@@ -899,13 +888,11 @@ 
 						if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
 							if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
 								$calItemProps[$this->proptags['busystatus']] = $tentative;
-							}
-							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;
 						}
 
@@ -935,8 +922,7 @@ 
 							$this->setRecipsFromString($recips, $messageprops[$this->proptags['toattendeesstring']], MAPI_TO);
 							$this->setRecipsFromString($recips, $messageprops[$this->proptags['ccattendeesstring']], MAPI_CC);
 							mapi_message_modifyrecipients($calmsg, 0, $recips);
-						}
-						else {
+						} else {
 							mapi_message_modifyrecipients($calmsg, MODRECIP_ADD, $recips);
 						}
 
@@ -948,8 +934,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);
@@ -967,13 +952,11 @@ 
 						if (isset($props[$this->proptags['intendedbusystatus']])) {
 							if ($tentative && $props[$this->proptags['intendedbusystatus']] !== fbFree) {
 								$props[$this->proptags['busystatus']] = $tentative;
-							}
-							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;
 						}
 
@@ -1008,8 +991,7 @@ 
 							$this->setRecipsFromString($recips, $messageprops[$this->proptags['toattendeesstring']], MAPI_TO);
 							$this->setRecipsFromString($recips, $messageprops[$this->proptags['ccattendeesstring']], MAPI_CC);
 							mapi_message_modifyrecipients($new, 0, $recips);
-						}
-						else {
+						} else {
 							mapi_message_modifyrecipients($new, MODRECIP_ADD, $recips);
 						}
 
@@ -1020,8 +1002,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Here only properties are set on calendaritem, because user is responding from calendar.
 			$props = [];
 			$props[$this->proptags['responsestatus']] = $tentative ? olResponseTentative : olResponseAccepted;
@@ -1029,13 +1010,11 @@ 
 			if (isset($messageprops[$this->proptags['intendedbusystatus']])) {
 				if ($tentative && $messageprops[$this->proptags['intendedbusystatus']] !== fbFree) {
 					$props[$this->proptags['busystatus']] = $tentative;
-				}
-				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;
 			}
 
@@ -1051,8 +1030,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);
 
@@ -1064,8 +1042,7 @@ 
 
 					$recurr->createException($proposeNewTimeProps + $props, $basedate, false, $recips);
 				}
-			}
-			else {
+			} else {
 				mapi_setprops($this->message, $proposeNewTimeProps + $props);
 			}
 			mapi_savechanges($this->message);
@@ -1106,8 +1083,7 @@ 
 
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 			$store = $this->store;
 		}
@@ -1141,8 +1117,7 @@ 
 
 			if ($this->isMeetingRequest()) {
 				$calendaritem = false;
-			}
-			else {
+			} else {
 				$result = false;
 			}
 		}
@@ -1188,8 +1163,7 @@ 
 			$delegatorStore = $this->getDelegatorStore($messageprops);
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 		}
 
@@ -1243,13 +1217,11 @@ 
 
 			// Move the message to the waste basket
 			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 { // remove normal/recurring meeting item.
+			} else { // remove normal/recurring meeting item.
 				// Move the message to the waste basket
 				mapi_folder_copymessages($sourcefolder, [$messageprops[PR_ENTRYID]], $wastebasket, MESSAGE_MOVE);
 			}
@@ -1381,8 +1353,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Basedate found, an exception is to be sent
 			if ($basedate) {
 				$recurr = new Recurrence($this->openDefaultStore(), $this->message);
@@ -1390,8 +1361,7 @@ 
 				if ($cancel) {
 					/* @TODO: remove occurrence from the 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) {
@@ -1410,8 +1380,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// This is normal meeting
 				$resourceRecipData = $this->bookResources($this->message, $cancel, $prefix);
 				if (!$this->errorSetResource) {
@@ -1614,8 +1583,7 @@ 
 	public function getDefaultFolderEntryID($prop) {
 		try {
 			$inbox = mapi_msgstore_getreceivefolder($this->store);
-		}
-		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
@@ -1712,8 +1680,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);
@@ -1725,8 +1692,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']];
@@ -2033,8 +1999,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;
 			}
@@ -2189,8 +2154,7 @@ 
 			$delegate = mapi_getprops($copy_from, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
 			$res = [RES_PROPERTY, [RELOP => RELOP_NE, ULPROPTAG => PR_EMAIL_ADDRESS, VALUE => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]]];
 			$recipients = mapi_table_queryallrows($recipienttable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recipients = mapi_table_queryallrows($recipienttable, $this->recipprops);
 		}
 
@@ -2296,8 +2260,7 @@ 
 						$accessToFolder = true;
 					}
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				$e->setHandled();
 				$this->errorSetResource = 1; // No access
 			}
@@ -2323,8 +2286,7 @@ 
 						 */
 						// $errorSetResource = 2;
 						$this->nonAcceptingResources[] = $resourceRecipients[$i];
-					}
-					else {
+					} else {
 						if ($declineRecurringMeetingRequests && !$cancel) {
 							// Check if appointment is recurring
 							if ($messageprops[$this->proptags['recurring']]) {
@@ -2342,8 +2304,7 @@ 
 								if ($this->isMeetingConflicting($message, $userStore, $calFolder, $messageprops)) {
 									$conflicting = true;
 								}
-							}
-							else {
+							} else {
 								$this->errorSetResource = 1; // No access
 							}
 							if ($conflicting) {
@@ -2398,8 +2359,7 @@ 
 					if (!$newResourceMsg) {
 						$newResourceMsg = mapi_folder_createmessage($calFolder);
 					}
-				}
-				else {
+				} else {
 					$newResourceMsg = mapi_msgstore_openentry($userStore, $rows[0]);
 				}
 
@@ -2413,8 +2373,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
@@ -2453,12 +2412,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
@@ -2481,8 +2438,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.
@@ -2564,8 +2520,7 @@ 
 			$delegate = mapi_getprops($this->message, [PR_RECEIVED_BY_EMAIL_ADDRESS]);
 			$res = [RES_PROPERTY, [RELOP => RELOP_NE, ULPROPTAG => PR_EMAIL_ADDRESS, VALUE => $delegate[PR_RECEIVED_BY_EMAIL_ADDRESS]]];
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops, $res);
-		}
-		else {
+		} else {
 			$recips = mapi_table_queryallrows($reciptable, $this->recipprops);
 		}
 
@@ -2584,13 +2539,11 @@ 
 		if (isset($exception_props[$this->proptags['intendedbusystatus']])) {
 			if ($tentative && $exception_props[$this->proptags['intendedbusystatus']] !== fbFree) {
 				$exception_props[$this->proptags['busystatus']] = $tentative;
-			}
-			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;
 		}
 
@@ -2600,8 +2553,7 @@ 
 		}
 		if ($recurr->isException($basedate)) {
 			$recurr->modifyException($exception_props, $basedate, $recips, $occurrenceItem);
-		}
-		else {
+		} else {
 			$recurr->createException($exception_props, $basedate, false, $recips, $occurrenceItem);
 		}
 
@@ -2694,8 +2646,7 @@ 
 
 			if (!$deletedRecips) {
 				$deletedRecips = array_merge([], $recipients);
-			}
-			else {
+			} else {
 				$deletedRecips = array_merge($deletedRecips, $recipients);
 			}
 		}
@@ -2818,8 +2769,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
 			}
@@ -2979,8 +2929,7 @@ 
 							mapi_savechanges($this->message);
 							$result = true;
 						}
-					}
-					elseif ((isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) ||
+					} elseif ((isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) ||
 						(isset($calendarItemProps[$this->proptags['owner_critical_change']]) && $props[$this->proptags['owner_critical_change']] < $calendarItemProps[$this->proptags['owner_critical_change']])) {
 						// we are not able to find exception, could mean that a significant change has occurred on series
 						// and it deleted all exceptions, so compare with series
@@ -2989,8 +2938,7 @@ 
 						mapi_savechanges($this->message);
 						$result = true;
 					}
-				}
-				elseif ((isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) ||
+				} elseif ((isset($calendarItemProps[$this->proptags['updatecounter']]) && $props[$this->proptags['updatecounter']] < $calendarItemProps[$this->proptags['updatecounter']]) ||
 					(isset($calendarItemProps[$this->proptags['owner_critical_change']]) && $props[$this->proptags['owner_critical_change']] < $calendarItemProps[$this->proptags['owner_critical_change']])) {
 					// normal / recurring series
 
@@ -3061,8 +3009,7 @@ 
 					$message = mapi_attach_openobj($attach, MAPI_MODIFY);
 				}
 			}
-		}
-		else {
+		} else {
 			// use normal message or recurring series message
 			$message = $this->message;
 		}
@@ -3105,8 +3052,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".
@@ -3133,8 +3079,7 @@ 
 			$delegatorStore = $this->getDelegatorStore($props);
 			$store = $delegatorStore['store'];
 			$calFolder = $delegatorStore['calFolder'];
-		}
-		else {
+		} else {
 			$calFolder = $this->openDefaultCalendar();
 		}
 
@@ -3229,8 +3174,7 @@ 
 				}
 
 				$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, $msgprops[$this->proptags['startdate']], $msgprops[$this->proptags['duedate']], [$this->proptags['goid'], $this->proptags['busystatus'], PR_OWNER_APPT_ID]);
 
@@ -3390,8 +3334,7 @@ 
 		foreach ($localCategories as $key => $value) {
 			if ($recurrence->isException($key)) {
 				$recurrence->modifyException([$this->proptags2['categories'] => $value], $key);
-			}
-			else {
+			} else {
 				$recurrence->createException([$this->proptags2['categories'] => $value], $key, false);
 			}
 			mapi_savechanges($message);

mapi/class.taskrequest.php

Braces +5 added lines, -10 removed lines

@@ -325,8 +325,7 @@ 
 			$messageprops = mapi_getprops($this->message, [$this->props['updatecount']]);
 			if (isset($messageprops)) {
 				++$messageprops[$this->props['updatecount']];
-			}
-			else {
+			} else {
 				$messageprops[$this->props['updatecount']] = 1;
 			}
 
@@ -907,17 +906,13 @@ 
 				$body .= "\n" . dgettext("kopano", "Status") . ":\t";
 				if ($msgProps[$this->props['status']] == 0) {
 					$body .= dgettext("kopano", "Not Started");
-				}
-				elseif ($msgProps[$this->props['status']] == 1) {
+				} elseif ($msgProps[$this->props['status']] == 1) {
 					$body .= dgettext("kopano", "In Progress");
-				}
-				elseif ($msgProps[$this->props['status']] == 2) {
+				} elseif ($msgProps[$this->props['status']] == 2) {
 					$body .= dgettext("kopano", "Complete");
-				}
-				elseif ($msgProps[$this->props['status']] == 3) {
+				} elseif ($msgProps[$this->props['status']] == 3) {
 					$body .= dgettext("kopano", "Wait for other person");
-				}
-				elseif ($msgProps[$this->props['status']] == 4) {
+				} elseif ($msgProps[$this->props['status']] == 4) {
 					$body .= dgettext("kopano", "Deferred");
 				}
 			}

mapi/class.baserecurrence.php

Braces +28 added lines, -56 removed lines

@@ -51,8 +51,7 @@ 
 
 			if (is_array($message)) {
 				$this->messageprops = $message;
-			}
-			else {
+			} else {
 				$this->message = $message;
 				$this->messageprops = mapi_getprops($this->message, $this->proptags);
 			}
@@ -207,8 +206,7 @@ 
 				$ret["regen"] = $data["regen"];
 				if ($ret["subtype"] == 3) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -232,8 +230,7 @@ 
 				$ret["regen"] = $data["regen"];
 				if ($ret["subtype"] == 3) {
 					$ret["weekdays"] = $data["monthday"];
-				}
-				else {
+				} else {
 					$ret["monthday"] = $data["monthday"];
 				}
 
@@ -582,8 +579,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;
 					// Calc first occ
@@ -651,8 +647,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;
@@ -669,8 +664,7 @@ 
 				}
 				if ($term == 0x0C /* monthly */) {
 					$everyn = (int) $this->recur["everyn"];
-				}
-				else {
+				} else {
 					$everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
 				}
 
@@ -746,8 +740,7 @@ 
 							$firstocc += $this->getMonthInSeconds(1601 + floor($i / 12), ($i % 12) + 1) / 60;
 						}
 						$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"]);
@@ -774,8 +767,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);
 					}
@@ -784,8 +776,7 @@ 
 						// Set on right month
 						if ($selmonth < $curmonth) {
 							$tmp = 12 - $curmonth + $selmonth;
-						}
-						else {
+						} else {
 							$tmp = ($selmonth - $curmonth);
 						}
 
@@ -797,8 +788,7 @@ 
 							}
 							++$curmonth;
 						}
-					}
-					else {
+					} else {
 						// Check or you exist in the right month
 						for ($i = 0; $i < 7; ++$i) {
 							if ($nday == 5 && (1 << ((gmdate("w", $monthbegindow) - $i) % 7)) & $weekdays) {
@@ -856,8 +846,7 @@ 
 					}
 					if ($nday == 5) {
 						$monthbegindow -= $day * 24 * 60 * 60;
-					}
-					else {
+					} else {
 						$monthbegindow += ($day - 1) * 24 * 60 * 60;
 					}
 
@@ -911,8 +900,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);
 			}
 
@@ -1030,8 +1018,7 @@ 
 							if ($curmonth >= 12) {
 								$curmonth = 1;
 								++$curyear;
-							}
-							else {
+							} else {
 								++$curmonth;
 							}
 							--$forwardcount;
@@ -1042,8 +1029,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;
 							}
 						}
@@ -1057,8 +1043,7 @@ 
 							if ($curmonth >= 12) {
 								$curmonth = 1;
 								++$curyear;
-							}
-							else {
+							} else {
 								++$curmonth;
 							}
 							--$forwardcount;
@@ -1066,8 +1051,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;
 						}
@@ -1133,8 +1117,7 @@ 
 
 				// set named prop 'side_effects' to 369, needed for Outlook to ask for single or total recurrence when deleting
 				mapi_setprops($this->message, [$this->proptags["side_effects"] => 369]);
-			}
-			else {
+			} else {
 				mapi_setprops($this->message, [$this->proptags["side_effects"] => 3441]);
 			}
 
@@ -1164,8 +1147,7 @@ 
 
 				if ($occ) {
 					mapi_setprops($this->message, [$this->proptags["flagdueby"] => $occ[$this->proptags["startdate"]] - ($reminderprops[$this->proptags["reminder_minutes"]] * 60)]);
-				}
-				else {
+				} else {
 					// Last reminder passed, no reminders any more.
 					mapi_setprops($this->message, [$this->proptags["reminder"] => false, $this->proptags["flagdueby"] => 0x7FF00000]);
 				}
@@ -1367,11 +1349,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;
@@ -1441,8 +1421,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;
@@ -1628,8 +1607,7 @@ 
 
 				if ($this->recur['regen'] && isset($this->action['datecompleted'])) {
 					$daystart = $this->dayStartOf($this->action['datecompleted']);
-				}
-				else {
+				} else {
 					$daystart = $this->dayStartOf($this->recur["start"]);
 				} // start on first day of occurrence
 
@@ -1637,8 +1615,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;
 				}
 
@@ -1720,8 +1697,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;
@@ -1748,8 +1724,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);
@@ -1767,8 +1742,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);
 							if ($now <= $dayend) {
@@ -1795,8 +1769,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;
 
@@ -1819,8 +1792,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 */);

version.php

Braces +1 added lines, -2 removed lines

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

lib/PHPWrapper.php

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 		// if the entryid is not available, do the fallback to the sourcekey
 		if (isset($props[PR_ENTRYID])) {
 			$entryid = $props[PR_ENTRYID];
-		}
-		elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
+		} elseif (isset($props[PR_SOURCE_KEY], $props[PR_PARENT_SOURCE_KEY])) {
 			$entryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY], $props[PR_SOURCE_KEY]);
 		}
 		$mapimessage = mapi_msgstore_openentry($this->store, $entryid);
@@ -113,8 +112,7 @@ 
 
 		if ($flags == SYNC_NEW_MESSAGE) {
 			$this->added[] = $url . $this->fileext;
-		}
-		else {
+		} else {
 			$this->modified[] = $url . $this->fileext;
 		}
 
@@ -135,8 +133,7 @@ 
 			$appttsref = $this->syncstate->getAppttsref($this->folderid, bin2hex($sourcekey));
 			if ($appttsref != null) {
 				$this->deleted[] = $appttsref . $this->fileext;
-			}
-			else {
+			} else {
 				$this->deleted[] = bin2hex($sourcekey) . $this->fileext;
 			}
 		}