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>

server/includes/modules/class.addressbooklistmodule.php

Indentation +5 added lines, -5 removed lines

@@ -908,14 +908,14 @@
 						// Do not show contacts' folders in the AB list view for which
 						// the user has permissions, but hasn't added them to the folder hierarchy.
 						if (!empty($sharedUserSetting) &&
-						    !isset($sharedUserSetting['all']) &&
-						    !isset($sharedUserSetting['contact']) &&
-						    in_array($mainUserEntryId, array_column($grants, 'userid'))) {
+							!isset($sharedUserSetting['all']) &&
+							!isset($sharedUserSetting['contact']) &&
+							in_array($mainUserEntryId, array_column($grants, 'userid'))) {
 							continue;
 						}
 						if (isset($sharedUserSetting['all']) ||
-						    isset($sharedUserSetting['contact']) ||
-						    in_array($mainUserEntryId, array_column($grants, 'userid')))
+							isset($sharedUserSetting['contact']) ||
+							in_array($mainUserEntryId, array_column($grants, 'userid')))
 						{
 							$this->addFolder($folders, [
 								// Postfix display name of every contact folder with respective owner name

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

Indentation +151 added lines, -151 removed lines

@@ -1,171 +1,171 @@
 <?php

 namespace Kendox;

 

-    require_once("class.kendox-token-generator.php");

+	require_once("class.kendox-token-generator.php");

 

-    class Client

-    {

+	class Client

+	{

         

-        /**

-         * Generated token for user

-         * 

-         * @var StdClass

-         */

-        public $Token = null;

+		/**

+		 * Generated token for user

+		 * 

+		 * @var StdClass

+		 */

+		public $Token = null;

 

-        /**

-         * URL of Kendox Service Endpoint

-         * @var string

-         */

-        public $ServiceEndpoint = null;

+		/**

+		 * URL of Kendox Service Endpoint

+		 * @var string

+		 */

+		public $ServiceEndpoint = null;

 

-        /**

-         * Connection Id returned from service on successful login

-         * @var string

-         */

-        public $ConnectionId = null;

+		/**

+		 * Connection Id returned from service on successful login

+		 * @var string

+		 */

+		public $ConnectionId = null;

 

-        function __construct($serviceEndpoint)

-        {

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

-            $this->ServiceEndpoint = $serviceEndpoint;

-        }

+		function __construct($serviceEndpoint)

+		{

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

+			$this->ServiceEndpoint = $serviceEndpoint;

+		}

 

-        /**

-         * Login to kendox service by creating a user based token, signed by Kendox trusted certificate

-         * 

-         * @param string $pfxFile The full path and file name of the PFX-File (certificate)

-         * @param string $pfxPassword The password used for reading the PFX-File (certificate)

-         * @param string $userName Username for token generation

-         * 

-         * @return bool

-         */

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

-            try {

-                $issuer = gethostname();

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

-                $this->Token = $tokenGenerator->generateToken($userName);                

-                $logonParameters = [

-                    "tenantName" => "",

-                    "token" => $this->Token,

-                    "tokenType" => "InfoShareToken"

-                ];

-                $result = $this->post("Authentication/LogonWithToken", $logonParameters);

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

-                return true;

-            } catch(\Exception $ex) {

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

-            }

-        }

+		/**

+		 * Login to kendox service by creating a user based token, signed by Kendox trusted certificate

+		 * 

+		 * @param string $pfxFile The full path and file name of the PFX-File (certificate)

+		 * @param string $pfxPassword The password used for reading the PFX-File (certificate)

+		 * @param string $userName Username for token generation

+		 * 

+		 * @return bool

+		 */

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

+			try {

+				$issuer = gethostname();

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

+				$this->Token = $tokenGenerator->generateToken($userName);                

+				$logonParameters = [

+					"tenantName" => "",

+					"token" => $this->Token,

+					"tokenType" => "InfoShareToken"

+				];

+				$result = $this->post("Authentication/LogonWithToken", $logonParameters);

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

+				return true;

+			} catch(\Exception $ex) {

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

+			}

+		}

 

-        /**

-         * Logout from kendox

-         * 

-         * @return bool

-         */

-        public function logout() {

-            try {

-                $logoutParameters = [

-                    "connectionId" => $this->ConnectionId

-                ];

-                $result = $this->post("Authentication/Logout", $logoutParameters);

-                $this->ConnectionId = null;

-                return true;

-            } catch(\Exception $ex) {

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

-            }

-        }

+		/**

+		 * Logout from kendox

+		 * 

+		 * @return bool

+		 */

+		public function logout() {

+			try {

+				$logoutParameters = [

+					"connectionId" => $this->ConnectionId

+				];

+				$result = $this->post("Authentication/Logout", $logoutParameters);

+				$this->ConnectionId = null;

+				return true;

+			} catch(\Exception $ex) {

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

+			}

+		}

 

-        /**

-         * Performs a user table query and fetch the result records

-         * 

-         * @param $userTableName The name of the user table

-         * @param $whereClauseElements Array with fields "ColumnName", "RelationalOperator" and "Value" for filter defintion of the query

-         * @param $addColumnHeaders Add column headers to result?

-         * 

-         * @return array The data result as an array

-         */

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

-            try {

-                $parameters = [

-                    "connectionId" => $this->ConnectionId,

-                    "userTable" => $userTableName,

-                    "whereClauseElements" => $whereClauseElements,

-                    "addColumnHeaders" => $addColumnHeaders

-                ];

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

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

-                return $result->UserTableGetRecordsResult;

-            } catch(\Exception $ex) {

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

-            }

-        }

+		/**

+		 * Performs a user table query and fetch the result records

+		 * 

+		 * @param $userTableName The name of the user table

+		 * @param $whereClauseElements Array with fields "ColumnName", "RelationalOperator" and "Value" for filter defintion of the query

+		 * @param $addColumnHeaders Add column headers to result?

+		 * 

+		 * @return array The data result as an array

+		 */

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

+			try {

+				$parameters = [

+					"connectionId" => $this->ConnectionId,

+					"userTable" => $userTableName,

+					"whereClauseElements" => $whereClauseElements,

+					"addColumnHeaders" => $addColumnHeaders

+				];

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

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

+				return $result->UserTableGetRecordsResult;

+			} catch(\Exception $ex) {

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

+			}

+		}

 

-        /**

-         * Uploading a file

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

-         */

-        public function uploadFile($file) {

-            $content = file_get_contents($file);

-            return $this->uploadContent($content);

-        }

+		/**

+		 * Uploading a file

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

+		 */

+		public function uploadFile($file) {

+			$content = file_get_contents($file);

+			return $this->uploadContent($content);

+		}

 

-        /**

-         * Uploading a stream of data

-         * @param Stream $stream Stream of content to upload

-         */

-        public function uploadStream($stream) {

-            $content = stream_get_contents($stream);

-            return $this->uploadContent($content);

-        }

+		/**

+		 * Uploading a stream of data

+		 * @param Stream $stream Stream of content to upload

+		 */

+		public function uploadStream($stream) {

+			$content = stream_get_contents($stream);

+			return $this->uploadContent($content);

+		}

 

-        private function uploadContent($content) {

-            $base64 = base64_encode($content);

-            $uploadParameters = [

-                "connectionId" => $this->ConnectionId,

-                "fileContentbase64" => $base64

-            ];            

-            $result = $this->post("File/UploadFileBase64", $uploadParameters);            

-            return $result->UploadFileBase64Result;

-        }

+		private function uploadContent($content) {

+			$base64 = base64_encode($content);

+			$uploadParameters = [

+				"connectionId" => $this->ConnectionId,

+				"fileContentbase64" => $base64

+			];            

+			$result = $this->post("File/UploadFileBase64", $uploadParameters);            

+			return $result->UploadFileBase64Result;

+		}

 

-        /**

-         * Performing a post request to service

-         * 

-         * @param string $path the route to the API endpoint (without service endpoint url)

-         * @param string Associated array with data to post

-         * 

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

-         */

-        private function post($path, $data)

-        {

-            $ch = curl_init();

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

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

-            curl_setopt($ch, CURLOPT_POST, 1);

-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));

