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

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 +14 added lines, -9 removed lines

@@ -1058,8 +1058,9 @@ 
 		 */
 		public function renameFolder($store, $entryid, $name, &$folderProps) {
 			$folder = mapi_msgstore_openentry($store, $entryid);
-			if (!$folder)
-				return false;
+			if (!$folder) {
+							return false;
+			}
 			$result = false;
 			$folderProps = mapi_getprops($folder, [PR_ENTRYID, PR_STORE_ENTRYID, PR_DISPLAY_NAME]);
 			/*
@@ -2087,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);
@@ -2610,8 +2612,9 @@ 
 			$storeprops = mapi_getprops($store, [PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_ENTRYID]);
 			$origStoreprops = mapi_getprops($origStore, [PR_ENTRYID]);
 
-			if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID]))
-				return false;
+			if (!isset($storeprops[PR_IPM_OUTBOX_ENTRYID])) {
+							return false;
+			}
 			if (isset($storeprops[PR_IPM_SENTMAIL_ENTRYID])) {
 				$props[PR_SENTMAIL_ENTRYID] = $storeprops[PR_IPM_SENTMAIL_ENTRYID];
 			}
@@ -2778,8 +2781,9 @@ 
 				$message = $this->saveMessage($store, $entryid, $storeprops[PR_IPM_OUTBOX_ENTRYID], $props, $messageProps, $recipients, $attachments, [], $copyFromMessage, $copyAttachments, $copyRecipients, $copyInlineAttachmentsOnly, true, true, $isPlainText);
 			}
 
-			if (!$message)
-				return false;
+			if (!$message) {
+							return false;
+			}
 			// Allowing to hook in just before the data sent away to be sent to the client
 			$GLOBALS['PluginManager']->triggerHook('server.core.operations.submitmessage', [
 				'moduleObject' => $this,
@@ -3057,8 +3061,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

server/includes/modules/class.appointmentitemmodule.php

Braces +6 added lines, -4 removed lines

@@ -376,8 +376,9 @@ 
 
 			// Compare the timezone definitions of the client and the appointment.
 			// Further processing is only required if they don't match.
-			if ($GLOBALS['entryid']->compareEntryIds($this->tzdef, $calendaritem['props']['tzdefstart']))
-				return;
+			if ($GLOBALS['entryid']->compareEntryIds($this->tzdef, $calendaritem['props']['tzdefstart'])) {
+							return;
+			}
 
 			if ($this->tzdefObj === false) {
 				$this->tzdefObj = $GLOBALS['entryid']->createTimezoneDefinitionObject($this->tzdef);
@@ -389,8 +390,9 @@ 
 			// Find TZRULE_FLAG_EFFECTIVE_TZREG rule for the appointment's timezone
 			$appTzEffRuleIdx = getEffectiveTzreg($appTzDefStart['rules']);
 
-			if (is_null($this->tzEffRuleIdx) && !is_null($appTzEffRuleIdx))
-				return;
+			if (is_null($this->tzEffRuleIdx) && !is_null($appTzEffRuleIdx)) {
+							return;
+			}
 			// first apply the bias of the appointment timezone and the bias of the browser
 			$localStart = $calendaritem['props']['startdate'] - $appTzDefStart['rules'][$appTzEffRuleIdx]['bias'] * 60 + $this->tzdefObj['rules'][$this->tzEffRuleIdx]['bias'] * 60;
 			if (isDst($appTzDefStart['rules'][$appTzEffRuleIdx], $calendaritem['props']['startdate'])) {