X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FTools%2FUtils.php;h=b7ad7966487f627334d38c467d6e7f1f9ef6975e;hb=92a66835624acf6fd14f5adc5f8aab399658592e;hp=b146d98b9c360dfd64a7da1057f9fc3f5d065219;hpb=1f4408de9ed08f3b0fda45a93f1585c80feeb21d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php
index b146d98b..b7ad7966 100644
--- a/src/Wallabag/CoreBundle/Tools/Utils.php
+++ b/src/Wallabag/CoreBundle/Tools/Utils.php
@@ -5,46 +5,29 @@ namespace Wallabag\CoreBundle\Tools;
 class Utils
 {
     /**
-     * Generate a token used for RSS.
+     * Generate a token used for Feeds.
+     *
+     * @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);
-    }
-
-    /**
-     * @param $words
-     * @return float
-     */
-    public static function convertWordsToMinutes($words)
-    {
-        return floor($words / 200);
+        return str_replace(['+', '/'], '', $token);
     }
 
     /**
-     * For a given text, we calculate reading time for an article
-     * based on 200 words per minute.
+     * For a given text, we calculate reading time for an article based on 200 words per minute.
      *
-     * @param $text
+     * @param string $text
      *
      * @return float
      */
     public static function getReadingTime($text)
     {
-        return self::convertWordsToMinutes(str_word_count(strip_tags($text)));
+        return floor(\count(preg_split('~([^\p{L}\p{N}\']+|(\p{Han}|\p{Hiragana}|\p{Katakana}|\p{Hangul}){1,2})~u', strip_tags($text))) / 200);
     }
 }