getGlobalCounters($link);
}
+ function getFeedUnread($link, $feed) {
+ $n_feed = sprintf("%d", $feed);
+
+ if ($n_feed == -1) {
+ $match_part = "marked = true";
+ } else if ($feed > 0) {
+ $match_part = "feed_id = '$n_feed'";
+ } else if ($feed < -10) {
+ $label_id = -$feed - 11;
+
+ $result = db_query($link, "SELECT sql_exp FROM ttrss_labels WHERE
+ id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
+
+ $match_part = db_fetch_result($result, 0, "sql_exp");
+ }
+
+ if ($match_part) {
+
+ $result = db_query($link, "SELECT count(int_id) AS unread
+ FROM ttrss_user_entries
+ WHERE unread = true AND $match_part AND owner_uid = " . $_SESSION["uid"]);
+
+ } else {
+
+ $result = db_query($link, "SELECT COUNT(post_int_id) AS unread
+ FROM ttrss_tags,ttrss_user_entries
+ WHERE tag_name = '$feed' AND post_int_id = int_id AND unread = true AND
+ ttrss_tags.owner_uid = " . $_SESSION["uid"]);
+ }
+
+ $unread = db_fetch_result($result, 0, "unread");
+ return $unread;
+ }
+
/* FIXME this needs reworking */
function getGlobalCounters($link) {
while ($line = db_fetch_assoc($result)) {
- $feed = $line["title"];
+ $feed = db_unescape_string($line["title"]);
$feed_id = $line["id"];
$subop = $_GET["subop"];
} else {
$comments_url = $line["link"];
}
- $entry_comments = "(<a href=\"$comments_url\">$num_comments comments</a>)";
+ $entry_comments = "<a href=\"$comments_url\">$num_comments comments</a>";
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
+ $entry_comments = "<a href=\"".$line["comments"]."\">Comments</a>";
}
}
print "<div class=\"postHeader\"><table width=\"100%\">";
- print "<tr><td>" . $line["title"] . "</td>";
+ print "<tr><td><a href=\"" . $line["link"] . "\">" . $line["title"] . "</a></td>";
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
strtotime($line["updated"]));
$tags_str = preg_replace("/, $/", "", $tags_str);
$f_tags_str = preg_replace("/, $/", "", $f_tags_str);
- print "<tr><td width='50%'>
- <a href=\"" . $line["link"] . "\">".$line["link"]."</a>
- $entry_comments</td>
- <td align=\"right\">$tags_str</td></tr>";
+// $truncated_link = truncate_string($line["link"], 60);
-/* if ($tags_str) {
- print "<tr><td><b>Tags:</b></td>
- <td width='100%'>$tags_str</td></tr>";
- } */
+ if ($tags_str || $entry_comments) {
+ print "<tr><td width='50%'>
+ $entry_comments</td>
+ <td align=\"right\">$tags_str</td></tr>";
+ }
print "</table></div>";
$view_mode = $_GET["view"];
$addheader = $_GET["addheader"];
$limit = $_GET["limit"];
- $omode = $_GET["omode"];
-
- if ($omode == "xml") {
- header("Content-Type: application/xml");
- }
if (!$feed) {
return;
$view_query_part = "";
+ if ($view_mode == "Adaptive") {
+ if ($feed != -1) {
+ $unread = getFeedUnread($link, $feed);
+ if ($unread > 0) {
+ $view_query_part = " unread = true AND ";
+ }
+ }
+ }
+
if ($view_mode == "Starred") {
$view_query_part = " marked = true AND ";
}
$view_query_part = " unread = true AND ";
}
- if ($view_mode == "Unread or Starred") {
+/* if ($view_mode == "Unread or Starred") {
$view_query_part = " (unread = true OR marked = true) AND ";
}
if ($view_mode == "Unread or Updated") {
$view_query_part = " (unread = true OR last_read is NULL) AND ";
- }
+ } */
/* $result = db_query($link, "SELECT count(id) AS total_entries
FROM ttrss_entries WHERE
if ($feed < -10) error_reporting (0);
+ print "<div id=\"headlinesContainer\">";
+
if (sprintf("%d", $feed) != 0) {
if ($feed > 0) {
$feed_kind = "Labels";
}
- if (!$vfeed_query_part) {
- $content_query_part = "SUBSTRING(content,1,300) as content_preview,";
- } else {
- $content_query_part = "";
- }
+// if (!$vfeed_query_part) {
+ $content_query_part = "content as content_preview,";
+// } else {
+// $content_query_part = "";
+// }
$result = db_query($link, "SELECT
id,title,
}
if (!$result) {
- if ($omode != "xml") {
- print "<div align='center'>
- Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
- return;
- } else {
- print "<error error-code=\"8\"/>";
-
- }
+ print "<div align='center'>
+ Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
+ return;
}
if (db_num_rows($result) > 0) {
- if ($omode != "xml") {
+ print "<table class=\"headlinesSubToolbar\"
+ width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
- print "<table class=\"headlinesSubToolbar\"
- width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
-
print "<td class=\"headlineActions\">
Select:
- <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
- 'RROW-', 'RCHK-', true)\">All</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
- 'RROW-', 'RCHK-', true, 'Unread')\">Unread</a>,
- <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
- 'RROW-', 'RCHK-', false)\">None</a>
-
- Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
- <a href=\"javascript:selectionToggleMarked()\">Starred</a>";
-
+
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
+ 'RROW-', 'RCHK-', true)\">All</a>,
+
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
+ 'RROW-', 'RCHK-', true, 'Unread')\">Unread</a>,
+
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
+ 'RROW-', 'RCHK-', false)\">None</a>
+
+
Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
+
<a href=\"javascript:selectionToggleMarked()\">Starred</a>";
+
print "</td>";
-
- print "<td class=\"headlineTitle\">";
-
- if ($feed_site_url) {
- print "<a target=\"_blank\" href=\"$feed_site_url\">$feed_title</a>";
- } else {
- print $feed_title;
- }
-
+
+ } else {
+
+ print "<td class=\"headlineActions\">
+ Select:
+ <a href=\"javascript:cdmSelectArticles('all')\">All</a>,
+ <a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
+ <a href=\"javascript:cdmSelectArticles('none')\">None</a>
+
+ Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
+
print "</td>";
- print "</tr></table>";
+
+
+ }
+
+ print "<td class=\"headlineTitle\">";
+ if ($feed_site_url) {
+ print "<a target=\"_blank\" href=\"$feed_site_url\">$feed_title</a>";
+ } else {
+ print $feed_title;
+ }
+
+ print "</td>";
+ print "</tr></table>";
+
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
print "<table class=\"headlinesList\" id=\"headlinesList\"
cellspacing=\"0\" width=\"100%\">";
-
- } else {
- print "<headlines feed=\"$feed\" title=\"$feed_title\" site_url=\"$feed_site_url\">";
}
-
+
$lnum = 0;
error_reporting (DEFAULT_ERROR_LEVEL);
if ($line["unread"] == "t" || $line["unread"] == "1") {
$class .= "Unread";
++$num_unread;
- $is_unread = 'true';
+ $is_unread = true;
} else {
- $is_unread = 'false';
+ $is_unread = false;
}
if ($line["marked"] == "t" || $line["marked"] == "1") {
200);
}
- if ($omode != "xml") {
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
print "<tr class='$class' id='RROW-$id'>";
- // onclick=\"javascript:view($id,$feed_id)\">
print "<td class='hlUpdatePic'>$update_pic</td>";
print "</tr>";
} else {
+
+ if ($is_unread) {
+ $add_class = "Unread";
+ } else {
+ $add_class = "";
+ }
+
+ print "<div class=\"cdmArticle$add_class\" id=\"RROW-$id\">";
- print "<entry unread='$is_unread' id='$id'>";
- print "<title><![CDATA[" . $line["title"] . "]]></title>";
- print "<link>" . $line["link"] . "</link>";
- print "<updated>$updated_fmt</updated>";
- if ($content_preview) {
- print "<preview><![CDATA[ $content_preview ]]></preview>";
- }
+ print "<div class=\"cdmHeader\">";
- if ($line["feed_title"]) {
- print "<feed id='$feed_id'><![CDATA[" . $line["feed_title"] . "]]></feed>";
+ print "<div style=\"float : right\">$updated_fmt</div>";
+
+ print "<a href=\"".$line["link"]."\">".$line["title"]."</a>";
+
+ if ($line["feed_title"]) {
+ print " (<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
}
- print "</entry>";
- }
-
+ print "</div>";
+
+ print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div>";
+
+ print "<div style=\"float : right\">$marked_pic</div>
+ <div class=\"cdmFooter\">
+ <input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
+ 'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"></div>";
+
+ print "</div>";
+
+ }
++$lnum;
}
- if ($omode != "xml") {
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
print "</table>";
- } else {
- print "</headlines>";
}
} else {
print "<div width='100%' align='center'>No articles found.</div>";
}
- if ($omode != "xml") {
+ print "</div>";
- print "<script type=\"text/javascript\">
- document.onkeydown = hotkey_handler;
- update_all_counters('$feed');
- </script>";
+ print "<script type=\"text/javascript\">
+ document.onkeydown = hotkey_handler;
+ update_all_counters('$feed');
+ </script>";
- if ($addheader) {
- print "</body></html>";
- }
+ if ($addheader) {
+ print "</body></html>";
}
}
print "<div align='center'>
<input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Cancel\">
+ onclick=\"feedEditCancel()\" value=\"Cancel\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedEditSave()\" value=\"Save\"></div>";
+ onclick=\"feedEditSave()\" value=\"Save\"></div>";
return;
}
update_interval = '$upd_intl',
purge_interval = '$purge_intl'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
+ }
+
+ if ($subop == "saveCat") {
+ $cat_title = db_escape_string($_GET["title"]);
+ $cat_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link, "UPDATE ttrss_feed_categories SET
+ title = '$cat_title' WHERE id = '$cat_id' AND owner_uid = ".$_SESSION["uid"]);
}
$_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) {
- $search_qpart = "UPPER(title) LIKE UPPER('%$feed_search%') AND";
+ $search_qpart = "(UPPER(title) LIKE UPPER('%$feed_search%') OR
+ UPPER(feed_url) LIKE UPPER('%$feed_search%')) AND";
} else {
$search_qpart = "";
}
if (!get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr class=\"title\">
- <td width=\"3%\"> </td>
- <td width=\"3%\">Select</td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('feed_url')\">Link</a>
- </td>";
-
- print "
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a>
- </td>
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a>
- </td>
- </tr>";
+ <td width='5%' align='center'> </td>
+ <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
}
$lnum = 0;
print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
print "<tr class=\"title\">
- <td width=\"3%\"> </td>
- <td width=\"3%\">Select</td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('feed_url')\">Link</a>
- </td>
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a>
- </td>
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a>
- </td></tr>";
+ <td width='5%' align='center'> </td>
+ <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
$cur_cat_id = $cat_id;
}
$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\">";
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . "/$feed_id.ico\">";
} else {
- $feed_icon = " ";
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- print "<td align='center'>$feed_icon</td>";
+// print "<td class='feedIcon'>$feed_icon</td>";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td class='feedSelect'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
$edit_title = truncate_string($edit_title, 40);
$edit_link = truncate_string($edit_link, 60);
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_title . "</a></td>";
+ "$feed_icon $edit_title" . "</a></td>";
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
$edit_link . "</a></td>";
</td</tr>";
print "<tr class=\"title\">
- <td width=\"10%\">Select</td><td width=\"80%\">Title</td>
+ <td width=\"5%\"></td><td width=\"80%\">Title</td>
</tr>";
$lnum = 0;
if (!$edit_cat_id || $subop != "editCat") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFeedCat($cat_id);\">" .
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
+ <td align='center' width=\"5%\"> </td>
<td width=\"20%\">Filter expression</td>
<td width=\"20%\">Feed</td>
<td width=\"15%\">Match</td>
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td><td width=\"40%\">SQL expression
+ <td align='center' width=\"5%\"> </td>
+ <td width=\"40%\">SQL expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
<td width=\"40%\">Caption</td></tr>";
if (!$line["description"]) $line["description"] = "[No caption]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editLabel($label_id);\">" .
name=\"subop\" value=\"Save configuration\">";
print " <input class=\"button\" type=\"submit\"
- name=\"subop\" value=\"Reset to defaults\"></p>";
+ name=\"subop\" onclick=\"return validatePrefsReset()\"
+ value=\"Reset to defaults\"></p>";
print "</form>";
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
+ <td align='center' width=\"5%\"> </td>
<td width='30%'>Username</td>
<td width='30%'>Access Level</td>
<td width='30%'>Last login</td></tr>";
if ($uid == $_SESSION["uid"]) {
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"UMCHK-".$line["id"]."\"></td>";
print "<td>".$line["login"]."</td>";
} else if (!$edit_uid || $subop != "edit") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
print "<td><a href=\"javascript:editUser($uid);\">" .
if ($op == "feed-details") {
- $feed_id = $_GET["id"];
-
- $result = db_query($link,
- "SELECT
- title,feed_url,
- SUBSTRING(last_updated,1,16) as last_updated,
- icon_url,site_url,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id) AS total,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND unread = true) AS unread,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND marked = true) AS marked
- FROM ttrss_feeds
- WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) return;
-
- $title = db_fetch_result($result, 0, "title");
- $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
- strtotime(db_fetch_result($result, 0, "last_updated")));
- $feed_url = db_fetch_result($result, 0, "feed_url");
- $icon_url = db_fetch_result($result, 0, "icon_url");
- $total = db_fetch_result($result, 0, "total");
- $unread = db_fetch_result($result, 0, "unread");
- $marked = db_fetch_result($result, 0, "marked");
- $site_url = db_fetch_result($result, 0, "site_url");
+// $feed_id = $_GET["id"];
- $result = db_query($link, "SELECT COUNT(id) AS subscribed
- FROM ttrss_feeds WHERE feed_url = '$feed_url'");
-
- $subscribed = db_fetch_result($result, 0, "subscribed");
+ $feed_ids = split(",", db_escape_string($_GET["id"]));
print "<div class=\"infoBoxContents\">";
- $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 "<h1>$feed_icon $title</h1>";
-
- print "<table width='100%'>";
-
- if ($site_url) {
- print "<tr><td width='30%'>Link</td>
- <td><a href=\"$site_url\">$site_url</a>
- <a href=\"$feed_url\">(feed)</a></td>
- </td></tr>";
- } else {
- print "<tr><td width='30%'>Feed URL</td>
- <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
- }
- print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
- print "<tr><td>Total articles</td><td>$total</td></tr>";
- print "<tr><td>Unread articles</td><td>$unread</td></tr>";
- print "<tr><td>Starred articles</td><td>$marked</td></tr>";
- print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
-
- print "</table>";
-
- $result = db_query($link, "SELECT title,
- SUBSTRING(updated,1,16) AS updated,unread
- FROM ttrss_entries,ttrss_user_entries
- WHERE ref_id = id AND feed_id = '$feed_id'
- ORDER BY date_entered DESC LIMIT 5");
-
- if (db_num_rows($result) > 0) {
+ foreach ($feed_ids as $feed_id) {
- print "<h1>Latest headlines</h1>";
-
- print "<ul class=\"nomarks\">";
+ $result = db_query($link,
+ "SELECT
+ title,feed_url,
+ SUBSTRING(last_updated,1,16) as last_updated,
+ icon_url,site_url,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id) AS total,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id AND unread = true) AS unread,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id AND marked = true) AS marked
+ FROM ttrss_feeds
+ WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
+
+ if (db_num_rows($result) == 0) return;
+
+ $title = db_unescape_string(db_fetch_result($result, 0, "title"));
+ $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
+ strtotime(db_fetch_result($result, 0, "last_updated")));
+ $feed_url = db_fetch_result($result, 0, "feed_url");
+ $icon_url = db_fetch_result($result, 0, "icon_url");
+ $total = db_fetch_result($result, 0, "total");
+ $unread = db_fetch_result($result, 0, "unread");
+ $marked = db_fetch_result($result, 0, "marked");
+ $site_url = db_fetch_result($result, 0, "site_url");
- while ($line = db_fetch_assoc($result)) {
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $line["title"] = "<b>" . $line["title"] . "</b>";
- }
- print "<li>" . $line["title"].
- " <span class=\"insensitive\">(" .
- date(get_pref($link, 'SHORT_DATE_FORMAT'),
- strtotime($line["updated"])).
- ")</span></li>";
+ $result = db_query($link, "SELECT COUNT(id) AS subscribed
+ FROM ttrss_feeds WHERE feed_url = '$feed_url'");
+
+ $subscribed = db_fetch_result($result, 0, "subscribed");
+
+ $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 "</ul>";
+ print "<h1>$feed_icon $title</h1>";
- print "</div>";
+ print "<table width='100%'>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+ if ($site_url) {
+ print "<tr><td width='30%'>Link</td>
+ <td><a href=\"$site_url\">$site_url</a>
+ <a href=\"$feed_url\">(feed)</a></td>
+ </td></tr>";
+ } else {
+ print "<tr><td width='30%'>Feed URL</td>
+ <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
+ }
+ print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
+ print "<tr><td>Total articles</td><td>$total</td></tr>";
+ print "<tr><td>Unread articles</td><td>$unread</td></tr>";
+ print "<tr><td>Starred articles</td><td>$marked</td></tr>";
+ print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
+
+ print "</table>";
+
+/* $result = db_query($link, "SELECT title,
+ SUBSTRING(updated,1,16) AS updated,unread
+ FROM ttrss_entries,ttrss_user_entries
+ WHERE ref_id = id AND feed_id = '$feed_id'
+ ORDER BY date_entered DESC LIMIT 5");
+
+ if (db_num_rows($result) > 0) {
+
+ print "<h1>Latest headlines</h1>";
+
+ print "<ul class=\"nomarks\">";
+
+ while ($line = db_fetch_assoc($result)) {
+ if ($line["unread"] == "t" || $line["unread"] == "1") {
+ $line["title"] = "<b>" . $line["title"] . "</b>";
+ }
+ print "<li>" . $line["title"].
+ " <span class=\"insensitive\">(" .
+ date(get_pref($link, 'SHORT_DATE_FORMAT'),
+ strtotime($line["updated"])).
+ ")</span></li>";
+ }
+
+ print "</ul>";
+
+ } */
}
- }
+
+ print "</div>";
+
+ print "<div align='center'>
+ <input type='submit' class='button'
+ onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+ }
db_close($link);
?>
git.wh0rd.org / tt-rss.git / blobdiff