rugk / threema-msgapi-sdk-php

source/Threema/MsgApi/Tools/CryptToolSalt.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return null|string
 	 */
 	protected function openBox($box, $recipientPrivateKey, $senderPublicKey, $nonce) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		try {
 			$data = Salt::box_open($boxPad, $recipientPrivateKey, $senderPublicKey, $nonce);
 		} catch (\SaltException $e) {
@@ -71,7 +71,7 @@ 
 	 * @return string as binary
 	 */
 	protected function openSecretBox($box, $nonce, $key) {
-		$boxPad = str_repeat("\x00", 16) . $box;
+		$boxPad = str_repeat("\x00", 16).$box;
 		$data = Salt::secretbox_open($boxPad, $nonce, $key);
 
 		if ($data) {
@@ -130,7 +130,7 @@ 
 			Salt::decodeInput($nonce),
 			$key);
 
-		if($data === false) {
+		if ($data === false) {
 			throw new Exception('encryption failed');
 		}
 
@@ -152,11 +152,11 @@ 
 	 * @throws Exception
 	 */
 	public function validate() {
-		if(false === $this->isSupported()) {
+		if (false === $this->isSupported()) {
 			throw new Exception('SALT implementation not supported');
 		}
 
-		if(PHP_INT_SIZE < 8) {
+		if (PHP_INT_SIZE < 8) {
 			throw new Exception('Pure PHP Crypto implementation requires 64Bit PHP. Please install the libsodium PHP extension.');
 		}
 		return true;

Indentation +3 added lines, -3 removed lines

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

source/Threema/MsgApi/Tools/CryptToolSodiumDep.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;

Indentation +3 added lines, -3 removed lines

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

source/Threema/MsgApi/Tools/FileAnalysisTool.php

Spacing +5 added lines, -5 removed lines

@@ -14,12 +14,12 @@ 
 	 */
 	public static function analyse($file) {
 		//check if file exists
-		if(false === file_exists($file)) {
+		if (false === file_exists($file)) {
 			return null;
 		}
 
 		//is not a file
-		if(false === is_file($file)) {
+		if (false === is_file($file)) {
 			return null;
 		}
 
@@ -28,16 +28,16 @@ 
 
 		$mimeType = null;
 		//mime type getter
-		if(function_exists('finfo_open')) {
+		if (function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
 		}
-		else if(function_exists('mime_content_type')) {
+		else if (function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 
 		//default mime type
-		if(strlen($mimeType) == 0) {
+		if (strlen($mimeType) == 0) {
 			//default mime type
 			$mimeType = 'application/octet-stream';
 		}

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 		if(function_exists('finfo_open')) {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimeType = finfo_file($finfo, $file);
-		}
-		else if(function_exists('mime_content_type')) {
+		} else if(function_exists('mime_content_type')) {
 			$mimeType = mime_content_type($file);
 		}
 

Indentation +3 added lines, -3 removed lines

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

source/bootstrap.php

Spacing +5 added lines, -5 removed lines

@@ -9,12 +9,12 @@ 
 	$fileName  = '';
 	if ($lastNsPos = strrpos($className, '\\')) {
 		$namespace = substr($className, 0, $lastNsPos);
-		$className = substr($className, $lastNsPos + 1);
-		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+		$className = substr($className, $lastNsPos+1);
+		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
 	}
-	$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+	$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 
-	if(true === file_exists( $d.'/'.$fileName)) {
+	if (true === file_exists($d.'/'.$fileName)) {
 		require $d.'/'.$fileName;
 	}
 });
@@ -23,7 +23,7 @@ 
 define('MSGAPI_SDK_VERSION', $sdkVersion);
 $cryptTool = Threema\MsgApi\Tools\CryptTool::getInstance();
 
-if(null === $cryptTool) {
+if (null === $cryptTool) {
 	throw new \Threema\Core\Exception("no supported crypt-tool");
 }
 

threema-msgapi-tool.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 //disallow using the cli tool in a web project
 if ('cli' !== php_sapi_name() || null === $argv) {
 	//file not called from the cli
-	die('please run ' . basename(__FILE__) . ' only in a cli. '.
+	die('please run '.basename(__FILE__).' only in a cli. '.
 		'To use the threema msgapi sdk in your web project, include the source/bootstrap.php or the threema_msgapi.phar file.');
 }
 try {
@@ -20,6 +20,6 @@ 
 		Threema\MsgApi\PublicKeyStores\PhpFile::create('keystore.php'));
 	$tool->run();
 } catch (\Threema\Core\Exception $exception) {
-	echo "ERROR: " . $exception->getMessage() . "\n";
+	echo "ERROR: ".$exception->getMessage()."\n";
 	die();
 }

source/Threema/Console/Command/Credits.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		$helper = new E2EHelper($privateKey, $connector);
 		$result = $helper->sendImageMessage($threemaId, $path);
 
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

Indentation +3 added lines, -3 removed lines

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

source/Threema/Console/Command/LookupPublicKeyById.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		$helper = new E2EHelper($privateKey, $connector);
 		$result = $helper->sendImageMessage($threemaId, $path);
 
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

Indentation +3 added lines, -3 removed lines

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

source/Threema/Console/Command/SendE2EFile.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		$helper = new E2EHelper($privateKey, $connector);
 		$result = $helper->sendImageMessage($threemaId, $path);
 
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

Indentation +3 added lines, -3 removed lines

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

source/Threema/Console/Command/SendE2EText.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 		Common::required($to, $from, $secret);
 
 		$message = $this->readStdIn();
-		if(strlen($message) === 0) {
+		if (strlen($message) === 0) {
 			throw new \InvalidArgumentException('please define a message');
 		}
 
@@ -49,7 +49,7 @@ 
 		$receiver = new Receiver($to, Receiver::TYPE_ID);
 
 		$result = $connector->sendSimple($receiver, $message);
-		if($result->isSuccess()) {
+		if ($result->isSuccess()) {
 			Common::l('Message ID: '.$result->getMessageId());
 		}
 		else {

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		$storeHandle = fopen($this->file, 'r');
 		if(false === $storeHandle) {
 			throw new Exception('could not open file '.$this->file);
-		}
-		else {
+		} else {
 			$threemaId = strtoupper($threemaId);
 			$publicKey = null;
 			while (!feof($storeHandle)) {

Indentation +3 added lines, -3 removed lines

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