Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OATH/HOTP.php

Spacing +14 added lines, -14 removed lines

@@ -46,25 +46,25 @@ 
      * @param String $counter
      * @return String hash
      */
-    protected function _getHash ($secret, $counter)
+    protected function _getHash($secret, $counter)
     {
          // Counter
          //the counter value can be more than one byte long, so we need to go multiple times
-         $cur_counter = array(0,0,0,0,0,0,0,0);
-         for($i=7;$i>=0;$i--)
+         $cur_counter = array(0, 0, 0, 0, 0, 0, 0, 0);
+         for ($i = 7; $i >= 0; $i--)
          {
-             $cur_counter[$i] = pack ('C*', $counter);
+             $cur_counter[$i] = pack('C*', $counter);
              $counter = $counter >> 8;
          }
          $bin_counter = implode($cur_counter);
          // Pad to 8 chars
-         if (strlen ($bin_counter) < 8)
+         if (strlen($bin_counter) < 8)
          {
-             $bin_counter = str_repeat (chr(0), 8 - strlen ($bin_counter)) . $bin_counter;
+             $bin_counter = str_repeat(chr(0), 8 - strlen($bin_counter)).$bin_counter;
          }
      
          // HMAC
-         $hash = hash_hmac ('sha1', $bin_counter, $secret);
+         $hash = hash_hmac('sha1', $bin_counter, $secret);
          return $hash;
     }
  
@@ -77,9 +77,9 @@ 
     protected function _truncate($hash, $length = 6)
     {
          // 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
@@ -88,10 +88,10 @@ 
          // Algorithm from RFC
          return
          (
-             (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-             (($hmac_result[$offset+1] & 0xff) << 16 ) |
-             (($hmac_result[$offset+2] & 0xff) << 8 ) |
-             ($hmac_result[$offset+3] & 0xff)
-         ) % pow(10,$length);
+             (($hmac_result[$offset + 0] & 0x7f) << 24) |
+             (($hmac_result[$offset + 1] & 0xff) << 16) |
+             (($hmac_result[$offset + 2] & 0xff) << 8) |
+             ($hmac_result[$offset + 3] & 0xff)
+         ) % pow(10, $length);
     }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         }
 
         if ($error != null) {
-            throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: " . $error, true);
+            throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: ".$error, true);
         }
 
     }

library/tiqr/Tiqr/Message/Exception.php

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/OATH/OCRAParser.php

Spacing +32 added lines, -32 removed lines

@@ -41,7 +41,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);
@@ -49,54 +49,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;
 
@@ -108,13 +108,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) {
@@ -122,7 +122,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;
@@ -134,13 +134,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) {
@@ -149,7 +149,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;
@@ -157,21 +157,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));
 		}
 	}
 
@@ -181,7 +181,7 @@ 
 
 		$bytes = self::generateRandomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -194,7 +194,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;
 		}
 
@@ -206,7 +206,7 @@ 
 
 	public function generateSessionInformation() {
 		if (!$this->S) {
-			throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
+			throw new Exception('Session information not defined in OCRASuite: '.var_export($this->OCRASuite, TRUE));
 		}
 
 		$s_length = $this->SLength;
@@ -228,7 +228,7 @@ 
 
 		/* Use mt_rand to generate $length random bytes. */
 		$data = '';
-		for($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++) {
 			$data .= chr(mt_rand(0, 255));
 		}
 
@@ -246,7 +246,7 @@ 
 			return openssl_random_pseudo_bytes($length);
 		}
 
