nilsteampassnet / TeamPass

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRServerProvider.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
         return $this->getContent($this->getUrl($qrtext, $size));
     }
     
+    /**
+     * @param string $value
+     */
     private function decodeColor($value) 
     {
         return vsprintf('%d-%d-%d', sscanf($value, "%02x%02x%02x"));

Indentation +6 added lines, -6 removed lines

@@ -31,16 +31,16 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'png':
+            case 'png':
                 return 'image/png';
-        	case 'gif':
+            case 'gif':
                 return 'image/gif';
-        	case 'jpg':
-        	case 'jpeg':
+            case 'jpg':
+            case 'jpeg':
                 return 'image/jpeg';
-        	case 'svg':
+            case 'svg':
                 return 'image/svg+xml';
-        	case 'eps':
+            case 'eps':
                 return 'application/postscript';
         }
         throw new QRException(sprintf('Unknown MIME-type: %s', $this->format));

Spacing +8 added lines, -8 removed lines

@@ -59,13 +59,13 @@
     public function getUrl($qrtext, $size) 
     {
         return 'https://api.qrserver.com/v1/create-qr-code/'
-            . '?size=' . $size . 'x' . $size
-            . '&ecc=' . strtoupper($this->errorcorrectionlevel)
-            . '&margin=' . $this->margin
-            . '&qzone=' . $this->qzone
-            . '&bgcolor=' . $this->decodeColor($this->bgcolor)
-            . '&color=' . $this->decodeColor($this->color)
-            . '&format=' . strtolower($this->format)
-            . '&data=' . rawurlencode($qrtext);
+            . '?size='.$size.'x'.$size
+            . '&ecc='.strtoupper($this->errorcorrectionlevel)
+            . '&margin='.$this->margin
+            . '&qzone='.$this->qzone
+            . '&bgcolor='.$this->decodeColor($this->bgcolor)
+            . '&color='.$this->decodeColor($this->color)
+            . '&format='.strtolower($this->format)
+            . '&data='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 
     function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 4, $qzone = 1, $bgcolor = 'ffffff', $color = '000000', $format = 'png') 
     {
-        if (!is_bool($verifyssl))
-            throw new QRException('VerifySSL must be bool');
+        if (!is_bool($verifyssl)) {
+                    throw new QRException('VerifySSL must be bool');
+        }
 
         $this->verifyssl = $verifyssl;
         

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Doc Comments +1 added lines

@@ -139,6 +139,7 @@
 
     /**
      * Get data-uri of QRCode
+     * @param string $label
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {

Spacing +20 added lines, -20 removed lines

@@ -36,11 +36,11 @@ 
 
         $algorithm = strtolower(trim($algorithm));
         if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+            throw new TwoFactorAuthException('Unsupported algorithm: '.$algorithm);
         $this->algorithm = $algorithm;
 
         // Set default QR Code provider if none was specified
-        if ($qrcodeprovider==null)
+        if ($qrcodeprovider == null)
             $qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
 
         if (!($qrcodeprovider instanceof Providers\Qr\IQRCodeProvider))
@@ -49,7 +49,7 @@ 
         $this->qrcodeprovider = $qrcodeprovider;
 
         // Try to find best available RNG provider if none was specified
-        if ($rngprovider==null) {
+        if ($rngprovider == null) {
             if (function_exists('random_bytes')) {
                 $rngprovider = new Providers\Rng\CSRNGProvider();
             } elseif (function_exists('mcrypt_create_iv')) {
@@ -78,12 +78,12 @@ 
     public function createSecret($bits = 80, $requirecryptosecure = true)
     {
         $secret = '';
-        $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
+        $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
         if ($requirecryptosecure && !$this->rngprovider->isCryptographicallySecure())
             throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
         $rnd = $this->rngprovider->getRandomBytes($bytes);
         for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+            $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -94,11 +94,11 @@ 
     {
         $secretkey = $this->base32Decode($secret);
 
-        $timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time)));  // Pack time into binary string
-        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true);             // Hash it with users secret key
-        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4);               // Use last nibble of result as index/offset and grab 4 bytes of the result
-        $value = unpack('N', $hashpart);                                                   // Unpack binary value
-        $value = $value[1] & 0x7FFFFFFF;                                                   // Drop MSB, keep only 31 bits
+        $timestamp = "\0\0\0\0".pack('N*', $this->getTimeSlice($this->getTime($time))); // Pack time into binary string
+        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true); // Hash it with users secret key
+        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4); // Use last nibble of result as index/offset and grab 4 bytes of the result
+        $value = unpack('N', $hashpart); // Unpack binary value
+        $value = $value[1] & 0x7FFFFFFF; // Drop MSB, keep only 31 bits
 
         return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
     }
@@ -115,7 +115,7 @@ 
         for ($i = -$discrepancy; $i <= $discrepancy; $i++)
             $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
 
-        return (bool)$result;
+        return (bool) $result;
     }
 
     /**
@@ -127,7 +127,7 @@ 
         } else {
             // In general, it's not possible to prevent length leaks. So it's OK to leak the length. The important part is that
             // we don't leak information about the difference of the two strings.
-            if (strlen($safe)===strlen($user)) {
+            if (strlen($safe) === strlen($user)) {
                 $result = 0;
                 for ($i = 0; $i < strlen($safe); $i++)
                     $result |= (ord($safe[$i]) ^ ord($user[$i]));
@@ -158,7 +158,7 @@ 
 
     private function getTimeSlice($time = null, $offset = 0)
     {
-        return (int)floor($time / $this->period) + ($offset * $this->period);
+        return (int) floor($time / $this->period) + ($offset * $this->period);
     }
 
     /**
@@ -166,17 +166,17 @@ 
      */
     public function getQRText($label, $secret)
     {
-        return 'otpauth://totp/' . rawurlencode($label)
-            . '?secret=' . rawurlencode($secret)
-            . '&issuer=' . rawurlencode($this->issuer)
-            . '&period=' . intval($this->period)
-            . '&algorithm=' . rawurlencode(strtoupper($this->algorithm))
-            . '&digits=' . intval($this->digits);
+        return 'otpauth://totp/'.rawurlencode($label)
+            . '?secret='.rawurlencode($secret)
+            . '&issuer='.rawurlencode($this->issuer)
+            . '&period='.intval($this->period)
+            . '&algorithm='.rawurlencode(strtoupper($this->algorithm))
+            . '&digits='.intval($this->digits);
     }
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value) == 0) return '';
 
         if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
             throw new TwoFactorAuthException('Invalid base32 string');

Braces +46 added lines, -29 removed lines

@@ -26,25 +26,30 @@ 
     {
         $this->issuer = $issuer;
 
-        if (!is_int($digits) || $digits <= 0)
-            throw new TwoFactorAuthException('Digits must be int > 0');
+        if (!is_int($digits) || $digits <= 0) {
+                    throw new TwoFactorAuthException('Digits must be int > 0');
+        }
         $this->digits = $digits;
 
-        if (!is_int($period) || $period <= 0)
-            throw new TwoFactorAuthException('Period must be int > 0');
+        if (!is_int($period) || $period <= 0) {
+                    throw new TwoFactorAuthException('Period must be int > 0');
+        }
         $this->period = $period;
 
         $algorithm = strtolower(trim($algorithm));
-        if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        if (!in_array($algorithm, self::$_supportedalgos)) {
+                    throw new TwoFactorAuthException('Unsupported algorithm: ' . $algorithm);
+        }
         $this->algorithm = $algorithm;
 
         // Set default QR Code provider if none was specified
-        if ($qrcodeprovider==null)
-            $qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
+        if ($qrcodeprovider==null) {
+                    $qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
+        }
 
-        if (!($qrcodeprovider instanceof Providers\Qr\IQRCodeProvider))
-            throw new TwoFactorAuthException('QRCodeProvider must implement IQRCodeProvider');
+        if (!($qrcodeprovider instanceof Providers\Qr\IQRCodeProvider)) {
+                    throw new TwoFactorAuthException('QRCodeProvider must implement IQRCodeProvider');
+        }
 
         $this->qrcodeprovider = $qrcodeprovider;
 
@@ -63,8 +68,9 @@ 
             }
         }
 
-        if (!($rngprovider instanceof Providers\Rng\IRNGProvider))
-            throw new TwoFactorAuthException('RNGProvider must implement IRNGProvider');
+        if (!($rngprovider instanceof Providers\Rng\IRNGProvider)) {
+                    throw new TwoFactorAuthException('RNGProvider must implement IRNGProvider');
+        }
 
         $this->rngprovider = $rngprovider;
 
@@ -79,11 +85,14 @@ 
     {
         $secret = '';
         $bytes = ceil($bits / 5);   //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
-        if ($requirecryptosecure && !$this->rngprovider->isCryptographicallySecure())
-            throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        if ($requirecryptosecure && !$this->rngprovider->isCryptographicallySecure()) {
+                    throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        }
         $rnd = $this->rngprovider->getRandomBytes($bytes);
-        for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31];  //Mask out left 3 bits for 0-31 values
+        for ($i = 0; $i < $bytes; $i++) {
+                    $secret .= self::$_base32[ord($rnd[$i]) & 31];
+        }
+        //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -112,8 +121,9 @@ 
         $timetamp = $this->getTime($time);
 
         // To keep safe from timing-attachs we iterate *all* possible codes even though we already may have verified a code is correct
-        for ($i = -$discrepancy; $i <= $discrepancy; $i++)
-            $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
+                    $result |= $this->codeEquals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        }
 
         return (bool)$result;
     }
@@ -129,8 +139,9 @@ 
             // we don't leak information about the difference of the two strings.
             if (strlen($safe)===strlen($user)) {
                 $result = 0;
-                for ($i = 0; $i < strlen($safe); $i++)
-                    $result |= (ord($safe[$i]) ^ ord($user[$i]));
+                for ($i = 0; $i < strlen($safe); $i++) {
+                                    $result |= (ord($safe[$i]) ^ ord($user[$i]));
+                }
                 return $result === 0;
             }
         }
@@ -142,8 +153,9 @@ 
      */
     public function getQRCodeImageAsDataUri($label, $secret, $size = 200)
     {
-        if (!is_int($size) || $size <= 0)
-            throw new TwoFactorAuthException('Size must be int > 0');
+        if (!is_int($size) || $size <= 0) {
+                    throw new TwoFactorAuthException('Size must be int > 0');
+        }
 
         return 'data:'
             . $this->qrcodeprovider->getMimeType()
@@ -176,23 +188,28 @@ 
 
     private function base32Decode($value)
     {
-        if (strlen($value)==0) return '';
+        if (strlen($value)==0) {
+            return '';
+        }
 
-        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
-            throw new TwoFactorAuthException('Invalid base32 string');
+        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0) {
+                    throw new TwoFactorAuthException('Invalid base32 string');
+        }
 
         $buffer = '';
         foreach (str_split($value) as $char)
         {
-            if ($char !== '=')
-                $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            if ($char !== '=') {
+                            $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            }
         }
         $length = strlen($buffer);
         $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
 
         $output = '';
-        foreach (explode(' ', $blocks) as $block)
-            $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        foreach (explode(' ', $blocks) as $block) {
+                    $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        }
 
         return $output;
     }

includes/libraries/Authentication/Yubico/Yubico.php

Doc Comments +3 added lines, -2 removed lines

@@ -98,8 +98,8 @@ 
 	 * Sets up the object
 	 * @param    string  $id     The client identity
 	 * @param    string  $key    The client MAC key (optional)
-	 * @param    boolean $https  Flag whether to use https (optional)
-	 * @param    boolean $httpsverify  Flag whether to use verify HTTPS
+	 * @param    integer $https  Flag whether to use https (optional)
+	 * @param    integer $httpsverify  Flag whether to use verify HTTPS
 	 *                                 server certificates (optional,
 	 *                                 default true)
 	 * @access public
@@ -207,6 +207,7 @@ 
 	 *
 	 * @param  string    Input string to parse
 	 * @param  string    Optional delimiter re-class, default is '[:]'
+	 * @param string $str
 	 * @return array     Keyed array with fields
 	 * @access public
 	 */

Indentation +412 added lines, -412 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-  /**
-   * Class for verifying Yubico One-Time-Passcodes
-   *
-   * @category    Auth
-   * @package     Auth_Yubico
-   * @author      Simon Josefsson <simon@yubico.com>, Olov Danielson <olov@yubico.com>
-   * @copyright   2007-2015 Yubico AB
-   * @license     http://opensource.org/licenses/bsd-license.php New BSD License
-   * @version     2.0
-   * @link        http://www.yubico.com/
-   */
+    /**
+     * Class for verifying Yubico One-Time-Passcodes
+     *
+     * @category    Auth
+     * @package     Auth_Yubico
+     * @author      Simon Josefsson <simon@yubico.com>, Olov Danielson <olov@yubico.com>
+     * @copyright   2007-2015 Yubico AB
+     * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+     * @version     2.0
+     * @link        http://www.yubico.com/
+     */
 
 require_once 'PEAR.php';
 
