getFeedCounters($link);
getTagCounters($link);
getGlobalCounters($link);
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ getCategoryCounters($link);
+ }
}
+ function getCategoryCounters($link) {
+ $result = db_query($link, "SELECT cat_id,SUM((SELECT COUNT(int_id)
+ FROM ttrss_user_entries WHERE feed_id = ttrss_feeds.id
+ AND unread = true)) AS unread FROM ttrss_feeds
+ WHERE owner_uid = ".$_SESSION["uid"]." GROUP BY cat_id");
+
+ while ($line = db_fetch_assoc($result)) {
+ $line["cat_id"] = sprintf("%d", $line["cat_id"]);
+ print "<counter type=\"category\" id=\"".$line["cat_id"]."\" counter=\"".
+ $line["unread"]."\"/>";
+ }
+ }
+
+ 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) {
ttrss_user_entries.ref_id = ttrss_entries.id AND
owner_uid = " . $_SESSION["uid"]);
$c_id = db_fetch_result($result, 0, "c_id");
- print "<counter id='global-unread' counter='$c_id'/>";
+ print "<counter type=\"global\" id='global-unread' counter='$c_id'/>";
}
function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
$tctrs_modified = false;
- $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
+/* $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_tags.owner_uid = ".$_SESSION["uid"]." AND
post_int_id = ttrss_user_entries.int_id AND unread = true GROUP BY tag_name
UNION
select tag_name,0 as count FROM ttrss_tags
- WHERE ttrss_tags.owner_uid = ".$_SESSION["uid"]);
+ WHERE ttrss_tags.owner_uid = ".$_SESSION["uid"]); */
+ $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
+ FROM ttrss_user_entries WHERE int_id = post_int_id
+ AND unread = true)) AS count FROM ttrss_tags
+ WHERE owner_uid = 2 GROUP BY tag_name ORDER BY tag_name");
+
$tags = array();
while ($line = db_fetch_assoc($result)) {
if (!$smart_mode || $old_counters[$tag] != $unread) {
$old_counters[$tag] = $unread;
$tctrs_modified = true;
- print "<tag id=\"$tag\" counter=\"$unread\"/>";
+ print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
}
}
$count = db_fetch_result($result, 0, "count");
- print "<label id=\"-1\" counter=\"$count\"/>";
+ print "<counter type=\"label\" id=\"-1\" counter=\"$count\"/>";
$result = db_query($link, "SELECT owner_uid,id,sql_exp,description FROM
ttrss_labels WHERE owner_uid = ".$_SESSION["uid"]." ORDER by description");
if (!$smart_mode || $old_counters[$id] != $count) {
$old_counters[$id] = $count;
$lctrs_modified = true;
- print "<label id=\"$id\" counter=\"$count\"/>";
+ print "<counter type=\"label\" id=\"$id\" counter=\"$count\"/>";
}
error_reporting (DEFAULT_ERROR_LEVEL);
$count = db_fetch_result($result, 0, "count");
- print "<feed id=\"$id\" counter=\"$count\"/>";
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\"/>";
}
function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
if (!$smart_mode || $old_counters[$id] != $count) {
$old_counters[$id] = $count;
$fctrs_modified = true;
- print "<feed id=\"$id\" counter=\"$count\"/>";
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\"/>";
}
}
print "</li></ul>";
}
- if (get_pref($link, 'ENABLE_LABELS')) {
+ if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) {
$result = db_query($link, "SELECT id,sql_exp,description FROM
ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description");
error_reporting (0);
- $tmp_result = db_query($link, "SELECT count(id) as count FROM ttrss_entries,ttrss_user_entries
+ $tmp_result = db_query($link, "SELECT count(id) as count
+ FROM ttrss_entries,ttrss_user_entries
WHERE (" . $line["sql_exp"] . ") AND unread = true AND
ttrss_user_entries.ref_id = ttrss_entries.id
AND owner_uid = '$owner_uid'");
AND ttrss_user_entries.ref_id = ttrss_entries.id
AND owner_uid = '$owner_uid') as unread,
(SELECT title FROM ttrss_feed_categories
- WHERE id = cat_id) AS category
+ WHERE id = cat_id) AS category,
+ cat_id,
+ (SELECT collapsed FROM ttrss_feed_categories
+ WHERE id = cat_id) AS collapsed
FROM ttrss_feeds WHERE owner_uid = '$owner_uid' ORDER BY $order_by_qpart");
$actid = $_GET["actid"];
while ($line = db_fetch_assoc($result)) {
- $feed = $line["title"];
+ $feed = db_unescape_string($line["title"]);
$feed_id = $line["id"];
$subop = $_GET["subop"];
$total = $line["total"];
$unread = $line["unread"];
+ $cat_id = $line["cat_id"];
+
$tmp_category = $line["category"];
if (!$tmp_category) {
}
$category = $tmp_category;
+
+ $collapsed = $line["collapsed"];
+
+ // workaround for NULL category
+ if ($category == "Uncategorized") {
+ if ($_COOKIE["ttrss_vf_uclps"] == 1) {
+ $collapsed = "t";
+ }
+ }
+
+ if ($collapsed == "t" || $collapsed == "1") {
+ $holder_class = "invisible";
+ $ellipsis = "...";
+ } else {
+ $holder_class = "";
+ $ellipsis = "";
+ }
+
+ if ($cat_id) {
+ $cat_id_qpart = "cat_id = '$cat_id'";
+ } else {
+ $cat_id_qpart = "cat_id IS NULL";
+ }
+
+ $tmp_result = db_query($link, "SELECT count(int_id) AS unread
+ FROM ttrss_user_entries,ttrss_feeds WHERE
+ unread = true AND
+ feed_id = ttrss_feeds.id AND $cat_id_qpart AND
+ ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
+
+ $cat_unread = db_fetch_result($tmp_result, 0, "unread");
+
+ $cat_id = sprintf("%d", $cat_id);
- print "<li class=\"feedCat\">$category</li>";
- print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
+ print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
+ <a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category
+ <span id=\"FCATCTR-$cat_id\"
+ class=\"$catctr_class\">($cat_unread unread)$ellipsis</span></a></li>";
+
+ // !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function
+ // -> keyboard navigation, etc.
+ print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\">";
}
printFeedEntry($feed_id, $class, $feed, $unread,
// tags
- $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
+/* $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
FROM ttrss_tags,ttrss_entries,ttrss_user_entries WHERE
post_int_id = ttrss_user_entries.int_id AND
unread = true AND ref_id = ttrss_entries.id
AND ttrss_tags.owner_uid = '$owner_uid' GROUP BY tag_name
UNION
select tag_name,0 as count FROM ttrss_tags WHERE owner_uid = '$owner_uid'
- ORDER BY tag_name");
-
+ ORDER BY tag_name"); */
+
+ $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
+ FROM ttrss_user_entries WHERE int_id = post_int_id
+ AND unread = true)) AS count FROM ttrss_tags
+ WHERE owner_uid = 2 GROUP BY tag_name ORDER BY tag_name");
+
$tags = array();
while ($line = db_fetch_assoc($result)) {
if (strchr($omode, "l")) getLabelCounters($link);
if (strchr($omode, "f")) getFeedCounters($link);
if (strchr($omode, "t")) getTagCounters($link);
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ getCategoryCounters($link);
+ }
getGlobalCounters($link);
print "</rpc-reply>";
}
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
}
+ if ($subop == "collapse") {
+ $cat_id = db_escape_string($_GET["cid"]);
+
+ db_query($link, "UPDATE ttrss_feed_categories SET
+ collapsed = NOT collapsed WHERE id = '$cat_id' AND owner_uid = " .
+ $_SESSION["uid"]);
+ return;
+ }
+
outputFeedList($link, $tags);
}
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
SUBSTRING(updated,1,16) as updated,
- (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
+ (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
+ num_comments
FROM ttrss_entries,ttrss_user_entries
WHERE id = '$id' AND ref_id = id");
$feed_icon = " ";
}
- if ($line["comments"] && $line["link"] != $line["comments"]) {
+/* if ($line["comments"] && $line["link"] != $line["comments"]) {
$entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
} else {
$entry_comments = "";
+ } */
+
+ $num_comments = $line["num_comments"];
+ $entry_comments = "";
+
+ if ($num_comments > 0) {
+ if ($line["comments"]) {
+ $comments_url = $line["comments"];
+ } else {
+ $comments_url = $line["link"];
+ }
+ $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>";
+ }
}
print "<div class=\"postReply\">";
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") {
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
$content_preview = truncate_string(strip_tags($line["content_preview"]),
- 60);
+ 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 "<td class='hlFeed'>
<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a> </td>";
} else {
- print "<td class='hlContent'>";
+ print "<td class='hlContent' valign='middle'>";
print "<a href=\"javascript:view($id,$feed_id);\">" .
$line["title"];
print "</tr>";
} else {
+
+ if ($is_unread) {
+ $add_class = "Unread";
+ } else {
+ $add_class = "";
+ }
+
+ print "<div class=\"cdmArticle$add_class\" id=\"RROW-$id\">";
+
+ print "<div class=\"cdmHeader\">";
- 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 style=\"float : right\">$updated_fmt</div>";
+
+ print "<a href=\"".$line["link"]."\">".$line["title"]."</a>";
- if ($line["feed_title"]) {
- print "<feed id='$feed_id'><![CDATA[" . $line["feed_title"] . "]]></feed>";
+ 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>";
}
}
if ($op == "pref-feeds") {
- $subop = $_GET["subop"];
+ $subop = $_REQUEST["subop"];
+ $quiet = $_REQUEST["quiet"];
- if ($subop == "editSave") {
- $feed_title = db_escape_string($_GET["t"]);
- $feed_link = db_escape_string($_GET["l"]);
- $upd_intl = db_escape_string($_GET["ui"]);
- $purge_intl = db_escape_string($_GET["pi"]);
+ if ($subop == "editfeed") {
$feed_id = db_escape_string($_GET["id"]);
- $cat_id = db_escape_string($_GET["catid"]);
+
+ $result = db_query($link,
+ "SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
+ owner_uid = " . $_SESSION["uid"]);
+
+ $title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
+ 0, "title")));
+
+ 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%'>";
+
+ $row_class = "odd";
+
+ print "<tr class='$row_class'><td>Title:</td>";
+ print "<td><input id=\"iedit_title\" value=\"$title\"></td></tr>";
+
+ $feed_url = db_fetch_result($result, 0, "feed_url");
+ $feed_url = htmlspecialchars(db_unescape_string(db_fetch_result($result,
+ 0, "feed_url")));
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<tr class='$row_class'><td>Feed URL:</td>";
+ print "<td><input id=\"iedit_link\" value=\"$feed_url\"></td></tr>";
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+ $cat_id = db_fetch_result($result, 0, "cat_id");
+
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<tr class='$row_class'><td>Category:</td>";
+ print "<td>";
+ print "<select id=\"iedit_fcat\">";
+ print "<option id=\"0\">Uncategorized</option>";
+
+ $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
+ WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+
+ if (db_num_rows($tmp_result) > 0) {
+ print "<option disabled>--------</option>";
+ }
+
+ while ($tmp_line = db_fetch_assoc($tmp_result)) {
+ if ($tmp_line["id"] == $cat_id) {
+ $is_selected = "selected";
+ } else {
+ $is_selected = "";
+ }
+ printf("<option $is_selected id='%d'>%s</option>",
+ $tmp_line["id"], $tmp_line["title"]);
+ }
+
+ print "</select></td>";
+ print "</td></tr>";
+
+ }
+
+ $update_interval = db_fetch_result($result, 0, "update_interval");
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<tr class='$row_class'><td>Update Interval:</td>";
+ print "<td><input id=\"iedit_updintl\"
+ value=\"$update_interval\"></td></tr>";
+
+ $purge_interval = db_fetch_result($result, 0, "purge_interval");
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<tr class='$row_class'><td>Purge Days:</td>";
+ print "<td><input id=\"iedit_purgintl\"
+ value=\"$purge_interval\"></td></tr>";
+
+// print "<tr><td colspan=\"2\"><b>Authentication</b></td></tr>";
+
+ $row_class = toggleEvenOdd($row_class);
+ $auth_login = db_fetch_result($result, 0, "auth_login");
+
+ print "<tr class='$row_class'><td>Login:</td>";
+ print "<td><input id=\"iedit_login\"
+ value=\"$auth_login\"></td></tr>";
+
+ $row_class = toggleEvenOdd($row_class);
+ $auth_pass = db_fetch_result($result, 0, "auth_pass");
+
+ print "<tr class='$row_class'><td>Password:</td>";
+ print "<td><input type=\"password\" id=\"iedit_pass\"
+ value=\"$auth_pass\"></td></tr>";
+
+ print "</table>";
+ print "</div>";
+
+ print "<div align='center'>
+ <input type='submit' class='button'
+ onclick=\"feedEditCancel()\" value=\"Cancel\">
+ <input type=\"submit\" class=\"button\"
+ onclick=\"feedEditSave()\" value=\"Save\"></div>";
+ return;
+ }
+
+ if ($subop == "editSave") {
+ $feed_title = db_escape_string($_POST["t"]);
+ $feed_link = db_escape_string($_POST["l"]);
+ $upd_intl = db_escape_string($_POST["ui"]);
+ $purge_intl = db_escape_string($_POST["pi"]);
+ $feed_id = db_escape_string($_POST["id"]);
+ $cat_id = db_escape_string($_POST["catid"]);
+ $auth_login = db_escape_string($_POST["login"]);
+ $auth_pass = db_escape_string($_POST["pass"]);
if (strtoupper($upd_intl) == "DEFAULT")
$upd_intl = 0;
$category_qpart,
title = '$feed_title', feed_url = '$feed_link',
update_interval = '$upd_intl',
- purge_interval = '$purge_intl'
+ purge_interval = '$purge_intl',
+ auth_login = '$auth_login',
+ auth_pass = '$auth_pass'
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"]);
}
}
+ if ($quiet) return;
+
// print "<h3>Edit Feeds</h3>";
$result = db_query($link, "SELECT id,title,feed_url,last_error
$_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 = "";
}
ttrss_feeds
WHERE
$search_qpart owner_uid = '".$_SESSION["uid"]."'
- ORDER by $feeds_sort,title");
+ ORDER by category,$feeds_sort,title");
if (db_num_rows($result) != 0) {
'FEEDR-', 'FRCHK-', false)\">None</a>
</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>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td width=\"10%\">
- <a href=\"javascript:updateFeedList('category')\">Category</a></td>";
+ if (!get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<tr class=\"title\">
+ <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>";
}
- 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>";
-
$lnum = 0;
+
+ $cur_cat_id = -1;
while ($line = db_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";
- $this_row_id = "";
- } else {
- $this_row_id = "id=\"FEEDR-$feed_id\"";
- }
-
- print "<tr class=\"$class\" $this_row_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\">";
- } else {
- $feed_icon = " ";
- }
- print "<td align='center'>$feed_icon</td>";
-
+ $cat_id = $line["cat_id"];
+
$edit_title = htmlspecialchars(db_unescape_string($line["title"]));
$edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+ if ($line["update_interval"] == "0") $line["update_interval"] = "Default";
+ if ($line["update_interval"] == "-1") $line["update_interval"] = "Disabled";
+ if ($line["purge_interval"] == "0") $line["purge_interval"] = "Default";
+ if ($line["purge_interval"] < 0) $line["purge_interval"] = "Disabled";
+
if (!$edit_cat) $edit_cat = "Uncategorized";
-
- if (!$edit_feed_id || $subop != "edit") {
-
- print "<td><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>";
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_link . "</a></td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_cat . "</a></td>";
- }
-
- if ($line["update_interval"] == "0")
- $line["update_interval"] = "Default";
-
- if ($line["update_interval"] == "-1")
- $line["update_interval"] = "Disabled";
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["update_interval"] . "</a></td>";
-
- if ($line["purge_interval"] == "0")
- $line["purge_interval"] = "Default";
-
- if ($line["purge_interval"] < 0)
- $line["purge_interval"] = "Disabled";
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["purge_interval"] . "</a></td>";
-
- } else if ($feed_id != $edit_feed_id) {
-
- print "<td><input disabled=\"true\" type=\"checkbox\"
- id=\"FRCHK-".$line["id"]."\"></td>";
+ if (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
+ $lnum = 0;
+
+ print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
- $edit_title = truncate_string($edit_title, 40);
- $edit_link = truncate_string($edit_link, 60);
+ print "<tr class=\"title\">
+ <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>";
- print "<td>$edit_title</td>";
- print "<td>$edit_link</td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td>$edit_cat</td>";
- }
-
- if ($line["update_interval"] == "0")
- $line["update_interval"] = "Default";
-
- print "<td>" . $line["update_interval"] . "</td>";
-
- if ($line["purge_interval"] == "0")
- $line["purge_interval"] = "Default";
-
- if ($line["purge_interval"] < 0)
- $line["purge_interval"] = "Disabled";
+ $cur_cat_id = $cat_id;
+ }
+
+ $class = ($lnum % 2) ? "even" : "odd";
+ $this_row_id = "id=\"FEEDR-$feed_id\"";
+
+ print "<tr class=\"$class\" $this_row_id>";
- print "<td>" . $line["purge_interval"] . "</td>";
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . "/$feed_id.ico\">";
} else {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+ }
+// print "<td class='feedIcon'>$feed_icon</td>";
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
-
- print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
- print "<td><input id=\"iedit_link\" value=\"$edit_link\"></td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- print "<td>";
- print "<select id=\"iedit_fcat\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($tmp_result) > 0) {
- print "<option disabled>--------</option>";
- }
+ print "<td class='feedSelect'><input onclick='toggleSelectRow(this);'
+ type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $line["cat_id"]) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["title"]);
- }
-
- print "</select></td>";
- print "</td>";
-
- }
+ $edit_title = truncate_string($edit_title, 40);
+ $edit_link = truncate_string($edit_link, 60);
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ "$feed_icon $edit_title" . "</a></td>";
- print "<td><input id=\"iedit_updintl\"
- value=\"".$line["update_interval"]."\"></td>";
- print "<td><input id=\"iedit_purgintl\"
- value=\"".$line["purge_interval"]."\"></td>";
-
- }
-
-/* if (!$line["last_updated"]) $line["last_updated"] = "Never";
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $edit_link . "</a></td>";
+
+/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $edit_cat . "</a></td>";
+ } */
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["update_interval"] . "</a></td>";
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["purge_interval"] . "</a></td>";
- print "<td>" . $line["last_updated"] . "</td>"; */
-
print "</tr>";
++$lnum;
</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);\">" .
if ($op == "pref-filters") {
$subop = $_GET["subop"];
+ $quiet = $_GET["quiet"];
if ($subop == "editSave") {
}
}
+ if ($quiet) return;
+
$result = db_query($link, "SELECT description
FROM ttrss_filter_types ORDER BY description");
</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);\">" .
}
}
+ // We need to accept raw SQL data in label queries, so not everything is escaped
+ // here, this is by design. If you don't like the whole idea, disable labels
+ // altogether with GLOBAL_ENABLE_LABELS = false
+
if ($op == "pref-labels") {
+ if (!GLOBAL_ENABLE_LABELS) {
+ return;
+ }
+
$subop = $_GET["subop"];
if ($subop == "test") {
</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);\">" .
}
+ if ($id == "quickAddFilter") {
+
+ $result = db_query($link, "SELECT description
+ FROM ttrss_filter_types ORDER BY description");
+
+ $filter_types = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ array_push($filter_types, $line["description"]);
+ }
+
+ print "<table>";
+
+ print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"40\"> ";
+
+ print_select("fadd_match", "Title", $filter_types);
+
+ print "</td></tr>";
+ print "<tr><td>Feed:</td><td><select id=\"fadd_feed\">";
+
+ print "<option selected id=\"0\">All feeds</option>";
+
+ $result = db_query($link, "SELECT id,title FROM ttrss_feeds
+ WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+
+ if (db_num_rows($result) > 0) {
+ print "<option disabled>--------</option>";
+ }
+
+ while ($line = db_fetch_assoc($result)) {
+ if ($param == $line["id"]) {
+ $selected = "selected";
+ } else {
+ $selected = "";
+ }
+ printf("<option id='%d' %s>%s</option>", $line["id"], $selected, $line["title"]);
+ }
+
+ print "</select></td></tr>";
+
+ print "<tr><td>Action:</td>";
+
+ print "<td><select id=\"fadd_action\">";
+
+ $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
+ ORDER BY name");
+
+ while ($line = db_fetch_assoc($result)) {
+ printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
+ }
+
+ print "</select>";
+
+ print "</td></tr><tr><td colspan=\"2\" align=\"right\">";
+
+ print "<input type=\"submit\"
+ class=\"button\" onclick=\"javascript:qaddFilter()\"
+ value=\"Add filter\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"javascript:closeDlg()\"
+ value=\"Close\">";
+
+ print "</td></tr></table>";
+ }
}
// update feeds of all users, may be used anonymously
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);\">" .
print "<h1>Subscribed feeds</h1>";
- $result = db_query($link, "SELECT id,title,feed_url FROM ttrss_feeds
+ $result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
WHERE owner_uid = '$uid' ORDER BY title LIMIT 20");
print "<ul class=\"nomarks\">";
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- print "<li>$feed_icon <a href=\"".$line["feed_url"]."\">".$line["title"]."</a></li>";
+ print "<li>$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
}
if (db_num_rows($result) < $num_feeds) {
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");
-
- $result = db_query($link, "SELECT COUNT(id) AS subscribed
- FROM ttrss_feeds WHERE feed_url = '$feed_url'");
+// $feed_id = $_GET["id"];
- $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 = "";
- }
+ foreach ($feed_ids as $feed_id) {
- 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) {
-
- 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");
+
+ $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";
- 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>";
+ 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