$op = $_GET["op"];
$fetch = $_GET["fetch"];
+
+ if ($op == "rpc") {
+
+ $subop = $_GET["subop"];
+ if ($subop == "catchupPage") {
+
+ $ids = split(",", $_GET["ids"]);
+
+ foreach ($ids as $id) {
+
+ pg_query("UPDATE ttrss_entries SET unread=false,last_read = NOW()
+ WHERE id = '$id'");
+
+ }
+
+ print "Marked active page as read.";
+ }
+
+ }
+
if ($op == "feeds") {
- if ($fetch) update_all_feeds($link);
+ $subop = $_GET["subop"];
+
+ if ($subop == "catchupAll") {
+ pg_query("UPDATE ttrss_entries SET last_read = NOW(),unread = false");
+ }
+
+ if ($fetch) update_all_feeds($link, $fetch);
+
$result = pg_query("SELECT *,
(SELECT count(id) FROM ttrss_entries
$lnum = 0;
+ $total_unread = 0;
+
while ($line = pg_fetch_assoc($result)) {
$feed = $line["title"];
if ($unread > 0) $class .= "Unread";
+ $total_unread += $unread;
+
print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed</a>";
++$lnum;
}
- print "<tr><td class=\"footer\" colspan=\"3\">
- <a href=\"javascript:update_feed_list(false,true)\">Update all feeds</a></td></tr>";
+// print "<tr><td class=\"footer\" colspan=\"3\">
+// <a href=\"javascript:update_feed_list(false,true)\">Update all feeds</a></td></tr>";
+
+// print "<tr><td class=\"footer\" colspan=\"2\"> ";
+// print "</td></tr>";
print "</table>";
+ print "<p align=\"center\">All feeds:
+ <a class=\"button\"
+ href=\"javascript:updateFeedList(false,true)\">Update</a>";
+
+ print " <a class=\"button\"
+ href=\"javascript:catchupAllFeeds()\">Mark as read</a></p>";
+
+ print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
+
}
if ($op == "view") {
$id = $_GET["id"];
- $result = pg_query("UPDATE ttrss_entries SET unread = false WHERE id = '$id'");
+ $result = pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
$result = pg_query("SELECT title,link,content FROM ttrss_entries
WHERE id = '$id'");
$feed = $_GET["feed"];
$skip = $_GET["skip"];
- $ext = $_GET["ext"];
+ $subop = $_GET["subop"];
if (!$skip) $skip = 0;
- if ($ext == "undefined") $ext = "";
+ if ($subop == "undefined") $subop = "";
// FIXME: check for null value here
$line = pg_fetch_assoc($result);
- if (!$ext && $line["update_timeout"] > MIN_UPDATE_TIME) {
+ if ($subop == "ForceUpdate" ||
+ (!$subop && $line["update_timeout"] > MIN_UPDATE_TIME)) {
update_rss_feed($link, $line["feed_url"], $feed);
} else {
- if ($ext == "MarkAllRead") {
+ if ($subop == "MarkAllRead") {
- pg_query("UPDATE ttrss_entries SET unread = false
+ pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW()
WHERE feed_id = '$feed'");
}
- if ($ext == "MarkPageRead") {
+ if ($subop == "MarkPageRead") {
// pg_query("UPDATE ttrss_entries SET unread = false
// WHERE feed_id = '$feed' ORDER BY updated OFFSET $skip LIMIT 1");
}
}
- print "<table class=\"headlines\" width=\"100%\">";
+ print "<table class=\"headlinesList\" id=\"headlinesList\" width=\"100%\">";
- print "<tr><td class=\"search\" colspan=\"2\">
+ print "<tr><td class=\"search\" colspan=\"3\">
Search: <input onchange=\"javascript:search($feed,this);\"></td></tr>";
- print "<tr><td colspan=\"2\" class=\"title\">" . $line["title"] . "</td></tr>";
+ print "<tr><td colspan=\"3\" class=\"title\">" . $line["title"] . "</td></tr>";
if ($ext == "SEARCH") {
$search = $_GET["search"];
OR content LIKE '%$search%') AND";
}
- $result = pg_query("SELECT id,title,updated,unread,feed_id FROM
- ttrss_entries WHERE
+ $result = pg_query("SELECT count(id) AS total_entries
+ FROM ttrss_entries WHERE feed_id = '$feed'");
+
+ $total_entries = pg_fetch_result($result, 0, "total_entries");
+
+ $result = pg_query("SELECT
+ id,title,updated,unread,feed_id,
+ EXTRACT(EPOCH FROM last_read) AS last_read_ts,
+ EXTRACT(EPOCH FROM updated) AS updated_ts
+ FROM
+ ttrss_entries
+ WHERE
$search_query_part
feed_id = '$feed' ORDER BY updated DESC LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");
$class = ($lnum % 2) ? "even" : "odd";
+ if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
+ $update_pic = "<img src=\"updated.png\" alt=\"Updated\">";
+ } else {
+ $update_pic = " ";
+ }
+
if ($line["unread"] == "t")
$class .= "Unread";
- $content_link = "<a href=\"javascript:view(".$line["id"].",".$line["feed_id"].");\">".$line["title"]."</a>";
-
- print "<tr class='$class' id='RROW-".$line["id"]."'>";
+ $id = $line["id"];
+ $feed_id = $line["feed_id"];
+
+ $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
+ $line["title"] . "</a>";
+
+ print "<tr class='$class' id='RROW-$id'>";
+
+ print "<td id='FUPDPIC-$id' valign='center' class='headlineUpdateMark'>$update_pic</td>";
+
print "<td class='headlineUpdated'>".$line["updated"]."</td>";
print "<td class='headlineTitle'>$content_link</td>";
}
- print "<tr><td colspan=\"2\" class=\"headlineToolbar\">";
+ print "<tr><td colspan=\"3\" class=\"headlineToolbar\">";
$next_skip = $skip + HEADLINES_PER_PAGE;
$prev_skip = $skip - HEADLINES_PER_PAGE;
print "Navigate: ";
- print "<a class=\"button\"
- href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
+
+ if ($prev_skip >= 0) {
+ print "<a class=\"button\"
+ href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
+ } else {
+ print "<a class=\"disabledButton\">Previous Page</a>";
+ }
+ print " ";
+
+ if ($next_skip < $total_entries) {
+ print "<a class=\"button\"
+ href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
+ } else {
+ print "<a class=\"disabledButton\">Next Page</a>";
+ }
print " ";
print "<a class=\"button\"
- href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
+ href=\"javascript:viewfeed($feed, $skip, '');\">Refresh Page</a>";
print " ";
print "<a class=\"button\"
- href=\"javascript:viewfeed($feed, $skip, '');\">Refresh</a>";
+ href=\"javascript:viewfeed($feed, 0, 'ForceUpdate');\">Update</a>";
+
print " Mark as read: ";
+
print "<a class=\"button\"
- href=\"javascript:viewfeed($feed, $skip, 'MarkPageRead');\">This Page</a>";
+ href=\"javascript:catchupPage($feed);\">This Page</a>";
print " ";
print "<a class=\"button\"
href=\"javascript:viewfeed($feed, $skip, 'MarkAllRead');\">All Posts</a>";
}
- if ($op == "pref-feeds") {
-
- $subop = $_GET["subop"];
+ if ($op == "pref-rpc") {
- if ($subop == "edit") {
- print "<p>[Edit feed placeholder]</p>";
- }
+ $subop = $_GET["subop"];
if ($subop == "unread") {
$ids = split(",", $_GET["ids"]);
foreach ($ids as $id) {
pg_query("UPDATE ttrss_entries SET unread = true WHERE feed_id = '$id'");
}
+
+ print "Marked selected feeds as read.";
}
if ($subop == "read") {
$ids = split(",", $_GET["ids"]);
foreach ($ids as $id) {
- pg_query("UPDATE ttrss_entries SET unread = false WHERE feed_id = '$id'");
+ pg_query("UPDATE ttrss_entries
+ SET unread = false,last_read = NOW() WHERE feed_id = '$id'");
}
+
+ print "Marked selected feeds as unread.";
+
+ }
+
+ }
+
+ if ($op == "pref-feeds") {
+
+ $subop = $_GET["subop"];
+
+ if ($subop == "edit") {
+ print "<p>[Edit feed placeholder]</p>";
}
if ($subop == "remove") {
git.wh0rd.org / tt-rss.git / blobdiff