rugk / threema-msgapi-sdk-php

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($useTlsOptions);
-    $connector = InitiateConnection($settings, $publicKeyStore);
+	$publicKeyStore = CreatePublicKeyStore($keystorePath);
+	$settings = CreateConnectionSettings($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 new Threema\MsgApi\PublicKeyStores\PhpFile($keystorePath);
+	if (!file_exists($keystorePath)) {
+		if (!touch($keystorePath)) {
+			throw new Exception("PHP keystore could not be created.");
+		}
+	}
+	return new Threema\MsgApi\PublicKeyStores\PhpFile($keystorePath);
 }
 
 /**
@@ -53,27 +53,27 @@ 
  */
 function CreateConnectionSettings($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;
 }
 
 /**
@@ -86,5 +86,5 @@ 
  */
 function InitiateConnection($settings, $publicKeyStore)
 {
-    return new Connection($settings, $publicKeyStore);
+	return 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)
 {

Indentation +25 added lines, -25 removed lines

@@ -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;
+	}
 }

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

samples/web/include/GetPost.php

Indentation +11 added lines, -11 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
+	 */
 
 /**
  * Returns the parameter from GET (preferred) or POST.
@@ -13,12 +13,12 @@ 
  */
 function ReturnGetPost($name)
 {
-    if (isset($_GET[$name])) {
-        return $_GET[$name];
-    }
-    if (isset($_POST[$name])) {
-        return $_POST[$name];
-    }
+	if (isset($_GET[$name])) {
+		return $_GET[$name];
+	}
+	if (isset($_POST[$name])) {
+		return $_POST[$name];
+	}
 
-    return null;
+	return null;
 }

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

samples/web/index.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
         $fileConnCredentErr .= ' Not all required constants are defined.';
     } else {
         if (MSGAPI_GATEWAY_THREEMA_ID == '' ||
-            !preg_match('/' . REGEXP_THREEMAID_GATEWAY . '/', MSGAPI_GATEWAY_THREEMA_ID)
+            !preg_match('/'.REGEXP_THREEMAID_GATEWAY.'/', MSGAPI_GATEWAY_THREEMA_ID)
         ) {
             $fileConnCredentErr .= ' \'MSGAPI_GATEWAY_THREEMA_ID\' is invalid.';
         }
@@ -76,7 +76,7 @@ 
         }
 
         if (MSGAPI_DEFAULTRECEIVER <> '' &&
-            !preg_match('/' . REGEXP_THREEMAID_ANY . '/', MSGAPI_DEFAULTRECEIVER)
+            !preg_match('/'.REGEXP_THREEMAID_ANY.'/', MSGAPI_DEFAULTRECEIVER)
         ) {
             $fileConnCredentErr .= ' \'MSGAPI_DEFAULTRECEIVER\' is invalid.';
         }
@@ -134,7 +134,7 @@ 
             <!-- files already exist - no need to show instructions -->
         <?php else: ?>
         <p>
-            Before you can use this test you have to get credentials at <a href="https://gateway.threema.ch" title="Threema Gateway">gateway.threema.ch</a> and <a href="https://github.com/rugk/threema-msgapi-sdk-php/wiki/How-to-generate-a-new-key-pair-and-send-a-message">create a key pair</a>. After you did so, you have to open <code><?php echo FILENAME_CONNCRED . FILEEXT_EXAMPLE ?></code> and <code><?php echo FILENAME_PRIVKEY . FILEEXT_EXAMPLE ?></code> and add your credentials and private key. Save them without the <code><?php echo FILEEXT_EXAMPLE ?></code> file extension afterwards.
+            Before you can use this test you have to get credentials at <a href="https://gateway.threema.ch" title="Threema Gateway">gateway.threema.ch</a> and <a href="https://github.com/rugk/threema-msgapi-sdk-php/wiki/How-to-generate-a-new-key-pair-and-send-a-message">create a key pair</a>. After you did so, you have to open <code><?php echo FILENAME_CONNCRED.FILEEXT_EXAMPLE ?></code> and <code><?php echo FILENAME_PRIVKEY.FILEEXT_EXAMPLE ?></code> and add your credentials and private key. Save them without the <code><?php echo FILEEXT_EXAMPLE ?></code> file extension afterwards.
             By default these files are excluded from git pulls so you will not accidentally publish these sensitive files.
         </p>
         <?php endif ?>
