grommunio / grommunio-web

server/includes/core/class.configcheck.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
 
 		# Replicate value logic from php-src/ext/zlib/zlib.c
 		$sv = ini_get("zlib.output_compression");
-		$sv = strcasecmp($sv, "on") == 0 ? 1 :
-			  (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
+		$sv = strcasecmp($sv, "on") == 0 ? 1 : (strcasecmp($sv, "off") == 0 ? 0 : intval($sv));
 		if ($sv != 0) {
 			$this->error_config("zlib.output_compression", "off", "With this option enabled, it could occur that XMLHTTP requests will fail");
 		}

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

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

plugins/files/php/vendor/phpfastcache/phpfastcache/lib/Phpfastcache/Exceptions/PhpfastcacheIOException.php

Indentation +13 added lines, -13 removed lines

@@ -21,17 +21,17 @@
  */
 class PhpfastcacheIOException extends PhpfastcacheCoreException
 {
-    /**
-     * @inheritdoc
-     */
-    public function __construct(string $message = "", int $code = 0, \Throwable $previous = null)
-    {
-        $lastError = error_get_last();
-        if ($lastError) {
-            $message .= "\n";
-            $message .= "Additional information provided by error_get_last():\n";
-            $message .= "{$lastError['message']} in {$lastError['file']} line {$lastError['line']}";
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function __construct(string $message = "", int $code = 0, \Throwable $previous = null)
+	{
+		$lastError = error_get_last();
+		if ($lastError) {
+			$message .= "\n";
+			$message .= "Additional information provided by error_get_last():\n";
+			$message .= "{$lastError['message']} in {$lastError['file']} line {$lastError['line']}";
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
     /**
      * @inheritdoc
      */
-    public function __construct(string $message = "", int $code = 0, \Throwable $previous = null)
-    {
+    public function __construct(string $message = "", int $code = 0, \Throwable $previous = null) {
         $lastError = error_get_last();
         if ($lastError) {
             $message .= "\n";

plugins/files/php/vendor/phpfastcache/phpfastcache/lib/Phpfastcache/Exceptions/PhpfastcacheCorruptedDataException.php

Indentation +8 added lines, -8 removed lines

@@ -18,12 +18,12 @@
 
 class PhpfastcacheCorruptedDataException extends PhpfastcacheDriverException
 {
-    /**
-     * @param string $message
-     * @param mixed|null $corruptedData
-     */
-    public function __construct(protected $message = '', protected mixed $corruptedData = null)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * @param string $message
+	 * @param mixed|null $corruptedData
+	 */
+	public function __construct(protected $message = '', protected mixed $corruptedData = null)
+	{
+		parent::__construct($message);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
      * @param string $message
      * @param mixed|null $corruptedData
      */
-    public function __construct(protected $message = '', protected mixed $corruptedData = null)
-    {
+    public function __construct(protected $message = '', protected mixed $corruptedData = null) {
         parent::__construct($message);
     }
 }