Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/UserStorage/Pdo.php

Spacing +7 added lines, -7 removed lines

@@ -44,7 +44,7 @@ 
         parent::__construct($config, $secretconfig);
         $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) {
             return false;
         }
@@ -57,7 +57,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (displayname,userid) VALUES (?,?)");
         }
-        $sth->execute(array($displayName,$userId));
+        $sth->execute(array($displayName, $userId));
         return $this->userExists($userId);
     }
     
@@ -85,7 +85,7 @@ 
     public function setNotificationType($userId, $type)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationtype = ? WHERE userid = ?");
-        $sth->execute(array($type,$userId));
+        $sth->execute(array($type, $userId));
     }
     
     public function getNotificationAddress($userId)
@@ -98,7 +98,7 @@ 
     public function setNotificationAddress($userId, $address)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET notificationaddress = ?  WHERE userid = ?");
-        $sth->execute(array($address,$userId));
+        $sth->execute(array($address, $userId));
     }
     
     public function getLoginAttempts($userId)
@@ -111,7 +111,7 @@ 
     public function setLoginAttempts($userId, $amount)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET loginattempts = ? WHERE userid = ?");
-        $sth->execute(array($amount,$userId));
+        $sth->execute(array($amount, $userId));
     }
     
     public function isBlocked($userId, $duration)
@@ -142,7 +142,7 @@ 
     
     public function setTemporaryBlockAttempts($userId, $amount) {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblockattempts = ? WHERE userid = ?");
-        $sth->execute(array($amount,$userId));
+        $sth->execute(array($amount, $userId));
     }
     
     public function getTemporaryBlockAttempts($userId) {
@@ -157,7 +157,7 @@ 
     public function setTemporaryBlockTimestamp($userId, $timestamp)
     {
         $sth = $this->handle->prepare("UPDATE ".$this->tablename." SET tmpblocktimestamp = ? WHERE userid = ?");
-        $sth->execute(array($timestamp,$userId));
+        $sth->execute(array($timestamp, $userId));
     }
             
     public function getTemporaryBlockTimestamp($userId)

library/tiqr/Tiqr/UserStorage/GenericStore.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     public function createUser($userId, $displayName) 
     {
         $user = array("userId"=>$userId,
-                      "displayName"=>$displayName);
+                        "displayName"=>$displayName);
         return $this->_saveUser($userId, $user);
     }
 
@@ -77,7 +77,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationType"])) {
-               return $data["notificationType"];
+                return $data["notificationType"];
             }
         }
         return NULL;
