grommunio / grommunio-sync

lib/log/log.php

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
 					$this->unauthMessageCache = [];
 				}
 				$this->WriteForUser($loglevel, $message);
-			}
-			else {
+			} else {
 				$this->unauthMessageCache[] = [$loglevel, $message];
 			}
 		}
@@ -270,8 +269,7 @@ 
 	protected function GetLogLevelString($loglevel, $pad = false) {
 		if ($pad) {
 			$s = " ";
-		}
-		else {
+		} else {
 			$s = "";
 		}
 

lib/syncobjects/syncprovisioning.php

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
 					self::STREAMER_VAR => "unapprovedinromapplist",
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,
 					self::STREAMER_ARRAY => SYNC_PROVISION_APPNAME,
-				],  // TODO check
+				], // TODO check
 				SYNC_PROVISION_APPROVEDAPPLIST => [
 					self::STREAMER_VAR => "approvedapplist",
 					self::STREAMER_PROP => self::STREAMER_TYPE_SEND_EMPTY,

lib/syncobjects/syncobject.php

Braces +15 added lines, -30 removed lines

@@ -53,8 +53,7 @@ 
 					)) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("%s->emptySupported(): no supported list available, emptying all not set parameters", get_class($this)));
 				$supportedFields = array_keys($this->mapping);
-			}
-			else {
+			} else {
 				return false;
 			}
 		}
@@ -118,14 +117,12 @@ 
 
 						return false;
 					}
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is set in one but not the other object", $val));
 
 					return false;
 				}
-			}
-			else {
+			} else {
 				if (isset($this->{$val}, $odo->{$val})) {
 					if ($strictTypeCompare) {
 						if ($this->{$val} !== $odo->{$val}) {
@@ -133,19 +130,16 @@ 
 
 							return false;
 						}
-					}
-					else {
+					} else {
 						if ($this->{$val} != $odo->{$val}) {
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false on field '%s': '%s' != '%s'", $val, Utils::PrintAsString($this->{$val}), Utils::PrintAsString($odo->{$val})));
 
 							return false;
 						}
 					}
-				}
-				elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
+				} elseif (!isset($this->{$val}) && !isset($odo->{$val})) {
 					continue;
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false because field '%s' is only defined at one obj: '%s' != '%s'", $val, Utils::PrintAsString(isset($this->{$val})), Utils::PrintAsString(isset($odo->{$val}))));
 
 					return false;
@@ -176,8 +170,7 @@ 
 
 			if (array_key_exists($k, $streamerVars)) {
 				$strV = "(S) ";
-			}
-			else {
+			} else {
 				$strV = "";
 			}
 
@@ -187,11 +180,9 @@ 
 				foreach ($v as $value) {
 					$str .= "\t\t" . Utils::PrintAsString($value) . "\n";
 				}
-			}
-			elseif ($v instanceof SyncObject) {
+			} elseif ($v instanceof SyncObject) {
 				$str .= "\t" . $strV . $k . " => " . str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
-			}
-			else {
+			} else {
 				$str .= "\t" . $strV . $k . " => " . (isset($this->{$k}) ? Utils::PrintAsString($this->{$k}) : "null") . "\n";
 			}
 		}
@@ -275,8 +266,7 @@ 
 					if (!$this->{$v[self::STREAMER_VAR]}->Check($logAsDebug)) {
 						return false;
 					}
