BOINC / boinc

html/inc/password.php

Switch Indentation +40 added lines, -40 removed lines

@@ -50,47 +50,47 @@ 
             }
             $resultLength = 0;
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
-                    if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
-                        if ($cost < 4 || $cost > 31) {
-                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
-                            return null;
-                        }
+            case PASSWORD_BCRYPT:
+                $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                if (isset($options['cost'])) {
+                    $cost = (int) $options['cost'];
+                    if ($cost < 4 || $cost > 31) {
+                        trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                        return null;
                     }
-                    // The length of salt to generate
-                    $raw_salt_len = 16;
-                    // The length required in the final serialization
-                    $required_salt_len = 22;
-                    $hash_format = sprintf("$2y$%02d$", $cost);
-                    // The expected length of the final crypt() output
-                    $resultLength = 60;
-                    break;
-                default:
-                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
-                    return null;
+                }
+                // The length of salt to generate
+                $raw_salt_len = 16;
+                // The length required in the final serialization
+                $required_salt_len = 22;
+                $hash_format = sprintf("$2y$%02d$", $cost);
+                // The expected length of the final crypt() output
+                $resultLength = 60;
+                break;
+            default:
+                trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                return null;
             }
             $salt_req_encoding = false;
             if (isset($options['salt'])) {
                 switch (gettype($options['salt'])) {
-                    case 'NULL':
-                    case 'boolean':
-                    case 'integer':
-                    case 'double':
-                    case 'string':
+                case 'NULL':
+                case 'boolean':
+                case 'integer':
+                case 'double':
+                case 'string':
+                    $salt = (string) $options['salt'];
+                    break;
+                case 'object':
+                    if (method_exists($options['salt'], '__tostring')) {
                         $salt = (string) $options['salt'];
                         break;
-                    case 'object':
-                        if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
-                            break;
-                        }
-                    case 'array':
-                    case 'resource':
-                    default:
-                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
-                        return null;
+                    }
+                case 'array':
+                case 'resource':
+                default:
+                    trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                    return null;
                 }
                 if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
                     trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
@@ -212,12 +212,12 @@ 
                 return true;
             }
             switch ($algo) {
-                case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
-                    if ($cost !== $info['options']['cost']) {
-                        return true;
-                    }
-                    break;
+            case PASSWORD_BCRYPT:
+                $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                if ($cost !== $info['options']['cost']) {
+                    return true;
+                }
+                break;
             }
             return false;
         }

Spacing +11 added lines, -11 removed lines

@@ -38,14 +38,14 @@ 
                 return null;
             }
             if (is_null($password) || is_int($password)) {
-                $password = (string) $password;
+                $password = (string)$password;
             }
             if (!is_string($password)) {
                 trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
                 return null;
             }
             if (!is_int($algo)) {
-                trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+                trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
                 return null;
             }
             $resultLength = 0;
