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

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

samples/web/include/PublicKey.php

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/FetchPublicKey.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 function FetchPublicKey($connector, $threemaId)
 {
     $result = $connector->fetchPublicKey($threemaId);
-    if($result->isSuccess()) {
+    if ($result->isSuccess()) {
     	return $result->getPublicKey();
     }
     else {
@@ -44,7 +44,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/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">

samples/web/SendE2EText.php

Spacing +3 added lines, -3 removed lines

@@ -39,10 +39,10 @@
     $result = $e2eHelper->sendTextMessage($receiverId, $message);
 
     //show result
-    if(true === $result->isSuccess()) {
-    	echo 'Message ID: '.$result->getMessageId() . "\n";
+    if (true === $result->isSuccess()) {
+    	echo 'Message ID: '.$result->getMessageId()."\n";
     } else {
-    	echo 'Error: '.$result->getErrorMessage() . "\n";
+    	echo 'Error: '.$result->getErrorMessage()."\n";
     }
 
 }