grommunio / grommunio-sync

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

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

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

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

lib/grommunio/mapiprovider.php

Braces +64 added lines, -128 removed lines

@@ -46,8 +46,7 @@ 
 		$props = mapi_getprops($mapimessage, [PR_MESSAGE_CLASS]);
 		if (isset($props[PR_MESSAGE_CLASS])) {
 			$messageclass = $props[PR_MESSAGE_CLASS];
-		}
-		else {
+		} else {
 			$messageclass = "IPM";
 		}
 
@@ -177,16 +176,14 @@ 
 		if (isset($messageprops[$appointmentprops["reminderset"]]) && $messageprops[$appointmentprops["reminderset"]] == true) {
 			if ($messageprops[$appointmentprops["remindertime"]] == 0x5AE980E1) {
 				$message->reminder = 15;
-			}
-			else {
+			} else {
 				$message->reminder = $messageprops[$appointmentprops["remindertime"]];
 			}
 		}
 
 		if (!isset($message->uid)) {
 			$message->uid = bin2hex($messageprops[$appointmentprops["sourcekey"]]);
-		}
-		else {
+		} else {
 			$message->uid = Utils::GetICalUidFromOLUid($message->uid);
 		}
 
@@ -205,14 +202,12 @@ 
 		if (!empty($messageprops[$appointmentprops["timezonetag"]])) {
 			$tz = $this->getTZFromMAPIBlob($messageprops[$appointmentprops["timezonetag"]]);
 			$appTz = true;
-		}
-		elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
+		} elseif (!empty($messageprops[$appointmentprops["timezonedesc"]])) {
 			// Windows uses UTC in timezone description in opposite to mstzones in TimezoneUtil which uses GMT
 			$wintz = str_replace("UTC", "GMT", $messageprops[$appointmentprops["timezonedesc"]]);
 			$tz = TimezoneUtil::GetFullTZFromTZName(TimezoneUtil::GetTZNameFromWinTZ($wintz));
 			$appTz = true;
-		}
-		else {
+		} else {
 			// set server default timezone (correct timezone should be configured!)
 			$tz = TimezoneUtil::GetFullTZ();
 		}
@@ -252,8 +247,7 @@ 
 			// smtp address is always a proper email address
 			if (isset($row[PR_SMTP_ADDRESS])) {
 				$attendee->email = w2u($row[PR_SMTP_ADDRESS]);
-			}
-			elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
+			} elseif (isset($row[PR_ADDRTYPE], $row[PR_EMAIL_ADDRESS])) {
 				// if address type is SMTP, it's also a proper email address
 				if ($row[PR_ADDRTYPE] == "SMTP") {
 					$attendee->email = w2u($row[PR_EMAIL_ADDRESS]);
@@ -268,8 +262,7 @@ 
 					// @see https://jira.z-hub.io/browse/ZP-1178
 					elseif (isset($row[PR_SEARCH_KEY])) {
 						$attendee->email = w2u($this->getEmailAddressFromSearchKey($row[PR_SEARCH_KEY]));
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_WARN, sprintf("MAPIProvider->getAppointment: The attendee '%s' of type ZARAFA can not be resolved. Code: 0x%X", $row[PR_EMAIL_ADDRESS], mapi_last_hresult()));
 					}
 				}
@@ -331,8 +324,7 @@ 
 
 		if (!isset($message->nativebodytype)) {
 			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+		} elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
 			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
 			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getAppointment(): native body type is undefined. Set it to %d.", $nbt));
 			$message->nativebodytype = $nbt;
