grommunio / grommunio-web

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

Spacing +9 added lines, -9 removed lines

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

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

                 return true;

-            } catch(\Exception $ex) {

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

+            } catch (\Exception $ex) {

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

             }

         }

 

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

                 $this->ConnectionId = null;

                 return true;

-            } catch(\Exception $ex) {

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

+            } catch (\Exception $ex) {

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

             }

         }

 

@@ -96,8 +96,8 @@ 
                 $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());

+            } catch (\Exception $ex) {

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

             }

         }

 

@@ -141,14 +141,14 @@ 
         {

             $ch = curl_init();

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

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

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

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

             }

             return $this->handleJsonResult($jsonResult);

 

@@ -161,7 +161,7 @@ 
             }

             $result = json_decode($json);

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

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

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

             }

             return $result;

         }

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;

+		}

+	}

 

 }

 

Spacing +15 added lines, -15 removed lines

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

             xmlwriter_end_element($writer);

             return xmlwriter_output_memory($writer);

-        } catch(\Exception $ex) {

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

+        } catch (\Exception $ex) {

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

         }

     }   

 

@@ -89,15 +89,15 @@ 
         $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'];

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

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

         xmlwriter_start_element($writer, "SignedInfo");

             xmlwriter_start_element($writer, "UserPrincipalName");

             xmlwriter_text($writer, $userEMail);

@@ -146,7 +146,7 @@ 
             $base64 = base64_encode($privateKey->sign($data));

             return $base64;

         } catch (\Exception $ex) {

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

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

         }

     }

 

@@ -154,19 +154,19 @@ 
      * Creates a unique ID

      * @return string

      */