@@ -34,340 +34,340 @@ 
  */
 class Auth_Yubico
 {
-	/**#@+
+    /**#@+
 	 * @access private
 	 */
 
-	/**
-	 * Yubico client ID
-	 * @var string
-	 */
-	var $_id;
-
-	/**
-	 * Yubico client key
-	 * @var string
-	 */
-	var $_key;
-
-	/**
-	 * URL part of validation server
-	 * @var string
-	 */
-	var $_url;
-
-	/**
-	 * List with URL part of validation servers
-	 * @var array
-	 */
-	var $_url_list;
-
-	/**
-	 * index to _url_list
-	 * @var int
-	 */
-	var $_url_index;
-
-	/**
-	 * Last query to server
-	 * @var string
-	 */
-	var $_lastquery;
-
-	/**
-	 * Response from server
-	 * @var string
-	 */
-	var $_response;
-
-	/**
-	 * Flag whether to use https or not.
-	 * @var boolean
-	 */
-	var $_https;
-
-	/**
-	 * Flag whether to verify HTTPS server certificates or not.
-	 * @var boolean
-	 */
-	var $_httpsverify;
-
-	/**
-	 * Constructor
-	 *
-	 * Sets up the object
-	 * @param    string  $id     The client identity
-	 * @param    string  $key    The client MAC key (optional)
-	 * @param    boolean $https  Flag whether to use https (optional)
-	 * @param    boolean $httpsverify  Flag whether to use verify HTTPS
-	 *                                 server certificates (optional,
-	 *                                 default true)
-	 * @access public
-	 */
-	public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
-	{
-		$this->_id =  $id;
-		$this->_key = base64_decode($key);
-		$this->_https = $https;
-		$this->_httpsverify = $httpsverify;
-	}
-
-	/**
-	 * Specify to use a different URL part for verification.
-	 * The default is "api.yubico.com/wsapi/verify".
-	 *
-	 * @param  string $url  New server URL part to use
-	 * @access public
-	 */
-	function setURLpart($url)
-	{
-		$this->_url = $url;
-	}
-
-	/**
-	 * Get URL part to use for validation.
-	 *
-	 * @return string  Server URL part
-	 * @access public
-	 */
-	function getURLpart()
-	{
-		if ($this->_url) {
-			return $this->_url;
-		} else {
-			return "api.yubico.com/wsapi/verify";
-		}
-	}
-
-
-	/**
-	 * Get next URL part from list to use for validation.
-	 *
-	 * @return mixed string with URL part of false if no more URLs in list
-	 * @access public
-	 */
-	function getNextURLpart()
-	{
-	  if ($this->_url_list) $url_list=$this->_url_list;
-	  else $url_list=array('api.yubico.com/wsapi/2.0/verify',
-			       'api2.yubico.com/wsapi/2.0/verify', 
-			       'api3.yubico.com/wsapi/2.0/verify', 
-			       'api4.yubico.com/wsapi/2.0/verify',
-			       'api5.yubico.com/wsapi/2.0/verify');
+    /**
+     * Yubico client ID
+     * @var string
+     */
+    var $_id;
+
+    /**
+     * Yubico client key
+     * @var string
+     */
+    var $_key;
+
+    /**
+     * URL part of validation server
+     * @var string
+     */
+    var $_url;
+
+    /**
+     * List with URL part of validation servers
+     * @var array
+     */
+    var $_url_list;
+
+    /**
+     * index to _url_list
+     * @var int
+     */
+    var $_url_index;
+
+    /**
+     * Last query to server
+     * @var string
+     */
+    var $_lastquery;
+
+    /**
+     * Response from server
+     * @var string
+     */
+    var $_response;
+
+    /**
+     * Flag whether to use https or not.
+     * @var boolean
+     */
+    var $_https;
+
+    /**
+     * Flag whether to verify HTTPS server certificates or not.
+     * @var boolean
+     */
+    var $_httpsverify;
+
+    /**
+     * Constructor
+     *
+     * Sets up the object
+     * @param    string  $id     The client identity
+     * @param    string  $key    The client MAC key (optional)
+     * @param    boolean $https  Flag whether to use https (optional)
+     * @param    boolean $httpsverify  Flag whether to use verify HTTPS
+     *                                 server certificates (optional,
+     *                                 default true)
+     * @access public
+     */
+    public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
+    {
+        $this->_id =  $id;
+        $this->_key = base64_decode($key);
+        $this->_https = $https;
+        $this->_httpsverify = $httpsverify;
+    }
+
+    /**
+     * Specify to use a different URL part for verification.
+     * The default is "api.yubico.com/wsapi/verify".
+     *
+     * @param  string $url  New server URL part to use
+     * @access public
+     */
+    function setURLpart($url)
+    {
+        $this->_url = $url;
+    }
+
+    /**
+     * Get URL part to use for validation.
+     *
+     * @return string  Server URL part
+     * @access public
+     */
+    function getURLpart()
+    {
+        if ($this->_url) {
+            return $this->_url;
+        } else {
+            return "api.yubico.com/wsapi/verify";
+        }
+    }
+
+
+    /**
+     * Get next URL part from list to use for validation.
+     *
+     * @return mixed string with URL part of false if no more URLs in list
+     * @access public
+     */
+    function getNextURLpart()
+    {
+        if ($this->_url_list) $url_list=$this->_url_list;
+        else $url_list=array('api.yubico.com/wsapi/2.0/verify',
+                    'api2.yubico.com/wsapi/2.0/verify', 
+                    'api3.yubico.com/wsapi/2.0/verify', 
+                    'api4.yubico.com/wsapi/2.0/verify',
+                    'api5.yubico.com/wsapi/2.0/verify');
 	  
-	  if ($this->_url_index>=count($url_list)) return false;
-	  else return $url_list[$this->_url_index++];
-	}
-
-	/**
-	 * Resets index to URL list
-	 *
-	 * @access public
-	 */
-	function URLreset()
-	{
-	  $this->_url_index=0;
-	}
-
-	/**
-	 * Add another URLpart.
-	 *
-	 * @access public
-	 */
-	function addURLpart($URLpart) 
-	{
-	  $this->_url_list[]=$URLpart;
-	}
+        if ($this->_url_index>=count($url_list)) return false;
+        else return $url_list[$this->_url_index++];
+    }
+
+    /**
+     * Resets index to URL list
+     *
+     * @access public
+     */
+    function URLreset()
+    {
+        $this->_url_index=0;
+    }
+
+    /**
+     * Add another URLpart.
+     *
+     * @access public
+     */
+    function addURLpart($URLpart) 
+    {
+        $this->_url_list[]=$URLpart;
+    }
 	
-	/**
-	 * Return the last query sent to the server, if any.
-	 *
-	 * @return string  Request to server
-	 * @access public
-	 */
-	function getLastQuery()
-	{
-		return $this->_lastquery;
-	}
-
-	/**
-	 * Return the last data received from the server, if any.
-	 *
-	 * @return string  Output from server
-	 * @access public
-	 */
-	function getLastResponse()
-	{
-		return $this->_response;
-	}
-
-	/**
-	 * Parse input string into password, yubikey prefix,
-	 * ciphertext, and OTP.
-	 *
-	 * @param  string    Input string to parse
-	 * @param  string    Optional delimiter re-class, default is '[:]'
-	 * @return array     Keyed array with fields
-	 * @access public
-	 */
-	function parsePasswordOTP($str, $delim = '[:]')
-	{
-	  if (!preg_match("/^((.*)" . $delim . ")?" .
-			  "(([cbdefghijklnrtuv]{0,16})" .
-			  "([cbdefghijklnrtuv]{32}))$/i",
-			  $str, $matches)) {
-	    /* Dvorak? */
-	    if (!preg_match("/^((.*)" . $delim . ")?" .
-			    "(([jxe\.uidchtnbpygk]{0,16})" .
-			    "([jxe\.uidchtnbpygk]{32}))$/i",
-			    $str, $matches)) {
-	      return false;
-	    } else {
-	      $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
-	    }
-	  } else {
-	    $ret['otp'] = $matches[3];
-	  }
-	  $ret['password'] = $matches[2];
-	  $ret['prefix'] = $matches[4];
-	  $ret['ciphertext'] = $matches[5];
-	  return $ret;
-	}
-
-	/* TODO? Add functions to get parsed parts of server response? */
-
-	/**
-	 * Parse parameters from last response
-	 *
-	 * example: getParameters("timestamp", "sessioncounter", "sessionuse");
-	 *
-	 * @param  array @parameters  Array with strings representing
-	 *                            parameters to parse
-	 * @return array  parameter array from last response
-	 * @access public
-	 */
-	function getParameters($parameters)
-	{
-	  if ($parameters == null) {
-	    $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
-	  }
-	  $param_array = array();
-	  foreach ($parameters as $param) {
-	    if(!preg_match("/" . $param . "=([0-9]+)/", $this->_response, $out)) {
-	      return PEAR::raiseError('Could not parse parameter ' . $param . ' from response');
-	    }
-	    $param_array[$param]=$out[1];
-	  }
-	  return $param_array;
-	}
-
-	/**
-	 * Verify Yubico OTP against multiple URLs
-	 * Protocol specification 2.0 is used to construct validation requests
-	 *
-	 * @param string $token        Yubico OTP
-	 * @param int $use_timestamp   1=>send request with &timestamp=1 to
-	 *                             get timestamp and session information
-	 *                             in the response
-	 * @param boolean $wait_for_all  If true, wait until all
-	 *                               servers responds (for debugging)
-	 * @param string $sl           Sync level in percentage between 0
-	 *                             and 100 or "fast" or "secure".
-	 * @param int $timeout         Max number of seconds to wait
-	 *                             for responses
-	 * @return mixed               PEAR error on error, true otherwise
-	 * @access public
-	 */
-	function verify($token, $use_timestamp=null, $wait_for_all=False,
-			$sl=null, $timeout=null)
-	{
-	  /* Construct parameters string */
-	  $ret = $this->parsePasswordOTP($token);
-	  if (!$ret) {
-	    return PEAR::raiseError('Could not parse Yubikey OTP');
-	  }
-	  $params = array('id'=>$this->_id, 
-			  'otp'=>$ret['otp'],
-			  'nonce'=>md5(uniqid(rand())));
-	  /* Take care of protocol version 2 parameters */
-	  if ($use_timestamp) $params['timestamp'] = 1;
-	  if ($sl) $params['sl'] = $sl;
-	  if ($timeout) $params['timeout'] = $timeout;
-	  ksort($params);
-	  $parameters = '';
-	  foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
-	  $parameters = ltrim($parameters, "&");
+    /**
+     * Return the last query sent to the server, if any.
+     *
+     * @return string  Request to server
+     * @access public
+     */
+    function getLastQuery()
+    {
+        return $this->_lastquery;
+    }
+
+    /**
+     * Return the last data received from the server, if any.
+     *
+     * @return string  Output from server
+     * @access public
+     */
+    function getLastResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Parse input string into password, yubikey prefix,
+     * ciphertext, and OTP.
+     *
+     * @param  string    Input string to parse
+     * @param  string    Optional delimiter re-class, default is '[:]'
+     * @return array     Keyed array with fields
+     * @access public
+     */
+    function parsePasswordOTP($str, $delim = '[:]')
+    {
+        if (!preg_match("/^((.*)" . $delim . ")?" .
+                "(([cbdefghijklnrtuv]{0,16})" .
+                "([cbdefghijklnrtuv]{32}))$/i",
+                $str, $matches)) {
+        /* Dvorak? */
+        if (!preg_match("/^((.*)" . $delim . ")?" .
+                "(([jxe\.uidchtnbpygk]{0,16})" .
+                "([jxe\.uidchtnbpygk]{32}))$/i",
+                $str, $matches)) {
+            return false;
+        } else {
+            $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
+        }
+        } else {
+        $ret['otp'] = $matches[3];
+        }
+        $ret['password'] = $matches[2];
+        $ret['prefix'] = $matches[4];
+        $ret['ciphertext'] = $matches[5];
+        return $ret;
+    }
+
+    /* TODO? Add functions to get parsed parts of server response? */
+
+    /**
+     * Parse parameters from last response
+     *
+     * example: getParameters("timestamp", "sessioncounter", "sessionuse");
+     *
+     * @param  array @parameters  Array with strings representing
+     *                            parameters to parse
+     * @return array  parameter array from last response
+     * @access public
+     */
+    function getParameters($parameters)
+    {
+        if ($parameters == null) {
+        $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
+        }
+        $param_array = array();
+        foreach ($parameters as $param) {
+        if(!preg_match("/" . $param . "=([0-9]+)/", $this->_response, $out)) {
+            return PEAR::raiseError('Could not parse parameter ' . $param . ' from response');
+        }
+        $param_array[$param]=$out[1];
+        }
+        return $param_array;
+    }
+
+    /**
+     * Verify Yubico OTP against multiple URLs
+     * Protocol specification 2.0 is used to construct validation requests
+     *
+     * @param string $token        Yubico OTP
+     * @param int $use_timestamp   1=>send request with &timestamp=1 to
+     *                             get timestamp and session information
+     *                             in the response
+     * @param boolean $wait_for_all  If true, wait until all
+     *                               servers responds (for debugging)
+     * @param string $sl           Sync level in percentage between 0
+     *                             and 100 or "fast" or "secure".
+     * @param int $timeout         Max number of seconds to wait
+     *                             for responses
+     * @return mixed               PEAR error on error, true otherwise
+     * @access public
+     */
+    function verify($token, $use_timestamp=null, $wait_for_all=False,
+            $sl=null, $timeout=null)
+    {
+        /* Construct parameters string */
+        $ret = $this->parsePasswordOTP($token);
+        if (!$ret) {
+        return PEAR::raiseError('Could not parse Yubikey OTP');
+        }
+        $params = array('id'=>$this->_id, 
+                'otp'=>$ret['otp'],
+                'nonce'=>md5(uniqid(rand())));
+        /* Take care of protocol version 2 parameters */
+        if ($use_timestamp) $params['timestamp'] = 1;
+        if ($sl) $params['sl'] = $sl;
+        if ($timeout) $params['timeout'] = $timeout;
+        ksort($params);
+        $parameters = '';
+        foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
+        $parameters = ltrim($parameters, "&");
 	  
-	  /* Generate signature. */
-	  if($this->_key <> "") {
-	    $signature = base64_encode(hash_hmac('sha1', $parameters,
-						 $this->_key, true));
-	    $signature = preg_replace('/\+/', '%2B', $signature);
-	    $parameters .= '&h=' . $signature;
-	  }
-
-	  /* Generate and prepare request. */
-	  $this->_lastquery=null;
-	  $this->URLreset();
-	  $mh = curl_multi_init();
-	  $ch = array();
-	  while($URLpart=$this->getNextURLpart()) 
-	    {
-	      /* Support https. */
-	      if ($this->_https) {
-		$query = "https://";
-	      } else {
-		$query = "http://";
-	      }
-	      $query .= $URLpart . "?" . $parameters;
-
-	      if ($this->_lastquery) { $this->_lastquery .= " "; }
-	      $this->_lastquery .= $query;
+        /* Generate signature. */
+        if($this->_key <> "") {
+        $signature = base64_encode(hash_hmac('sha1', $parameters,
+                            $this->_key, true));
+        $signature = preg_replace('/\+/', '%2B', $signature);
+        $parameters .= '&h=' . $signature;
+        }
+
+        /* Generate and prepare request. */
+        $this->_lastquery=null;
+        $this->URLreset();
+        $mh = curl_multi_init();
+        $ch = array();
+        while($URLpart=$this->getNextURLpart()) 
+        {
+            /* Support https. */
+            if ($this->_https) {
+        $query = "https://";
+            } else {
+        $query = "http://";
+            }
+            $query .= $URLpart . "?" . $parameters;
+
+            if ($this->_lastquery) { $this->_lastquery .= " "; }
+            $this->_lastquery .= $query;
 	      
-	      $handle = curl_init($query);
-	      curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
-	      curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
-	      if (!$this->_httpsverify) {
-		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
-	      }
-	      curl_setopt($handle, CURLOPT_FAILONERROR, true);
-	      /* If timeout is set, we better apply it here as well
+            $handle = curl_init($query);
+            curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
+            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+            if (!$this->_httpsverify) {
+        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
+            }
+            curl_setopt($handle, CURLOPT_FAILONERROR, true);
+            /* If timeout is set, we better apply it here as well
 	         in case the validation server fails to follow it. 
 	      */ 
-	      if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
-	      curl_multi_add_handle($mh, $handle);
+            if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
+            curl_multi_add_handle($mh, $handle);
 	      
-	      $ch[(int)$handle] = $handle;
-	    }
-
-	  /* Execute and read request. */
-	  $this->_response=null;
-	  $replay=False;
-	  $valid=False;
-	  do {
-	    /* Let curl do its work. */
-	    while (($mrc = curl_multi_exec($mh, $active))
-		   == CURLM_CALL_MULTI_PERFORM)
-	      ;
-
-	    while ($info = curl_multi_info_read($mh)) {
-	      if ($info['result'] == CURLE_OK) {
-
-		/* We have a complete response from one server. */
-
-		$str = curl_multi_getcontent($info['handle']);
-		$cinfo = curl_getinfo ($info['handle']);
+            $ch[(int)$handle] = $handle;
+        }
+
+        /* Execute and read request. */
+        $this->_response=null;
+        $replay=False;
+        $valid=False;
+        do {
+        /* Let curl do its work. */
+        while (($mrc = curl_multi_exec($mh, $active))
+            == CURLM_CALL_MULTI_PERFORM)
+            ;
+
+        while ($info = curl_multi_info_read($mh)) {
+            if ($info['result'] == CURLE_OK) {
+
+        /* We have a complete response from one server. */
+
+        $str = curl_multi_getcontent($info['handle']);
+        $cinfo = curl_getinfo ($info['handle']);
 		
-		if ($wait_for_all) { # Better debug info
-		  $this->_response .= 'URL=' . $cinfo['url'] ."\n"
-		    . $str . "\n";
-		}
+        if ($wait_for_all) { # Better debug info
+            $this->_response .= 'URL=' . $cinfo['url'] ."\n"
+            . $str . "\n";
+        }
 
-		if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
-		  $status = $out[1];
+        if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
+            $status = $out[1];
 
-		  /* 
+            /* 
 		   * There are 3 cases.
 		   *
 		   * 1. OTP or Nonce values doesn't match - ignore
@@ -379,92 +379,92 @@ 
 		   *
 		   * 3. Return if status=OK or status=REPLAYED_OTP.
 		   */
-		  if (!preg_match("/otp=".$params['otp']."/", $str) ||
-		      !preg_match("/nonce=".$params['nonce']."/", $str)) {
-		    /* Case 1. Ignore response. */
-		  } 
-		  elseif ($this->_key <> "") {
-		    /* Case 2. Verify signature first */
-		    $rows = explode("\r\n", trim($str));
-		    $response=array();
-		    while (list($key, $val) = each($rows)) {
-		      /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
-		      $val = preg_replace('/=/', '#', $val, 1);
-		      $row = explode("#", $val);
-		      $response[$row[0]] = $row[1];
-		    }
+            if (!preg_match("/otp=".$params['otp']."/", $str) ||
+              !preg_match("/nonce=".$params['nonce']."/", $str)) {
+            /* Case 1. Ignore response. */
+            } 
+            elseif ($this->_key <> "") {
+            /* Case 2. Verify signature first */
+            $rows = explode("\r\n", trim($str));
+            $response=array();
+            while (list($key, $val) = each($rows)) {
+                /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
+                $val = preg_replace('/=/', '#', $val, 1);
+                $row = explode("#", $val);
+                $response[$row[0]] = $row[1];
+            }
 		    
-		    $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
-		    sort($parameters);
-		    $check=Null;
-		    foreach ($parameters as $param) {
-		      if (array_key_exists($param, $response)) {
-			if ($check) $check = $check . '&';
-			$check = $check . $param . '=' . $response[$param];
-		      }
-		    }
-
-		    $checksignature =
-		      base64_encode(hash_hmac('sha1', utf8_encode($check),
-					      $this->_key, true));
-
-		    if($response['h'] == $checksignature) {
-		      if ($status == 'REPLAYED_OTP') {
-			if (!$wait_for_all) { $this->_response = $str; }
-			$replay=True;
-		      } 
-		      if ($status == 'OK') {
-			if (!$wait_for_all) { $this->_response = $str; }
-			$valid=True;
-		      }
-		    }
-		  } else {
-		    /* Case 3. We check the status directly */
-		    if ($status == 'REPLAYED_OTP') {
-		      if (!$wait_for_all) { $this->_response = $str; }
-		      $replay=True;
-		    } 
-		    if ($status == 'OK') {
-		      if (!$wait_for_all) { $this->_response = $str; }
-		      $valid=True;
-		    }
-		  }
-		}
-		if (!$wait_for_all && ($valid || $replay)) 
-		  {
-		    /* We have status=OK or status=REPLAYED_OTP, return. */
-		    foreach ($ch as $h) {
-		      curl_multi_remove_handle($mh, $h);
-		      curl_close($h);
-		    }
-		    curl_multi_close($mh);
-		    if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-		    if ($valid) return true;
-		    return PEAR::raiseError($status);
-		  }
+            $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
+            sort($parameters);
+            $check=Null;
+            foreach ($parameters as $param) {
+                if (array_key_exists($param, $response)) {
+            if ($check) $check = $check . '&';
+            $check = $check . $param . '=' . $response[$param];
+                }
+            }
+
+            $checksignature =
+                base64_encode(hash_hmac('sha1', utf8_encode($check),
+                            $this->_key, true));
+
+            if($response['h'] == $checksignature) {
+                if ($status == 'REPLAYED_OTP') {
+            if (!$wait_for_all) { $this->_response = $str; }
+            $replay=True;
+                } 
+                if ($status == 'OK') {
+            if (!$wait_for_all) { $this->_response = $str; }
+            $valid=True;
+                }
+            }
+            } else {
+            /* Case 3. We check the status directly */
+            if ($status == 'REPLAYED_OTP') {
+                if (!$wait_for_all) { $this->_response = $str; }
+                $replay=True;
+            } 
+            if ($status == 'OK') {
+                if (!$wait_for_all) { $this->_response = $str; }
+                $valid=True;
+            }
+            }
+        }
+        if (!$wait_for_all && ($valid || $replay)) 
+            {
+            /* We have status=OK or status=REPLAYED_OTP, return. */
+            foreach ($ch as $h) {
+                curl_multi_remove_handle($mh, $h);
+                curl_close($h);
+            }
+            curl_multi_close($mh);
+            if ($replay) return PEAR::raiseError('REPLAYED_OTP');
+            if ($valid) return true;
+            return PEAR::raiseError($status);
+            }
 		
-		curl_multi_remove_handle($mh, $info['handle']);
-		curl_close($info['handle']);
-		unset ($ch[(int)$info['handle']]);
-	      }
-	      curl_multi_select($mh);
-	    }
-	  } while ($active);
-
-	  /* Typically this is only reached for wait_for_all=true or
+        curl_multi_remove_handle($mh, $info['handle']);
+        curl_close($info['handle']);
+        unset ($ch[(int)$info['handle']]);
+            }
+            curl_multi_select($mh);
+        }
+        } while ($active);
+
+        /* Typically this is only reached for wait_for_all=true or
 	   * when the timeout is reached and there is no
 	   * OK/REPLAYED_REQUEST answer (think firewall).
 	   */
 
-	  foreach ($ch as $h) {
-	    curl_multi_remove_handle ($mh, $h);
-	    curl_close ($h);
-	  }
-	  curl_multi_close ($mh);
+        foreach ($ch as $h) {
+        curl_multi_remove_handle ($mh, $h);
+        curl_close ($h);
+        }
+        curl_multi_close ($mh);
 	  
-	  if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-	  if ($valid) return true;
-	  return PEAR::raiseError('NO_VALID_ANSWER');
-	}
+        if ($replay) return PEAR::raiseError('REPLAYED_OTP');
+        if ($valid) return true;
+        return PEAR::raiseError('NO_VALID_ANSWER');
+    }
 }
 ?>

Spacing +42 added lines, -42 removed lines

@@ -106,7 +106,7 @@ 
 	 */
 	public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
 	{
-		$this->_id =  $id;
+		$this->_id = $id;
 		$this->_key = base64_decode($key);
 		$this->_https = $https;
 		$this->_httpsverify = $httpsverify;
@@ -148,14 +148,14 @@ 
 	 */
 	function getNextURLpart()
 	{
-	  if ($this->_url_list) $url_list=$this->_url_list;
-	  else $url_list=array('api.yubico.com/wsapi/2.0/verify',
+	  if ($this->_url_list) $url_list = $this->_url_list;
+	  else $url_list = array('api.yubico.com/wsapi/2.0/verify',
 			       'api2.yubico.com/wsapi/2.0/verify', 
 			       'api3.yubico.com/wsapi/2.0/verify', 
 			       'api4.yubico.com/wsapi/2.0/verify',
 			       'api5.yubico.com/wsapi/2.0/verify');
 	  
-	  if ($this->_url_index>=count($url_list)) return false;
+	  if ($this->_url_index >= count($url_list)) return false;
 	  else return $url_list[$this->_url_index++];
 	}
 
@@ -166,7 +166,7 @@ 
 	 */
 	function URLreset()
 	{
-	  $this->_url_index=0;
+	  $this->_url_index = 0;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	function addURLpart($URLpart) 
 	{
-	  $this->_url_list[]=$URLpart;
+	  $this->_url_list[] = $URLpart;
 	}
 	
 	/**
@@ -212,13 +212,13 @@ 
 	 */
 	function parsePasswordOTP($str, $delim = '[:]')
 	{
-	  if (!preg_match("/^((.*)" . $delim . ")?" .
-			  "(([cbdefghijklnrtuv]{0,16})" .
+	  if (!preg_match("/^((.*)".$delim.")?".
+			  "(([cbdefghijklnrtuv]{0,16})".
 			  "([cbdefghijklnrtuv]{32}))$/i",
 			  $str, $matches)) {
 	    /* Dvorak? */
-	    if (!preg_match("/^((.*)" . $delim . ")?" .
-			    "(([jxe\.uidchtnbpygk]{0,16})" .
+	    if (!preg_match("/^((.*)".$delim.")?".
+			    "(([jxe\.uidchtnbpygk]{0,16})".
 			    "([jxe\.uidchtnbpygk]{32}))$/i",
 			    $str, $matches)) {
 	      return false;
@@ -253,10 +253,10 @@ 
 	  }
 	  $param_array = array();
 	  foreach ($parameters as $param) {
-	    if(!preg_match("/" . $param . "=([0-9]+)/", $this->_response, $out)) {
-	      return PEAR::raiseError('Could not parse parameter ' . $param . ' from response');
+	    if (!preg_match("/".$param."=([0-9]+)/", $this->_response, $out)) {
+	      return PEAR::raiseError('Could not parse parameter '.$param.' from response');
 	    }
-	    $param_array[$param]=$out[1];
+	    $param_array[$param] = $out[1];
 	  }
 	  return $param_array;
 	}
@@ -278,8 +278,8 @@ 
 	 * @return mixed               PEAR error on error, true otherwise
 	 * @access public
 	 */
-	function verify($token, $use_timestamp=null, $wait_for_all=False,
-			$sl=null, $timeout=null)
+	function verify($token, $use_timestamp = null, $wait_for_all = False,
+			$sl = null, $timeout = null)
 	{
 	  /* Construct parameters string */
 	  $ret = $this->parsePasswordOTP($token);
@@ -295,23 +295,23 @@ 
 	  if ($timeout) $params['timeout'] = $timeout;
 	  ksort($params);
 	  $parameters = '';
-	  foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
+	  foreach ($params as $p=>$v) $parameters .= "&".$p."=".$v;
 	  $parameters = ltrim($parameters, "&");
 	  
 	  /* Generate signature. */
-	  if($this->_key <> "") {
+	  if ($this->_key <> "") {
 	    $signature = base64_encode(hash_hmac('sha1', $parameters,
 						 $this->_key, true));
 	    $signature = preg_replace('/\+/', '%2B', $signature);
-	    $parameters .= '&h=' . $signature;
+	    $parameters .= '&h='.$signature;
 	  }
 
 	  /* Generate and prepare request. */
-	  $this->_lastquery=null;
+	  $this->_lastquery = null;
 	  $this->URLreset();
 	  $mh = curl_multi_init();
 	  $ch = array();
-	  while($URLpart=$this->getNextURLpart()) 
+	  while ($URLpart = $this->getNextURLpart()) 
 	    {
 	      /* Support https. */
 	      if ($this->_https) {
@@ -319,7 +319,7 @@ 
 	      } else {
 		$query = "http://";
 	      }
-	      $query .= $URLpart . "?" . $parameters;
+	      $query .= $URLpart."?".$parameters;
 
 	      if ($this->_lastquery) { $this->_lastquery .= " "; }
 	      $this->_lastquery .= $query;
@@ -338,13 +338,13 @@ 
 	      if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
 	      curl_multi_add_handle($mh, $handle);
 	      
-	      $ch[(int)$handle] = $handle;
+	      $ch[(int) $handle] = $handle;
 	    }
 
 	  /* Execute and read request. */
-	  $this->_response=null;
-	  $replay=False;
-	  $valid=False;
+	  $this->_response = null;
+	  $replay = False;
+	  $valid = False;
 	  do {
 	    /* Let curl do its work. */
 	    while (($mrc = curl_multi_exec($mh, $active))
@@ -357,11 +357,11 @@ 
 		/* We have a complete response from one server. */
 
 		$str = curl_multi_getcontent($info['handle']);
-		$cinfo = curl_getinfo ($info['handle']);
+		$cinfo = curl_getinfo($info['handle']);
 		
 		if ($wait_for_all) { # Better debug info
-		  $this->_response .= 'URL=' . $cinfo['url'] ."\n"
-		    . $str . "\n";
+		  $this->_response .= 'URL='.$cinfo['url']."\n"
+		    . $str."\n";
 		}
 
 		if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
@@ -386,7 +386,7 @@ 
 		  elseif ($this->_key <> "") {
 		    /* Case 2. Verify signature first */
 		    $rows = explode("\r\n", trim($str));
-		    $response=array();
+		    $response = array();
 		    while (list($key, $val) = each($rows)) {
 		      /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
 		      $val = preg_replace('/=/', '#', $val, 1);
@@ -394,13 +394,13 @@ 
 		      $response[$row[0]] = $row[1];
 		    }
 		    
-		    $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
+		    $parameters = array('nonce', 'otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
 		    sort($parameters);
-		    $check=Null;
+		    $check = Null;
 		    foreach ($parameters as $param) {
 		      if (array_key_exists($param, $response)) {
-			if ($check) $check = $check . '&';
-			$check = $check . $param . '=' . $response[$param];
+			if ($check) $check = $check.'&';
+			$check = $check.$param.'='.$response[$param];
 		      }
 		    }
 
@@ -408,25 +408,25 @@ 
 		      base64_encode(hash_hmac('sha1', utf8_encode($check),
 					      $this->_key, true));
 
-		    if($response['h'] == $checksignature) {
+		    if ($response['h'] == $checksignature) {
 		      if ($status == 'REPLAYED_OTP') {
 			if (!$wait_for_all) { $this->_response = $str; }
-			$replay=True;
+			$replay = True;
 		      } 
 		      if ($status == 'OK') {
 			if (!$wait_for_all) { $this->_response = $str; }
-			$valid=True;
+			$valid = True;
 		      }
 		    }
 		  } else {
 		    /* Case 3. We check the status directly */
 		    if ($status == 'REPLAYED_OTP') {
 		      if (!$wait_for_all) { $this->_response = $str; }
-		      $replay=True;
+		      $replay = True;
 		    } 
 		    if ($status == 'OK') {
 		      if (!$wait_for_all) { $this->_response = $str; }
-		      $valid=True;
+		      $valid = True;
 		    }
 		  }
 		}
@@ -445,7 +445,7 @@ 
 		
 		curl_multi_remove_handle($mh, $info['handle']);
 		curl_close($info['handle']);
-		unset ($ch[(int)$info['handle']]);
+		unset ($ch[(int) $info['handle']]);
 	      }
 	      curl_multi_select($mh);
 	    }
@@ -457,10 +457,10 @@ 
 	   */
 
 	  foreach ($ch as $h) {
-	    curl_multi_remove_handle ($mh, $h);
-	    curl_close ($h);
+	    curl_multi_remove_handle($mh, $h);
+	    curl_close($h);
 	  }
-	  curl_multi_close ($mh);
+	  curl_multi_close($mh);
 	  
 	  if ($replay) return PEAR::raiseError('REPLAYED_OTP');
 	  if ($valid) return true;

Braces +41 added lines, -16 removed lines

@@ -148,15 +148,21 @@ 
 	 */
 	function getNextURLpart()
 	{
-	  if ($this->_url_list) $url_list=$this->_url_list;
-	  else $url_list=array('api.yubico.com/wsapi/2.0/verify',
+	  if ($this->_url_list) {
+	      $url_list=$this->_url_list;
+	  } else {
+	      $url_list=array('api.yubico.com/wsapi/2.0/verify',
 			       'api2.yubico.com/wsapi/2.0/verify', 
 			       'api3.yubico.com/wsapi/2.0/verify', 
 			       'api4.yubico.com/wsapi/2.0/verify',
 			       'api5.yubico.com/wsapi/2.0/verify');
+	  }
 	  
-	  if ($this->_url_index>=count($url_list)) return false;
-	  else return $url_list[$this->_url_index++];
+	  if ($this->_url_index>=count($url_list)) {
+	      return false;
+	  } else {
+	      return $url_list[$this->_url_index++];
+	  }
 	}
 
 	/**
@@ -290,12 +296,20 @@ 
 			  'otp'=>$ret['otp'],
 			  'nonce'=>md5(uniqid(rand())));
 	  /* Take care of protocol version 2 parameters */
-	  if ($use_timestamp) $params['timestamp'] = 1;
-	  if ($sl) $params['sl'] = $sl;
-	  if ($timeout) $params['timeout'] = $timeout;
+	  if ($use_timestamp) {
+	      $params['timestamp'] = 1;
+	  }
+	  if ($sl) {
+	      $params['sl'] = $sl;
+	  }
+	  if ($timeout) {
+	      $params['timeout'] = $timeout;
+	  }
 	  ksort($params);
 	  $parameters = '';
-	  foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
+	  foreach($params as $p=>$v) {
+	      $parameters .= "&" . $p . "=" . $v;
+	  }
 	  $parameters = ltrim($parameters, "&");
 	  
 	  /* Generate signature. */
@@ -335,7 +349,9 @@ 
 	      /* If timeout is set, we better apply it here as well
 	         in case the validation server fails to follow it. 
 	      */ 
-	      if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
+	      if ($timeout) {
+	          curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
+	      }
 	      curl_multi_add_handle($mh, $handle);
 	      
 	      $ch[(int)$handle] = $handle;
@@ -382,8 +398,7 @@ 
 		  if (!preg_match("/otp=".$params['otp']."/", $str) ||
 		      !preg_match("/nonce=".$params['nonce']."/", $str)) {
 		    /* Case 1. Ignore response. */
-		  } 
-		  elseif ($this->_key <> "") {
+		  } elseif ($this->_key <> "") {
 		    /* Case 2. Verify signature first */
 		    $rows = explode("\r\n", trim($str));
 		    $response=array();
@@ -399,7 +414,9 @@ 
 		    $check=Null;
 		    foreach ($parameters as $param) {
 		      if (array_key_exists($param, $response)) {
-			if ($check) $check = $check . '&';
+			if ($check) {
+			    $check = $check . '&';
+			}
 			$check = $check . $param . '=' . $response[$param];
 		      }
 		    }
@@ -438,8 +455,12 @@ 
 		      curl_close($h);
 		    }
 		    curl_multi_close($mh);
-		    if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-		    if ($valid) return true;
+		    if ($replay) {
+		        return PEAR::raiseError('REPLAYED_OTP');
+		    }
+		    if ($valid) {
+		        return true;
+		    }
 		    return PEAR::raiseError($status);
 		  }
 		
@@ -462,8 +483,12 @@ 
 	  }
 	  curl_multi_close ($mh);
 	  
-	  if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-	  if ($valid) return true;
+	  if ($replay) {
+	      return PEAR::raiseError('REPLAYED_OTP');
+	  }
+	  if ($valid) {
+	      return true;
+	  }
 	  return PEAR::raiseError('NO_VALID_ANSWER');
 	}
 }

includes/libraries/Database/Meekrodb/db.class.php

Doc Comments +6 added lines

@@ -294,6 +294,9 @@ 
     return call_user_func_array(array($this, 'query'), $args);
   }
 
+  /**
+   * @param string $which
+   */
   public function insertOrReplace($which, $table, $datas, $options=array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
@@ -566,6 +569,9 @@ 
     return $query;
   }
 
+  /**
+   * @param string $prepend
+   */
   protected function prependCall($function, $args, $prepend) { array_unshift($args, $prepend); return call_user_func_array($function, $args); }
   public function query() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'assoc'); }
   public function queryAllLists() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'list'); }

Indentation +385 added lines, -385 removed lines

@@ -18,33 +18,33 @@ 
 
 
 class DB {
-  // initial connection
-  public static $dbName = '';
-  public static $user = '';
-  public static $password = '';
-  public static $host = 'localhost';
-  public static $port = null;
-  public static $encoding = 'utf8';
-
-  // configure workings
-  public static $param_char = '%';
-  public static $named_param_seperator = '_';
-  public static $success_handler = false;
-  public static $error_handler = true;
-  public static $throw_exception_on_error = false;
-  public static $nonsql_error_handler = null;
-  public static $throw_exception_on_nonsql_error = false;
-  public static $nested_transactions = false;
-  public static $usenull = true;
-
-  // internal
-  protected static $mdb = null;
-
-  public static function getMDB() {
+    // initial connection
+    public static $dbName = '';
+    public static $user = '';
+    public static $password = '';
+    public static $host = 'localhost';
+    public static $port = null;
+    public static $encoding = 'utf8';
+
+    // configure workings
+    public static $param_char = '%';
+    public static $named_param_seperator = '_';
+    public static $success_handler = false;
+    public static $error_handler = true;
+    public static $throw_exception_on_error = false;
+    public static $nonsql_error_handler = null;
+    public static $throw_exception_on_nonsql_error = false;
+    public static $nested_transactions = false;
+    public static $usenull = true;
+
+    // internal
+    protected static $mdb = null;
+
+    public static function getMDB() {
     $mdb = DB::$mdb;
 
     if ($mdb === null) {
-      $mdb = DB::$mdb = new MeekroDB();
+        $mdb = DB::$mdb = new MeekroDB();
     }
 
     if ($mdb->param_char !== DB::$param_char) $mdb->param_char = DB::$param_char;
@@ -58,91 +58,91 @@ 
     if ($mdb->usenull !== DB::$usenull) $mdb->usenull = DB::$usenull;
 
     return $mdb;
-  }
-
-  public static function get() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'get'), $args); }
-  public static function disconnect() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'disconnect'), $args); }
-  public static function query() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'query'), $args); }
-  public static function queryFirstRow() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstRow'), $args); }
-  public static function queryOneRow() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneRow'), $args); }
-  public static function queryAllLists() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryAllLists'), $args); }
-  public static function queryFullColumns() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFullColumns'), $args); }
-  public static function queryFirstList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstList'), $args); }
-  public static function queryOneList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneList'), $args); }
-  public static function queryFirstColumn() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstColumn'), $args); }
-  public static function queryOneColumn() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneColumn'), $args); }
-  public static function queryFirstField() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstField'), $args); }
-  public static function queryOneField() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneField'), $args); }
-  public static function queryRaw() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryRaw'), $args); }
-  public static function queryRawUnbuf() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryRawUnbuf'), $args); }
-
-  public static function insert() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insert'), $args); }
-  public static function insertIgnore() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertIgnore'), $args); }
-  public static function insertUpdate() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertUpdate'), $args); }
-  public static function replace() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'replace'), $args); }
-  public static function update() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'update'), $args); }
-  public static function delete() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'delete'), $args); }
-
-  public static function insertId() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertId'), $args); }
-  public static function count() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'count'), $args); }
-  public static function affectedRows() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'affectedRows'), $args); }
-
-  public static function useDB() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'useDB'), $args); }
-  public static function startTransaction() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'startTransaction'), $args); }
-  public static function commit() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'commit'), $args); }
-  public static function rollback() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'rollback'), $args); }
-  public static function tableList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'tableList'), $args); }
-  public static function columnList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'columnList'), $args); }
-
-  public static function sqlEval() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'sqlEval'), $args); }
-  public static function nonSQLError() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'nonSQLError'), $args); }
-
-  public static function serverVersion() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'serverVersion'), $args); }
-  public static function transactionDepth() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'transactionDepth'), $args); }
-
-
-  public static function debugMode($handler = true) {
+    }
+
+    public static function get() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'get'), $args); }
+    public static function disconnect() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'disconnect'), $args); }
+    public static function query() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'query'), $args); }
+    public static function queryFirstRow() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstRow'), $args); }
+    public static function queryOneRow() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneRow'), $args); }
+    public static function queryAllLists() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryAllLists'), $args); }
+    public static function queryFullColumns() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFullColumns'), $args); }
+    public static function queryFirstList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstList'), $args); }
+    public static function queryOneList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneList'), $args); }
+    public static function queryFirstColumn() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstColumn'), $args); }
+    public static function queryOneColumn() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneColumn'), $args); }
+    public static function queryFirstField() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryFirstField'), $args); }
+    public static function queryOneField() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryOneField'), $args); }
+    public static function queryRaw() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryRaw'), $args); }
+    public static function queryRawUnbuf() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'queryRawUnbuf'), $args); }
+
+    public static function insert() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insert'), $args); }
+    public static function insertIgnore() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertIgnore'), $args); }
+    public static function insertUpdate() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertUpdate'), $args); }
+    public static function replace() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'replace'), $args); }
+    public static function update() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'update'), $args); }
+    public static function delete() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'delete'), $args); }
+
+    public static function insertId() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'insertId'), $args); }
+    public static function count() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'count'), $args); }
+    public static function affectedRows() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'affectedRows'), $args); }
+
+    public static function useDB() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'useDB'), $args); }
+    public static function startTransaction() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'startTransaction'), $args); }
+    public static function commit() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'commit'), $args); }
+    public static function rollback() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'rollback'), $args); }
+    public static function tableList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'tableList'), $args); }
+    public static function columnList() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'columnList'), $args); }
+
+    public static function sqlEval() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'sqlEval'), $args); }
+    public static function nonSQLError() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'nonSQLError'), $args); }
+
+    public static function serverVersion() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'serverVersion'), $args); }
+    public static function transactionDepth() { $args = func_get_args(); return call_user_func_array(array(DB::getMDB(), 'transactionDepth'), $args); }
+
+
+    public static function debugMode($handler = true) {
     DB::$success_handler = $handler;
-  }
+    }
 
