WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
FROM ttrss_feeds ORDER BY title");
- print "<table width=\"100%\" class=\"feeds\">";
+ print "<table width=\"100%\" class=\"feeds\" id=\"feedsList\">";
$lnum = 0;
$feed = $line["title"];
$feed_id = $line["id"];
+
+ $subop = $_GET["subop"];
$total = $line["total"];
$unread = $line["unread"];
print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
+
+ if ($subop != "piggie") {
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img width=\"16\" height=\"16\"
+ src=\"" . ICONS_URL . "/$feed_id.ico\">";
+ } else {
+ $feed_icon = " ";
+ }
+ } else {
+ $feed_icon = "<img width=\"16\" height=\"16\"
+ src=\"http://madoka.spb.ru/stuff/fox/tiny_piggie.png\">";
+ }
+
$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed</a>";
+ if (ENABLE_FEED_ICONS) {
+ print "<td>$feed_icon</td>";
+ }
print "<td id=\"FEEDN-$feed_id\">$feed</td>";
print "<td>";
print "<span id=\"FEEDU-$feed_id\">$unread</span> / ";
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 == "updateFeed") {
+ $feed_id = $_GET["feed"];
+
+ $result = pg_query($link,
+ "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_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 "DONE-$feed_id";
+
+ return;
+ }
+
if ($subop == "forceUpdateAllFeeds") {
update_all_feeds($link, true);
outputFeedList($link);
$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
+ $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'");
if ($result) {
$line = pg_fetch_assoc($result);
-/* print "<table class=\"feedOverview\">";
- print "<tr><td><b>Title:</b></td><td>".$line["title"]."</td></tr>";
- print "<tr><td><b>Link:</b></td><td><a href=\"".$line["link"]."\">".$line["link"]."</a></td></tr>";
- print "</table>";
+ if ($line["icon_url"]) {
+ $feed_icon = "<img class=\"feedIcon\" src=\"" . $line["icon_url"] . "\">";
+ } else {
+ $feed_icon = " ";
+ }
- print $line["content"]; */
+ print "<table class=\"postTable\" width=\"100%\" cellspacing=\"0\"
+ cellpadding=\"0\">";
+
+ 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>";
- print "<table class=\"postTable\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">";
- print "<tr class=\"titleTop\"><td align=\"right\"><b>Title:</b></td>
- <td width=\"100%\">".$line["title"]."</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></tr>";
-
- print "<tr><td class=\"post\" colspan=\"2\">" . $line["content"] . "</td></tr>";
- print "</table>";
+ <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>
+ </tr>";
+ print "</table>";
+
}
}
$feed_last_updated = "Updated: " . $line["last_updated"];
print "<tr><td class=\"search\" colspan=\"3\">
- Search: <input onchange=\"javascript:search($feed,this);\">
- <a class=\"button\" href=\"javascript:viewfeed($feed,0)\">Reset</a>
+ Search: <input id=\"searchbox\"
+ onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
+ onchange=\"javascript:search($feed);\">
+ <a class=\"button\" href=\"javascript:resetSearch()\">Reset</a>
</td></tr>";
print "<tr>
<td colspan=\"3\" class=\"title\">" . $line["title"] . "</td></tr>";
- if ($subop == "search") {
- $search = $_GET["search"];
+ $search = $_GET["search"];
+
+ if (search) {
$search_query_part = "(upper(title) LIKE upper('%$search%')
OR content LIKE '%$search%') AND";
}
$result = pg_query("SELECT count(id) AS total_entries
- FROM ttrss_entries WHERE feed_id = '$feed'");
+ FROM ttrss_entries WHERE
+ $search_query_part
+ feed_id = '$feed'");
$total_entries = pg_fetch_result($result, 0, "total_entries");
feed_id = '$feed' ORDER BY updated DESC LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");
$lnum = 0;
+
+ $num_unread = 0;
while ($line = pg_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
- $update_pic = "<img src=\"updated.png\" alt=\"Updated\">";
+ $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 "<td id='FUPDPIC-$id' valign='center' class='headlineUpdateMark'>$update_pic</td>";
- print "<td class='headlineUpdated'>".$line["updated"]."</td>";
+ print "<td class='headlineUpdated'>
+ <a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
print "<td class='headlineTitle'>$content_link</td>";
print "</tr>";
// start unholy navbar block
print "<tr><td colspan=\"3\" class=\"headlineToolbar\">";
-
+
$next_skip = $skip + HEADLINES_PER_PAGE;
$prev_skip = $skip - HEADLINES_PER_PAGE;
-
+
print "Navigate: ";
if ($prev_skip >= 0) {
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>";
print "</td></tr>";
// end unholy navbar block
-
print "</table>";
$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"]);
pg_query("DELETE FROM ttrss_entries WHERE feed_id = '$id'");
pg_query("DELETE FROM ttrss_feeds WHERE id = '$id'");
pg_query("COMMIT");
+
+ if (file_exists(ICONS_DIR . "/$id.ico")) {
+ unlink(ICONS_DIR . "/$id.ico");
+ }
}
}
}
$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");
}
}
- $result = pg_query("SELECT * FROM ttrss_feeds ORDER by title");
+ $result = pg_query("SELECT
+ id,title,feed_url,substring(last_updated,1,16) as last_updated
+ FROM
+ ttrss_feeds ORDER by title");
print "<p><table width=\"100%\" class=\"prefFeedList\" id=\"prefFeedList\">";
print "<tr class=\"title\">
- <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\">";
- print "<td><input onclick='toggleSelectRow(this);'
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img width=\"16\" height=\"16\"
+ src=\"" . ICONS_URL . "/$feed_id.ico\">";
+ } else {
+ $feed_icon = " ";
+ }
+ print "<td align='center'>$feed_icon</td>";
+
+ 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