@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @author Threema GmbH |
|
| 4 | - * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | - */ |
|
| 3 | + * @author Threema GmbH |
|
| 4 | + * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | + */ |
|
| 6 | 6 | |
| 7 | 7 | |
| 8 | 8 | namespace Threema\Core; |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @author Threema GmbH |
|
| 4 | - * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | - */ |
|
| 3 | + * @author Threema GmbH |
|
| 4 | + * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | + */ |
|
| 6 | 6 | |
| 7 | 7 | |
| 8 | 8 | namespace Threema\Core; |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @author Threema GmbH |
|
| 4 | - * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | - */ |
|
| 3 | + * @author Threema GmbH |
|
| 4 | + * @copyright Copyright (c) 2015-2016 Threema GmbH |
|
| 5 | + */ |
|
| 6 | 6 | |
| 7 | 7 | |
| 8 | 8 | namespace Threema\Core; |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | require_once("Salt/autoload.php"); |
| 3 | 3 | |
| 4 | 4 | //define possibly missing constants |
| 5 | -defined('CURL_SSLVERSION_DEFAULT') || define('CURL_SSLVERSION_DEFAULT', 0); |
|
| 6 | -defined('CURL_SSLVERSION_TLSv1') || define('CURL_SSLVERSION_TLSv1', 1); |
|
| 7 | -defined('CURL_SSLVERSION_TLSv1_1') || define('CURL_SSLVERSION_TLSv1_1', 5); |
|
| 8 | -defined('CURL_SSLVERSION_TLSv1_2') || define('CURL_SSLVERSION_TLSv1_2', 6); |
|
| 5 | +defined('CURL_SSLVERSION_DEFAULT') || define('CURL_SSLVERSION_DEFAULT', 0); |
|
| 6 | +defined('CURL_SSLVERSION_TLSv1') || define('CURL_SSLVERSION_TLSv1', 1); |
|
| 7 | +defined('CURL_SSLVERSION_TLSv1_1') || define('CURL_SSLVERSION_TLSv1_1', 5); |
|
| 8 | +defined('CURL_SSLVERSION_TLSv1_2') || define('CURL_SSLVERSION_TLSv1_2', 6); |
|
| 9 | 9 | |
| 10 | 10 | //define autoloader |
| 11 | 11 | $d = dirname(__FILE__); |
@@ -15,12 +15,12 @@ discard block |
||
| 15 | 15 | $fileName = ''; |
| 16 | 16 | if ($lastNsPos = strrpos($className, '\\')) { |
| 17 | 17 | $namespace = substr($className, 0, $lastNsPos); |
| 18 | - $className = substr($className, $lastNsPos + 1); |
|
| 19 | - $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR; |
|
| 18 | + $className = substr($className, $lastNsPos+1); |
|
| 19 | + $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR; |
|
| 20 | 20 | } |
| 21 | - $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; |
|
| 21 | + $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php'; |
|
| 22 | 22 | |
| 23 | - if(true === file_exists( $d.'/'.$fileName)) { |
|
| 23 | + if (true === file_exists($d.'/'.$fileName)) { |
|
| 24 | 24 | require $d.'/'.$fileName; |
| 25 | 25 | } |
| 26 | 26 | }); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | define('MSGAPI_SDK_VERSION', $sdkVersion); |
| 30 | 30 | $cryptTool = Threema\MsgApi\Tools\CryptTool::getInstance(); |
| 31 | 31 | |
| 32 | -if(null === $cryptTool) { |
|
| 32 | +if (null === $cryptTool) { |
|
| 33 | 33 | throw new \Threema\Core\Exception("no supported crypt-tool"); |
| 34 | 34 | } |
| 35 | 35 | |