@@ -221,9 +221,9 @@ 
                     </fieldset>
                     <fieldset id="field_method">
                         <legend>Method</legend>
-                        <input id="SrvMethodGet" name="servermethod" type="radio" <?php if ($_SERVER['REQUEST_METHOD'] == 'GET') {echo 'checked="checked"';}?> value="get">
+                        <input id="SrvMethodGet" name="servermethod" type="radio" <?php if ($_SERVER['REQUEST_METHOD'] == 'GET') {echo 'checked="checked"'; }?> value="get">
                             <label for="SrvMethodGet">GET</label>
-                        <input id="SrvMethodPost" name="servermethod" type="radio" <?php if ($_SERVER['REQUEST_METHOD'] == 'POST') {echo 'checked="checked"';}?> value="post">
+                        <input id="SrvMethodPost" name="servermethod" type="radio" <?php if ($_SERVER['REQUEST_METHOD'] == 'POST') {echo 'checked="checked"'; }?> value="post">
                             <label for="SrvMethodPost">POST</label>
                         <br />
                         <input id="ButtonExternalScript" name="isExternal" type="checkbox">

Braces +5 added lines, -2 removed lines

@@ -132,7 +132,8 @@ 
         <h2 id="prerequisites">Prerequisites</h2>
         <?php if ($fileConnCredentErr == '' && $fileChkPrivateKeyErr == ''): ?>
             <!-- files already exist - no need to show instructions -->
-        <?php else: ?>
+        <?php else {
+	: ?>
         <p>
             Before you can use this test you have to get credentials at <a href="https://gateway.threema.ch" title="Threema Gateway">gateway.threema.ch</a> and <a href="https://github.com/rugk/threema-msgapi-sdk-php/wiki/How-to-generate-a-new-key-pair-and-send-a-message">create a key pair</a>. After you did so, you have to open <code><?php echo FILENAME_CONNCRED . FILEEXT_EXAMPLE ?></code> and <code><?php echo FILENAME_PRIVKEY . FILEEXT_EXAMPLE ?></code> and add your credentials and private key. Save them without the <code><?php echo FILEEXT_EXAMPLE ?></code> file extension afterwards.
             By default these files are excluded from git pulls so you will not accidentally publish these sensitive files.
@@ -192,7 +193,9 @@ 
                 You did not prepared your setup correctly to use the test. Please follow the intructions above to setup your environment.
             </div>
         <?php else: ?>
-            <form id="mainform" action="." method="<?php echo $_SERVER['REQUEST_METHOD']; ?>">
+            <form id="mainform" action="." method="<?php echo $_SERVER['REQUEST_METHOD'];
+}
+?>">
                 <div class="formcontainer">
                     <fieldset id="field_generalsettings">
                         <legend>General settings</legend>

Indentation +74 added lines, -74 removed lines

@@ -1,10 +1,10 @@ 
 <!--
 <?php
 /**
- * @author rugk
- * @copyright Copyright (c) 2015 rugk
- * @license MIT
- */
+	 * @author rugk
+	 * @copyright Copyright (c) 2015 rugk
+	 * @license MIT
+	 */
 
 /* INCLUDES */
 require_once 'include/GlobalConstants.php';