-    private function createGUID(){

-        if (function_exists('com_create_guid')){

+    private function createGUID() {

+        if (function_exists('com_create_guid')) {

             return com_create_guid();

         }

         else {

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

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

+            $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

Spacing +4 added lines, -4 removed lines

@@ -391,8 +391,8 @@ 
 		$a = mapi_getprops($msg, [PR_TRANSPORT_MESSAGE_HEADERS]);
 		$a = $a === false ? "" : ($a[PR_TRANSPORT_MESSAGE_HEADERS] ?? "");
 		$prop[PR_TRANSPORT_MESSAGE_HEADERS] =
-			"# Outer headers:\n".($prop[PR_TRANSPORT_MESSAGE_HEADERS] ?? "").
-			"# Inner headers:\n".$a;
+			"# Outer headers:\n" . ($prop[PR_TRANSPORT_MESSAGE_HEADERS] ?? "") .
+			"# Inner headers:\n" . $a;
 	}
 
 	/**
@@ -512,7 +512,7 @@ 
 		}
 
 		if (!encryptionStoreExpirationSupport()) {
-			withPHPSession(function () use ($encryptionStore) {
+			withPHPSession(function() use ($encryptionStore) {
 				$encryptionStore->add('smime', '');
 			});
 		}
@@ -1007,7 +1007,7 @@ 
 			if (strlen($this->openssl_error) == 0)
 				$this->openssl_error = $s;
 			else
-				$this->openssl_error .= "\n".$s;
+				$this->openssl_error .= "\n" . $s;
 		$openssl_error_code = 0;
 		if ($this->openssl_error) {
 			$openssl_error_list = explode(":", $this->openssl_error);

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

Spacing +4 added lines, -5 removed lines

@@ -480,8 +480,8 @@ 
 	$a = mapi_getprops($msg, [PR_TRANSPORT_MESSAGE_HEADERS]);
 	$a = $a === false ? "" : ($a[PR_TRANSPORT_MESSAGE_HEADERS] ?? "");
 	$prop[PR_TRANSPORT_MESSAGE_HEADERS] =
-		"# Outer headers:\n".($prop[PR_TRANSPORT_MESSAGE_HEADERS] ?? "").
-		"# Inner headers:\n".$a;
+		"# Outer headers:\n" . ($prop[PR_TRANSPORT_MESSAGE_HEADERS] ?? "") .
+		"# Inner headers:\n" . $a;
 }
 
 /**
@@ -546,7 +546,7 @@ 
 				PR_SENT_REPRESENTING_SMTP_ADDRESS => $props[PR_SENT_REPRESENTING_SMTP_ADDRESS] ?? '',
 				PR_SENT_REPRESENTING_ADDRTYPE => $props[PR_SENT_REPRESENTING_ADDRTYPE] ?? 'SMTP',
 				PR_CLIENT_SUBMIT_TIME => $props[PR_CLIENT_SUBMIT_TIME] ?? time(),
-				PR_TRANSPORT_MESSAGE_HEADERS => ($props[PR_TRANSPORT_MESSAGE_HEADERS] ?? "").$inner_headers,
+				PR_TRANSPORT_MESSAGE_HEADERS => ($props[PR_TRANSPORT_MESSAGE_HEADERS] ?? "") . $inner_headers,
 			]);
 		}
 	}
@@ -1004,8 +1004,7 @@ 
 		// on the day before or after. This should be fine for all the
 		// timezones which do not exceed 12 hour difference to UTC.
 		$ts = $interval > 0 ?
-			$ts - ($interval < 43200 ? $interval : $interval - 86400) :
-			$ts + ($interval > -43200 ? $interval : $interval - 86400);
+			$ts - ($interval < 43200 ? $interval : $interval - 86400) : $ts + ($interval > -43200 ? $interval : $interval - 86400);
 	}
 
 	return $ts;

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] =

server/includes/modules/class.appointmentitemmodule.php

Spacing +1 added lines, -2 removed lines

@@ -382,8 +382,7 @@
 		// all-day events).
 		$isTzdefstartSet = isset($calendaritem['props']['tzdefstart']);
 		$tzdefstart = $isTzdefstartSet ?
-			hex2bin($calendaritem['props']['tzdefstart']) :
-			mapi_ianatz_to_tzdef("Etc/UTC");
+			hex2bin($calendaritem['props']['tzdefstart']) : mapi_ianatz_to_tzdef("Etc/UTC");
 
 		// Compare the timezone definitions of the client and the appointment.
 		// Further processing is only required if they don't match.

server/includes/modules/class.hierarchymodule.php

Indentation +2 added lines, -2 removed lines

@@ -129,12 +129,12 @@
 					if (!$store || !$parententryid || !$entryid)
 						break;
 					if (!isset($action["message_action"], $action["message_action"]["action_type"]) ||
-					    $action["message_action"]["action_type"] !== "removefavorites") {
+						$action["message_action"]["action_type"] !== "removefavorites") {
 						$this->deleteFolder($store, $parententryid, $entryid, $action);
 						break;
 					}
 					if (!isset($action["message_action"]["isSearchFolder"]) ||
-					    !$action["message_action"]["isSearchFolder"]) {
+						!$action["message_action"]["isSearchFolder"]) {
 						$this->removeFromFavorite($entryid);
 						break;
 					}

Switch Indentation +189 added lines, -189 removed lines

@@ -64,150 +64,150 @@ 
 				$this->store_entryid = $action["store_entryid"] ?? '';
 
 				switch ($actionType) {
-				case "keepalive":
-					/*
+					case "keepalive":
+						/*
 					 * as we haven't done any processing here but still we need to send
 					 * success message to client so client can know that there isn't any problem
 					 * on server side (this will also make bus class happy as it will cry when
 					 * there isn't any data to send to client).
 					 */
-					$this->sendFeedback(true);
-					break;
+						$this->sendFeedback(true);
+						break;
 
-				case "destroysession":
-					// This actiontype should never get this far, but should already have been
-					// intercepted by the Session class.
-					// Nevertheless implement processing here for unforeseen cases.
-					$this->sendFeedback(true);
-					break;
+					case "destroysession":
+						// This actiontype should never get this far, but should already have been
+						// intercepted by the Session class.
+						// Nevertheless implement processing here for unforeseen cases.
+						$this->sendFeedback(true);
+						break;
 
-				case "list":
-					$this->hierarchyList();
-					break;
+					case "list":
+						$this->hierarchyList();
+						break;
 
-				case "open":
-					$folder = mapi_msgstore_openentry($store, $entryid);
-					$data = $this->getFolderProps($store, $folder);
+					case "open":
+						$folder = mapi_msgstore_openentry($store, $entryid);
+						$data = $this->getFolderProps($store, $folder);
 
-					// return response
-					$this->addActionData("item", $data);
-					$GLOBALS["bus"]->addData($this->getResponseData());
-					break;
+						// return response
+						$this->addActionData("item", $data);
+						$GLOBALS["bus"]->addData($this->getResponseData());
+						break;
 
-				case "foldersize":
-					$folders = [];
+					case "foldersize":
+						$folders = [];
 
-					$folder = mapi_msgstore_openentry($store, $entryid);
-					$data = $this->getFolderProps($store, $folder);
+						$folder = mapi_msgstore_openentry($store, $entryid);
+						$data = $this->getFolderProps($store, $folder);
 
-					$info = $this->getFolderSize($store, $folder, '', $folders);
+						$info = $this->getFolderSize($store, $folder, '', $folders);
 
-					// It could be that the $props already contains the data,
-					// this happens when the folder is the IPM_SUBTREE and the
-					// folder size is read directly from the store. Adjust
-					// total_size accordingly.
-					if (isset($data["props"]["store_size"])) {
-						if (!isset($data["props"]["message_size"])) {
-							$data["props"]["message_size"] = $data["props"]["store_size"];
+						// It could be that the $props already contains the data,
+						// this happens when the folder is the IPM_SUBTREE and the
+						// folder size is read directly from the store. Adjust
+						// total_size accordingly.
+						if (isset($data["props"]["store_size"])) {
+							if (!isset($data["props"]["message_size"])) {
+								$data["props"]["message_size"] = $data["props"]["store_size"];
+							}
+							$data["props"]["total_message_size"] = $data["props"]["store_size"] + $info["total_size"];
 						}
-						$data["props"]["total_message_size"] = $data["props"]["store_size"] + $info["total_size"];
-					}
-					else {
-						$data["props"]["message_size"] = $info["size"];
-						$data["props"]["total_message_size"] = $info["total_size"];
-					}
-					$data["folders"] = [
-						"item" => $folders,
-					];
-
-					// return response
-					$this->addActionData("item", $data);
-					$GLOBALS["bus"]->addData($this->getResponseData());
-					break;
+						else {
+							$data["props"]["message_size"] = $info["size"];
+							$data["props"]["total_message_size"] = $info["total_size"];
+						}
+						$data["folders"] = [
+							"item" => $folders,
+						];
 
-				case "delete":
-					if (!$store || !$parententryid || !$entryid)
-						break;
-					if (!isset($action["message_action"], $action["message_action"]["action_type"]) ||
-					    $action["message_action"]["action_type"] !== "removefavorites") {
-						$this->deleteFolder($store, $parententryid, $entryid, $action);
-						break;
-					}
-					if (!isset($action["message_action"]["isSearchFolder"]) ||
-					    !$action["message_action"]["isSearchFolder"]) {
-						$this->removeFromFavorite($entryid);
+						// return response
+						$this->addActionData("item", $data);
+						$GLOBALS["bus"]->addData($this->getResponseData());
 						break;
-					}
-					$result = $this->deleteSearchFolder($store, $parententryid, $entryid, $action);
-					dump($result, '$result');
-					if ($result) {
-						$this->sendFeedback(true);
-					}
-					break;
 
-				case "save":
-					if (!$store || !$parententryid)
-						break;
-					if ($entryid) {
-						// The "message_action" object has been set, check the action_type field for
-						// the exact action which must be taken.
-						// Supported actions:
-						//   - copy: Copy the folder to the new destination folder
-						//   - move: Move the folder to the new destination folder
-						//   - emptyfolder: Delete all items within the folder
-						//   - readflags: Mark all items within the folder as read
-						//   - addtofavorites: Add the folder to "favorites"
-						if (!isset($action["message_action"]["isSearchFolder"])) {
-							$folder = mapi_msgstore_openentry($store, $entryid);
-							$data = $this->getFolderProps($store, $folder);
+					case "delete":
+						if (!$store || !$parententryid || !$entryid)
+							break;
+						if (!isset($action["message_action"], $action["message_action"]["action_type"]) ||
+					    	$action["message_action"]["action_type"] !== "removefavorites") {
+							$this->deleteFolder($store, $parententryid, $entryid, $action);
+							break;
 						}
-						if (isset($action["message_action"], $action["message_action"]["action_type"])) {
-							switch ($action["message_action"]["action_type"]) {
-							case "copy":
-							case "move":
-								$destentryid = false;
-								if (isset($action["message_action"]["destination_parent_entryid"])) {
-									$destentryid = hex2bin($action["message_action"]["destination_parent_entryid"]);
-								}
-
-								$deststore = $store;
-								if (isset($action["message_action"]["destination_store_entryid"])) {
-									$deststore = $GLOBALS['mapisession']->openMessageStore(hex2bin($action["message_action"]["destination_store_entryid"]));
-								}
+						if (!isset($action["message_action"]["isSearchFolder"]) ||
+					    	!$action["message_action"]["isSearchFolder"]) {
+							$this->removeFromFavorite($entryid);
+							break;
+						}
+						$result = $this->deleteSearchFolder($store, $parententryid, $entryid, $action);
+						dump($result, '$result');
+						if ($result) {
+							$this->sendFeedback(true);
+						}
+						break;
 
-								if ($destentryid && $deststore) {
-									$this->copyFolder($store, $parententryid, $entryid, $destentryid, $deststore, $action["message_action"]["action_type"] == "move");
-								}
-								if ($data["props"]["container_class"] === "IPF.Contact") {
-									$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
-								}
-								break;
+					case "save":
+						if (!$store || !$parententryid)
+							break;
+						if ($entryid) {
+							// The "message_action" object has been set, check the action_type field for
+							// the exact action which must be taken.
+							// Supported actions:
+							//   - copy: Copy the folder to the new destination folder
+							//   - move: Move the folder to the new destination folder
+							//   - emptyfolder: Delete all items within the folder
+							//   - readflags: Mark all items within the folder as read
+							//   - addtofavorites: Add the folder to "favorites"
+							if (!isset($action["message_action"]["isSearchFolder"])) {
+								$folder = mapi_msgstore_openentry($store, $entryid);
+								$data = $this->getFolderProps($store, $folder);
+							}
+							if (isset($action["message_action"], $action["message_action"]["action_type"])) {
+								switch ($action["message_action"]["action_type"]) {
+									case "copy":
+									case "move":
+										$destentryid = false;
+										if (isset($action["message_action"]["destination_parent_entryid"])) {
+											$destentryid = hex2bin($action["message_action"]["destination_parent_entryid"]);
+										}
+
+										$deststore = $store;
+										if (isset($action["message_action"]["destination_store_entryid"])) {
+											$deststore = $GLOBALS['mapisession']->openMessageStore(hex2bin($action["message_action"]["destination_store_entryid"]));
+										}
+
+										if ($destentryid && $deststore) {
+											$this->copyFolder($store, $parententryid, $entryid, $destentryid, $deststore, $action["message_action"]["action_type"] == "move");
+										}
+										if ($data["props"]["container_class"] === "IPF.Contact") {
+											$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
+										}
+										break;
 
-							case "emptyfolder":
-								$this->emptyFolder($store, $entryid);
-								break;
+									case "emptyfolder":
+										$this->emptyFolder($store, $entryid);
+										break;
 
-							case "readflags":
-								$this->setReadFlags($store, $entryid);
-								break;
+									case "readflags":
+										$this->setReadFlags($store, $entryid);
+										break;
 
-							case "addtofavorites":
-								if (isset($action["message_action"]["isSearchFolder"]) && $action["message_action"]["isSearchFolder"]) {
-									$searchStoreEntryId = $action["message_action"]["search_store_entryid"];
-									// Set display name to search folder.
-									$searchStore = $GLOBALS["mapisession"]->openMessageStore(hex2bin($searchStoreEntryId));
-									$searchFolder = mapi_msgstore_openentry($searchStore, $entryid);
-									mapi_setprops($searchFolder, [
-										PR_DISPLAY_NAME => $action["props"]["display_name"],
-									]);
-									mapi_savechanges($searchFolder);
-									$this->createLinkedSearchFolder($searchFolder);
-								}
-								else {
-									$this->addToFavorite($store, $entryid);
+									case "addtofavorites":
+										if (isset($action["message_action"]["isSearchFolder"]) && $action["message_action"]["isSearchFolder"]) {
+											$searchStoreEntryId = $action["message_action"]["search_store_entryid"];
+											// Set display name to search folder.
+											$searchStore = $GLOBALS["mapisession"]->openMessageStore(hex2bin($searchStoreEntryId));
+											$searchFolder = mapi_msgstore_openentry($searchStore, $entryid);
+											mapi_setprops($searchFolder, [
+												PR_DISPLAY_NAME => $action["props"]["display_name"],
+											]);
+											mapi_savechanges($searchFolder);
+											$this->createLinkedSearchFolder($searchFolder);
+										}
+										else {
+											$this->addToFavorite($store, $entryid);
+										}
+										break;
 								}
-								break;
-							}
 						}
 						else {
 							// save folder
@@ -262,93 +262,93 @@ 
 					}
 					break;
 
-				case "closesharedfolder":
-					if (isset($action["folder_type"]) && $action["folder_type"] != "all") {
-						// We're closing a Shared folder, check if we still have other
-						// folders for the same user opened, if not we can safely close
-						// the usrstore.
-						$stores = $GLOBALS["settings"]->get("zarafa/v1/contexts/hierarchy/shared_stores/" . strtolower(bin2hex($action["user_name"])));
-						if (!isset($stores) || empty($stores) || (count($stores) == 1 && isset($stores[$action["folder_type"]]))) {
-							$entryid = $GLOBALS["mapisession"]->removeUserStore($action["user_name"]);
+					case "closesharedfolder":
+						if (isset($action["folder_type"]) && $action["folder_type"] != "all") {
+							// We're closing a Shared folder, check if we still have other
+							// folders for the same user opened, if not we can safely close
+							// the usrstore.
+							$stores = $GLOBALS["settings"]->get("zarafa/v1/contexts/hierarchy/shared_stores/" . strtolower(bin2hex($action["user_name"])));
+							if (!isset($stores) || empty($stores) || (count($stores) == 1 && isset($stores[$action["folder_type"]]))) {
+								$entryid = $GLOBALS["mapisession"]->removeUserStore($action["user_name"]);
+							}
+							else {
+								$entryid = $GLOBALS["mapisession"]->getStoreEntryIdOfUser($action["user_name"]);
+								$this->removeFromFavorite(hex2bin($action["entryid"]), $store, PR_WLINK_ENTRYID, false);
+							}
 						}
 						else {
-							$entryid = $GLOBALS["mapisession"]->getStoreEntryIdOfUser($action["user_name"]);
-							$this->removeFromFavorite(hex2bin($action["entryid"]), $store, PR_WLINK_ENTRYID, false);
+							// We're closing a Shared Store, simply remove it from the session.
+							$entryid = $GLOBALS["mapisession"]->removeUserStore($action["user_name"]);
+
+							if (isset($action["remove_favorites"]) && $action["remove_favorites"]) {
+								$this->removeFromFavorite(hex2bin($action["store_entryid"]), $store, PR_WLINK_STORE_ENTRYID, false);
+							}
 						}
-					}
-					else {
-						// We're closing a Shared Store, simply remove it from the session.
-						$entryid = $GLOBALS["mapisession"]->removeUserStore($action["user_name"]);
 
-						if (isset($action["remove_favorites"]) && $action["remove_favorites"]) {
-							$this->removeFromFavorite(hex2bin($action["store_entryid"]), $store, PR_WLINK_STORE_ENTRYID, false);
+						$data = [];
+						$data["store_entryid"] = bin2hex($entryid);
+						if (isset($action["folder_type"])) {
+							$data["folder_type"] = $action["folder_type"];
 						}
-					}
 
-					$data = [];
-					$data["store_entryid"] = bin2hex($entryid);
-					if (isset($action["folder_type"])) {
-						$data["folder_type"] = $action["folder_type"];
-					}
+						$this->addActionData("delete", $data);
+						$GLOBALS["bus"]->addData($this->getResponseData());
+						$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
+						break;
 
-					$this->addActionData("delete", $data);
-					$GLOBALS["bus"]->addData($this->getResponseData());
-					$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
-					break;
+					case "opensharedfolder":
+						$username = strtolower($action["user_name"]);
+						$store = $GLOBALS["mapisession"]->addUserStore($username);
+						if (!$store) {
+							break;
+						}
 
-				case "opensharedfolder":
-					$username = strtolower($action["user_name"]);
-					$store = $GLOBALS["mapisession"]->addUserStore($username);
-					if (!$store) {
-						break;
-					}
+						$options = [$username => [$action["folder_type"] => $action]];
+						$data = $GLOBALS["operations"]->getHierarchyList($this->list_properties, HIERARCHY_GET_ONE, $store, $options, $username);
 
-					$options = [$username => [$action["folder_type"] => $action]];
-					$data = $GLOBALS["operations"]->getHierarchyList($this->list_properties, HIERARCHY_GET_ONE, $store, $options, $username);
+						if (empty($data["item"][0]["folders"]["item"])) {
+							throw new MAPIException(null, MAPI_E_NO_ACCESS);
+						}
 
-					if (empty($data["item"][0]["folders"]["item"])) {
-						throw new MAPIException(null, MAPI_E_NO_ACCESS);
-					}
+						$folders = count($data["item"][0]["folders"]["item"]);
+						if ($folders === 0) {
+							throw new MAPIException(null, MAPI_E_NO_ACCESS);
+						}
 
-					$folders = count($data["item"][0]["folders"]["item"]);
-					if ($folders === 0) {
-						throw new MAPIException(null, MAPI_E_NO_ACCESS);
-					}
+						$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function ($item) {
+							return $item['props']['access'] === 0;
+						});
+						if (count($noPermissionFolders) >= $folders) {
+							// Throw an exception that we couldn't open the shared store,
+							// lets have processException() fill in our error message.
+							throw new MAPIException(null, MAPI_E_NO_ACCESS);
+						}
 
-					$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function ($item) {
-						return $item['props']['access'] === 0;
-					});
-					if (count($noPermissionFolders) >= $folders) {
-						// Throw an exception that we couldn't open the shared store,
-						// lets have processException() fill in our error message.
-						throw new MAPIException(null, MAPI_E_NO_ACCESS);
-					}
+						$this->addActionData("list", $data);
+						$GLOBALS["bus"]->addData($this->getResponseData());
+						$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
+						break;
 
-					$this->addActionData("list", $data);
-					$GLOBALS["bus"]->addData($this->getResponseData());
-					$GLOBALS["bus"]->notify(ADDRESSBOOK_ENTRYID, OBJECT_SAVE);
-					break;
+					case "sharedstoreupdate":
+						$supported_types = ['inbox' => 1, 'all' => 1];
+						$users = $GLOBALS["settings"]->get("zarafa/v1/contexts/hierarchy/shared_stores", []);
 
-				case "sharedstoreupdate":
-					$supported_types = ['inbox' => 1, 'all' => 1];
-					$users = $GLOBALS["settings"]->get("zarafa/v1/contexts/hierarchy/shared_stores", []);
+						foreach ($users as $username => $data) {
+							$key = array_keys($data)[0];
+							$folder_type = $data[$key]['folder_type'];
 
-					foreach ($users as $username => $data) {
-						$key = array_keys($data)[0];
-						$folder_type = $data[$key]['folder_type'];
+							if (!isset($supported_types[$folder_type])) {
+								continue;
+							}
 
-						if (!isset($supported_types[$folder_type])) {
-							continue;
+							$GLOBALS["bus"]->notify(REQUEST_ENTRYID, HIERARCHY_UPDATE, [strtolower(hex2bin($username)), $folder_type]);
 						}
 
-						$GLOBALS["bus"]->notify(REQUEST_ENTRYID, HIERARCHY_UPDATE, [strtolower(hex2bin($username)), $folder_type]);
-					}
-
-					$this->sendFeedback(true);
-					break;
+						$this->sendFeedback(true);
+						break;
 
-				default:
-					$this->handleUnknownActionType($actionType);
+					default:
+						$this->handleUnknownActionType($actionType);
 				}
 			}
 			catch (MAPIException $e) {

Spacing +1 added lines, -1 removed lines

@@ -315,7 +315,7 @@
 						throw new MAPIException(null, MAPI_E_NO_ACCESS);
 					}
 
-					$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function ($item) {
+					$noPermissionFolders = array_filter($data['item'][0]['folders']['item'], function($item) {
 						return $item['props']['access'] === 0;
 					});
 					if (count($noPermissionFolders) >= $folders) {

Braces +9 added lines, -6 removed lines

@@ -55,8 +55,9 @@ 
 	 */
 	public function execute() {
 		foreach ($this->data as $actionType => $action) {
-			if (!isset($actionType))
-				continue;
+			if (!isset($actionType)) {
+							continue;
+			}
 			try {
 				$store = $this->getActionStore($action);
 				$parententryid = $this->getActionParentEntryID($action);
@@ -126,8 +127,9 @@ 
 					break;
 
 				case "delete":
-					if (!$store || !$parententryid || !$entryid)
-						break;
+					if (!$store || !$parententryid || !$entryid) {
+											break;
+					}
 					if (!isset($action["message_action"], $action["message_action"]["action_type"]) ||
 					    $action["message_action"]["action_type"] !== "removefavorites") {
 						$this->deleteFolder($store, $parententryid, $entryid, $action);
@@ -146,8 +148,9 @@ 
 					break;
 
 				case "save":
-					if (!$store || !$parententryid)
-						break;
+					if (!$store || !$parententryid) {
+											break;
+					}
 					if ($entryid) {
 						// The "message_action" object has been set, check the action_type field for
 						// the exact action which must be taken.

server/includes/modules/class.appointmentlistmodule.php

Indentation +2 added lines, -2 removed lines

@@ -616,8 +616,8 @@
 			// may have changed, so it's necessary to check again if they are
 			// still in the requested interval.
 			if (($start <= $item["props"]["startdate"] && $end > $item['props']['startdate']) ||
-			    ($start < $item["props"]["duedate"] && $end >= $item['props']['duedate']) ||
-			    ($start > $item["props"]["startdate"] && $end < $item['props']['duedate'])) {
+				($start < $item["props"]["duedate"] && $end >= $item['props']['duedate']) ||
+				($start > $item["props"]["startdate"] && $end < $item['props']['duedate'])) {
 				array_push($items, $item);
 			}
 		}

Spacing +2 added lines, -4 removed lines

@@ -521,8 +521,7 @@ 
 		// all-day events) or was imported from a system which doesn't set it.
 		$isTzdefstartSet = isset($calendaritem['props']['tzdefstart']);
 		$tzdefstart = $isTzdefstartSet ?
-			hex2bin($calendaritem['props']['tzdefstart']) :
-			mapi_ianatz_to_tzdef("Etc/UTC");
+			hex2bin($calendaritem['props']['tzdefstart']) : mapi_ianatz_to_tzdef("Etc/UTC");
 
 		// queryrows only returns 510 chars max, so if tzdef is longer than that
 		// it was probably silently truncated. In such case we need to open
@@ -555,8 +554,7 @@ 
 				// on the day before or after. This should be fine for all the
 				// timezones which do not exceed 12 hour difference to UTC.
 				$localStart = $interval > 0 ?
-					$calendaritem['props']['startdate'] - ($interval < 43200 ? $interval : $interval - 86400):
-					$calendaritem['props']['startdate'] + ($interval > -43200 ? $interval : $interval - 86400) ;
+					$calendaritem['props']['startdate'] - ($interval < 43200 ? $interval : $interval - 86400) : $calendaritem['props']['startdate'] + ($interval > -43200 ? $interval : $interval - 86400);
 				$calendaritem['props']['startdate'] = $calendaritem['props']['commonstart'] = $localStart;
 				$calendaritem['props']['duedate'] = $calendaritem['props']['commonend'] = $localStart + $duration;
 			}