-				}
-				elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
+				} elseif (is_array($this->{$v[self::STREAMER_VAR]})) {
 					foreach ($this->{$v[self::STREAMER_VAR]} as $subobj) {
 						if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug)) {
 							return false;
@@ -356,8 +346,7 @@ 
 								SLog::Write(LOGLEVEL_ERROR, sprintf("SyncObject->Check(): Can not compare parameter '%s' against the other value '%s' as it is not defined object from type %s. Please report this! Check skipped!", $objClass, $v[self::STREAMER_VAR], $condition));
 
 								continue;
-							}
-							else {
+							} else {
 								$cmpPar = $this->mapping[$condition][self::STREAMER_VAR];
 								if (isset($this->{$cmpPar})) {
 									$cmp = $this->{$cmpPar};
@@ -391,8 +380,7 @@ 
 						if (is_array($this->{$v[self::STREAMER_VAR]})) {
 							// implosion takes 2bytes, so we just assume ", " here
 							$chkstr = implode(", ", $this->{$v[self::STREAMER_VAR]});
-						}
-						else {
+						} else {
 							$chkstr = $this->{$v[self::STREAMER_VAR]};
 						}
 
@@ -416,8 +404,7 @@ 
 						if (is_array($this->{$v[self::STREAMER_VAR]})) {
 							$mails = $this->{$v[self::STREAMER_VAR]};
 							$as_array = true;
-						}
-						else {
+						} else {
 							$mails = [$this->{$v[self::STREAMER_VAR]}];
 						}
 
@@ -425,8 +412,7 @@ 
 						foreach ($mails as $mail) {
 							if (!Utils::CheckEmail($mail)) {
 								SLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
-							}
-							else {
+							} else {
 								$output[] = $mail;
 							}
 						}
@@ -443,8 +429,7 @@ 
 							// if we are allowed to rewrite the attribute, we do that
 							if ($as_array) {
 								$this->{$v[self::STREAMER_VAR]} = $output;
-							}
-							else {
+							} else {
 								$this->{$v[self::STREAMER_VAR]} = $output[0];
 							}
 						}

lib/grommunio/listfolders.php

Braces +3 added lines, -6 removed lines

@@ -76,8 +76,7 @@ 
 	$zarafaAdmin = listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass);
 	if (isset($zarafaAdmin['adminStore'], $options['l'])) {
 		listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
-	}
-	else {
+	} else {
 		echo "Usage:\n" .
 				"listfolders.php [actions] [options]\n\n" .
 				"Actions: [-l username]\n" .
@@ -145,8 +144,7 @@ 
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		$entryid = @mapi_msgstore_createentryid($adminStore, $user);
 	}
 
@@ -212,8 +210,7 @@ 
 		if (version_compare(phpversion("mapi"), $version) == -1) {
 			return false;
 		}
-	}
-	else {
+	} else {
 		return false;
 	}
 

lib/grommunio/mapiphpwrapper.php

Braces +4 added lines, -8 removed lines

@@ -110,20 +110,17 @@ 
 				if ($message->SupportsPrivateStripping()) {
 					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): stripping data of private message from a shared folder");
 					$message->StripData(Streamer::STRIP_PRIVATE_DATA);
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_DEBUG, "PHPWrapper->ImportMessageChange(): ignoring private message from a shared folder");
 
 					return SYNC_E_IGNORE;
 				}
 			}
-		}
-		catch (SyncObjectBrokenException $mbe) {
+		} catch (SyncObjectBrokenException $mbe) {
 			$brokenSO = $mbe->GetSyncObject();
 			if (!$brokenSO) {
 				SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but broken SyncObject available"));
-			}
-			else {
+			} else {
 				if (!isset($brokenSO->id)) {
 					$brokenSO->id = "Unknown ID";
 					SLog::Write(LOGLEVEL_ERROR, sprintf("PHPWrapper->ImportMessageChange(): Caught SyncObjectBrokenException but no ID of object set"));
@@ -137,8 +134,7 @@ 
 		// substitute the MAPI SYNC_NEW_MESSAGE flag by a grommunio-sync proprietary flag
 		if ($flags == SYNC_NEW_MESSAGE) {
 			$message->flags = SYNC_NEWMESSAGE;
-		}
-		else {
+		} else {
 			$message->flags = $flags;
 		}
 

lib/grommunio/mapiutils.php

Spacing +19 added lines, -19 removed lines

@@ -142,7 +142,7 @@ 
 					],
 				], // EXISTS OR
 			],
