X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FTools%2FUtils.php;h=4561f39f08cc87741fff5394c89197e78abe14f8;hb=a1ab7d1d32cb69af563fcec4395fce5217f154f7;hp=a16baca97e0a09e27e7c35e7ecafdfdf0131416e;hpb=109d67dbb16478f927c3d6a46ab61ea9994aafae;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php index a16baca9..4561f39f 100644 --- a/src/Wallabag/CoreBundle/Tools/Utils.php +++ b/src/Wallabag/CoreBundle/Tools/Utils.php @@ -7,23 +7,16 @@ class Utils /** * Generate a token used for RSS. * + * @param int $length Length of the token + * * @return string */ - public static function generateToken() + public static function generateToken($length = 15) { - if (ini_get('open_basedir') === '') { - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - // alternative to /dev/urandom for Windows - $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); - } else { - $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15); - } - } else { - $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20); - } + $token = substr(base64_encode(random_bytes($length)), 0, $length); // remove character which can broken the url - return str_replace(array('+', '/'), '', $token); + return str_replace(['+', '/'], '', $token); } /**