valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add one catchall function to make uniqids/keyhashes/etc used by tt-rss

This commit is contained in:
Andrew Dolgov 2015-08-03 19:21:06 +03:00
parent e053fd8d6b
commit 3ceb893f66
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/feeds.php
View File

@ -1893,7 +1893,7 @@ class Pref_Feeds extends Handler_Protected {
AND owner_uid = " . $owner_uid); AND owner_uid = " . $owner_uid);
if ($this->dbh->num_rows($result) == 1) { if ($this->dbh->num_rows($result) == 1) {
$key = $this->dbh->escape_string(uniqid(base_convert(rand(), 10, 36))); $key = $this->dbh->escape_string(uniqid_short());
$this->dbh->query("UPDATE ttrss_access_keys SET access_key = '$key' $this->dbh->query("UPDATE ttrss_access_keys SET access_key = '$key'
WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat

8
include/functions.php
View File

@ -738,7 +738,7 @@
$_SESSION["name"] = db_fetch_result($result, 0, "login"); $_SESSION["name"] = db_fetch_result($result, 0, "login");
$_SESSION["access_level"] = db_fetch_result($result, 0, "access_level"); $_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
$_SESSION["csrf_token"] = uniqid(rand(), true); $_SESSION["csrf_token"] = uniqid_short();
db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " . db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
$_SESSION["uid"]); $_SESSION["uid"]);
@ -768,7 +768,7 @@
$_SESSION["auth_module"] = false; $_SESSION["auth_module"] = false;
if (!$_SESSION["csrf_token"]) { if (!$_SESSION["csrf_token"]) {
$_SESSION["csrf_token"] = uniqid(rand(), true); $_SESSION["csrf_token"] = uniqid_short();
} }
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
@ -1996,6 +1996,10 @@
} }
} }
function uniqid_short() {
return uniqid(base_convert(rand(), 10, 36));
}
// TODO: less dumb splitting // TODO: less dumb splitting
require_once "functions2.php"; require_once "functions2.php";

2
include/functions2.php
View File

@ -1773,7 +1773,7 @@
if (db_num_rows($result) == 1) { if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "access_key"); return db_fetch_result($result, 0, "access_key");
} else { } else {
$key = db_escape_string(uniqid(base_convert(rand(), 10, 36))); $key = db_escape_string(uniqid_short());
$result = db_query("INSERT INTO ttrss_access_keys $result = db_query("INSERT INTO ttrss_access_keys
(access_key, feed_id, is_cat, owner_uid) (access_key, feed_id, is_cat, owner_uid)

4
plugins/instances/init.php
View File

@ -407,7 +407,7 @@ class Instances extends Plugin implements IHandler {
print "<hr/>"; print "<hr/>";
$access_key = uniqid(rand(), true); $access_key = uniqid_short();
/* Access key */ /* Access key */
@ -439,7 +439,7 @@ class Instances extends Plugin implements IHandler {
} }
function genHash() { function genHash() {
$hash = uniqid(base_convert(rand(), 10, 36)); $hash = uniqid_short();
print json_encode(array("hash" => $hash)); print json_encode(array("hash" => $hash));
} }

4
plugins/share/init.php
View File

@ -60,7 +60,7 @@ class Share extends Plugin {
function newkey() { function newkey() {
$id = db_escape_string($_REQUEST['id']); $id = db_escape_string($_REQUEST['id']);
$uuid = db_escape_string(uniqid(base_convert(rand(), 10, 36))); $uuid = db_escape_string(uniqid_short());
db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$id' db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$id'
AND owner_uid = " . $_SESSION['uid']); AND owner_uid = " . $_SESSION['uid']);
@ -91,7 +91,7 @@ class Share extends Plugin {
$ref_id = db_fetch_result($result, 0, "ref_id"); $ref_id = db_fetch_result($result, 0, "ref_id");
if (!$uuid) { if (!$uuid) {
$uuid = db_escape_string(uniqid(base_convert(rand(), 10, 36))); $uuid = db_escape_string(uniqid_short());
db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param' db_query("UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
AND owner_uid = " . $_SESSION['uid']); AND owner_uid = " . $_SESSION['uid']);
} }