-		];        // global OR
+		]; // global OR
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 						[
 							RES_CONTENT,
 							[
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 								ULPROPTAG => PR_DISPLAY_NAME,
 								VALUE => $query,
 							],
@@ -186,7 +186,7 @@ 
 						[
 							RES_CONTENT,
 							[
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 								ULPROPTAG => PR_ACCOUNT,
 								VALUE => $query,
 							],
@@ -194,7 +194,7 @@ 
 						[
 							RES_CONTENT,
 							[
-								FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+								FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 								ULPROPTAG => PR_SMTP_ADDRESS,
 								VALUE => $query,
 							],
@@ -678,7 +678,7 @@ 
 				PR_SENT_REPRESENTING_ENTRYID => $props[PR_SENT_REPRESENTING_ENTRYID],
 				PR_SENT_REPRESENTING_SEARCH_KEY => $props[PR_SENT_REPRESENTING_SEARCH_KEY],
 				// mark the message as read if the main message has read flag
-				PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS] | MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
+				PR_MESSAGE_FLAGS => $read ? $mprops[PR_MESSAGE_FLAGS]|MSGFLAG_READ : $mprops[PR_MESSAGE_FLAGS],
 			]);
 		}
 		// TODO check if we need to do this for encrypted (and signed?) message as well
@@ -749,13 +749,13 @@ 
 		$entryId = strtoupper($entryid);
 
 		$res = [
-			'abFlags' => '',  // BYTE[4],  4 bytes,  8 hex characters
-			'guid' => '',  // GUID,    16 bytes, 32 hex characters
-			'version' => '',  // ULONG,    4 bytes,  8 hex characters
-			'type' => '',  // ULONG,    4 bytes,  8 hex characters
-			'id' => '',  // ULONG,    4 bytes,  8 hex characters
-			'server' => '',  // CHAR,    variable length
-			'padding' => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
+			'abFlags' => '', // BYTE[4],  4 bytes,  8 hex characters
+			'guid' => '', // GUID,    16 bytes, 32 hex characters
+			'version' => '', // ULONG,    4 bytes,  8 hex characters
+			'type' => '', // ULONG,    4 bytes,  8 hex characters
+			'id' => '', // ULONG,    4 bytes,  8 hex characters
+			'server' => '', // CHAR,    variable length
+			'padding' => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
 		];
 
 		$res['length'] = strlen($entryId);
@@ -800,13 +800,13 @@ 
 		$entryId = strtoupper($entryid);
 
 		$res = [
-			'abFlags' => '',  // BYTE[4],  4 bytes,  8 hex characters
-			'guid' => '',  // GUID,    16 bytes, 32 hex characters
-			'version' => '',  // ULONG,    4 bytes,  8 hex characters
-			'type' => '',  // ULONG,    4 bytes,  8 hex characters
-			'uniqueId' => '',  // ULONG,   16 bytes,  32 hex characters
-			'server' => '',  // CHAR,    variable length
-			'padding' => '',  // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
+			'abFlags' => '', // BYTE[4],  4 bytes,  8 hex characters
+			'guid' => '', // GUID,    16 bytes, 32 hex characters
+			'version' => '', // ULONG,    4 bytes,  8 hex characters
+			'type' => '', // ULONG,    4 bytes,  8 hex characters
+			'uniqueId' => '', // ULONG,   16 bytes,  32 hex characters
+			'server' => '', // CHAR,    variable length
+			'padding' => '', // TCHAR[3], 4 bytes,  8 hex characters (upto 4 bytes)
 		];
 
 		$res['length'] = strlen($entryId);

Braces +2 added lines, -4 removed lines

@@ -717,8 +717,7 @@ 
 			if ($eid1['length'] < $eid1['min_length'] || $eid1['id'] != $eid2['id']) {
 				return false;
 			}
-		}
-		elseif ($eid1['length'] < $eid1['min_length'] || $eid1['uniqueId'] != $eid2['uniqueId']) {
+		} elseif ($eid1['length'] < $eid1['min_length'] || $eid1['uniqueId'] != $eid2['uniqueId']) {
 			return false;
 		}
 
