grommunio / grommunio-web

plugins/smime/php/lib/Ocsp.php

Braces +4 added lines, -8 removed lines

@@ -47,14 +47,11 @@ 
 		$i = strlen($i);
 		if ($i <= 127) {
 			$res = pack('C', $i);
-		}
-		elseif ($i <= 255) {
+		} elseif ($i <= 255) {
 			$res = pack('CC', 0x81, $i);
-		}
-		elseif ($i <= 65535) {
+		} elseif ($i <= 65535) {
 			$res = pack('Cn', 0x82, $i);
-		}
-		else {
+		} else {
 			$res = pack('CN', 0x84, $i);
 		}
 
@@ -163,8 +160,7 @@ 
 		$this->xtns->next();
 		if ($choice == 1) {
 			$res['responderID']['byName'] = $this->xtns->name();
-		}
-		elseif ($choice == 2) {
+		} elseif ($choice == 2) {
 			$res['responderID']['byKey'] = $this->xtns->keyident();
 		}
 		$res['producedAt'] = $this->xtns->time();

plugins/smime/php/lib/Nemid.php

Braces +3 added lines, -6 removed lines

@@ -495,14 +495,11 @@
 		$i = strlen($i);
 		if ($i <= 127) {
 			$res = pack('C', $i);
-		}
-		elseif ($i <= 255) {
+		} elseif ($i <= 255) {
 			$res = pack('CC', 0x81, $i);
-		}
-		elseif ($i <= 65535) {
+		} elseif ($i <= 65535) {
 			$res = pack('Cn', 0x82, $i);
-		}
-		else {
+		} else {
 			$res = pack('CN', 0x84, $i);
 		}
 

plugins/smime/php/lib/Der.php

Braces +9 added lines, -18 removed lines

@@ -77,17 +77,13 @@ 
 					$int = bcadd($int, ord($byte), 0);
 				}
 				$this->value = $int;
-			}
-			elseif ($this->tag == 1) { # boolean
+			} elseif ($this->tag == 1) { # boolean
 				$this->value = ord($value) != 0;
-			}
-			elseif ($this->tag == 3) { # bit string
+			} elseif ($this->tag == 3) { # bit string
 				$this->value = $value;
-			}
-			elseif ($this->tag == 5) { # null
+			} elseif ($this->tag == 5) { # null
 				$this->value = null;
-			}
-			else {
+			} else {
 				$this->value = $value;
 			}
 		}
@@ -102,8 +98,7 @@ 
 		$i = $this->i;
 		if (!$pass) {
 			$this->i = $oldi;
-		}
-		else {
+		} else {
 			$this->i += $this->len;
 		}
 
@@ -181,15 +176,12 @@ 
 			try {
 				if (method_exists($this, $extnID)) {
 					$theext['extnValue'] = call_user_func([$this, $extnID], $theext['extnValue']);
-				}
-				elseif (!empty($ignoredextensions['$extnID'])) {
+				} elseif (!empty($ignoredextensions['$extnID'])) {
 					trigger_error("Unknown extension {$extnID}", E_USER_ERROR);
-				}
-				else {
+				} else {
 					$theext['extnValue'] = chunk_split(bin2hex($theext['extnValue']), 2, ':');
 				}
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				$theext['extnValue'] = chunk_split(bin2hex($theext['extnValue']), 2, ':');
 			}
 			$this->end();
@@ -259,8 +251,7 @@ 
 		$time = $this->next($tag);
 		if ($this->tag == 23) {
 			$time = (substr($time, 0, 2) < 50 ? '20' : '19') . $time;
-		}
-		elseif ($this->tag != 24) {
+		} elseif ($this->tag != 24) {
 			trigger_error('expected der utc or generalized time', E_USER_ERROR);
 		}
 

plugins/smime/php/class.pluginsmimemodule.php

Braces +7 added lines, -14 removed lines

@@ -86,8 +86,7 @@ 
 						default:
 							$this->handleUnknownActionType($actionType);
 					}
