rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Commands/SendE2E.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * @param object $res
 	 * @return UploadFileResult
 	 */
-	function parseResult($httpCode, $res){
+	function parseResult($httpCode, $res) {
 		return new UploadFileResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Commands/SendSimple.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * @param object $res
 	 * @return UploadFileResult
 	 */
-	function parseResult($httpCode, $res){
+	function parseResult($httpCode, $res) {
 		return new UploadFileResult($httpCode, $res);
 	}
 }

source/Threema/MsgApi/Tools/CryptToolSodium.php

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

Spacing +19 added lines, -19 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return CryptTool
 	 */
 	public static function getInstance() {
-		if(null === self::$instance) {
-			foreach(array(
+		if (null === self::$instance) {
+			foreach (array(
 				function() {
 					return self::createInstance(self::TYPE_SODIUM);
 				},
@@ -51,7 +51,7 @@ 
 					return self::createInstance(self::TYPE_SALT);
 				}) as $instanceGenerator) {
 				$i = $instanceGenerator->__invoke();
-				if(null !== $i) {
+				if (null !== $i) {
 					self::$instance = $i;
 					break;
 				}
@@ -66,18 +66,18 @@ 
 	 * @return null|CryptTool null on unknown type
 	 */
 	public static function createInstance($type) {
-		switch($type) {
+		switch ($type) {
 			case self::TYPE_SODIUM:
 				$instance = new CryptToolSodium();
-				if(false === $instance->isSupported()) {
+				if (false === $instance->isSupported()) {
 					//try to instance old version of sodium wrapper
 					/** @noinspection PhpDeprecationInspection */
 					$instance = new CryptToolSodiumDep();
 				}
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			case self::TYPE_SALT:
 				$instance = new CryptToolSalt();
-				return $instance->isSupported() ? $instance :null;
+				return $instance->isSupported() ? $instance : null;
 			default:
 				return null;
 		}
@@ -104,14 +104,14 @@ 
 	 */
 	final public function encryptMessageText($text, $senderPrivateKey, $recipientPublicKey, $nonce) {
 		/* prepend type byte (0x01) to message data */
-		$textBytes = "\x01" . $text;
+		$textBytes = "\x01".$text;
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = mt_rand(1, 255);
 
 		/* append padding */
 		$padbytes = 0;
-		while($padbytes < 1 || $padbytes > 255) {
+		while ($padbytes < 1 || $padbytes > 255) {
 			$padbytes = ord($this->createRandom(1));
 		}
 
@@ -132,7 +132,7 @@ 
 			$senderPrivateKey,
 			$recipientPublicKey,
 			$nonce) {
-		$message = "\x02" . hex2bin($uploadFileResult->getBlobId());
+		$message = "\x02".hex2bin($uploadFileResult->getBlobId());
 		$message .= pack('V', $encryptResult->getSize());
 		$message .= $encryptResult->getNonce();
 
@@ -163,11 +163,11 @@ 
 			'i' => 0
 		);
 
-		if($thumbnailUploadFileResult != null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
+		if ($thumbnailUploadFileResult != null && strlen($thumbnailUploadFileResult->getBlobId()) > 0) {
 			$messageContent['t'] = $thumbnailUploadFileResult->getBlobId();
 		}
 
-		$message = "\x17" . json_encode($messageContent);
+		$message = "\x17".json_encode($messageContent);
 
 		/* determine random amount of PKCS7 padding */
 		$padbytes = mt_rand(1, 255);
@@ -240,7 +240,7 @@ 
 
 		/* remove padding */
 		$padbytes = ord($data[strlen($data)-1]);
-		$realDataLength = strlen($data) - $padbytes;
+		$realDataLength = strlen($data)-$padbytes;
 		if ($realDataLength < 1) {
 			throw new BadMessageException();
 		}
@@ -266,7 +266,7 @@ 
 				return new TextMessage(substr($data, 1));
 			case DeliveryReceipt::TYPE_CODE:
 				/* Delivery receipt */
-				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength - 2) % self::MESSAGE_ID_LEN) != 0)  {
+				if ($realDataLength < (self::MESSAGE_ID_LEN-2) || (($realDataLength-2)%self::MESSAGE_ID_LEN) != 0) {
 					throw new BadMessageException();
 				}
 
@@ -276,7 +276,7 @@ 
 				return new DeliveryReceipt($receiptType, $messageIds);
 			case ImageMessage::TYPE_CODE:
 				/* Image Message */
-				if ($realDataLength != 1 + self::BLOB_ID_LEN + self::IMAGE_FILE_SIZE_LEN + self::IMAGE_NONCE_LEN)  {
+				if ($realDataLength != 1+self::BLOB_ID_LEN+self::IMAGE_FILE_SIZE_LEN+self::IMAGE_NONCE_LEN) {
 					throw new BadMessageException();
 				}
 
@@ -287,12 +287,12 @@ 
 			case FileMessage::TYPE_CODE:
 				/* Image Message */
 				$decodeResult = json_decode(substr($data, 1), true);
-				if(null === $decodeResult || false === $decodeResult) {
+				if (null === $decodeResult || false === $decodeResult) {
 					throw new BadMessageException();
 				}
 
 				$values = AssocArray::byJsonString(substr($data, 1), array('b', 't', 'k', 'm', 'n', 's'));
-				if(null === $values) {
+				if (null === $values) {
 					throw new BadMessageException();
 				}
 
@@ -394,7 +394,7 @@ 
 	 * @return null|string
 	 */
 	public final function decryptFile($data, $key) {
-		$result =  $this->openSecretBox($data, self::FILE_NONCE, $key);
+		$result = $this->openSecretBox($data, self::FILE_NONCE, $key);
 		return false === $result ? null : $result;
 	}
 
@@ -405,7 +405,7 @@ 
 	 */
 	public final function encryptFileThumbnail($data, $key) {
 		$box = $this->makeSecretBox($data, self::FILE_THUMBNAIL_NONCE, $key);
-		return new EncryptResult($box, $key,  self::FILE_THUMBNAIL_NONCE, strlen($box));
+		return new EncryptResult($box, $key, self::FILE_THUMBNAIL_NONCE, strlen($box));
 	}
 
 	public final function decryptFileThumbnail($data, $key) {

samples/web/include/Connection.php

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