grommunio / grommunio-sync

lib/core/synccollections.php

Braces +11 added lines, -22 removed lines

@@ -60,8 +60,7 @@ 
 			}
 
 			return true;
-		}
-		catch (GSyncException $e) {
+		} catch (GSyncException $e) {
 		}
 
 		return false;
@@ -165,8 +164,7 @@ 
 
 				return true;
 			}
-		}
-		catch (StateInvalidException $sive) {
+		} catch (StateInvalidException $sive) {
 			// in case there is something wrong with the state, just stop here
 			// later when trying to retrieve the SyncParameters nothing will be found
 
@@ -193,8 +191,7 @@ 
 			try {
 				// make sure the hierarchy cache is loaded when we are loading hierarchy states
 				$this->addparms[$folderid]["state"] = $this->stateManager->GetSyncState($spa->GetLatestSyncKey($confirmedOnly), ($folderid === false));
-			}
-			catch (StateNotFoundException $snfe) {
+			} catch (StateNotFoundException $snfe) {
 				// if we can't find the state, first we should try a sync of that folder, so
 				// we generate a fake change, so a sync on this folder is triggered
 				$this->changes[$folderid] = 1;
@@ -387,8 +384,7 @@ 
 		// take the requested global windowsize or the max 512 if not defined
 		if (isset($this->globalWindowSize)) {
 			$globalWindowSize = $this->globalWindowSize;
-		}
-		else {
+		} else {
 			$globalWindowSize = WINDOW_SIZE_MAX; // 512 by default
 		}
 
@@ -476,19 +472,16 @@ 
 		}
 		if (empty($classes)) {
 			$checkClasses = "policies only";
-		}
-		elseif (array_sum($classes) > 4) {
+		} elseif (array_sum($classes) > 4) {
 			$checkClasses = "";
 			foreach ($classes as $class => $count) {
 				if ($count == 1) {
 					$checkClasses .= sprintf("%s ", $class);
-				}
-				else {
+				} else {
 					$checkClasses .= sprintf("%s(%d) ", $class, $count);
 				}
 			}
-		}
-		else {
+		} else {
 			$checkClasses = implode(" ", array_keys($classes));
 		}
 
@@ -601,8 +594,7 @@ 
 						if ($this->countHierarchyChange(true)) {
 							throw new StatusException("SyncCollections->CheckForChanges(): HierarchySync required.", self::HIERARCHY_CHANGED);
 						}
-					}
-					else {
+					} else {
 						// the backend will notify on the backend folderid
 						$folderid = GSync::GetDeviceManager()->GetFolderIdForBackendId($backendFolderId);
 
@@ -611,8 +603,7 @@ 
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s'", $folderid));
 							$validNotifications = true;
 							$this->waitingTime = time() - $started;
-						}
-						else {
+						} else {
 							SLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s', but it is not relevant", $folderid));
 						}
 					}
@@ -698,8 +689,7 @@ 
 					$changecount = $exporter->GetChangeCount();
 				}
 			}
-		}
-		catch (StatusException $ste) {
+		} catch (StatusException $ste) {
 			if ($ste->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
 				SLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): exporter can not be re-configured due to state error, emulating change in folder to force Sync.");
 				$this->changes[$folderid] = 1;
@@ -767,8 +757,7 @@ 
 
 					$this->hierarchyExporterChecked = true;
 				}
-			}
-			catch (StatusException $ste) {
+			} catch (StatusException $ste) {
 				throw new StatusException("SyncCollections->countHierarchyChange(): exporter can not be re-configured.", self::ERROR_WRONG_HIERARCHY, null, LOGLEVEL_WARN);
 			}
 

lib/core/streamimporter.php

Braces +3 added lines, -6 removed lines