@@ -381,8 +373,7 @@ 
 	private function getRecurrence($mapimessage, $recurprops, &$syncMessage, &$syncRecurrence, $tz) {
 		if ($syncRecurrence instanceof SyncTaskRecurrence) {
 			$recurrence = new TaskRecurrence($this->store, $mapimessage);
-		}
-		else {
+		} else {
 			$recurrence = new Recurrence($this->store, $mapimessage);
 		}
 
@@ -606,8 +597,7 @@ 
 
 		if (isset($messageprops[PR_SOURCE_KEY])) {
 			$sourcekey = $messageprops[PR_SOURCE_KEY];
-		}
-		else {
+		} else {
 			$mbe = new SyncObjectBrokenException("The message doesn't have a sourcekey");
 			$mbe->SetSyncObject($message);
 
@@ -638,8 +628,7 @@ 
 
 		if ($fromname) {
 			$from = "\"" . w2u($fromname) . "\" <" . w2u($fromaddr) . ">";
-		}
-		else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
+		} else { // START CHANGED dw2412 HTC shows "error" if sender name is unknown
 			$from = "\"" . w2u($fromaddr) . "\" <" . w2u($fromaddr) . ">";
 		}
 		// END CHANGED dw2412 HTC shows "error" if sender name is unknown
@@ -662,8 +651,7 @@ 
 			// Set Timezone
 			if (isset($props[$meetingrequestproperties["timezonetag"]])) {
 				$tz = $this->getTZFromMAPIBlob($props[$meetingrequestproperties["timezonetag"]]);
-			}
-			else {
+			} else {
 				$tz = TimezoneUtil::GetFullTZ();
 			}
 
@@ -675,12 +663,10 @@ 
 				if (isset($props[$meetingrequestproperties["recReplTime"]])) {
 					$basedate = $props[$meetingrequestproperties["recReplTime"]];
 					$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $this->getGMTTZ());
-				}
-				else {
+				} else {
 					if (!isset($props[$meetingrequestproperties["goidtag"]]) || !isset($props[$meetingrequestproperties["recurStartTime"]]) || !isset($props[$meetingrequestproperties["timezonetag"]])) {
 						SLog::Write(LOGLEVEL_WARN, "Missing property to set correct basedate for exception");
-					}
-					else {
+					} else {
 						$basedate = Utils::ExtractBaseDate($props[$meetingrequestproperties["goidtag"]], $props[$meetingrequestproperties["recurStartTime"]]);
 						$message->meetingrequest->recurrenceid = $this->getGMTTimeByTZ($basedate, $tz);
 					}
@@ -690,8 +676,7 @@ 
 			// Organizer is the sender
 			if (strpos($message->messageclass, "IPM.Schedule.Meeting.Resp") === 0) {
 				$message->meetingrequest->organizer = $message->to;
-			}
-			else {
+			} else {
 				$message->meetingrequest->organizer = $message->from;
 			}
 
@@ -716,12 +701,10 @@ 
 			$message->meetingrequest->instancetype = 0;
 			if (isset($props[$meetingrequestproperties["isrecurringtag"]]) && $props[$meetingrequestproperties["isrecurringtag"]] == 1) {
 				$message->meetingrequest->instancetype = 1;
-			}
-			elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
+			} elseif ((!isset($props[$meetingrequestproperties["isrecurringtag"]]) || $props[$meetingrequestproperties["isrecurringtag"]] == 0) && isset($message->meetingrequest->recurrenceid)) {
 				if (isset($props[$meetingrequestproperties["appSeqNr"]]) && $props[$meetingrequestproperties["appSeqNr"]] == 0) {
 					$message->meetingrequest->instancetype = 2;
-				}
-				else {
+				} else {
 					$message->meetingrequest->instancetype = 3;
 				}
 			}
@@ -735,8 +718,7 @@ 
 				// /set the default reminder time to seconds
 				if ($props[$meetingrequestproperties["remindertime"]] == 0x5AE980E1) {
 					$message->meetingrequest->reminder = 900;
-				}
-				else {
+				} else {
 					$message->meetingrequest->reminder = $props[$meetingrequestproperties["remindertime"]] * 60;
 				}
 			}
@@ -820,8 +802,7 @@ 
 			if (isset($row[PR_ATTACH_NUM])) {
 				if (Request::GetProtocolVersion() >= 12.0) {
 					$attach = new SyncBaseAttachment();
-				}
-				else {
+				} else {
 					$attach = new SyncAttachment();
 				}
 
@@ -867,8 +848,7 @@ 
 						}
 						$stat = mapi_stream_stat($stream);
 						$attach->estimatedDataSize = $stat['cb'];
-					}
-					else {
+					} else {
 						$attach->estimatedDataSize = $attachprops[PR_ATTACH_SIZE];
 					}
 
@@ -893,8 +873,7 @@ 
 					}
 
 					array_push($message->asattachments, $attach);
