nilsteampassnet / TeamPass

includes/libraries/Goodby/CSV/Import/Standard/StreamFilter/ConvertMbstringEncoding.php

Spacing +7 added lines, -7 removed lines

@@ -42,11 +42,11 @@ 
      */
     public static function register()
     {
-        if ( self::$hasBeenRegistered === true ) {
+        if (self::$hasBeenRegistered === true) {
             return;
         }
 
-        if ( stream_filter_register(self::getFilterName(), __CLASS__) === false ) {
+        if (stream_filter_register(self::getFilterName(), __CLASS__) === false) {
             throw new RuntimeException('Failed to register stream filter: '.self::getFilterName());
         }
 
@@ -62,7 +62,7 @@ 
      */
     public static function getFilterURL($filename, $fromCharset, $toCharset = null)
     {
-        if ( $toCharset === null ) {
+        if ($toCharset === null) {
             return sprintf('php://filter/convert.mbstring.encoding.%s/resource=%s', $fromCharset, $filename);
         } else {
             return sprintf('php://filter/convert.mbstring.encoding.%s:%s/resource=%s', $fromCharset, $toCharset, $filename);
@@ -74,18 +74,18 @@ 
      */
     public function onCreate()
     {
-        if ( strpos($this->filtername, self::FILTER_NAMESPACE) !== 0 ) {
+        if (strpos($this->filtername, self::FILTER_NAMESPACE) !== 0) {
             return false;
         }
 
         $parameterString = substr($this->filtername, strlen(self::FILTER_NAMESPACE));
 
-        if ( ! preg_match('/^(?P<from>[-\w]+)(:(?P<to>[-\w]+))?$/', $parameterString, $matches) ) {
+        if (!preg_match('/^(?P<from>[-\w]+)(:(?P<to>[-\w]+))?$/', $parameterString, $matches)) {
             return false;
         }
 
         $this->fromCharset = isset($matches['from']) ? $matches['from'] : 'auto';
-        $this->toCharset   = isset($matches['to'])   ? $matches['to']   : mb_internal_encoding();
+        $this->toCharset   = isset($matches['to']) ? $matches['to'] : mb_internal_encoding();
 
         return true;
     }
@@ -99,7 +99,7 @@ 
      */
     public function filter($in, $out, &$consumed, $closing)
     {
-        while ( $bucket = stream_bucket_make_writeable($in) ) {
+        while ($bucket = stream_bucket_make_writeable($in)) {
             $bucket->data = mb_convert_encoding($bucket->data, $this->toCharset, $this->fromCharset);
             $consumed += $bucket->datalen;
             stream_bucket_append($out, $bucket);

includes/libraries/Goodby/CSV/Import/Standard/Lexer.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
         $flags          = $this->config->getFlags();
         $ignoreHeader   = $this->config->getIgnoreHeaderLine();
 
-        if ( $fromCharset === null ) {
+        if ($fromCharset === null) {
             $url = $filename;
         } else {
             $url = ConvertMbstringEncoding::getFilterURL($filename, $fromCharset, $toCharset);
@@ -61,7 +61,7 @@ 
         $originalLocale = setlocale(LC_ALL, '0'); // Backup current locale
         setlocale(LC_ALL, 'en_US.UTF-8');
 
-        foreach ( $csv as $lineNumber => $line ) {
+        foreach ($csv as $lineNumber => $line) {
             if ($ignoreHeader && $lineNumber == 0 || (count($line) === 1 && empty($line[0]))) {
                 continue;
             }

includes/libraries/csrfp/libs/csrf/csrfprotector.php

Spacing +28 added lines, -28 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
 if (!defined('__CSRF_PROTECTOR__')) {
-    define('__CSRF_PROTECTOR__', true);     // to avoid multiple declaration errors
+    define('__CSRF_PROTECTOR__', true); // to avoid multiple declaration errors
 
     // name of HTTP POST variable for authentication
-    define("CSRFP_TOKEN","csrfp_token");
+    define("CSRFP_TOKEN", "csrfp_token");
 
     // We insert token name and list of url patterns for which
     // GET requests are validated against CSRF as hidden input fields
@@ -71,7 +71,7 @@ 
          * Contains list of those parameters that are required to be there
          *  in config file for csrfp to work
          */
-        public static $requiredConfigurations  = array('logDirectory', 'failedAuthAction', 'jsPath', 'jsUrl', 'tokenLength');
+        public static $requiredConfigurations = array('logDirectory', 'failedAuthAction', 'jsPath', 'jsUrl', 'tokenLength');
 
         /*
          *  Function: init
@@ -102,7 +102,7 @@ 
 
             //start session in case its not
             if (session_id() === '') {
-                require_once __DIR__ ."/../../../../../sources/SecureHandler.php";
+                require_once __DIR__."/../../../../../sources/SecureHandler.php";
                 session_start();
             }
 
@@ -112,12 +112,12 @@ 
              * a config/csrf_config.php file in the root folder
              * for composer installations
              */
-            $standard_config_location = __DIR__ ."/../csrfp.config.php";
-            $composer_config_location = __DIR__ ."/../../../../../config/csrf_config.php";
+            $standard_config_location = __DIR__."/../csrfp.config.php";
+            $composer_config_location = __DIR__."/../../../../../config/csrf_config.php";
 
             if (file_exists($standard_config_location)) {
                 self::$config = include($standard_config_location);
-            } elseif(file_exists($composer_config_location)) {
+            } elseif (file_exists($composer_config_location)) {
                 self::$config = include($composer_config_location);
             } else {
                 throw new configFileNotFoundException("OWASP CSRFProtector: configuration file not found for CSRFProtector!");
@@ -188,7 +188,7 @@ 
                     //action in case of failed validation
                     self::failedValidationAction();
                 } else {
-                    self::refreshToken();   //refresh token for successfull validation
+                    self::refreshToken(); //refresh token for successfull validation
                 }
             } else if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
@@ -204,7 +204,7 @@ 
                     //action in case of failed validation
                     self::failedValidationAction();
                 } else {
-                    self::refreshToken();   //refresh token for successfull validation
+                    self::refreshToken(); //refresh token for successfull validation
                 }
             }
         }
@@ -251,7 +251,7 @@ 
          */
         private static function failedValidationAction()
         {
-            if (!file_exists(__DIR__ ."/../" .self::$config['logDirectory']))
+            if (!file_exists(__DIR__."/../".self::$config['logDirectory']))
                 throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
 
             //call the logging function
@@ -275,7 +275,7 @@ 
                     break;
                 case 2:
                     //redirect to custom error page
-                    $location  = self::$config['errorRedirectionPage'];
+                    $location = self::$config['errorRedirectionPage'];
                     header("location: $location");
                 case 3:
                     //send custom error message
@@ -283,7 +283,7 @@ 
                     break;
                 case 4:
                     //send 500 header -- internal server error
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+                    header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error', true, 500);
                     exit("<h2>500 Internal Server Error!</h2>");
                     break;
                 default:
@@ -339,7 +339,7 @@ 
         {
             //if config tokenLength value is 0 or some non int
             if (intval(self::$config['tokenLength']) == 0) {
-                self::$config['tokenLength'] = 32;  //set as default
+                self::$config['tokenLength'] = 32; //set as default
             }
 
             //#todo - if $length > 128 throw exception
@@ -395,22 +395,22 @@ 
             //add a <noscript> message to outgoing HTML output,
             //informing the user to enable js for CSRFProtector to work
             //best section to add, after <body> tag
-            $buffer = preg_replace("/<body[^>]*>/", "$0 <noscript>" .self::$config['disabledJavascriptMessage'] .
+            $buffer = preg_replace("/<body[^>]*>/", "$0 <noscript>".self::$config['disabledJavascriptMessage'].
                 "</noscript>", $buffer);
-            $hiddenInput = '<fieldset style="display: none"><legend>CSRF Protection</legend>' .PHP_EOL;
-            $hiddenInput .= '<input type="hidden" id="' . CSRFP_FIELD_TOKEN_NAME.'" value="'
-                            .self::$config['CSRFP_TOKEN'] .'" />' .PHP_EOL;
+            $hiddenInput = '<fieldset style="display: none"><legend>CSRF Protection</legend>'.PHP_EOL;
+            $hiddenInput .= '<input type="hidden" id="'.CSRFP_FIELD_TOKEN_NAME.'" value="'
+                            .self::$config['CSRFP_TOKEN'].'" />'.PHP_EOL;
 
-            $hiddenInput .= '<input type="hidden" id="' .CSRFP_FIELD_URLS .'" value=\''
-                            .json_encode(str_replace("&","%26",self::$config['verifyGetFor'])) .'\' />' .PHP_EOL;
+            $hiddenInput .= '<input type="hidden" id="'.CSRFP_FIELD_URLS.'" value=\''
+                            .json_encode(str_replace("&", "%26", self::$config['verifyGetFor'])).'\' />'.PHP_EOL;
             $hiddenInput .= '</fieldset>';
 
             //implant hidden fields with check url information for reading in javascript
-            $buffer = str_ireplace('</body>', $hiddenInput . '</body>', $buffer);
+            $buffer = str_ireplace('</body>', $hiddenInput.'</body>', $buffer);
 
             //implant the CSRFGuard js file to outgoing script
-            $script = '<script type="text/javascript" src="' . self::$config['jsUrl'] . '"></script>' . PHP_EOL;
-            $buffer = str_ireplace('</body>', $script . '</body>', $buffer, $count);
+            $script = '<script type="text/javascript" src="'.self::$config['jsUrl'].'"></script>'.PHP_EOL;
+            $buffer = str_ireplace('</body>', $script.'</body>', $buffer, $count);
 
             if (!$count)
                 $buffer .= $script;
@@ -434,8 +434,8 @@ 
         private static function logCSRFattack()
         {
             //if file doesnot exist for, create it
-            $logFile = fopen(__DIR__ ."/../" .self::$config['logDirectory']
-            ."/" .date("m-20y") .".log", "a+");
+            $logFile = fopen(__DIR__."/../".self::$config['logDirectory']
+            ."/".date("m-20y").".log", "a+");
 
             //throw exception if above fopen fails
             if (!$logFile)
@@ -456,7 +456,7 @@ 
             $log['cookie'] = $_COOKIE;
 
             //convert log array to JSON format to be logged
-            $log = json_encode($log) .PHP_EOL;
+            $log = json_encode($log).PHP_EOL;
 
             //append log to the file
             fwrite($logFile, $log);
@@ -489,7 +489,7 @@ 
                 }
             }
 
-            return $request_scheme . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+            return $request_scheme.'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
         }
 
         /*
@@ -505,8 +505,8 @@ 
          */
         public static function isURLallowed() {
             foreach (self::$config['verifyGetFor'] as $key => $value) {
-                $value = str_replace(array('/','*'), array('\/','(.*)'), $value);
-                preg_match('/' .$value .'/', self::getCurrentUrl(), $output);
+                $value = str_replace(array('/', '*'), array('\/', '(.*)'), $value);
+                preg_match('/'.$value.'/', self::getCurrentUrl(), $output);
                 if (count($output) > 0)
                     return false;
             }

Braces +44 added lines, -27 removed lines

@@ -97,8 +97,9 @@ 
              * if mod_csrfp already enabled, no verification, no filtering
              * Already done by mod_csrfp
              */
-            if (getenv('mod_csrfp_enabled'))
-                return;
+            if (getenv('mod_csrfp_enabled')) {
+                            return;
+            }
 
             //start session in case its not
             if (session_id() === '') {
@@ -124,15 +125,18 @@ 
             }
 
             //overriding length property if passed in parameters
-            if ($length != null)
-                self::$config['tokenLength'] = intval($length);
+            if ($length != null) {
+                            self::$config['tokenLength'] = intval($length);
+            }
 
             //action that is needed to be taken in case of failed authorisation
-            if ($action != null)
-                self::$config['failedAuthAction'] = $action;
+            if ($action != null) {
+                            self::$config['failedAuthAction'] = $action;
+            }
 
-            if (self::$config['CSRFP_TOKEN'] == '')
-                self::$config['CSRFP_TOKEN'] = CSRFP_TOKEN;
+            if (self::$config['CSRFP_TOKEN'] == '') {
+                            self::$config['CSRFP_TOKEN'] = CSRFP_TOKEN;
+            }
 
             // Validate the config if everythings filled out
             foreach (self::$requiredConfigurations as $value) {
@@ -152,8 +156,9 @@ 
                 || !isset($_SESSION[self::$config['CSRFP_TOKEN']])
                 || !is_array($_SESSION[self::$config['CSRFP_TOKEN']])
                 || !in_array($_COOKIE[self::$config['CSRFP_TOKEN']],
-                    $_SESSION[self::$config['CSRFP_TOKEN']]))
-                self::refreshToken();
+                    $_SESSION[self::$config['CSRFP_TOKEN']])) {
+                            self::refreshToken();
+            }
 
             // Set protected by CSRF Protector header
             header('X-CSRF-Protection: OWASP CSRFP 1.0.0');
@@ -221,14 +226,20 @@ 
          * bool - true if its valid else false
          */
         private static function isValidToken($token) {
-            if (!isset($_SESSION[self::$config['CSRFP_TOKEN']])) return false;
-            if (!is_array($_SESSION[self::$config['CSRFP_TOKEN']])) return false;
+            if (!isset($_SESSION[self::$config['CSRFP_TOKEN']])) {
+                return false;
+            }
+            if (!is_array($_SESSION[self::$config['CSRFP_TOKEN']])) {
+                return false;
+            }
             foreach ($_SESSION[self::$config['CSRFP_TOKEN']] as $key => $value) {
                 if ($value == $token) {
 
                     // Clear all older tokens assuming they have been consumed
                     foreach ($_SESSION[self::$config['CSRFP_TOKEN']] as $_key => $_value) {
-                        if ($_value == $token) break;
+                        if ($_value == $token) {
+                            break;
+                        }
                         array_shift($_SESSION[self::$config['CSRFP_TOKEN']]);
                     }
                     return true;
@@ -251,8 +262,9 @@ 
          */
         private static function failedValidationAction()
         {
-            if (!file_exists(__DIR__ ."/../" .self::$config['logDirectory']))
-                throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
+            if (!file_exists(__DIR__ ."/../" .self::$config['logDirectory'])) {
+                            throw new logDirectoryNotFoundException("OWASP CSRFProtector: Log Directory Not Found!");
+            }
 
             //call the logging function
             static::logCSRFattack();
@@ -312,8 +324,9 @@ 
             $token = self::generateAuthToken();
 
             if (!isset($_SESSION[self::$config['CSRFP_TOKEN']])
-                || !is_array($_SESSION[self::$config['CSRFP_TOKEN']]))
-                $_SESSION[self::$config['CSRFP_TOKEN']] = array();
+                || !is_array($_SESSION[self::$config['CSRFP_TOKEN']])) {
+                            $_SESSION[self::$config['CSRFP_TOKEN']] = array();
+            }
 
             //set token to session for server side validation
             array_push($_SESSION[self::$config['CSRFP_TOKEN']], $token);
@@ -412,8 +425,9 @@ 
             $script = '<script type="text/javascript" src="' . self::$config['jsUrl'] . '"></script>' . PHP_EOL;
             $buffer = str_ireplace('</body>', $script . '</body>', $buffer, $count);
 
-            if (!$count)
-                $buffer .= $script;
+            if (!$count) {
+                            $buffer .= $script;
+            }
 
             return $buffer;
         }
@@ -438,8 +452,9 @@ 
             ."/" .date("m-20y") .".log", "a+");
 
             //throw exception if above fopen fails
-            if (!$logFile)
-                throw new logFileWriteError("OWASP CSRFProtector: Unable to write to the log file");
+            if (!$logFile) {
+                            throw new logFileWriteError("OWASP CSRFProtector: Unable to write to the log file");
+            }
 
             //miniature version of the log
             $log = array();
@@ -448,10 +463,11 @@ 
             $log['REQUEST_URI'] = $_SERVER['REQUEST_URI'];
             $log['requestType'] = self::$requestType;
 
-            if (self::$requestType === "GET")
-                $log['query'] = $_GET;
-            else
-                $log['query'] = $_POST;
+            if (self::$requestType === "GET") {
+                            $log['query'] = $_GET;
+            } else {
+                            $log['query'] = $_POST;
+            }
 
             $log['cookie'] = $_COOKIE;
 
@@ -507,8 +523,9 @@ 
             foreach (self::$config['verifyGetFor'] as $key => $value) {
                 $value = str_replace(array('/','*'), array('\/','(.*)'), $value);
                 preg_match('/' .$value .'/', self::getCurrentUrl(), $output);
-                if (count($output) > 0)
-                    return false;
+                if (count($output) > 0) {
+                                    return false;
+                }
             }
             return true;
         }

includes/libraries/csrfp/libs/csrfp.config.sample.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
  */
 
 return array(
-   "CSRFP_TOKEN" => "",
-   "logDirectory" => "../log",
-   "failedAuthAction" => array(
-      "GET" => 0,
-      "POST" => 0),
-   "errorRedirectionPage" => "",
-   "customErrorMessage" => "",
-   "jsPath" => "../js/csrfprotector.js",
-   "jsUrl" => "",
-   "tokenLength" => 50,
-   "disabledJavascriptMessage" => "This site attempts to protect users against <a href=\"https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29\">
+    "CSRFP_TOKEN" => "",
+    "logDirectory" => "../log",
+    "failedAuthAction" => array(
+        "GET" => 0,
+        "POST" => 0),
+    "errorRedirectionPage" => "",
+    "customErrorMessage" => "",
+    "jsPath" => "../js/csrfprotector.js",
+    "jsUrl" => "",
+    "tokenLength" => 50,
+    "disabledJavascriptMessage" => "This site attempts to protect users against <a href=\"https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29\">
    Cross-Site Request Forgeries </a> attacks. In order to do so, you must have JavaScript enabled in your web browser otherwise this site will fail to work correctly for you.
     See details of your web browser for how to enable JavaScript.",
     "verifyGetFor" => array("*page=items&type=duo_check*", "*upload.attachments.php*")

includes/libraries/Authentication/DuoSecurity/Duo.php

Indentation +97 added lines, -97 removed lines

@@ -1,101 +1,101 @@
 <?php
 
 class Duo {
-	const DUO_PREFIX = "TX";
-	const APP_PREFIX = "APP";
-	const AUTH_PREFIX = "AUTH";
-
-	const DUO_EXPIRE = 300;
-	const APP_EXPIRE = 3600;
-
-	const IKEY_LEN = 20;
-	const SKEY_LEN = 40;
-	const AKEY_LEN = 40; // if this changes you have to change ERR_AKEY
-
-	const ERR_USER = 'ERR|The username passed to sign_request() is invalid.';
-	const ERR_IKEY = 'ERR|The Duo integration key passed to sign_request() is invalid.';
-	const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
-	const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
-
-	private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
-		$exp = ($time ? $time : time()) + $expire;
-		$val = $vals . '|' . $exp;
-		$b64 = base64_encode($val);
-		$cookie = $prefix . '|' . $b64;
-
-		$sig = hash_hmac("sha1", $cookie, $key);
-		return $cookie . '|' . $sig;
-	}
-
-	private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
-		$ts = ($time ? $time : time());
-
-		$parts = explode('|', $val);
-		if (count($parts) !== 3) {
-			return null;
-		}
-		list($u_prefix, $u_b64, $u_sig) = $parts;
-
-		$sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
-		if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
-			return null;
-		}
-
-		if ($u_prefix !== $prefix) {
-			return null;
-		}
-
-		$cookie_parts = explode('|', base64_decode($u_b64));
-		if (count($cookie_parts) !== 3) {
-			return null;
-		}
-		list($user, $u_ikey, $exp) = $cookie_parts;
-
-		if ($u_ikey !== $ikey) {
-			return null;
-		}
-		if ($ts >= intval($exp)) {
-			return null;
-		}
-
-		return $user;
-	}
-
-	public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
-		if (!isset($username) || strlen($username) === 0) {
-			return self::ERR_USER;
-		}
-		if (strpos($username, '|') !== FALSE) {
-			return self::ERR_USER;
-		}
-		if (!isset($ikey) || strlen($ikey) !== self::IKEY_LEN) {
-			return self::ERR_IKEY;
-		}
-		if (!isset($skey) || strlen($skey) !== self::SKEY_LEN) {
-			return self::ERR_SKEY;
-		}
-		if (!isset($akey) || strlen($akey) < self::AKEY_LEN) {
-			return self::ERR_AKEY;
-		}
-
-		$vals = $username . '|' . $ikey;
-
-		$duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
-		$app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
-
-		return $duo_sig . ':' . $app_sig;
-	}
-
-	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
-		list($auth_sig, $app_sig) = explode(':', $sig_response);
-
-		$auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);
-		$app_user = self::parse_vals($akey, $app_sig, self::APP_PREFIX, $ikey, $time);
-
-		if ($auth_user !== $app_user) {
-			return null;
-		}
-
-		return $auth_user;
-	}
+    const DUO_PREFIX = "TX";
+    const APP_PREFIX = "APP";
+    const AUTH_PREFIX = "AUTH";
+
+    const DUO_EXPIRE = 300;
+    const APP_EXPIRE = 3600;
+
+    const IKEY_LEN = 20;
+    const SKEY_LEN = 40;
+    const AKEY_LEN = 40; // if this changes you have to change ERR_AKEY
+
+    const ERR_USER = 'ERR|The username passed to sign_request() is invalid.';
+    const ERR_IKEY = 'ERR|The Duo integration key passed to sign_request() is invalid.';
+    const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
+    const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
+
+    private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
+        $exp = ($time ? $time : time()) + $expire;
+        $val = $vals . '|' . $exp;
+        $b64 = base64_encode($val);
+        $cookie = $prefix . '|' . $b64;
+
+        $sig = hash_hmac("sha1", $cookie, $key);
+        return $cookie . '|' . $sig;
+    }
+
+    private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
+        $ts = ($time ? $time : time());
+
+        $parts = explode('|', $val);
+        if (count($parts) !== 3) {
+            return null;
+        }
+        list($u_prefix, $u_b64, $u_sig) = $parts;
+
+        $sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+        if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
+            return null;
+        }
+
+        if ($u_prefix !== $prefix) {
+            return null;
+        }
+
+        $cookie_parts = explode('|', base64_decode($u_b64));
+        if (count($cookie_parts) !== 3) {
+            return null;
+        }
+        list($user, $u_ikey, $exp) = $cookie_parts;
+
+        if ($u_ikey !== $ikey) {
+            return null;
+        }
+        if ($ts >= intval($exp)) {
+            return null;
+        }
+
+        return $user;
+    }
+
+    public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
+        if (!isset($username) || strlen($username) === 0) {
+            return self::ERR_USER;
+        }
+        if (strpos($username, '|') !== FALSE) {
+            return self::ERR_USER;
+        }
+        if (!isset($ikey) || strlen($ikey) !== self::IKEY_LEN) {
+            return self::ERR_IKEY;
+        }
+        if (!isset($skey) || strlen($skey) !== self::SKEY_LEN) {
+            return self::ERR_SKEY;
+        }
+        if (!isset($akey) || strlen($akey) < self::AKEY_LEN) {
+            return self::ERR_AKEY;
+        }
+
+        $vals = $username . '|' . $ikey;
+
+        $duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
+        $app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
+
+        return $duo_sig . ':' . $app_sig;
+    }
+
+    public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
+        list($auth_sig, $app_sig) = explode(':', $sig_response);
+
+        $auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);
+        $app_user = self::parse_vals($akey, $app_sig, self::APP_PREFIX, $ikey, $time);
+
+        if ($auth_user !== $app_user) {
+            return null;
+        }
+
+        return $auth_user;
+    }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -17,17 +17,17 @@ 
 	const ERR_SKEY = 'ERR|The Duo secret key passed to sign_request() is invalid.';
 	const ERR_AKEY = 'ERR|The application secret key passed to sign_request() must be at least 40 characters.';
 
-	private static function sign_vals($key, $vals, $prefix, $expire, $time=NULL) {
+	private static function sign_vals($key, $vals, $prefix, $expire, $time = NULL) {
 		$exp = ($time ? $time : time()) + $expire;
-		$val = $vals . '|' . $exp;
+		$val = $vals.'|'.$exp;
 		$b64 = base64_encode($val);
-		$cookie = $prefix . '|' . $b64;
+		$cookie = $prefix.'|'.$b64;
 
 		$sig = hash_hmac("sha1", $cookie, $key);
-		return $cookie . '|' . $sig;
+		return $cookie.'|'.$sig;
 	}
 
-	private static function parse_vals($key, $val, $prefix, $ikey, $time=NULL) {
+	private static function parse_vals($key, $val, $prefix, $ikey, $time = NULL) {
 		$ts = ($time ? $time : time());
 
 		$parts = explode('|', $val);
@@ -36,7 +36,7 @@ 
 		}
 		list($u_prefix, $u_b64, $u_sig) = $parts;
 
-		$sig = hash_hmac("sha1", $u_prefix . '|' . $u_b64, $key);
+		$sig = hash_hmac("sha1", $u_prefix.'|'.$u_b64, $key);
 		if (hash_hmac("sha1", $sig, $key) !== hash_hmac("sha1", $u_sig, $key)) {
 			return null;
 		}
@@ -61,7 +61,7 @@ 
 		return $user;
 	}
 
-	public static function signRequest($ikey, $skey, $akey, $username, $time=NULL) {
+	public static function signRequest($ikey, $skey, $akey, $username, $time = NULL) {
 		if (!isset($username) || strlen($username) === 0) {
 			return self::ERR_USER;
 		}
@@ -78,15 +78,15 @@ 
 			return self::ERR_AKEY;
 		}
 
-		$vals = $username . '|' . $ikey;
+		$vals = $username.'|'.$ikey;
 
 		$duo_sig = self::sign_vals($skey, $vals, self::DUO_PREFIX, self::DUO_EXPIRE, $time);
 		$app_sig = self::sign_vals($akey, $vals, self::APP_PREFIX, self::APP_EXPIRE, $time);
 
-		return $duo_sig . ':' . $app_sig;
+		return $duo_sig.':'.$app_sig;
 	}
 
-	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time=NULL) {
+	public static function verifyResponse($ikey, $skey, $akey, $sig_response, $time = NULL) {
 		list($auth_sig, $app_sig) = explode(':', $sig_response);
 
 		$auth_user = self::parse_vals($skey, $auth_sig, self::AUTH_PREFIX, $ikey, $time);

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

Indentation +1 added lines, -1 removed lines

@@ -6,6 +6,6 @@
 {
     function __construct($message = "", $code = 0, $exception = null)
     {
-    	parent::__construct($message, $code, $exception);
+        parent::__construct($message, $code, $exception);
     }
 }
\ No newline at end of file

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

Indentation +3 added lines, -3 removed lines

@@ -26,11 +26,11 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'p':
+            case 'p':
                 return 'image/png';
-        	case 'g':
+            case 'g':
                 return 'image/gif';
-        	case 'j':
+            case 'j':
                 return 'image/jpeg';
         }
         throw new QRException(sprintf('Unknown MIME-type: %s', $this->format));

Spacing +6 added lines, -6 removed lines

@@ -44,11 +44,11 @@
     public function getUrl($qrtext, $size) 
     {
         return 'http://qrickit.com/api/qr'
-            . '?qrsize=' . $size
-            . '&e=' . strtolower($this->errorcorrectionlevel)
-            . '&bgdcolor=' . $this->bgcolor
-            . '&fgdcolor=' . $this->color
-            . '&t=' . strtolower($this->format)
-            . '&d=' . rawurlencode($qrtext);
+            . '?qrsize='.$size
+            . '&e='.strtolower($this->errorcorrectionlevel)
+            . '&bgdcolor='.$this->bgcolor
+            . '&fgdcolor='.$this->color
+            . '&t='.strtolower($this->format)
+            . '&d='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

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

Spacing +3 added lines, -3 removed lines

@@ -33,8 +33,8 @@
     public function getUrl($qrtext, $size)
     {
         return 'https://chart.googleapis.com/chart?cht=qr'
-            . '&chs=' . $size . 'x' . $size
-            . '&chld=' . $this->errorcorrectionlevel . '|' . $this->margin
-            . '&chl=' . rawurlencode($qrtext);
+            . '&chs='.$size.'x'.$size
+            . '&chld='.$this->errorcorrectionlevel.'|'.$this->margin
+            . '&chl='.rawurlencode($qrtext);
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
 
     function __construct($verifyssl = false, $errorcorrectionlevel = 'L', $margin = 1)
     {
-        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/Providers/Rng/MCryptRNGProvider.php

Braces +3 added lines, -2 removed lines

@@ -12,8 +12,9 @@
     
     public function getRandomBytes($bytecount) {
         $result = mcrypt_create_iv($bytecount, $this->source);
-        if ($result === false)
-            throw new RNGException('mcrypt_create_iv returned an invalid value');
+        if ($result === false) {
+                    throw new RNGException('mcrypt_create_iv returned an invalid value');
+        }
         return $result;
     }