Add odd number of character support to random_string()

diff --git a/include/text.php b/include/text.php
index f49ccc8abcbb8116fc63b10c55d0ef551e68c895..5df1d65cee38b7c5bfa45949c25379db91d2a32b 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -41,26 +41,19 @@ function replace_macros($s, $r) {
        return $output;
 }
 
-// PHP < 7 polyfill
-if (!is_callable('intdiv')) {
-       function intdiv($a, $b) {
-               return ($a - $a % $b) / $b;
-       }
-}
-
 /**
  * @brief Generates a pseudo-random string of hexadecimal characters
  *
- * Only supports pair numbers of output characters.
- *
  * @param int $size
  * @return string
  */
 function random_string($size = 64)
 {
-       $bytes = random_bytes(intdiv((int) $size, 2));
+       $byte_size = ceil($size / 2);
+
+       $bytes = random_bytes($byte_size);
 
-       $return = bin2hex($bytes);
+       $return = substr(bin2hex($bytes), 0, $size);
 
        return $return;
 }