-				}
-				else {
+				} else {
 					$attach->attsize = $attachprops[PR_ATTACH_SIZE];
 					$attach->attname = sprintf("%s:%s:%s", $entryid, $row[PR_ATTACH_NUM], $parentSourcekey);
 					if (!isset($message->attachments)) {
@@ -922,11 +901,9 @@ 
 
 			if (isset($row[PR_SMTP_ADDRESS])) {
 				$address = $row[PR_SMTP_ADDRESS];
-			}
-			elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
+			} elseif ($addrtype == "SMTP" && isset($row[PR_EMAIL_ADDRESS])) {
 				$address = $row[PR_EMAIL_ADDRESS];
-			}
-			elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
+			} elseif ($addrtype == "ZARAFA" && isset($row[PR_ENTRYID])) {
 				$address = $this->getSMTPAddressFromEntryID($row[PR_ENTRYID]);
 			}
 
@@ -940,20 +917,17 @@ 
 
 			if ($name == "" || $name == $address) {
 				$fulladdr = w2u($address);
-			}
-			else {
+			} else {
 				if (substr($name, 0, 1) != '"' && substr($name, -1) != '"') {
 					$fulladdr = "\"" . w2u($name) . "\" <" . w2u($address) . ">";
-				}
-				else {
+				} else {
 					$fulladdr = w2u($name) . "<" . w2u($address) . ">";
 				}
 			}
 
 			if ($row[PR_RECIPIENT_TYPE] == MAPI_TO) {
 				array_push($message->to, $fulladdr);
-			}
-			elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
+			} elseif ($row[PR_RECIPIENT_TYPE] == MAPI_CC) {
 				array_push($message->cc, $fulladdr);
 			}
 		}
@@ -981,8 +955,7 @@ 
 
 		if (!isset($message->nativebodytype)) {
 			$message->nativebodytype = MAPIUtils::GetNativeBodyType($messageprops);
-		}
-		elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
+		} elseif ($message->nativebodytype == SYNC_BODYPREFERENCE_UNDEFINED) {
 			$nbt = MAPIUtils::GetNativeBodyType($messageprops);
 			SLog::Write(LOGLEVEL_INFO, sprintf("MAPIProvider->getEmail(): native body type is undefined. Set it to %d.", $nbt));
 			$message->nativebodytype = $nbt;
@@ -1071,8 +1044,7 @@ 
 		$folder->serverid = GSync::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folderprops[PR_DISPLAY_NAME]);
 		if ($folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_SUBTREE_ENTRYID] || $folderprops[PR_PARENT_ENTRYID] == $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID]) {
 			$folder->parentid = "0";
-		}
-		else {
+		} else {
 			$folder->parentid = GSync::GetDeviceManager()->GetFolderIdForBackendId(bin2hex($folderprops[PR_PARENT_SOURCE_KEY]));
 		}
 		$folder->displayname = w2u($folderprops[PR_DISPLAY_NAME]);
@@ -1322,8 +1294,7 @@ 
 			$delprops[] = $flagprops["completetime"];
 			$delprops[] = $flagprops["flagstatus"];
 			$delprops[] = $flagprops["flagicon"];
-		}
-		else {
+		} else {
 			$this->setPropsInMAPI($mapimessage, $message->flag, $flagmapping);
 			$props[$flagprops["todoitemsflags"]] = 1;
 			if (isset($message->subject) && strlen($message->subject) > 0) {
@@ -1373,8 +1344,7 @@ 
 		// Get timezone info
 		if (isset($appointment->timezone)) {
 			$tz = $this->getTZFromSyncBlob(base64_decode($appointment->timezone));
-		}
-		else {
+		} else {
 			$tz = false;
 		}
 
@@ -1497,8 +1467,7 @@ 
 						$noexceptions = false;
 						// Delete exception
 						$recurrence->createException([], $basedate, true);
-					}
-					else {
+					} else {
 						// Change exception
 						$mapiexception = ["basedate" => $basedate];
 						// other exception properties which are not handled in recurrence
@@ -1550,8 +1519,7 @@ 
 							$noexceptions = false;
 							if ($recurrence->isException($basedate)) {
 								$recurrence->modifyException($exceptionprops, $basedate);
-							}
-							else {
+							} else {
 								$recurrence->createException($exceptionprops, $basedate);
 							}
 						}
@@ -1563,8 +1531,7 @@ 
 			if ($noexceptions) {
 				$recurrence->setRecurrence($tz, $recur);
 			}
-		}
-		else {
+		} else {
 			$props[$appointmentprops["isrecurring"]] = false;
 		}
 
@@ -1640,8 +1607,7 @@ 
 					$recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
 					$recip[PR_RECIPIENT_FLAGS] = recipSendable;
 					$recip[PR_RECIPIENT_TRACKSTATUS] = isset($attendee->attendeestatus) ? $attendee->attendeestatus : olResponseNone;
