grommunio / grommunio-web

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.operations.php

Spacing +4 added lines, -4 removed lines

@@ -2065,9 +2065,9 @@ 
 		$messageProps = [];
 		// It stores the values that is exception allowed or not false -> not allowed
 		$isExceptionAllowed = true;
-		$delete = $actionType == 'delete';	// Flag for MeetingRequest Class whether to send update or cancel mail.
-		$basedate = false;	// Flag for MeetingRequest Class whether to send an exception or not.
-		$isReminderTimeAllowed = true;	// Flag to check reminder minutes is in range of the occurrences
+		$delete = $actionType == 'delete'; // Flag for MeetingRequest Class whether to send update or cancel mail.
+		$basedate = false; // Flag for MeetingRequest Class whether to send an exception or not.
+		$isReminderTimeAllowed = true; // Flag to check reminder minutes is in range of the occurrences
 		$properties = $GLOBALS['properties']->getAppointmentProperties();
 		$send = false;
 		$oldProps = [];
@@ -3016,7 +3016,7 @@ 
 			 * convert flags of PR_MESSAGE_FLAGS property to flags that is
 			 * used in mapi_message_setreadflag.
 			 */
-			$flag = MAPI_DEFERRED_ERRORS;		// set unread flag, read receipt will be sent
+			$flag = MAPI_DEFERRED_ERRORS; // set unread flag, read receipt will be sent
 
 			if (($flags & MSGFLAG_RN_PENDING) && isset($msg_action['send_read_receipt']) && $msg_action['send_read_receipt'] == false) {
 				$flag |= SUPPRESS_RECEIPT;

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