diff options
author | Andrew Dolgov <[email protected]> | 2009-12-28 20:25:16 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-12-28 20:25:16 +0300 |
commit | ef83538d2ea4de3994a726c1748eb34d6e4647e1 (patch) | |
tree | 6d9a8f0c4472b53304c9014f37b045563e13c009 | |
parent | 8056ec5011775d1751660ba956f166b28378d073 (diff) |
show originating feed info when viewing archived article
-rw-r--r-- | functions.php | 40 | ||||
-rw-r--r-- | modules/backend-rpc.php | 2 |
2 files changed, 37 insertions, 5 deletions
diff --git a/functions.php b/functions.php index de35b3274..11ebf7b8c 100644 --- a/functions.php +++ b/functions.php @@ -1164,10 +1164,13 @@ _debug("update_rss_feed: initial score: $score"); } - $result = db_query($link, - "SELECT ref_id, int_id FROM ttrss_user_entries WHERE + $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE ref_id = '$ref_id' AND owner_uid = '$owner_uid' - $dupcheck_qpart"); + $dupcheck_qpart"; + +// if ($_GET["xdebug"]) print "$query\n"; + + $result = db_query($link, $query); // okay it doesn't exist - create user entry if (db_num_rows($result) == 0) { @@ -4154,7 +4157,8 @@ if ($feed_id != "0") { print "<li class=\"insensitive\">".__('Selection:')."</li> - <li onclick=\"$archive_sel_link\"> ".__('Archive')."</li>"; + <li onclick=\"$archive_sel_link\"> ".__('Archive')."</li> + <li onclick=\"$delete_sel_link\"> ".__('Delete')."</li>"; } else { print "<li class=\"insensitive\">".__('Selection:')."</li> <li onclick=\"$archive_sel_link\"> ".__('Move back')."</li> @@ -4702,6 +4706,7 @@ (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, num_comments, author, + orig_feed_id, note FROM ttrss_entries,ttrss_user_entries WHERE id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]); @@ -4811,6 +4816,33 @@ print "</div>"; print "<div clear='both'>$entry_comments</div>"; + if ($line["orig_feed_id"]) { + + $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds + WHERE id = ".$line["orig_feed_id"]); + + if (db_num_rows($tmp_result) != 0) { + + print "<div clear='both'>"; + print __("Originally from:"); + + print " "; + + $tmp_line = db_fetch_assoc($tmp_result); + + print "<a target='_blank' + href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" . + $tmp_line['title'] . "</a>"; + + print " "; + + print "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>"; + print "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>"; + + print "</div>"; + } + } + print "</div>"; print "<div class=\"postIcon\">" . $feed_icon . "</div>"; diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 7374241ca..2d1a8f90b 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -106,7 +106,7 @@ $ids = db_escape_string($_GET["ids"]); $result = db_query($link, "UPDATE ttrss_user_entries - SET feed_id = orig_feed_id + SET feed_id = orig_feed_id, orig_feed_id = NULL WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]); print "<rpc-reply><counters>"; |