-				}
-				else {
+				} else {
 					$recip[PR_DISPLAY_NAME] = u2w($attendee->name);
 					$recip[PR_SEARCH_KEY] = "SMTP:" . $recip[PR_EMAIL_ADDRESS] . "\0";
 					$recip[PR_ADDRTYPE] = "SMTP";
@@ -1727,12 +1693,10 @@ 
 		if (isset($props[$contactprops["businessaddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 2;
 			$this->setMailingAddress($contact->businesscity, $contact->businesscountry, $contact->businesspostalcode, $contact->businessstate, $contact->businessstreet, $props[$contactprops["businessaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["homeaddress"]])) {
+		} elseif (isset($props[$contactprops["homeaddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 1;
 			$this->setMailingAddress($contact->homecity, $contact->homecountry, $contact->homepostalcode, $contact->homestate, $contact->homestreet, $props[$contactprops["homeaddress"]], $props, $contactprops);
-		}
-		elseif (isset($props[$contactprops["otheraddress"]])) {
+		} elseif (isset($props[$contactprops["otheraddress"]])) {
 			$props[$contactprops["mailingaddress"]] = 3;
 			$this->setMailingAddress($contact->othercity, $contact->othercountry, $contact->otherpostalcode, $contact->otherstate, $contact->otherstreet, $props[$contactprops["otheraddress"]], $props, $contactprops);
 		}
@@ -1793,8 +1757,7 @@ 
 			$middlename = (isset($contact->middlename)) ? $contact->middlename : "";
 			$company = (isset($contact->companyname)) ? $contact->companyname : "";
 			$props[$contactprops["fileas"]] = Utils::BuildFileAs($lastname, $firstname, $middlename, $company);
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_DEBUG, "FILEAS_ORDER not defined");
 		}
 
@@ -1833,8 +1796,7 @@ 
 				$props[$taskprops["completion"]] = 1.0;
 				$props[$taskprops["status"]] = 2;
 				$props[$taskprops["reminderset"]] = false;
-			}
-			else {
+			} else {
 				// Set completion to 0%
 				// Set status to 'not started'
 				$props[$taskprops["completion"]] = 0.0;
@@ -1993,12 +1955,10 @@ 
 				if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
 					if (is_array($message->{$asprop})) {
 						$value = array_map("u2wi", $message->{$asprop});
-					}
-					else {
+					} else {
 						$value = u2wi($message->{$asprop});
 					}
-				}
-				else {
+				} else {
 					$value = $message->{$asprop};
 				}
 
@@ -2033,13 +1993,11 @@ 
 				if (is_array($value) && empty($value)) {
 					$propsToDelete[] = $mapiprop;
 					SLog::Write(LOGLEVEL_DEBUG, sprintf("MAPIProvider->setPropsInMAPI(): Property '%s' to be deleted as it is an empty array", $asprop));
-				}
-				else {
+				} else {
 					// all properties will be set at once
 					$propsToSet[$mapiprop] = $value;
 				}
-			}
-			elseif (in_array($asprop, $unsetVars)) {
+			} elseif (in_array($asprop, $unsetVars)) {
 				$propsToDelete[] = $mapiprop;
 			}
 		}
@@ -2099,12 +2057,10 @@ 
 					// Force to actual '0' or '1'
 					if ($messageprops[$mapiprop]) {
 						$message->{$asprop} = 1;
-					}
-					else {
+					} else {
 						$message->{$asprop} = 0;
 					}
-				}
-				else {
+				} else {
 					// Special handling for PR_MESSAGE_FLAGS
 					if ($mapiprop == PR_MESSAGE_FLAGS) {
 						$message->{$asprop} = $messageprops[$mapiprop] & 1;
@@ -2112,15 +2068,12 @@ 
 					elseif ($mapiprop == PR_RTF_COMPRESSED) {
 						// do not send rtf to the mobile
 						continue;
-					}
-					elseif (is_array($messageprops[$mapiprop])) {
+					} elseif (is_array($messageprops[$mapiprop])) {
 						$message->{$asprop} = array_map("w2u", $messageprops[$mapiprop]);
-					}
-					else {
+					} else {
 						if (mapi_prop_type($mapiprop) != PT_BINARY && mapi_prop_type($mapiprop) != PT_MV_BINARY) {
 							$message->{$asprop} = w2u($messageprops[$mapiprop]);
-						}
-						else {
+						} else {
 							$message->{$asprop} = $messageprops[$mapiprop];
 						}
 					}
@@ -2316,17 +2269,14 @@ 
 			// northern hemisphere (july = dst)
 			if ($localtime >= $start && $localtime < $end) {
 				$dst = true;
-			}
-			else {
+			} else {
 				$dst = false;
 			}
-		}
-		else {
+		} else {
 			// southern hemisphere (january = dst)
 			if ($localtime >= $end && $localtime < $start) {
 				$dst = false;
-			}
-			else {
+			} else {
 				$dst = true;
 			}
 		}
@@ -2372,8 +2322,7 @@ 
 			$monthnow = gmdate("n", $date); // gmdate returns 1-12
 			if ($monthnow > $month) {
 				$date = $date - (24 * 7 * 60 * 60);
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -2602,8 +2551,7 @@ 
 				$recur["type"] = 10;
 				if (isset($message->recurrence->dayofweek)) {
 					$recur["subtype"] = 1;
-				}
-				else {
+				} else {
 					$recur["subtype"] = 0;
 				}
 
@@ -2660,12 +2608,10 @@ 
 		if (isset($message->recurrence->until)) {
 			$recur["term"] = 0x21;
 			$recur["end"] = $message->recurrence->until;
-		}
-		elseif (isset($message->recurrence->occurrences)) {
+		} elseif (isset($message->recurrence->occurrences)) {
 			$recur["term"] = 0x22;
 			$recur["numoccur"] = $message->recurrence->occurrences;
-		}
-		else {
+		} else {
 			$recur["term"] = 0x23;
 		}
 
@@ -2745,8 +2691,7 @@ 
 		if ($stream) {
 			$stat = mapi_stream_stat($stream);
 			$streamsize = $stat['cb'];
-		}
-		else {
+		} else {
 			$streamsize = 0;
 		}
 
@@ -2757,24 +2702,20 @@ 
 			if ($bpReturnType == SYNC_BODYPREFERENCE_RTF) {
 				$body = $this->mapiReadStream($stream, $streamsize);
 				$message->asbody->data = StringStreamWrapper::Open(base64_encode($body));
-			}
-			elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
+			} elseif (isset($message->internetcpid) && $bpReturnType == SYNC_BODYPREFERENCE_HTML) {
 				// if PR_HTML is UTF-8 we can stream it directly, else we have to convert to UTF-8 & wrap it
 				if ($message->internetcpid == INTERNET_CPID_UTF8) {
 					$message->asbody->data = MAPIStreamWrapper::Open($stream, $truncateHtmlSafe);
-				}
-				else {
+				} else {
 					$body = $this->mapiReadStream($stream, $streamsize);
 					$message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body), $truncateHtmlSafe);
 					$message->internetcpid = INTERNET_CPID_UTF8;
 				}
-			}
-			else {
+			} else {
 				$message->asbody->data = MAPIStreamWrapper::Open($stream);
 			}
 			$message->asbody->estimatedDataSize = $streamsize;
-		}
-		else {
+		} else {
 			$body = $this->mapiReadStream($stream, $streamsize);
 			$message->body = str_replace("\n", "\r\n", w2u(str_replace("\r", "", $body)));
 			$message->bodysize = $streamsize;
@@ -2814,8 +2755,7 @@ 
 		if (isset($mapiEmail[PR_EC_IMAP_EMAIL]) || MAPIUtils::GetError(PR_EC_IMAP_EMAIL, $mapiEmail) == MAPI_E_NOT_ENOUGH_MEMORY) {
 			$stream = mapi_openproperty($mapimessage, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
 			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->imtoinet(): using PR_EC_IMAP_EMAIL as full RFC822 message");
-		}
-		else {
+		} else {
 			$addrbook = $this->getAddressbook();
 			$stream = mapi_inetmapi_imtoinet($this->session, $addrbook, $mapimessage, ['use_tnef' => -1, 'ignore_missing_attachments' => 1]);
 		}
@@ -2830,8 +2770,7 @@ 
 					$message->asbody->data = MAPIStreamWrapper::Open($stream);
 					$message->asbody->estimatedDataSize = $streamsize;
 					$message->asbody->truncated = 0;
-				}
-				else {
+				} else {
 					$message->mimedata = MAPIStreamWrapper::Open($stream);
 					$message->mimesize = $streamsize;
 					$message->mimetruncated = 0;
@@ -2902,8 +2841,7 @@ 
 			if (Request::GetProtocolVersion() >= 14.0 && $bpo->GetPreview()) {
 				$message->asbody->preview = Utils::Utf8_truncate(MAPIUtils::readPropStream($mapimessage, PR_BODY), $bpo->GetPreview());
 			}
-		}
-		else {
+		} else {
 			// Override 'body' for truncation
 			$truncsize = Utils::GetTruncSize($contentparameters->GetTruncation());
 			$this->setMessageBodyForType($mapimessage, SYNC_BODYPREFERENCE_PLAIN, $message);
@@ -2968,8 +2906,7 @@ 
 				case SYNC_BODYPREFERENCE_MIME:
 					break;
 			}
-		}
-		else {
+		} else {
 			SLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->setASbody either type or data are not set. Setting to empty body");
 			$props[$appointmentprops["body"]] = "";
 		}
@@ -3105,8 +3042,7 @@ 
 						$this->specialFoldersData[] = substr($persistData, 8, $unpackedData['elDataSize']);
 						// Add PersistId and DataElementsSize lengths to the data size as they're not part of it
 						$persistData = substr($persistData, $unpackedData['dataSize'] + 4);
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_INFO, "MAPIProvider->getSpecialFoldersData(): persistent data is not valid");
 						break;
 					}