-  public function version() {
+    public function version() {
     return $this->version_info();
-  }
+    }
 
 }
 
 
 class MeekroDB {
-  // initial connection
-  public $dbName = '';
-  public $user = '';
-  public $password = '';
-  public $host = 'localhost';
-  public $port = null;
-  public $encoding = 'latin1';
-
-  // configure workings
-  public $param_char = '%';
-  public $named_param_seperator = '_';
-  public $success_handler = false;
-  public $error_handler = true;
-  public $throw_exception_on_error = false;
-  public $nonsql_error_handler = null;
-  public $throw_exception_on_nonsql_error = false;
-  public $nested_transactions = false;
-  public $usenull = true;
-
-  // internal
-  public $internal_mysql = null;
-  public $server_info = null;
-  public $insert_id = 0;
-  public $num_rows = 0;
-  public $affected_rows = 0;
-  public $current_db = null;
-  public $nested_transactions_count = 0;
-
-
-  public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
+    // initial connection
+    public $dbName = '';
+    public $user = '';
+    public $password = '';
+    public $host = 'localhost';
+    public $port = null;
+    public $encoding = 'latin1';
+
+    // configure workings
+    public $param_char = '%';
+    public $named_param_seperator = '_';
+    public $success_handler = false;
+    public $error_handler = true;
+    public $throw_exception_on_error = false;
+    public $nonsql_error_handler = null;
+    public $throw_exception_on_nonsql_error = false;
+    public $nested_transactions = false;
+    public $usenull = true;
+
+    // internal
+    public $internal_mysql = null;
+    public $server_info = null;
+    public $insert_id = 0;
+    public $num_rows = 0;
+    public $affected_rows = 0;
+    public $current_db = null;
+    public $nested_transactions_count = 0;
+
+
+    public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
     if ($host === null) $host = DB::$host;
     if ($user === null) $user = DB::$user;
     if ($password === null) $password = DB::$password;
@@ -156,131 +156,131 @@ 
     $this->dbName = $dbName;
     $this->port = $port;
     $this->encoding = $encoding;
-  }
+    }
 
