Tiqr / tiqr-server-libphp

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

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
      *                       config options per type.
      * @throws Exception An exception if an unknown storage is requested.
      */
-    public static function getStorage($type="dummy", $options=array())
+    public static function getStorage($type = "dummy", $options = array())
     {
         switch ($type) {
             case "dummy":
@@ -57,7 +57,7 @@ 
             default:
                 $instance = NULL;
         }
-        if ($instance!=NULL) {
+        if ($instance != NULL) {
             $instance->init();
             return $instance;
         }

library/tiqr/Tiqr/UserSecretStorage.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      *
      * @return Tiqr_UserSecretStorage_Interface
      */
-    public static function getSecretStorage($type="file", $options=array())
+    public static function getSecretStorage($type = "file", $options = array())
     {
         switch ($type) {
             case "file":
@@ -59,7 +59,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/OATH/OCRAWrapper_v1.php

Indentation +2 added lines, -2 removed lines

@@ -90,9 +90,9 @@
      */
     public function verifyResponse($response, $secret, $challenge, $sessionKey)
     {
-         $expected = $this->calculateResponse($secret, $challenge, $sessionKey);
+            $expected = $this->calculateResponse($secret, $challenge, $sessionKey);
 
-         return ($expected == $response);
+            return ($expected == $response);
     }
 
     /**

Braces +3 added lines, -1 removed lines

@@ -107,7 +107,9 @@
     {
         // find the :QN10, -QN10, QH10 etc. bit
         $pos = stripos($ocraSuite, ":q");
-        if ($pos===false) $pos = stripos($ocraSuite, "-q");
+        if ($pos===false) {
+            $pos = stripos($ocraSuite, "-q");
+        }
         if ($pos===false) {
             // No challenge config specified. Since we only support challenge based OCRA, we fallback to default 10 digit hexadecimal.
             return array("format"=>"H", "length"=>10);

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
      */
     public function generateSessionKey() 
     {
-        return bin2hex( Tiqr_Random::randomBytes(self::SESSIONKEY_SIZE) );
+        return bin2hex(Tiqr_Random::randomBytes(self::SESSIONKEY_SIZE));
     }
     
     /**
@@ -107,19 +107,19 @@ 
     {
         // find the :QN10, -QN10, QH10 etc. bit
         $pos = stripos($ocraSuite, ":q");
-        if ($pos===false) $pos = stripos($ocraSuite, "-q");
-        if ($pos===false) {
+        if ($pos === false) $pos = stripos($ocraSuite, "-q");
+        if ($pos === false) {
             // No challenge config specified. Since we only support challenge based OCRA, we fallback to default 10 digit hexadecimal.
             return array("format"=>"H", "length"=>10);
         }
-        $format = substr($ocraSuite, $pos+2, 1);
+        $format = substr($ocraSuite, $pos + 2, 1);
         if (!in_array($format, array("N", "A", "H"))) {
             $format = "H";
         }
         
-        $length = (int)substr($ocraSuite, $pos+3, 2);
+        $length = (int) substr($ocraSuite, $pos + 3, 2);
                 
-        if ($length<=0) {
+        if ($length <= 0) {
             $length = 10;
         }
         
@@ -190,7 +190,7 @@ 
      */
     protected function _calculateResponse($ocraSuite, $secret, $challenge, $sessionKey)
     {       
-        if (strpos(strtolower($ocraSuite), "qn")!==false) {
+        if (strpos(strtolower($ocraSuite), "qn") !== false) {
             
             // challenge is decimal, but generateOcra always wants it in hex.
             $challenge = dechex($challenge);