@@ -855,8 +854,7 @@ 
 			if (substr($entryId, $len - ($offset + 2), $len - $offset) == '00') {
 				$padding .= '00';
 				$offset += 2;
-			}
-			else {
+			} else {
 				// if non-null character found then break the loop
 				break;
 			}

lib/grommunio/grommunio.php

Braces +34 added lines, -68 removed lines

@@ -130,8 +130,7 @@ 
 		if ($this->impersonateUser !== false) {
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
 			$defaultUser = $this->impersonateUser;
-		}
-		else {
+		} else {
 			$defaultUser = $this->mainUser;
 		}
 
@@ -145,8 +144,7 @@ 
 					$gsync_version = 'Grommunio-Sync_' . @constant('GROMMUNIOSYNC_VERSION');
 					$user_agent = ($deviceId) ? GSync::GetDeviceManager()->GetUserAgent() : "unknown";
 					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0, $gsync_version, $user_agent);
-				}
-				else {
+				} else {
 					$this->session = @mapi_logon_zarafa($this->mainUser, $pass, MAPI_SERVER, null, null, 0);
 				}
 				$this->notifications = true;
@@ -163,8 +161,7 @@ 
 					throw new ServiceUnavailableException("Error connecting to KC (login)");
 				}
 			}
-		}
-		catch (MAPIException $ex) {
+		} catch (MAPIException $ex) {
 			throw new AuthenticationRequiredException($ex->getDisplayMessage());
 		}
 
@@ -266,8 +263,7 @@ 
 							$storeProps = mapi_getprops($userstore, [PR_IPM_SUBTREE_ENTRYID]);
 							$rights = $this->HasSecretaryACLs($userstore, '', $storeProps[PR_IPM_SUBTREE_ENTRYID]);
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for secretary ACLs on root folder of impersonated store '%s': '%s'", $user, Utils::PrintAsString($rights)));
-						}
-						else {
+						} else {
 							$zarafauserinfo = @nsp_getuserinfo($this->mainUser);
 							$rights = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ? true : false;
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->Setup(): Checking for admin ACLs on store '%s': '%s'", $user, Utils::PrintAsString($rights)));
@@ -330,8 +326,7 @@ 
 		// for SYSTEM user open the public folders
 		if (strtoupper($this->storeName) == "SYSTEM") {
 			$rootfolder = mapi_msgstore_openentry($this->store, $storeProps[PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
-		}
-		else {
+		} else {
 			$rootfolder = mapi_msgstore_openentry($this->store);
 		}
 
@@ -354,8 +349,7 @@ 
 			$folder = $mapiprovider->GetFolder($row);
 			if ($folder) {
 				$folders[] = $folder;
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->GetHierarchy(): ignoring folder '%s' as MAPIProvider->GetFolder() did not return a SyncFolder object", (isset($row[PR_DISPLAY_NAME]) ? $row[PR_DISPLAY_NAME] : "unknown")));
 			}
 		}
@@ -547,8 +541,7 @@ 
 						PR_ICON_INDEX => 262,
 						PR_LAST_VERB_EXECUTED => 104,
 					];
-				}
-				elseif ($sm->replyflag) {
+				} elseif ($sm->replyflag) {
 					$updateProps = [
 						PR_ICON_INDEX => 261,
 						PR_LAST_VERB_EXECUTED => 102,
@@ -608,8 +601,7 @@ 
 						$mapiprops[$sendMailProps["html"]] = $bodyHtml . "<br><br>" . $fwbodyHtml;
 					}
 				}