-  public function get() {
+    public function get() {
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-      if (! $this->port) $this->port = ini_get('mysqli.default_port');
-      $this->current_db = $this->dbName;
+        if (! $this->port) $this->port = ini_get('mysqli.default_port');
+        $this->current_db = $this->dbName;
       
-      $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
+        $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
 
-      if ($mysql->connect_error) {
+        if ($mysql->connect_error) {
         $this->nonSQLError('Unable to connect to MySQL server! Error: ' . $mysql->connect_error);
-      }
+        }
 
-      $mysql->set_charset($this->encoding);
-      $this->internal_mysql = $mysql;
-      $this->server_info = $mysql->server_info;
+        $mysql->set_charset($this->encoding);
+        $this->internal_mysql = $mysql;
+        $this->server_info = $mysql->server_info;
     }
 
     return $mysql;
-  }
+    }
 
-  public function disconnect() {
+    public function disconnect() {
     $mysqli = $this->internal_mysql;
     if ($mysqli instanceof MySQLi) {
-      if ($thread_id = $mysqli->thread_id) $mysqli->kill($thread_id);
-      $mysqli->close();
+        if ($thread_id = $mysqli->thread_id) $mysqli->kill($thread_id);
+        $mysqli->close();
     }
     $this->internal_mysql = null;
-  }
+    }
 
-  public function nonSQLError($message) {
+    public function nonSQLError($message) {
     if ($this->throw_exception_on_nonsql_error) {
-      $e = new MeekroDBException($message);
-      throw $e;
+        $e = new MeekroDBException($message);
+        throw $e;
     }
 
     $error_handler = is_callable($this->nonsql_error_handler) ? $this->nonsql_error_handler : 'meekrodb_error_handler';
 
     call_user_func($error_handler, array(
-      'type' => 'nonsql',
-      'error' => $message
+        'type' => 'nonsql',
+        'error' => $message
     ));
-  }
+    }
 
-  public function debugMode($handler = true) {
+    public function debugMode($handler = true) {
     $this->success_handler = $handler;
-  }
+    }
 
-  public function serverVersion() { $this->get(); return $this->server_info; }
-  public function transactionDepth() { return $this->nested_transactions_count; }
-  public function insertId() { return $this->insert_id; }
-  public function affectedRows() { return $this->affected_rows; }
-  public function count() { $args = func_get_args(); return call_user_func_array(array($this, 'numRows'), $args); }
-  public function numRows() { return $this->num_rows; }
+    public function serverVersion() { $this->get(); return $this->server_info; }
+    public function transactionDepth() { return $this->nested_transactions_count; }
+    public function insertId() { return $this->insert_id; }
+    public function affectedRows() { return $this->affected_rows; }
+    public function count() { $args = func_get_args(); return call_user_func_array(array($this, 'numRows'), $args); }
+    public function numRows() { return $this->num_rows; }
 
-  public function useDB() { $args = func_get_args(); return call_user_func_array(array($this, 'setDB'), $args); }
-  public function setDB($dbName) {
+    public function useDB() { $args = func_get_args(); return call_user_func_array(array($this, 'setDB'), $args); }
+    public function setDB($dbName) {
     $db = $this->get();
     if (! $db->select_db($dbName)) $this->nonSQLError("Unable to set database to $dbName");
     $this->current_db = $dbName;
-  }
+    }
 
 
-  public function startTransaction() {
+    public function startTransaction() {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
     if (!$this->nested_transactions || $this->nested_transactions_count == 0) {
-      $this->query('START TRANSACTION');
-      $this->nested_transactions_count = 1;
+        $this->query('START TRANSACTION');
+        $this->nested_transactions_count = 1;
     } else {
-      $this->query("SAVEPOINT LEVEL{$this->nested_transactions_count}");
-      $this->nested_transactions_count++;
+        $this->query("SAVEPOINT LEVEL{$this->nested_transactions_count}");
+        $this->nested_transactions_count++;
     }
 
     return $this->nested_transactions_count;
-  }
+    }
 
-  public function commit($all=false) {
+    public function commit($all=false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
-      $this->nested_transactions_count--;
+        $this->nested_transactions_count--;
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
-      $this->nested_transactions_count = 0;
-      $this->query('COMMIT');
+        $this->nested_transactions_count = 0;
+        $this->query('COMMIT');
     } else {
-      $this->query("RELEASE SAVEPOINT LEVEL{$this->nested_transactions_count}");
+        $this->query("RELEASE SAVEPOINT LEVEL{$this->nested_transactions_count}");
     }
 
     return $this->nested_transactions_count;
-  }
+    }
 
-  public function rollback($all=false) {
+    public function rollback($all=false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+        return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
-      $this->nested_transactions_count--;
+        $this->nested_transactions_count--;
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
-      $this->nested_transactions_count = 0;
-      $this->query('ROLLBACK');
+        $this->nested_transactions_count = 0;
+        $this->query('ROLLBACK');
     } else {
-      $this->query("ROLLBACK TO SAVEPOINT LEVEL{$this->nested_transactions_count}");
+        $this->query("ROLLBACK TO SAVEPOINT LEVEL{$this->nested_transactions_count}");
     }
 
     return $this->nested_transactions_count;
-  }
+    }
 
-  protected function formatTableName($table) {
+    protected function formatTableName($table) {
     $table = trim($table, '`');
 
     if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
     else return '`' . str_replace('`', '``', $table) . '`';
-  }
+    }
 
-  public function update() {
+    public function update() {
     $args = func_get_args();
     $table = array_shift($args);
     $params = array_shift($args);
@@ -292,95 +292,95 @@ 
     array_unshift($args, $table);
     array_unshift($args, $query);
     return call_user_func_array(array($this, 'query'), $args);
-  }
+    }
 
-  public function insertOrReplace($which, $table, $datas, $options=array()) {
+    public function insertOrReplace($which, $table, $datas, $options=array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
-      foreach ($datas as $datum) {
+        foreach ($datas as $datum) {
         ksort($datum);
         if (! $keys) $keys = array_keys($datum);
         $values[] = array_values($datum);
-      }
+        }
 
     } else {
-      $keys = array_keys($datas);
-      $values = array_values($datas);
+        $keys = array_keys($datas);
+        $values = array_values($datas);
     }
 
     if (isset($options['ignore']) && $options['ignore']) $which = 'INSERT IGNORE';
 
     if (isset($options['update']) && is_array($options['update']) && $options['update'] && strtolower($which) == 'insert') {
-      if (array_values($options['update']) !== $options['update']) {
+        if (array_values($options['update']) !== $options['update']) {
         return $this->query("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE %?", $table, $keys, $values, $options['update']);
-      } else {
+        } else {
         $update_str = array_shift($options['update']);
         $query_param = array("INSERT INTO %b %lb VALUES %? ON DUPLICATE KEY UPDATE $update_str", $table, $keys, $values);
         $query_param = array_merge($query_param, $options['update']);
         return call_user_func_array(array($this, 'query'), $query_param);
-      }
+        }
 
     }
 
     return $this->query("%l INTO %b %lb VALUES %?", $which, $table, $keys, $values);
-  }
+    }
 
-  public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); }
-  public function insertIgnore($table, $data) { return $this->insertOrReplace('INSERT', $table, $data, array('ignore' => true)); }
-  public function replace($table, $data) { return $this->insertOrReplace('REPLACE', $table, $data); }
+    public function insert($table, $data) { return $this->insertOrReplace('INSERT', $table, $data); }
+    public function insertIgnore($table, $data) { return $this->insertOrReplace('INSERT', $table, $data, array('ignore' => true)); }
+    public function replace($table, $data) { return $this->insertOrReplace('REPLACE', $table, $data); }
 
-  public function insertUpdate() {
+    public function insertUpdate() {
     $args = func_get_args();
     $table = array_shift($args);
     $data = array_shift($args);
 
     if (! isset($args[0])) { // update will have all the data of the insert
-      if (isset($data[0]) && is_array($data[0])) { //multiple insert rows specified -- failing!
+        if (isset($data[0]) && is_array($data[0])) { //multiple insert rows specified -- failing!
         $this->nonSQLError("Badly formatted insertUpdate() query -- you didn't specify the update component!");
-      }
+        }
 
-      $args[0] = $data;
+        $args[0] = $data;
     }
 
     if (is_array($args[0])) $update = $args[0];
     else $update = $args;
 
     return $this->insertOrReplace('INSERT', $table, $data, array('update' => $update));
-  }
+    }
 
-  public function delete() {
+    public function delete() {
     $args = func_get_args();
     $table = $this->formatTableName(array_shift($args));
     $where = array_shift($args);
     $buildquery = "DELETE FROM $table WHERE $where";
     array_unshift($args, $buildquery);
     return call_user_func_array(array($this, 'query'), $args);
-  }
+    }
 
-  public function sqleval() {
+    public function sqleval() {
     $args = func_get_args();
     $text = call_user_func_array(array($this, 'parseQueryParams'), $args);
     return new MeekroDBEval($text);
-  }
+    }
 
-  public function columnList($table) {
+    public function columnList($table) {
     return $this->queryOneColumn('Field', "SHOW COLUMNS FROM $table");
-  }
+    }
 
-  public function tableList($db = null) {
+    public function tableList($db = null) {
     if ($db) {
-      $olddb = $this->current_db;
-      $this->useDB($db);
+        $olddb = $this->current_db;
+        $this->useDB($db);
     }
 
     $result = $this->queryFirstColumn('SHOW TABLES');
     if (isset($olddb)) $this->useDB($olddb);
     return $result;
-  }
+    }
 
-  protected function preparseQueryParams() {
+    protected function preparseQueryParams() {
     $args = func_get_args();
     $sql = trim(strval(array_shift($args)));
     $args_all = $args;
@@ -391,32 +391,32 @@ 
     $named_seperator_length = strlen($this->named_param_seperator);
 
     $types = array(
-      $this->param_char . 'll', // list of literals
-      $this->param_char . 'ls', // list of strings
-      $this->param_char . 'l',  // literal
-      $this->param_char . 'li', // list of integers
-      $this->param_char . 'ld', // list of decimals
-      $this->param_char . 'lb', // list of backticks
-      $this->param_char . 'lt', // list of timestamps
-      $this->param_char . 's',  // string
-      $this->param_char . 'i',  // integer
-      $this->param_char . 'd',  // double / decimal
-      $this->param_char . 'b',  // backtick
-      $this->param_char . 't',  // timestamp
-      $this->param_char . '?',  // infer type
-      $this->param_char . 'ss'  // search string (like string, surrounded with %'s)
+        $this->param_char . 'll', // list of literals
+        $this->param_char . 'ls', // list of strings
+        $this->param_char . 'l',  // literal
+        $this->param_char . 'li', // list of integers
+        $this->param_char . 'ld', // list of decimals
+        $this->param_char . 'lb', // list of backticks
+        $this->param_char . 'lt', // list of timestamps
+        $this->param_char . 's',  // string
+        $this->param_char . 'i',  // integer
+        $this->param_char . 'd',  // double / decimal
+        $this->param_char . 'b',  // backtick
+        $this->param_char . 't',  // timestamp
+        $this->param_char . '?',  // infer type
+        $this->param_char . 'ss'  // search string (like string, surrounded with %'s)
     );
 
     // generate list of all MeekroDB variables in our query, and their position
     // in the form "offset => variable", sorted by offsets
     $posList = array();
     foreach ($types as $type) {
-      $lastPos = 0;
-      while (($pos = strpos($sql, $type, $lastPos)) !== false) {
+        $lastPos = 0;
+        while (($pos = strpos($sql, $type, $lastPos)) !== false) {
         $lastPos = $pos + 1;
         if (isset($posList[$pos]) && strlen($posList[$pos]) > strlen($type)) continue;
         $posList[$pos] = $type;
-      }
+        }
     }
 
     ksort($posList);
@@ -425,24 +425,24 @@ 
     $chunkyQuery = array(); // preparsed query
     $pos_adj = 0; // how much we've added or removed from the original sql string
     foreach ($posList as $pos => $type) {
-      $type = substr($type, $param_char_length); // variable, without % in front of it
-      $length_type = strlen($type) + $param_char_length; // length of variable w/o %
+        $type = substr($type, $param_char_length); // variable, without % in front of it
+        $length_type = strlen($type) + $param_char_length; // length of variable w/o %
 
-      $new_pos = $pos + $pos_adj; // position of start of variable
-      $new_pos_back = $new_pos + $length_type; // position of end of variable
-      $arg_number_length = 0; // length of any named or numbered parameter addition
+        $new_pos = $pos + $pos_adj; // position of start of variable
+        $new_pos_back = $new_pos + $length_type; // position of end of variable
+        $arg_number_length = 0; // length of any named or numbered parameter addition
 
-      // handle numbered parameters
-      if ($arg_number_length = strspn($sql, '0123456789', $new_pos_back)) {
+        // handle numbered parameters
+        if ($arg_number_length = strspn($sql, '0123456789', $new_pos_back)) {
         $arg_number = substr($sql, $new_pos_back, $arg_number_length);
         if (! array_key_exists($arg_number, $args_all)) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
 
         $arg = $args_all[$arg_number];
 
-      // handle named parameters
-      } else if (substr($sql, $new_pos_back, $named_seperator_length) == $this->named_param_seperator) {
+        // handle named parameters
+        } else if (substr($sql, $new_pos_back, $named_seperator_length) == $this->named_param_seperator) {
         $arg_number_length = strspn($sql, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_',
-          $new_pos_back + $named_seperator_length) + $named_seperator_length;
+            $new_pos_back + $named_seperator_length) + $named_seperator_length;
 
         $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
         if (count($args_all) != 1 || !is_array($args_all[0])) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
@@ -450,38 +450,38 @@ 
 
         $arg = $args_all[0][$arg_number];
 
-      } else {
+        } else {
         $arg_number = 0;
         $arg = array_shift($args);
-      }
+        }
 
-      if ($new_pos > 0) $chunkyQuery[] = substr($sql, 0, $new_pos);
+        if ($new_pos > 0) $chunkyQuery[] = substr($sql, 0, $new_pos);
 
-      if (is_object($arg) && ($arg instanceof WhereClause)) {
+        if (is_object($arg) && ($arg instanceof WhereClause)) {
         list($clause_sql, $clause_args) = $arg->textAndArgs();
         array_unshift($clause_args, $clause_sql);
         $preparsed_sql = call_user_func_array(array($this, 'preparseQueryParams'), $clause_args);
         $chunkyQuery = array_merge($chunkyQuery, $preparsed_sql);
-      } else {
+        } else {
         $chunkyQuery[] = array('type' => $type, 'value' => $arg);
-      }
+        }
 
-      $sql = substr($sql, $new_pos_back + $arg_number_length);
-      $pos_adj -= $new_pos_back + $arg_number_length;
+        $sql = substr($sql, $new_pos_back + $arg_number_length);
+        $pos_adj -= $new_pos_back + $arg_number_length;
     }
 
     if (strlen($sql) > 0) $chunkyQuery[] = $sql;
 
     return $chunkyQuery;
-  }
+    }
 
-  protected function escape($str) { return "'" . $this->get()->real_escape_string(strval($str)) . "'"; }
+    protected function escape($str) { return "'" . $this->get()->real_escape_string(strval($str)) . "'"; }
 
