remove unnecessary wrapping from share uniqid() keys

[tt-rss.git] / include / functions.php

diff --git a/include/functions.php b/include/functions.php
index cf9b0510ffa9976757e9e527ca9405eb37ce5e30..a64f0978a64dbf9ca01c7e557a1f419e999d8007 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -80,7 +80,7 @@
                                        "pt_BR" => "Portuguese/Brazil",
                                        "zh_CN" => "Simplified Chinese",
                                        "sv_SE" => "Svenska",
-                                       "fi_FI" => "Suomi",                                     
+                                       "fi_FI" => "Suomi",
                                        "tr_TR" => "Türkçe");
 
                return $tr;
@@ -721,7 +721,7 @@
 
                                $_SESSION["name"] = db_fetch_result($result, 0, "login");
                                $_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
-                               $_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
+                               $_SESSION["csrf_token"] = uniqid(rand(), true);
 
                                db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
                                        $_SESSION["uid"]);
@@ -751,7 +751,7 @@
                        $_SESSION["auth_module"] = false;
 
                        if (!$_SESSION["csrf_token"]) {
-                               $_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
+                               $_SESSION["csrf_token"] = uniqid(rand(), true);
                        }
 
                        $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
@@ -3747,7 +3747,7 @@
                if (db_num_rows($result) == 1) {
                        return db_fetch_result($result, 0, "access_key");
                } else {
-                       $key = db_escape_string(sha1(uniqid(rand(), true)));
+                       $key = db_escape_string(uniqid());
 
                        $result = db_query("INSERT INTO ttrss_access_keys
                                (access_key, feed_id, is_cat, owner_uid)