@@ -102,7 +102,7 @@ 
     {
         if ($data = $this->_loadUser($userId)) {
             if (isset($data["notificationAddress"])) {
-               return $data["notificationAddress"];
+                return $data["notificationAddress"];
             }
         }
         return NULL;

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     public function userExists($userId)
     {
         $user = $this->_loadUser($userId, FALSE);
-        return (is_array($user)||is_object($user)); 
+        return (is_array($user) || is_object($user)); 
     }
 
     /**
@@ -153,7 +153,7 @@ 
         if ($data = $this->_loadUser($userId)) {
             $timestamp = $this->getTemporaryBlockTimestamp($userId);
             // if not blocked or block is expired, return false
-            if (!isset($data["blocked"]) || $data["blocked"]==false || (false !== $timestamp && false != $duration && (strtotime($timestamp) + $duration * 60) < time())) {
+            if (!isset($data["blocked"]) || $data["blocked"] == false || (false !== $timestamp && false != $duration && (strtotime($timestamp) + $duration * 60) < time())) {
                 return false;
             }
         }

library/tiqr/Tiqr/UserStorage/Encryption.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      *
      * @return Tiqr_UserStorage_Encryption_Interface
      */
-    public static function getEncryption($type="dummy", $options=array())
+    public static function getEncryption($type = "dummy", $options = array())
     {
         switch ($type) {
             case "dummy":

library/tiqr/Tiqr/UserStorage/File.php

Indentation +2 added lines, -2 removed lines

@@ -94,8 +94,8 @@
      */
     public function getPath()
     {
-         if (substr($this->_path, -1)!="/") return $this->_path."/";
-         return $this->_path;
+            if (substr($this->_path, -1)!="/") return $this->_path."/";
+            return $this->_path;
     }
     
 }

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,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 {
                 return false;
             }
@@ -94,7 +94,7 @@ 
      */
     public function getPath()
     {
-         if (substr($this->_path, -1)!="/") return $this->_path."/";
+         if (substr($this->_path, -1) != "/") return $this->_path."/";
          return $this->_path;
     }
     

Braces +3 added lines, -1 removed lines

@@ -94,7 +94,9 @@
      */
     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/OcraService.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      *
      * @return Tiqr_OcraService_Interface
      */
-    public static function getOcraService($type="tiqr", $options=array())
+    public static function getOcraService($type = "tiqr", $options = array())
     {
         switch ($type) {
             case "tiqr":
@@ -51,7 +51,7 @@ 
                 if (!isset($type)) {
                     throw new Exception('Class name not set');
                 } elseif (!class_exists($type)) {
-                    throw new Exception('Class not found: ' . var_export($type, TRUE));
+                    throw new Exception('Class not found: '.var_export($type, TRUE));
                 }
                 $instance = new $type($options);
         }

library/tiqr/Tiqr/StateStorage.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
      *                       options per type.
      * @throws Exception If an unknown type is requested.
      */
-    public static function getStorage($type="file", $options=array())
+    public static function getStorage($type = "file", $options = array())
     {
         switch ($type) {
             case "file":
@@ -62,9 +62,9 @@ 
                 if (!isset($type)) {
                     throw new Exception('Class name not set');
                 } elseif (!class_exists($type)) {
-                    throw new Exception('Class not found: ' . var_export($type, TRUE));
+                    throw new Exception('Class not found: '.var_export($type, TRUE));
                 } elseif (!is_subclass_of($type, 'Tiqr_StateStorage_Abstract')) {
-                    throw new Exception('Class ' . $type . ' not subclass of Tiqr_StateStorage_Abstract');
+                    throw new Exception('Class '.$type.' not subclass of Tiqr_StateStorage_Abstract');
                 }
                 $instance = new $type($options);
         }

library/tiqr/Tiqr/DeviceStorage/Abstract.php

Spacing +1 added lines, -1 removed lines

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

library/tiqr/Tiqr/DeviceStorage/TokenExchange.php

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@
     {
         $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) return false;
-        if (stripos($output, "error")!==false) return false;
+        if (stripos($output, "not found") !== false) return false;
+        if (stripos($output, "error") !== false) return false;
         return trim($output);
     }
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -44,8 +44,12 @@
         $url.= "&notificationToken=".$notificationToken;
         
         $output = file_get_contents($url);
-        if (stripos($output, "not found")!==false) return false;
-        if (stripos($output, "error")!==false) return false;
+        if (stripos($output, "not found")!==false) {
+            return false;
+        }
+        if (stripos($output, "error")!==false) {
+            return false;
+        }
         return trim($output);
     }
 }
\ No newline at end of file

library/tiqr/Tiqr/UserSecretStorage/Pdo.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     {
         $this->tablename = isset($config['table']) ? $config['table'] : 'tiqrusersecret';
         try {
-            $this->handle = new PDO($config['dsn'],$config['username'],$config['password']);
+            $this->handle = new PDO($config['dsn'], $config['username'], $config['password']);
         } catch (PDOException $e) {
             return false;
         }
@@ -73,7 +73,7 @@ 
         } else {
             $sth = $this->handle->prepare("INSERT INTO ".$this->tablename." (secret,userid) VALUES (?,?)");
         }
-        $sth->execute(array($secret,$userId));
+        $sth->execute(array($secret, $userId));
     }
 
     public static function log($message)