grommunio / grommunio-web

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) {

server/includes/core/class.webappauthentication.php

Spacing +1 added lines, -2 removed lines

@@ -195,8 +195,7 @@
 			// TODO: move logon from MAPISession to here
 
 			WebAppAuthentication::$_errorCode = isset($_SESSION['_keycloak_auth']) ?
-				WebAppAuthentication::$_mapiSession->logon_token($username, $pass) :
-				WebAppAuthentication::$_mapiSession->logon($username, $pass, DEFAULT_SERVER);
+				WebAppAuthentication::$_mapiSession->logon_token($username, $pass) : WebAppAuthentication::$_mapiSession->logon($username, $pass, DEFAULT_SERVER);
 
 			// Include external login plugins to be loaded
 			if (file_exists(BASE_PATH . 'extlogin.php')) {

plugins/smime/php/class.pluginsmimemodule.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 				if ($data === CHANGE_PASSPHRASE_SUCCESS) {
 					// Reset cached passphrase.
 					$encryptionStore = EncryptionStore::getInstance();
-					withPHPSession(function () use ($encryptionStore) {
+					withPHPSession(function() use ($encryptionStore) {
 						$encryptionStore->add('smime', '');
 					});
 				}
@@ -167,7 +167,7 @@ 
 				$encryptionStore->add('smime', $data['passphrase'], time() + (5 * 60));
 			}
 			else {
-				withPHPSession(function () use ($encryptionStore, $data) {
+				withPHPSession(function() use ($encryptionStore, $data) {
 					$encryptionStore->add('smime', $data['passphrase']);
 				});
 			}

server/includes/modules/class.resolvenamesmodule.php

Spacing +2 added lines, -2 removed lines

@@ -242,7 +242,7 @@ 
 		$abHierarchyRows = mapi_table_queryallrows($hierarchyTable, [PR_AB_PROVIDER_ID, PR_ENTRYID]);
 
 		// Look for the 'Contacts Folders'
-		for ($i = 0,$len = count($abHierarchyRows); $i < $len; ++$i) {
+		for ($i = 0, $len = count($abHierarchyRows); $i < $len; ++$i) {
 			// Check if the folder matches the Contact Provider GUID
 			if ($abHierarchyRows[$i][PR_AB_PROVIDER_ID] == MUIDZCSAB) {
 				$abContactContainerEntryid = $abHierarchyRows[$i][PR_ENTRYID];
@@ -258,7 +258,7 @@ 
 			$abContactContainerHierarchyRows = mapi_table_queryallrows($abContactContainerHierarchyTable, [PR_DISPLAY_NAME, PR_OBJECT_TYPE, PR_ENTRYID]);
 
 			// Loop through all the contact folders found under the 'Contacts Folders' hierarchy
-			for ($j = 0,$len = count($abContactContainerHierarchyRows); $j < $len; ++$j) {
+			for ($j = 0, $len = count($abContactContainerHierarchyRows); $j < $len; ++$j) {
 				// Open, get contents table, restrict, sort and then merge the result in the list of $rows
 				$abContactFolder = mapi_ab_openentry($ab, $abContactContainerHierarchyRows[$j][PR_ENTRYID]);
 				$abContactFolderTable = mapi_folder_getcontentstable($abContactFolder, MAPI_DEFERRED_ERRORS);

server/includes/modules/class.listmodule.php

Spacing +2 added lines, -2 removed lines

@@ -507,12 +507,12 @@
 		$data["search_meta"]["searchfolder_entryid"] = $entryid;
 		$data["search_meta"]["search_store_entryid"] = $action["store_entryid"];
 		$data["search_meta"]["searchstate"] = $searchState;
-		$data["search_meta"]["results"] = $numberOfResults;		// actual number of items that we are sending to client
+		$data["search_meta"]["results"] = $numberOfResults; // actual number of items that we are sending to client
 
 		$data["page"] = [];
 		$data["page"]["start"] = 0;
 		$data["page"]["rowcount"] = $rowCount;
-		$data["page"]["totalrowcount"] = $totalRowCount;	// total number of items
+		$data["page"]["totalrowcount"] = $totalRowCount; // total number of items
 
 		if (!empty($listData)) {
 			$data["item"] = array_merge([], $listData);

server/includes/modules/class.delegatesmodule.php

Spacing +1 added lines, -1 removed lines

@@ -575,7 +575,7 @@
 		];
 
 		$rule[PR_RULE_NAME] = '';
-		$rule[PR_RULE_PROVIDER_DATA] = '';		// 0 byte binary string
+		$rule[PR_RULE_PROVIDER_DATA] = ''; // 0 byte binary string
 		$rule[PR_RULE_STATE] = ST_ENABLED;
 		$rule[PR_RULE_LEVEL] = 0;
 		$rule[PR_RULE_SEQUENCE] = 0;

server/includes/modules/class.hierarchymodule.php

Spacing +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 								throw new MAPIException(null, MAPI_E_NO_ACCESS);
 							}
 
-							$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function ($item) {
+							$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function($item) {
 								return $item['props']['access'] === 0;
 							});
 							if (count($noPermissionFolders) >= $folders) {

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -384,7 +384,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) {
@@ -411,7 +411,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

@@ -54,13 +54,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);
@@ -99,13 +99,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);
@@ -184,13 +184,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);
@@ -634,8 +634,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,
@@ -665,13 +664,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) {
@@ -731,12 +730,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) {