-			}
-			else {
+			} else {
 				// no fwmessage could be opened and we need it because we do not replace mime
 				if (!isset($sm->replacemime) || $sm->replacemime == false) {
 					throw new StatusException(sprintf("Grommunio->SendMail(): Could not open message id '%s' in folder id '%s' to be replied/forwarded: 0x%X", $sm->source->itemid, $sm->source->folderid, mapi_last_hresult()), SYNC_COMMONSTATUS_ITEMNOTFOUND);
@@ -657,8 +649,7 @@ 
 		if (!$folderid) {
 			$entryid = hex2bin($id);
 			$sk = $id;
-		}
-		else {
+		} else {
 			// id might be in the new longid format, so we have to split it here
 			list($fsk, $sk) = Utils::SplitMessageId($id);
 			// get the entry id of the message
@@ -751,8 +742,7 @@ 
 			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $embMessage, ['use_tnef' => -1]);
 			// set the default contenttype for this kind of messages
 			$attachment->contenttype = "message/rfc822";
-		}
-		else {
+		} else {
 			$stream = mapi_openproperty($attach, PR_ATTACH_DATA_BIN, IID_IStream, 0, 0);
 		}
 
@@ -764,8 +754,7 @@ 
 		$attachment->data = MAPIStreamWrapper::Open($stream);
 		if (isset($attprops[PR_ATTACH_MIME_TAG])) {
 			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
-		}
-		elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
+		} elseif (isset($attprops[PR_ATTACH_MIME_TAG_W])) {
 			$attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG_W];
 		}
 		// TODO default contenttype
@@ -1164,8 +1153,7 @@ 
 							}
 							++$response->recipientcount;
 							$response->recipient[] = $entry;
-						}
-						elseif (is_int($recipient)) {
+						} elseif (is_int($recipient)) {
 							$response->status = $recipient;
 						}
 					}
@@ -1660,8 +1648,7 @@ 
 			if (isset($stateMessageProps[PR_LAST_MODIFICATION_TIME])) {
 				return $stateMessageProps[PR_LAST_MODIFICATION_TIME];
 			}
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 		}
 
 		return "0";
@@ -1859,8 +1846,7 @@ 
 				if ($devid) {
 					$this->setDeviceUserData($this->userDeviceData, bin2hex($hierarchyRows[0][PR_ENTRYID]), $devid, $this->mainUser, "statefolder");
 				}
-			}
-			elseif ($rowCnt == 0) {
+			} elseif ($rowCnt == 0) {
 				// legacy code: create the hidden state folder and the device subfolder
 				// this should happen when the user configures the device (autodiscover or first sync if no autodiscover)
 
@@ -1872,8 +1858,7 @@ 
 				if ($rowCnt == 1) {
 					$hierarchyRows = mapi_table_queryrows($hierarchy, [PR_ENTRYID], 0, 1);
 					$stateFolder = mapi_msgstore_openentry($this->store, $hierarchyRows[0][PR_ENTRYID]);
-				}
-				elseif ($rowCnt == 0) {
+				} elseif ($rowCnt == 0) {
 					$stateFolder = mapi_folder_createfolder($rootfolder, STORE_STATE_FOLDER, "");
 					mapi_setprops($stateFolder, [PR_ATTR_HIDDEN => true]);
 				}
@@ -1966,8 +1951,7 @@ 
 
 		try {
 			$stateMessage = $this->getStateMessage($devid, $type, $key, $counter);
-		}
-		catch (StateNotFoundException $e) {
+		} catch (StateNotFoundException $e) {
 			// if message is not available, try to create a new one
 			$stateMessage = mapi_folder_createmessage($this->stateFolder, MAPI_ASSOCIATED);
 			SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->setStateMessage(): mapi_folder_createmessage 0x%08X", mapi_last_hresult()));
@@ -2136,8 +2120,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$entryid = @mapi_msgstore_createentryid($this->defaultstore, $user);
 		}
 
@@ -2215,8 +2198,7 @@ 
 		// if oof state is set it must be set of oof and get otherwise
 		if (isset($oof->oofstate)) {
 			$this->settingsOofSet($oof);
-		}
-		else {
+		} else {
 			$this->settingsOofGet($oof);
 		}
 	}
