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/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

server/includes/templates/login.php

Braces +2 added lines, -1 removed lines

@@ -96,7 +96,8 @@
 		<div class="disclaimer">
 			<?php include '/etc/grommunio-web/disclaimer.html'; ?>
 		</div>
-		<?php } elseif (file_exists('disclaimer.html')) { ?>
+		<?php }
+elseif (file_exists('disclaimer.html')) { ?>
 		<div class="disclaimer">
 			<?php include 'disclaimer.html'; ?>
 		</div>

plugins/kendox/php/class.kendox-module.php

Braces +2 added lines, -1 removed lines

@@ -186,7 +186,8 @@
 		// Read message properties
 		try {
 			$messageProps = mapi_getprops($this->mapiMessage, [PR_SUBJECT, PR_MESSAGE_CLASS]);
-		} catch (Exception $ex) {
+		}
+		catch (Exception $ex) {
 			$this->logErrorAndThrow("Error on getting MAPI message properties", $ex);
 		}
 

plugins/kendox/php/kendox-client/class.kendox-client.php

Braces +21 added lines, -17 removed lines

@@ -25,9 +25,10 @@ 
          */

         public $ConnectionId = null;

 

-        function __construct($serviceEndpoint)

-        {

-            if (!str_ends_with($serviceEndpoint, '/')) $serviceEndpoint .= '/';

+        function __construct($serviceEndpoint) {
+            if (!str_ends_with($serviceEndpoint, '/')) {
+            	$serviceEndpoint .= '/';
+            }
             $this->ServiceEndpoint = $serviceEndpoint;

         }

 

@@ -40,7 +41,7 @@ 
          * 

          * @return bool

          */

-        public function loginWithToken($pfxFile, $pfxPassword, $userName) {

+        public function loginWithToken($pfxFile, $pfxPassword, $userName) {
             try {

                 $issuer = gethostname();

                 $tokenGenerator = new \Kendox\TokenGenerator($issuer, $pfxFile, $pfxPassword);

@@ -53,7 +54,8 @@ 
                 $result = $this->post("Authentication/LogonWithToken", $logonParameters);

                 $this->ConnectionId = $result->LogonWithTokenResult->ConnectionId;

                 return true;

-            } catch(\Exception $ex) {

+            }
+            catch(\Exception $ex) {

                 throw new \Exception("Token-Login failed: ".$ex->getMessage());

             }

         }

@@ -63,7 +65,7 @@ 
          * 

          * @return bool

          */

-        public function logout() {

+        public function logout() {
             try {

                 $logoutParameters = [

                     "connectionId" => $this->ConnectionId

@@ -71,7 +73,8 @@ 
                 $result = $this->post("Authentication/Logout", $logoutParameters);

                 $this->ConnectionId = null;

                 return true;

-            } catch(\Exception $ex) {

+            }
+            catch(\Exception $ex) {

                 throw new \Exception("Token-Login failed: ".$ex->getMessage());

             }

         }

@@ -85,7 +88,7 @@ 
          * 

          * @return array The data result as an array

          */

-        public function userTableQuery($userTableName, $whereClauseElements, $addColumnHeaders) {

+        public function userTableQuery($userTableName, $whereClauseElements, $addColumnHeaders) {
             try {

                 $parameters = [

                     "connectionId" => $this->ConnectionId,

@@ -94,9 +97,12 @@ 
                     "addColumnHeaders" => $addColumnHeaders

                 ];

                 $result = $this->post("UserTable/UserTableGetRecords", $parameters);

-                if (!isset($result->UserTableGetRecordsResult)) throw new \Exception("Unexpected result");

+                if (!isset($result->UserTableGetRecordsResult)) {
+                	throw new \Exception("Unexpected result");
+                }
                 return $result->UserTableGetRecordsResult;

-            } catch(\Exception $ex) {

+            }
+            catch(\Exception $ex) {

                 throw new \Exception("User table query failed: ".$ex->getMessage());

             }

         }

@@ -105,7 +111,7 @@ 
          * Uploading a file

          * @param string $file Path and file name of file to upload

          */

-        public function uploadFile($file) {

+        public function uploadFile($file) {
             $content = file_get_contents($file);

             return $this->uploadContent($content);

         }

@@ -114,12 +120,12 @@ 
          * Uploading a stream of data

          * @param Stream $stream Stream of content to upload

          */

-        public function uploadStream($stream) {

+        public function uploadStream($stream) {
             $content = stream_get_contents($stream);

             return $this->uploadContent($content);

         }

 

-        private function uploadContent($content) {

+        private function uploadContent($content) {
             $base64 = base64_encode($content);

             $uploadParameters = [

                 "connectionId" => $this->ConnectionId,

@@ -137,8 +143,7 @@ 
          * 

          * @return object Returns object with data. If service returns an error an exception will be thrown with detailed information

          */

-        private function post($path, $data)

-        {

+        private function post($path, $data) {
             $ch = curl_init();

             //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);

             curl_setopt($ch, CURLOPT_URL, $this->ServiceEndpoint.$path);

@@ -154,8 +159,7 @@ 
 

         }

         

-        private function handleJsonResult($json)

-        {

+        private function handleJsonResult($json) {
             if ($json === FALSE) {

                 throw new \Exception("No valid JSON has been returned from service.");

             }

plugins/kendox/php/kendox-client/class.kendox-token-generator.php

Braces +23 added lines, -18 removed lines

@@ -44,8 +44,7 @@ 
     private $PfxFile, /**
      * Password for PFX-File (Certificate)
      */
-    private $PfxPassword)

-    {

+    private $PfxPassword) {
         $this->loadCertificateFromPfx();        

     }

 

@@ -56,8 +55,7 @@ 
      * 

      * @return string Token in XML format

      */

-    public function generateToken($userEMail)

-    {

+    public function generateToken($userEMail) {
         try {

             $now = new \DateTime("now", new \DateTimeZone("utc"));

             $guid = $this->createGUID();

@@ -73,7 +71,8 @@ 
                 xmlwriter_end_element($writer);                

             xmlwriter_end_element($writer);

             return xmlwriter_output_memory($writer);

-        } catch(\Exception $ex) {

+        }
+        catch(\Exception $ex) {

             throw new \Exception("Generating token failed: ".$ex->getMessage());

         }

     }   

@@ -81,21 +80,27 @@ 
     /**

      * Loads the X509-certificate from PFX-File

      */

-    private function loadCertificateFromPfx()

-    {

-        if ($this->PfxFile == null) throw new \Exception("No PFX-File available.");

-        if (!file_exists($this->PfxFile)) throw new \Exception("PFX-File not found.");

-        if (empty($this->PfxPassword)) throw new \Exception("Password not set for PFX-File.");

+    private function loadCertificateFromPfx() {
+        if ($this->PfxFile == null) {
+        	throw new \Exception("No PFX-File available.");
+        }
+        if (!file_exists($this->PfxFile)) {
+        	throw new \Exception("PFX-File not found.");
+        }
+        if (empty($this->PfxPassword)) {
+        	throw new \Exception("Password not set for PFX-File.");
+        }
         $pfxContent = file_get_contents($this->PfxFile);

         $results = [];

         $read = openssl_pkcs12_read($pfxContent, $results, $this->PfxPassword);

-        if ($read == false) throw new \Exception("Error on reading PFX-File: ".openssl_error_string());

+        if ($read == false) {
+        	throw new \Exception("Error on reading PFX-File: ".openssl_error_string());
+        }
         $this->Certificate = $results['pkey'].$results['cert'];

         $this->CertPrivateKey = $results['pkey'];

     }

 

-    private function writeSignedInfo($writer, $userEMail, $time, $uniqueId)

-    {

+    private function writeSignedInfo($writer, $userEMail, $time, $uniqueId) {
         $utcTime = $time->format('Y-m-d H:i:s');

         $utcTime = str_replace(" ", "T", $utcTime)."Z";

         xmlwriter_start_element($writer, "SignedInfo");

@@ -136,8 +141,7 @@ 
      * 

      * @return string

      */

-    function SignXmlString($signedInfoXml)

-    {

+    function SignXmlString($signedInfoXml) {
         try {

             $data = iconv('utf-8', 'utf-16le', $signedInfoXml);    

             $privateKey = \phpseclib3\Crypt\RSA::loadFormat('PKCS8', $this->CertPrivateKey)

@@ -145,7 +149,8 @@ 
                             ->withHash('sha512');

             $base64 = base64_encode($privateKey->sign($data));

             return $base64;

-        } catch (\Exception $ex) {

+        }
+        catch (\Exception $ex) {

             throw new \Exception("XML signing failed: ".$ex->getMessage());

         }

     }

@@ -154,10 +159,10 @@ 
      * Creates a unique ID

      * @return string

      */

-    private function createGUID(){

+    private function createGUID() {
         if (function_exists('com_create_guid')){

             return com_create_guid();

-        }

+        }
         else {

             mt_srand((double)microtime()*10000);

             $charid = strtoupper(md5(uniqid(random_int(0, mt_getrandmax()), true)));

plugins/smime/php/plugin.smime.php

Braces +8 added lines, -8 removed lines

@@ -386,8 +386,7 @@ 
 		unlink($tmpUserCert);
 	}
 
-	function join_xph(&$prop, $msg)
-	{
+	function join_xph(&$prop, $msg) {
 		$a = mapi_getprops($msg, [PR_TRANSPORT_MESSAGE_HEADERS]);
 		$a = $a === false ? "" : ($a[PR_TRANSPORT_MESSAGE_HEADERS] ?? "");
 		$prop[PR_TRANSPORT_MESSAGE_HEADERS] =
@@ -988,8 +987,7 @@ 
 		return !empty($rows);
 	}
 
-	public function clear_openssl_error()
-	{
+	public function clear_openssl_error() {
 		while (@openssl_error_string() !== false)
 			/* nothing */;
 	}
@@ -1003,11 +1001,13 @@ 
 	 */
 	public function extract_openssl_error() {
 		$this->openssl_error = "";
-		while (($s = @openssl_error_string()) !== false)
-			if (strlen($this->openssl_error) == 0)
+		while (($s = @openssl_error_string()) !== false) {
+					if (strlen($this->openssl_error) == 0)
 				$this->openssl_error = $s;
-			else
-				$this->openssl_error .= "\n".$s;
+		}
+			else {
+							$this->openssl_error .= "\n".$s;
+			}
 		$openssl_error_code = 0;
 		if ($this->openssl_error) {
 			$openssl_error_list = explode(":", $this->openssl_error);

server/includes/download_message.php

Braces +6 added lines, -4 removed lines

@@ -17,8 +17,9 @@ 
 	 * It also sends the eml file to the client.
 	 */
 	public function downloadMessageAsFile() {
-		if (!$this->message || !$this->store)
-			return;
+		if (!$this->message || !$this->store) {
+					return;
+		}
 		// get message properties.
 		$messageProps = mapi_getprops($this->message, [PR_SUBJECT, PR_MESSAGE_CLASS]);
 
@@ -49,8 +50,9 @@ 
 	 * Send ZIP to the client if all the requested eml files included successfully into the same.
 	 */
 	public function downloadMessageAsZipFile() {
-		if (!$this->store)
-			return;
+		if (!$this->store) {
+					return;
+		}
 		// Generate random ZIP file name at default temporary path of PHP
 		$randomZipName = tempnam(sys_get_temp_dir(), 'zip');
 

server/includes/util.php

Braces +1 added lines, -2 removed lines

@@ -475,8 +475,7 @@
 	return $default;
 }
 
-function parse_smime__join_xph(&$prop, $msg)
-{
+function parse_smime__join_xph(&$prop, $msg) {
 	$a = mapi_getprops($msg, [PR_TRANSPORT_MESSAGE_HEADERS]);
 	$a = $a === false ? "" : ($a[PR_TRANSPORT_MESSAGE_HEADERS] ?? "");
 	$prop[PR_TRANSPORT_MESSAGE_HEADERS] =