grommunio / grommunio-web

server/includes/core/class.configcheck.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
 
 		# Replicate value logic from php-src/ext/zlib/zlib.c
 		$sv = ini_get("zlib.output_compression");
-		$sv = strcasecmp($sv, "on") == 0 ? 1 :
-			  (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
+		$sv = strcasecmp($sv, "on") == 0 ? 1 : (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
 		if ($sv != 0) {
 			$this->error_config("zlib.output_compression", "off", "With this option enabled, it could occur that XMLHTTP requests will fail");
 		}

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -389,7 +389,7 @@ 
 				if ($data_orig_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_orig_strs[$i]['length'];
 					$orig_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgid'] = $orig_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgid'] = $orig_str['str']; // unpack converts to array :S
 
 					// Find context in the original string
 					if (strpos($translation_data[$i]['msgid'], "\004") !== false) {
@@ -416,7 +416,7 @@ 
 				if ($data_transl_strs[$i]['length'] > 0) {	// fread does not accept length=0
 					$length = $data_transl_strs[$i]['length'];
 					$trans_str = unpack('a' . $length . 'str', fread($fp, $length));
-					$translation_data[$i]['msgstr'] = $trans_str['str'];	// unpack converts to array :S
+					$translation_data[$i]['msgstr'] = $trans_str['str']; // unpack converts to array :S
 
 					// If there are plural forms in the source string,
 					// then the translated string must contain plural

server/includes/core/class.entryid.php

Spacing +35 added lines, -36 removed lines

@@ -55,13 +55,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);
@@ -100,13 +100,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);
@@ -185,13 +185,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,    16 bytes,  32 hex characters
-				'extid' => '',		// 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,    16 bytes,  32 hex characters
+				'extid' => '', // CHAR,     variable length
+				'padding' => '', // TCHAR[3],  4 bytes,  8 hex characters (upto 4 bytes)
 			];
 
 			$res['length'] = strlen($entryId);
@@ -636,8 +636,7 @@ 
 				}
 			}
 			elseif ($checkValue !== null && $val != $checkValue) {
-				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() :
-						"<mapisession not yet initialized>";
+				$user = $GLOBALS["mapisession"] !== null ? $GLOBALS["mapisession"]->getUserName() : "<mapisession not yet initialized>";
 				error_log(sprintf(
 					"Unexpected value in store entryid for user %s. Entryid: %s key: '%s' value: '%s' expected: %s",
 					$user,
@@ -667,13 +666,13 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'messagetype' => '',			// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
-				'messagedbguid' => '',		// GUID,     16 bytes, 32 hex characters
-				'messagecounter' => '',	// ULONG,     6 bytes, 12 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagetype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
+				'messagedbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'messagecounter' => '', // ULONG,     6 bytes, 12 hex characters
 			];
 
 			if (!$entryId) {
@@ -733,12 +732,12 @@ 
 			$entryId = strtoupper($entryId);
 
 			$res = [
-				'abflags' => '',					// BYTE[4],   4 bytes,  8 hex characters
-				'providerguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldertype' => '',				// UINT,      2 bytes,  4 hex characters
-				'folderdbguid' => '',			// GUID,     16 bytes, 32 hex characters
-				'foldercounter' => '',		// ULONG,     6 bytes, 12 hex characters
-				'padding' => '',					// TCHAR[3],  2 bytes,  4 hex characters
+				'abflags' => '', // BYTE[4],   4 bytes,  8 hex characters
+				'providerguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldertype' => '', // UINT,      2 bytes,  4 hex characters
+				'folderdbguid' => '', // GUID,     16 bytes, 32 hex characters
+				'foldercounter' => '', // ULONG,     6 bytes, 12 hex characters
+				'padding' => '', // TCHAR[3],  2 bytes,  4 hex characters
 			];
 
 			if (!$entryId) {

server/includes/loader.php

Spacing +1 added lines, -1 removed lines

@@ -360,7 +360,7 @@
 			];
 			$fileDependencies[$filename] = [
 				'depends' => [],
-				'core' => $core,		// Based on tag or on class or on file path?
+				'core' => $core, // Based on tag or on class or on file path?
 			];
 
 			for ($j = 0, $lenJ = count($class[1]); $j < $lenJ; ++$j) {

plugins/files/php/Files/Backend/Webdav/sabredav/FilesWebDavClient.php

Spacing +2 added lines, -2 removed lines

@@ -58,8 +58,8 @@
 		curl_setopt($curl, CURLOPT_USERPWD, $this->userName . ":" . $this->password);
 		curl_setopt($curl, CURLOPT_FILE, $file_handle);
 		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+		curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
+		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 
 		curl_exec($curl);
 

plugins/files/php/notifiers/class.fileshierarchynotifier.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	 * @return Number the event which this module handles
 	 */
 	public function getEvents() {
-		return OBJECT_DELETE | OBJECT_SAVE;
+		return OBJECT_DELETE|OBJECT_SAVE;
 	}
 
 	/**

plugins/mdm/php/class.pluginmdmmodule.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 		if ($stateFolder) {
 			$store = $GLOBALS["mapisession"]->getDefaultMessageStore();
 			$username = $GLOBALS["mapisession"]->getUserName();
-			$hierarchyTable = mapi_folder_gethierarchytable($stateFolder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+			$hierarchyTable = mapi_folder_gethierarchytable($stateFolder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 			$rows = mapi_table_queryallrows($hierarchyTable, [PR_ENTRYID, PR_DISPLAY_NAME]);
 			foreach ($rows as $row) {
 				$deviceStateFolder = mapi_msgstore_openentry($store, $row[PR_ENTRYID]);
@@ -897,7 +897,7 @@ 
 		if (!$this->stateFolder) {
 			$store = $GLOBALS["mapisession"]->getDefaultMessageStore();
 			$rootFolder = mapi_msgstore_openentry($store);
-			$hierarchy = mapi_folder_gethierarchytable($rootFolder, CONVENIENT_DEPTH | MAPI_DEFERRED_ERRORS);
+			$hierarchy = mapi_folder_gethierarchytable($rootFolder, CONVENIENT_DEPTH|MAPI_DEFERRED_ERRORS);
 			$restriction = $this->getStateFolderRestriction(PLUGIN_MDM_STORE_STATE_FOLDER);
 			mapi_table_restrict($hierarchy, $restriction);
 			if (mapi_table_getrowcount($hierarchy) == 1) {

plugins/smime/php/util.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 			$restrict,
 			[RES_CONTENT,
 				[
-					FUZZYLEVEL => FL_FULLSTRING | FL_IGNORECASE,
+					FUZZYLEVEL => FL_FULLSTRING|FL_IGNORECASE,
 					ULPROPTAG => PR_SUBJECT,
 					VALUE => [PR_SUBJECT => $emailAddress],
 				],

plugins/smime/php/plugin.smime.php

Spacing +3 added lines, -3 removed lines

@@ -454,7 +454,7 @@ 
 		}
 
 		if (!encryptionStoreExpirationSupport()) {
-			withPHPSession(function () use ($encryptionStore) {
+			withPHPSession(function() use ($encryptionStore) {
 				$encryptionStore->add('smime', '');
 			});
 		}
@@ -678,7 +678,7 @@ 
 			}
 
 			// Save the signed message as attachment of the send email
-			$stream = mapi_openproperty($signedAttach, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($signedAttach, PR_ATTACH_DATA_BIN, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 			$handle = fopen($tmpSendSmimeEmail, 'r');
 			while (!feof($handle)) {
 				$contents = fread($handle, BLOCK_SIZE);
@@ -1003,7 +1003,7 @@ 
 			]);
 			// Save attachment
 			$msgBody = base64_encode($cert);
-			$stream = mapi_openproperty($assocMessage, PR_BODY, IID_IStream, 0, MAPI_CREATE | MAPI_MODIFY);
+			$stream = mapi_openproperty($assocMessage, PR_BODY, IID_IStream, 0, MAPI_CREATE|MAPI_MODIFY);
 			mapi_stream_setsize($stream, strlen($msgBody));
 			mapi_stream_write($stream, $msgBody);
 			mapi_stream_commit($stream);