lib/grommunio/importer.php

Braces +10 added lines, -20 removed lines

@@ -60,13 +60,11 @@ 
 			if ($folderidForBackendId != $this->folderidHex) {
 				$this->prefix = $folderidForBackendId . ':';
 			}
-		}
-		else {
+		} else {
 			$storeprops = mapi_getprops($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];
 			}
 		}
@@ -88,8 +86,7 @@ 
 
 		if ($folderid) {
 			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0, 0);
-		}
-		else {
+		} else {
 			$this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0, 0);
 		}
 	}
@@ -127,8 +124,7 @@ 
 			// possible conflicting messages will be cached here
 			$this->memChanges = new ChangesMemoryWrapper();
 			$stat = mapi_importcontentschanges_config($this->importer, $stream, $flags);
-		}
-		else {
+		} else {
 			$stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
 		}
 
@@ -201,8 +197,7 @@ 
 			$data = mapi_stream_read($this->statestream, 4096);
 			if (strlen($data)) {
 				$state .= $data;
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -395,8 +390,7 @@ 
 
 				return false;
 			}
-		}
-		else {
+		} else {
 			$flags = SYNC_NEW_MESSAGE;
 		}
 
@@ -436,8 +430,7 @@ 
 		$this->lazyLoadConflicts();
 		if ($this->memChanges->IsChanged($id)) {
 			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data from Server will be dropped! PIM deleted object.", $id));
-		}
-		elseif ($this->memChanges->IsDeleted($id)) {
+		} elseif ($this->memChanges->IsDeleted($id)) {
 			SLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data is already deleted. Request will be ignored.", $id));
 
 			return true;
@@ -658,12 +651,10 @@ 
 				$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 				if (GSync::GetBackend()->GetImpersonatedUser() == 'system' && isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
 					$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-				}
-				elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
+				} elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
 					$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
 				}
