Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/DeviceStorage/TokenExchange.php

Spacing +3 added lines, -3 removed lines

@@ -41,15 +41,15 @@
     {
         $url = $this->_options["url"]."?appId=".$this->_options["appid"];
         
-        $url.= "&notificationToken=".$notificationToken;
+        $url .= "&notificationToken=".$notificationToken;
         
         $output = file_get_contents($url);
-        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/DeviceStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
      * the Tiqr_DeviceStorage factory will call this for you.
      * @param array $options The options for the s
      */
-    public function __construct($options=array(), LoggerInterface $logger)
+    public function __construct($options = array(), LoggerInterface $logger)
     {
         $this->_options = $options;
         $this->logger = $logger;

library/tiqr/Tiqr/StateStorage/Memcache.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
      * The default configuration
      */
     const DEFAULT_HOST = '127.0.0.1';
-    const DEFAULT_PORT =  11211;
+    const DEFAULT_PORT = 11211;
     
     /**
      * Get the prefix to use for all keys in memcache.
@@ -102,7 +102,7 @@ 
      * (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)
     {  
         $key = $this->_getKeyPrefix().$key;
 

library/tiqr/Tiqr/UserStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @return Tiqr_UserStorage_Encryption_Interface
      */
-    public static function getEncryption(LoggerInterface $logger, $type="dummy", $options=array())
+    public static function getEncryption(LoggerInterface $logger, $type = "dummy", $options = array())
     {
         $logger->info(sprintf('Using %s as UserStorage encryption type', $type));
         switch ($type) {

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';
@@ -162,7 +162,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;
@@ -306,7 +306,7 @@ 
             $this->logger->info(sprintf('Creating and sending a %s push notification', $notificationType));
             $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();
@@ -375,13 +375,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;
         }
 
@@ -391,11 +391,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;
     }
@@ -415,9 +415,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);
@@ -426,7 +426,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;
@@ -437,9 +437,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();
         }
 
@@ -484,9 +484,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);
@@ -545,7 +545,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;
@@ -564,7 +564,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;
@@ -585,14 +585,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
          );
@@ -642,7 +642,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.'
              );
          }
@@ -672,7 +672,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;
@@ -686,7 +686,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'
             );
@@ -704,7 +704,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;
         }
@@ -717,9 +717,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(); 
         }
         
@@ -754,9 +754,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(); 
         }
@@ -775,7 +775,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'
@@ -783,7 +783,7 @@ 
             return false;
         }
         
-        $userId   = NULL;
+        $userId = NULL;
         $challenge = $state["challenge"];
         if (isset($state["userId"])) {
             $userId = $state["userId"];
@@ -791,7 +791,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;
     }
 
     /**
@@ -815,7 +815,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/UserStorage/FileTrait.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
         if ($data === NULL) {
             if ($failIfNotFound) {
-                throw new Exception('Error loading data for user: ' . var_export($userId, TRUE));
+                throw new Exception('Error loading data for user: '.var_export($userId, TRUE));
             } else {
                 $this->logger->error('Error loading data for user from user storage (file storage)');
                 return false;
@@ -47,7 +47,7 @@ 
      */
     public function getPath()
     {
-        if (substr($this->path, -1)!="/") return $this->path."/";
+        if (substr($this->path, -1) != "/") return $this->path."/";
         return $this->path;
     }
 }

library/tiqr/Tiqr/DeviceStorage.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @param LoggerInterface $logger
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage($type="dummy", $options=array(), LoggerInterface $logger)
+    public static function getStorage($type = "dummy", $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "dummy":

library/tiqr/Tiqr/UserStorage.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @throws Exception An exception if an unknown user storage is requested.
      */
-    public static function getStorage($type="file", $options=array(), LoggerInterface $logger)
+    public static function getStorage($type = "file", $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "file":

library/tiqr/Tiqr/OcraService.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @return Tiqr_OcraService_Interface
      * @throws Exception An exception if an unknown orca service type is requested.
      */
-    public static function getOcraService($type="tiqr", $options=array(), LoggerInterface $logger)
+    public static function getOcraService($type = "tiqr", $options = array(), LoggerInterface $logger)
     {
         switch ($type) {
             case "tiqr":