-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-            curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);

-            $jsonResult = curl_exec($ch);

-            if (curl_errno($ch)) {

-                throw new \Exception("Error on post request: ".curl_errno($ch));

-            }

-            return $this->handleJsonResult($jsonResult);

+		/**

+		 * Performing a post request to service

+		 * 

+		 * @param string $path the route to the API endpoint (without service endpoint url)

+		 * @param string Associated array with data to post

+		 * 

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

+		 */

+		private function post($path, $data)

+		{

+			$ch = curl_init();

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

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

+			curl_setopt($ch, CURLOPT_POST, 1);

+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));

+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+			curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);

+			$jsonResult = curl_exec($ch);

+			if (curl_errno($ch)) {

+				throw new \Exception("Error on post request: ".curl_errno($ch));

+			}

+			return $this->handleJsonResult($jsonResult);

 

-        }

+		}

         

-        private function handleJsonResult($json)

-        {

-            if ($json === FALSE) {

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

-            }

-            $result = json_decode($json);

-            if (isset($result->ErrorNumber)) {

-                throw new \Exception("(".$result->ErrorNumber.") ".$result->Message);

-            }

-            return $result;

-        }

+		private function handleJsonResult($json)

+		{

+			if ($json === FALSE) {

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

+			}

+			$result = json_decode($json);

+			if (isset($result->ErrorNumber)) {

+				throw new \Exception("(".$result->ErrorNumber.") ".$result->Message);

+			}

+			return $result;

+		}

 

