Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/StateStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * a state storage instance of a certain type.
      * @param array $options An array of options for the state storage
      */
-    public function __construct($options=array(), LoggerInterface $logger)
+    public function __construct($options = array(), LoggerInterface $logger)
     {
         $this->logger = $logger;
         $this->_options = $options;

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
     private function getUserSecret($userId)
     {
         $sth = $this->handle->prepare("SELECT secret FROM ".$this->tableName." WHERE userid = ?");
-        if($sth->execute(array($userId))) {
+        if ($sth->execute(array($userId))) {
             $secret = $sth->fetchColumn();
             if ($secret !== false) {
                 return $secret;
@@ -104,7 +104,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tableName." (secret,userid) VALUES (?,?)");
         }
-        $result = $sth->execute(array($secret,$userId));
+        $result = $sth->execute(array($secret, $userId));
         if (!$result) {
             throw new ReadWriteException('Unable to persist user secret in user secret storage (PDO)');
         }

library/tiqr/Tiqr/UserStorage/Pdo.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
         parent::__construct($config, $logger);
         $this->tablename = isset($config['table']) ? $config['table'] : 'tiqruser';
         try {
-            $this->handle = new PDO($config['dsn'],$config['username'],$config['password']);
+            $this->handle = new PDO($config['dsn'], $config['username'], $config['password']);
         } catch (PDOException $e) {
             $this->logger->error(
                 sprintf('Unable to establish a PDO connection. Error message from PDO: %s', $e->getMessage())
@@ -61,7 +61,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (displayname,userid) VALUES (?,?)");
         }
-        if ($sth->execute(array($displayName,$userId))){
+        if ($sth->execute(array($displayName, $userId))) {
             return $this->userExists($userId);
         }
         throw new ReadWriteException('The user could not be saved in the user storage (PDO)');
@@ -106,7 +106,7 @@ 
     public function setNotificationType($userId, $type)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationtype = ? WHERE userid = ?");
-        if (!$sth->execute(array($type,$userId))) {
+        if (!$sth->execute(array($type, $userId))) {
             throw new ReadWriteException('Unable to set the notification type in user storage for a given user (PDO)');
         }
     }
@@ -123,7 +123,7 @@ 
     public function setNotificationAddress($userId, $address)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationaddress = ?  WHERE userid = ?");
-        if (!$sth->execute(array($address,$userId))) {
+        if (!$sth->execute(array($address, $userId))) {
             throw new ReadWriteException('Unable to set the notification address in user storage for a given user (PDO)');
 
         }
@@ -141,7 +141,7 @@ 
     public function setLoginAttempts($userId, $amount)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET loginattempts = ? WHERE userid = ?");
-        if (!$sth->execute(array($amount,$userId))) {
+        if (!$sth->execute(array($amount, $userId))) {
             throw new ReadWriteException('Unable to set login attempts in user storage for a given user (PDO)');
         }
     }
@@ -174,7 +174,7 @@ 
     
     public function setTemporaryBlockAttempts($userId, $amount) {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblockattempts = ? WHERE userid = ?");
-        if (!$sth->execute(array($amount,$userId))) {
+        if (!$sth->execute(array($amount, $userId))) {
             throw new ReadWriteException('Unable to set temp login attempts in user storage for a given user (PDO)');
         }
     }
@@ -199,7 +199,7 @@ 
     public function setTemporaryBlockTimestamp($userId, $timestamp)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblocktimestamp = ? WHERE userid = ?");
-        if (!$sth->execute(array($timestamp,$userId))) {
+        if (!$sth->execute(array($timestamp, $userId))) {
             throw new ReadWriteException('Unable to update temp lock timestamp in user storage for a given user (PDO)');
         }
     }

library/tiqr/Tiqr/StateStorage/StateStorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * @param int $expire The expiration (in seconds) of the data
      * @throws ReadWriteException
      */
-    public function setValue($key, $value, $expire=0);
+    public function setValue($key, $value, $expire = 0);
 
     /**
      * Remove a value from the state storage

library/tiqr/Tiqr/StateStorage/File.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
         $this->path = $path;
     }
 
-    public function setValue($key, $value, $expire=0)
+    public function setValue($key, $value, $expire = 0)
     {   
         $envelope = array("expire"=>$expire,
                           "createdAt"=>time(),
@@ -98,8 +98,8 @@ 
 
     private 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/StateStorage/Pdo.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
     private function cleanExpired() {
         $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `expire` < ? AND NOT `expire` = 0");
         $result = $sth->execute(array(time()));
-        if (!$result || $sth->rowCount() === 0){
+        if (!$result || $sth->rowCount() === 0) {
             // No exception is thrown here. The application can continue with expired state for now.
             $this->logger->error('Unable to remove expired keys from the pdo state storage');
         }
@@ -84,9 +84,9 @@ 
      * (non-PHPdoc)
      * @see library/tiqr/Tiqr/StateStorage/Tiqr_StateStorage_Abstract::setValue()
      */
-    public function setValue($key, $value, $expire=0)
+    public function setValue($key, $value, $expire = 0)
     {
-        if (((float) rand() /(float) getrandmax()) < $this->cleanupProbability) {
+        if (((float) rand() / (float) getrandmax()) < $this->cleanupProbability) {
             $this->cleanExpired();
         }
         if ($this->keyExists($key)) {
@@ -96,9 +96,9 @@ 
         }
         // $expire == 0 means never expire
         if ($expire != 0) {
-            $expire+=time();    // Store unix timestamp after which the expires
+            $expire += time(); // Store unix timestamp after which the expires
         }
-        if (!$sth->execute(array(serialize($value),$expire,$key))) {
+        if (!$sth->execute(array(serialize($value), $expire, $key))) {
             throw new ReadWriteException(sprintf('Unable to store "%s" state to the PDO', $key));
         }
     }
@@ -110,7 +110,7 @@ 
     public function unsetValue($key)
     {
         if ($this->keyExists($key)) {
-            $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `key` = ?");
+            $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `key` = ?");
             $result = $sth->execute(array($key));
             if (!$result || $sth->rowCount() === 0) {
                 throw new ReadWriteException(
@@ -137,7 +137,7 @@ 
                 $this->logger->error('Unable to prepare the get key statement');
                 return NULL;
             }
-            if (false === $sth->execute(array($key, time())) ) {
+            if (false === $sth->execute(array($key, time()))) {
                 $this->logger->error('Unable to get key from the pdo state storage');
                 return NULL;
             }

library/tiqr/Tiqr/AutoLoader.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	}
 
 	public static function autoload($className) {
-		if($className === NULL) {
+		if ($className === NULL) {
 			return;
 		}
 
@@ -32,13 +32,13 @@ 
 		$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';
         } elseif ($className === 'ReadWriteException') {
-            $file = $self->tiqrPath . DIRECTORY_SEPARATOR . 'Tiqr/Exception/ReadWriteException.php';
+            $file = $self->tiqrPath.DIRECTORY_SEPARATOR.'Tiqr/Exception/ReadWriteException.php';
 		} else {
 			return;
 		}
@@ -59,34 +59,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));
 		}
 	}
 

library/tiqr/Tiqr/Service.php

Spacing +35 added lines, -35 removed lines

@@ -74,12 +74,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';
@@ -158,7 +158,7 @@ 
      * @param array $options
      * @param int $version The protocol version to use (defaults to the latest)
      */
-    public function __construct(LoggerInterface $logger, $options=array(), $version = 2)
+    public function __construct(LoggerInterface $logger, $options = array(), $version = 2)
     {
         $this->_options = $options;
         $this->logger = $logger;
@@ -311,7 +311,7 @@ 
 
             $this->logger->info(sprintf('Creating and sending a %s push notification', $notificationType));
             $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();
@@ -380,13 +380,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;
         }
 
@@ -396,11 +396,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;
     }
@@ -420,9 +420,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);
@@ -431,7 +431,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;
@@ -442,9 +442,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();
         }
 
@@ -489,9 +489,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);
@@ -550,7 +550,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)) {
             $this->logger->error('Unable to find enrollment metadata in state storage');
             return false;
@@ -569,7 +569,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;
@@ -590,14 +590,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
          );
@@ -647,7 +647,7 @@ 
              $this->_stateStorage->unsetValue(self::PREFIX_ENROLLMENT_SECRET.$enrollmentSecret);
          } else {
              $this->logger->error(
-                 'Enrollment status is not finalized, enrollmentsecret was not found in state storage. ' .
+                 'Enrollment status is not finalized, enrollmentsecret was not found in state storage. '.
                  'Warning! the method will still return "true" as a result.'
              );
          }
@@ -677,7 +677,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)) {
             $this->logger->info('The auth challenge could not be found in the state storage');
             return self::AUTH_RESULT_INVALID_CHALLENGE;
@@ -691,7 +691,7 @@ 
           $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
-        if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
+        if ($challengeUserId != NULL && ($userId != $challengeUserId)) {
             $this->logger->error(
                 'Authentication failed: the first factor user id does not match with that of the second factor'
             );
@@ -709,7 +709,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);
             $this->logger->info('Authentication succeeded');
             return self::AUTH_RESULT_AUTHENTICATED;
         }
@@ -722,9 +722,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(); 
         }
         
@@ -759,9 +759,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 == "") {
             $this->logger->debug('Using the PHP session id, as no session id was provided');
             $sessionId = session_id(); 
         }
@@ -780,7 +780,7 @@ 
      */
     protected function _getChallengeUrl($sessionKey)
     {                
-        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE . $sessionKey);
+        $state = $this->_stateStorage->getValue(self::PREFIX_CHALLENGE.$sessionKey);
         if (is_null($state)) {
             $this->logger->error(
                 'Unable find an existing challenge url in the state storage based on the existing session key'
@@ -788,7 +788,7 @@ 
             return false;
         }
         
-        $userId   = NULL;
+        $userId = NULL;
         $challenge = $state["challenge"];
         if (isset($state["userId"])) {
             $userId = $state["userId"];
@@ -796,7 +796,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;
     }
 
     /**
@@ -820,7 +820,7 @@ 
     protected function _uniqueSessionKey($prefix)
     {      
         $value = 1;
-        while ($value!=NULL) {
+        while ($value != NULL) {
             $sessionKey = $this->_ocraWrapper->generateSessionKey();
             $value = $this->_stateStorage->getValue($prefix.$sessionKey);
         }