@@ -18,87 +18,87 @@ 
 /* SOME SMALL FUNCTIONS */
 function ShowDefaultReceiverId($addOptionsHtmlCode = false)
 {
-    $isShown = ReturnGetPost('threemaid') != null || ReturnGetPost('recieverid')
-    != null || MSGAPI_DEFAULTRECEIVER <> '';
-
-    // Show previous input if there is something
-    if ($isShown && $addOptionsHtmlCode) {
-        echo '<option value="';
-    }
-
-    if (ReturnGetPost('threemaid') != null) {
-        echo htmlentities(ReturnGetPost('threemaid'));
-    } elseif (ReturnGetPost('recieverid') != null) {
-        echo htmlentities(ReturnGetPost('recieverid'));
-    } elseif (MSGAPI_DEFAULTRECEIVER <> '') {
-        // use receiver in config
-        echo MSGAPI_DEFAULTRECEIVER;
-    }
-
-    if ($isShown && $addOptionsHtmlCode) {
-        echo '">';
-    }
+	$isShown = ReturnGetPost('threemaid') != null || ReturnGetPost('recieverid')
+	!= null || MSGAPI_DEFAULTRECEIVER <> '';
+
+	// Show previous input if there is something
+	if ($isShown && $addOptionsHtmlCode) {
+		echo '<option value="';
+	}
+
+	if (ReturnGetPost('threemaid') != null) {
+		echo htmlentities(ReturnGetPost('threemaid'));
+	} elseif (ReturnGetPost('recieverid') != null) {
+		echo htmlentities(ReturnGetPost('recieverid'));
+	} elseif (MSGAPI_DEFAULTRECEIVER <> '') {
+		// use receiver in config
+		echo MSGAPI_DEFAULTRECEIVER;
+	}
+
+	if ($isShown && $addOptionsHtmlCode) {
+		echo '">';
+	}
 }
 
 function ShowDefaultMessage()
 {
-    // Show previous input if there is something
-    if (ReturnGetPost('message') != null) {
-        echo htmlentities(ReturnGetPost('message'));
-    }
+	// Show previous input if there is something
+	if (ReturnGetPost('message') != null) {
+		echo htmlentities(ReturnGetPost('message'));
+	}
 }
 
 /* CHECK PREREQUISITES */
 $fileConnCredentErr = '';
 if (!file_exists(FILENAME_CONNCRED)) {
-    $fileConnCredentErr .= ' The file does not exist.';
+	$fileConnCredentErr .= ' The file does not exist.';
 } else {
-    require_once FILENAME_CONNCRED;
-    if (!defined('MSGAPI_GATEWAY_THREEMA_ID') ||
-        !defined('MSGAPI_GATEWAY_THREEMA_ID_SECRET')
-    ) {
-        $fileConnCredentErr .= ' Not all required constants are defined.';
-    } else {
-        if (MSGAPI_GATEWAY_THREEMA_ID == '' ||
-            !preg_match('/' . REGEXP_THREEMAID_GATEWAY . '/', MSGAPI_GATEWAY_THREEMA_ID)
-        ) {
-            $fileConnCredentErr .= ' \'MSGAPI_GATEWAY_THREEMA_ID\' is invalid.';
-        }
-
-        if (MSGAPI_GATEWAY_THREEMA_ID_SECRET == '' ||
-            !ctype_alnum(MSGAPI_GATEWAY_THREEMA_ID_SECRET)
-        ) {
-            $fileConnCredentErr .= ' \'MSGAPI_GATEWAY_THREEMA_ID_SECRET\' is invalid.';
-        }
-
-        // MSGAPI_DEFAULTRECEIVER is optional
-        if (!defined('MSGAPI_DEFAULTRECEIVER')) {
-            define('MSGAPI_DEFAULTRECEIVER', '');
-        }
-
-        if (MSGAPI_DEFAULTRECEIVER <> '' &&
-            !preg_match('/' . REGEXP_THREEMAID_ANY . '/', MSGAPI_DEFAULTRECEIVER)
-        ) {
-            $fileConnCredentErr .= ' \'MSGAPI_DEFAULTRECEIVER\' is invalid.';
-        }
-    }
+	require_once FILENAME_CONNCRED;
+	if (!defined('MSGAPI_GATEWAY_THREEMA_ID') ||
+		!defined('MSGAPI_GATEWAY_THREEMA_ID_SECRET')
+	) {
+		$fileConnCredentErr .= ' Not all required constants are defined.';
+	} else {
+		if (MSGAPI_GATEWAY_THREEMA_ID == '' ||
+			!preg_match('/' . REGEXP_THREEMAID_GATEWAY . '/', MSGAPI_GATEWAY_THREEMA_ID)
+		) {
+			$fileConnCredentErr .= ' \'MSGAPI_GATEWAY_THREEMA_ID\' is invalid.';
+		}
+
+		if (MSGAPI_GATEWAY_THREEMA_ID_SECRET == '' ||
+			!ctype_alnum(MSGAPI_GATEWAY_THREEMA_ID_SECRET)
+		) {
+			$fileConnCredentErr .= ' \'MSGAPI_GATEWAY_THREEMA_ID_SECRET\' is invalid.';
+		}
+
+		// MSGAPI_DEFAULTRECEIVER is optional
+		if (!defined('MSGAPI_DEFAULTRECEIVER')) {
+			define('MSGAPI_DEFAULTRECEIVER', '');
+		}
+
+		if (MSGAPI_DEFAULTRECEIVER <> '' &&
+			!preg_match('/' . REGEXP_THREEMAID_ANY . '/', MSGAPI_DEFAULTRECEIVER)
+		) {
+			$fileConnCredentErr .= ' \'MSGAPI_DEFAULTRECEIVER\' is invalid.';
+		}
+	}
 }
 
 
 $fileChkPrivateKeyErr = '';
 if (!file_exists(FILENAME_PRIVKEY)) {
-    $fileChkPrivateKeyErr .= ' The file does not exist.';
+	$fileChkPrivateKeyErr .= ' The file does not exist.';
 } else {
-    require_once FILENAME_PRIVKEY;
-    if (!defined('MSGAPI_PRIVATE_KEY')) {
-        $fileChkPrivateKeyErr .= ' Not all constants are defined.';
-    } else {
-        if (MSGAPI_PRIVATE_KEY == '' ||
-            !KeyCheck(MSGAPI_PRIVATE_KEY, 'private:')
-        ) {
-            $fileChkPrivateKeyErr .= ' \'MSGAPI_PRIVATE_KEY\' is invalid.';
-        }
-    }
+	require_once FILENAME_PRIVKEY;
+	if (!defined('MSGAPI_PRIVATE_KEY')) {
+		$fileChkPrivateKeyErr .= ' Not all constants are defined.';
+	} else {
+		if (MSGAPI_PRIVATE_KEY == '' ||
+			!KeyCheck(MSGAPI_PRIVATE_KEY, 'private:')
+		) {
+			$fileChkPrivateKeyErr .= ' \'MSGAPI_PRIVATE_KEY\' is invalid.';
+		}
+	}
 }
 ?>
 -->