-  protected function sanitize($value) {
+    protected function sanitize($value) {
     if (is_object($value)) {
-      if ($value instanceof MeekroDBEval) return $value->text;
-      else if ($value instanceof DateTime) return $this->escape($value->format('Y-m-d H:i:s'));
-      else return '';
+        if ($value instanceof MeekroDBEval) return $value->text;
+        else if ($value instanceof DateTime) return $this->escape($value->format('Y-m-d H:i:s'));
+        else return '';
     }
 
     if (is_null($value)) return $this->usenull ? 'NULL' : "''";
@@ -490,33 +490,33 @@ 
     else if (is_float($value)) return $value;
 
     else if (is_array($value)) {
-      // non-assoc array?
-      if (array_values($value) === $value) {
+        // non-assoc array?
+        if (array_values($value) === $value) {
         if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
         else return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
-      }
+        }
 
-      $pairs = array();
-      foreach ($value as $k => $v) {
+        $pairs = array();
+        foreach ($value as $k => $v) {
         $pairs[] = $this->formatTableName($k) . '=' . $this->sanitize($v);
-      }
+        }
 
-      return implode(', ', $pairs);
+        return implode(', ', $pairs);
     }
     else return $this->escape($value);
-  }
+    }
 
-  protected function parseTS($ts) {
+    protected function parseTS($ts) {
     if (is_string($ts)) return date('Y-m-d H:i:s', strtotime($ts));
     else if (is_object($ts) && ($ts instanceof DateTime)) return $ts->format('Y-m-d H:i:s');
-  }
+    }
 
-  protected function intval($var) {
+    protected function intval($var) {
     if (PHP_INT_SIZE == 8) return intval($var);
     return floor(doubleval($var));
-  }
+    }
 
-  protected function parseQueryParams() {
+    protected function parseQueryParams() {
     $args = func_get_args();
     $chunkyQuery = call_user_func_array(array($this, 'preparseQueryParams'), $args);
 
@@ -524,57 +524,57 @@ 
     $array_types = array('ls', 'li', 'ld', 'lb', 'll', 'lt');
 
     foreach ($chunkyQuery as $chunk) {
-      if (is_string($chunk)) {
+        if (is_string($chunk)) {
         $query .= $chunk;
         continue;
-      }
+        }
 
-      $type = $chunk['type'];
-      $arg = $chunk['value'];
-      $result = '';
+        $type = $chunk['type'];
+        $arg = $chunk['value'];
+        $result = '';
 
-      if ($type != '?') {
+        if ($type != '?') {
         $is_array_type = in_array($type, $array_types, true);
         if ($is_array_type && !is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
         else if (!$is_array_type && is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
-      }
+        }
 
-      if ($type == 's') $result = $this->escape($arg);
-      else if ($type == 'i') $result = $this->intval($arg);
-      else if ($type == 'd') $result = doubleval($arg);
-      else if ($type == 'b') $result = $this->formatTableName($arg);
-      else if ($type == 'l') $result = $arg;
-      else if ($type == 'ss') $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
-      else if ($type == 't') $result = $this->escape($this->parseTS($arg));
+        if ($type == 's') $result = $this->escape($arg);
+        else if ($type == 'i') $result = $this->intval($arg);
+        else if ($type == 'd') $result = doubleval($arg);
+        else if ($type == 'b') $result = $this->formatTableName($arg);
+        else if ($type == 'l') $result = $arg;
+        else if ($type == 'ss') $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
+        else if ($type == 't') $result = $this->escape($this->parseTS($arg));
 
-      else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
-      else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
-      else if ($type == 'ld') $result = array_map('doubleval', $arg);
-      else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
-      else if ($type == 'll') $result = $arg;
-      else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
+        else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
+        else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
+        else if ($type == 'ld') $result = array_map('doubleval', $arg);
+        else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
+        else if ($type == 'll') $result = $arg;
+        else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
 
-      else if ($type == '?') $result = $this->sanitize($arg);
+        else if ($type == '?') $result = $this->sanitize($arg);
 
-      else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+        else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
 
-      if (is_array($result)) $result = '(' . implode(',', $result) . ')';
+        if (is_array($result)) $result = '(' . implode(',', $result) . ')';
 
-      $query .= $result;
+        $query .= $result;
     }
 
     return $query;
-  }
+    }
 
-  protected function prependCall($function, $args, $prepend) { array_unshift($args, $prepend); return call_user_func_array($function, $args); }
-  public function query() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'assoc'); }
-  public function queryAllLists() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'list'); }
-  public function queryFullColumns() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'full'); }
+    protected function prependCall($function, $args, $prepend) { array_unshift($args, $prepend); return call_user_func_array($function, $args); }
+    public function query() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'assoc'); }
+    public function queryAllLists() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'list'); }
+    public function queryFullColumns() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'full'); }
 
-  public function queryRaw() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_buf'); }
-  public function queryRawUnbuf() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_unbuf'); }
+    public function queryRaw() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_buf'); }
+    public function queryRawUnbuf() { $args = func_get_args(); return $this->prependCall(array($this, 'queryHelper'), $args, 'raw_unbuf'); }
 
-  protected function queryHelper() {
+    protected function queryHelper() {
     $args = func_get_args();
     $type = array_shift($args);
     $db = $this->get();
@@ -584,23 +584,23 @@ 
     $full_names = false;
 
     switch ($type) {
-      case 'assoc':
+        case 'assoc':
         break;
-      case 'list':
+        case 'list':
         $row_type = 'list';
         break;
-      case 'full':
+        case 'full':
         $row_type = 'list';
         $full_names = true;
         break;
-      case 'raw_buf':
+        case 'raw_buf':
         $row_type = 'raw';
         break;
-      case 'raw_unbuf':
+        case 'raw_unbuf':
         $is_buffered = false;
         $row_type = 'raw';
         break;
-      default:
+        default:
         $this->nonSQLError('Error -- invalid argument to queryHelper!');
     }
 
@@ -613,41 +613,41 @@ 
 
     // ----- BEGIN ERROR HANDLING
     if (!$sql || $db->error) {
-      if ($this->error_handler) {
+        if ($this->error_handler) {
         $db_error = $db->error;
         $db_errno = $db->errno;
     $db->query(
-      "INSERT INTO ".$GLOBALS['pre']."log_system SET
+        "INSERT INTO ".$GLOBALS['pre']."log_system SET
       date=".time().",
       qui=".$_SESSION['user_id'].",
       label='Query: ".addslashes($sql)."<br />Error: ".addslashes($db_error)."<br />@ ".mysqli_real_escape_string($link, filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_STRING))."',
       type='error'",
-      MYSQLI_USE_RESULT
+        MYSQLI_USE_RESULT
     );
 
         $error_handler = is_callable($this->error_handler) ? $this->error_handler : 'meekrodb_error_handler';
 
         call_user_func($error_handler, array(
-          'type' => 'sql',
-          'query' => $sql,
-          'error' => $db_error,
-          'code' => $db_errno
+            'type' => 'sql',
+            'query' => $sql,
+            'error' => $db_error,
+            'code' => $db_errno
         ));
-      }
+        }
 
-      if ($this->throw_exception_on_error) {
+        if ($this->throw_exception_on_error) {
         $e = new MeekroDBException($db_error, $sql, $db_errno);
         throw $e;
-      }
+        }
     } else if ($this->success_handler) {
-      $runtime = sprintf('%f', $runtime * 1000);
-      $success_handler = is_callable($this->success_handler) ? $this->success_handler : 'meekrodb_debugmode_handler';
+        $runtime = sprintf('%f', $runtime * 1000);
+        $success_handler = is_callable($this->success_handler) ? $this->success_handler : 'meekrodb_debugmode_handler';
 
-      call_user_func($success_handler, array(
+        call_user_func($success_handler, array(
         'query' => $sql,
         'runtime' => $runtime,
         'affected' => $db->affected_rows
-      ));
+        ));
     }
 
     // ----- END ERROR HANDLING
@@ -664,45 +664,45 @@ 
     $return = array();
 
     if ($full_names) {
-      $infos = array();
-      foreach ($result->fetch_fields() as $info) {
+        $infos = array();
+        foreach ($result->fetch_fields() as $info) {
         if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
         else $infos[] = $info->name;
-      }
+        }
     }
 
     while ($row = ($row_type == 'assoc' ? $result->fetch_assoc() : $result->fetch_row())) {
-      if ($full_names) $row = array_combine($infos, $row);
-      $return[] = $row;
+        if ($full_names) $row = array_combine($infos, $row);
+        $return[] = $row;
     }
 
     // free results
     $result->free();
     while ($db->more_results()) {
-      $db->next_result();
-      if ($result = $db->use_result()) $result->free();
+        $db->next_result();
+        if ($result = $db->use_result()) $result->free();
     }
 
     return $return;
-  }
+    }
 
-  public function queryOneRow() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstRow'), $args); }
-  public function queryFirstRow() {
+    public function queryOneRow() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstRow'), $args); }
+    public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
     if (! $result) return null;
     return reset($result);
-  }
+    }
 
-  public function queryOneList() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstList'), $args); }
-  public function queryFirstList() {
+    public function queryOneList() { $args = func_get_args(); return call_user_func_array(array($this, 'queryFirstList'), $args); }
+    public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
     if (! $result) return null;
     return reset($result);
-  }
+    }
 
-  public function queryFirstColumn() {
+    public function queryFirstColumn() {
     $args = func_get_args();
     $results = call_user_func_array(array($this, 'queryAllLists'), $args);
     $ret = array();
@@ -710,13 +710,13 @@ 
     if (!count($results) || !count($results[0])) return $ret;
 
     foreach ($results as $row) {
-      $ret[] = $row[0];
+        $ret[] = $row[0];
     }
 
     return $ret;
-  }
+    }
 
-  public function queryOneColumn() {
+    public function queryOneColumn() {
     $args = func_get_args();
     $column = array_shift($args);
     $results = call_user_func_array(array($this, 'query'), $args);
@@ -724,103 +724,103 @@ 
 
     if (!count($results) || !count($results[0])) return $ret;
     if ($column === null) {
-      $keys = array_keys($results[0]);
-      $column = $keys[0];
+        $keys = array_keys($results[0]);
+        $column = $keys[0];
     }
 
     foreach ($results as $row) {
-      $ret[] = $row[$column];
+        $ret[] = $row[$column];
     }
 
     return $ret;
-  }
+    }
 
-  public function queryFirstField() {
+    public function queryFirstField() {
     $args = func_get_args();
     $row = call_user_func_array(array($this, 'queryFirstList'), $args);
     if ($row == null) return null;
     return $row[0];
-  }
+    }
 
-  public function queryOneField() {
+    public function queryOneField() {
     $args = func_get_args();
     $column = array_shift($args);
 
     $row = call_user_func_array(array($this, 'queryOneRow'), $args);
     if ($row == null) {
-      return null;
+        return null;
     } else if ($column === null) {
-      $keys = array_keys($row);
-      $column = $keys[0];
+        $keys = array_keys($row);
+        $column = $keys[0];
     }
 
     return $row[$column];
-  }
+    }
 }
 
 class WhereClause {
-  public $type = 'and'; //AND or OR
-  public $negate = false;
-  public $clauses = array();
+    public $type = 'and'; //AND or OR
+    public $negate = false;
+    public $clauses = array();
 
-  function __construct($type) {
+    function __construct($type) {
     $type = strtolower($type);
     if ($type !== 'or' && $type !== 'and') DB::nonSQLError('you must use either WhereClause(and) or WhereClause(or)');
     $this->type = $type;
-  }
+    }
 
-  function add() {
+    function add() {
     $args = func_get_args();
     $sql = array_shift($args);
 
     if ($sql instanceof WhereClause) {
-      $this->clauses[] = $sql;
+        $this->clauses[] = $sql;
     } else {
-      $this->clauses[] = array('sql' => $sql, 'args' => $args);
+        $this->clauses[] = array('sql' => $sql, 'args' => $args);
+    }
     }
-  }
 
-  function negateLast() {
+    function negateLast() {
     $i = count($this->clauses) - 1;
     if (!isset($this->clauses[$i])) return;
 
     if ($this->clauses[$i] instanceof WhereClause) {
-      $this->clauses[$i]->negate();
+        $this->clauses[$i]->negate();
     } else {
-      $this->clauses[$i]['sql'] = 'NOT (' . $this->clauses[$i]['sql'] . ')';
+        $this->clauses[$i]['sql'] = 'NOT (' . $this->clauses[$i]['sql'] . ')';
+    }
     }
-  }
 
-  function negate() {
+    function negate() {
     $this->negate = ! $this->negate;
-  }
+    }
 
-  function addClause($type) {
+    function addClause($type) {
     $r = new WhereClause($type);
     $this->add($r);
     return $r;
-  }
+    }
 
-  function count() {
+    function count() {
     return count($this->clauses);
-  }
+    }
 
-  function textAndArgs() {
+    function textAndArgs() {
     $sql = array();
     $args = array();
 
     if (count($this->clauses) == 0) return array('(1)', $args);
 
     foreach ($this->clauses as $clause) {
-      if ($clause instanceof WhereClause) {
+        if ($clause instanceof WhereClause) {
         list($clause_sql, $clause_args) = $clause->textAndArgs();
-      } else {
+        } else {
         $clause_sql = $clause['sql'];
         $clause_args = $clause['args'];
-      }
+        }
 
-      $sql[] = "($clause_sql)";
-      $args = array_merge($args, $clause_args);
+        $sql[] = "($clause_sql)";
+        $args = array_merge($args, $clause_args);
     }
 
     if ($this->type == 'and') $sql = implode(' AND ', $sql);
@@ -828,111 +828,111 @@ 
 
     if ($this->negate) $sql = '(NOT ' . $sql . ')';
     return array($sql, $args);
-  }
+    }
 
-  // backwards compatability
-  // we now return full WhereClause object here and evaluate it in preparseQueryParams
-  function text() { return $this; }
+    // backwards compatability
+    // we now return full WhereClause object here and evaluate it in preparseQueryParams
+    function text() { return $this; }
 }
 
 class DBTransaction {
-  private $committed = false;
+    private $committed = false;
 
-  function __construct() {
+    function __construct() {
     DB::startTransaction();
-  }
-  function __destruct() {
+    }
+    function __destruct() {
     if (! $this->committed) DB::rollback();
-  }
-  function commit() {
+    }
+    function commit() {
     DB::commit();
     $this->committed = true;
-  }
+    }
 
 
 }
 
 class MeekroDBException extends Exception {
-  protected $query = '';
+    protected $query = '';
 
-  function __construct($message='', $query='', $code = 0) {
+    function __construct($message='', $query='', $code = 0) {
     parent::__construct($message);
     $this->query = $query;
-  $this->code = $code;
-  }
+    $this->code = $code;
+    }
 
-  public function getQuery() { return $this->query; }
+    public function getQuery() { return $this->query; }
 }
 
 class DBHelper {
-  /*
+    /*
     verticalSlice
     1. For an array of assoc rays, return an array of values for a particular key
     2. if $keyfield is given, same as above but use that hash key as the key in new array
   */
 
-  public static function verticalSlice($array, $field, $keyfield = null) {
+    public static function verticalSlice($array, $field, $keyfield = null) {
     $array = (array) $array;
 
     $R = array();
     foreach ($array as $obj) {
-      if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
 
-      if ($keyfield) {
+        if ($keyfield) {
         if (! array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
         $R[$obj[$keyfield]] = $obj[$field];
-      } else {
+        } else {
         $R[] = $obj[$field];
-      }
+        }
     }
     return $R;
-  }
+    }
 
-  /*
+    /*
     reIndex
     For an array of assoc rays, return a new array of assoc rays using a certain field for keys
   */
 
-  public static function reIndex() {
+    public static function reIndex() {
     $fields = func_get_args();
     $array = array_shift($fields);
     $array = (array) $array;
 
     $R = array();
     foreach ($array as $obj) {
-      $target =& $R;
+        $target =& $R;
 
-      foreach ($fields as $field) {
+        foreach ($fields as $field) {
         if (! array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
 
         $nextkey = $obj[$field];
         $target =& $target[$nextkey];
-      }
-      $target = $obj;
+        }
+        $target = $obj;
     }
     return $R;
-  }
+    }
 }
 
 function meekrodb_error_handler($params) {
-  echo prepareExchangedData('[{"error" : "'.$params['error'].'"}]', "encode");
+    echo prepareExchangedData('[{"error" : "'.$params['error'].'"}]', "encode");
 
-  die;
+    die;
 }
 
 function meekrodb_debugmode_handler($params) {
-  echo "QUERY: " . $params['query'] . " [" . $params['runtime'] . " ms]";
-  if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+    echo "QUERY: " . $params['query'] . " [" . $params['runtime'] . " ms]";
+    if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
     echo "\n";
-  } else {
+    } else {
     echo "<br>\n";
-  }
+    }
 }
 
 class MeekroDBEval {
-  public $text = '';
+    public $text = '';
 
-  function __construct($text) {
+    function __construct($text) {
     $this->text = $text;
-  }
+    }
 }
\ No newline at end of file

Spacing +49 added lines, -49 removed lines

@@ -142,7 +142,7 @@ 
   public $nested_transactions_count = 0;
 
 
