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

plugins/smime/php/lib/X509.php

Switch Indentation +25 added lines, -25 removed lines

@@ -15,31 +15,31 @@
 		$tag = $this->peek();
 
 		switch ($tag) {
-		case 0:
-			$res['otherName'] = $this->oid(-6);
-			break;
-
-		case 1:
-			$res['rfc822Name'] = $this->next(-22);
-			break;
-
-		case 2:
-			$res['dNSName'] = $this->next(-22);
-			break;
-
-		case 4:
-			$this->next(4);
-			$res['directoryName'] = $this->name();
-			$res['directoryName_'] = $this->nameasstring($res['directoryName']);
-			break;
-
-		case 6:
-			$res['uniformResourceIdentifier'] = $this->next(-22);
-			break;
-
-		default:
-			throw new \Exception("Unsupported GeneralName: {$tag}");
-#                trigger_error("Unsupported GeneralName: $tag", E_USER_ERROR);
+			case 0:
+				$res['otherName'] = $this->oid(-6);
+				break;
+
+			case 1:
+				$res['rfc822Name'] = $this->next(-22);
+				break;
+
+			case 2:
+				$res['dNSName'] = $this->next(-22);
+				break;
+
+			case 4:
+				$this->next(4);
+				$res['directoryName'] = $this->name();
+				$res['directoryName_'] = $this->nameasstring($res['directoryName']);
+				break;
+
+			case 6:
+				$res['uniformResourceIdentifier'] = $this->next(-22);
+				break;
+
+			default:
+				throw new \Exception("Unsupported GeneralName: {$tag}");
+	#                trigger_error("Unsupported GeneralName: $tag", E_USER_ERROR);
 		}
 
 		return $res;

plugins/smime/php/class.pluginsmimemodule.php

Switch Indentation +50 added lines, -50 removed lines

@@ -29,62 +29,62 @@
 			if (!isset($actionType))
 				continue;
 			switch ($actionType) {
-			case 'certificate':
-				$data = $this->verifyCertificate($actionData);
-				$response = [
-					'type' => 3,
-					'status' => $data['status'],
-					'message' => $data['message'],
-					'data' => $data['data'],
-				];
-				$this->addActionData('certificate', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'certificate':
+					$data = $this->verifyCertificate($actionData);
+					$response = [
+						'type' => 3,
+						'status' => $data['status'],
+						'message' => $data['message'],
+						'data' => $data['data'],
+					];
+					$this->addActionData('certificate', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'passphrase':
-				$data = $this->verifyPassphrase($actionData);
-				$response = [
-					'type' => 3,
-					'status' => $data['status'],
-				];
-				$this->addActionData('passphrase', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'passphrase':
+					$data = $this->verifyPassphrase($actionData);
+					$response = [
+						'type' => 3,
+						'status' => $data['status'],
+					];
+					$this->addActionData('passphrase', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'changepassphrase':
-				$data = $this->changePassphrase($actionData);
-				if ($data === CHANGE_PASSPHRASE_SUCCESS) {
-					// Reset cached passphrase.
-					$encryptionStore = EncryptionStore::getInstance();
-					withPHPSession(function () use ($encryptionStore) {
-						$encryptionStore->add('smime', '');
-					});
-				}
-				$response = [
-					'type' => 3,
-					'code' => $data,
-				];
-				$this->addActionData('changepassphrase', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'changepassphrase':
+					$data = $this->changePassphrase($actionData);
+					if ($data === CHANGE_PASSPHRASE_SUCCESS) {
+						// Reset cached passphrase.
+						$encryptionStore = EncryptionStore::getInstance();
+						withPHPSession(function () use ($encryptionStore) {
+							$encryptionStore->add('smime', '');
+						});
+					}
+					$response = [
+						'type' => 3,
+						'code' => $data,
+					];
+					$this->addActionData('changepassphrase', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'list':
-				$data = $this->getPublicCertificates();
-				$this->addActionData('list', $data);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'list':
+					$data = $this->getPublicCertificates();
+					$this->addActionData('list', $data);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'delete':
-				// FIXME: handle multiple deletes? Separate function?
-				$entryid = $actionData['entryid'];
-				$root = mapi_msgstore_openentry($this->store, null);
-				mapi_folder_deletemessages($root, [hex2bin($entryid)]);
+				case 'delete':
+					// FIXME: handle multiple deletes? Separate function?
+					$entryid = $actionData['entryid'];
+					$root = mapi_msgstore_openentry($this->store, null);
+					mapi_folder_deletemessages($root, [hex2bin($entryid)]);
 
-				$this->sendFeedback(true);
-				break;
+					$this->sendFeedback(true);
+					break;
 
-			default:
-				$this->handleUnknownActionType($actionType);
+				default:
+					$this->handleUnknownActionType($actionType);
 			}
 		}
 		catch (Exception $e) {

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']);
 				});
 			}

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 * @return bool true on success or false on failure
 	 */
 	public function execute() {
-		foreach ($this->data as $actionType => $actionData) try {
+		foreach ($this->data as $actionType => $actionData) {
+			try {
 			if (!isset($actionType))
 				continue;
+		}
 			switch ($actionType) {
 			case 'certificate':
 				$data = $this->verifyCertificate($actionData);

plugins/smime/php/class.certificate.php

Switch Indentation +6 added lines, -6 removed lines

@@ -33,14 +33,14 @@
 		}
 
 		switch ($this->status) {
-		case 'good':
-			return OCSP_CERT_STATUS_GOOD;
+			case 'good':
+				return OCSP_CERT_STATUS_GOOD;
 
-		case 'revoked':
-			return OCSP_CERT_STATUS_REVOKED;
+			case 'revoked':
+				return OCSP_CERT_STATUS_REVOKED;
 
-		default:
-			return OCSP_CERT_STATUS_UNKOWN;
+			default:
+				return OCSP_CERT_STATUS_UNKOWN;
 		}
 	}
 }

plugins/smime/php/util.php

Braces +3 added lines, -2 removed lines

@@ -98,8 +98,9 @@
 	// Get messages from certificates
 	foreach ($privateCerts as $privateCert) {
 		$privateCertMessage = mapi_msgstore_openentry($store, $privateCert[PR_ENTRYID]);
-		if ($privateCertMessage === false)
-			continue;
+		if ($privateCertMessage === false) {
+					continue;
+		}
 		$pkcs12 = "";
 		$certs = [];
 		// Read pkcs12 cert from message