grommunio / grommunio-web

plugins/smime/php/plugin.smime.php

Braces +22 added lines, -44 removed lines

@@ -64,8 +64,7 @@ 
 
 		if (version_compare(phpversion(), '5.4', '<')) {
 			$this->cipher = OPENSSL_CIPHER_3DES;
-		}
-		else {
+		} else {
 			$this->cipher = PLUGIN_SMIME_CIPHER;
 		}
 	}
@@ -188,8 +187,7 @@ 
 
 		if (array_filter($missingCerts, "missingMyself") === []) {
 			$errorMsg = _('Missing public certificates for the following recipients: ') . implode(', ', $missingCerts) . _('. Please contact your system administrator for details');
-		}
-		else {
+		} else {
 			$errorMsg = _("Your public certificate is not installed. Without this certificate, you will not be able to read encrypted messages you have sent to others.");
 		}
 
@@ -225,8 +223,7 @@ 
 					// Put empty string into file? dafuq?
 					file_put_contents($tmpUserCert, $userCert);
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				$msg = "[smime] Unable to open PR_SENT_REPRESENTING_ENTRYID. Maybe %s was does not exists or deleted from server.";
 				Log::write(LOGLEVEL_ERROR, sprintf($msg, $userProps[PR_SENT_REPRESENTING_NAME]));
 				error_log("[smime] Unable to open PR_SENT_REPRESENTING_NAME: " . print_r($userProps[PR_SENT_REPRESENTING_NAME], true));
@@ -242,8 +239,7 @@ 
 			$senderAddressArray = $senderAddressArray['props'];
 			if ($senderAddressArray['address_type'] === 'SMTP') {
 				$emailAddr = $senderAddressArray['email_address'];
-			}
-			else {
+			} else {
 				$emailAddr = $senderAddressArray['smtp_address'];
 			}
 
@@ -253,8 +249,7 @@ 
 			if (!$emailAddr) {
 				if (!empty($userProps[PR_SENT_REPRESENTING_NAME])) {
 					$emailAddr = $userProps[PR_SENT_REPRESENTING_NAME];
-				}
-				else {
+				} else {
 					$searchKeys = mapi_getprops($message, [PR_SEARCH_KEY, PR_SENT_REPRESENTING_SEARCH_KEY]);
 					$searchKey = $searchKeys[PR_SEARCH_KEY] ?? $searchKeys[PR_SENT_REPRESENTING_SEARCH_KEY];
 					if ($searchKey) {
@@ -307,16 +302,14 @@ 
 						$importMessageCert !== false) {
 						// Redundant
 						$importMessageCert = true;
-					}
-					else {
+					} else {
 						$importMessageCert = false;
 						verifyOCSP($userCert, $caCerts, $this->message);
 						break;
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// Works. Just leave it.
 			$signed_ok = openssl_pkcs7_verify($tmpfname, PKCS7_NOSIGS, $outcert, explode(';', PLUGIN_SMIME_CACERTS));
 			$openssl_error_code = $this->extract_openssl_error();
@@ -333,8 +326,7 @@ 
 				}
 				// We don't have a certificate from the MAPI UserStore or LDAP, so we will set $userCert to $importCert
 				// so that we can verify the message according to the be imported certificate.
-			}
-			else { // No pubkey
+			} else { // No pubkey
 				$importMessageCert = false;
 				Log::write(LOGLEVEL_INFO, sprintf("[smime] Unable to verify message without public key, openssl error: '%s'", $this->openssl_error));
 				$this->message['success'] = SMIME_STATUS_FAIL;
@@ -404,8 +396,7 @@ 
 						break;
 					}
 				}
-			}
-			else {
+			} else {
 				$decryptStatus = openssl_pkcs7_decrypt($tmpFile, $tmpDecrypted, $certs['cert'], [$certs['pkey'], $pass]);
 			}
 
@@ -437,19 +428,16 @@ 
 			if (strpos($content, 'multipart/signed') !== false || strpos($content, 'signed-data') !== false) {
 				$this->message['type'] = 'encryptsigned';
 				$this->verifyMessage($data['message'], $content);
-			}
-			elseif ($decryptStatus) {
+			} elseif ($decryptStatus) {
 				$this->message['info'] = SMIME_DECRYPT_SUCCESS;
 				$this->message['success'] = SMIME_STATUS_SUCCESS;
-			}
-			elseif ($this->extract_openssl_error() === OPENSSL_RECIPIENT_CERTIFICATE_MISMATCH) {
+			} elseif ($this->extract_openssl_error() === OPENSSL_RECIPIENT_CERTIFICATE_MISMATCH) {
 				error_log("[smime] Error when decrypting email, openssl error: " . print_r($this->openssl_error, true));
 				Log::Write(LOGLEVEL_ERROR, sprintf("[smime] Error when decrypting email, openssl error: '%s'", $this->openssl_error));
 				$this->message['info'] = SMIME_DECRYPT_CERT_MISMATCH;
 				$this->message['success'] = SMIME_STATUS_FAIL;
 			}
