blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rpc: move several feed-related calls to pref-feeds

Browse source
This commit is contained in:
Andrew Dolgov 2013-04-02 14:47:43 +04:00
parent d719b06240
commit 195187c490
4 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
classes/pref/feeds.php
View file

@ -1834,5 +1834,54 @@ class Pref_Feeds extends Handler_Protected {
}
}
function regenOPMLKey() {
$this->update_feed_access_key($this->link, 'OPML:Publish',
false, $_SESSION["uid"]);
$new_link = Opml::opml_publish_url($this->link);
print json_encode(array("link" => $new_link));
}
function regenFeedKey() {
$feed_id = db_escape_string($this->link, $_REQUEST['id']);
$is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
$new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
print json_encode(array("link" => $new_key));
}
private function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
$sql_is_cat = bool_to_sql_bool($is_cat);
$result = db_query($link, "SELECT access_key FROM ttrss_access_keys
WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
if (db_num_rows($result) == 1) {
$key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
return $key;
} else {
return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
}
}
// Silent
function clearKeys() {
db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
owner_uid = " . $_SESSION["uid"]);
}
}
?>

47
classes/rpc.php
View file

@ -411,15 +411,6 @@ class RPC extends Handler_Protected {
"content" => $tags_str, "content_full" => $tags_str_full));
}
function regenOPMLKey() {
$this->update_feed_access_key($this->link, 'OPML:Publish',
false, $_SESSION["uid"]);
$new_link = Opml::opml_publish_url($this->link);
print json_encode(array("link" => $new_link));
}
function completeLabels() {
$search = db_escape_string($this->link, $_REQUEST["search"]);
@ -609,21 +600,6 @@ class RPC extends Handler_Protected {
print_feed_cat_select($this->link, "cat_id", $id);
}
function regenFeedKey() {
$feed_id = db_escape_string($this->link, $_REQUEST['id']);
$is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
$new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
print json_encode(array("link" => $new_key));
}
// Silent
function clearKeys() {
db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
owner_uid = " . $_SESSION["uid"]);
}
// Silent
function clearArticleKeys() {
db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
@ -716,29 +692,6 @@ class RPC extends Handler_Protected {
}
function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
$sql_is_cat = bool_to_sql_bool($is_cat);
$result = db_query($link, "SELECT access_key FROM ttrss_access_keys
WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
if (db_num_rows($result) == 1) {
$key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
AND owner_uid = " . $owner_uid);
return $key;
} else {
return get_feed_access_key($link, $feed_id, $is_cat, $owner_uid);
}
}
private function markArticlesById($link, $ids, $cmode) {
$tmp_ids = array();

2
js/functions.js
View file

@ -1357,7 +1357,7 @@ function genUrlChangeKey(feed, is_cat) {
notify_progress("Trying to change address...", true);
var query = "?op=rpc&method=regenFeedKey&id=" + param_escape(feed) +
var query = "?op=pref-feeds&method=regenFeedKey&id=" + param_escape(feed) +
"&is_cat=" + param_escape(is_cat);
new Ajax.Request("backend.php", {

4
js/prefs.js
View file

@ -1221,7 +1221,7 @@ function opmlRegenKey() {
notify_progress("Trying to change address...", true);
var query = "?op=rpc&method=regenOPMLKey";
var query = "?op=pref-feeds&method=regenOPMLKey";
new Ajax.Request("backend.php", {
parameters: query,
@ -1521,7 +1521,7 @@ function clearFeedAccessKeys() {
if (ok) {
notify_progress("Clearing URLs...");
var query = "?op=rpc&method=clearKeys";
var query = "?op=pref-feeds&method=clearKeys";
new Ajax.Request("backend.php", {
parameters: query,