grommunio / grommunio-web

plugins/files/php/plugin.files.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 						'notifier' => [
 							'info' => [
 								'files' => [
-									'value' => "dropdown",        // static notifier
+									'value' => "dropdown", // static notifier
 								],
 							],
 						],

Switch Indentation +24 added lines, -24 removed lines

@@ -45,37 +45,37 @@
 
 			case 'server.index.load.custom':
 				switch ($data['name']) {
-				case 'files_get_recipients':
-					RecipientHandler::doGetRecipients();
-					break;
+					case 'files_get_recipients':
+						RecipientHandler::doGetRecipients();
+						break;
 
-				case 'download_file':
-					DownloadHandler::doDownload();
-					break;
+					case 'download_file':
+						DownloadHandler::doDownload();
+						break;
 
-				case 'upload_file':
-					UploadHandler::doUpload();
-					break;
+					case 'upload_file':
+						UploadHandler::doUpload();
+						break;
 
-				case 'form':
-					if (isset($_GET['backend'])) {
-						$backend = urldecode($_GET["backend"]);
-					}
-					else {
-						$backend = '';
-					}
-					$backendstore = Files\Backend\BackendStore::getInstance();
+					case 'form':
+						if (isset($_GET['backend'])) {
+							$backend = urldecode($_GET["backend"]);
+						}
+						else {
+							$backend = '';
+						}
+						$backendstore = Files\Backend\BackendStore::getInstance();
 
-					if ($backendstore->backendExists($backend)) {
-						$backendInstance = $backendstore->getInstanceOfBackend($backend);
-						$formdata = $backendInstance->getFormConfig();
+						if ($backendstore->backendExists($backend)) {
+							$backendInstance = $backendstore->getInstanceOfBackend($backend);
+							$formdata = $backendInstance->getFormConfig();
 
-						exit($formdata);
-					}
+							exit($formdata);
+						}
 
-						exit("Specified backend does not exist!");
+							exit("Specified backend does not exist!");
 
-					break;
+						break;
 			}
 			break;
 		}

