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

archive: automatically subscribe user to originating feed while unarchiving

This commit is contained in:
Andrew Dolgov 2013-03-30 21:59:52 +04:00
parent aa5ac2cd3a
commit b029f91621
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
classes/rpc.php
View File

@ -158,11 +158,58 @@ class RPC extends Handler_Protected {
} }
function unarchive() { function unarchive() {
$ids = db_escape_string($this->link, $_REQUEST["ids"]); $ids = explode(",", $_REQUEST["ids"]);
$result = db_query($this->link, "UPDATE ttrss_user_entries foreach ($ids as $id) {
SET feed_id = orig_feed_id, orig_feed_id = NULL $id = db_escape_string($this->link, trim($id));
WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); db_query($this->link, "BEGIN");
$result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
AND owner_uid = ".$_SESSION["uid"].")");
if (db_num_rows($result) != 0) {
$feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
$site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
$title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = " .$_SESSION["uid"]);
if (db_num_rows($result) == 0) {
if (!$title) $title = '[Unknown]';
$result = db_query($this->link,
"INSERT INTO ttrss_feeds
(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
VALUES (".$_SESSION["uid"].",
'$feed_url',
'$site_url',
'$title',
NULL, '', '', 0)");
$result = db_query($this->link,
"SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) != 0) {
$feed_id = db_fetch_result($result, 0, "id");
}
} else {
$feed_id = db_fetch_result($result, 0, "id");
}
if ($feed_id) {
$result = db_query($this->link, "UPDATE ttrss_user_entries
SET feed_id = '$feed_id', orig_feed_id = NULL
WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
}
}
db_query($this->link, "COMMIT");
}
print json_encode(array("message" => "UPDATE_COUNTERS")); print json_encode(array("message" => "UPDATE_COUNTERS"));
} }

3
js/viewfeed.js
View File

@ -1021,6 +1021,9 @@ function archiveSelection() {
op = "archive"; op = "archive";
} else { } else {
str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
str += " " + __("Please note that unstarred articles might get purged on next feed update.");
op = "unarchive"; op = "unarchive";
} }