-				}
-				catch (Exception $e) {
+				} catch (Exception $e) {
 					$this->sendFeedback(false, parent::errorDetailsFromException($e));
 				}
 			}
@@ -116,8 +115,7 @@ 
 		// No certificates
 		if (!$privateCerts || count($privateCerts) === 0) {
 			$message = _('No certificate avaliable');
-		}
-		else {
+		} else {
 			// For each certificate in MAPI store
 			$smtpAddress = $GLOBALS['mapisession']->getSMTPAddress();
 			for ($i = 0, $cnt = count($privateCerts); $i < $cnt; ++$i) {
@@ -126,14 +124,11 @@ 
 				// And remove possible duplication from plugin.smime.php->onUploadCertificate
 				if ($privateCerts[$i][PR_MESSAGE_DELIVERY_TIME] < time()) { // validTo
 					$message = _('Private certificate is not valid yet, unable to sign email');
-				}
-				elseif ($privateCerts[$i][PR_CLIENT_SUBMIT_TIME] >= time()) { // validFrom
+				} elseif ($privateCerts[$i][PR_CLIENT_SUBMIT_TIME] >= time()) { // validFrom
 					$message = _('Private certificate has been expired, unable to sign email');
-				}
-				elseif (strcasecmp($privateCerts[$i][PR_SUBJECT], $smtpAddress) !== 0) {
+				} elseif (strcasecmp($privateCerts[$i][PR_SUBJECT], $smtpAddress) !== 0) {
 					$message = _('Private certificate does not match email address');
-				}
-				else {
+				} else {
 					$status = true;
 					$message = '';
 					$certIdx = $i;
@@ -167,15 +162,13 @@ 
 			$encryptionStore = EncryptionStore::getInstance();
 			if (encryptionStoreExpirationSupport()) {
 				$encryptionStore->add('smime', $data['passphrase'], time() + (5 * 60));
-			}
-			else {
+			} else {
 				withPHPSession(function () use ($encryptionStore, $data) {
 					$encryptionStore->add('smime', $data['passphrase']);
 				});
 			}
 			$result = true;
-		}
-		else {
+		} else {
 			$result = false;
 		}
 

plugins/smime/php/plugin.smime.php

Braces +24 added lines, -48 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));
 			}
 		}
@@ -963,8 +944,7 @@ 
 		if ($php72) {
 			openssl_pkcs7_verify($emlfile, PKCS7_NOVERIFY, $certfile);
 			openssl_pkcs7_verify($emlfile, PKCS7_NOVERIFY, $certfile, [], $certfile, $outfile, $p7bfile);
-		}
-		else {
+		} else {
 			kopano_pkcs7_verify($emlfile, PKCS7_NOVERIFY, $certfile);
 			kopano_pkcs7_verify($emlfile, PKCS7_NOVERIFY, $certfile, [], $certfile, $outfile, $p7bfile);
 		}
@@ -973,8 +953,7 @@ 
 		$p7b = file_get_contents($p7bfile);
 		if ($php72) {
 			openssl_pkcs7_read($p7b, $cas);
-		}
-		else {
+		} else {
 			// FIXME: Without the error_log, kopano_pkcs7_verify does not work (wtf).
 			error_log($p7b);
 			kopano_pkcs7_read($p7b, $cas);
@@ -1045,8 +1024,7 @@ 
 
 		if ($hash === 'sha1') {
 			$fingerprint = sha1($body);
-		}
-		else {
+		} else {
 			$fingerprint = md5($body);
 		}
 
@@ -1071,8 +1049,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();
 		}
 
@@ -1145,8 +1122,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]));
 			}
 

plugins/smime/php/class.certificate.php

Braces +3 added lines, -6 removed lines

