Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserSecretStorage.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
                 $password = $options['password'];
 
                 try {
-                    $handle = new PDO($dsn, $userName, $password, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION) );
+                    $handle = new PDO($dsn, $userName, $password, array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
                 } catch (PDOException $e) {
                     $logger->error(
                         sprintf('Unable to establish a PDO connection. Error message from PDO: %s', $e->getMessage())

library/tiqr/Tiqr/OcraService.php

Spacing +2 added lines, -2 removed lines

@@ -39,10 +39,10 @@
      * @return Tiqr_OcraService_Interface
      * @throws Exception An exception if an unknown orca service type is requested.
      */
-    public static function getOcraService(string $type="tiqr", array $options=array(), LoggerInterface $logger=null)
+    public static function getOcraService(string $type = "tiqr", array $options = array(), LoggerInterface $logger = null)
     {
         if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+            $logger = new \Psr\Log\NullLogger();
 
         switch ($type) {
             case "tiqr":

library/tiqr/Tiqr/OATH/OCRAParser.php

Spacing +25 added lines, -25 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	private function parseOCRASuite($ocraSuite) {
 		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('OCRASuite not in string format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$ocraSuite = strtoupper($ocraSuite);
@@ -53,54 +53,54 @@ 
 
 		$s = explode(':', $ocraSuite);
 		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('Invalid OCRASuite format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$algo = explode('-', $s[0]);
 		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+			throw new Exception('Invalid OCRA version: '.var_export($s[0], TRUE));
 		}
 
 		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+			throw new Exception('Unsupported OCRA algorithm: '.var_export($algo[0], TRUE));
 		}
 
 		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+			throw new Exception('Unsupported OCRA version: '.var_export($algo[1], TRUE));
 		}
 		$this->OCRAVersion = $algo[1];
 
 		$cf = explode('-', $s[1]);
 		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function: '.var_export($s[1], TRUE));
 		}
 
 		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+			throw new Exception('Unsupported OCRA suite crypto function: '.var_export($cf[0], TRUE));
 		}
 		$this->CryptoFunctionType = $cf[0];
 
 		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+			throw new Exception('Unsupported hash function in OCRA suite crypto function: '.var_export($cf[1], TRUE));
 		}
 		$this->CryptoFunctionHash = $cf[1];
 		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
 
 		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function truncation length: '.var_export($cf[2], TRUE));
 		}
 		$this->CryptoFunctionTruncation = intval($cf[2]);
 
 		$di = explode('-', $s[2]);
 		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+			throw new Exception('Invalid OCRA suite data input: '.var_export($s[2], TRUE));
 		}
 
 		$data_input = array();
-		foreach($di as $elem) {
+		foreach ($di as $elem) {
 			$letter = $elem[0];
 			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+				throw new Exception('Duplicate field in OCRA suite data input: '.var_export($elem, TRUE));
 			}
 			$data_input[$letter] = 1;
 
@@ -112,13 +112,13 @@ 
 				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
 					$q_len = intval($match[2]);
 					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input question length: '.var_export($q_len, TRUE));
 					}
 					$this->Q = TRUE;
 					$this->QType = $match[1];
 					$this->QLength = $q_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input question: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'P') {
 				if (strlen($elem) == 1) {
@@ -126,7 +126,7 @@ 
 				} else {
 					$p_algo = substr($elem, 1);
 					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+						throw new Exception('Unsupported OCRA suite PIN hash function: '.var_export($elem, TRUE));
 					}
 					$this->P = TRUE;
 					$this->PType = $p_algo;
@@ -138,13 +138,13 @@ 
 				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
 					$s_len = intval($match[1]);
 					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input session information length: '.var_export($s_len, TRUE));
 					}
 
 					$this->S = TRUE;
 					$this->SLength = $s_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input session information length: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'T') {
 				if (strlen($elem) == 1) {
@@ -153,7 +153,7 @@ 
 					preg_match_all('/(\d+)([HMS])/', $elem, $match);
 
 					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$length = 0;
@@ -161,21 +161,21 @@ 
 						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
 					}
 					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$this->T = TRUE;
 					$this->TLength = $length;
 				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 				}
 			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+				throw new Exception('Unsupported OCRA suite data input field: '.var_export($elem, TRUE));
 			}
 		}
 
 		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+			throw new Exception('OCRA suite data input question not defined: '.var_export($s[2], TRUE));
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 
         $bytes = Tiqr_Random::randomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -209,7 +209,7 @@ 
 				$challenge = implode("", unpack('N*', $bytes));
 				break;
 			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+				throw new Exception('Unsupported OCRASuite challenge type: '.var_export($q_type, TRUE));
 				break;
 		}
 
