Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/StateStorage/Pdo.php

Spacing +10 added lines, -10 removed lines

@@ -117,9 +117,9 @@ 
      */
     private function cleanExpired(): void {
         try {
-            $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `expire` < ? AND NOT `expire` = 0");
+            $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `expire` < ? AND NOT `expire` = 0");
             $sth->execute(array(time()));
-            $deletedRows=$sth->rowCount();
+            $deletedRows = $sth->rowCount();
             $this->logger->notice(
                 sprintf("Deleted %d expired keys", $deletedRows)
             );
@@ -135,12 +135,12 @@ 
     /**
      * @see Tiqr_StateStorage_StateStorageInterface::setValue()
      */
-    public function setValue(string $key, $value, int $expire=0): void
+    public function setValue(string $key, $value, int $expire = 0): void
     {
         if (empty($key)) {
             throw new InvalidArgumentException('Empty key not allowed');
         }
-        if (((float) rand() /(float) getrandmax()) < $this->cleanupProbability) {
+        if (((float) rand() / (float) getrandmax()) < $this->cleanupProbability) {
             $this->cleanExpired();
         }
         // REPLACE INTO is mysql dialect. Supported by sqlite as well.
@@ -153,7 +153,7 @@ 
 
         // $expire == 0 means never expire
         if ($expire != 0) {
-            $expire+=time();    // Store unix timestamp after which the key expires
+            $expire += time(); // Store unix timestamp after which the key expires
         }
         try {
             $sth->execute(array(serialize($value), $expire, $key));
@@ -176,7 +176,7 @@ 
             throw new InvalidArgumentException('Empty key not allowed');
         }
         try {
-            $sth = $this->handle->prepare("DELETE FROM " . $this->tablename . " WHERE `key` = ?");
+            $sth = $this->handle->prepare("DELETE FROM ".$this->tablename." WHERE `key` = ?");
             $sth->execute(array($key));
         }
         catch (Exception $e) {
@@ -206,7 +206,7 @@ 
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT `value` FROM ' . $this->tablename . ' WHERE `key` = ? AND (`expire` >= ? OR `expire` = 0)');
+            $sth = $this->handle->prepare('SELECT `value` FROM '.$this->tablename.' WHERE `key` = ? AND (`expire` >= ? OR `expire` = 0)');
             $sth->execute(array($key, time()));
         }
         catch (Exception $e) {
@@ -220,9 +220,9 @@ 
         if (false === $result) {
             // Occurs normally
             $this->logger->info(sprintf('getValue: Key "%s" not found in PDO StateStorage', $key));
-            return NULL;    // Key not found
+            return NULL; // Key not found
         }
-        $result=unserialize($result, array('allowed_classes' => false));
+        $result = unserialize($result, array('allowed_classes' => false));
         if (false === $result) {
             throw new RuntimeException(sprintf('getValue: unserialize error for key "%s" in PDO StateStorage', $key));
         }
@@ -237,7 +237,7 @@ 
     {
         try {
             // Retrieve a random row from the table, this checks that the table exists and is readable
-            $sth = $this->handle->prepare('SELECT `value`, `key`, `expire` FROM ' . $this->tablename . ' LIMIT 1');
+            $sth = $this->handle->prepare('SELECT `value`, `key`, `expire` FROM '.$this->tablename.' LIMIT 1');
             $sth->execute();
         }
         catch (Exception $e) {

library/tiqr/Tiqr/StateStorage/Memcache.php

Spacing +4 added lines, -4 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.
@@ -106,7 +106,7 @@ 
     /**
      * @see Tiqr_StateStorage_StateStorageInterface::setValue()
      */
-    public function setValue(string $key, $value, int $expire=0): void
+    public function setValue(string $key, $value, int $expire = 0): void
     {
         if (empty($key)) {
             throw new InvalidArgumentException('Empty key not allowed');
@@ -160,7 +160,7 @@ 
         if ($result === false) {
             // Memcache interface does not provide error information, either the key does not exist or
             // there was an error communicating with the memcache
-            $this->logger->info( sprintf('Unable to get key "%s" from memcache StateStorage', $key) );
+            $this->logger->info(sprintf('Unable to get key "%s" from memcache StateStorage', $key));
             return null;
         }
         return $result;
@@ -176,7 +176,7 @@ 
             $key = bin2hex(random_bytes(16));
             $this->setValue($key, 'healthcheck', 10);
         } catch (Exception $e) {
-            $statusMessage = 'Unable to store key in memcache: ' . $e->getMessage();
+            $statusMessage = 'Unable to store key in memcache: '.$e->getMessage();
             return false;
         }
 

library/tiqr/Tiqr/StateStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -71,6 +71,6 @@
      */
     public function healthCheck(string &$statusMessage = ''): bool
     {
-        return true;    // Health check is always successful when not implemented
+        return true; // Health check is always successful when not implemented
     }
 }

library/tiqr/Tiqr/UserStorage/Pdo.php

Spacing +17 added lines, -17 removed lines

@@ -98,21 +98,21 @@ 
      */
     private function _getStringValue(string $columnName, string $userId): string
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' FROM '.$this->tablename.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return '';  // Value unset
+                return ''; // Value unset
             }
             if (!is_string($res)) {
                 $this->logger->error(sprintf('Expected string type while getting "%s" for user "%s"', $columnName, $userId));
@@ -136,28 +136,28 @@ 
      */
     private function _getIntValue(string $columnName, string $userId): int
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
 
         try {
-            $sth = $this->handle->prepare('SELECT ' . $columnName . ' FROM ' . $this->tablename . ' WHERE userid = ?');
+            $sth = $this->handle->prepare('SELECT '.$columnName.' FROM '.$this->tablename.' WHERE userid = ?');
             $sth->execute(array($userId));
-            $res=$sth->fetchColumn();
+            $res = $sth->fetchColumn();
             if ($res === false) {
                 // No result
                 $this->logger->error(sprintf('No result getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('User not found');
             }
             if ($res === NULL) {
-                return 0;  // Value unset
+                return 0; // Value unset
             }
             // Return type for integers depends on the PDO driver, can be string
             if (!is_numeric($res)) {
                 $this->logger->error(sprintf('Expected int type while getting "%s" for user "%s"', $columnName, $userId));
                 throw new RuntimeException('Unexpected return type');
             }
-            return (int)$res;
+            return (int) $res;
         }
         catch (Exception $e) {
             $this->logger->error('PDO error getting user', array('exception' => $e, 'userId' => $userId, 'columnName'=>$columnName));
@@ -174,11 +174,11 @@ 
      */
     private function _setStringValue(string $columnName, string $userId, string $value): void
     {
-        if ( !in_array($columnName, $this->_allowedStringColumns) ) {
+        if (!in_array($columnName, $this->_allowedStringColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -202,11 +202,11 @@ 
      */
     private function _setIntValue(string $columnName, string $userId, int $value): void
     {
-        if ( !in_array($columnName, $this->_allowedIntColumns) ) {
+        if (!in_array($columnName, $this->_allowedIntColumns)) {
             throw new InvalidArgumentException('Unsupported column name');
         }
         try {
-            $sth = $this->handle->prepare('UPDATE ' . $this->tablename . ' SET ' . $columnName . ' = ? WHERE userid = ?');
+            $sth = $this->handle->prepare('UPDATE '.$this->tablename.' SET '.$columnName.' = ? WHERE userid = ?');
             $sth->execute(array($value, $userId));
             if ($sth->rowCount() == 0) {
                 // Required for mysql which only returns the number of rows that were actually updated
@@ -318,17 +318,17 @@ 
     {
         // Check for blocked
         if ($this->_getIntValue('blocked', $userId) != 0) {
-            return true;   // Blocked
+            return true; // Blocked
         }
 
         if (0 == $tempBlockDuration) {
-            return false;   // No check for temporary block
+            return false; // No check for temporary block
         }
 
         // Check for temporary block
         $timestamp = $this->getTemporaryBlockTimestamp($userId);
         // if no temporary block timestamp is set or if the temporary block is expired, return false
-        if ( 0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
+        if (0 == $timestamp || ($timestamp + $tempBlockDuration * 60) < time()) {
             return false;
         }
         return true;
@@ -384,7 +384,7 @@ 
             $sth->execute();
         }
         catch (Exception $e) {
-            $statusMessage = "Error reading from UserStorage_PDO: ". $e->getMessage();
+            $statusMessage = "Error reading from UserStorage_PDO: ".$e->getMessage();
             return false;
         }
 

library/tiqr/Tiqr/UserStorage/FileTrait.php

Spacing +1 added lines, -1 removed lines

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

library/tiqr/Tiqr/UserSecretStorage/File.php

Spacing +1 added lines, -1 removed lines

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

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +6 added lines, -6 removed lines

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

library/tiqr/Tiqr/UserSecretStorage/Abstract.php

Spacing +4 added lines, -4 removed lines

@@ -57,13 +57,13 @@ 
         if ($prefix === $this->encryption->get_type()) {
             // Decrypt the secret if it is prefixed with the current encryption type
             // Remove the encryption type prefix before decrypting
-            return $this->encryption->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->encryption->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         // Check the decryption array for the encryption type to see if there is an encryption
         // instance defined for it. If so, use that to decrypt the secret.
         if (isset($this->decryption[$prefix])) {
-            return $this->decryption[$prefix]->decrypt( substr($encryptedSecret, $pos+1) );
+            return $this->decryption[$prefix]->decrypt(substr($encryptedSecret, $pos + 1));
         }
 
         $this->logger->error("Secret for user '$userId' is encrypted with unsupported encryption type '$prefix'");
@@ -80,7 +80,7 @@ 
     {
         $encryptedSecret = $this->encryption->encrypt($secret);
         // Prefix the user secret with the encryption type
-        $this->setUserSecret($userId, $this->encryption->get_type() . ':' . $encryptedSecret);
+        $this->setUserSecret($userId, $this->encryption->get_type().':'.$encryptedSecret);
     }
 
     /**
@@ -88,6 +88,6 @@ 
      */
     public function healthCheck(string &$statusMessage = ''): bool
     {
-        return true;    // Health check is always successful when not implemented
+        return true; // Health check is always successful when not implemented
     }
 }

library/tiqr/Tiqr/UserStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

@@ -71,6 +71,6 @@
      */
     public function healthCheck(string &$statusMessage = ''): bool
     {
-        return true;    // Health check is always successful when not implemented
+        return true; // Health check is always successful when not implemented
     }
 }