grommunio / grommunio-sync

lib/utils/g_RFC822.php

Spacing +13 added lines, -13 removed lines

@@ -294,7 +294,7 @@ 
 
 			// First check there's a colon at all:
 			if (strpos($string, ':') === false) {
-				$this->error = 'Invalid address: ' . $string;
+				$this->error = 'Invalid address: '.$string;
 
 				return false;
 			}
@@ -376,7 +376,7 @@ 
 				$this->_hasUnclosedBrackets($string, '()') ||
 				substr($string, -1) == '\\') {
 				if (isset($parts[$i + 1])) {
-					$string = $string . $char . $parts[$i + 1];
+					$string = $string.$char.$parts[$i + 1];
 				}
 				else {
 					$this->error = 'Invalid address spec. Unclosed bracket or quotes';
@@ -449,7 +449,7 @@ 
 		$this->_hasUnclosedBracketsSub($string, $num_angle_end, $chars[1]);
 
 		if ($num_angle_start < $num_angle_end) {
-			$this->error = 'Invalid address spec. Unmatched quote or bracket (' . $chars . ')';
+			$this->error = 'Invalid address spec. Unmatched quote or bracket ('.$chars.')';
 
 			return false;
 		}
@@ -473,7 +473,7 @@ 
 				--$num;
 			}
 			if (isset($parts[$i + 1])) {
-				$parts[$i + 1] = $parts[$i] . $char . $parts[$i + 1];
+				$parts[$i + 1] = $parts[$i].$char.$parts[$i + 1];
 			}
 		}
 
@@ -512,7 +512,7 @@ 
 				$structure->groupname = $groupname;
 			}
 
-			$address['address'] = ltrim(substr($address['address'], strlen($groupname . ':')));
+			$address['address'] = ltrim(substr($address['address'], strlen($groupname.':')));
 		}
 
 		// If a group then split on comma and put into an array.
