grommunio / grommunio-web

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

server/includes/core/class.properties.php

Spacing +21 added lines, -21 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;
@@ -639,7 +639,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;
@@ -955,9 +955,9 @@ 
 				$properties["appointment_location"] = "PT_STRING8:PSETID_Appointment:" . PidLidLocation;
 				$properties["appointment_recurring_pattern"] = "PT_STRING8:PSETID_Appointment:0x8232";
 				$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;
 				// Propose new time properties
 				$properties["proposed_start_date"] = "PT_SYSTIME:PSETID_Appointment:" . PidLidAppointmentProposedStartWhole;
@@ -1243,18 +1243,18 @@ 
 				$properties["subject"] = PR_SUBJECT;
 				$properties["object_type"] = PR_OBJECT_TYPE;
 
-				$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["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["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;

index.php

Spacing +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
 	}
 
 	$Language->setLanguage($lang);
-	setcookie('lang', $lang, [ 'expires' => time() + 31536000, 'path' => '/', 'domain' => '', 'secure' => true, 'httponly' => true, 'samesite' => 'Strict' ]);
+	setcookie('lang', $lang, ['expires' => time() + 31536000, 'path' => '/', 'domain' => '', 'secure' => true, 'httponly' => true, 'samesite' => 'Strict']);
 
 	// add extra header
 	header("X-grommunio: " . trim(file_get_contents('version')));

server/includes/core/class.operations.php

Indentation +3 added lines, -3 removed lines

@@ -2119,9 +2119,9 @@
 						$props = mapi_getprops($message, $properties);
 						// Do not update timezone information if the appointment times haven't changed
 						if (!isset($action['props']['commonstart']) &&
-						    !isset($action['props']['commonend']) &&
-						    !isset($action['props']['startdate']) &&
-						    !isset($action['props']['enddate'])
+							!isset($action['props']['commonend']) &&
+							!isset($action['props']['startdate']) &&
+							!isset($action['props']['enddate'])
 							) {
 							unset($action['props']['tzdefstart'], $action['props']['tzdefend']);
 						}

Spacing +5 added lines, -5 removed lines

@@ -2059,9 +2059,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 = [];
@@ -3003,7 +3003,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;
@@ -3056,7 +3056,7 @@ 
 
 			if (array_search(strtolower($foldername), $folderNames) !== false) {
 				$i = 2;
-				while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false)
+				while (array_search(strtolower($foldername) . " ($i)", $folderNames) !== false)
 					++$i;
 				$foldername .= " ($i)";
 			}

Braces +5 added lines, -3 removed lines

@@ -2088,7 +2088,8 @@ 
 			if (!empty($action['props']['timezone_iana'])) {
 				try {
 					$tzdef = mapi_ianatz_to_tzdef($action['props']['timezone_iana']);
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 				}
 				if ($tzdef !== false) {
 					$action['props']['tzdefstart'] = $action['props']['tzdefend'] = bin2hex($tzdef);
@@ -3056,8 +3057,9 @@ 
 
 			if (array_search(strtolower($foldername), $folderNames) !== false) {
 				$i = 2;
-				while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false)
-					++$i;
+				while (array_search(strtolower($foldername)." ($i)", $folderNames) !== false) {
+									++$i;
+				}
 				$foldername .= " ($i)";
 			}
 

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