Tiqr / tiqr-server-libphp

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/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

Indentation +96 added lines, -96 removed lines

@@ -1,102 +1,102 @@
 <?php
 class Tiqr_AutoLoader {
 
-	protected static $instance;
-
-	protected $tiqrPath;
-	protected $qrcodePath;
-	protected $zendPath;
-
-	protected function __construct($options) {
-		if ($options !== NULL) {
-			$this->setOptions($options);
-		}
-		spl_autoload_register(array(__CLASS__, 'autoload'));
-	}
-
-	public static function getInstance($options = NULL) {
-		if (null === self::$instance) {
-			self::$instance = new self($options);
-		}
-
-		return self::$instance;
-	}
-
-	public static function autoload($className) {
-		if($className === NULL) {
-			return;
-		}
-
-		$self = self::getInstance();
-
-		$substr5 = substr($className, 0, 5);
-
-		if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
-			$file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-		} elseif ($className === 'QRcode') {
-			$file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
-		} elseif ($substr5 === 'Zend_') {
-			$file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+    protected static $instance;
+
+    protected $tiqrPath;
+    protected $qrcodePath;
+    protected $zendPath;
+
+    protected function __construct($options) {
+        if ($options !== NULL) {
+            $this->setOptions($options);
+        }
+        spl_autoload_register(array(__CLASS__, 'autoload'));
+    }
+
+    public static function getInstance($options = NULL) {
+        if (null === self::$instance) {
+            self::$instance = new self($options);
+        }
+
+        return self::$instance;
+    }
+
+    public static function autoload($className) {
+        if($className === NULL) {
+            return;
+        }
+
+        $self = self::getInstance();
+
+        $substr5 = substr($className, 0, 5);
+
+        if ($substr5 === 'Tiqr_' || $substr5 === 'OATH_') {
+            $file = $self->tiqrPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        } elseif ($className === 'QRcode') {
+            $file = $self->qrcodePath . DIRECTORY_SEPARATOR . 'qrlib.php';
+        } elseif ($substr5 === 'Zend_') {
+            $file = $self->zendPath . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
         } elseif ($className === 'ReadWriteException') {
             $file = $self->tiqrPath . DIRECTORY_SEPARATOR . 'Tiqr/Exception/ReadWriteException.php';
-		} else {
-			return;
-		}
-
-		if (file_exists($file)) {
-			require_once($file);
-		}
-	}
-
-	public function setOptions($options) {
-		if (isset($options["tiqr.path"])) {
-			$tiqr_dir = $options["tiqr.path"];
-			$tiqr_path = realpath($tiqr_dir);
-		} else {
-			$tiqr_dir = dirname(__FILE__);
-			$tiqr_path = $tiqr_dir;
-		}
-		if (is_dir($tiqr_path)) {
-			$this->tiqrPath = $tiqr_path;
-		} else {
-			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_path = $qrcode_dir;
-		}
-
-		if (is_dir($qrcode_path)) {
-			$this->qrcodePath = $qrcode_path;
-		} else {
-			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_path = $zend_dir;
-		}
-		if (is_dir($zend_path)) {
-			$this->zendPath = $zend_path;
-		} else {
-			throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
-		}
-	}
-
-
-	public function setIncludePath() {
-		set_include_path(implode(PATH_SEPARATOR, array(
-			$this->tiqrPath,
-			$this->zendPath,
-			$this->qrcodePath,
-			get_include_path(),
-		)));
-	}
+        } else {
+            return;
+        }
+
+        if (file_exists($file)) {
+            require_once($file);
+        }
+    }
+
+    public function setOptions($options) {
+        if (isset($options["tiqr.path"])) {
+            $tiqr_dir = $options["tiqr.path"];
+            $tiqr_path = realpath($tiqr_dir);
+        } else {
+            $tiqr_dir = dirname(__FILE__);
+            $tiqr_path = $tiqr_dir;
+        }
+        if (is_dir($tiqr_path)) {
+            $this->tiqrPath = $tiqr_path;
+        } else {
+            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_path = $qrcode_dir;
+        }
+
+        if (is_dir($qrcode_path)) {
+            $this->qrcodePath = $qrcode_path;
+        } else {
+            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_path = $zend_dir;
+        }
+        if (is_dir($zend_path)) {
+            $this->zendPath = $zend_path;
+        } else {
+            throw new Exception('Directory not found: ' . var_export($zend_dir, TRUE));
+        }
+    }
+
+
+    public function setIncludePath() {
+        set_include_path(implode(PATH_SEPARATOR, array(
+            $this->tiqrPath,
+            $this->zendPath,
+            $this->qrcodePath,
+            get_include_path(),
+        )));
+    }
 }

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));
 		}
 	}