Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/API/Client.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function setBaseURL($apiBaseURL)
     {
-        $this->_apiBaseURL = rtrim($apiBaseURL, '/') . '/';
+        $this->_apiBaseURL = rtrim($apiBaseURL, '/').'/';
     }
 
     /**
@@ -78,7 +78,7 @@ 
     protected function callAPI($resource, $method = "GET", $data = array(), $headers = array())
     {
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->_apiBaseURL . ltrim($resource, '/'));
+        curl_setopt($ch, CURLOPT_URL, $this->_apiBaseURL.ltrim($resource, '/'));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
         // Explicitly empty null values, because http_build_query will throw away
@@ -107,7 +107,7 @@ 
 
         $headerArray = array();
         foreach ($headers as $key => $value) {
-            $headerArray[] = $key . ': ' . $value;
+            $headerArray[] = $key.': '.$value;
         }
 
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headerArray);

library/tiqr/Tiqr/Message/Exception/MismatchSenderId.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * @param boolean   $temporary  temporary failure?
      * @param Exception $parent     parent exception
      */
-    public function __construct($message, $temporary=false, Exception $parent=null)
+    public function __construct($message, $temporary = false, Exception $parent = null)
     {
         parent::__construct($message, $parent);
         $this->_temporary = $temporary;

library/tiqr/Tiqr/Message/Exception.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
      * @param string    $message    exception message
      * @param Exception $parent     parent exception
      */
-     public function __construct($message, $parent=null)
-     {
-         parent::__construct($message, 0, $parent);
-     }
+        public function __construct($message, $parent=null)
+        {
+            parent::__construct($message, 0, $parent);
+        }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * @param string    $message    exception message
      * @param Exception $parent     parent exception
      */
-     public function __construct($message, $parent=null)
+     public function __construct($message, $parent = null)
      {
          parent::__construct($message, 0, $parent);
      }

library/tiqr/Tiqr/Message/Exception/SendFailure.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * @param boolean   $temporary  temporary failure?
      * @param Exception $parent     parent exception
      */
-    public function __construct($message, $temporary=false, Exception $parent=null)
+    public function __construct($message, $temporary = false, Exception $parent = null)
     {
         parent::__construct($message, $parent);
         $this->_temporary = $temporary;

library/tiqr/Tiqr/OATH/OCRA.php

Indentation +11 added lines, -11 removed lines

@@ -36,11 +36,11 @@ 
      */
     private static function _hmac(string $crypto, string $keyBytes, string $text) : string
     {
-         $hash = hash_hmac($crypto, $text, $keyBytes);
-         if (false === $hash) {
-             throw new Exception("calculating hash_hmac failed");
-         }
-         return $hash;
+            $hash = hash_hmac($crypto, $text, $keyBytes);
+            if (false === $hash) {
+                throw new Exception("calculating hash_hmac failed");
+            }
+            return $hash;
     }
 
     /**
@@ -99,12 +99,12 @@ 
      * alternative to "-S064"
      */
     static function generateOCRA(string $ocraSuite,
-                                 string $key,
-                                 string $counter,
-                                 string $question,
-                                 string $password,
-                                 string $sessionInformation,
-                                 string $timeStamp) : string
+                                    string $key,
+                                    string $counter,
+                                    string $question,
+                                    string $password,
+                                    string $sessionInformation,
+                                    string $timeStamp) : string
     {
         $codeDigits = 0;
         $crypto = "";

Spacing +75 added lines, -75 removed lines

@@ -58,18 +58,18 @@ 
     private static function _hexStr2Bytes(string $hex, int $maxBytes, string $parameterName) : string
     {
         $len = strlen($hex);
-        if ( ($len !== 0) && (! ctype_xdigit($hex)) ) {
+        if (($len !== 0) && (!ctype_xdigit($hex))) {
             throw new InvalidArgumentException("Parameter '$parameterName' contains non hex digits");
         }
-        if ( $len % 2 !== 0 ) {
+        if ($len % 2 !== 0) {
             throw new InvalidArgumentException("Parameter '$parameterName' contains odd number of hex digits");
         }
-        if ( $len > $maxBytes * 2) {
+        if ($len > $maxBytes * 2) {
             throw new InvalidArgumentException("Parameter '$parameterName' too long");
         }
         // hex2bin logs PHP warnings when $hex contains invalid characters or has uneven length. Because we
         // check for these conditions above hex2bin() should always be silent
-        $res=hex2bin($hex);
+        $res = hex2bin($hex);
         if (false === $res) {
             throw new InvalidArgumentException("Parameter '$parameterName' could not be decoded");
         }
@@ -125,83 +125,83 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
 
-        if(stripos($cryptoFunction, "hotp-sha1")!==false)
+        if (stripos($cryptoFunction, "hotp-sha1") !== false)
             $crypto = "sha1";
-        elseif(stripos($cryptoFunction, "hotp-sha256")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha256") !== false)
             $crypto = "sha256";
-        elseif(stripos($cryptoFunction, "hotp-sha512")!==false)
+        elseif (stripos($cryptoFunction, "hotp-sha512") !== false)
             $crypto = "sha512";
         else {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
 
         // The Cryptofucntion must ha a truncation of 0, 4-10
-        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
-        if (! ctype_digit($codeDigits_str)) {
+        $codeDigits_str = substr($cryptoFunction, strrpos($cryptoFunction, "-") + 1);
+        if (!ctype_digit($codeDigits_str)) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
-        $codeDigits = (integer)$codeDigits_str;
+        $codeDigits = (integer) $codeDigits_str;
         if (($codeDigits != 0) && (($codeDigits < 4) || ($codeDigits > 10))) {
             throw new InvalidArgumentException('Unsupported OCRA CryptoFunction');
         }
                 
         // The size of the byte array message to be encrypted
         // Counter
-        if($dataInput[0] == "c" ) {
+        if ($dataInput[0] == "c") {
             // Fix the length of the HEX string
-            while(strlen($counter) < 16)
-                $counter = "0" . $counter;
-            $counterLength=8;
+            while (strlen($counter) < 16)
+                $counter = "0".$counter;
+            $counterLength = 8;
         }
         // Question
-        if($dataInput[0] == "q" ||
-                stripos($dataInput, "-q")!==false) {
-            while(strlen($question) < 256)
-                $question = $question . "0";
-            $questionLength=128;
+        if ($dataInput[0] == "q" ||
+                stripos($dataInput, "-q") !== false) {
+            while (strlen($question) < 256)
+                $question = $question."0";
+            $questionLength = 128;
         }
 
         // Password
-        if(stripos($dataInput, "psha1")!==false) {
-            while(strlen($password) < 40)
-                $password = "0" . $password;
-            $passwordLength=20;
+        if (stripos($dataInput, "psha1") !== false) {
+            while (strlen($password) < 40)
+                $password = "0".$password;
+            $passwordLength = 20;
         }
     
-        if(stripos($dataInput, "psha256")!==false) {
-            while(strlen($password) < 64)
-                $password = "0" . $password;
-            $passwordLength=32;
+        if (stripos($dataInput, "psha256") !== false) {
+            while (strlen($password) < 64)
+                $password = "0".$password;
+            $passwordLength = 32;
         }
         
-        if(stripos($dataInput, "psha512")!==false) {
-            while(strlen($password) < 128)
-                $password = "0" . $password;
-            $passwordLength=64;
+        if (stripos($dataInput, "psha512") !== false) {
+            while (strlen($password) < 128)
+                $password = "0".$password;
+            $passwordLength = 64;
         }
         
         // sessionInformation
-        if(stripos($dataInput, "s064") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+        if (stripos($dataInput, "s064") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
 
-            $sessionInformationLength=64;
-        } else if(stripos($dataInput, "s128") !==false) {
-            while(strlen($sessionInformation) < 256)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "s128") !== false) {
+            while (strlen($sessionInformation) < 256)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=128;
-        } else if(stripos($dataInput, "s256") !==false) {
-            while(strlen($sessionInformation) < 512)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 128;
+        } else if (stripos($dataInput, "s256") !== false) {
+            while (strlen($sessionInformation) < 512)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=256;
-        } else if(stripos($dataInput, "s512") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 256;
+        } else if (stripos($dataInput, "s512") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=64;
-        } else if (stripos($dataInput, "-s") !== false ) {
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "-s") !== false) {
             // deviation from spec. Officially 's' without a length indicator is not in the reference implementation.
             // RFC is ambigious. However we have supported this in Tiqr since day 1, so we continue to support it.
 
@@ -210,27 +210,27 @@ 
             // to prevent matching the "s" in the password input e.g. "psha1".
             // [C] | QFxx | [PH | Snnn | TG] : Challenge-Response computation
             // [C] | QFxx | [PH | TG] : Plain Signature computation
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
             
-            $sessionInformationLength=64;
+            $sessionInformationLength = 64;
         }
         
         
              
         // TimeStamp
-        if($dataInput[0] == "t" ||
+        if ($dataInput[0] == "t" ||
                 stripos($dataInput, "-t") !== false) {
-            while(strlen($timeStamp) < 16)
-                $timeStamp = "0" . $timeStamp;
-            $timeStampLength=8;
+            while (strlen($timeStamp) < 16)
+                $timeStamp = "0".$timeStamp;
+            $timeStampLength = 8;
         }
 
         // Put the bytes of "ocraSuite" parameters into the message
         
-        $msg = array_fill(0,$ocraSuiteLength+$counterLength+$questionLength+$passwordLength+$sessionInformationLength+$timeStampLength+1, 0);
+        $msg = array_fill(0, $ocraSuiteLength + $counterLength + $questionLength + $passwordLength + $sessionInformationLength + $timeStampLength + 1, 0);
                 
-        for($i=0;$i<strlen($ocraSuite);$i++) {
+        for ($i = 0; $i < strlen($ocraSuite); $i++) {
             $msg[$i] = $ocraSuite[$i];
         }
         
@@ -239,9 +239,9 @@ 
 
         // Put the bytes of "Counter" to the message
         // Input is HEX encoded
-        if($counterLength > 0 ) {
+        if ($counterLength > 0) {
             $bArray = self::_hexStr2Bytes($counter, $counterLength, 'counter');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1] = $bArray[$i];
             }
         }
@@ -249,41 +249,41 @@ 
 
         // Put the bytes of "question" to the message
         // Input is text encoded
-        if($questionLength > 0 ) {
+        if ($questionLength > 0) {
             $bArray = self::_hexStr2Bytes($question, $questionLength, 'question');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "password" to the message
         // Input is HEX encoded
-        if($passwordLength > 0){
+        if ($passwordLength > 0) {
             $bArray = self::_hexStr2Bytes($password, $passwordLength, 'password');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "sessionInformation" to the message
         // Input is HEX encoded
-        if($sessionInformationLength > 0 ){
+        if ($sessionInformationLength > 0) {
             $bArray = self::_hexStr2Bytes($sessionInformation, $sessionInformationLength, 'sessionInformation');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "time" to the message
         // Input is HEX encoded value of minutes
-        if($timeStampLength > 0){
+        if ($timeStampLength > 0) {
             $bArray = self::_hexStr2Bytes($timeStamp, $timeStampLength, 'timeStamp');
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength + $sessionInformationLength] = $bArray[$i];
             }
         }
         
-        $byteKey = self::_hexStr2Bytes($key, strlen($key)/2, 'key');
+        $byteKey = self::_hexStr2Bytes($key, strlen($key) / 2, 'key');
               
         $msg = implode("", $msg);
 
@@ -308,23 +308,23 @@ 
     static function _oath_truncate(string $hash, int $length = 6) : string
     {
         // Convert to dec
-        foreach(str_split($hash,2) as $hex)
+        foreach (str_split($hash, 2) as $hex)
         {
-            $hmac_result[]=hexdec($hex);
+            $hmac_result[] = hexdec($hex);
         }
     
         // Find offset
         $offset = $hmac_result[count($hmac_result) - 1] & 0xf;
     
         $v = strval(
-            (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-            (($hmac_result[$offset+1] & 0xff) << 16 ) |
-            (($hmac_result[$offset+2] & 0xff) << 8 ) |
-            ($hmac_result[$offset+3] & 0xff)
+            (($hmac_result[$offset + 0] & 0x7f) << 24) |
+            (($hmac_result[$offset + 1] & 0xff) << 16) |
+            (($hmac_result[$offset + 2] & 0xff) << 8) |
+            ($hmac_result[$offset + 3] & 0xff)
         );
 
         // Prefix truncated string with 0's to ensure it always has the required length
-        $v=str_pad($v, $length, "0", STR_PAD_LEFT);
+        $v = str_pad($v, $length, "0", STR_PAD_LEFT);
 
         $v = substr($v, strlen($v) - $length);
         return $v;

library/tiqr/Tiqr/UserSecretStorage/File.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     private function setUserSecret(string $userId, string $secret): void
     {
-        $data=array();
+        $data = array();
         if ($this->_userExists($userId)) {
             $data = $this->_loadUser($userId);
         }

Indentation -1 removed lines

@@ -35,7 +35,6 @@
  * Supported options:
  * path : Path to the directory where the user data is stored
  *
-
  */
 class Tiqr_UserSecretStorage_File implements Tiqr_UserSecretStorage_Interface
 {

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
     public function userExists(string $userId): bool
     {
         try {
-            $sth = $this->handle->prepare('SELECT userid FROM ' . $this->tableName . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT userid FROM '.$this->tableName.' WHERE userid = ?');
             $sth->execute(array($userId));
             return (false !== $sth->fetchColumn());
         }
@@ -103,9 +103,9 @@ 
     private function getUserSecret(string $userId): string
     {
         try {
-            $sth = $this->handle->prepare('SELECT secret FROM ' . $this->tableName . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT secret FROM '.$this->tableName.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting secret for user "%s"', $userId));
@@ -141,9 +141,9 @@ 
         // - The INSERT will fail when displayname has a NOT NULL constraint
         try {
             if ($this->userExists($userId)) {
-                $sth = $this->handle->prepare('UPDATE ' . $this->tableName . ' SET secret = ? WHERE userid = ?');
+                $sth = $this->handle->prepare('UPDATE '.$this->tableName.' SET secret = ? WHERE userid = ?');
             } else {
-                $sth = $this->handle->prepare('INSERT INTO ' . $this->tableName . ' (secret,userid) VALUES (?,?)');
+                $sth = $this->handle->prepare('INSERT INTO '.$this->tableName.' (secret,userid) VALUES (?,?)');
             }
             $sth->execute(array($secret, $userId));
         }

Indentation -1 removed lines

@@ -42,7 +42,6 @@
     userid varchar(30) NOT NULL UNIQUE,
     secret varchar(128),
 );
-
  * @see Tiqr_UserSecretStorage::getSecretStorage()
  * @see Tiqr_UserSecretStorage_Interface
  *

library/tiqr/Tiqr/UserStorage/FileTrait.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      */
     public function getPath(): string
     {
-        if (substr($this->path, -1)!="/") return $this->path."/";
+        if (substr($this->path, -1) != "/") return $this->path."/";
         return $this->path;
     }
 }

library/tiqr/Tiqr/UserStorage/GenericStore.php

Indentation +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
     public function createUser(string $userId, string $displayName) : void
     {
         $user = array("userId"=>$userId,
-                      "displayName"=>$displayName);
+                        "displayName"=>$displayName);
         $this->_saveUser($userId, $user);
     }
 
@@ -90,7 +90,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationType"])) {
-               return $data["notificationType"];
+                return $data["notificationType"];
             }
         }
         return '';
@@ -113,7 +113,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationAddress"])) {
-               return $data["notificationAddress"];
+                return $data["notificationAddress"];
             }
         }
         $this->logger->info('Unable to find notification address for user');

Spacing +2 added lines, -2 removed lines

@@ -170,10 +170,10 @@
             }
 
             if ($timestamp + $tempBlockDuration * 60 < time()) {
-                return false;   // Temp block expired
+                return false; // Temp block expired
             }
         }
-        return true;    // Blocked by temp block
+        return true; // Blocked by temp block
     }
     
     /**