@@ -2251,13 +2233,11 @@ 
 					@mapi_setprops($this->defaultstore, [PR_EC_OUTOFOFFICE => false]);
 					@mapi_deleteprops($this->defaultstore, [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL]);
 					SLog::Write(LOGLEVEL_INFO, "Grommunio->settingsOofGet(): Out of office is set but the from and until are in the past. Disabling out of office.");
-				}
-				elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
+				} elseif ($oofprops[PR_EC_OUTOFOFFICE_FROM] < $oofprops[PR_EC_OUTOFOFFICE_UNTIL]) {
 					$oof->oofstate = SYNC_SETTINGSOOF_TIMEBASED;
 					$oof->starttime = $oofprops[PR_EC_OUTOFOFFICE_FROM];
 					$oof->endtime = $oofprops[PR_EC_OUTOFOFFICE_UNTIL];
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_WARN, sprintf(
 						"Grommunio->settingsOofGet(): Time based out of office set but end time ('%s') is before startime ('%s').",
 						date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]),
@@ -2265,8 +2245,7 @@ 
 					));
 					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 				}
-			}
-			elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
+			} elseif ($oof->oofstate == SYNC_SETTINGSOOF_GLOBAL && (isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) || isset($oofprops[PR_EC_OUTOFOFFICE_UNTIL]))) {
 				SLog::Write(LOGLEVEL_WARN, sprintf(
 					"Grommunio->settingsOofGet(): Time based out of office set but either start time ('%s') or end time ('%s') is missing.",
 					(isset($oofprops[PR_EC_OUTOFOFFICE_FROM]) ? date("Y-m-d H:i:s", $oofprops[PR_EC_OUTOFOFFICE_FROM]) : 'empty'),
@@ -2274,8 +2253,7 @@ 
 				));
 				$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_WARN, "Grommunio->Unable to get out of office information");
 		}
 
@@ -2303,16 +2281,13 @@ 
 				if (isset($oof->starttime, $oof->endtime)) {
 					$props[PR_EC_OUTOFOFFICE_FROM] = $oof->starttime;
 					$props[PR_EC_OUTOFOFFICE_UNTIL] = $oof->endtime;
-				}
-				elseif (isset($oof->starttime) || isset($oof->endtime)) {
+				} elseif (isset($oof->starttime) || isset($oof->endtime)) {
 					$oof->Status = SYNC_SETTINGSSTATUS_PROTOCOLLERROR;
 				}
-			}
-			else {
+			} else {
 				$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
 			}
-		}
-		elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
+		} elseif ($oof->oofstate == SYNC_SETTINGSOOF_DISABLED) {
 			$props[PR_EC_OUTOFOFFICE] = false;
 			$deleteProps = [PR_EC_OUTOFOFFICE_FROM, PR_EC_OUTOFOFFICE_UNTIL];
 		}
@@ -2355,8 +2330,7 @@ 
 				$emailaddresses->primarysmtpaddress = $user["primary_email"];
 				$account->emailaddresses = $emailaddresses;
 				$userinformation->accounts[] = $account;
-			}
-			else {
+			} else {
 				$userinformation->emailaddresses[] = $user["primary_email"];
 			}
 
@@ -2634,13 +2608,11 @@ 
 			// some devices request 0 ambiguous recipients
 			if ($querycnt == 1 && $maxAmbiguousRecipients == 0) {
 				$rowsToQuery = 1;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
+			} elseif ($querycnt > 1 && $maxAmbiguousRecipients == 0) {
 				SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->resolveRecipientGAL(): GAL search found %d recipients but the device hasn't requested ambiguous recipients", $querycnt));
 
 				return $recipientGal;
-			}
-			elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
+			} elseif ($querycnt > 1 && $maxAmbiguousRecipients == 1) {
 				$rowsToQuery = $querycnt;
 			}
 			// get the certificate every time because caching the certificate is less expensive than opening addressbook entry again