@@ -90,8 +90,7 @@ 
 
 		if ($message->flags === false || $message->flags === SYNC_NEWMESSAGE) {
 			$this->encoder->startTag(SYNC_ADD);
-		}
-		else {
+		} else {
 			// on update of an SyncEmail we only export the flags and categories
 			if ($message instanceof SyncMail && ((isset($message->flag) && $message->flag instanceof SyncMailFlags) || isset($message->categories))) {
 				$newmessage = new SyncMail();
@@ -144,8 +143,7 @@ 
 		++$this->importedMsgs;
 		if ($asSoftDelete) {
 			$this->encoder->startTag(SYNC_SOFTDELETE);
-		}
-		else {
+		} else {
 			$this->encoder->startTag(SYNC_REMOVE);
 		}
 		$this->encoder->startTag(SYNC_SERVERENTRYID);
@@ -227,8 +225,7 @@ 
 		// send a modify flag if the folder is already known on the device
 		if (isset($folder->flags) && $folder->flags === SYNC_NEWMESSAGE) {
 			$this->encoder->startTag(SYNC_FOLDERHIERARCHY_ADD);
-		}
-		else {
+		} else {
 			$this->encoder->startTag(SYNC_FOLDERHIERARCHY_UPDATE);
 		}
 

lib/core/streamer.php

Braces +26 added lines, -52 removed lines

@@ -70,14 +70,11 @@ 
 					$map = $this->mapping[$entity[EN_TAG]];
 					if (isset($map[self::STREAMER_ARRAY])) {
 						$this->{$map[self::STREAMER_VAR]} = [];
-					}
-					elseif (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
+					} elseif (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
 						$this->{$map[self::STREAMER_VAR]} = "1";
-					}
-					elseif (!isset($map[self::STREAMER_TYPE])) {
+					} elseif (!isset($map[self::STREAMER_TYPE])) {
 						$this->{$map[self::STREAMER_VAR]} = "";
-					}
-					elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) {
+					} elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) {
 						$this->{$map[self::STREAMER_VAR]} = "";
 					}
 
@@ -107,15 +104,13 @@ 
 							$decoded = new $map[self::STREAMER_TYPE]();
 
 							$decoded->Decode($decoder);
-						}
-						else {
+						} else {
 							$decoded = $decoder->getElementContent();
 						}
 
 						if (!isset($this->{$map[self::STREAMER_VAR]})) {
 							$this->{$map[self::STREAMER_VAR]} = [$decoded];
-						}
-						else {
+						} else {
 							array_push($this->{$map[self::STREAMER_VAR]}, $decoded);
 						}
 
@@ -144,8 +139,7 @@ 
 							return false;
 						}
 					}
-				}
-				else { // Handle single value
+				} else { // Handle single value
 					if (isset($map[self::STREAMER_TYPE])) {
 						// Complex type, decode recursively
 						if ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) {
@@ -153,8 +147,7 @@ 
 							if (!$decoder->getElementEndTag()) {
 								return false;
 							}
-						}
-						elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
+						} elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
 							$decoded = hex2bin($decoder->getElementContent());
 							if (!$decoder->getElementEndTag()) {
 								return false;
@@ -167,14 +160,12 @@ 
 							if (!$decoder->getElementEndTag()) {
 								return false;
 							}
-						}
-						elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
+						} elseif ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
 							$decoded = StringStreamWrapper::Open($decoder->getElementContent());
 							if (!$decoder->getElementEndTag()) {
 								return false;
 							}
-						}
-						else {
+						} else {
 							$subdecoder = new $map[self::STREAMER_TYPE]();
 							if ($subdecoder->Decode($decoder) === false) {
 								return false;
@@ -188,8 +179,7 @@ 
 								return false;
 							}
 						}
-					}
-					else {
+					} else {
 						// Simple type, just get content
 						$decoded = $decoder->getElementContent();
 
@@ -208,13 +198,11 @@ 
 					// $decoded now contains data object (or string)
 					$this->{$map[self::STREAMER_VAR]} = $decoded;
 				}