@@ -53,7 +53,7 @@ 
                 case PASSWORD_BCRYPT:
                     $cost = PASSWORD_BCRYPT_DEFAULT_COST;
                     if (isset($options['cost'])) {
-                        $cost = (int) $options['cost'];
+                        $cost = (int)$options['cost'];
                         if ($cost < 4 || $cost > 31) {
                             trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
                             return null;
@@ -79,11 +79,11 @@ 
                     case 'integer':
                     case 'double':
                     case 'string':
-                        $salt = (string) $options['salt'];
+                        $salt = (string)$options['salt'];
                         break;
                     case 'object':
                         if (method_exists($options['salt'], '__tostring')) {
-                            $salt = (string) $options['salt'];
+                            $salt = (string)$options['salt'];
                             break;
                         }
                     case 'array':
@@ -126,13 +126,13 @@ 
                     if ($read >= $raw_salt_len) {
                         $buffer_valid = true;
                     }
-                    $buffer = str_pad($buffer, $raw_salt_len, "\0") ^ str_pad($local_buffer, $raw_salt_len, "\0");
+                    $buffer = str_pad($buffer, $raw_salt_len, "\0")^str_pad($local_buffer, $raw_salt_len, "\0");
                 }
                 if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
                     $buffer_length = PasswordCompat\binary\_strlen($buffer);
                     for ($i = 0; $i < $raw_salt_len; $i++) {
                         if ($i < $buffer_length) {
-                            $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+                            $buffer[$i] = $buffer[$i]^chr(mt_rand(0, 255));
                         } else {
                             $buffer .= chr(mt_rand(0, 255));
                         }
@@ -153,7 +153,7 @@ 
             }
             $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
 
-            $hash = $hash_format . $salt;
+            $hash = $hash_format.$salt;
 
             $ret = crypt($password, $hash);
 
@@ -208,12 +208,12 @@ 
          */
         function password_needs_rehash($hash, $algo, array $options = array()) {
             $info = password_get_info($hash);
-            if ($info['algo'] !== (int) $algo) {
+            if ($info['algo'] !== (int)$algo) {
                 return true;
             }
             switch ($algo) {
                 case PASSWORD_BCRYPT:
-                    $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                    $cost = isset($options['cost']) ? (int)$options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
                     if ($cost !== $info['options']['cost']) {
                         return true;
                     }
@@ -242,7 +242,7 @@ 
 
             $status = 0;
             for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
-                $status |= (ord($ret[$i]) ^ ord($hash[$i]));
+                $status |= (ord($ret[$i])^ord($hash[$i]));
             }
 
             return $status === 0;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
          * @return boolean the check result
          */
         function check() {
-            static $pass = NULL;
+            static $pass = null;
 
             if (is_null($pass)) {
                 if (function_exists('crypt')) {

html/inc/user_util.inc

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -56,7 +56,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_addr($email_addr)) return null;
     if (is_banned_email_addr($email_addr)) return null;
@@ -69,7 +69,7 @@ 
     $email_addr = BoincDb::escape_string($email_addr);
     $name = sanitize_tags($name);
     $name = BoincDb::escape_string($name);
-    $database_passwd_hash = password_hash( $passwd_hash, PASSWORD_DEFAULT);
+    $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
     $database_passwd_hash = BoincDb::escape_string($database_passwd_hash);
 
     $country = BoincDb::escape_string($country);
@@ -189,7 +189,7 @@ 
         show_error(tra("Passwords may only include ASCII characters."));
     }
 
-    if (strlen($passwd)<$min_passwd_length) {
+    if (strlen($passwd) < $min_passwd_length) {
         show_error(
             tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
         );

html/user/login_action.php

Spacing +5 added lines, -5 removed lines

@@ -45,17 +45,17 @@ 
         page_tail();
         exit;
     }
-    if (substr($user->authenticator, 0, 1) == 'x'){
+    if (substr($user->authenticator, 0, 1) == 'x') {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         error_page("This account has been administratively disabled.");
     }
     // allow authenticator as password
-    if ($passwd != $user->authenticator ) {
+    if ($passwd != $user->authenticator) {
         $passwd_hash = md5($passwd.$email_addr);
-        if ( $passwd_hash == $user->passwd_hash || password_verify($passwd_hash,$user->passwd_hash) ) {
+        if ($passwd_hash == $user->passwd_hash || password_verify($passwd_hash, $user->passwd_hash)) {
             // on valid login, rehash password in order to upgrade hash overtime
             // as the defaults change.  Also converts users passwords from md5 if required
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT);
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $result = $user->update(
                 "passwd_hash='$database_passwd_hash'"
             );
@@ -113,7 +113,7 @@ 
             Please <a href=get_passwd.php>try again</a>.
         ";
         page_tail();
-    } else if (substr($user->authenticator, 0, 1) == 'x'){
+    } else if (substr($user->authenticator, 0, 1) == 'x') {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         error_page("This account has been administratively disabled.");
     } else {

html/user/edit_email_action.php

Spacing +3 added lines, -3 removed lines

@@ -47,15 +47,15 @@
         // deal with the case where user hasn't set passwd
         // (i.e. passwd is account key)
         //
-        if ($passwd_hash != $user->passwd_hash && !password_verify($passwd_hash,$user->passwd_hash)) {
+        if ($passwd_hash != $user->passwd_hash && !password_verify($passwd_hash, $user->passwd_hash)) {
             $passwd = $user->authenticator;
             $passwd_hash = md5($passwd.$user->email_addr);
         }
-        if ($passwd_hash != $user->passwd_hash && !password_verify($passwd_hash,$user->passwd_hash)) {
+        if ($passwd_hash != $user->passwd_hash && !password_verify($passwd_hash, $user->passwd_hash)) {
             echo tra("Invalid password.");
         } else {
             $passwd_hash = md5($passwd.$email_addr);
-            $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT );
+            $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
             $email_addr = BoincDb::escape_string($email_addr);
             $result = $user->update(
                 "email_addr='$email_addr', passwd_hash='$database_passwd_hash', email_validated=0"

html/user/edit_passwd_action.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 }
 
 $passwd_hash = md5($passwd.$user->email_addr);
-$database_passwd_hash = password_hash( $passwd_hash, PASSWORD_DEFAULT);
+$database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT);
 $result = $user->update("passwd_hash='$database_passwd_hash'");
 if (!$result) {
     error_page(tra("We can't update your password due to a database problem. Please try again later."));