@@ -2662,13 +2634,11 @@ 
 							SLog::Write(LOGLEVEL_WBXML, sprintf("Grommunio->resolveRecipientGAL(): distlist's '%s' member: '%s'", $to, $distListMembers[$j][PR_DISPLAY_NAME]));
 							$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $to, $distListMembers[$j], $nrDistListMembers);
 						}
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_DEBUG, sprintf("Grommunio->resolveRecipientGAL(): '%s' is a dist list, but return it as is.", $to));
 						$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
 					}
-				}
-				elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
+				} elseif ($abentries[$i][PR_OBJECT_TYPE] == MAPI_MAILUSER) {
 					$recipientGal[] = $this->createResolveRecipient(SYNC_RESOLVERECIPIENTS_TYPE_GAL, $abentries[$i][PR_SMTP_ADDRESS], $abentries[$i]);
 				}
 			}
@@ -2755,8 +2725,7 @@ 
 					break;
 				}
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->resolveRecipientContact(): Unable to open public store: 0x%X", $result));
 		}
 
@@ -2815,18 +2784,15 @@ 
 
 		if ($type == SYNC_RESOLVERECIPIENTS_TYPE_GAL) {
 			$certificateProp = PR_EMS_AB_TAGGED_X509_CERT;
-		}
-		elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
+		} elseif ($type == SYNC_RESOLVERECIPIENTS_TYPE_CONTACT) {
 			$certificateProp = PR_USER_X509_CERTIFICATE;
-		}
-		else {
+		} else {
 			$certificateProp = null;
 		}
 
 		if (isset($recipientProperties[$certificateProp]) && is_array($recipientProperties[$certificateProp]) && !empty($recipientProperties[$certificateProp])) {
 			$certificates = $this->getCertificates($recipientProperties[$certificateProp], $recipientCount);
-		}
-		else {
+		} else {
 			$certificates = $this->getCertificates(false);
 			SLog::Write(LOGLEVEL_INFO, sprintf("Grommunio->createResolveRecipient(): No certificate found for '%s' (requested email address: '%s')", $recipientProperties[PR_DISPLAY_NAME], $email));
 		}

Spacing +5 added lines, -6 removed lines

@@ -1372,8 +1372,7 @@ 
 
 		// if the search range is set limit the result to it, otherwise return all found messages
 		$rows = (is_array($searchRange) && isset($searchRange[0], $searchRange[1])) ?
-			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) :
-			mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
+			mapi_table_queryrows($table, [PR_ENTRYID], $searchRange[0], $searchRange[1] - $searchRange[0] + 1) : mapi_table_queryrows($table, [PR_ENTRYID], 0, SEARCH_MAXRESULTS);
 
 		$cnt = count($rows);
 		$items['searchtotal'] = $cnt;
@@ -1977,12 +1976,12 @@ 
 			mapi_setprops($stateMessage, [PR_DISPLAY_NAME => $messageName, PR_MESSAGE_CLASS => 'IPM.Note.GrommunioState']);
 		}
 		if (isset($stateMessage)) {
-			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE | JSON_UNESCAPED_UNICODE) : $state;
+			$jsonEncodedState = is_object($state) || is_array($state) ? json_encode($state, JSON_INVALID_UTF8_IGNORE|JSON_UNESCAPED_UNICODE) : $state;
 
 			$encodedState = base64_encode($jsonEncodedState);
 			$encodedStateLength = strlen($encodedState);
 			mapi_setprops($stateMessage, [PR_LAST_VERB_EXECUTED => is_int($counter) ? $counter : 0]);
-			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($stateMessage, PR_BODY, IID_IStream, STGM_DIRECT, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, $encodedStateLength);
 			mapi_stream_write($stream, $encodedState);
 			mapi_stream_commit($stream);