-			}
-			elseif ($entity[EN_TYPE] == EN_TYPE_ENDTAG) {
+			} elseif ($entity[EN_TYPE] == EN_TYPE_ENDTAG) {
 				$decoder->ungetElement($entity);
 
 				break;
-			}
-			else {
+			} else {
 				SLog::Write(LOGLEVEL_WBXMLSTACK, "Unexpected content in type");
 
 				break;
@@ -243,8 +231,7 @@ 
 						if (!$res && isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
 							$encoder->startTag($tag, false, true);
 						}
-					}
-					else {
+					} else {
 						SLog::Write(LOGLEVEL_ERROR, sprintf("Streamer->Encode(): parameter '%s' of object %s is not of type Streamer", $map[self::STREAMER_VAR], get_class($this)));
 					}
 				}
@@ -252,8 +239,7 @@ 
 				elseif (isset($map[self::STREAMER_ARRAY])) {
 					if (empty($this->{$map[self::STREAMER_VAR]}) && isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
 						$encoder->startTag($tag, false, true);
-					}
-					else {
+					} else {
 						// Outputs array container (eg Attachments)
 						// Do not output start and end tag when type is STREAMER_TYPE_NO_CONTAINER
 						if (!isset($map[self::STREAMER_PROP]) || $map[self::STREAMER_PROP] != self::STREAMER_TYPE_NO_CONTAINER) {
@@ -265,8 +251,7 @@ 
 								$encoder->startTag($map[self::STREAMER_ARRAY]); // Outputs object container (eg Attachment)
 								$element->Encode($encoder);
 								$encoder->endTag();
-							}
-							else {
+							} else {
 								if (strlen($element) == 0)
 									  // Do not output empty items. Not sure if we should output an empty tag with $encoder->startTag($map[self::STREAMER_ARRAY], false, true);
 									  ; else {
@@ -282,8 +267,7 @@ 
 							$encoder->endTag();
 						}
 					}
-				}
-				else {
+				} else {
 					if (isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_IGNORE) {
 						continue;
 					}
@@ -313,14 +297,11 @@ 
 						if ($this->{$map[self::STREAMER_VAR]} != 0) { // don't output 1-1-1970
 							$encoder->content($this->formatDate($this->{$map[self::STREAMER_VAR]}, $map[self::STREAMER_TYPE]));
 						}
-					}
-					elseif (isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
+					} elseif (isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
 						$encoder->content(strtoupper(bin2hex($this->{$map[self::STREAMER_VAR]})));
-					}
-					elseif (isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
+					} elseif (isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
 						$encoder->contentStream($this->{$map[self::STREAMER_VAR]}, false);
-					}
-					elseif (isset($map[self::STREAMER_TYPE]) && ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASBASE64 || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM)) {
+					} elseif (isset($map[self::STREAMER_TYPE]) && ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASBASE64 || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM)) {
 						$encoder->contentStream($this->{$map[self::STREAMER_VAR]}, true);
 					}
 					// implode comma or semicolon arrays into a string
@@ -328,8 +309,7 @@ 
 						($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_SEMICOLON_SEPARATED)) {
 						$glue = ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED) ? ", " : "; ";
 						$encoder->content(implode($glue, $this->{$map[self::STREAMER_VAR]}));
-					}
-					else {
+					} else {
 						$encoder->content($this->{$map[self::STREAMER_VAR]});
 					}
 					$encoder->endTag();
@@ -357,27 +337,22 @@ 
 			if (isset($this->{$v[self::STREAMER_VAR]})) {
 				if (is_object($this->{$v[self::STREAMER_VAR]}) && method_exists($this->{$v[self::STREAMER_VAR]}, "StripData")) {
 					$this->{$v[self::STREAMER_VAR]}->StripData($flags);
-				}
-				elseif (isset($v[self::STREAMER_ARRAY]) && !empty($this->{$v[self::STREAMER_VAR]})) {
+				} elseif (isset($v[self::STREAMER_ARRAY]) && !empty($this->{$v[self::STREAMER_VAR]})) {
 					foreach ($this->{$v[self::STREAMER_VAR]} as $element) {
 						if (is_object($element) && method_exists($element, "StripData")) {
 							$element->StripData($flags);
-						}
-						elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
+						} elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
 							if ($v[self::STREAMER_PRIVATE] !== true) {
 								$this->{$v[self::STREAMER_VAR]} = $v[self::STREAMER_PRIVATE];
-							}
-							else {
+							} else {
 								unset($this->{$v[self::STREAMER_VAR]});
 							}
 						}
 					}
