summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-12-24 13:27:57 +0400
committerAndrew Dolgov <[email protected]>2013-12-24 13:27:57 +0400
commit76d78eb2e75adee00024d3beedaf437c2d91d1c6 (patch)
treea9a611d9171e23580122adb40c6ebef1cdf83b74 /plugins
parentd31d521f79026f0341fb4945750b68c504f87e19 (diff)
remove unnecessary wrapping from share uniqid() keys
Diffstat (limited to 'plugins')
-rw-r--r--plugins/instances/init.php4
-rw-r--r--plugins/share/init.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/instances/init.php b/plugins/instances/init.php
index aac28196f..069186ad1 100644
--- a/plugins/instances/init.php
+++ b/plugins/instances/init.php
@@ -407,7 +407,7 @@ class Instances extends Plugin implements IHandler {
print "<hr/>";
- $access_key = sha1(uniqid(rand(), true));
+ $access_key = uniqid();
/* Access key */
@@ -439,7 +439,7 @@ class Instances extends Plugin implements IHandler {
}
function genHash() {
- $hash = sha1(uniqid(rand(), true));
+ $hash = uniqid();
print json_encode(array("hash" => $hash));
}
diff --git a/plugins/share/init.php b/plugins/share/init.php
index a000b8ebe..5fa998757 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -60,7 +60,7 @@ class Share extends Plugin {
function newkey() {
$id = db_escape_string($_REQUEST['id']);
- $uuid = db_escape_string(sha1(uniqid(rand(), true)));
+ $uuid = db_escape_string(uniqid());
db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$id'
AND owner_uid = " . $_SESSION['uid']);
@@ -91,7 +91,7 @@ class Share extends Plugin {
$ref_id = db_fetch_result($result, 0, "ref_id");
if (!$uuid) {
- $uuid = db_escape_string(sha1(uniqid(rand(), true)));
+ $uuid = db_escape_string(uniqid());
db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
AND owner_uid = " . $_SESSION['uid']);
}