makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-09-17 21:01:51 +02:00
commit ca04dca6e9
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/includes/functions.php
View file

@ -61,8 +61,17 @@ function phpbb_load_extensions_autoloaders($phpbb_root_path)
*/ */
function gen_rand_string($num_chars = 8) function gen_rand_string($num_chars = 8)
{ {
// [a, z] + [0, 9] = 36 $range = array_merge(range('A', 'Z'), range(0, 9));
return substr(strtoupper(base_convert(bin2hex(random_bytes($num_chars + 1)), 16, 36)), 0, $num_chars); $size = count($range);
$output = '';
for ($i = 0; $i < $num_chars; $i++)
{
$rand = random_int(0, $size-1);
$output .= $range[$rand];
}
return $output;
} }
/** /**
@ -76,13 +85,17 @@ function gen_rand_string($num_chars = 8)
*/ */
function gen_rand_string_friendly($num_chars = 8) function gen_rand_string_friendly($num_chars = 8)
{ {
$rand_str = bin2hex(random_bytes($num_chars + 1)); $range = array_merge(range('A', 'N'), range('P', 'Z'), range(1, 9));
$size = count($range);
// Remove Z and Y from the base_convert(), replace 0 with Z and O with Y $output = '';
// [a, z] + [0, 9] - {z, y} = [a, z] + [0, 9] - {0, o} = 34 for ($i = 0; $i < $num_chars; $i++)
$rand_str = str_replace(array('0', 'O'), array('Z', 'Y'), strtoupper(base_convert($rand_str, 16, 34))); {
$rand = random_int(0, $size-1);
$output .= $range[$rand];
}
return substr($rand_str, 0, $num_chars); return $output;
} }
/** /**
@ -90,7 +103,7 @@ function gen_rand_string_friendly($num_chars = 8)
*/ */
function unique_id() function unique_id()
{ {
return bin2hex(random_bytes(8)); return gen_rand_string(32);
} }
/** /**