@@ -521,7 +521,7 @@ 
 			while (strlen($address['address']) > 0) {
 				$parts = explode(',', $address['address']);
 				$addresses[] = $this->_splitCheck($parts, ',');
-				$address['address'] = trim(substr($address['address'], strlen(end($addresses) . ',')));
+				$address['address'] = trim(substr($address['address'], strlen(end($addresses).',')));
 			}
 		}
 		else {
@@ -539,7 +539,7 @@ 
 		for ($i = 0; $i < count($addresses); ++$i) {
 			if (!$this->validateMailbox($addresses[$i])) {
 				if (empty($this->error)) {
-					$this->error = 'Validation failed for: ' . $addresses[$i];
+					$this->error = 'Validation failed for: '.$addresses[$i];
 				}
 
 				return false;
@@ -688,7 +688,7 @@ 
 				$comments[] = $comment;
 
 				// +2 is for the brackets
-				$_mailbox = substr($_mailbox, strpos($_mailbox, '(' . $comment) + strlen($comment) + 2);
+				$_mailbox = substr($_mailbox, strpos($_mailbox, '('.$comment) + strlen($comment) + 2);
 			}
 			else {
 				break;
@@ -707,11 +707,11 @@ 
 			$name = $this->_splitCheck($parts, '<');
 
 			$phrase = trim($name);
-			$route_addr = trim(substr($mailbox, strlen($name . '<'), -1));
+			$route_addr = trim(substr($mailbox, strlen($name.'<'), -1));
 
 			// grommunio-sync fix for umlauts and other special chars
 			if (substr($phrase, 0, 1) != '"' && substr($phrase, -1) != '"') {
-				$phrase = '"' . $phrase . '"';
+				$phrase = '"'.$phrase.'"';
 			}
 
 			if ($this->_validatePhrase($phrase) === false || ($route_addr = $this->_validateRouteAddr($route_addr)) === false) {
@@ -792,7 +792,7 @@ 
 				return false;
 			}
 
-			$addr_spec = substr($route_addr, strlen($route . ':'));
+			$addr_spec = substr($route_addr, strlen($route.':'));
 
 			// Validate addr-spec part.
 			if (($addr_spec = $this->_validateAddrSpec($addr_spec)) === false) {
@@ -915,7 +915,7 @@ 
 		if (strpos($addr_spec, '@') !== false) {
 			$parts = explode('@', $addr_spec);
 			$local_part = $this->_splitCheck($parts, '@');
-			$domain = substr($addr_spec, strlen($local_part . '@'));
+			$domain = substr($addr_spec, strlen($local_part.'@'));
 
 		// No @ sign so assume the default domain.
 		}
@@ -1023,7 +1023,7 @@ 
 	 * @return bool always false as there was an error
 	 */
 	public function raiseError($message) {
-		SLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: " . $message);
+		SLog::Write(LOGLEVEL_ERROR, "z_RFC822 error: ".$message);
 
 		return false;
 	}

lib/utils/utils.php

Spacing +10 added lines, -10 removed lines

@@ -65,17 +65,17 @@ 
 			$zcs = $zip;
 		}
 		if (isset($city) && $city != "") {
-			$zcs .= (($zcs) ? " " : "") . $city;
+			$zcs .= (($zcs) ? " " : "").$city;
 		}
 		if (isset($state) && $state != "") {
-			$zcs .= (($zcs) ? " " : "") . $state;
+			$zcs .= (($zcs) ? " " : "").$state;
 		}
 		if ($zcs) {
-			$out = $zcs . "\r\n" . $out;
+			$out = $zcs."\r\n".$out;
 		}
 
 		if (isset($street) && $street != "") {
-			$out = $street . (($out) ? "\r\n\r\n" . $out : "");
+			$out = $street.(($out) ? "\r\n\r\n".$out : "");
 		}
 
 		return ($out) ? $out : null;
@@ -94,7 +94,7 @@ 
 	public static function BuildFileAs($lastname = "", $firstname = "", $middlename = "", $company = "") {
 		if (defined('FILEAS_ORDER')) {
 			$fileas = $lastfirst = $firstlast = "";
-			$names = trim($firstname . " " . $middlename);
+			$names = trim($firstname." ".$middlename);
 			$lastname = trim($lastname);
 			$company = trim($company);
 
@@ -257,7 +257,7 @@ 
 			$OLUid .= pack("V", 1);
 			$OLUid .= $icalUid;
 
-			return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000" . bin2hex($OLUid) . "00");
+			return hex2bin("040000008200E00074C5B7101A82E0080000000000000000000000000000000000000000".bin2hex($OLUid)."00");
 		}
 
 		return hex2bin($icalUid);
@@ -409,7 +409,7 @@ 
 	 */
 	public static function Utf8_truncate($string, $length, $htmlsafe = false) {
 		// make sure length is always an integer
-		$length = (int) $length;
+		$length = (int)$length;
 
 		// if the input string is shorter then the trunction, make sure it's valid UTF-8!
 		if (strlen($string) <= $length) {
@@ -479,7 +479,7 @@ 
 	 * @return bool
 	 */
 	public static function IsBase64String($string) {
-		return (bool) preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
+		return (bool)preg_match("#^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+\\/]{3}=|[A-Za-z0-9+/]{4})?$#", $string);
 	}
 
 	/**
@@ -975,7 +975,7 @@ 
 	}
 
 	if (function_exists("iconv")) {
-		return @iconv("UTF-8", "Windows-1252" . $option, $string);
+		return @iconv("UTF-8", "Windows-1252".$option, $string);
 	}
 
 	return utf8_decode($string); // no euro support here
@@ -988,7 +988,7 @@ 
 	}
 
 	if (function_exists("iconv")) {
-		return @iconv("Windows-1252", "UTF-8" . $option, $string);
+		return @iconv("Windows-1252", "UTF-8".$option, $string);
 	}
 
 	return utf8_encode($string); // no euro support here

lib/exceptions/gsyncexception.php

Spacing +3 added lines, -3 removed lines

@@ -23,12 +23,12 @@
 			$logLevel = $this->defaultLogLevel;
 		}
 
-		parent::__construct($message, (int) $code);
-		SLog::Write($logLevel, get_class($this) . ': ' . $message . ' - code: ' . $code . ' - file: ' . $this->getFile() . ':' . $this->getLine(), false);
+		parent::__construct($message, (int)$code);
+		SLog::Write($logLevel, get_class($this).': '.$message.' - code: '.$code.' - file: '.$this->getFile().':'.$this->getLine(), false);
 	}
 
 	public function getHTTPCodeString() {
-		return $this->httpReturnCode . " " . $this->httpReturnMessage;
+		return $this->httpReturnCode." ".$this->httpReturnMessage;
 	}
 
 	public function getHTTPHeaders() {

lib/exceptions/httpreturncodeexception.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 		if ($code) {
 			$this->httpReturnCode = $code;
 		}
-		parent::__construct($message, (int) $code, $previous, $logLevel);
+		parent::__construct($message, (int)$code, $previous, $logLevel);
 	}
 }

lib/exceptions/serviceunavailableexception.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	public function __construct($message = "", $code = 0, $previous = null, $logLevel = false) {
 		parent::__construct($message, $code, $previous, $logLevel);
 		if (RETRY_AFTER_DELAY !== false) {
-			$this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
+			$this->httpHeaders[] = 'Retry-After: '.RETRY_AFTER_DELAY;
 		}
 	}
 }

config.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	define('TIMEZONE', '');
 
 	// Defines the base path on the server
-	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . '/');
+	define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 
 	// Try to set unlimited timeout
 	define('SCRIPT_TIMEOUT', 0);
@@ -80,8 +80,8 @@ 
 
 	// Filelog settings
 	define('LOGFILEDIR', '/var/log/grommunio-sync/');
-	define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
-	define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-error.log');
+	define('LOGFILE', LOGFILEDIR.'grommunio-sync.log');
+	define('LOGERRORFILE', LOGFILEDIR.'grommunio-sync-error.log');
 
 	// Syslog settings
 	// false will log to local syslog, otherwise put the remote syslog IP here

index.php

Spacing +6 added lines, -6 removed lines

@@ -100,13 +100,13 @@ 
 		header(GSync::GetServerHeader());
 
 		if (RequestProcessor::isUserAuthenticated()) {
-			header("X-Grommunio-Sync-Version: " . @constant('GROMMUNIOSYNC_VERSION'));
+			header("X-Grommunio-Sync-Version: ".@constant('GROMMUNIOSYNC_VERSION'));
 
 			// announce the supported AS versions (if not already sent to device)
 			if (GSync::GetDeviceManager()->AnnounceASVersion()) {
 				$versions = GSync::GetSupportedProtocolVersions(true);
 				SLog::Write(LOGLEVEL_INFO, sprintf("Announcing latest AS version to device: %s", $versions));
-				header("X-MS-RP: " . $versions);
+				header("X-MS-RP: ".$versions);
 			}
 		}
 
@@ -174,7 +174,7 @@ 
 		if ($ex->getPrevious()) {
 			do {
 				$current_exception = $ex->getPrevious();
-				$exception_message .= ' -> ' . $current_exception->getMessage();
+				$exception_message .= ' -> '.$current_exception->getMessage();
 			}
 			while ($current_exception->getPrevious());
 		}
@@ -187,7 +187,7 @@ 
 
 		if (!headers_sent()) {
 			if ($ex instanceof GSyncException) {
-				header('HTTP/1.1 ' . $ex->getHTTPCodeString());
+				header('HTTP/1.1 '.$ex->getHTTPCodeString());
 				foreach ($ex->getHTTPHeaders() as $h) {
 					header($h);
 				}
@@ -223,8 +223,8 @@ 
 		elseif (!($ex instanceof GSyncException) || $ex->showLegalNotice()) {
 			$cmdinfo = (Request::GetCommand()) ? sprintf(" processing command <i>%s</i>", Request::GetCommand()) : "";
 			$extrace = $ex->getTrace();
-			$trace = (!empty($extrace)) ? "\n\nTrace:\n" . print_r($extrace, 1) : "";
-			GSync::PrintGrommunioSyncLegal($exclass . $cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage() . $trace));
+			$trace = (!empty($extrace)) ? "\n\nTrace:\n".print_r($extrace, 1) : "";
+			GSync::PrintGrommunioSyncLegal($exclass.$cmdinfo, sprintf('<pre>%s</pre>', $ex->getMessage().$trace));
 		}
 
 		// Announce exception to process loop detection