@@ -2077,7 +2076,7 @@ 
 	private function adviseStoreToSink($store) {
 		// check if we already advised the store
 		if (!in_array($store, $this->changesSinkStores)) {
-			mapi_msgstore_advise($store, null, fnevObjectModified | fnevObjectCreated | fnevObjectMoved | fnevObjectDeleted, $this->changesSink);
+			mapi_msgstore_advise($store, null, fnevObjectModified|fnevObjectCreated|fnevObjectMoved|fnevObjectDeleted, $this->changesSink);
 
 			if (mapi_last_hresult()) {
 				SLog::Write(LOGLEVEL_WARN, sprintf("Grommunio->adviseStoreToSink(): failed to advised store '%s' with code 0x%X. Polling will be performed.", $store, mapi_last_hresult()));
@@ -2551,7 +2550,7 @@ 
 					$resOr,
 					[RES_CONTENT,
 						[
-							FUZZYLEVEL => FL_SUBSTRING | FL_IGNORECASE,
+							FUZZYLEVEL => FL_SUBSTRING|FL_IGNORECASE,
 							ULPROPTAG => $property,
 							VALUE => u2w($term),
 						],

lib/grommunio/mapistreamwrapper.php

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
 		if ($this->mapistream) {
 			$stat = mapi_stream_stat($this->mapistream);
 			$this->streamlength = $stat["cb"];
-		}
-		else {
+		} else {
 			$this->streamlength = 0;
 		}
 
@@ -73,8 +72,7 @@ 
 		}
 		if ($this->mapistream) {
 			$data = mapi_stream_read($this->mapistream, $len);
-		}
-		else {
+		} else {
 			$data = "";
 		}
 		$this->position += strlen($data);

lib/grommunio/exporter.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
 
 		// change exporterflags if we are doing a ContentExport
 		if ($this->folderid) {
-			$this->exporterflags |= SYNC_NORMAL | SYNC_READ_STATE;
+			$this->exporterflags |= SYNC_NORMAL|SYNC_READ_STATE;
 
 			// Initial sync, we don't want deleted items. If the initial sync is chunked
 			// we check the change ID of the syncstate (0 at initial sync)
@@ -115,7 +115,7 @@ 
 				if (!($this->flags & BACKEND_DISCARD_DATA)) {
 					SLog::Write(LOGLEVEL_DEBUG, "ExportChangesICS->Config(): syncing initial data");
 				}
-				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS | SYNC_NO_DELETIONS;
+				$this->exporterflags |= SYNC_NO_SOFT_DELETIONS|SYNC_NO_DELETIONS;
 			}
 		}
 

Braces +7 added lines, -14 removed lines

@@ -45,13 +45,11 @@ 
 		try {
 			if ($folderid) {
 				$entryid = mapi_msgstore_entryidfromsourcekey($store, $folderid);
-			}
-			else {
+			} else {
 				$storeprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 				if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
 					$entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				else {
+				} else {
 					$entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
 				}
 			}
@@ -68,16 +66,13 @@ 
 			if ($folder) {
 				if ($folderid) {
 					$this->exporter = mapi_openproperty($folder, PR_CONTENTS_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
-				}
-				else {
+				} else {
 					$this->exporter = mapi_openproperty($folder, PR_HIERARCHY_SYNCHRONIZER, IID_IExchangeExportChanges, 0, 0);
 				}
-			}
-			else {
+			} else {
 				$this->exporter = false;
 			}
-		}
-		catch (MAPIException $me) {
+		} catch (MAPIException $me) {
 			$this->exporter = false;
 			// We return the general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
 			// if this happened while doing content sync, the mobile will try to resync the folderhierarchy
@@ -201,8 +196,7 @@ 
 			// ICS c++ wrapper
 			$mapiimporter = mapi_wrap_importcontentschanges($phpwrapper);
 			$includeprops = false;
-		}
-		else {
+		} else {
 			$mapiimporter = mapi_wrap_importhierarchychanges($phpwrapper);
 			$includeprops = [PR_SOURCE_KEY, PR_DISPLAY_NAME];
 		}
@@ -261,8 +255,7 @@ 
 			$data = mapi_stream_read($this->statestream, 4096);
 			if (strlen($data)) {
 				$state .= $data;
-			}
-			else {
+			} else {
 				break;
 			}
 		}