-		}
-		else {
+		} else {
 			$this->message['info'] = SMIME_UNLOCK_CERT;
 		}
 
@@ -482,18 +470,15 @@ 
 			$this->message['info'] = SMIME_ERROR;
 			$this->message['success'] = SMIME_STATUS_FAIL;
 		// Verification was successful
-		}
-		elseif ($openssl_return) {
+		} elseif ($openssl_return) {
 			$this->message['info'] = SMIME_SUCCESS;
 			$this->message['success'] = SMIME_STATUS_SUCCESS;
 		// Verification was not successful, display extra information.
-		}
-		else {
+		} else {
 			$this->message['success'] = SMIME_STATUS_FAIL;
 			if ($openssl_errors === OPENSSL_CA_VERIFY_FAIL) {
 				$this->message['info'] = SMIME_CA;
-			}
-			else { // Catch general errors
+			} else { // Catch general errors
 				$this->message['info'] = SMIME_ERROR;
 			}
 		}
@@ -542,8 +527,7 @@ 
 				// TODO: update to serialNumber check
 				if ($certMessage && $certMessage[0][PR_MESSAGE_DELIVERY_TIME] == $publickeyData['validTo_time_t']) {
 					$message = _('Certificate is already stored on the server');
-				}
-				else {
+				} else {
 					$saveCert = true;
 					$root = mapi_msgstore_openentry($this->getStore(), null);
 					// Remove old certificate
@@ -619,8 +603,7 @@ 
 			if (isset($props[PR_EC_IMAP_EMAIL]) || propIsError(PR_EC_IMAP_EMAIL, $props) == MAPI_E_NOT_ENOUGH_MEMORY) {
 				// Stream the message to properly get the PR_EC_IMAP_EMAIL property
 				$emlMessageStream = mapi_openproperty($message, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
-			}
-			else {
+			} else {
 				// Read the message as RFC822-formatted e-mail stream.
 				$emlMessageStream = mapi_inetmapi_imtoinet($GLOBALS['mapisession']->getSession(), $GLOBALS['mapisession']->getAddressbook(), $message, []);
 			}
@@ -725,8 +708,7 @@ 
 				Log::Write(LOGLEVEL_ERROR, sprintf("[smime] Unable to sign message with intermediate certificates, openssl error: '%s'", @openssl_error_string()));
 			}
 			unlink($tmpFile);
-		}
-		else {
+		} else {
 			$ok = openssl_pkcs7_sign($infile, $outfile, $certs['cert'], [$certs['pkey'], ''], [], PKCS7_DETACHED);
 			if (!$ok) {
 				Log::Write(LOGLEVEL_ERROR, sprintf("[smime] Unable to sign message, openssl error: '%s'", @openssl_error_string()));
@@ -830,8 +812,7 @@ 
 
 			if (!empty($gabCert)) {
 				array_push($publicCerts, $gabCert);
-			}
-			elseif (!empty($storeCert)) {
+			} elseif (!empty($storeCert)) {
 				array_push($publicCerts, base64_decode($storeCert));
 			}
 		}
@@ -1026,8 +1007,7 @@ 
 
 		if ($hash === 'sha1') {
 			$fingerprint = sha1($body);
-		}
-		else {
+		} else {
 			$fingerprint = md5($body);
 		}
 
@@ -1052,8 +1032,7 @@ 
 		try {
 			$user = mapi_ab_resolvename($addrbook, $userArr, EMS_AB_ADDRESS_LOOKUP);
 			$user = mapi_ab_openentry($addrbook, $user[0][PR_ENTRYID]);
-		}
-		catch (MAPIException $e) {
+		} catch (MAPIException $e) {
 			$e->setHandled();
 		}
 
@@ -1126,8 +1105,7 @@ 
 					$senderStructure["props"]['display_type'] = isset($userprops[PR_DISPLAY_TYPE]) ? $userprops[PR_DISPLAY_TYPE] : MAPI_MAILUSER;
 					$senderStructure["props"]['display_type_ex'] = isset($userprops[PR_DISPLAY_TYPE_EX]) ? $userprops[PR_DISPLAY_TYPE_EX] : MAPI_MAILUSER;
 				}
-			}
-			catch (MAPIException $e) {
+			} catch (MAPIException $e) {
 				Log::write(LOGLEVEL_ERROR, sprintf("%s %s", $e, $userProps[PR_SENT_REPRESENTING_NAME]));
 			}