1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00

some changes

git-svn-id: file:///svn/phpbb/trunk@8223 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-11-03 11:10:07 +00:00
parent ce8be416d8
commit 61fc9605fa
7 changed files with 23 additions and 27 deletions

View File

@@ -89,7 +89,8 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false)
if ($type == 'array')
{
reset($default);
list($sub_key_type, $sub_type) = each(current($default));
$default = current($default);
list($sub_key_type, $sub_type) = each($default);
$sub_type = gettype($sub_type);
$sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type;
$sub_key_type = gettype($sub_key_type);
@@ -269,23 +270,12 @@ function phpbb_hash($password)
$random = '';
$count = 6;
if (($fh = @fopen('/dev/urandom', 'rb')))
for ($i = 0; $i < $count; $i += 16)
{
$random = fread($fh, $count);
fclose($fh);
}
if (strlen($random) < $count)
{
$random = '';
for ($i = 0; $i < $count; $i += 16)
{
$random_state = md5(unique_id() . $random_state);
$random .= pack('H*', md5($random_state));
}
$random = substr($random, 0, $count);
$random_state = md5(unique_id() . $random_state);
$random .= pack('H*', md5($random_state));
}
$random = substr($random, 0, $count);
$hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64);