grommunio / grommunio-web

plugins/smime/php/plugin.smime.php

Spacing +1 added lines, -1 removed lines

@@ -454,7 +454,7 @@
 		}
 
 		if (!encryptionStoreExpirationSupport()) {
-			withPHPSession(function () use ($encryptionStore) {
+			withPHPSession(function() use ($encryptionStore) {
 				$encryptionStore->add('smime', '');
 			});
 		}

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

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.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/core/class.properties.php

Spacing +22 added lines, -22 removed lines

@@ -247,14 +247,14 @@ 
 			$properties["reminderset"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;
 			$properties["flag_request"] = "PT_STRING8:PSETID_Common:" . PidLidFlagRequest;
 			$properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;
-			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence;                                     // AppointmentSequenceNumber
-			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203";                        // AppointmentLastSequence
+			$properties["updatecounter"] = "PT_LONG:PSETID_Appointment:" . PidLidAppointmentSequence; // AppointmentSequenceNumber
+			$properties["last_updatecounter"] = "PT_LONG:PSETID_Appointment:0x8203"; // AppointmentLastSequence
 			$properties["busystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidBusyStatus;
 			$properties["intendedbusystatus"] = "PT_LONG:PSETID_Appointment:" . PidLidIntendedBusyStatus;
 			$properties["start"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["responselocation"] = "PT_STRING8:PSETID_Meeting:0x2";
 			$properties["location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
-			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229";            // PidLidFInvited, MeetingRequestWasSent
+			$properties["requestsent"] = "PT_BOOLEAN:PSETID_Appointment:0x8229"; // PidLidFInvited, MeetingRequestWasSent
 			$properties["startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["duedate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["commonstart"] = "PT_SYSTIME:PSETID_Common:0x8516";
@@ -262,11 +262,11 @@ 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
 			$properties["clipstart"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;
 			$properties["clipend"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;
-			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD";                         // StartRecurTime
-			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE";                         // StartRecurTime
-			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF";                           // EndRecurDate
-			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10";                          // EndRecurTime
-			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";                          // LID_IS_EXCEPTION
+			$properties["start_recur_date"] = "PT_LONG:PSETID_Meeting:0xD"; // StartRecurTime
+			$properties["start_recur_time"] = "PT_LONG:PSETID_Meeting:0xE"; // StartRecurTime
+			$properties["end_recur_date"] = "PT_LONG:PSETID_Meeting:0xF"; // EndRecurDate
+			$properties["end_recur_time"] = "PT_LONG:PSETID_Meeting:0x10"; // EndRecurTime
+			$properties["is_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 			// Propose new time properties
 			$properties["proposed_start_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
 			$properties["proposed_end_whole"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedEndWhole;
@@ -646,7 +646,7 @@ 
 			$properties = [];
 			$properties["entryid"] = PR_ENTRYID;
 			$properties["parent_entryid"] = PR_PARENT_ENTRYID;
-			$properties["store_entryid"] = PR_STORE_ENTRYID;	// is this required ???
+			$properties["store_entryid"] = PR_STORE_ENTRYID; // is this required ???
 			$properties["icon_index"] = PR_ICON_INDEX;
 			$properties["message_class"] = PR_MESSAGE_CLASS;
 			$properties["message_flags"] = PR_MESSAGE_FLAGS;
@@ -960,9 +960,9 @@ 
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:" . PidLidRecurrencePattern;
 			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;	// ClipStart
-			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd;		// ClipEnd
-			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA";						// LID_IS_EXCEPTION
+			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart; // ClipStart
+			$properties["appointment_enddate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipEnd; // ClipEnd
+			$properties["appointment_exception"] = "PT_BOOLEAN:PSETID_Meeting:0xA"; // LID_IS_EXCEPTION
 			$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 			$properties["alldayevent"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidAppointmentSubType;
 			$properties["tzdefstart"] = "PT_BINARY:PSETID_Appointment:" . PidLidAppointmentTimeZoneDefinitionStartDisplay;
@@ -1268,18 +1268,18 @@ 
 			$properties["object_type"] = PR_OBJECT_TYPE;
 
 			$properties["recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;
-			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet;				// PidLidReminderSet
-			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta;			// PidLidReminderDelta
-			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime;			// PidLidReminderTime
-			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime;				// PidLidReminderSignalTime
-
-			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate;				// PidLidTaskDueDate
-			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate;			// PidLidTaskStartDate
-			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107";		// PidLidTaskResetReminder
-			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126";			// PidLidTaskFRecurring
+			$properties["reminder"] = "PT_BOOLEAN:PSETID_Common:" . PidLidReminderSet; // PidLidReminderSet
+			$properties["reminder_minutes"] = "PT_LONG:PSETID_Common:" . PidLidReminderDelta; // PidLidReminderDelta
+			$properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderTime; // PidLidReminderTime
+			$properties["flagdueby"] = "PT_SYSTIME:PSETID_Common:" . PidLidReminderSignalTime; // PidLidReminderSignalTime
+
+			$properties["task_duedate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskDueDate; // PidLidTaskDueDate
+			$properties["task_startdate"] = "PT_SYSTIME:PSETID_Task:" . PidLidTaskStartDate; // PidLidTaskStartDate
+			$properties["task_resetreminder"] = "PT_BOOLEAN:PSETID_Task:0x8107"; // PidLidTaskResetReminder
+			$properties["task_recurring"] = "PT_BOOLEAN:PSETID_Task:0x8126"; // PidLidTaskFRecurring
 			$properties["taskmode"] = "PT_LONG:PSETID_Common:0x8518";
 
-			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring;			// PidLidRecurring
+			$properties["appointment_recurring"] = "PT_BOOLEAN:PSETID_Appointment:" . PidLidRecurring; // PidLidRecurring
 			$properties["appointment_startdate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentStartWhole;
 			$properties["appointment_enddate"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentEndWhole;
 			$properties["appointment_startdate_recurring"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidClipStart;

server/includes/core/class.entryid.php

Spacing +35 added lines, -36 removed lines

@@ -60,13 +60,13 @@ 
 		$entryId = strtoupper((string) $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);
@@ -111,13 +111,13 @@ 
 		$entryId = strtoupper((string) $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);
@@ -162,13 +162,13 @@ 
 		$entryId = strtoupper((string) $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);
@@ -479,8 +479,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,
@@ -511,13 +510,13 @@ 
 		$entryId = strtoupper((string) $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) {
@@ -577,12 +576,12 @@ 
 		$entryId = strtoupper((string) $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/core/class.theming.php

Spacing +1 added lines, -1 removed lines

@@ -358,7 +358,7 @@
 
 		if ($themeProps['primary-color']) {
 			if (!$themeProps['primary-color:hover']) {
-				[, , $l] = Colors::rgb2hsl(Colors::colorString2Object($themeProps['primary-color']));
+				[,, $l] = Colors::rgb2hsl(Colors::colorString2Object($themeProps['primary-color']));
 				if ($l > 20) {
 					$themeProps['primary-color:hover'] = Colors::darker($themeProps['primary-color'], 10);
 				}

server/includes/core/class.language.php

Spacing +2 added lines, -2 removed lines

@@ -396,7 +396,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 (str_contains((string) $translation_data[$i]['msgid'], "\004")) {
@@ -423,7 +423,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