-				}
-				elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
+				} elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
 					if ($v[self::STREAMER_PRIVATE] !== true) {
 						$this->{$v[self::STREAMER_VAR]} = $v[self::STREAMER_PRIVATE];
-					}
-					else {
+					} else {
 						unset($this->{$v[self::STREAMER_VAR]});
 					}
 				}
@@ -436,8 +411,7 @@ 
 				SLog::Write(LOGLEVEL_DEBUG, sprintf("Streamer->jsonDeserialize(): top class '%s'", $v->gsSyncStateClass));
 				$this->{$k} = new $v->gsSyncStateClass();
 				$this->{$k}->jsonDeserialize($v);
-			}
-			else {
+			} else {
 				$this->{$k} = $v;
 			}
 		}

lib/core/slog.php

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 
 		try {
 			self::getLogger()->Log($loglevel, $message);
-		}
-		catch (\Exception $e) {
+		} catch (\Exception $e) {
 			// @TODO How should we handle logging error ?
 			// Ignore any error.
 		}
@@ -126,8 +125,7 @@ 
 			// if there is an impersonated user it's used instead of the GET user
 			if (Request::GetImpersonatedUser()) {
 				$user = Request::GetImpersonatedUser();
-			}
-			else {
+			} else {
 				list($user) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));
 			}
 

lib/wbxml/wbxmldecoder.php

Braces +5 added lines, -10 removed lines

@@ -33,8 +33,7 @@ 
 	public static function InWhile($name) {
 		if (!isset(self::$loopCounter[$name])) {
 			self::$loopCounter[$name] = 0;
-		}
-		else {
+		} else {
 			++self::$loopCounter[$name];
 		}
 
@@ -119,8 +118,7 @@ 
 					}
 					if ($next[EN_TYPE] == EN_CONTENT) {
 						$element[EN_CONTENT] .= $next[EN_CONTENT];
-					}
-					else {
+					} else {
 						$this->ungetElement($next);
 
 						break;
@@ -293,8 +291,7 @@ 
 				if ($el[EN_FLAGS] & EN_FLAGS_CONTENT) {
 					SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . " <" . $el[EN_TAG] . ">");
 					array_push($this->logStack, $el[EN_TAG]);
-				}
-				else {
+				} else {
 					SLog::Write(LOGLEVEL_WBXML, "I " . $spaces . " <" . $el[EN_TAG] . "/>");
 				}
 				break;
@@ -311,8 +308,7 @@ 
 				$messagesize = strlen($el[EN_CONTENT]);
 				if ($messagesize > 10240 && !defined('WBXML_DEBUGGING')) {
 					$content = substr($el[EN_CONTENT], 0, 10240) . sprintf(" <log message with %d bytes truncated>", $messagesize);
-				}
-				else {
+				} else {
 					$content = $el[EN_CONTENT];
 				}
 				// Log but make sure it's not truncated again (will be slightly bigger than 10KB)
@@ -467,8 +463,7 @@ 
 
 			if ($byte & 0x80) {
 				$uint = $uint << 7;
-			}
-			else {
+			} else {
 				break;
 			}
 		}

lib/wbxml/wbxmlencoder.php

Braces +9 added lines, -18 removed lines

@@ -53,8 +53,7 @@ 
 		if ($this->multipart) {
 			header("Content-Type: application/vnd.ms-sync.multipart");
 			SLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.multipart");
-		}
-		else {
+		} else {
 			header("Content-Type: application/vnd.ms-sync.wbxml");
 			SLog::Write(LOGLEVEL_DEBUG, "WBXMLEncoder->startWBXML() type: vnd.ms-sync.wbxml");
 		}
