grommunio / grommunio-web

plugins/smime/php/class.pluginsmimemodule.php

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/plugin.smime.php

Braces +27 added lines, -18 removed lines

@@ -165,8 +165,9 @@ 
 		if ($messageClass !== 'IPM.Note.SMIME' &&
 		    $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
 		    $messageClass !== 'IPM.Note.deferSMIME' &&
-		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
-			return;
+		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt') {
+					return;
+		}
 
 		$recipients = $data['action']['props']['smime'];
 		$missingCerts = [];
@@ -300,8 +301,9 @@ 
 				$importCert = file_get_contents($outcert);
 				$parsedImportCert = openssl_x509_parse($importCert);
 				$parsedUserCert = openssl_x509_parse($userCert);
-				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL)
-					continue;
+				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL) {
+									continue;
+				}
 
 				// CA Checks out
 				$caCerts = $this->extractCAs($tmpfname);
@@ -528,8 +530,9 @@ 
 	 * @param {mixed} $data
 	 */
 	public function onUploadCertificate($data) {
-		if ($data['sourcetype'] !== 'certificate')
-			return;
+		if ($data['sourcetype'] !== 'certificate') {
+					return;
+		}
 		$passphrase = $_POST['passphrase'];
 		$saveCert = false;
 		$tmpname = $data['tmpname'];
@@ -604,11 +607,13 @@ 
 		$props = mapi_getprops($message, [PR_MESSAGE_CLASS]);
 		$messageClass = $props[PR_MESSAGE_CLASS];
 
-		if (!isset($messageClass))
-			return;
+		if (!isset($messageClass)) {
+					return;
+		}
 		if (stripos($messageClass, 'IPM.Note.deferSMIME') === false &&
-		    stripos($messageClass, 'IPM.Note.SMIME') === false)
-			return;
+		    stripos($messageClass, 'IPM.Note.SMIME') === false) {
+					return;
+		}
 
 		// FIXME: for now return when we are going to sign but we don't have the passphrase set
 		// This should never happen sign
@@ -617,8 +622,9 @@ 
 		    $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
 		    $messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
 		    $messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
-		    !$encryptionStore->get('smime'))
-			return;
+		    !$encryptionStore->get('smime')) {
+					return;
+		}
 		// NOTE: setting message class to IPM.Note, so that mapi_inetmapi_imtoinet converts the message to plain email
 		// and doesn't fail when handling the attachments.
 		mapi_setprops($message, [PR_MESSAGE_CLASS => 'IPM.Note']);
@@ -862,8 +868,9 @@ 
 			foreach ($certs as $cert) {
 				$pubkey = mapi_msgstore_openentry($this->getStore(), $cert[PR_ENTRYID]);
 				$certificate = "";
-				if ($pubkey == false)
-					continue;
+				if ($pubkey == false) {
+									continue;
+				}
 				// retrieve pkcs#11 certificate from body
 				$stream = mapi_openproperty($pubkey, PR_BODY, IID_IStream, 0, 0);
 				$stat = mapi_stream_stat($stream);
@@ -985,8 +992,9 @@ 
 	 */
 	public function importCertificate($cert, $certData, $type = 'public', $force = false) {
 		$certEmail = getCertEmail($certData);
-		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private')
-			return;
+		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private') {
+					return;
+		}
 		$issued_by = "";
 		foreach (array_keys($certData['issuer']) as $key) {
 			$issued_by .= $key . '=' . $certData['issuer'][$key] . "\n";
@@ -1110,8 +1118,9 @@ 
 	 * @return array with properties
 	 */
 	public function getSenderAddress($mapiMessage) {
-		if (method_exists($GLOBALS['operations'], 'getSenderAddress'))
-			return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		if (method_exists($GLOBALS['operations'], 'getSenderAddress')) {
+					return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		}
 
 		$messageProps = mapi_getprops($mapiMessage, [PR_SENT_REPRESENTING_ENTRYID, PR_SENDER_ENTRYID]);
 		$senderEntryID = isset($messageProps[PR_SENT_REPRESENTING_ENTRYID]) ? $messageProps[PR_SENT_REPRESENTING_ENTRYID] : $messageProps[PR_SENDER_ENTRYID];

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