@@ -112,9 +112,9 @@ 
     </head>
     <body>
         <?php
-        // only shows content when it is not parsed by a PHP interpreter
-        if (false):
-        ?>
+		// only shows content when it is not parsed by a PHP interpreter
+		if (false):
+		?>
         <!-- PHP parsing error message -->
         <div class="warning">
             You are viewing this file within a browser. However you do need to call this file
@@ -122,8 +122,8 @@ 
             PHP support and access the file like this: <code>http://127.0.0.1/threema-msgapi-sdk-php/samples/web/</code>.
         </div>
         <?php
-        endif
-        ?>
+		endif
+		?>
 
         <h1 id="devui">Development UI - MSGAPI-PHP-SDK - Threema Gateway</h1>
         <p>

samples/web/FetchPublicKey.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
+	 */
 
 header('Content-Type: text/plain');
 
@@ -32,20 +32,20 @@ 
  */
 function FetchPublicKey($connector, $threemaId)
 {
-    $result = $connector->fetchPublicKey($threemaId);
-    if ($result->isSuccess()) {
-    	return $result->getPublicKey();
-    } else {
-    	throw new Exception($result->getErrorMessage());
-    }
+	$result = $connector->fetchPublicKey($threemaId);
+	if ($result->isSuccess()) {
+		return $result->getPublicKey();
+	} else {
+		throw new Exception($result->getErrorMessage());
+	}
 }
 
 //get params
 $threemaId = null;
 if (ReturnGetPost('threemaid') &&
-    preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('threemaid'))
+	preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('threemaid'))
 ) {
-    $threemaId = htmlentities(ReturnGetPost('threemaid'));
+	$threemaId = htmlentities(ReturnGetPost('threemaid'));
 }
 
 //create connection