-  public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
+  public function __construct($host = null, $user = null, $password = null, $dbName = null, $port = null, $encoding = null) {
     if ($host === null) $host = DB::$host;
     if ($user === null) $user = DB::$user;
     if ($password === null) $password = DB::$password;
@@ -162,13 +162,13 @@ 
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-      if (! $this->port) $this->port = ini_get('mysqli.default_port');
+      if (!$this->port) $this->port = ini_get('mysqli.default_port');
       $this->current_db = $this->dbName;
       
       $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
 
       if ($mysql->connect_error) {
-        $this->nonSQLError('Unable to connect to MySQL server! Error: ' . $mysql->connect_error);
+        $this->nonSQLError('Unable to connect to MySQL server! Error: '.$mysql->connect_error);
       }
 
       $mysql->set_charset($this->encoding);
@@ -216,14 +216,14 @@ 
   public function useDB() { $args = func_get_args(); return call_user_func_array(array($this, 'setDB'), $args); }
   public function setDB($dbName) {
     $db = $this->get();
-    if (! $db->select_db($dbName)) $this->nonSQLError("Unable to set database to $dbName");
+    if (!$db->select_db($dbName)) $this->nonSQLError("Unable to set database to $dbName");
     $this->current_db = $dbName;
   }
 
 
   public function startTransaction() {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if (!$this->nested_transactions || $this->nested_transactions_count == 0) {
@@ -237,9 +237,9 @@ 
     return $this->nested_transactions_count;
   }
 
-  public function commit($all=false) {
+  public function commit($all = false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
@@ -255,9 +255,9 @@ 
     return $this->nested_transactions_count;
   }
 
-  public function rollback($all=false) {
+  public function rollback($all = false) {
     if ($this->nested_transactions && $this->serverVersion() < '5.5') {
-      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
+      return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL ".$this->serverVersion());
     }
 
     if ($this->nested_transactions && $this->nested_transactions_count > 0)
@@ -277,7 +277,7 @@ 
     $table = trim($table, '`');
 
     if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
-    else return '`' . str_replace('`', '``', $table) . '`';
+    else return '`'.str_replace('`', '``', $table).'`';
   }
 
   public function update() {
@@ -286,7 +286,7 @@ 
     $params = array_shift($args);
     $where = array_shift($args);
 
-    $query = "UPDATE %b SET %? WHERE " . $where;
+    $query = "UPDATE %b SET %? WHERE ".$where;
 
     array_unshift($args, $params);
     array_unshift($args, $table);
@@ -294,14 +294,14 @@ 
     return call_user_func_array(array($this, 'query'), $args);
   }
 
-  public function insertOrReplace($which, $table, $datas, $options=array()) {
+  public function insertOrReplace($which, $table, $datas, $options = array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
       foreach ($datas as $datum) {
         ksort($datum);
-        if (! $keys) $keys = array_keys($datum);
+        if (!$keys) $keys = array_keys($datum);
         $values[] = array_values($datum);
       }
 
@@ -336,7 +336,7 @@ 
     $table = array_shift($args);
     $data = array_shift($args);
 
-    if (! isset($args[0])) { // update will have all the data of the insert
+    if (!isset($args[0])) { // update will have all the data of the insert
       if (isset($data[0]) && is_array($data[0])) { //multiple insert rows specified -- failing!
         $this->nonSQLError("Badly formatted insertUpdate() query -- you didn't specify the update component!");
       }
@@ -391,20 +391,20 @@ 
     $named_seperator_length = strlen($this->named_param_seperator);
 
     $types = array(
-      $this->param_char . 'll', // list of literals
-      $this->param_char . 'ls', // list of strings
-      $this->param_char . 'l',  // literal
-      $this->param_char . 'li', // list of integers
-      $this->param_char . 'ld', // list of decimals
-      $this->param_char . 'lb', // list of backticks
-      $this->param_char . 'lt', // list of timestamps
-      $this->param_char . 's',  // string
-      $this->param_char . 'i',  // integer
-      $this->param_char . 'd',  // double / decimal
-      $this->param_char . 'b',  // backtick
-      $this->param_char . 't',  // timestamp
-      $this->param_char . '?',  // infer type
-      $this->param_char . 'ss'  // search string (like string, surrounded with %'s)
+      $this->param_char.'ll', // list of literals
+      $this->param_char.'ls', // list of strings
+      $this->param_char.'l', // literal
+      $this->param_char.'li', // list of integers
+      $this->param_char.'ld', // list of decimals
+      $this->param_char.'lb', // list of backticks
+      $this->param_char.'lt', // list of timestamps
+      $this->param_char.'s', // string
+      $this->param_char.'i', // integer
+      $this->param_char.'d', // double / decimal
+      $this->param_char.'b', // backtick
+      $this->param_char.'t', // timestamp
+      $this->param_char.'?', // infer type
+      $this->param_char.'ss'  // search string (like string, surrounded with %'s)
     );
 
     // generate list of all MeekroDB variables in our query, and their position
@@ -435,7 +435,7 @@ 
       // handle numbered parameters
       if ($arg_number_length = strspn($sql, '0123456789', $new_pos_back)) {
         $arg_number = substr($sql, $new_pos_back, $arg_number_length);
-        if (! array_key_exists($arg_number, $args_all)) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (!array_key_exists($arg_number, $args_all)) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
 
         $arg = $args_all[$arg_number];
 
@@ -446,7 +446,7 @@ 
 
         $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
         if (count($args_all) != 1 || !is_array($args_all[0])) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
-        if (! array_key_exists($arg_number, $args_all[0])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (!array_key_exists($arg_number, $args_all[0])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
 
         $arg = $args_all[0][$arg_number];
 
@@ -475,7 +475,7 @@ 
     return $chunkyQuery;
   }
 
-  protected function escape($str) { return "'" . $this->get()->real_escape_string(strval($str)) . "'"; }
+  protected function escape($str) { return "'".$this->get()->real_escape_string(strval($str))."'"; }
 
   protected function sanitize($value) {
     if (is_object($value)) {
@@ -493,12 +493,12 @@ 
       // non-assoc array?
       if (array_values($value) === $value) {
         if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
-        else return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        else return '('.implode(', ', array_map(array($this, 'sanitize'), $value)).')';
       }
 
       $pairs = array();
       foreach ($value as $k => $v) {
-        $pairs[] = $this->formatTableName($k) . '=' . $this->sanitize($v);
+        $pairs[] = $this->formatTableName($k).'='.$this->sanitize($v);
       }
 
       return implode(', ', $pairs);
@@ -544,7 +544,7 @@ 
       else if ($type == 'd') $result = doubleval($arg);
       else if ($type == 'b') $result = $this->formatTableName($arg);
       else if ($type == 'l') $result = $arg;
-      else if ($type == 'ss') $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
+      else if ($type == 'ss') $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
       else if ($type == 't') $result = $this->escape($this->parseTS($arg));
 
       else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
@@ -558,7 +558,7 @@ 
 
       else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
 
-      if (is_array($result)) $result = '(' . implode(',', $result) . ')';
+      if (is_array($result)) $result = '('.implode(',', $result).')';
 
       $query .= $result;
     }
@@ -666,7 +666,7 @@ 
     if ($full_names) {
       $infos = array();
       foreach ($result->fetch_fields() as $info) {
-        if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
+        if (strlen($info->table)) $infos[] = $info->table.'.'.$info->name;
         else $infos[] = $info->name;
       }
     }
@@ -690,7 +690,7 @@ 
   public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
-    if (! $result) return null;
+    if (!$result) return null;
     return reset($result);
   }
 
@@ -698,7 +698,7 @@ 
   public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
-    if (! $result) return null;
+    if (!$result) return null;
     return reset($result);
   }
 
@@ -787,12 +787,12 @@ 
     if ($this->clauses[$i] instanceof WhereClause) {
       $this->clauses[$i]->negate();
     } else {
-      $this->clauses[$i]['sql'] = 'NOT (' . $this->clauses[$i]['sql'] . ')';
+      $this->clauses[$i]['sql'] = 'NOT ('.$this->clauses[$i]['sql'].')';
     }
   }
 
   function negate() {
-    $this->negate = ! $this->negate;
+    $this->negate = !$this->negate;
   }
 
   function addClause($type) {
@@ -826,7 +826,7 @@ 
     if ($this->type == 'and') $sql = implode(' AND ', $sql);
     else $sql = implode(' OR ', $sql);
 
-    if ($this->negate) $sql = '(NOT ' . $sql . ')';
+    if ($this->negate) $sql = '(NOT '.$sql.')';
     return array($sql, $args);
   }
 
@@ -842,7 +842,7 @@ 
     DB::startTransaction();
   }
   function __destruct() {
-    if (! $this->committed) DB::rollback();
+    if (!$this->committed) DB::rollback();
   }
   function commit() {
     DB::commit();
@@ -855,7 +855,7 @@ 
 class MeekroDBException extends Exception {
   protected $query = '';
 
-  function __construct($message='', $query='', $code = 0) {
+  function __construct($message = '', $query = '', $code = 0) {
     parent::__construct($message);
     $this->query = $query;
   $this->code = $code;
@@ -876,10 +876,10 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-      if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+      if (!array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
 
       if ($keyfield) {
-        if (! array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (!array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
         $R[$obj[$keyfield]] = $obj[$field];
       } else {
         $R[] = $obj[$field];
@@ -900,13 +900,13 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-      $target =& $R;
+      $target = & $R;
 
       foreach ($fields as $field) {
-        if (! array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
+        if (!array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
 
         $nextkey = $obj[$field];
-        $target =& $target[$nextkey];
+        $target = & $target[$nextkey];
       }
       $target = $obj;
     }
@@ -921,7 +921,7 @@ 
 }
 
 function meekrodb_debugmode_handler($params) {
-  echo "QUERY: " . $params['query'] . " [" . $params['runtime'] . " ms]";
+  echo "QUERY: ".$params['query']." [".$params['runtime']." ms]";
   if (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
     echo "\n";
   } else {

Braces +241 added lines, -97 removed lines

@@ -47,15 +47,33 @@ 
       $mdb = DB::$mdb = new MeekroDB();
     }
 
-    if ($mdb->param_char !== DB::$param_char) $mdb->param_char = DB::$param_char;
-    if ($mdb->named_param_seperator !== DB::$named_param_seperator) $mdb->named_param_seperator = DB::$named_param_seperator;
-    if ($mdb->success_handler !== DB::$success_handler) $mdb->success_handler = DB::$success_handler;
-    if ($mdb->error_handler !== DB::$error_handler) $mdb->error_handler = DB::$error_handler;
-    if ($mdb->throw_exception_on_error !== DB::$throw_exception_on_error) $mdb->throw_exception_on_error = DB::$throw_exception_on_error;
-    if ($mdb->nonsql_error_handler !== DB::$nonsql_error_handler) $mdb->nonsql_error_handler = DB::$nonsql_error_handler;
-    if ($mdb->throw_exception_on_nonsql_error !== DB::$throw_exception_on_nonsql_error) $mdb->throw_exception_on_nonsql_error = DB::$throw_exception_on_nonsql_error;
-    if ($mdb->nested_transactions !== DB::$nested_transactions) $mdb->nested_transactions = DB::$nested_transactions;
-    if ($mdb->usenull !== DB::$usenull) $mdb->usenull = DB::$usenull;
+    if ($mdb->param_char !== DB::$param_char) {
+        $mdb->param_char = DB::$param_char;
+    }
+    if ($mdb->named_param_seperator !== DB::$named_param_seperator) {
+        $mdb->named_param_seperator = DB::$named_param_seperator;
+    }
+    if ($mdb->success_handler !== DB::$success_handler) {
+        $mdb->success_handler = DB::$success_handler;
+    }
+    if ($mdb->error_handler !== DB::$error_handler) {
+        $mdb->error_handler = DB::$error_handler;
+    }
+    if ($mdb->throw_exception_on_error !== DB::$throw_exception_on_error) {
+        $mdb->throw_exception_on_error = DB::$throw_exception_on_error;
+    }
+    if ($mdb->nonsql_error_handler !== DB::$nonsql_error_handler) {
+        $mdb->nonsql_error_handler = DB::$nonsql_error_handler;
+    }
+    if ($mdb->throw_exception_on_nonsql_error !== DB::$throw_exception_on_nonsql_error) {
+        $mdb->throw_exception_on_nonsql_error = DB::$throw_exception_on_nonsql_error;
+    }
+    if ($mdb->nested_transactions !== DB::$nested_transactions) {
+        $mdb->nested_transactions = DB::$nested_transactions;
+    }
+    if ($mdb->usenull !== DB::$usenull) {
+        $mdb->usenull = DB::$usenull;
+    }
 
     return $mdb;
   }
@@ -143,12 +161,24 @@ 
 
 
   public function __construct($host=null, $user=null, $password=null, $dbName=null, $port=null, $encoding=null) {
-    if ($host === null) $host = DB::$host;
-    if ($user === null) $user = DB::$user;
-    if ($password === null) $password = DB::$password;
-    if ($dbName === null) $dbName = DB::$dbName;
-    if ($port === null) $port = DB::$port;
-    if ($encoding === null) $encoding = DB::$encoding;
+    if ($host === null) {
+        $host = DB::$host;
+    }
+    if ($user === null) {
+        $user = DB::$user;
+    }
+    if ($password === null) {
+        $password = DB::$password;
+    }
+    if ($dbName === null) {
+        $dbName = DB::$dbName;
+    }
+    if ($port === null) {
+        $port = DB::$port;
+    }
+    if ($encoding === null) {
+        $encoding = DB::$encoding;
+    }
 
     $this->host = $host;
     $this->user = $user;
@@ -162,7 +192,9 @@ 
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-      if (! $this->port) $this->port = ini_get('mysqli.default_port');
+      if (! $this->port) {
+          $this->port = ini_get('mysqli.default_port');
+      }
       $this->current_db = $this->dbName;
       
       $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
@@ -182,7 +214,9 @@ 
   public function disconnect() {
     $mysqli = $this->internal_mysql;
     if ($mysqli instanceof MySQLi) {
-      if ($thread_id = $mysqli->thread_id) $mysqli->kill($thread_id);
+      if ($thread_id = $mysqli->thread_id) {
+          $mysqli->kill($thread_id);
+      }
       $mysqli->close();
     }
     $this->internal_mysql = null;
@@ -216,7 +250,9 @@ 
   public function useDB() { $args = func_get_args(); return call_user_func_array(array($this, 'setDB'), $args); }
   public function setDB($dbName) {
     $db = $this->get();
-    if (! $db->select_db($dbName)) $this->nonSQLError("Unable to set database to $dbName");
+    if (! $db->select_db($dbName)) {
+        $this->nonSQLError("Unable to set database to $dbName");
+    }
     $this->current_db = $dbName;
   }
 
@@ -242,8 +278,9 @@ 
       return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
-    if ($this->nested_transactions && $this->nested_transactions_count > 0)
-      $this->nested_transactions_count--;
+    if ($this->nested_transactions && $this->nested_transactions_count > 0) {
+          $this->nested_transactions_count--;
+    }
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
       $this->nested_transactions_count = 0;
@@ -260,8 +297,9 @@ 
       return $this->nonSQLError("Nested transactions are only available on MySQL 5.5 and greater. You are using MySQL " . $this->serverVersion());
     }
 
-    if ($this->nested_transactions && $this->nested_transactions_count > 0)
-      $this->nested_transactions_count--;
+    if ($this->nested_transactions && $this->nested_transactions_count > 0) {
+          $this->nested_transactions_count--;
+    }
 
     if (!$this->nested_transactions || $all || $this->nested_transactions_count == 0) {
       $this->nested_transactions_count = 0;
@@ -276,8 +314,11 @@ 
   protected function formatTableName($table) {
     $table = trim($table, '`');
 
-    if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
-    else return '`' . str_replace('`', '``', $table) . '`';
+    if (strpos($table, '.')) {
+        return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
+    } else {
+        return '`' . str_replace('`', '``', $table) . '`';
+    }
   }
 
   public function update() {
@@ -301,7 +342,9 @@ 
     if (isset($datas[0]) && is_array($datas[0])) {
       foreach ($datas as $datum) {
         ksort($datum);
-        if (! $keys) $keys = array_keys($datum);
+        if (! $keys) {
+            $keys = array_keys($datum);
+        }
         $values[] = array_values($datum);
       }
 
@@ -310,7 +353,9 @@ 
       $values = array_values($datas);
     }
 
-    if (isset($options['ignore']) && $options['ignore']) $which = 'INSERT IGNORE';
+    if (isset($options['ignore']) && $options['ignore']) {
+        $which = 'INSERT IGNORE';
+    }
 
     if (isset($options['update']) && is_array($options['update']) && $options['update'] && strtolower($which) == 'insert') {
       if (array_values($options['update']) !== $options['update']) {
@@ -344,8 +389,11 @@ 
       $args[0] = $data;
     }
 
-    if (is_array($args[0])) $update = $args[0];
-    else $update = $args;
+    if (is_array($args[0])) {
+        $update = $args[0];
+    } else {
+        $update = $args;
+    }
 
     return $this->insertOrReplace('INSERT', $table, $data, array('update' => $update));
   }
@@ -376,7 +424,9 @@ 
     }
 
     $result = $this->queryFirstColumn('SHOW TABLES');
-    if (isset($olddb)) $this->useDB($olddb);
+    if (isset($olddb)) {
+        $this->useDB($olddb);
+    }
     return $result;
   }
 
@@ -385,7 +435,9 @@ 
     $sql = trim(strval(array_shift($args)));
     $args_all = $args;
 
-    if (count($args_all) == 0) return array($sql);
+    if (count($args_all) == 0) {
+        return array($sql);
+    }
 
     $param_char_length = strlen($this->param_char);
     $named_seperator_length = strlen($this->named_param_seperator);
@@ -414,7 +466,9 @@ 
       $lastPos = 0;
       while (($pos = strpos($sql, $type, $lastPos)) !== false) {
         $lastPos = $pos + 1;
-        if (isset($posList[$pos]) && strlen($posList[$pos]) > strlen($type)) continue;
+        if (isset($posList[$pos]) && strlen($posList[$pos]) > strlen($type)) {
+            continue;
+        }
         $posList[$pos] = $type;
       }
     }
@@ -435,7 +489,9 @@ 
       // handle numbered parameters
       if ($arg_number_length = strspn($sql, '0123456789', $new_pos_back)) {
         $arg_number = substr($sql, $new_pos_back, $arg_number_length);
-        if (! array_key_exists($arg_number, $args_all)) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (! array_key_exists($arg_number, $args_all)) {
+            $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        }
 
         $arg = $args_all[$arg_number];
 
@@ -445,8 +501,12 @@ 
           $new_pos_back + $named_seperator_length) + $named_seperator_length;
 
         $arg_number = substr($sql, $new_pos_back + $named_seperator_length, $arg_number_length - $named_seperator_length);
-        if (count($args_all) != 1 || !is_array($args_all[0])) $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
-        if (! array_key_exists($arg_number, $args_all[0])) $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        if (count($args_all) != 1 || !is_array($args_all[0])) {
+            $this->nonSQLError("If you use named parameters, the second argument must be an array of parameters");
+        }
+        if (! array_key_exists($arg_number, $args_all[0])) {
+            $this->nonSQLError("Non existent argument reference (arg $arg_number): $sql");
+        }
 
         $arg = $args_all[0][$arg_number];
 
@@ -455,7 +515,9 @@ 
         $arg = array_shift($args);
       }
 
-      if ($new_pos > 0) $chunkyQuery[] = substr($sql, 0, $new_pos);
+      if ($new_pos > 0) {
+          $chunkyQuery[] = substr($sql, 0, $new_pos);
+      }
 
       if (is_object($arg) && ($arg instanceof WhereClause)) {
         list($clause_sql, $clause_args) = $arg->textAndArgs();
@@ -470,7 +532,9 @@ 
       $pos_adj -= $new_pos_back + $arg_number_length;
     }
 
-    if (strlen($sql) > 0) $chunkyQuery[] = $sql;
+    if (strlen($sql) > 0) {
+        $chunkyQuery[] = $sql;
+    }
 
     return $chunkyQuery;
   }
@@ -479,21 +543,31 @@ 
 
   protected function sanitize($value) {
     if (is_object($value)) {
-      if ($value instanceof MeekroDBEval) return $value->text;
-      else if ($value instanceof DateTime) return $this->escape($value->format('Y-m-d H:i:s'));
-      else return '';
+      if ($value instanceof MeekroDBEval) {
+          return $value->text;
+      } else if ($value instanceof DateTime) {
+          return $this->escape($value->format('Y-m-d H:i:s'));
+      } else {
+          return '';
+      }
     }
 
-    if (is_null($value)) return $this->usenull ? 'NULL' : "''";
-    else if (is_bool($value)) return ($value ? 1 : 0);
-    else if (is_int($value)) return $value;
-    else if (is_float($value)) return $value;
-
-    else if (is_array($value)) {
+    if (is_null($value)) {
+        return $this->usenull ? 'NULL' : "''";
+    } else if (is_bool($value)) {
+        return ($value ? 1 : 0);
+    } else if (is_int($value)) {
+        return $value;
+    } else if (is_float($value)) {
+        return $value;
+    } else if (is_array($value)) {
       // non-assoc array?
       if (array_values($value) === $value) {
-        if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
-        else return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        if (is_array($value[0])) {
+            return implode(', ', array_map(array($this, 'sanitize'), $value));
+        } else {
+            return '(' . implode(', ', array_map(array($this, 'sanitize'), $value)) . ')';
+        }
       }
 
       $pairs = array();
@@ -502,17 +576,23 @@ 
       }
 
       return implode(', ', $pairs);
+    } else {
+        return $this->escape($value);
     }
-    else return $this->escape($value);
   }
 
   protected function parseTS($ts) {
-    if (is_string($ts)) return date('Y-m-d H:i:s', strtotime($ts));
-    else if (is_object($ts) && ($ts instanceof DateTime)) return $ts->format('Y-m-d H:i:s');
+    if (is_string($ts)) {
+        return date('Y-m-d H:i:s', strtotime($ts));
+    } else if (is_object($ts) && ($ts instanceof DateTime)) {
+        return $ts->format('Y-m-d H:i:s');
+    }
   }
 
   protected function intval($var) {
-    if (PHP_INT_SIZE == 8) return intval($var);
+    if (PHP_INT_SIZE == 8) {
+        return intval($var);
+    }
     return floor(doubleval($var));
   }
 
@@ -535,30 +615,48 @@ 
 
       if ($type != '?') {
         $is_array_type = in_array($type, $array_types, true);
-        if ($is_array_type && !is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
-        else if (!$is_array_type && is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        if ($is_array_type && !is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
+        } else if (!$is_array_type && is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        }
       }
 
-      if ($type == 's') $result = $this->escape($arg);
-      else if ($type == 'i') $result = $this->intval($arg);
-      else if ($type == 'd') $result = doubleval($arg);
-      else if ($type == 'b') $result = $this->formatTableName($arg);
-      else if ($type == 'l') $result = $arg;
-      else if ($type == 'ss') $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
-      else if ($type == 't') $result = $this->escape($this->parseTS($arg));
-
-      else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
-      else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
-      else if ($type == 'ld') $result = array_map('doubleval', $arg);
-      else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
-      else if ($type == 'll') $result = $arg;
-      else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
-
-      else if ($type == '?') $result = $this->sanitize($arg);
-
-      else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+      if ($type == 's') {
+          $result = $this->escape($arg);
+      } else if ($type == 'i') {
+          $result = $this->intval($arg);
+      } else if ($type == 'd') {
+          $result = doubleval($arg);
+      } else if ($type == 'b') {
+          $result = $this->formatTableName($arg);
+      } else if ($type == 'l') {
+          $result = $arg;
+      } else if ($type == 'ss') {
+          $result = $this->escape("%" . str_replace(array('%', '_'), array('\%', '\_'), $arg) . "%");
+      } else if ($type == 't') {
+          $result = $this->escape($this->parseTS($arg));
+      } else if ($type == 'ls') {
+          $result = array_map(array($this, 'escape'), $arg);
+      } else if ($type == 'li') {
+          $result = array_map(array($this, 'intval'), $arg);
+      } else if ($type == 'ld') {
+          $result = array_map('doubleval', $arg);
+      } else if ($type == 'lb') {
+          $result = array_map(array($this, 'formatTableName'), $arg);
+      } else if ($type == 'll') {
+          $result = $arg;
+      } else if ($type == 'lt') {
+          $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
+      } else if ($type == '?') {
+          $result = $this->sanitize($arg);
+      } else {
+          $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+      }
 
-      if (is_array($result)) $result = '(' . implode(',', $result) . ')';
+      if (is_array($result)) {
+          $result = '(' . implode(',', $result) . ')';
+      }
 
       $query .= $result;
     }
@@ -606,10 +704,15 @@ 
 
     $sql = call_user_func_array(array($this, 'parseQueryParams'), $args);
 
-    if ($this->success_handler) $starttime = microtime(true);
+    if ($this->success_handler) {
+        $starttime = microtime(true);
+    }
     $result = $db->query($sql, $is_buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT);
-    if ($this->success_handler) $runtime = microtime(true) - $starttime;
-    else $runtime = 0;
+    if ($this->success_handler) {
+        $runtime = microtime(true) - $starttime;
+    } else {
+        $runtime = 0;
+    }
 
     // ----- BEGIN ERROR HANDLING
     if (!$sql || $db->error) {
@@ -656,23 +759,33 @@ 
     $this->affected_rows = $db->affected_rows;
 
     // mysqli_result->num_rows won't initially show correct results for unbuffered data
-    if ($is_buffered && ($result instanceof MySQLi_Result)) $this->num_rows = $result->num_rows;
-    else $this->num_rows = null;
+    if ($is_buffered && ($result instanceof MySQLi_Result)) {
+        $this->num_rows = $result->num_rows;
+    } else {
+        $this->num_rows = null;
+    }
 
-    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) return $result;
+    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) {
+        return $result;
+    }
 
     $return = array();
 
     if ($full_names) {
       $infos = array();
       foreach ($result->fetch_fields() as $info) {
-        if (strlen($info->table)) $infos[] = $info->table . '.' . $info->name;
-        else $infos[] = $info->name;
+        if (strlen($info->table)) {
+            $infos[] = $info->table . '.' . $info->name;
+        } else {
+            $infos[] = $info->name;
+        }
       }
     }
 
     while ($row = ($row_type == 'assoc' ? $result->fetch_assoc() : $result->fetch_row())) {
-      if ($full_names) $row = array_combine($infos, $row);
+      if ($full_names) {
+          $row = array_combine($infos, $row);
+      }
       $return[] = $row;
     }
 
@@ -680,7 +793,9 @@ 
     $result->free();
     while ($db->more_results()) {
       $db->next_result();
-      if ($result = $db->use_result()) $result->free();
+      if ($result = $db->use_result()) {
+          $result->free();
+      }
     }
 
     return $return;
@@ -690,7 +805,9 @@ 
   public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
-    if (! $result) return null;
+    if (! $result) {
+        return null;
+    }
     return reset($result);
   }
 
@@ -698,7 +815,9 @@ 
   public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
-    if (! $result) return null;
+    if (! $result) {
+        return null;
+    }
     return reset($result);
   }
 
@@ -707,7 +826,9 @@ 
     $results = call_user_func_array(array($this, 'queryAllLists'), $args);
     $ret = array();
 
-    if (!count($results) || !count($results[0])) return $ret;
+    if (!count($results) || !count($results[0])) {
+        return $ret;
+    }
 
     foreach ($results as $row) {
       $ret[] = $row[0];
@@ -722,7 +843,9 @@ 
     $results = call_user_func_array(array($this, 'query'), $args);
     $ret = array();
 
-    if (!count($results) || !count($results[0])) return $ret;
+    if (!count($results) || !count($results[0])) {
+        return $ret;
+    }
     if ($column === null) {
       $keys = array_keys($results[0]);
       $column = $keys[0];
@@ -738,7 +861,9 @@ 
   public function queryFirstField() {
     $args = func_get_args();
     $row = call_user_func_array(array($this, 'queryFirstList'), $args);
-    if ($row == null) return null;
+    if ($row == null) {
+        return null;
+    }
     return $row[0];
   }
 
@@ -765,7 +890,9 @@ 
 
   function __construct($type) {
     $type = strtolower($type);
-    if ($type !== 'or' && $type !== 'and') DB::nonSQLError('you must use either WhereClause(and) or WhereClause(or)');
+    if ($type !== 'or' && $type !== 'and') {
+        DB::nonSQLError('you must use either WhereClause(and) or WhereClause(or)');
+    }
     $this->type = $type;
   }
 
@@ -782,7 +909,9 @@ 
 
   function negateLast() {
     $i = count($this->clauses) - 1;
-    if (!isset($this->clauses[$i])) return;
+    if (!isset($this->clauses[$i])) {
+        return;
+    }
 
     if ($this->clauses[$i] instanceof WhereClause) {
       $this->clauses[$i]->negate();
@@ -809,7 +938,9 @@ 
     $sql = array();
     $args = array();
 
-    if (count($this->clauses) == 0) return array('(1)', $args);
+    if (count($this->clauses) == 0) {
+        return array('(1)', $args);
+    }
 
     foreach ($this->clauses as $clause) {
       if ($clause instanceof WhereClause) {
@@ -823,10 +954,15 @@ 
       $args = array_merge($args, $clause_args);
     }
 
-    if ($this->type == 'and') $sql = implode(' AND ', $sql);
-    else $sql = implode(' OR ', $sql);
+    if ($this->type == 'and') {
+        $sql = implode(' AND ', $sql);
+    } else {
+        $sql = implode(' OR ', $sql);
+    }
 
-    if ($this->negate) $sql = '(NOT ' . $sql . ')';
+    if ($this->negate) {
+        $sql = '(NOT ' . $sql . ')';
+    }
     return array($sql, $args);
   }
 
@@ -842,7 +978,9 @@ 
     DB::startTransaction();
   }
   function __destruct() {
-    if (! $this->committed) DB::rollback();
+    if (! $this->committed) {
+        DB::rollback();
+    }
   }
   function commit() {
     DB::commit();
@@ -876,10 +1014,14 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-      if (! array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+      if (! array_key_exists($field, $obj)) {
+          die("verticalSlice: array doesn't have requested field\n");
+      }
 
       if ($keyfield) {
-        if (! array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (! array_key_exists($keyfield, $obj)) {
+            die("verticalSlice: array doesn't have requested field\n");
+        }
         $R[$obj[$keyfield]] = $obj[$field];
       } else {
         $R[] = $obj[$field];
@@ -903,7 +1045,9 @@ 
       $target =& $R;
 
       foreach ($fields as $field) {
-        if (! array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
+        if (! array_key_exists($field, $obj)) {
+            die("reIndex: array doesn't have requested field\n");
+        }
 
         $nextkey = $obj[$field];
         $target =& $target[$nextkey];

includes/libraries/Email/Phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param integer $port
      * @param integer $tval
      * @return boolean
      */

Spacing +4 added lines, -4 removed lines

@@ -169,13 +169,13 @@ 
         if (false === $port) {
             $this->port = $this->POP3_PORT;
         } else {
-            $this->port = (integer)$port;
+            $this->port = (integer) $port;
         }
         // If no timeout value provided, use default
         if (false === $timeout) {
             $this->tval = $this->POP3_TIMEOUT;
         } else {
-            $this->tval = (integer)$timeout;
+            $this->tval = (integer) $timeout;
         }
         $this->do_debug = $debug_level;
         $this->username = $username;
@@ -276,11 +276,11 @@ 
         }
 
         // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
+        $this->sendString("USER $username".self::CRLF);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
             // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
+            $this->sendString("PASS $password".self::CRLF);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
                 return true;

includes/libraries/Encryption/Crypt/aesctr.php

Doc Comments +18 added lines, -5 removed lines

@@ -49,6 +49,10 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $rnd
+     * @param integer $Nb
+     */
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
@@ -61,6 +65,9 @@ 
         return $state;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
@@ -73,6 +80,9 @@ 
         return $s;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function shiftRows($s, $Nb)
     {
         // shift row r of state S left by r bytes [é5.1.2]
@@ -88,6 +98,9 @@ 
         return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
@@ -219,10 +232,10 @@ 
     *
     * Unicode multi-byte character safe
     *
-    * @param plaintext source text to be encrypted
+    * @param plaintext string text to be encrypted
     * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
+    * @param nBits     integer of bits to be used in the key (128, 192, or 256)
+    * @return          string text
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
@@ -302,8 +315,8 @@ 
     *
     * @param ciphertext source text to be decrypted
     * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
+    * @param nBits      integer of bits to be used in the key (128, 192, or 256)
+    * @return           string text
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {

Indentation +17 added lines, -17 removed lines

@@ -214,16 +214,16 @@ 
 {
 
     /**
-    * Encrypt a text using AES encryption in Counter mode of operation
-    *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-    *
-    * Unicode multi-byte character safe
-    *
-    * @param plaintext source text to be encrypted
-    * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
-    */
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
     public static function encrypt($plaintext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
@@ -298,13 +298,13 @@ 
     }
 
     /**
-    * Decrypt a text encrypted by AES in counter mode of operation
-    *
-    * @param ciphertext source text to be decrypted
-    * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
-    */
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES

Spacing +107 added lines, -107 removed lines

@@ -20,17 +20,17 @@ 
     public static function cipher($input, $w)
     {
         // main cipher function [é5.1]
-        $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-        $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $state[$i%4][floor($i/4)] = $input[$i];
+        $state = array(); // initialise 4xNb byte-array 'state' with input [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $state[$i % 4][floor($i / 4)] = $input[$i];
         }
 
         $state = self::addRoundKey($state, $w, 0, $Nb);
 
-        for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
+        for ($round = 1; $round < $Nr; $round++) {  // apply Nr rounds
             $state = self::subBytes($state, $Nb);
             $state = self::shiftRows($state, $Nb);
             $state = self::mixColumns($state, $Nb);
@@ -41,9 +41,9 @@ 
         $state = self::shiftRows($state, $Nb);
         $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
-        $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $output[$i] = $state[$i%4][floor($i/4)];
+        $output = array(4 * $Nb); // convert state to 1-d array before returning [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $output[$i] = $state[$i % 4][floor($i / 4)];
         }
 
         return $output;
@@ -52,9 +52,9 @@ 
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
-                $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
+                $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
             }
         }
 
@@ -64,8 +64,8 @@ 
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
                 $s[$r][$c] = self::$sBox[$s[$r][$c]];
             }
         }
@@ -77,26 +77,26 @@ 
     {
         // shift row r of state S left by r bytes [é5.1.2]
         $t = array(4);
-        for ($r=1; $r<4; $r++) {
-            for ($c=0; $c<4; $c++) {
-                $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
+        for ($r = 1; $r < 4; $r++) {
+            for ($c = 0; $c < 4; $c++) {
+                $t[$c] = $s[$r][($c + $r) % $Nb]; // shift into temp copy
             }
-            for ($c=0; $c<4; $c++) {
-                $s[$r][$c] = $t[$c];           // and copy back
+            for ($c = 0; $c < 4; $c++) {
+                $s[$r][$c] = $t[$c]; // and copy back
             }
         }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-        return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+        return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
-        for ($c=0; $c<4; $c++) {
-            $a = array(4);  // 'a' is a copy of the current column from 's'
-            $b = array(4);  // 'b' is aé{02} in GF(2^8)
-            for ($i=0; $i<4; $i++) {
+        for ($c = 0; $c < 4; $c++) {
+            $a = array(4); // 'a' is a copy of the current column from 's'
+            $b = array(4); // 'b' is aé{02} in GF(2^8)
+            for ($i = 0; $i < 4; $i++) {
                 $a[$i] = $s[$i][$c];
-                $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+                $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
             }
             // a[n] ^ b[n] is aé{03} in GF(2^8)
             $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -118,33 +118,33 @@ 
     public static function keyExpansion($key)
     {
         // generate Key Schedule from Cipher Key [é5.2]
-        $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-        $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+        $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
         $w = array();
         $temp = array();
 
-        for ($i=0; $i<$Nk; $i++) {
-            $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+        for ($i = 0; $i < $Nk; $i++) {
+            $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
             $w[$i] = $r;
         }
 
-        for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+        for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++) {
             $w[$i] = array();
-            for ($t=0; $t<4; $t++) {
-                $temp[$t] = $w[$i-1][$t];
+            for ($t = 0; $t < 4; $t++) {
+                $temp[$t] = $w[$i - 1][$t];
             }
             if ($i % $Nk == 0) {
                 $temp = self::subWord(self::rotWord($temp));
-                for ($t=0; $t<4; $t++) {
-                    $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+                for ($t = 0; $t < 4; $t++) {
+                    $temp[$t] ^= self::$rCon[$i / $Nk][$t];
                 }
-            } elseif ($Nk > 6 && $i%$Nk == 4) {
+            } elseif ($Nk > 6 && $i % $Nk == 4) {
                 $temp = self::subWord($temp);
             }
-            for ($t=0; $t<4; $t++) {
-                $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+            for ($t = 0; $t < 4; $t++) {
+                $w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
             }
         }
 
@@ -154,7 +154,7 @@ 
     private static function subWord($w)
     {
         // apply SBox to 4-byte word w
-        for ($i=0; $i<4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
             $w[$i] = self::$sBox[$w[$i]];
         }
 
@@ -165,8 +165,8 @@ 
     {
         // rotate 4-byte word w left by one byte
         $tmp = $w[0];
-        for ($i=0; $i<3; $i++) {
-            $w[$i] = $w[$i+1];
+        for ($i = 0; $i < 3; $i++) {
+            $w[$i] = $w[$i + 1];
         }
         $w[3] = $tmp;
 
@@ -175,22 +175,22 @@ 
 
     // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
     private static $sBox = array(
-            0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-            0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-            0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-            0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-            0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-            0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-            0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-            0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-            0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-            0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-            0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-            0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-            0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-            0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-            0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-            0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
+            0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+            0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+            0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+            0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+            0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+            0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+            0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+            0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+            0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+            0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+            0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+            0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+            0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+            0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+            0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+            0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
     );
 
     // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
@@ -226,72 +226,72 @@ 
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
         // use AES itself to encrypt password to get cipher key (using plain password as source for
         // key expansion) - gives us well encrypted key
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in
         // 1st 8 bytes, block counter in 2nd 8 bytes
         $counterBlock = array();
-        $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
-        $nonceSec = floor($nonce/1000);
-        $nonceMs = $nonce%1000;
+        $nonce = floor(microtime(true) * 1000); // timestamp: milliseconds since 1-Jan-1970
+        $nonceSec = floor($nonce / 1000);
+        $nonceMs = $nonce % 1000;
         // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
         }
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i+4] = $nonceMs & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i + 4] = $nonceMs & 0xff;
         }
         // and convert it to a string to go on the front of the ciphertext
         $ctrTxt = '';
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $ctrTxt .= chr($counterBlock[$i]);
         }
 
         // generate key schedule - an expansion of the key into distinct Key Rounds for each round
         $keySchedule = Aes::keyExpansion($key);
 
-        $blockCount = ceil(strlen($plaintext)/$blockSize);
-        $ciphertxt = array();  // ciphertext as array of strings
+        $blockCount = ceil(strlen($plaintext) / $blockSize);
+        $ciphertxt = array(); // ciphertext as array of strings
 
-        for ($b=0; $b<$blockCount; $b++) {
+        for ($b = 0; $b < $blockCount; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
             // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // -- encrypt counter block --
 
             // block size is reduced on final block
-            $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+            $blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
             $cipherByte = array();
 
-            for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
+            for ($i = 0; $i < $blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
                 $cipherByte[$i] = chr($cipherByte[$i]);
             }
-            $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+            $ciphertxt[$b] = implode('', $cipherByte); // escape troublesome characters in ciphertext
         }
 
         // implode is more efficient than repeated string concatenation
-        $ciphertext = $ctrTxt . implode('', $ciphertxt);
+        $ciphertext = $ctrTxt.implode('', $ciphertxt);
         $ciphertext = base64_encode($ciphertext);
 
         return $ciphertext;
@@ -307,25 +307,25 @@ 
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         $ciphertext = base64_decode($ciphertext);
 
         // use AES to encrypt password (mirroring encrypt routine)
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // recover nonce from 1st element of ciphertext
         $counterBlock = array();
         $ctrTxt = substr($ciphertext, 0, 8);
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
         }
 
@@ -333,29 +333,29 @@ 
         $keySchedule = Aes::keyExpansion($key);
 
         // separate ciphertext into blocks (skipping past initial 8 bytes)
-        $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+        $nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
         $ct = array();
-        for ($b=0; $b<$nBlocks; $b++) {
-            $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+        for ($b = 0; $b < $nBlocks; $b++) {
+            $ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
         }
-        $ciphertext = $ct;  // ciphertext is now array of block-length strings
+        $ciphertext = $ct; // ciphertext is now array of block-length strings
 
         // plaintext will get generated block-by-block into array of block-length strings
         $plaintxt = array();
 
-        for ($b=0; $b<$nBlocks; $b++) {
+        for ($b = 0; $b < $nBlocks; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
             $plaintxtByte = array();
-            for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+            for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
                 // -- xor plaintext with ciphered counter byte-by-byte --
                 $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
                 $plaintxtByte[$i] = chr($plaintxtByte[$i]);
@@ -379,12 +379,12 @@ 
     private static function urs($a, $b)
     {
         $a &= 0xffffffff;
-        $b &= 0x1f;  // (bounds check)
-        if ($a&0x80000000 && $b>0) {   // if left-most bit set
-            $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-            $a = $a >> ($b-1);           //   remaining right-shifts
+        $b &= 0x1f; // (bounds check)
+        if ($a & 0x80000000 && $b > 0) {   // if left-most bit set
+            $a = ($a >> 1) & 0x7fffffff; //   right-shift one bit & clear left-most bit
+            $a = $a >> ($b - 1); //   remaining right-shifts
         } else {                       // otherwise
-            $a = ($a>>$b);               //   use normal right-shift
+            $a = ($a >> $b); //   use normal right-shift
         }
 
         return $a;

includes/libraries/Encryption/Encryption/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -706,7 +706,7 @@
      *
      * @throws Ex\IOException
      *
-     * @return string
+     * @return integer
      */
     public static function writeBytes($stream, $buf, $num_bytes = null)
     {

Spacing +17 added lines, -17 removed lines

@@ -186,7 +186,7 @@ 
         $if = @\fopen($inputFilename, 'rb');
         if ($if === false) {
             throw new Ex\IOException(
-                'Cannot open input file for encrypting: ' .
+                'Cannot open input file for encrypting: '.
                 self::getLastErrorMessage()
             );
         }
@@ -200,7 +200,7 @@ 
         if ($of === false) {
             \fclose($if);
             throw new Ex\IOException(
-                'Cannot open output file for encrypting: ' .
+                'Cannot open output file for encrypting: '.
                 self::getLastErrorMessage()
             );
         }
@@ -250,7 +250,7 @@ 
         $if = @\fopen($inputFilename, 'rb');
         if ($if === false) {
             throw new Ex\IOException(
-                'Cannot open input file for decrypting: ' .
+                'Cannot open input file for decrypting: '.
                 self::getLastErrorMessage()
             );
         }
@@ -265,7 +265,7 @@ 
         if ($of === false) {
             \fclose($if);
             throw new Ex\IOException(
-                'Cannot open output file for decrypting: ' .
+                'Cannot open output file for decrypting: '.
                 self::getLastErrorMessage()
             );
         }
@@ -312,12 +312,12 @@ 
      */
     private static function encryptResourceInternal($inputHandle, $outputHandle, KeyOrPassword $secret)
     {
-        if (! \is_resource($inputHandle)) {
+        if (!\is_resource($inputHandle)) {
             throw new Ex\IOException(
                 'Input handle must be a resource!'
             );
         }
-        if (! \is_resource($outputHandle)) {
+        if (!\is_resource($outputHandle)) {
             throw new Ex\IOException(
                 'Output handle must be a resource!'
             );
@@ -345,7 +345,7 @@ 
         /* Write the header, salt, and IV. */
         self::writeBytes(
             $outputHandle,
-            Core::CURRENT_VERSION . $file_salt . $iv,
+            Core::CURRENT_VERSION.$file_salt.$iv,
             Core::HEADER_VERSION_SIZE + Core::SALT_BYTE_SIZE + $ivsize
         );
 
@@ -362,7 +362,7 @@ 
 
         /* Loop until we reach the end of the input file. */
         $at_file_end = false;
-        while (! (\feof($inputHandle) || $at_file_end)) {
+        while (!(\feof($inputHandle) || $at_file_end)) {
             /* Find out if we can read a full buffer, or only a partial one. */
             $pos = \ftell($inputHandle);
             if ($pos === false) {
@@ -429,12 +429,12 @@ 
      */
     public static function decryptResourceInternal($inputHandle, $outputHandle, KeyOrPassword $secret)
     {
-        if (! \is_resource($inputHandle)) {
+        if (!\is_resource($inputHandle)) {
             throw new Ex\IOException(
                 'Input handle must be a resource!'
             );
         }
-        if (! \is_resource($outputHandle)) {
+        if (!\is_resource($outputHandle)) {
             throw new Ex\IOException(
                 'Output handle must be a resource!'
             );
@@ -528,7 +528,7 @@ 
         $hmac2 = \hash_copy($hmac);
 
         $break = false;
-        while (! $break) {
+        while (!$break) {
             $pos = \ftell($inputHandle);
             if ($pos === false) {
                 throw new Ex\IOException(
@@ -560,14 +560,14 @@ 
                     'Cannot duplicate a hash context'
                 );
             }
-            $macs []= \hash_final($chunk_mac);
+            $macs [] = \hash_final($chunk_mac);
         }
 
         /* Get the final HMAC, which should match the stored one. */
         $final_mac = \hash_final($hmac, true);
 
         /* Verify the HMAC. */
-        if (! Core::hashEquals($final_mac, $stored_mac)) {
+        if (!Core::hashEquals($final_mac, $stored_mac)) {
             throw new Ex\WrongKeyOrModifiedCiphertextException(
                 'Integrity check failed.'
             );
@@ -583,7 +583,7 @@ 
         }
 
         $at_file_end = false;
-        while (! $at_file_end) {
+        while (!$at_file_end) {
             $pos = \ftell($inputHandle);
             if ($pos === false) {
                 throw new Ex\IOException(
@@ -594,7 +594,7 @@ 
             /* Read the next buffer-sized chunk (or less). */
             if ($pos + Core::BUFFER_BYTE_SIZE >= $cipher_end) {
                 $at_file_end = true;
-                $read   = self::readBytes(
+                $read = self::readBytes(
                     $inputHandle,
                     $cipher_end - $pos + 1
                 );
@@ -621,7 +621,7 @@ 
                 throw new Ex\WrongKeyOrModifiedCiphertextException(
                     'File was modified after MAC verification'
                 );
-            } elseif (! Core::hashEquals(\array_shift($macs), $calc)) {
+            } elseif (!Core::hashEquals(\array_shift($macs), $calc)) {
                 throw new Ex\WrongKeyOrModifiedCiphertextException(
                     'File was modified after MAC verification'
                 );
@@ -678,7 +678,7 @@ 
         }
         $buf       = '';
         $remaining = $num_bytes;
-        while ($remaining > 0 && ! \feof($stream)) {
+        while ($remaining > 0 && !\feof($stream)) {
             $read = \fread($stream, $remaining);
 
             if ($read === false) {

includes/libraries/Encryption/PBKDF2/PasswordHash.php

Doc Comments +6 added lines

@@ -74,6 +74,9 @@ 
 }
 
 // Compares two strings $a and $b in length-constant time.
+/**
+ * @param string $a
+ */
 function slow_equals($a, $b)
 {
     $diff = strlen($a) ^ strlen($b);
@@ -99,6 +102,9 @@ 
  * This implementation of PBKDF2 was originally created by https://defuse.ca
  * With improvements by http://www.variations-of-shadow.com
  */
+/**
+ * @param integer $key_length
+ */
 function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
 {
     $algorithm = strtolower($algorithm);

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 {
     // format: algorithm:iterations:salt:hash
     $salt = base64_encode(mcrypt_create_iv(PBKDF2_SALT_BYTE_SIZE, MCRYPT_DEV_URANDOM));
-    return PBKDF2_HASH_ALGORITHM . ":" . PBKDF2_ITERATIONS . ":" .  $salt . ":" .
+    return PBKDF2_HASH_ALGORITHM.":".PBKDF2_ITERATIONS.":".$salt.":".
     base64_encode(pbkdf2(
         PBKDF2_HASH_ALGORITHM,
         $password,
@@ -57,7 +57,7 @@ 
 function validate_password($password, $correct_hash)
 {
     $params = explode(":", $correct_hash);
-    if(count($params) < HASH_SECTIONS)
+    if (count($params) < HASH_SECTIONS)
         return false;
     $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
     return slow_equals(
@@ -66,7 +66,7 @@ 
             $params[HASH_ALGORITHM_INDEX],
             $password,
             $params[HASH_SALT_INDEX],
-            (int)$params[HASH_ITERATION_INDEX],
+            (int) $params[HASH_ITERATION_INDEX],
             strlen($pbkdf2),
             true
         )
@@ -77,7 +77,7 @@ 
 function slow_equals($a, $b)
 {
     $diff = strlen($a) ^ strlen($b);
-    for($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
+    for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
     {
         $diff |= ord($a[$i]) ^ ord($b[$i]);
     }
@@ -102,9 +102,9 @@ 
 function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
 {
     $algorithm = strtolower($algorithm);
-    if(!in_array($algorithm, hash_algos(), true))
+    if (!in_array($algorithm, hash_algos(), true))
         trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-    if($count <= 0 || $key_length <= 0)
+    if ($count <= 0 || $key_length <= 0)
         trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
 
     if (function_exists("hash_pbkdf2")) {
@@ -119,9 +119,9 @@ 
     $block_count = ceil($key_length / $hash_length);
 
     $output = "";
-    for($i = 1; $i <= $block_count; $i++) {
+    for ($i = 1; $i <= $block_count; $i++) {
         // $i encoded as 4 bytes, big endian.
-        $last = $salt . pack("N", $i);
+        $last = $salt.pack("N", $i);
         // first iteration
         $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
         // perform the other $count - 1 iterations
@@ -131,7 +131,7 @@ 
         $output .= $xorsum;
     }
 
-    if($raw_output)
+    if ($raw_output)
         return substr($output, 0, $key_length);
     else
         return bin2hex(substr($output, 0, $key_length));

Braces +15 added lines, -11 removed lines

@@ -57,8 +57,9 @@ 
 function validate_password($password, $correct_hash)
 {
     $params = explode(":", $correct_hash);
-    if(count($params) < HASH_SECTIONS)
-        return false;
+    if(count($params) < HASH_SECTIONS) {
+            return false;
+    }
     $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
     return slow_equals(
         $pbkdf2,
@@ -102,10 +103,12 @@ 
 function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
 {
     $algorithm = strtolower($algorithm);
-    if(!in_array($algorithm, hash_algos(), true))
-        trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-    if($count <= 0 || $key_length <= 0)
-        trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+    if(!in_array($algorithm, hash_algos(), true)) {
+            trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
+    }
+    if($count <= 0 || $key_length <= 0) {
+            trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+    }
 
     if (function_exists("hash_pbkdf2")) {
         // The output length is in NIBBLES (4-bits) if $raw_output is false!
@@ -131,9 +134,10 @@ 
         $output .= $xorsum;
     }
 
-    if($raw_output)
-        return substr($output, 0, $key_length);
-    else
-        return bin2hex(substr($output, 0, $key_length));
-}
+    if($raw_output) {
+            return substr($output, 0, $key_length);
+    } else {
+            return bin2hex(substr($output, 0, $key_length));
+    }
+    }
 ?>
\ No newline at end of file

includes/libraries/Encryption/PBKDF2/PasswordHashClass.php

Doc Comments +9 added lines

@@ -76,6 +76,10 @@ 
     }
 
     // Compares two strings $a and $b in length-constant time.
+
+    /**
+     * @param string $a
+     */
     public static function slow_equals($a, $b)
     {
         $diff = strlen($a) ^ strlen($b);
@@ -101,6 +105,11 @@ 
     * This implementation of PBKDF2 was originally created by https://defuse.ca
     * With improvements by http://www.variations-of-shadow.com
     */
+
+    /**
+     * @param integer $count
+     * @param integer $key_length
+     */
     private static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
     {
         $algorithm = strtolower($algorithm);

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
     {
         // format: algorithm:iterations:salt:hash
         $salt = base64_encode(mcrypt_create_iv(PBKDF2_SALT_BYTES, MCRYPT_DEV_URANDOM));
-        return PBKDF2_HASH_ALGORITHM . ":" . PBKDF2_ITERATIONS . ":" .  $salt . ":" .
+        return PBKDF2_HASH_ALGORITHM.":".PBKDF2_ITERATIONS.":".$salt.":".
         base64_encode(self::pbkdf2(
             PBKDF2_HASH_ALGORITHM,
             $password,
@@ -59,7 +59,7 @@ 
     public static function validate_password($password, $good_hash)
     {
         $params = explode(":", $good_hash);
-        if(count($params) < HASH_SECTIONS)
+        if (count($params) < HASH_SECTIONS)
             return false;
         $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
         return self::slow_equals(
@@ -68,7 +68,7 @@ 
                 $params[HASH_ALGORITHM_INDEX],
                 $password,
                 $params[HASH_SALT_INDEX],
-                (int)$params[HASH_ITERATION_INDEX],
+                (int) $params[HASH_ITERATION_INDEX],
                 strlen($pbkdf2),
                 true
             )
@@ -79,7 +79,7 @@ 
     public static function slow_equals($a, $b)
     {
         $diff = strlen($a) ^ strlen($b);
-        for($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
+        for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++)
         {
             $diff |= ord($a[$i]) ^ ord($b[$i]);
         }
@@ -104,9 +104,9 @@ 
     private static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
     {
         $algorithm = strtolower($algorithm);
-        if(!in_array($algorithm, hash_algos(), true))
+        if (!in_array($algorithm, hash_algos(), true))
             trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-        if($count <= 0 || $key_length <= 0)
+        if ($count <= 0 || $key_length <= 0)
             trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
 
         if (function_exists("hash_pbkdf2")) {
@@ -121,9 +121,9 @@ 
         $block_count = ceil($key_length / $hash_length);
 
         $output = "";
-        for($i = 1; $i <= $block_count; $i++) {
+        for ($i = 1; $i <= $block_count; $i++) {
             // $i encoded as 4 bytes, big endian.
-            $last = $salt . pack("N", $i);
+            $last = $salt.pack("N", $i);
             // first iteration
             $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
             // perform the other $count - 1 iterations
@@ -133,7 +133,7 @@ 
             $output .= $xorsum;
         }
 
-        if($raw_output)
+        if ($raw_output)
             return substr($output, 0, $key_length);
         else
             return bin2hex(substr($output, 0, $key_length));

Braces +14 added lines, -10 removed lines

@@ -59,8 +59,9 @@ 
     public static function validate_password($password, $good_hash)
     {
         $params = explode(":", $good_hash);
-        if(count($params) < HASH_SECTIONS)
-            return false;
+        if(count($params) < HASH_SECTIONS) {
+                    return false;
+        }
         $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
         return self::slow_equals(
             $pbkdf2,
@@ -104,10 +105,12 @@ 
     private static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
     {
         $algorithm = strtolower($algorithm);
-        if(!in_array($algorithm, hash_algos(), true))
-            trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-        if($count <= 0 || $key_length <= 0)
-            trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+        if(!in_array($algorithm, hash_algos(), true)) {
+                    trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
+        }
+        if($count <= 0 || $key_length <= 0) {
+                    trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+        }
 
         if (function_exists("hash_pbkdf2")) {
             // The output length is in NIBBLES (4-bits) if $raw_output is false!
@@ -133,10 +136,11 @@ 
             $output .= $xorsum;
         }
 
-        if($raw_output)
-            return substr($output, 0, $key_length);
-        else
-            return bin2hex(substr($output, 0, $key_length));
+        if($raw_output) {
+                    return substr($output, 0, $key_length);
+        } else {
+                    return bin2hex(substr($output, 0, $key_length));
+        }
     }
 }
 ?>
\ No newline at end of file