-    }

+	}

 

 ?>
\ No newline at end of file

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

Indentation +155 added lines, -155 removed lines

@@ -6,170 +6,170 @@
 class TokenGenerator

 {

 

-    /**

-     * Token version

-     * @var string

-     */

-    private $TokenVersion = "1";

+	/**

+	 * Token version

+	 * @var string

+	 */

+	private $TokenVersion = "1";

 

-    /**

-     * Token lifetime in seconds

-     * @var int

-     */

-    private $TokenLifeTime = 99000000;

+	/**

+	 * Token lifetime in seconds

+	 * @var int

+	 */

+	private $TokenLifeTime = 99000000;

 

-    /**

-     * Certificate data (read from PFX-File)

-     * @var string

-     */

-    private $Certificate = null;

+	/**

+	 * Certificate data (read from PFX-File)

+	 * @var string

+	 */

+	private $Certificate = null;

 

-    /**

-     * Private key of certificate (read from PFX-file)

-     * @var string

-     */

-    private $CertPrivateKey = null;

+	/**

+	 * Private key of certificate (read from PFX-file)

+	 * @var string

+	 */

+	private $CertPrivateKey = null;

 

-    /**
-     * @param string $issuer
-     * @param string $pfxFile
-     * @param string $pfxPassword
-     */
-    function __construct(/**
-     * Issuer host name
-     */
-    private $Issuer, /**
-     * Full filename of PFX-File (Certificate)
-     */
-    private $PfxFile, /**
-     * Password for PFX-File (Certificate)
-     */
-    private $PfxPassword)

-    {

-        $this->loadCertificateFromPfx();        

-    }

+	/**
+	 * @param string $issuer
+	 * @param string $pfxFile
+	 * @param string $pfxPassword
+	 */
+	function __construct(/**
+	 * Issuer host name
+	 */
+	private $Issuer, /**
+	 * Full filename of PFX-File (Certificate)
+	 */
+	private $PfxFile, /**
+	 * Password for PFX-File (Certificate)
+	 */
+	private $PfxPassword)

+	{

+		$this->loadCertificateFromPfx();        

+	}

 

-    /**

-     * Token generation

-     * 

-     * @param string $userEMail The e-mail of the user to generate a token

-     * 

-     * @return string Token in XML format

-     */

-    public function generateToken($userEMail)

-    {

-        try {

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

-            $guid = $this->createGUID();

-            $writerSignedInfo = xmlwriter_open_memory();        

-            $this->writeSignedInfo($writerSignedInfo, $userEMail, $now, $guid);

-            $signedInfo = xmlwriter_output_memory($writerSignedInfo);

-            $writer = xmlwriter_open_memory();

-            xmlwriter_set_indent($writer, false);

-            xmlwriter_start_element($writer, "InfoShareToken");

-                $this->writeSignedInfo($writer, $userEMail, $now, $guid);

-                xmlwriter_start_element($writer, "SignatureValue");

-                    xmlwriter_text($writer, $this->signXmlString($signedInfo));

-                xmlwriter_end_element($writer);                

-            xmlwriter_end_element($writer);

-            return xmlwriter_output_memory($writer);

-        } catch(\Exception $ex) {

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

-        }

-    }   

+	/**

+	 * Token generation

+	 * 

+	 * @param string $userEMail The e-mail of the user to generate a token

+	 * 

+	 * @return string Token in XML format

+	 */

+	public function generateToken($userEMail)

+	{

+		try {

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

+			$guid = $this->createGUID();

+			$writerSignedInfo = xmlwriter_open_memory();        

+			$this->writeSignedInfo($writerSignedInfo, $userEMail, $now, $guid);

+			$signedInfo = xmlwriter_output_memory($writerSignedInfo);

+			$writer = xmlwriter_open_memory();

+			xmlwriter_set_indent($writer, false);

+			xmlwriter_start_element($writer, "InfoShareToken");

+				$this->writeSignedInfo($writer, $userEMail, $now, $guid);

+				xmlwriter_start_element($writer, "SignatureValue");

+					xmlwriter_text($writer, $this->signXmlString($signedInfo));

+				xmlwriter_end_element($writer);                

+			xmlwriter_end_element($writer);

+			return xmlwriter_output_memory($writer);

+		} catch(\Exception $ex) {

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

+		}

+	}   

 

-    /**

-     * 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.");

-        $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());

-        $this->Certificate = $results['pkey'].$results['cert'];

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

-    }

+	/**

+	 * 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.");

+		$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());

+		$this->Certificate = $results['pkey'].$results['cert'];

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

+	}

 

-    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");

-            xmlwriter_start_element($writer, "UserPrincipalName");

-            xmlwriter_text($writer, $userEMail);

-            xmlwriter_end_element($writer);    

-            xmlwriter_start_element($writer, "UniqueId");

-            xmlwriter_text($writer, $uniqueId);

-            xmlwriter_end_element($writer);            

-            xmlwriter_start_element($writer, "Version");

-            xmlwriter_text($writer, $this->TokenVersion);

-            xmlwriter_end_element($writer);      

-            xmlwriter_start_element($writer, "TimeStampUTC");

-            xmlwriter_text($writer, $utcTime);

-            xmlwriter_end_element($writer);                    

-            xmlwriter_start_element($writer, "LifeTimeSeconds");

-            xmlwriter_text($writer, $this->TokenLifeTime);

-            xmlwriter_end_element($writer);             

-            xmlwriter_start_element($writer, "IssueServer");

-            xmlwriter_text($writer, $this->Issuer);

-            xmlwriter_end_element($writer);     

-            xmlwriter_start_element($writer, "CertificateFingerprint");

-            xmlwriter_text($writer, strtoupper(openssl_x509_fingerprint($this->Certificate)));

-            xmlwriter_end_element($writer);  

-            xmlwriter_start_element($writer, "HashAlgorithm");

-            xmlwriter_text($writer, "SHA512");

-            xmlwriter_end_element($writer);    

-            xmlwriter_start_element($writer, "Attributes");

-            xmlwriter_text($writer, "");

-            xmlwriter_end_element($writer);                                                                                                                                                 

-        xmlwriter_end_element($writer);     

-    }

+	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");

+			xmlwriter_start_element($writer, "UserPrincipalName");

+			xmlwriter_text($writer, $userEMail);

+			xmlwriter_end_element($writer);    

+			xmlwriter_start_element($writer, "UniqueId");

+			xmlwriter_text($writer, $uniqueId);

+			xmlwriter_end_element($writer);            

+			xmlwriter_start_element($writer, "Version");

+			xmlwriter_text($writer, $this->TokenVersion);

+			xmlwriter_end_element($writer);      

+			xmlwriter_start_element($writer, "TimeStampUTC");

+			xmlwriter_text($writer, $utcTime);

+			xmlwriter_end_element($writer);                    

+			xmlwriter_start_element($writer, "LifeTimeSeconds");

+			xmlwriter_text($writer, $this->TokenLifeTime);

+			xmlwriter_end_element($writer);             

+			xmlwriter_start_element($writer, "IssueServer");

+			xmlwriter_text($writer, $this->Issuer);

+			xmlwriter_end_element($writer);     

+			xmlwriter_start_element($writer, "CertificateFingerprint");

+			xmlwriter_text($writer, strtoupper(openssl_x509_fingerprint($this->Certificate)));

+			xmlwriter_end_element($writer);  

+			xmlwriter_start_element($writer, "HashAlgorithm");

+			xmlwriter_text($writer, "SHA512");

+			xmlwriter_end_element($writer);    

+			xmlwriter_start_element($writer, "Attributes");

+			xmlwriter_text($writer, "");

+			xmlwriter_end_element($writer);                                                                                                                                                 

+		xmlwriter_end_element($writer);     

+	}

 

-    /**

-     * Signing a XML-String and returns the result

-     * 

-     * @param string $xml XML-String

-     * 

-     * @return string

-     */

-    function SignXmlString($signedInfoXml)

-    {

-        try {

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

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

-                            ->withPadding(\phpseclib3\Crypt\RSA::SIGNATURE_PKCS1)

-                            ->withHash('sha512');

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

-            return $base64;

-        } catch (\Exception $ex) {

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

-        }

-    }

+	/**

+	 * Signing a XML-String and returns the result

+	 * 

+	 * @param string $xml XML-String

+	 * 

+	 * @return string

+	 */

+	function SignXmlString($signedInfoXml)

+	{

+		try {

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

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

+							->withPadding(\phpseclib3\Crypt\RSA::SIGNATURE_PKCS1)

+							->withHash('sha512');

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

+			return $base64;

+		} catch (\Exception $ex) {

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

+		}

+	}

 

-    /**

-     * Creates a unique ID

-     * @return string

-     */

-    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)));

-            $hyphen = chr(45);// "-"

-            $uuid = substr($charid, 0, 8).$hyphen

-                .substr($charid, 8, 4).$hyphen

-                .substr($charid,12, 4).$hyphen

-                .substr($charid,16, 4).$hyphen

-                .substr($charid,20,12);

-            return $uuid;

-        }

-    }

+	/**

+	 * Creates a unique ID

+	 * @return string

+	 */

+	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)));

+			$hyphen = chr(45);// "-"

+			$uuid = substr($charid, 0, 8).$hyphen

+				.substr($charid, 8, 4).$hyphen

+				.substr($charid,12, 4).$hyphen

+				.substr($charid,16, 4).$hyphen

+				.substr($charid,20,12);

+			return $uuid;

+		}

+	}

 

 }

 

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');