@@ -53,14 +53,14 @@ 
 
 //Fetch public key and return a 500 error in case of a failure
 if ($threemaId != null) {
-    try {
-        $publicKey = FetchPublicKey($connector, $threemaId);
-        echo $publicKey;
-    } catch (Exception $e) {
-        http_response_code(500);
-        echo $e->getMessage();
-    }
+	try {
+		$publicKey = FetchPublicKey($connector, $threemaId);
+		echo $publicKey;
+	} catch (Exception $e) {
+		http_response_code(500);
+		echo $e->getMessage();
+	}
 } else {
-    http_response_code(500);
-    echo 'Invalid Threema ID';
+	http_response_code(500);
+	echo 'Invalid Threema ID';
 }

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 //get params
 $threemaId = null;
 if (ReturnGetPost('threemaid') &&
-    preg_match('/' . REGEXP_THREEMAID_ANY . '/', ReturnGetPost('threemaid'))
+    preg_match('/'.REGEXP_THREEMAID_ANY.'/', ReturnGetPost('threemaid'))
 ) {
     $threemaId = htmlentities(ReturnGetPost('threemaid'));
 }

samples/web/SendE2EText.php

Indentation +17 added lines, -17 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
+	 */
 
 header('Content-Type: text/plain');
 
@@ -31,19 +31,19 @@ 
  */
 function SendText($connector, $receiverId, $message)
 {
-    //get private key
-    $privateKey = KeyHexToBin(MSGAPI_PRIVATE_KEY);
-
-    //send message
-    $e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($privateKey, $connector);
-    $result = $e2eHelper->sendTextMessage($receiverId, $message);
-
-    //show result
-    if (true === $result->isSuccess()) {
-    	echo 'Message ID: '.$result->getMessageId() . "\n";
-    } else {
-    	echo 'Error: '.$result->getErrorMessage() . "\n";
-    }
+	//get private key
+	$privateKey = KeyHexToBin(MSGAPI_PRIVATE_KEY);
+
+	//send message
+	$e2eHelper = new \Threema\MsgApi\Helpers\E2EHelper($privateKey, $connector);
+	$result = $e2eHelper->sendTextMessage($receiverId, $message);
+
+	//show result
+	if (true === $result->isSuccess()) {
+		echo 'Message ID: '.$result->getMessageId() . "\n";
+	} else {
+		echo 'Error: '.$result->getErrorMessage() . "\n";
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
 
     //show result
     if (true === $result->isSuccess()) {
-    	echo 'Message ID: '.$result->getMessageId() . "\n";
+    	echo 'Message ID: '.$result->getMessageId()."\n";
     } else {
-    	echo 'Error: '.$result->getErrorMessage() . "\n";
+    	echo 'Error: '.$result->getErrorMessage()."\n";
     }
 
 }

samples/web/include/PublicKey.php

Indentation +17 added lines, -17 removed lines

@@ -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 +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 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);
 }
 
 /**