-		if($fp === NULL) {
+		if ($fp === NULL) {
 			if (@file_exists('/dev/urandom')) {
 				$fp = @fopen('/dev/urandom', 'rb');
 			} else {
@@ -254,17 +254,17 @@ 
 			}
 		}
 
-		if($fp !== FALSE) {
+		if ($fp !== FALSE) {
 			/* Read random bytes from /dev/urandom. */
 			$data = fread($fp, $length);
-			if($data === FALSE) {
+			if ($data === FALSE) {
 				throw new Exception('Error reading random data.');
 			}
-			if(strlen($data) != $length) {
+			if (strlen($data) != $length) {
 				if ($fallback) {
 					$data = self::generateRandomBytesMTrand($length);
 				} else {
-					throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
+					throw new Exception('Did not get requested number of bytes from random source. Requested ('.$length.') got ('.strlen($data).')');
 				}
 			}
 		} else {
@@ -290,7 +290,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

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/Message/FCM.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      *
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry=false)
+    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry = false)
     {
         $msg = array(
             'challenge' => $challenge,
@@ -71,7 +71,7 @@ 
         );
 
         $headers = array(
-            'Authorization: key=' . $apiKey,
+            'Authorization: key='.$apiKey,
             'Content-Type: application/json',
         );
 
@@ -84,7 +84,7 @@ 
         $result = curl_exec($ch);
         $errors = curl_error($ch);
         $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $remoteip = curl_getinfo($ch,CURLINFO_PRIMARY_IP);
+        $remoteip = curl_getinfo($ch, CURLINFO_PRIMARY_IP);
         curl_close($ch);
 
         if ($result === false) {
@@ -92,7 +92,7 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
@@ -110,7 +110,7 @@ 
         $response = json_decode($result, true);
         foreach ($response['results'] as $k => $v) {
             if (isset($v['error'])) {
-                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: " . $v['error'], true);
+                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: ".$v['error'], true);
             }
         }
     }

library/tiqr/Tiqr/Service.php

Spacing +34 added lines, -34 removed lines

@@ -68,12 +68,12 @@ 
     /**
      * Enrollment status codes
      */
-    const ENROLLMENT_STATUS_IDLE = 1;        // Nothing happens
+    const ENROLLMENT_STATUS_IDLE = 1; // Nothing happens
     const ENROLLMENT_STATUS_INITIALIZED = 2; // An enrollment session has begun
-    const ENROLLMENT_STATUS_RETRIEVED = 3;   // The device has retrieved the metadata
-    const ENROLLMENT_STATUS_PROCESSED = 4;   // The device has snet back a secret
-    const ENROLLMENT_STATUS_FINALIZED = 5;   // The application has stored the secret
-    const ENROLLMENT_STATUS_VALIDATED = 6;   // A first succesful authentication was performed
+    const ENROLLMENT_STATUS_RETRIEVED = 3; // The device has retrieved the metadata
+    const ENROLLMENT_STATUS_PROCESSED = 4; // The device has snet back a secret
+    const ENROLLMENT_STATUS_FINALIZED = 5; // The application has stored the secret
+    const ENROLLMENT_STATUS_VALIDATED = 6; // A first succesful authentication was performed
 
     const PREFIX_ENROLLMENT_SECRET = 'enrollsecret';
     const PREFIX_ENROLLMENT = 'enroll';
@@ -156,7 +156,7 @@ 
      * @param array $options
      * @param int $version The protocol version to use (defaults to the latest)
      */
-    public function __construct($options=array(), $version = 2)
+    public function __construct($options = array(), $version = 2)
     {
         $this->_options = $options;
         
@@ -294,7 +294,7 @@ 
 
             $message = new $class($this->_options);
             $message->setId(time());
-            $message->setText("Please authenticate for " . $this->_name);
+            $message->setText("Please authenticate for ".$this->_name);
             $message->setAddress($notificationAddress);
             $message->setCustomProperty('challenge', $this->_getChallengeUrl($sessionKey));
             $message->send();
@@ -362,13 +362,13 @@ 
      * @param String $spIdentifier If SP and IDP are 2 different things, pass the url/identifier of the SP the user is logging into.
      *                             For setups where IDP==SP, just leave this blank.
      */
-    public function startAuthenticationSession($userId="", $sessionId="", $spIdentifier="")
+    public function startAuthenticationSession($userId = "", $sessionId = "", $spIdentifier = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
-        if ($spIdentifier=="") {
+        if ($spIdentifier == "") {
             $spIdentifier = $this->_identifier;
         }
 
@@ -378,11 +378,11 @@ 
         
         $data = array("sessionId"=>$sessionId, "challenge"=>$challenge, "spIdentifier" => $spIdentifier);
         
-        if ($userId!="") {
+        if ($userId != "") {
             $data["userId"] = $userId;
         }
         
-        $this->_stateStorage->setValue(self::PREFIX_CHALLENGE . $sessionKey, $data, self::CHALLENGE_EXPIRE);
+        $this->_stateStorage->setValue(self::PREFIX_CHALLENGE.$sessionKey, $data, self::CHALLENGE_EXPIRE);
        
         return $sessionKey;
     }
@@ -402,9 +402,9 @@ 
      *                           to php session)
      * @return String The enrollment key
      */
-    public function startEnrollmentSession($userId, $displayName, $sessionId="")
+    public function startEnrollmentSession($userId, $displayName, $sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
         $enrollmentKey = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT);
@@ -413,7 +413,7 @@ 
             "displayName" => $displayName,
             "sessionId" => $sessionId
         ];
-        $this->_stateStorage->setValue(self::PREFIX_ENROLLMENT . $enrollmentKey, $data, self::ENROLLMENT_EXPIRE);
+        $this->_stateStorage->setValue(self::PREFIX_ENROLLMENT.$enrollmentKey, $data, self::ENROLLMENT_EXPIRE);
         $this->_setEnrollmentStatus($sessionId, self::ENROLLMENT_STATUS_INITIALIZED);
 
         return $enrollmentKey;
@@ -424,9 +424,9 @@ 
      * @param $sessionId The application's session identifier (defaults
      *                   to php session)
      */
-    public function resetEnrollmentSession($sessionId="")
+    public function resetEnrollmentSession($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id();
         }
 
@@ -471,9 +471,9 @@ 
      *               A first successful authentication was performed 
      *               (todo: currently not used)
      */
-    public function getEnrollmentStatus($sessionId="")
+    public function getEnrollmentStatus($sessionId = "")
     { 
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         $status = $this->_stateStorage->getValue("enrollstatus".$sessionId);
@@ -532,7 +532,7 @@ 
      */
     public function getEnrollmentMetadata($enrollmentKey, $authenticationUrl, $enrollmentUrl)
     {
-        $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+        $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
         if (!is_array($data)) {
             return false;
         }
@@ -550,7 +550,7 @@ 
                                array("identifier" =>$data["userId"],
                                      "displayName"=>$data["displayName"]));
 
-        $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+        $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
 
         $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_RETRIEVED);
         return $metadata;
@@ -571,14 +571,14 @@ 
      */
     public function getEnrollmentSecret($enrollmentKey)
     {
-         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT . $enrollmentKey);
+         $data = $this->_stateStorage->getValue(self::PREFIX_ENROLLMENT.$enrollmentKey);
          $secret = $this->_uniqueSessionKey(self::PREFIX_ENROLLMENT_SECRET);
          $enrollmentData = [
              "userId" => $data["userId"],
              "sessionId" => $data["sessionId"]
          ];
          $this->_stateStorage->setValue(
-             self::PREFIX_ENROLLMENT_SECRET . $secret,
+             self::PREFIX_ENROLLMENT_SECRET.$secret,
              $enrollmentData,
              self::ENROLLMENT_EXPIRE
          );
@@ -652,7 +652,7 @@ 
      */
     public function authenticate($userId, $userSecret, $sessionKey, $response)
     {
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             return self::AUTH_RESULT_INVALID_CHALLENGE;
         }
@@ -665,7 +665,7 @@ 
           $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
-        if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
+        if ($challengeUserId != NULL && ($userId != $challengeUserId)) {
             return self::AUTH_RESULT_INVALID_USERID; // only allowed to authenticate against the user that's authenticated in the first factor
         }
 
@@ -680,7 +680,7 @@ 
             $this->_stateStorage->setValue("authenticated_".$sessionId, $userId, self::LOGIN_EXPIRE);
             
             // Clean up the challenge.
-            $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE . $sessionKey);
+            $this->_stateStorage->unsetValue(self::PREFIX_CHALLENGE.$sessionKey);
             
             return self::AUTH_RESULT_AUTHENTICATED;
         }
@@ -692,9 +692,9 @@ 
      * @param String $sessionId The application's session identifier (defaults
      *                          to the php session).
      */
-    public function logout($sessionId="")
+    public function logout($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         
@@ -729,9 +729,9 @@ 
      * @return mixed An array with user data if a user was logged in or NULL if
      *               no user is logged in.
      */
-    public function getAuthenticatedUser($sessionId="")
+    public function getAuthenticatedUser($sessionId = "")
     {
-        if ($sessionId=="") {
+        if ($sessionId == "") {
             $sessionId = session_id(); 
         }
         
@@ -749,12 +749,12 @@ 
      */
     protected function _getChallengeUrl($sessionKey)
     {                
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             return false;
         }
         
-        $userId   = NULL;
+        $userId = NULL;
         $challenge = $state["challenge"];
         if (isset($state["userId"])) {
             $userId = $state["userId"];
@@ -762,7 +762,7 @@ 
         $spIdentifier = $state["spIdentifier"];
         
         // Last bit is the spIdentifier
-        return $this->_protocolAuth."://".(!is_null($userId)?urlencode($userId).'@':'').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
+        return $this->_protocolAuth."://".(!is_null($userId) ?urlencode($userId).'@' : '').$this->getIdentifier()."/".$sessionKey."/".$challenge."/".urlencode($spIdentifier)."/".$this->_protocolVersion;
     }
 
     /**
@@ -786,7 +786,7 @@ 
     protected function _uniqueSessionKey($prefix)
     {      
         $value = 1;
-        while ($value!=NULL) {
+        while ($value != NULL) {
             $sessionKey = $this->_ocraWrapper->generateSessionKey();
             $value = $this->_stateStorage->getValue($prefix.$sessionKey);
         }

library/tiqr/Tiqr/AutoLoader.php

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 	}
 
 	public static function autoload($className) {
-		if($className === NULL) {
+		if ($className === NULL) {
 			return;
 		}
 
@@ -32,11 +32,11 @@ 
 		$substr5 = substr($className, 0, 5);
 
 		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->tiqrPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+			$file = $self->qrcodePath.DIRECTORY_SEPARATOR.'qrlib.php';
 		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+			$file = $self->zendPath.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 		} else {
 			return;
 		}
@@ -57,34 +57,34 @@ 
 		if (is_dir($tiqr_path)) {
 			$this->tiqrPath = $tiqr_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($tiqr_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($tiqr_dir, TRUE));
 		}
 
 		if (isset($options["phpqrcode.path"])) {
 			$qrcode_dir = $options["phpqrcode.path"];
 			$qrcode_path = realpath($qrcode_dir);
 		} else {
-			$qrcode_dir = dirname(dirname(dirname(__FILE__))) . '/phpqrcode';
+			$qrcode_dir = dirname(dirname(dirname(__FILE__))).'/phpqrcode';
 			$qrcode_path = $qrcode_dir;
 		}
 
 		if (is_dir($qrcode_path)) {
 			$this->qrcodePath = $qrcode_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($qrcode_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($qrcode_dir, TRUE));
 		}
 
 		if (isset($options["zend.path"])) {
 			$zend_dir = $options["zend.path"];
 			$zend_path = realpath($zend_dir);
 		} else {
-			$zend_dir = dirname(dirname(dirname(__FILE__))) . "/zend";
+			$zend_dir = dirname(dirname(dirname(__FILE__)))."/zend";
 			$zend_path = $zend_dir;
 		}
 		if (is_dir($zend_path)) {
 			$this->zendPath = $zend_path;
 		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+			throw new Exception('Directory not found: '.var_export($zend_dir, TRUE));
 		}
 	}