rugk / threema-msgapi-sdk-php

samples/web/FetchPublicKey.php

Indentation +19 added lines, -19 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -35,8 +35,7 @@ 
     $result = $connector->fetchPublicKey($threemaId);
     if($result->isSuccess()) {
     	return $result->getPublicKey();
-    }
-    else {
+    } else {
     	throw new Exception($result->getErrorMessage());
     }
 }
@@ -57,8 +56,7 @@ 
     try {
         $publicKey = FetchPublicKey($connector, $threemaId);
         echo $publicKey;
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         http_response_code(500);
         echo $e->getMessage();
     }

samples/web/index.php

Indentation +73 added lines, -73 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,86 +18,86 @@ 
 /* 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.';
+		}
+	}
 }
 ?>
 -->
@@ -111,9 +111,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
@@ -121,8 +121,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>

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>

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