plugins/files/php/Files/Backend/class.backendstore.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	 * Search the backend folder for backends and register them.
 	 */
 	public function initialize() {
-		$list = [];    // this hold our plugin folders
+		$list = []; // this hold our plugin folders
 		$workdir = __DIR__ . self::BACKEND_DIR;
 
 		// Populate the list of directories to check against
@@ -87,7 +87,7 @@ 
 	 * Search the backend folder for external backends and register them.
 	 */
 	public function initializeExternal() {
-		$list = [];    // this hold our plugin folders
+		$list = []; // this hold our plugin folders
 		$workdir = $this->EXTERNAL_BACKEND_DIR;
 
 		// Populate the list of directories to check against

plugins/files/php/Files/Backend/Webdav/class.backend.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 				"fields" => $this->formFields,
 				"formConfig" => $this->formConfig,
 			],
-			"data" => [ // here we can specify the default values.
+			"data" => [// here we can specify the default values.
 				"server_address" => "files.demo.com",
 				"server_port" => "80",
 				"server_path" => "/remote.php/webdav",

plugins/filesbackendOwncloud/php/class.backend.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 				"fields" => $this->formFields,
 				"formConfig" => $this->formConfig,
 			],
-			"data" => [ // here we can specify the default values.
+			"data" => [// here we can specify the default values.
 				"server_address" => $_SERVER['HTTP_HOST'],
 				"server_ssl" => true,
 				"server_port" => "443",

plugins/smime/php/lib/Nemid.php

Spacing +1 added lines, -1 removed lines

@@ -445,7 +445,7 @@
 
 	public static function my_rsa_sha_encode($data, $key_id, $signagure_alg) {
 		$algos = [
-			'sha1WithRSAEncryption' => ['alg' => 'sha1',   'oid' => '1.3.14.3.2.26'],
+			'sha1WithRSAEncryption' => ['alg' => 'sha1', 'oid' => '1.3.14.3.2.26'],
 			'sha256WithRSAEncryption' => ['alg' => 'sha256', 'oid' => '2.16.840.1.101.3.4.2.1'],
 			'sha384WithRSAEncryption' => ['alg' => 'sha384', 'oid' => '2.16.840.1.101.3.4.2.2'],
 			'sha512WithRSAEncryption' => ['alg' => 'sha512', 'oid' => '2.16.840.1.101.3.4.2.3'],

plugins/smime/php/lib/Der.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
 	}
 
 	protected function name($tag = null) {
-		$this->beginsequence($tag);  # seq of RDN
+		$this->beginsequence($tag); # seq of RDN
 		$res = [];
 		while ($this->in()) {
 			$parts = [];

plugins/smime/php/plugin.smime.php

Spacing +1 added lines, -1 removed lines

@@ -454,7 +454,7 @@
 		}
 
 		if (!encryptionStoreExpirationSupport()) {
-			withPHPSession(function () use ($encryptionStore) {
+			withPHPSession(function() use ($encryptionStore) {
 				$encryptionStore->add('smime', '');
 			});
 		}

Indentation +8 added lines, -8 removed lines

@@ -163,9 +163,9 @@ 
 		$messageClass = mapi_getprops($message, [PR_MESSAGE_CLASS]);
 		$messageClass = $messageClass[PR_MESSAGE_CLASS];
 		if ($messageClass !== 'IPM.Note.SMIME' &&
-		    $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
-		    $messageClass !== 'IPM.Note.deferSMIME' &&
-		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
+			$messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
+			$messageClass !== 'IPM.Note.deferSMIME' &&
+			$messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
 			return;
 
 		$recipients = $data['action']['props']['smime'];
@@ -607,17 +607,17 @@ 
 		if (!isset($messageClass))
 			return;
 		if (stripos($messageClass, 'IPM.Note.deferSMIME') === false &&
-		    stripos($messageClass, 'IPM.Note.SMIME') === false)
+			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
 		$encryptionStore = \EncryptionStore::getInstance();
 		if (($messageClass === 'IPM.Note.deferSMIME.SignedEncrypt' ||
-		    $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
-		    $messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
-		    $messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
-		    !$encryptionStore->get('smime'))
+			$messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
+			$messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
+			$messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
+			!$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.

Switch Indentation +56 added lines, -56 removed lines

@@ -92,45 +92,45 @@ 
 	public function execute($eventID, &$data) {
 		switch ($eventID) {
 		// Register plugin
-		case 'server.core.settings.init.before':
-			$this->onBeforeSettingsInit($data);
-			break;
-		// Verify a signed or encrypted message when an email is opened
-		case 'server.util.parse_smime.signed':
-			$this->onSignedMessage($data);
-			break;
-
-		case 'server.util.parse_smime.encrypted':
-			$this->onEncrypted($data);
-			break;
-		// Add S/MIME property, which is send to the client
-		case 'server.module.itemmodule.open.after':
-			$this->onAfterOpen($data);
-			break;
-		// Catch uploaded certificate
-		case 'server.upload_attachment.upload':
-			$this->onUploadCertificate($data);
-			break;
-		// Sign email before sending
-		case 'server.core.operations.submitmessage':
-			$this->onBeforeSend($data);
-			break;
-		// Verify that we have public certificates for all recipients
-		case 'server.module.createmailitemmodule.beforesend':
-			$this->onCertificateCheck($data);
-			break;
-
-		case 'server.index.load.custom':
-			if ($data['name'] === 'smime_passphrase') {
-				include 'templates/passphrase.tpl.php';
-				exit();
-			}
-			if ($data['name'] === 'smime_passphrasecheck') {
-				// No need to do anything, this is just used to trigger
-				// the browser's autofill save password dialog.
-				exit();
-			}
-			break;
+			case 'server.core.settings.init.before':
+				$this->onBeforeSettingsInit($data);
+				break;
+			// Verify a signed or encrypted message when an email is opened
+			case 'server.util.parse_smime.signed':
+				$this->onSignedMessage($data);
+				break;
+
+			case 'server.util.parse_smime.encrypted':
+				$this->onEncrypted($data);
+				break;
+			// Add S/MIME property, which is send to the client
+			case 'server.module.itemmodule.open.after':
+				$this->onAfterOpen($data);
+				break;
+			// Catch uploaded certificate
+			case 'server.upload_attachment.upload':
+				$this->onUploadCertificate($data);
+				break;
+			// Sign email before sending
+			case 'server.core.operations.submitmessage':
+				$this->onBeforeSend($data);
+				break;
+			// Verify that we have public certificates for all recipients
+			case 'server.module.createmailitemmodule.beforesend':
+				$this->onCertificateCheck($data);
+				break;
+
+			case 'server.index.load.custom':
+				if ($data['name'] === 'smime_passphrase') {
+					include 'templates/passphrase.tpl.php';
+					exit();
+				}
+				if ($data['name'] === 'smime_passphrasecheck') {
+					// No need to do anything, this is just used to trigger
+					// the browser's autofill save password dialog.
+					exit();
+				}
+				break;
 		}
 	}
 
@@ -663,23 +663,23 @@ 
 
 		// Sign then Encrypt email
 		switch ($messageClass) {
-		case 'IPM.Note.deferSMIME.SignedEncrypt':
-		case 'IPM.Note.SMIME.SignedEncrypt':
-			$tmpFile = tempnam(sys_get_temp_dir(), true);
-			$this->sign($tmpSendEmail, $tmpFile, $message, $signedAttach, $smimeProps);
-			$this->encrypt($tmpFile, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			unlink($tmpFile);
-			break;
-
-		case 'IPM.Note.deferSMIME.MultipartSigned':
-		case 'IPM.Note.SMIME.MultipartSigned':
-			$this->sign($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			break;
-
-		case 'IPM.Note.deferSMIME':
-		case 'IPM.Note.SMIME':
-			$this->encrypt($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			break;
+			case 'IPM.Note.deferSMIME.SignedEncrypt':
+			case 'IPM.Note.SMIME.SignedEncrypt':
+				$tmpFile = tempnam(sys_get_temp_dir(), true);
+				$this->sign($tmpSendEmail, $tmpFile, $message, $signedAttach, $smimeProps);
+				$this->encrypt($tmpFile, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				unlink($tmpFile);
+				break;
+
+			case 'IPM.Note.deferSMIME.MultipartSigned':
+			case 'IPM.Note.SMIME.MultipartSigned':
+				$this->sign($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				break;
+
+			case 'IPM.Note.deferSMIME':
+			case 'IPM.Note.SMIME':
+				$this->encrypt($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				break;
 		}
 
 		// Save the signed message as attachment of the send email

Braces +27 added lines, -18 removed lines

@@ -167,8 +167,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 = [];
@@ -303,8 +304,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);
@@ -549,8 +551,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'];
@@ -625,11 +628,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
@@ -638,8 +643,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']);
@@ -883,8 +889,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);
@@ -1006,8 +1013,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";
@@ -1131,8 +1139,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];

server/includes/modules/class.suggestemailaddressmodule.php

Spacing +2 added lines, -2 removed lines

@@ -122,8 +122,8 @@
 		if (!empty($action["query"]) && !empty($recipient_history) && !empty($recipient_history['recipients'])) {
 			// Setup result array with match levels
 			$l_aResult = [
-				0 => [],	// Matches on whole string
-				1 => [],	// Matches on part of string
+				0 => [], // Matches on whole string
+				1 => [], // Matches on part of string
 			];
 
 			// Loop through all the recipients

server/includes/core/class.theming.php

Spacing +1 added lines, -1 removed lines

@@ -358,7 +358,7 @@
 
 		if ($themeProps['primary-color']) {
 			if (!$themeProps['primary-color:hover']) {
-				list(, , $l) = Colors::rgb2hsl(Colors::colorString2Object($themeProps['primary-color']));
+				list(,, $l) = Colors::rgb2hsl(Colors::colorString2Object($themeProps['primary-color']));
 				if ($l > 20) {
 					$themeProps['primary-color:hover'] = Colors::darker($themeProps['primary-color'], 10);
 				}