@@ -38,14 +38,14 @@ discard block |
||
| 38 | 38 | return null; |
| 39 | 39 | } |
| 40 | 40 | if (is_null($password) || is_int($password)) { |
| 41 | - $password = (string) $password; |
|
| 41 | + $password = (string)$password; |
|
| 42 | 42 | } |
| 43 | 43 | if (!is_string($password)) { |
| 44 | 44 | trigger_error("password_hash(): Password must be a string", E_USER_WARNING); |
| 45 | 45 | return null; |
| 46 | 46 | } |
| 47 | 47 | if (!is_int($algo)) { |
| 48 | - trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING); |
|
| 48 | + trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING); |
|
| 49 | 49 | return null; |
| 50 | 50 | } |
| 51 | 51 | $resultLength = 0; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | case PASSWORD_BCRYPT: |
| 54 | 54 | $cost = PASSWORD_BCRYPT_DEFAULT_COST; |
| 55 | 55 | if (isset($options['cost'])) { |
| 56 | - $cost = (int) $options['cost']; |
|
| 56 | + $cost = (int)$options['cost']; |
|
| 57 | 57 | if ($cost < 4 || $cost > 31) { |
| 58 | 58 | trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING); |
| 59 | 59 | return null; |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | case 'integer': |
| 80 | 80 | case 'double': |
| 81 | 81 | case 'string': |
| 82 | - $salt = (string) $options['salt']; |
|
| 82 | + $salt = (string)$options['salt']; |
|
| 83 | 83 | break; |
| 84 | 84 | case 'object': |
| 85 | 85 | if (method_exists($options['salt'], '__tostring')) { |
| 86 | - $salt = (string) $options['salt']; |
|
| 86 | + $salt = (string)$options['salt']; |
|
| 87 | 87 | break; |
| 88 | 88 | } |
| 89 | 89 | case 'array': |
@@ -126,13 +126,13 @@ discard block |
||
| 126 | 126 | if ($read >= $raw_salt_len) { |
| 127 | 127 | $buffer_valid = true; |
| 128 | 128 | } |
| 129 | - $buffer = str_pad($buffer, $raw_salt_len, "\0") ^ str_pad($local_buffer, $raw_salt_len, "\0"); |
|
| 129 | + $buffer = str_pad($buffer, $raw_salt_len, "\0")^str_pad($local_buffer, $raw_salt_len, "\0"); |
|
| 130 | 130 | } |
| 131 | 131 | if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) { |
| 132 | 132 | $buffer_length = PasswordCompat\binary\_strlen($buffer); |
| 133 | 133 | for ($i = 0; $i < $raw_salt_len; $i++) { |
| 134 | 134 | if ($i < $buffer_length) { |
| 135 | - $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255)); |
|
| 135 | + $buffer[$i] = $buffer[$i]^chr(mt_rand(0, 255)); |
|
| 136 | 136 | } else { |
| 137 | 137 | $buffer .= chr(mt_rand(0, 255)); |
| 138 | 138 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len); |
| 155 | 155 | |
| 156 | - $hash = $hash_format . $salt; |
|
| 156 | + $hash = $hash_format.$salt; |
|
| 157 | 157 | |
| 158 | 158 | $ret = crypt($password, $hash); |
| 159 | 159 | |
@@ -208,12 +208,12 @@ discard block |
||
| 208 | 208 | */ |
| 209 | 209 | function password_needs_rehash($hash, $algo, array $options = array()) { |
| 210 | 210 | $info = password_get_info($hash); |
| 211 | - if ($info['algo'] !== (int) $algo) { |
|
| 211 | + if ($info['algo'] !== (int)$algo) { |
|
| 212 | 212 | return true; |
| 213 | 213 | } |
| 214 | 214 | switch ($algo) { |
| 215 | 215 | case PASSWORD_BCRYPT: |
| 216 | - $cost = isset($options['cost']) ? (int) $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST; |
|
| 216 | + $cost = isset($options['cost']) ? (int)$options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST; |
|
| 217 | 217 | if ($cost !== $info['options']['cost']) { |
| 218 | 218 | return true; |
| 219 | 219 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | $status = 0; |
| 244 | 244 | for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) { |
| 245 | - $status |= (ord($ret[$i]) ^ ord($hash[$i])); |
|
| 245 | + $status |= (ord($ret[$i])^ord($hash[$i])); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | return $status === 0; |
@@ -70,10 +70,10 @@ |
||
| 70 | 70 | $n = ($bytes - $i) > 1073741824 |
| 71 | 71 | ? 1073741824 |
| 72 | 72 | : $bytes - $i; |
| 73 | - $buf .= Sodium::randombytes_buf((int) $n); |
|
| 73 | + $buf .= Sodium::randombytes_buf((int)$n); |
|
| 74 | 74 | } |
| 75 | 75 | } else { |
| 76 | - $buf .= Sodium::randombytes_buf((int) $bytes); |
|
| 76 | + $buf .= Sodium::randombytes_buf((int)$bytes); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (is_string($buf)) { |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | if ($max === $min) { |
| 81 | - return (int) $min; |
|
| 81 | + return (int)$min; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -124,12 +124,12 @@ discard block |
||
| 124 | 124 | * type juggling |
| 125 | 125 | */ |
| 126 | 126 | while ($range > 0) { |
| 127 | - if ($bits % 8 === 0) { |
|
| 127 | + if ($bits%8 === 0) { |
|
| 128 | 128 | ++$bytes; |
| 129 | 129 | } |
| 130 | 130 | ++$bits; |
| 131 | 131 | $range >>= 1; |
| 132 | - $mask = $mask << 1 | 1; |
|
| 132 | + $mask = $mask << 1|1; |
|
| 133 | 133 | } |
| 134 | 134 | $valueShift = $min; |
| 135 | 135 | } |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | $val &= 0; |
| 169 | 169 | for ($i = 0; $i < $bytes; ++$i) { |
| 170 | - $val |= ord($randomByteString[$i]) << ($i * 8); |
|
| 170 | + $val |= ord($randomByteString[$i]) << ($i*8); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -185,6 +185,6 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | } while (!is_int($val) || $val > $max || $val < $min); |
| 187 | 187 | |
| 188 | - return (int) $val; |
|
| 188 | + return (int)$val; |
|
| 189 | 189 | } |
| 190 | 190 | } |
@@ -60,11 +60,11 @@ |
||
| 60 | 60 | && |
| 61 | 61 | $number < PHP_INT_MAX |
| 62 | 62 | ) { |
| 63 | - $number = (int) $number; |
|
| 63 | + $number = (int)$number; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | if (is_int($number)) { |
| 67 | - return (int) $number; |
|
| 67 | + return (int)$number; |
|
| 68 | 68 | } elseif (!$fail_open) { |
| 69 | 69 | throw new TypeError( |
| 70 | 70 | 'Expected an integer.' |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION)); |
| 35 | 35 | define( |
| 36 | 36 | 'PHP_VERSION_ID', |
| 37 | - $RandomCompatversion[0] * 10000 |
|
| 38 | - + $RandomCompatversion[1] * 100 |
|
| 37 | + $RandomCompatversion[0]*10000 |
|
| 38 | + + $RandomCompatversion[1]*100 |
|
| 39 | 39 | + $RandomCompatversion[2] |
| 40 | 40 | ); |
| 41 | 41 | $RandomCompatversion = null; |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | $RandomCompatDIR = dirname(__FILE__); |
| 56 | 56 | |
| 57 | -require_once $RandomCompatDIR . '/byte_safe_strings.inc'; |
|
| 58 | -require_once $RandomCompatDIR . '/cast_to_int.inc'; |
|
| 59 | -require_once $RandomCompatDIR . '/error_polyfill.inc'; |
|
| 57 | +require_once $RandomCompatDIR.'/byte_safe_strings.inc'; |
|
| 58 | +require_once $RandomCompatDIR.'/cast_to_int.inc'; |
|
| 59 | +require_once $RandomCompatDIR.'/error_polyfill.inc'; |
|
| 60 | 60 | |
| 61 | 61 | if (!is_callable('random_bytes')) { |
| 62 | 62 | /** |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | if (extension_loaded('libsodium')) { |
| 77 | 77 | // See random_bytes_libsodium.php |
| 78 | 78 | if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { |
| 79 | - require_once $RandomCompatDIR . '/random_bytes_libsodium.inc'; |
|
| 79 | + require_once $RandomCompatDIR.'/random_bytes_libsodium.inc'; |
|
| 80 | 80 | } elseif (method_exists('Sodium', 'randombytes_buf')) { |
| 81 | - require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.inc'; |
|
| 81 | + require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.inc'; |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | // place, that is not helpful to us here. |
| 118 | 118 | |
| 119 | 119 | // See random_bytes_dev_urandom.php |
| 120 | - require_once $RandomCompatDIR . '/random_bytes_dev_urandom.inc'; |
|
| 120 | + require_once $RandomCompatDIR.'/random_bytes_dev_urandom.inc'; |
|
| 121 | 121 | } |
| 122 | 122 | // Unset variables after use |
| 123 | 123 | $RandomCompat_basedir = null; |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | extension_loaded('mcrypt') |
| 160 | 160 | ) { |
| 161 | 161 | // See random_bytes_mcrypt.php |
| 162 | - require_once $RandomCompatDIR . '/random_bytes_mcrypt.inc'; |
|
| 162 | + require_once $RandomCompatDIR.'/random_bytes_mcrypt.inc'; |
|
| 163 | 163 | } |
| 164 | 164 | $RandomCompatUrandom = null; |
| 165 | 165 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); |
| 185 | 185 | if (method_exists($RandomCompatCOMtest, 'GetRandom')) { |
| 186 | 186 | // See random_bytes_com_dotnet.php |
| 187 | - require_once $RandomCompatDIR . '/random_bytes_com_dotnet.inc'; |
|
| 187 | + require_once $RandomCompatDIR.'/random_bytes_com_dotnet.inc'; |
|
| 188 | 188 | } |
| 189 | 189 | } catch (com_exception $e) { |
| 190 | 190 | // Don't try to use it. |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | if (!is_callable('random_int')) { |
| 222 | - require_once $RandomCompatDIR . '/random_int.inc'; |
|
| 222 | + require_once $RandomCompatDIR.'/random_int.inc'; |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | $RandomCompatDIR = null; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $expiration = $now + $duration; |
| 32 | 32 | $type = BoincDb::escape_string($type); |
| 33 | 33 | $ret = BoincToken::insert("(token,userid,type,create_time,expire_time) values ('$token', $userid, '$type', $now, $expiration)"); |
| 34 | - if ( !$ret ) { |
|
| 34 | + if (!$ret) { |
|
| 35 | 35 | return null; |
| 36 | 36 | } |
| 37 | 37 | return $token; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | function is_valid_token($userid, $token, $type) { |
| 41 | 41 | $boincToken = BoincToken::lookup_valid_token($userid, $token, $type); |
| 42 | - if ( $boincToken == null ) { |
|
| 42 | + if ($boincToken == null) { |
|
| 43 | 43 | return false; |
| 44 | 44 | } |
| 45 | 45 | return true; |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | echo tra("Invalid password."); |
| 63 | 63 | } else { |
| 64 | 64 | $passwd_hash = md5($passwd.$email_addr); |
| 65 | - $database_passwd_hash = password_hash($passwd_hash , PASSWORD_DEFAULT); |
|
| 65 | + $database_passwd_hash = password_hash($passwd_hash, PASSWORD_DEFAULT); |
|
| 66 | 66 | $email_addr = BoincDb::escape_string($email_addr); |
| 67 | 67 | $user->email_addr_change_time = time(); |
| 68 | 68 | $result = $user->update( |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | } else { |
| 51 | 51 | echo tra("Email address has been reverted.")."<br /><br />".tra("You need to reset your password: ")."<a href=\"".secure_url_base()."get_passwd.php\">".secure_url_base()."get_passwd.php</a>"; |
| 52 | 52 | |
| 53 | - $database_passwd_hash = password_hash(random_string() , PASSWORD_DEFAULT); |
|
| 53 | + $database_passwd_hash = password_hash(random_string(), PASSWORD_DEFAULT); |
|
| 54 | 54 | //Change previous_email |
| 55 | 55 | $result = $tmpuser->update( |
| 56 | 56 | "email_addr=previous_email_addr, previous_email_addr='', email_addr_change_time=0, passwd_hash='$database_passwd_hash', email_validated=0" |
@@ -11,39 +11,39 @@ |
||
| 11 | 11 | BoincToken::insert("(token,userid,type,create_time, expire_time) values ('$token', 0, 'T', $now, $now+3600)"); |
| 12 | 12 | |
| 13 | 13 | $boincTokens = BoincToken::enum("userid=0"); |
| 14 | -foreach($boincTokens as $boincToken) { |
|
| 15 | - echo $boincToken->token . "\n"; |
|
| 16 | - echo $boincToken->userid . "\n"; |
|
| 17 | - echo $boincToken->type . "\n"; |
|
| 18 | - echo $boincToken->create_time . "\n"; |
|
| 19 | - echo $boincToken->expire_time . "\n"; |
|
| 14 | +foreach ($boincTokens as $boincToken) { |
|
| 15 | + echo $boincToken->token."\n"; |
|
| 16 | + echo $boincToken->userid."\n"; |
|
| 17 | + echo $boincToken->type."\n"; |
|
| 18 | + echo $boincToken->create_time."\n"; |
|
| 19 | + echo $boincToken->expire_time."\n"; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | echo "---------------\n"; |
| 23 | 23 | $boincToken = BoincToken::lookup("userid=0"); |
| 24 | -echo $boincToken->token . "\n"; |
|
| 25 | -echo $boincToken->userid . "\n"; |
|
| 26 | -echo $boincToken->type . "\n"; |
|
| 27 | -echo $boincToken->create_time . "\n"; |
|
| 28 | -echo $boincToken->expire_time . "\n"; |
|
| 24 | +echo $boincToken->token."\n"; |
|
| 25 | +echo $boincToken->userid."\n"; |
|
| 26 | +echo $boincToken->type."\n"; |
|
| 27 | +echo $boincToken->create_time."\n"; |
|
| 28 | +echo $boincToken->expire_time."\n"; |
|
| 29 | 29 | |
| 30 | 30 | echo "---------------\n"; |
| 31 | 31 | $boincToken = BoincToken::lookup_valid_token(0, $token, 'T'); |
| 32 | -if ( $boincToken != null ) { |
|
| 32 | +if ($boincToken != null) { |
|
| 33 | 33 | echo "Found valid token\n"; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | echo "---------------\n"; |
| 37 | 37 | $boincToken = BoincToken::lookup_valid_token(0, 'notrealtoken', 'T'); |
| 38 | -if ( $boincToken == null ) { |
|
| 38 | +if ($boincToken == null) { |
|
| 39 | 39 | echo "Successfully didn't find invalid token\n"; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | echo "---------------\n"; |
| 43 | 43 | $user = new BoincUser(); |
| 44 | -$user->id=0; |
|
| 44 | +$user->id = 0; |
|
| 45 | 45 | $token = create_token($user->id, TOKEN_TYPE_DELETE_ACCOUNT, TOKEN_DURATION_ONE_DAY); |
| 46 | -if ( is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) { |
|
| 46 | +if (is_valid_token($user->id, $token, TOKEN_TYPE_DELETE_ACCOUNT)) { |
|
| 47 | 47 | echo "Successfully created and validated delete account token"; |
| 48 | 48 | } |
| 49 | 49 | |