print "</table>";
+ print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
+
+/*
print "<p align=\"center\">All feeds:
<a class=\"button\"
href=\"javascript:scheduleFeedUpdate(true)\">Update</a>";
href=\"javascript:catchupAllFeeds()\">Mark as read</a></p>";
print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-
+*/
}
$subop = $_GET["subop"];
- if ($subop == "getRelativeId") {
- $mode = $_GET["mode"];
- $id = $_GET["id"];
+ if ($subop == "updateFeed") {
$feed_id = $_GET["feed"];
- if ($id != 'false' && $feed_id != 'false') {
+ $result = pg_query($link,
+ "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'");
- if ($mode == 'next') {
- $check_qpart = "updated >= ";
- } else {
- $idcheck_qpart = "id < '$id'";
- }
-
- $result = pg_query("SELECT id FROM ttrss_entries WHERE
- $check_qpart AND
- feed_id = '$feed_id'
- ORDER BY updated DESC LIMIT 1");
-
- $result_id = pg_fetch_result($result, 0, "id");
+ if (pg_num_rows($result) > 0) {
+ $feed_url = pg_fetch_result($result, 0, "feed_url");
+// update_rss_feed($link, $feed_url, $feed_id);
+ }
- print "M $mode : P $id -> P $result_id : F $feed_id";
+ print "DONE-$feed_id";
- }
+ return;
}
if ($subop == "forceUpdateAllFeeds") {
$result = pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
- $result = pg_query("SELECT title,link,content,feed_id,
+ $result = pg_query("SELECT title,link,content,feed_id,comments,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
FROM ttrss_entries
WHERE id = '$id'");
print "<tr class=\"titleTop\"><td align=\"right\"><b>Title:</b></td>
<td width=\"100%\">".$line["title"]."</td>
<td> </td></tr>";
-
+
+ if ($line["comments"] && $line["comments"] != $line["link"]) {
+// print "<tr class=\"titleInner\"><td align=\"right\"><b>Comments:</b></td>
+// <td><a href=\"".$line["comments"]."\">".$line["comments"]."</a></td>
+// <td> </td> </tr>";
+
+ $comments_prompt = "(<a href=\"".$line["comments"]."\">Comments</a>)";
+ }
+
print "<tr class=\"titleBottom\"><td align=\"right\"><b>Link:</b></td>
- <td><a href=\"".$line["link"]."\">".$line["link"]."</a></td>
- <td> </td> </tr>";
+ <td><a href=\"".$line["link"]."\">".$line["link"]."</a> $comments_prompt</td>
+ <td> </td></tr>";
print "<tr><td valign=\"top\" class=\"post\"
colspan=\"2\">" . $line["content"] . "</td>
<td valign=\"top\">$feed_icon</td>
feed_id = '$feed' ORDER BY updated DESC LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");
$lnum = 0;
+
+ $num_unread = 0;
while ($line = pg_fetch_assoc($result)) {
if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
$update_pic = "<img src=\"images/updated.png\" alt=\"Updated\">";
+ ++$num_unread;
} else {
$update_pic = " ";
}
- if ($line["unread"] == "t")
+ if ($line["unread"] == "t") {
$class .= "Unread";
+ ++$num_unread;
+ }
$id = $line["id"];
$feed_id = $line["feed_id"];
print " Mark as read: ";
- print "<a class=\"button\"
- href=\"javascript:catchupPage($feed);\">This Page</a>";
- print " ";
+ if ($num_unread > 0) {
+ print "<a class=\"button\" id=\"btnCatchupPage\"
+ href=\"javascript:catchupPage($feed);\">This Page</a>";
+ print " ";
+ } else {
+ print "<a class=\"disabledButton\">This Page</a>";
+ print " ";
+ }
+
print "<a class=\"button\"
href=\"javascript:viewfeed($feed, $skip, 'MarkAllRead');\">All Posts</a>";
$subop = $_GET["subop"];
- if ($subop == "edit") {
-
- $feed_id = $_GET["id"];
-
- $result = pg_query("SELECT title,feed_url
- FROM ttrss_feeds WHERE id = '$feed_id'");
-
- $fedit_link = pg_fetch_result($result, 0, "feed_url");
- $fedit_title = pg_fetch_result($result, 0, "title");
-
- print "<table class=\"prefAddFeed\">
- <td>Title:</td><td><input id=\"fedit_title\" value=\"$fedit_title\"></td></tr>
- <td>Link:</td><td><input id=\"fedit_link\" value=\"$fedit_link\"></td></tr>
- <tr><td colspan=\"2\" align=\"right\">
- <a class=\"button\" href=\"javascript:feedEditCancel()\">Cancel</a>
- <a class=\"button\" href=\"javascript:feedEditSave($feed_id)\">Save</a>
- </td></tr>
- </table>";
-
- } else {
-
- print "<table class=\"prefAddFeed\">
- <td><input id=\"fadd_link\"></td>
- <td colspan=\"4\" align=\"right\">
- <a class=\"button\" href=\"javascript:addFeed()\">Add feed</a></td></tr>
- </table>";
-
- }
-
if ($subop == "editSave") {
$feed_title = pg_escape_string($_GET["t"]);
$feed_link = pg_escape_string($_GET["l"]);
$result = pg_query(
"INSERT INTO ttrss_feeds (feed_url,title) VALUES ('$feed_link', '')");
- $result = pg_query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'");
+ $result = pg_query(
+ "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'");
$feed_id = pg_fetch_result($result, 0, "id");
print "<p><table width=\"100%\" class=\"prefFeedList\" id=\"prefFeedList\">";
print "<tr class=\"title\">
- <td> </td><td>Select</td><td>Title</td><td>Link</td><td>Last Updated</td></tr>";
+ <td> </td><td>Select</td><td width=\"40%\">Title</td>
+ <td width=\"40%\">Link</td><td>Last Updated</td></tr>";
$lnum = 0;
while ($line = pg_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
-
+
$feed_id = $line["id"];
-
+
+ $edit_feed_id = $_GET["id"];
+
+ if ($subop == "edit" && $feed_id != $edit_feed_id) {
+ $class .= "Grayed";
+ }
+
print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
$icon_file = ICONS_DIR . "/$feed_id.ico";
}
print "<td align='center'>$feed_icon</td>";
- print "<td><input onclick='toggleSelectRow(this);'
+ if (!$edit_feed_id || $subop != "edit") {
+
+ print "<td><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["title"] . "</td>";
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["feed_url"] . "</td>";
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["title"] . "</td>";
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["feed_url"] . "</td>";
+
+
+ } else if ($feed_id != $edit_feed_id) {
+
+ print "<td><input disabled=\"true\" type=\"checkbox\"
+ id=\"FRCHK-".$line["id"]."\"></td>";
+
+ print "<td>".$line["title"]."</td>";
+ print "<td>".$line["feed_url"]."</td>";
+
+ } else {
+
+ print "<td><input disabled=\"true\" type=\"checkbox\"></td>";
+
+ print "<td><input id=\"iedit_title\" value=\"".$line["title"]."\"></td>";
+ print "<td><input id=\"iedit_link\" value=\"".$line["feed_url"]."\"></td>";
+
+ }
print "<td>" . $line["last_updated"] . "</td>";
+
print "</tr>";
++$lnum;
print "</table>";
+ print "<p>";
+
+ if ($subop == "edit") {
+ print "Edit feed:
+ <a class=\"button\" href=\"javascript:feedEditCancel()\">Cancel</a>
+ <a class=\"button\" href=\"javascript:feedEditSave()\">Save</a>";
+ } else {
+
+ print "
+ Selection:
+ <a class=\"button\"
+ href=\"javascript:editSelectedFeed()\">Edit</a>
+ <a class=\"buttonWarn\"
+ href=\"javascript:removeSelectedFeeds()\">Remove</a>
+ <a class=\"button\"
+ href=\"javascript:readSelectedFeeds()\">Mark as read</a>
+ <a class=\"button\"
+ href=\"javascript:unreadSelectedFeeds()\">Mark as unread</a>
+ Page:
+ <a class=\"button\"
+ href=\"javascript:updateFeedList()\">Refresh</a>
+ OPML:
+ <a class=\"button\" href=\"opml.php?op=Export\">Export</a>
+ ";
+
+ }
+
}
pg_close($link);
git.wh0rd.org / tt-rss.git / blobdiff