-			}
-			else {
+			} else {
 				$parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
 			}
 
@@ -726,8 +717,7 @@ 
 			$parentprops = mapi_getprops($this->store, [PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID]);
 			if (GSync::GetBackend()->GetImpersonatedUser() == 'system') {
 				$parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-			}
-			else {
+			} else {
 				$parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
 			}
 			$mapifolder = mapi_msgstore_openentry($this->store, $parentfentryid);

lib/core/redisconnection.php

Braces +3 added lines, -6 removed lines

@@ -48,8 +48,7 @@ 
 	public function getKey($key) {
 		try {
 			return $this->redisObj->get($key);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			SLog::Write(LOGLEVEL_ERROR, sprintf("%s->getKey(): %s", get_class($this), $e->getMessage()));
 		}
 	}
@@ -61,8 +60,7 @@ 
 			}
 
 			return $this->redisObj->set($key, $value);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			SLog::Write(LOGLEVEL_ERROR, sprintf("%s->setKey(): %s", get_class($this), $e->getMessage()));
 		}
 	}
@@ -70,8 +68,7 @@ 
 	public function delKey($key) {
 		try {
 			return $this->redisObj->del($key);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			SLog::Write(LOGLEVEL_ERROR, sprintf("%s->delKey(): %s", get_class($this), $e->getMessage()));
 		}
 	}