@@ -233,7 +233,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

library/tiqr/Tiqr/OcraService/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $this->logger = $logger;
 
         // Set the OCRA suite
-        $this->_ocraSuite = $config['ocra.suite'] ?? 'OCRA-1:HOTP-SHA1-6:QH10-S';   // Use tiqr server default suite
+        $this->_ocraSuite = $config['ocra.suite'] ?? 'OCRA-1:HOTP-SHA1-6:QH10-S'; // Use tiqr server default suite
         $this->_ocraParser = new OATH_OCRAParser($this->_ocraSuite);
     }
 

library/tiqr/Tiqr/DeviceStorage.php

Spacing +2 added lines, -2 removed lines

@@ -40,10 +40,10 @@
      * @param LoggerInterface $logger
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage(string $type="dummy", Array $options=array(), LoggerInterface $logger=null)
+    public static function getStorage(string $type = "dummy", Array $options = array(), LoggerInterface $logger = null)
     {
         if (!$logger)
-            $logger=new \Psr\Log\NullLogger();
+            $logger = new \Psr\Log\NullLogger();
 
         switch ($type) {
             case "dummy":

library/tiqr/Tiqr/UserSecretStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      *
      * @return Tiqr_UserSecretStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, string $type="dummy", array $options=array()): Tiqr_UserSecretStorage_Encryption_Interface
+    public static function getEncryption(LoggerInterface $logger, string $type = "dummy", array $options = array()): Tiqr_UserSecretStorage_Encryption_Interface
     {
         $instance = null;
         $logger->info(sprintf('Using "%s" as UserSecretStorage encryption type', $type));

library/tiqr/Tiqr/UserSecretStorage/Encryption/OpenSSL.php

Spacing +22 added lines, -22 removed lines

@@ -48,22 +48,22 @@ 
     */
 
     private $_supportedCiphers = [
-        'aes-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aes-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aes-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aes-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aes-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aes-256-gcm' => [ 'tag' => true, 'key' => 32 ],
-        'chacha20' => [ 'tag' => false, 'key' => 32 ],
-        'camellia-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'camellia-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'camellia-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-128-cbc' => [ 'tag' => false, 'key' => 16 ],
-        'aria-128-gcm' => [ 'tag' => true, 'key' => 16 ],
-        'aria-192-cbc' => [ 'tag' => false, 'key' => 24 ],
-        'aria-192-gcm' => [ 'tag' => true, 'key' => 24 ],
-        'aria-256-cbc' => [ 'tag' => false, 'key' => 32 ],
-        'aria-256-gcm' => [ 'tag' => true, 'key' => 32 ],
+        'aes-128-cbc' => ['tag' => false, 'key' => 16],
+        'aes-128-gcm' => ['tag' => true, 'key' => 16],
+        'aes-192-cbc' => ['tag' => false, 'key' => 24],
+        'aes-192-gcm' => ['tag' => true, 'key' => 24],
+        'aes-256-cbc' => ['tag' => false, 'key' => 32],
+        'aes-256-gcm' => ['tag' => true, 'key' => 32],
+        'chacha20' => ['tag' => false, 'key' => 32],
+        'camellia-128-cbc' => ['tag' => false, 'key' => 16],
+        'camellia-192-cbc' => ['tag' => false, 'key' => 24],
+        'camellia-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-128-cbc' => ['tag' => false, 'key' => 16],
+        'aria-128-gcm' => ['tag' => true, 'key' => 16],
+        'aria-192-cbc' => ['tag' => false, 'key' => 24],
+        'aria-192-gcm' => ['tag' => true, 'key' => 24],
+        'aria-256-cbc' => ['tag' => false, 'key' => 32],
+        'aria-256-gcm' => ['tag' => true, 'key' => 32],
     ];
 
     /**
@@ -136,12 +136,12 @@ 
         // A longer key is not a problem, but could indicate a configuration error
         $key_length = $this->_supportedCiphers[$this->_cipher]['key'];
         if (strlen($key) != $key_length) {
-            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got " . strlen($key) . " bytes");
+            throw new RuntimeException("Invalid length of key with key_id '{$this->_key_id}' used with cipher '{$this->_cipher}', expected {$key_length} bytes, got ".strlen($key)." bytes");
         }
 
         // openssl_encrypt returns the ciphertext as a base64 encoded string, so we don't need to encode it again
         // The tag is returned as a binary string, but only if the cipher requires a tag
-        $tag='';
+        $tag = '';
         if ($this->_supportedCiphers[$this->_cipher]['tag']) {
             $encrypted = openssl_encrypt($data, $this->_cipher, $key, 0, $iv, $tag, '', 16);
         } else {
@@ -153,7 +153,7 @@ 
         $tag = $this->_supportedCiphers[$this->_cipher]['tag'] ? $tag : '';
         // Return the encoded ciphertext, including the IV, tag and cipher
         // <cipher>:<key_id>:iv<>:<tag>:<ciphertext>
-        $encoded = $this->_cipher . ":" . $this->_key_id . ":" . base64_encode($iv) . ":" . base64_encode($tag) . ":" . $encrypted;
+        $encoded = $this->_cipher.":".$this->_key_id.":".base64_encode($iv).":".base64_encode($tag).":".$encrypted;
 
         return $encoded;
     }
@@ -192,19 +192,19 @@ 
         }
 
         // IV
-        $iv = base64_decode($split_data[2],true);
+        $iv = base64_decode($split_data[2], true);
         if ($iv === false) {
             throw new RuntimeException("Error decoding IV");
         }
 
         // Tag
-        $tag = base64_decode($split_data[3],true);
+        $tag = base64_decode($split_data[3], true);
         if ($tag === false) {
             throw new RuntimeException("Error decoding tag");
         }
         $ciphertext = $split_data[4];
 
-        $plaintext=openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
+        $plaintext = openssl_decrypt($ciphertext, $cipher, $key, 0, $iv, $tag);
         if ($plaintext === false) {
             throw new RuntimeException("Error decrypting data");
         }

library/tiqr/Tiqr/DeviceStorage/TokenExchange.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     {
         $url = $this->_options["url"]."?appId=".$this->_options["appid"];
         
-        $url.= "&notificationToken=".$notificationToken;
+        $url .= "&notificationToken=".$notificationToken;
 
         $ch = curl_init();
 
@@ -53,12 +53,12 @@ 
         $output = curl_exec($ch);
         curl_close($ch);
 
-        if (stripos($output, "not found")!==false) {
+        if (stripos($output, "not found") !== false) {
             $this->logger->error('Token Exchange failed and responded with: not found', ['full output' => $output]);
             return false;
         }
 
-        if (stripos($output, "error")!==false) {
+        if (stripos($output, "error") !== false) {
             $this->logger->error('Token Exchange failed and responded with: error', ['full output' => $output]);
             return false;
         }

library/tiqr/Tiqr/OATH/OCRA.php

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;