@@ -86,8 +85,7 @@ 
 
 		// If 'nocontent' is specified, then apparently the user wants to force
 			// output of an empty tag, and we therefore output the stack here
-		}
-		else {
+		} else {
 			$this->_outputStack();
 			$this->_startTag($tag, $nocontent);
 		}
@@ -274,8 +272,7 @@ 
 		if ($opaque) {
 			$this->outByte(self::WBXML_OPAQUE);
 			$this->outMBUInt($stat['size']);
-		}
-		else {
+		} else {
 			$this->outByte(self::WBXML_STR_I);
 		}
 
@@ -344,8 +341,7 @@ 
 			$uint = $uint >> 7;
 			if ($i == 0) {
 				$out = chr($byte) . $out;
-			}
-			else {
+			} else {
 				$out = chr($byte | 0x80) . $out;
 			}
 		}
@@ -390,8 +386,7 @@ 
 
 		if (isset($split["ns"])) {
 			$cp = $this->_dtd["namespaces"][$split["ns"]];
-		}
-		else {
+		} else {
 			$cp = 0;
 		}
 
@@ -417,8 +412,7 @@ 
 		if ($pos) {
 			$ns = substr($fulltag, 0, $pos);
 			$tag = substr($fulltag, $pos + 1);
-		}
-		else {
+		} else {
 			$tag = $fulltag;
 		}
 
@@ -443,8 +437,7 @@ 
 		$spaces = str_repeat(" ", count($this->logStack));
 		if ($nocontent) {
 			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}/>");
-		}
-		else {
+		} else {
 			array_push($this->logStack, $tag);
 			SLog::Write(LOGLEVEL_WBXML, "O " . $spaces . " <{$tag}>");
 		}
@@ -509,11 +502,9 @@ 
 	private function writeLog() {
 		if (ob_get_length() === false) {
 			$data = "output buffer disabled";
-		}
-		elseif (ob_get_length() < 524288) {
+		} elseif (ob_get_length() < 524288) {
 			$data = base64_encode(ob_get_contents());
-		}
-		else {
+		} else {
 			$data = "more than 512K of data";
 		}
 		SLog::Write(LOGLEVEL_WBXML, "WBXML-OUT: " . $data, false);

lib/utils/compat.php

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 			header($protocol . ' ' . $code . ' ' . $text);
 
 			$GLOBALS['http_response_code'] = $code;
-		}
-		else {
+		} else {
 			$code = (isset($GLOBALS['http_response_code']) ? $GLOBALS['http_response_code'] : 200);
 		}
 

lib/utils/timezoneutil.php

Braces +1 added lines, -2 removed lines

@@ -1120,8 +1120,7 @@
 		SLog::Write(LOGLEVEL_DEBUG, "TimezoneUtil::FillTZNames() filling up bias " . $tz["bias"]);
 		if (!isset($tz["bias"])) {
 			SLog::Write(LOGLEVEL_WARN, "TimezoneUtil::FillTZNames() submitted TZ array does not have a bias");
-		}
-		else {
+		} else {
 			$tzname = self::guessTZNameFromOffset($tz);
 			$tz['tzname'] = $tz['tznamedst'] = self::encodeTZName(self::getMSTZnameFromTZName($tzname));
 		}

lib/utils/stringstreamwrapper.php

Braces +2 added lines, -4 removed lines

@@ -87,11 +87,9 @@
 	public function stream_seek($offset, $whence = SEEK_SET) {
 		if ($whence == SEEK_CUR) {
 			$this->position += $offset;
-		}
-		elseif ($whence == SEEK_END) {
+		} elseif ($whence == SEEK_END) {
 			$this->position = $this->stringlength + $offset;
-		}
-		else {
+		} else {
 			$this->position = $offset;
 		}