rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Tools/CryptToolSodium.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('Sodium implementation not supported');
 		}
 		return true;

source/Threema/MsgApi/Tools/EncryptResult.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

source/Threema/MsgApi/Tools/FileAnalysisResult.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

source/Threema/MsgApi/Exceptions/InvalidArgumentException.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

source/Threema/Core/KeyPair.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Threema GmbH
- * @copyright Copyright (c) 2015 Threema GmbH
- */
+	 * @author Threema GmbH
+	 * @copyright Copyright (c) 2015 Threema GmbH
+	 */
 
 
 namespace Threema\MsgApi\Tools;

samples/web/include/Connection.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  *
  * @param string $keystorePath Path public key store file (PHP)
  *
- * @return PhpFile public key store
+ * @return Threema\MsgApi\PublicKeyStores\PhpFile public key store
  */
 function CreatePublicKeyStore($keystorePath)
 {

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  *
  * @return Connection $connector
  */
-function CreateConnection($keystorePath='../../keystore.php', $useTlsOptions=true)
+function CreateConnection($keystorePath = '../../keystore.php', $useTlsOptions = true)
 {
     $publicKeyStore = CreatePublicKeyStore($keystorePath);
     $settings = CreateConnectionSettings($publicKeyStore, $useTlsOptions);

Indentation +35 added lines, -35 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * @author rugk
- * @copyright Copyright (c) 2015 rugk
- * @license MIT
- */
+		 * @author rugk
+		 * @copyright Copyright (c) 2015 rugk
+		 * @license MIT
+		 */
 
 use Threema\MsgApi\Connection;
 use Threema\MsgApi\ConnectionSettings;
@@ -20,11 +20,11 @@ 
  */
 function CreateConnection($keystorePath='../../keystore.php', $useTlsOptions=true)
 {
-    $publicKeyStore = CreatePublicKeyStore($keystorePath);
-    $settings = CreateConnectionSettings($publicKeyStore, $useTlsOptions);
-    $connector = InitiateConnection($settings, $publicKeyStore);
+	$publicKeyStore = CreatePublicKeyStore($keystorePath);
+	$settings = CreateConnectionSettings($publicKeyStore, $useTlsOptions);
+	$connector = InitiateConnection($settings, $publicKeyStore);
 
-    return $connector;
+	return $connector;
 }
 
 /**
@@ -36,12 +36,12 @@ 
  */
 function CreatePublicKeyStore($keystorePath)
 {
-    if (!file_exists($keystorePath)) {
-        if (!touch($keystorePath)) {
-            throw new Exception("PHP keystore could not be created.");
-        }
-    }
-    return $publicKeyStore = new Threema\MsgApi\PublicKeyStores\PhpFile($keystorePath);
+	if (!file_exists($keystorePath)) {
+		if (!touch($keystorePath)) {
+			throw new Exception("PHP keystore could not be created.");
+		}
+	}
+	return $publicKeyStore = new Threema\MsgApi\PublicKeyStores\PhpFile($keystorePath);
 }
 
 /**
@@ -54,27 +54,27 @@ 
  */
 function CreateConnectionSettings($publicKeyStore, $useTlsOptions)
 {
-    if ($useTlsOptions == true) {
-        //create a connection with advanced options
-        $settings = new ConnectionSettings(
-            MSGAPI_GATEWAY_THREEMA_ID,
-            MSGAPI_GATEWAY_THREEMA_ID_SECRET,
-            null,
-            [
-                'forceHttps' => true,
-                'tlsVersion' => '1.2',
-                'tlsCipher' => 'ECDHE-RSA-AES128-GCM-SHA256'
-            ]
-        );
-    } else {
-        //create a connection with default options
-        $settings = new ConnectionSettings(
-            MSGAPI_GATEWAY_THREEMA_ID,
-            MSGAPI_GATEWAY_THREEMA_ID_SECRET
-        );
-    }
+	if ($useTlsOptions == true) {
+		//create a connection with advanced options
+		$settings = new ConnectionSettings(
+			MSGAPI_GATEWAY_THREEMA_ID,
+			MSGAPI_GATEWAY_THREEMA_ID_SECRET,
+			null,
+			[
+				'forceHttps' => true,
+				'tlsVersion' => '1.2',
+				'tlsCipher' => 'ECDHE-RSA-AES128-GCM-SHA256'
+			]
+		);
+	} else {
+		//create a connection with default options
+		$settings = new ConnectionSettings(
+			MSGAPI_GATEWAY_THREEMA_ID,
+			MSGAPI_GATEWAY_THREEMA_ID_SECRET
+		);
+	}
 
-    return $settings;
+	return $settings;
 }
 
 /**
@@ -87,5 +87,5 @@ 
  */
 function InitiateConnection($settings, $publicKeyStore)
 {
-    return $connector = new Connection($settings, $publicKeyStore);
+	return $connector = new Connection($settings, $publicKeyStore);
 }

samples/web/SendTextMessage.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  * @param string $threemaId The id whose public key should be fetched
  * @param string $message The message to send (max 3500 characters)
  *
- * @return string|Exception
+ * @return string
  */
 function SendMessage($connector, $threemaId, $message)
 {

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 
 //get params
 if (ReturnGetPost('recieverid') &&
-    preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('recieverid'))
+    preg_match('/'.REGEXP_THREEMAID_ANY.'/', ReturnGetPost('recieverid'))
 ) {
     $threemaId = htmlentities(ReturnGetPost('recieverid'));
     $message = ReturnGetPost('message');
@@ -77,7 +77,7 @@ 
 //Show direct output if the file is called directly
 if (!$isIncluded) {
     if ($errorMessage == null) {
-        echo 'Message ID: ' . $messageId;
+        echo 'Message ID: '.$messageId;
     } else {
         echo $errorMessage;
     }

Indentation +29 added lines, -29 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * @author rugk
- * @copyright Copyright (c) 2015 rugk
- * @license MIT
- */
+	 * @author rugk
+	 * @copyright Copyright (c) 2015 rugk
+	 * @license MIT
+	 */
 
 $isIncluded = count(get_included_files()) > 1;
 
@@ -38,22 +38,22 @@ 
  */
 function SendMessage($connector, $threemaId, $message)
 {
-    $e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper(KeyHexToBin(MSGAPI_PRIVATE_KEY), $connector);
-    $result = $e2eHelper->sendTextMessage($threemaId, $message);
+	$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper(KeyHexToBin(MSGAPI_PRIVATE_KEY), $connector);
+	$result = $e2eHelper->sendTextMessage($threemaId, $message);
 
-    if (true === $result->isSuccess()) {
-        return $result->getMessageId();
-    } else {
-        throw new Exception($result->getErrorMessage());
-    }
+	if (true === $result->isSuccess()) {
+		return $result->getMessageId();
+	} else {
+		throw new Exception($result->getErrorMessage());
+	}
 }
 
 //get params
 if (ReturnGetPost('recieverid') &&
-    preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('recieverid'))
+	preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('recieverid'))
 ) {
-    $threemaId = htmlentities(ReturnGetPost('recieverid'));
-    $message = ReturnGetPost('message');
+	$threemaId = htmlentities(ReturnGetPost('recieverid'));
+	$message = ReturnGetPost('message');
 }
 
 //create connection
@@ -61,24 +61,24 @@ 
 
 //Send message
 if ($threemaId != null && $message != null) {
-    if (!$isIncluded) {
-        header('Content-Type: text/plain');
-    }
-    $actionDone = true;
+	if (!$isIncluded) {
+		header('Content-Type: text/plain');
+	}
+	$actionDone = true;
 
-    try {
-        $messageId = SendMessage($connector, $threemaId, $message);
-    } catch (Exception $e) {
-        http_response_code(500);
-        $errorMessage = $e->getMessage();
-    }
+	try {
+		$messageId = SendMessage($connector, $threemaId, $message);
+	} catch (Exception $e) {
+		http_response_code(500);
+		$errorMessage = $e->getMessage();
+	}
 }
 
 //Show direct output if the file is called directly
 if (!$isIncluded) {
-    if ($errorMessage == null) {
-        echo 'Message ID: ' . $messageId;
-    } else {
-        echo $errorMessage;
-    }
+	if ($errorMessage == null) {
+		echo 'Message ID: ' . $messageId;
+	} else {
+		echo $errorMessage;
+	}
 }

samples/web/include/PublicKey.php

Indentation +21 added lines, -21 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * @author rugk
- * @copyright Copyright (c) 2015 rugk
- * @license MIT
- */
+	 * @author rugk
+	 * @copyright Copyright (c) 2015 rugk
+	 * @license MIT
+	 */
 
 /**
  * Checks whether a HEX-key is valid.
@@ -14,8 +14,8 @@ 
  */
 function KeyCheck($publicKey, $suffix='')
 {
-    // RegExp: https://regex101.com/r/sU5tC8/1
-    return preg_match('/^(' . $suffix . ')?[[:alnum:]]{64}$/', $publicKey);
+	// RegExp: https://regex101.com/r/sU5tC8/1
+	return preg_match('/^(' . $suffix . ')?[[:alnum:]]{64}$/', $publicKey);
 }
 
 /**
@@ -32,14 +32,14 @@ 
  */
 function KeyGetUserDisplay($publicKey)
 {
-    //force key to be binary
-    if (ctype_alnum($publicKey)) {
-        $publicKey = KeyHexToBin($publicKey);
-    }
+	//force key to be binary
+	if (ctype_alnum($publicKey)) {
+		$publicKey = KeyHexToBin($publicKey);
+	}
 
-    //create short hash
-    $shortHash = substr(hash('sha256', $publicKey, 0, 32));
-    return $shortHash;
+	//create short hash
+	$shortHash = substr(hash('sha256', $publicKey, 0, 32));
+	return $shortHash;
 }
 
 /**
@@ -51,13 +51,13 @@ 
  */
 function KeyHexToBin($keyHex)
 {
-    //delete prefix
-    $keyTypeCheck = substr($keyHex, 0, 8);
-    if ($keyTypeCheck == 'private:' || $keyTypeCheck == 'public:') {
-        $keyHex = substr($keyHex, 8);
-    }
+	//delete prefix
+	$keyTypeCheck = substr($keyHex, 0, 8);
+	if ($keyTypeCheck == 'private:' || $keyTypeCheck == 'public:') {
+		$keyHex = substr($keyHex, 8);
+	}
 
-    //convert key
-    $keyBin = hex2bin($keyHex);
-    return $keyBin;
+	//convert key
+	$keyBin = hex2bin($keyHex);
+	return $keyBin;
 }

Spacing +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
  * @param string optional suffix (usually 'private:' or 'public:') (default: '')
  * @return bool whether the key is valid (true) or not (false)
  */
-function KeyCheck($publicKey, $suffix='')
+function KeyCheck($publicKey, $suffix = '')
 {
     // RegExp: https://regex101.com/r/sU5tC8/1
-    return preg_match('/^(' . $suffix . ')?[[:alnum:]]{64}$/', $publicKey);
+    return preg_match('/^('.$suffix.')?[[:alnum:]]{64}$/', $publicKey);
 }
 
 /**

samples/web/include/GlobalConstants.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @author rugk
- * @copyright Copyright (c) 2015 rugk
- * @license MIT
- */
+	 * @author rugk
+	 * @copyright Copyright (c) 2015 rugk
+	 * @license MIT
+	 */
 
 /* CONSTANTS */
 const FILENAME_CONNCRED = 'ConnectionCredentials.php';