@@ -122,8 +122,7 @@ 
 		// If subject/emailAddress is not set, try subjectAltName
 		if (isset($this->data['subject']['emailAddress'])) {
 			$certEmailAddress = $this->data['subject']['emailAddress'];
-		}
-		elseif (isset($this->data['extensions'], $this->data['extensions']['subjectAltName'])
+		} elseif (isset($this->data['extensions'], $this->data['extensions']['subjectAltName'])
 			) {
 			// Example [subjectAltName] => email:foo@bar.com
 			$tmp = explode('email:', $this->data['extensions']['subjectAltName']);
@@ -242,8 +241,7 @@ 
 		$body = base64_decode($body);
 		if ($hash_algorithm === 'sha1') {
 			$fingerprint = sha1($body);
-		}
-		else {
+		} else {
 			$fingerprint = md5($body);
 		}
 		// Format 1000AB as 10:00:AB
@@ -281,8 +279,7 @@ 
 		$curl_error = curl_error($ch);
 		if (!$curl_error && $http_status === 200) {
 			$cert = $this->der2pem($output);
-		}
-		else {
+		} else {
 			Log::Write(LOGLEVEL_ERROR, sprintf("[smime] Error when downloading internmediate certificate '%s', http status: '%s'", $curl_error, $http_status));
 		}
 		curl_close($ch);

plugins/smime/php/util.php

Braces +3 added lines, -6 removed lines

@@ -17,8 +17,7 @@ 
 	// If subject/emailAddress is not set, try subjectAltName
 	if (isset($certificate['subject']['emailAddress'])) {
 		$certEmailAddress = $certificate['subject']['emailAddress'];
-	}
-	elseif (isset($certificate['extensions'], $certificate['extensions']['subjectAltName'])) {
+	} elseif (isset($certificate['extensions'], $certificate['extensions']['subjectAltName'])) {
 		// Example [subjectAltName] => email:foo@bar.com
 		$tmp = explode('email:', $certificate['extensions']['subjectAltName']);
 		// Only get the first match
@@ -183,8 +182,7 @@ 
 		if ($issuer->issuer()) {
 			$issuer->verify();
 		}
-	}
-	catch (OCSPException $e) {
+	} catch (OCSPException $e) {
 		if ($e->getCode() === OCSP_CERT_STATUS && $e->getCertStatus() == OCSP_CERT_STATUS_REVOKED) {
 			$message['info'] = SMIME_REVOKED;
 			$message['success'] = SMIME_STATUS_PARTIAL;
@@ -244,8 +242,7 @@ 
 		elseif (!verifyOCSP($certs['cert'], $extracerts, $data)) {
 			$message = _('Certificate is revoked');
 		}
-	}
-	else { // Can't parse public certificate pkcs#12 file might be corrupt
+	} else { // Can't parse public certificate pkcs#12 file might be corrupt
 		$message = _('Unable to read public certificate');
 	}
 

server/includes/download_message.php

Braces +4 added lines, -8 removed lines

@@ -87,8 +87,7 @@ 
 					// Add file into zip by stream
 					$zip->addFromString($filename, $datastring);
 				}
-			}
-			else {
+			} else {
 				$zip->close();
 				// Remove the zip file to avoid unnecessary disk-space consumption
 				unlink($randomZipName);
@@ -135,8 +134,7 @@ 
 		if (isset($messageProps[PR_EC_IMAP_EMAIL]) || propIsError(PR_EC_IMAP_EMAIL, $messageProps) == MAPI_E_NOT_ENOUGH_MEMORY) {
 			// Stream the message to properly get the PR_EC_IMAP_EMAIL property
 			$stream = mapi_openproperty($this->message, PR_EC_IMAP_EMAIL, IID_IStream, 0, 0);
-		}
-		else {
+		} else {
 			// Get addressbook for current session
 			$addrBook = $GLOBALS['mapisession']->getAddressbook();
 
@@ -155,8 +153,7 @@ 
 		if ($this->allAsZip) {
 			// download multiple eml messages in a ZIP file
 			$this->downloadMessageAsZipFile();
-		}
-		else {
+		} else {
 			// download message as file
 			$this->downloadMessageAsFile();
 		}
@@ -172,7 +169,6 @@ 
 
 	// download message
 	$messageInstance->download();
-}
-catch (Exception $e) {
+} catch (Exception $e) {
 	$messageInstance->handleSaveMessageException($e);
 }

server/includes/upload_attachment.php

Braces +30 added lines, -60 removed lines

@@ -151,8 +151,7 @@ 
 					if (!isIE11() && !isEdge() && $this->ignoreExtractAttachid === false) {
 						$attachID = substr($filename, -8);
 						$filename = substr($filename, 0, -8);
-					}
-					else {
+					} else {
 						$attachID = uniqid();
 					}
 
@@ -178,8 +177,7 @@ 
 					// import given files
 					if ($this->import) {
 						$importStatus = $this->importFiles($attachTempName, $filename, isset($_POST['has_icsvcs_file']) ? $_POST['has_icsvcs_file'] : false);
-					}
-					elseif ($sourcetype === 'contactphoto' || $sourcetype === 'default') {
+					} elseif ($sourcetype === 'contactphoto' || $sourcetype === 'default') {
 						$fileData = [
 							'props' => [
 								'attach_num' => -1,
@@ -195,8 +193,7 @@ 
 						}
 
 						$returnfiles[] = $fileData;
-					}
-					else {
+					} else {
 						// Backwards compatibility for Plugins (S/MIME)
 						$lastKey = count($returnfiles) - 1;
 						if ($lastKey >= 0) {
@@ -209,12 +206,10 @@ 
 			if ($this->import) {
 				if ($importStatus !== false) {
 					$this->sendImportResponse($importStatus);
-				}
-				else {
+				} else {
 					throw new ZarafaException(_("File is not imported successfully"));
 				}
-			}
-			else {
+			} else {
 				$return = [
 					'success' => true,
 					'zarafa' => [
@@ -294,21 +289,18 @@ 
 			processVCFStream($attachmentStream);
 			// Convert vCard 1.0 to a MAPI contact.
 			$contacts = $this->convertVCFContactsToMapi($this->destinationFolder, $attachmentStream);
-		}
-		catch (ZarafaException $e) {
+		} catch (ZarafaException $e) {
 			$e->setTitle(_("Import error"));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$destinationFolderProps = mapi_getprops($this->destinationFolder, [PR_DISPLAY_NAME, PR_MDB_PROVIDER]);
 			$fullyQualifiedFolderName = $destinationFolderProps[PR_DISPLAY_NAME];
 			if ($destinationFolderProps[PR_MDB_PROVIDER] === ZARAFA_STORE_PUBLIC_GUID) {
 				$publicStore = $GLOBALS["mapisession"]->getPublicMessageStore();
 				$publicStoreName = mapi_getprops($publicStore, [PR_DISPLAY_NAME]);
 				$fullyQualifiedFolderName .= " - " . $publicStoreName[PR_DISPLAY_NAME];
-			}
-			elseif ($destinationFolderProps[PR_MDB_PROVIDER] === ZARAFA_STORE_DELEGATE_GUID) {
+			} elseif ($destinationFolderProps[PR_MDB_PROVIDER] === ZARAFA_STORE_DELEGATE_GUID) {
 				$otherStore = $GLOBALS['operations']->getOtherStoreFromEntryid($this->destinationFolderId);
 				$sharedStoreOwnerName = mapi_getprops($otherStore, [PR_MAILBOX_OWNER_NAME]);
 				$fullyQualifiedFolderName .= " - " . $sharedStoreOwnerName[PR_MAILBOX_OWNER_NAME];
@@ -317,14 +309,11 @@ 
 			$message = sprintf(_("Unable to import '%s' to '%s'. "), $filename, $fullyQualifiedFolderName);
 			if ($e->getCode() === MAPI_E_TABLE_EMPTY) {
 				$message .= _("There is no contact found in this file.");
-			}
-			elseif ($e->getCode() === MAPI_E_CORRUPT_DATA) {
+			} elseif ($e->getCode() === MAPI_E_CORRUPT_DATA) {
 				$message .= _("The file is corrupt.");
-			}
-			elseif ($e->getCode() === MAPI_E_INVALID_PARAMETER) {
+			} elseif ($e->getCode() === MAPI_E_INVALID_PARAMETER) {
 				$message .= _("The file is invalid.");
-			}
-			else {
+			} else {
 				$message = sprintf(_("Unable to import '%s'. "), $filename) . _("Please contact your system administrator if the problem persists.");
 			}
 
@@ -367,16 +356,14 @@ 
 		// but if it doesn't exist, we use the old function 'mapi_vcftomapi' for single vcf file.
 		if (function_exists('mapi_vcftomapi2')) {
 			$contacts = mapi_vcftomapi2($destinationFolder, $attachmentStream);
-		}
-		elseif ($_POST['is_single_import']) {
+		} elseif ($_POST['is_single_import']) {
 			$newMessage = mapi_folder_createmessage($this->destinationFolder);
 			$store = $GLOBALS["mapisession"]->getDefaultMessageStore();
 			$ok = mapi_vcftomapi($GLOBALS['mapisession']->getSession(), $store, $newMessage, $attachmentStream);
 			if ($ok !== false) {
 				$contacts = is_array($newMessage) ? $newMessage : [$newMessage];
 			}
-		}
-		else {
+		} else {
 			// Throw error related to multiple vcf as the function is not available for importing multiple vcf file.
 			throw new ZarafaException(_("grommunio Web does not support importing multiple VCF with this version."));
 		}
@@ -439,8 +426,7 @@ 
 				if (array_search($value, $prefix, true) !== false) {
 					$props[PR_DISPLAY_NAME_PREFIX] = $value;
 					unset($str[$index]);
-				}
-				elseif (array_search($value, $suffix, true) !== false) {
+				} elseif (array_search($value, $suffix, true) !== false) {
 					$props[PR_GENERATION] = $value;
 					unset($str[$index]);
 				}
@@ -486,13 +472,11 @@ 
 
 		try {
 			$events = $this->convertICSToMapi($attachmentStream);
-		}
-		catch (ZarafaException $e) {
+		} catch (ZarafaException $e) {
 			$e->setTitle(_("Import error"));
 
 			throw $e;
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$destinationFolderProps = mapi_getprops($this->destinationFolder, [PR_DISPLAY_NAME, PR_MDB_PROVIDER]);
 			$fullyQualifiedFolderName = $destinationFolderProps[PR_DISPLAY_NAME];
 			// Condition true if folder is belongs to Public store.
@@ -500,8 +484,7 @@ 
 				$publicStore = $GLOBALS["mapisession"]->getPublicMessageStore();
 				$publicStoreName = mapi_getprops($publicStore, [PR_DISPLAY_NAME]);
 				$fullyQualifiedFolderName .= " - " . $publicStoreName[PR_DISPLAY_NAME];
-			}
-			elseif ($destinationFolderProps[PR_MDB_PROVIDER] === ZARAFA_STORE_DELEGATE_GUID) {
+			} elseif ($destinationFolderProps[PR_MDB_PROVIDER] === ZARAFA_STORE_DELEGATE_GUID) {
 				// Condition true if folder is belongs to delegate store.
 				$otherStore = $GLOBALS['operations']->getOtherStoreFromEntryid($this->destinationFolderId);
 				$sharedStoreOwnerName = mapi_getprops($otherStore, [PR_MAILBOX_OWNER_NAME]);
@@ -511,14 +494,11 @@ 
 			$message = sprintf(_("Unable to import '%s' to '%s'. "), $filename, $fullyQualifiedFolderName);
 			if ($e->getCode() === MAPI_E_TABLE_EMPTY) {
 				$message .= _("There is no appointment found in this file.");
-			}
-			elseif ($e->getCode() === MAPI_E_CORRUPT_DATA) {
+			} elseif ($e->getCode() === MAPI_E_CORRUPT_DATA) {
 				$message .= _("The file is corrupt.");
-			}
-			elseif ($e->getCode() === MAPI_E_INVALID_PARAMETER) {
+			} elseif ($e->getCode() === MAPI_E_INVALID_PARAMETER) {
 				$message .= _("The file is invalid.");
-			}
-			else {
+			} else {
 				$message = sprintf(_("Unable to import '%s'. "), $filename) . _("Please contact your system administrator if the problem persists.");
 			}
 
@@ -570,8 +550,7 @@ 
 		// but if it doesn't exist, we use the old function 'mapi_icaltomapi' for single ics file.
 		if (function_exists('mapi_icaltomapi2')) {
 			$events = mapi_icaltomapi2($addrBook, $this->destinationFolder, $attachmentStream);
-		}
-		elseif ($_POST['is_single_import']) {
+		} elseif ($_POST['is_single_import']) {
 			$newMessage = mapi_folder_createmessage($this->destinationFolder);
 			$store = $GLOBALS["mapisession"]->getDefaultMessageStore();
 			$ok = mapi_icaltomapi($GLOBALS['mapisession']->getSession(), $store, $addrBook, $newMessage, $attachmentStream, false);
@@ -579,8 +558,7 @@ 
 			if ($ok !== false) {
 				array_push($events, $newMessage);
 			}
-		}
-		else {
+		} else {
 			// Throw error related to multiple ics as the function is not available for importing multiple ics file.
 			throw new ZarafaException(_("grommunio Web does not support importing multiple ICS with this version."));
 		}
@@ -630,8 +608,7 @@ 
 
 		try {
 			$destinationFolder = mapi_msgstore_openentry($this->store, hex2bin($this->destinationFolderId));
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			// Try to find the folder from shared stores in case if it is not found in current user's store
 			$destinationFolder = mapi_msgstore_openentry($GLOBALS['operations']->getOtherStoreFromEntryid($this->destinationFolderId), hex2bin($this->destinationFolderId));
 		}
@@ -654,8 +631,7 @@ 
 
 			// Delete the file instance and unregister the file
 			$this->attachment_state->deleteUploadedAttachmentFile($_REQUEST['dialog_attachments'], $num, $attachID);
-		}
-		else {
+		} else {
 			// Set the correct array structure
 			$this->attachment_state->addDeletedAttachment($_REQUEST['dialog_attachments'], $num);
 		}
@@ -735,8 +711,7 @@ 
 				'type' => mime_content_type($tmpname),
 				'sourcetype' => 'default',
 			]);
-		}
-		else {
+		} else {
 			// Check if no files are uploaded with this attachmentid
 			$this->attachment_state->clearAttachmentFiles($_GET['attachment_id']);
 		}
@@ -857,15 +832,12 @@ 
 			if (isset($_FILES['attachments']) && is_array($_FILES['attachments'])) {
 				// import given files into respective webapp folder
 				$this->processFiles();
-			}
-			elseif (isset($_POST['deleteattachment'])) {
+			} elseif (isset($_POST['deleteattachment'])) {
 				$this->deleteUploadedFiles();
-			}
-			elseif (isset($_POST['entryid'])) {	// Check for adding of embedded attachments
+			} elseif (isset($_POST['entryid'])) {	// Check for adding of embedded attachments
 				$this->addingEmbeddedAttachments();
 			}
-		}
-		elseif ($_GET && isset($_GET['attachment_id'])) { // this is to upload the file to server when the doc is send via OOo
+		} elseif ($_GET && isset($_GET['attachment_id'])) { // this is to upload the file to server when the doc is send via OOo
 			$this->uploadWhenWendViaOOO();
 		}
 
@@ -882,10 +854,8 @@ 
 
 	// upload files
 	$uploadInstance->upload();
-}
-catch (ZarafaException $e) {
+} catch (ZarafaException $e) {
 	$uploadInstance->handleUploadException($e, $e->getTitle());
-}
-catch (Exception $e) {
+} catch (Exception $e) {
 	$uploadInstance->handleUploadException($e);
 }