exit;
}
- define('SCHEMA_VERSION', 2);
+ define('SCHEMA_VERSION', 3);
require_once "sanity_check.php";
require_once "config.php";
$fetch = $_GET["fetch"];
+ setcookie("ttrss_icons_url", ICONS_URL);
+
+ if (!sanity_check($link)) { return; }
+
function getAllCounters($link) {
getLabelCounters($link);
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) {
-
- $result = db_query($link, "SELECT tag_name,count(ttrss_entries.id) AS count
+ function getTagCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+ if ($smart_mode) {
+ if (!$_SESSION["tctr_last_value"]) {
+ $_SESSION["tctr_last_value"] = array();
+ }
+ }
+
+ $old_counters = $_SESSION["tctr_last_value"];
+
+ $tctrs_modified = false;
+
+/* $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)) {
$unread = $tags[$tag];
$tag = htmlspecialchars($tag);
- print "<tag id=\"$tag\" counter=\"$unread\"/>";
+
+ if (!$smart_mode || $old_counters[$tag] != $unread) {
+ $old_counters[$tag] = $unread;
+ $tctrs_modified = true;
+ print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
+ }
+
}
+
+ if ($smart_mode && $tctrs_modified) {
+ $_SESSION["tctr_last_value"] = $old_counters;
+ }
+
}
- function getLabelCounters($link) {
+ function getLabelCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+ if ($smart_mode) {
+ if (!$_SESSION["lctr_last_value"]) {
+ $_SESSION["lctr_last_value"] = array();
+ }
+ }
+
+ $old_counters = $_SESSION["lctr_last_value"];
+ $lctrs_modified = false;
$result = db_query($link, "SELECT count(id) as count FROM ttrss_entries,ttrss_user_entries
WHERE marked = true AND ttrss_user_entries.ref_id = ttrss_entries.id AND
$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");
$count = db_fetch_result($tmp_result, 0, "count");
- print "<label id=\"$id\" counter=\"$count\"/>";
+ if (!$smart_mode || $old_counters[$id] != $count) {
+ $old_counters[$id] = $count;
+ $lctrs_modified = true;
+ print "<counter type=\"label\" id=\"$id\" counter=\"$count\"/>";
+ }
error_reporting (DEFAULT_ERROR_LEVEL);
-
+ }
+
+ if ($smart_mode && $lctrs_modified) {
+ $_SESSION["lctr_last_value"] = $old_counters;
}
}
- function getFeedCounter($link, $id) {
+/* function getFeedCounter($link, $id) {
$result = db_query($link, "SELECT
- count(id) as count FROM ttrss_entries,ttrss_user_entries
+ count(id) as count,last_error
+ FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE feed_id = '$id' AND unread = true
+ AND ttrss_user_entries.feed_id = ttrss_feeds.id
AND ttrss_user_entries.ref_id = ttrss_entries.id");
$count = db_fetch_result($result, 0, "count");
+ $last_error = htmlspecialchars(db_fetch_result($result, 0, "last_error"));
- print "<feed id=\"$id\" counter=\"$count\"/>";
- }
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
+ } */
- function getFeedCounters($link) {
-
- $result = db_query($link, "SELECT id,
+ function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
+
+ if ($smart_mode) {
+ if (!$_SESSION["fctr_last_value"]) {
+ $_SESSION["fctr_last_value"] = array();
+ }
+ }
+
+ $old_counters = $_SESSION["fctr_last_value"];
+
+ $result = db_query($link, "SELECT id,last_error,parent_feed,
(SELECT count(id)
FROM ttrss_entries,ttrss_user_entries
- WHERE feed_id = ttrss_feeds.id AND ttrss_user_entries.ref_id = ttrss_entries.id
+ WHERE feed_id = ttrss_feeds.id AND
+ ttrss_user_entries.ref_id = ttrss_entries.id
AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count
- FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
-
+ FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"] . "
+ AND parent_feed IS NULL");
+
+ $fctrs_modified = false;
+
while ($line = db_fetch_assoc($result)) {
$id = $line["id"];
$count = $line["count"];
+ $last_error = htmlspecialchars($line["last_error"]);
+
+ $has_img = is_file(ICONS_DIR . "/$id.ico");
- print "<feed id=\"$id\" counter=\"$count\"/>";
+ $tmp_result = db_query($link,
+ "SELECT id,COUNT(unread) AS unread
+ FROM ttrss_feeds LEFT JOIN ttrss_user_entries
+ ON (ttrss_feeds.id = ttrss_user_entries.feed_id)
+ WHERE parent_feed = '$id' AND unread = true GROUP BY ttrss_feeds.id");
+
+ if (db_num_rows($tmp_result) > 0) {
+ while ($l = db_fetch_assoc($tmp_result)) {
+ $count += $l["unread"];
+ }
+ }
+
+ if (!$smart_mode || $old_counters[$id] != $count) {
+ $old_counters[$id] = $count;
+ $fctrs_modified = true;
+
+ if ($last_error) {
+ $error_part = "error=\"$last_error\"";
+ } else {
+ $error_part = "";
+ }
+
+ if ($has_img) {
+ $has_img_part = "hi=\"$has_img\"";
+ } else {
+ $has_img_part = "";
+ }
+
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part/>";
+ }
+ }
+
+ if ($smart_mode && $fctrs_modified) {
+ $_SESSION["fctr_last_value"] = $old_counters;
}
}
print "<script type=\"text/javascript\" src=\"functions.js\"></script>
<script type=\"text/javascript\" src=\"feedlist.js\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+ <!--[if gte IE 5.5000]>
+ <script type=\"text/javascript\" src=\"pngfix.js\"></script>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss-ie.css\">
+ <![endif]-->
</head><body onload=\"init()\">";
print "<ul class=\"feedList\" id=\"feedList\">";
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'");
$order_by_qpart = "title";
}
- $result = db_query($link, "SELECT *,
- (SELECT count(id) FROM ttrss_entries,ttrss_user_entries
+ $result = db_query($link, "SELECT ttrss_feeds.*,
+ (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
owner_uid = '$owner_uid') AS total,
- (SELECT count(id) FROM ttrss_entries,ttrss_user_entries
+ (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND unread = true
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
- FROM ttrss_feeds WHERE owner_uid = '$owner_uid' ORDER BY $order_by_qpart");
-
+ cat_id,last_error,
+ ttrss_feed_categories.title AS category,
+ ttrss_feed_categories.collapsed
+ FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
+ ON (ttrss_feed_categories.id = cat_id)
+ WHERE
+ ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
+ ORDER BY $order_by_qpart");
+
$actid = $_GET["actid"];
/* real feeds */
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"];
+ $tmp_result = db_query($link,
+ "SELECT id,COUNT(unread) AS unread
+ FROM ttrss_feeds LEFT JOIN ttrss_user_entries
+ ON (ttrss_feeds.id = ttrss_user_entries.feed_id)
+ WHERE parent_feed = '$feed_id' AND unread = true
+ GROUP BY ttrss_feeds.id");
+
+ if (db_num_rows($tmp_result) > 0) {
+ while ($l = db_fetch_assoc($tmp_result)) {
+ $unread += $l["unread"];
+ }
+ }
+
+ $cat_id = $line["cat_id"];
+
$tmp_category = $line["category"];
if (!$tmp_category) {
}
// $class = ($lnum % 2) ? "even" : "odd";
-
- $class = "feed";
+
+ if ($line["last_error"]) {
+ $class = "error";
+ } else {
+ $class = "feed";
+ }
if ($unread > 0) $class .= "Unread";
}
$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\" id=\"FCATLIST-$cat_id\">";
}
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)) {
print "</ul>";
- print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-
}
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>";
}
/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
if ($subop == "catchupSelected") {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
$cmode = sprintf("%d", $_GET["cmode"]);
if ($subop == "markSelected") {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
$cmode = sprintf("%d", $_GET["cmode"]);
}
if ($subop == "sanityCheck") {
-
- $error_code = 0;
-
- $result = db_query($link, "SELECT schema_version FROM ttrss_version");
-
- $schema_version = db_fetch_result($result, 0, "schema_version");
-
- if ($schema_version != SCHEMA_VERSION) {
- $error_code = 5;
- }
-
- print "<error error-code='$error_code'/>";
+ sanity_check();
}
if ($subop == "globalPurge") {
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);
}
$addheader = $_GET["addheader"];
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
- (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
+ SUBSTRING(updated,1,16) as updated,
+ (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 colspan='2'>" . $line["title"] . "</td></tr>";
+ print "<tr><td><a href=\"" . $line["link"] . "\">" . $line["title"] . "</a></td>";
+
+ $parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
+ strtotime($line["updated"]));
+
+ print "<td class=\"postDate\">$parsed_updated</td>";
+
+ print "</tr>";
$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
ttrss_tags WHERE post_int_id = " . $line["int_id"] . "
ORDER BY tag_name");
$tags_str = "";
+ $f_tags_str = "";
+
+ $num_tags = 0;
while ($tmp_line = db_fetch_assoc($tmp_result)) {
- $tag = $tmp_line["tag_name"];
- $tags_str .= "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, ";
- }
+ $num_tags++;
+ $tag = $tmp_line["tag_name"];
+ $tag_str = "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, ";
+
+ if ($num_tags == 5) {
+ $tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>";
+ } else if ($num_tags < 5) {
+ $tags_str .= $tag_str;
+ }
+ $f_tags_str .= $tag_str;
+ }
- $tags_str = preg_replace("/, $/", "", $tags_str);
+ $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>";
print "<div class=\"postIcon\">" . $feed_icon . "</div>";
- print "<div class=\"postContent\">" . $line["content"] . "</div>";
+ print "<div class=\"postContent\">";
+
+ if (db_num_rows($tmp_result) > 5) {
+ print "<div id=\"allEntryTags\">Tags: $f_tags_str</div>";
+ }
+
+ print $line["content"] . "</div>";
print "</div>";
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
<script type=\"text/javascript\" src=\"functions.js\"></script>
<script type=\"text/javascript\" src=\"viewfeed.js\"></script>
+ <!--[if gte IE 5.5000]>
+ <script type=\"text/javascript\" src=\"pngfix.js\"></script>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss-ie.css\">
+ <![endif]-->
</head><body onload='init()'>";
}
if (sprintf("%d", $feed) != 0) {
if ($feed > 0) {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW()
- WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+
+ $tmp_result = db_query($link, "SELECT id
+ FROM ttrss_feeds WHERE parent_feed = '$feed'
+ ORDER BY cat_id,title");
+
+ $parent_ids = array();
+
+ if (db_num_rows($tmp_result) > 0) {
+ while ($p = db_fetch_assoc($tmp_result)) {
+ array_push($parent_ids, "feed_id = " . $p["id"]);
+ }
+
+ $children_qpart = implode(" OR ", $parent_ids);
+
+ db_query($link, "UPDATE ttrss_user_entries
+ SET unread = false,last_read = NOW()
+ WHERE (feed_id = '$feed' OR $children_qpart)
+ AND owner_uid = " . $_SESSION["uid"]);
+
+ } else {
+ db_query($link, "UPDATE ttrss_user_entries
+ SET unread = false,last_read = NOW()
+ WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+ }
} else if ($feed < 0 && $feed > -10) { // special, like starred
}
- $search = $_GET["search"];
-
- $search_mode = $_GET["smode"];
+ $search = db_escape_string($_GET["search"]);
+ $search_mode = db_escape_string($_GET["smode"]);
if ($search) {
$search_query_part = "(upper(title) LIKE upper('%$search%')
$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") {
- $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
- $search_query_part
- feed_id = '$feed'");
-
- $total_entries = db_fetch_result($result, 0, "total_entries"); */
-
-/* $result = db_query("SELECT count(id) AS unread_entries
- FROM ttrss_entries WHERE
- $search_query_part
- unread = true AND
- feed_id = '$feed'");
-
- $unread_entries = db_fetch_result($result, 0, "unread_entries"); */
-
if ($limit && $limit != "All") {
$limit_query_part = "LIMIT " . $limit;
}
// override query strategy and enable feed display when searching globally
if ($search && $search_mode == "All feeds") {
$query_strategy_part = "id > 0";
- $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
- id = feed_id) as feed_title,";
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if (sprintf("%d", $feed) == 0) {
$query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
id = feed_id) as feed_title,";
} else if ($feed >= 0) {
- $query_strategy_part = "feed_id = '$feed'";
+
+ $tmp_result = db_query($link, "SELECT id
+ FROM ttrss_feeds WHERE parent_feed = '$feed'
+ ORDER BY cat_id,title");
+
+ $parent_ids = array();
+
+ if (db_num_rows($tmp_result) > 0) {
+ while ($p = db_fetch_assoc($tmp_result)) {
+ array_push($parent_ids, "feed_id = " . $p["id"]);
+ }
+
+ $query_strategy_part = sprintf("(feed_id = %d OR %s)",
+ $feed, implode(" OR ", $parent_ids));
+
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+ } else {
+ $query_strategy_part = "feed_id = '$feed'";
+ }
} else if ($feed == -1) { // starred virtual feed
$query_strategy_part = "marked = true";
- $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
- id = feed_id) as feed_title,";
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if ($feed <= -10) { // labels
$label_id = -$feed - 11;
$query_strategy_part = db_fetch_result($tmp_result, 0, "sql_exp");
- $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
- id = feed_id) as feed_title,";
+ $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else {
$query_strategy_part = "id > 0"; // dumb
}
} else if (sprintf("%d", $feed) == 0) {
$feed_title = $feed;
} else if ($feed > 0) {
- $result = db_query($link, "SELECT title,site_url FROM ttrss_feeds
+ $result = db_query($link, "SELECT title,site_url,last_error FROM ttrss_feeds
WHERE id = '$feed'");
$feed_title = db_fetch_result($result, 0, "title");
$feed_site_url = db_fetch_result($result, 0, "site_url");
+ $last_error = db_fetch_result($result, 0, "last_error");
} else if ($feed == -1) {
$feed_title = "Starred articles";
$feed_title = "?";
}
- 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:toggleUnread()\">Unread</a>,
- <a href=\"javascript:toggleStarred()\">Starred</a>";
-
-/* print "
- View:
- <a href=\"javascript:limitView('All')\">All</a>,
- <a href=\"javascript:limitView('Unread')\">Unread</a>,
- <a href=\"javascript:limitView('Starred')\">Starred</a>
-
- Feed:
- <a href=\"javascript:updateCurrentFeed()\">Update</a>,
- <a href=\"javascript:catchupCurrentFeed()\">Mark as read</a>"; */
-
- print "</td>";
-
- print "<td class=\"headlineTitle\">";
-
- if ($feed_site_url) {
- print "<a href=\"$feed_site_url\">$feed_title</a>";
- } else {
- print $feed_title;
- }
-
- print "</td>";
- print "</tr></table>";
-
- print "<table class=\"headlinesList\" id=\"headlinesList\"
- cellspacing=\"0\" width=\"100%\">";
-
-
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 = "content as content_preview,";
+// } else {
+// $content_query_part = "";
+// }
+
$result = db_query($link, "SELECT
- id,title,
+ ttrss_entries.id,ttrss_entries.title,
SUBSTRING(updated,1,16) as updated,
unread,feed_id,marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part
- SUBSTRING(updated,1,19) as updated_noms,
- content as content_preview
+ $content_query_part
+ SUBSTRING(updated,1,19) as updated_noms
FROM
- ttrss_entries,ttrss_user_entries
+ ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE
+ ttrss_user_entries.feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
- owner_uid = '".$_SESSION["uid"]."' AND
+ ttrss_user_entries.owner_uid = '".$_SESSION["uid"]."' AND
$search_query_part
$view_query_part
$query_strategy_part ORDER BY $order_by
ttrss_entries.id as id,title,
SUBSTRING(updated,1,16) as updated,
unread,feed_id,
- marked,link,last_read,
+ marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part
- SUBSTRING(updated,1,19) as updated_noms,
- content
+ $content_query_part
+ SUBSTRING(updated,1,19) as updated_noms
FROM
ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE
}
if (!$result) {
- print "<tr><td colspan='4' align='center'>
- Could not display feed (query failed). Please check match syntax or local configuration.</td></tr>";
+ 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) {
- $lnum = 0;
-
- error_reporting (DEFAULT_ERROR_LEVEL);
-
- $num_unread = 0;
-
- while ($line = db_fetch_assoc($result)) {
+ print "<table class=\"headlinesSubToolbar\"
+ width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
+
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+
+ print "<td class=\"headlineActions\">
+ Select:
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
+ 'RROW-', 'RCHK-', true, '', true)\">All</a>,
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
+ 'RROW-', 'RCHK-', true, 'Unread', true)\">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>";
- $class = ($lnum % 2) ? "even" : "odd";
+ } else {
- $id = $line["id"];
- $feed_id = $line["feed_id"];
+ 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>";
- if ($line["last_read"] == "" &&
- ($line["unread"] != "t" && $line["unread"] != "1")) {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
- alt=\"Updated\">";
- } else {
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
- alt=\"Updated\">";
}
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $class .= "Unread";
- ++$num_unread;
- }
+ if ($last_error) {
+ print "<td align='center' class='small'>
+ <a class=\"warning\" href=\"javascript:alert('TT-RSS encountered an error while trying to update this feed.\\n\\n$last_error')\">Could not update this feed.</a></td>";
+ }
- if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_set.png\"
- alt=\"Reset mark\" onclick='javascript:toggleMark($id, false)'>";
+ print "<td class=\"headlineTitle\">";
+
+ if ($feed_site_url) {
+ print "<a target=\"_blank\" href=\"$feed_site_url\">$feed_title</a>";
} else {
- $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\"
- alt=\"Set mark\" onclick='javascript:toggleMark($id, true)'>";
+ print $feed_title;
}
-
- $content_link = "<a id=\"FTITLE-$id\" href=\"javascript:view($id,$feed_id);\">" .
- $line["title"] . "</a>";
- print "<tr class='$class' id='RROW-$id'>";
- // onclick=\"javascript:view($id,$feed_id)\">
+ print "</td>";
+ print "</tr></table>";
- print "<td valign='center' class='hlUpdatePic'>$update_pic</td>";
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+ print "<table class=\"headlinesList\" id=\"headlinesList\"
+ cellspacing=\"0\" width=\"100%\">";
+ }
- print "<td valign='center' class='hlSelectRow'>
- <input type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
- class=\"feedCheckBox\" id=\"RCHK-$id\">
- </td>";
+ $lnum = 0;
+
+ error_reporting (DEFAULT_ERROR_LEVEL);
+
+ $num_unread = 0;
+
+ while ($line = db_fetch_assoc($result)) {
- print "<td valign='center' class='hlMarkedPic'>$marked_pic</td>";
+ $class = ($lnum % 2) ? "even" : "odd";
+
+ $id = $line["id"];
+ $feed_id = $line["feed_id"];
+
+ if ($line["last_read"] == "" &&
+ ($line["unread"] != "t" && $line["unread"] != "1")) {
+
+ $update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
+ alt=\"Updated\">";
+ } else {
+ $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
+ alt=\"Updated\">";
+ }
+
+ if ($line["unread"] == "t" || $line["unread"] == "1") {
+ $class .= "Unread";
+ ++$num_unread;
+ $is_unread = true;
+ } else {
+ $is_unread = false;
+ }
+
+ if ($line["marked"] == "t" || $line["marked"] == "1") {
+ $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_set.png\"
+ alt=\"Reset mark\" onclick='javascript:toggleMark($id)'>";
+ } else {
+ $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\"
+ alt=\"Set mark\" onclick='javascript:toggleMark($id)'>";
+ }
+
+ $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
+ $line["title"] . "</a>";
+
+ if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+ $updated_fmt = smart_date_time(strtotime($line["updated"]));
+ } else {
+ $short_date = get_pref($link, 'SHORT_DATE_FORMAT');
+ $updated_fmt = date($short_date, strtotime($line["updated"]));
+ }
- if ($line["feed_title"]) {
- print "<td class='hlContent'>$content_link</td>";
- print "<td class='hlFeed'>
- <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
- } else {
- print "<td class='hlContent'>$content_link";
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
$content_preview = truncate_string(strip_tags($line["content_preview"]),
- 101);
-
- print "<span class=\"contentPreview\"> - $content_preview</span>";
+ 200);
}
- print "</td>";
- }
- $updated_fmt = date("M d, G:i", strtotime($line["updated"]));
- print "<td class=\"hlUpdated\"><nobr>$updated_fmt</nobr></td>";
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+
+ print "<tr class='$class' id='RROW-$id'>";
+
+ print "<td class='hlUpdatePic'>$update_pic</td>";
+
+ print "<td class='hlSelectRow'>
+ <input type=\"checkbox\" onclick=\"toggleSelectRow(this)\"
+ class=\"feedCheckBox\" id=\"RCHK-$id\">
+ </td>";
+
+ print "<td class='hlMarkedPic'>$marked_pic</td>";
+
+ if ($line["feed_title"]) {
+ print "<td class='hlContent'>$content_link</td>";
+ print "<td class='hlFeed'>
+ <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a> </td>";
+ } else {
+ print "<td class='hlContent' valign='middle'>";
+
+ print "<a href=\"javascript:view($id,$feed_id);\">" .
+ $line["title"];
+
+ if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
+
+ if ($content_preview) {
+ print "<span class=\"contentPreview\"> - $content_preview</span>";
+ }
+ }
+
+ print "</a>";
+ print "</td>";
+ }
+
+ print "<td class=\"hlUpdated\"><nobr>$updated_fmt </nobr></td>";
+
+ print "</tr>";
- print "</tr>";
+ } else {
+
+ if ($is_unread) {
+ $add_class = "Unread";
+ } else {
+ $add_class = "";
+ }
+
+ print "<div class=\"cdmArticle$add_class\" id=\"RROW-$id\">";
- ++$lnum;
- }
+ print "<div class=\"cdmHeader\">";
+
+ 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 "</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>";
- if ($lnum == 0) {
- print "<tr><td align='center'>No articles found.</td></tr>";
+ print "</div>";
+
+ }
+
+ ++$lnum;
+ }
+
+ if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
+ print "</table>";
+ }
+
+ } else {
+ print "<div width='100%' align='center'>No articles found.</div>";
}
-
- print "</table>";
-
+
+ print "</div>";
+
print "<script type=\"text/javascript\">
document.onkeydown = hotkey_handler;
update_all_counters('$feed');
</script>";
-
+
if ($addheader) {
print "</body></html>";
}
-
}
if ($op == "pref-rpc") {
$subop = $_GET["subop"];
if ($subop == "unread") {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "UPDATE ttrss_user_entries SET unread = true
WHERE feed_id = '$id' AND owner_uid = ".$_SESSION["uid"]);
}
if ($subop == "read") {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() WHERE
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 == "browse") {
+
+ print "<div class=\"infoBoxContents\">";
+
+ print "<h1>Feed browser</h1>";
+
+ print "<p>Showing top 50 registered feeds, sorted by popularity:</p>";
+
+ $result = db_query($link, "SELECT feed_url,count(id) AS subscribers
+ FROM ttrss_feeds WHERE auth_login = '' AND auth_pass = ''
+ GROUP BY feed_url ORDER BY subscribers LIMIT 50");
+
+ print "<ul class='browseFeedList' id='browseFeedList'>";
+
+ while ($line = db_fetch_assoc($result)) {
+ $feed_url = $line["feed_url"];
+ $subscribers = $line["subscribers"];
+
+ $det_result = db_query($link, "SELECT site_url,title,id
+ FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
+
+ $details = db_fetch_assoc($det_result);
+
+ $icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
+ "/".$details["id"].".ico\">";
+ } else {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+ }
+
+ $check_box = "<input class='feedBrowseCB' type=\"checkbox\" id=\"BFCHK-" . $details["id"] . "\">";
+
+ print "<li>$check_box $feed_icon" . $details["title"] .
+ " <span class='subscribers'>($subscribers)</span></li>";
+ }
+
+ print "</ul>";
+
+ print "<div align='center'>
+ <input type='submit' class='button'
+ onclick=\"closeInfoBox()\" value=\"Cancel\">
+ <input type=\"submit\" class=\"button\"
+ onclick=\"feedBrowserSubscribe()\" value=\"Subscribe\"></div>";
+
+ print "</div>";
+ return;
+ }
+
+ 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>";
+
+ $row_class = toggleEvenOdd($row_class);
+ print "<tr class='$row_class'><td>Link to:</td>";
+
+ $parent_feed = db_fetch_result($result, 0, "parent_feed");
+
+ print "<select id=\"iedit_parent_feed\">";
+ print "<option id=\"0\">Not linked</option>";
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ if ($cat_id) {
+ $cat_qpart = "AND cat_id = '$cat_id'";
+ } else {
+ $cat_qpart = "AND cat_id IS NULL";
+ }
+ }
+
+ $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
+ WHERE owner_uid = ".$_SESSION["uid"]." $cat_qpart 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"] == $parent_feed) {
+ $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>";
+
+ $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"]);
+ $parent_feed = db_escape_string($_POST["pfeed"]);
if (strtoupper($upd_intl) == "DEFAULT")
$upd_intl = 0;
+ if (strtoupper($upd_intl) == "DISABLED")
+ $upd_intl = -1;
+
if (strtoupper($purge_intl) == "DEFAULT")
$purge_intl = 0;
$category_qpart = 'cat_id = NULL';
}
+ if ($parent_feed != 0) {
+ $parent_qpart = "parent_feed = '$parent_feed'";
+ } else {
+ $parent_qpart = 'parent_feed = NULL';
+ }
+
$result = db_query($link, "UPDATE ttrss_feeds SET
$category_qpart,
+ $parent_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 (!WEB_DEMO_MODE) {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_feeds
if (!WEB_DEMO_MODE) {
$feed_link = db_escape_string(trim($_GET["link"]));
+ $cat_id = db_escape_string($_GET["cid"]);
+
+ if ($cat_id == "0" || !$cat_id) {
+ $cat_qpart = "NULL";
+ } else {
+ $cat_qpart = "'$cat_id'";
+ }
$result = db_query($link,
"SELECT id FROM ttrss_feeds
if (db_num_rows($result) == 0) {
$result = db_query($link,
- "INSERT INTO ttrss_feeds (owner_uid,feed_url,title)
- VALUES ('".$_SESSION["uid"]."', '$feed_link', '')");
+ "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id)
+ VALUES ('".$_SESSION["uid"]."', '$feed_link',
+ '[Unknown]', $cat_qpart)");
$result = db_query($link,
- "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'
+ "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_link'
AND owner_uid = " . $_SESSION["uid"]);
$feed_id = db_fetch_result($result, 0, "id");
if ($feed_id) {
- update_rss_feed($link, $feed_link, $feed_id);
+ update_rss_feed($link, $feed_link, $feed_id, true);
}
} else {
if (!WEB_DEMO_MODE) {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
}
}
+ if ($subop == "categorize") {
+
+ if (!WEB_DEMO_MODE) {
+
+ $ids = split(",", db_escape_string($_GET["ids"]));
+
+ $cat_id = db_escape_string($_GET["cat_id"]);
+
+ if ($cat_id == 0) {
+ $cat_id_qpart = 'NULL';
+ } else {
+ $cat_id_qpart = "'$cat_id'";
+ }
+
+ db_query($link, "BEGIN");
+
+ foreach ($ids as $id) {
+
+ db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+ WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+ }
+
+ db_query($link, "COMMIT");
+ }
+
+ }
+
+ if ($quiet) return;
+
// print "<h3>Edit Feeds</h3>";
$result = db_query($link, "SELECT id,title,feed_url,last_error
if (db_num_rows($result) > 0) {
print "<div class=\"warning\">";
-
- print "<b>Feeds with update errors:</b>";
+
+// print"<img class=\"closeButton\"
+// onclick=\"javascript:hideParentElement(this);\" src=\"images/close.png\">";
+
+ print "<a href=\"javascript:showBlockElement('feedUpdateErrors')\">
+ <b>Feeds with update errors</b> (click to expand)</a>";
- print "<ul class=\"nomarks\">";
+ print "<ul id=\"feedUpdateErrors\" class=\"nomarks\">";
while ($line = db_fetch_assoc($result)) {
print "<li>" . $line["title"] . " (" . $line["feed_url"] . "): " .
}
- print "<p><div class=\"prefGenericAddBox\">
- <input id=\"fadd_link\" size=\"40\"> <input
- type=\"submit\" class=\"button\"
- onclick=\"javascript:addFeed()\" value=\"Add feed\"></div>";
+ $feed_search = db_escape_string($_GET["search"]);
+
+ if (array_key_exists("search", $_GET)) {
+ $_SESSION["prefs_feed_search"] = $feed_search;
+ } else {
+ $feed_search = $_SESSION["prefs_feed_search"];
+ }
+
+ print "<table width='100%' class=\"prefGenericAddBox\"
+ cellspacing='0' cellpadding='0'><tr>
+ <td>
+ <input id=\"fadd_link\"
+ onchange=\"javascript:addFeed()\"
+ size=\"40\">
+ <input type=\"submit\" class=\"button\"
+ onclick=\"javascript:addFeed()\" value=\"Add feed\">
+
+ (<a href='javascript:browseFeeds()'>Browse feeds</a>)
+ </td><td align='right'>
+ <input id=\"feed_search\" size=\"20\"
+ onchange=\"javascript:updateFeedList()\"
+ value=\"$feed_search\">
+ <input type=\"submit\" class=\"button\"
+ onclick=\"javascript:updateFeedList()\" value=\"Search\">
+ </td>
+ </tr></table>";
$feeds_sort = db_escape_string($_GET["sort"]);
$_SESSION["pref_sort_feeds"] = $feeds_sort;
+ if ($feed_search) {
+ $search_qpart = "(UPPER(F1.title) LIKE UPPER('%$feed_search%') OR
+ UPPER(F1.feed_url) LIKE UPPER('%$feed_search%')) AND";
+ } else {
+ $search_qpart = "";
+ }
+
$result = db_query($link, "SELECT
- id,title,feed_url,substring(last_updated,1,16) as last_updated,
- update_interval,purge_interval,
- (SELECT title FROM ttrss_feed_categories
- WHERE id = cat_id) AS category
+ F1.id,
+ F1.title,
+ F1.feed_url,
+ substring(F1.last_updated,1,16) AS last_updated,
+ F1.parent_feed,
+ F1.update_interval,
+ F1.purge_interval,
+ F1.cat_id,
+ F2.title AS parent_title,
+ C1.title AS category
FROM
- ttrss_feeds WHERE owner_uid = '".$_SESSION["uid"]."'
- ORDER by $feeds_sort,title");
+ ttrss_feeds AS F1
+ LEFT JOIN ttrss_feeds AS F2
+ ON (F1.parent_feed = F2.id)
+ LEFT JOIN ttrss_feed_categories AS C1
+ ON (F1.cat_id = C1.id)
+ WHERE
+ $search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
+ ORDER by category,$feeds_sort,title");
if (db_num_rows($result) != 0) {
print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
- print "<p><table width=\"100%\" class=\"prefFeedList\" id=\"prefFeedList\">";
+ print "<p><table width=\"100%\" cellspacing=\"0\"
+ class=\"prefFeedList\" id=\"prefFeedList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
<a href=\"javascript:selectTableRowsByIdPrefix('prefFeedList',
'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>";
- }
-
- 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;
-
- 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>";
-
- $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 (!$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";
-
- 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>";
-
- $edit_title = truncate_string($edit_title, 40);
- $edit_link = truncate_string($edit_link, 60);
+ 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>";
+ }
+
+ $lnum = 0;
- 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>";
+ $cur_cat_id = -1;
+
+ while ($line = db_fetch_assoc($result)) {
- if ($line["purge_interval"] == "0")
- $line["purge_interval"] = "Default";
+ $feed_id = $line["id"];
+ $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["purge_interval"] < 0)
- $line["purge_interval"] = "Disabled";
+ 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 (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
+ $lnum = 0;
+
+ print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
+
+ 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>";
+
+ $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>";
-
- }
-
- print "<td><input id=\"iedit_updintl\"
- value=\"".$line["update_interval"]."\"></td>";
- print "<td><input id=\"iedit_purgintl\"
- value=\"".$line["purge_interval"]."\"></td>";
-
+ $edit_title = truncate_string($edit_title, 40);
+ $edit_link = truncate_string($edit_link, 60);
+
+ $parent_title = $line["parent_title"];
+ if ($parent_title) {
+ $parent_title = "<span class='groupPrompt'>(linked to
+ $parent_title)</span>";
}
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ "$feed_icon $edit_title $parent_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>";
+ } */
+
+ 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>";
-/* if (!$line["last_updated"]) $line["last_updated"] = "Never";
-
- print "<td>" . $line["last_updated"] . "</td>"; */
-
print "</tr>";
++$lnum;
onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
<input type=\"submit\" class=\"button\"
onclick=\"javascript:removeSelectedFeeds()\" value=\"Remove\">";
-
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+ print " ";
+
+ $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
+ WHERE owner_uid = ".$_SESSION["uid"]."
+ ORDER BY title");
+
+ print "<select id=\"sfeed_set_fcat\">";
+ print "<option id=\"0\">Uncategorized</option>";
+
+ if (db_num_rows($result) != 0) {
+
+ print "<option disabled>--------</option>";
+
+ while ($line = db_fetch_assoc($result)) {
+ printf("<option id='%d'>%s</option>",
+ $line["id"], $line["title"]);
+ }
+ }
+
+ print "</select>";
+
+ print " <input type=\"submit\" class=\"button\"
+ onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Set category\">";
+
+ }
+
if (get_pref($link, 'ENABLE_PREFS_CATCHUP_UNCATCHUP')) {
print "
<input type=\"submit\" class=\"button\"
}
print "
- All feeds: <input type=\"submit\"
+ All feeds: <input type=\"submit\"
class=\"button\" onclick=\"gotoExportOpml()\"
value=\"Export OPML\">";
}
// print "<h3>Categories</h3>";
print "<div class=\"prefGenericAddBox\">
- <input id=\"fadd_cat\" size=\"40\"> <input
+ <input id=\"fadd_cat\"
+ onchange=\"javascript:addFeedCat()\"
+ size=\"40\">
+ <input
type=\"submit\" class=\"button\"
onclick=\"javascript:addFeedCat()\" value=\"Add category\"></div>";
if (db_num_rows($result) != 0) {
print "<p><table width=\"100%\" class=\"prefFeedCatList\"
- id=\"prefFeedCatList\">";
+ cellspacing=\"0\" id=\"prefFeedCatList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
</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") {
$match = db_escape_string($_GET["m"]);
$filter_id = db_escape_string($_GET["id"]);
$feed_id = db_escape_string($_GET["fid"]);
+ $action_id = db_escape_string($_GET["aid"]);
if (!$feed_id) {
$feed_id = 'NULL';
reg_exp = '$regexp',
description = '$descr',
feed_id = $feed_id,
+ action_id = '$action_id',
filter_type = (SELECT id FROM ttrss_filter_types WHERE
description = '$match')
WHERE id = '$filter_id'");
if (!WEB_DEMO_MODE) {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id'");
$regexp = db_escape_string(trim($_GET["regexp"]));
$match = db_escape_string(trim($_GET["match"]));
$feed_id = db_escape_string($_GET["fid"]);
+ $action_id = db_escape_string($_GET["aid"]);
if (!$feed_id) {
$feed_id = 'NULL';
}
$result = db_query($link,
- "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id) VALUES
+ "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
+ action_id)
+ VALUES
('$regexp', (SELECT id FROM ttrss_filter_types WHERE
- description = '$match'),'".$_SESSION["uid"]."', $feed_id)");
+ description = '$match'),'".$_SESSION["uid"]."',
+ $feed_id, '$action_id')");
}
}
+ if ($quiet) return;
+
$result = db_query($link, "SELECT description
FROM ttrss_filter_types ORDER BY description");
}
print "</select> ";
-
+
+ print " Action: ";
+
+ print "<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 "<input type=\"submit\"
class=\"button\" onclick=\"javascript:addFilter()\"
value=\"Add filter\">";
+ print "</div>";
+
$result = db_query($link, "SELECT
ttrss_filters.id AS id,reg_exp,
ttrss_filters.description AS description,
ttrss_filter_types.name AS filter_type_name,
ttrss_filter_types.description AS filter_type_descr,
feed_id,
- (SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
+ ttrss_filter_actions.description AS action_description,
+ ttrss_feeds.title AS feed_title
FROM
- ttrss_filters,ttrss_filter_types
+ ttrss_filters,ttrss_filter_types,ttrss_filter_actions LEFT JOIN
+ ttrss_feeds ON (feed_id = ttrss_feeds.id)
WHERE
filter_type = ttrss_filter_types.id AND
+ ttrss_filter_actions.id = action_id AND
ttrss_filters.owner_uid = ".$_SESSION["uid"]."
ORDER by reg_exp");
if (db_num_rows($result) != 0) {
- print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">";
+ print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefFilterList\"
+ id=\"prefFilterList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td><td width=\"30%\">Filter expression</td>
- <td width=\"30%\">Feed</td><td width=\"10%\">Match</td>
+ <td align='center' width=\"5%\"> </td>
+ <td width=\"20%\">Filter expression</td>
+ <td width=\"20%\">Feed</td>
+ <td width=\"15%\">Match</td>
+ <td width=\"15%\">Action</td>
<td width=\"30%\">Description</td></tr>";
$lnum = 0;
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);\">" .
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["filter_type_descr"] . "</td>";
-
+
+ print "<td><a href=\"javascript:editFilter($filter_id);\">" .
+ $line["action_description"] . "</td>";
+
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["description"] . "</td>";
print "<td>".$line["reg_exp"]."</td>";
print "<td>".$line["feed_title"]."</td>";
print "<td>".$line["filter_type_descr"]."</td>";
+ print "<td>".$line["action_description"]."</td>";
print "<td>".$line["description"]."</td>";
-
+
} else {
print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
"\"></td>";
print "<td>";
-
print "<select id=\"iedit_feed\">";
-
print "<option id=\"0\">All feeds</option>";
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</option>";
- }
-
$tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
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"] == $line["feed_id"]) {
$is_selected = "selected";
print "<td>";
print_select("iedit_match", $line["filter_type_descr"], $filter_types);
print "</td>";
+
+ print "<td>";
+ print "<select id=\"iedit_filter_action\">";
+
+ $tmp_result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
+ ORDER BY description");
+
+ while ($tmp_line = db_fetch_assoc($tmp_result)) {
+ if ($tmp_line["description"] == $line["action_description"]) {
+ $is_selected = "selected";
+ } else {
+ $is_selected = "";
+ }
+ printf("<option $is_selected id='%d'>%s</option>",
+ $tmp_line["id"], $tmp_line["description"]);
+ }
+ print "</select></td>";
+
+
print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
"\"></td>";
}
}
+ // 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") {
if (!WEB_DEMO_MODE) {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_labels WHERE id = '$id'");
if (db_num_rows($result) != 0) {
- print "<p><table width=\"100%\" class=\"prefLabelList\" id=\"prefLabelList\">";
+ print "<p><table width=\"100%\" cellspacing=\"0\"
+ class=\"prefLabelList\" id=\"prefLabelList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
</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);\">" .
print "
Feed URL: <input
onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
- id=\"qafInput\">
- <input class=\"button\"
+ id=\"qafInput\">";
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
+ WHERE owner_uid = ".$_SESSION["uid"]."
+ ORDER BY title");
+
+ print " <select id=\"qafCat\">";
+ print "<option id=\"0\">Uncategorized</option>";
+
+ if (db_num_rows($result) != 0) {
+
+ print "<option disabled>--------</option>";
+
+ while ($line = db_fetch_assoc($result)) {
+ printf("<option id='%d'>%s</option>",
+ $line["id"], $line["title"]);
+ }
+ }
+
+ print "</select>";
+ }
+
+ print " <input class=\"button\"
type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Add feed\">
<input class=\"button\"
type=\"submit\" onclick=\"javascript:closeDlg()\"
}
+ 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
$_SESSION["prefs_op_result"] = "save-config";
+ $_SESSION["prefs_cache"] = false;
+
foreach (array_keys($_POST) as $pref_name) {
$pref_name = db_escape_string($pref_name);
print "Unknown option: $pref_name";
}
+ } else if ($subop == "Change e-mail") {
+
+ if (WEB_DEMO_MODE) {
+ header("Location: prefs.php");
+ return;
+ }
+
+ $email = db_escape_string($_GET["email"]);
+ $active_uid = $_SESSION["uid"];
+
+ if ($email) {
+ db_query($link, "UPDATE ttrss_users SET email = '$email'
+ WHERE id = '$active_uid'");
+ }
+
+ header("Location: prefs.php");
+
} else if ($subop == "Change password") {
if (WEB_DEMO_MODE) {
if (!SINGLE_USER_MODE) {
- $result = db_query($link, "SELECT id FROM ttrss_users
+ $result = db_query($link, "SELECT id,email FROM ttrss_users
WHERE id = ".$_SESSION["uid"]." AND (pwd_hash = 'password' OR
pwd_hash = 'SHA1:".sha1("password")."')");
$_SESSION["prefs_op_result"] = "";
+ print "<form action=\"backend.php\" method=\"GET\">";
+
+ print "<table width=\"100%\" class=\"prefPrefsList\">";
+ print "<tr><td colspan='3'><h3>Personal data</h3></tr></td>";
+
+ $result = db_query($link, "SELECT email FROM ttrss_users
+ WHERE id = ".$_SESSION["uid"]);
+
+ $email = db_fetch_result($result, 0, "email");
+
+ print "<tr><td width=\"40%\">E-mail</td>";
+ print "<td><input class=\"editbox\" name=\"email\"
+ value=\"$email\"></td></tr>";
+
+ print "</table>";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
+
+ print "<p><input class=\"button\" type=\"submit\"
+ value=\"Change e-mail\" name=\"subop\">";
+
print "<form action=\"backend.php\" method=\"POST\">";
print "<table width=\"100%\" class=\"prefPrefsList\">";
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>";
$login = db_escape_string($_GET["l"]);
$uid = db_escape_string($_GET["id"]);
$access_level = sprintf("%d", $_GET["al"]);
+ $email = db_escape_string($_GET["e"]);
- db_query($link, "UPDATE ttrss_users SET login = '$login', access_level = '$access_level' WHERE id = '$uid'");
+ db_query($link, "UPDATE ttrss_users SET login = '$login',
+ access_level = '$access_level', email = '$email' WHERE id = '$uid'");
}
} else if ($subop == "remove") {
if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
- $ids = split(",", $_GET["ids"]);
+ $ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_users WHERE id = '$id' AND id != " . $_SESSION["uid"]);
$uid = db_escape_string($_GET["id"]);
- $result = db_query($link, "SELECT login FROM ttrss_users WHERE id = '$uid'");
+ $result = db_query($link, "SELECT login,email
+ FROM ttrss_users WHERE id = '$uid'");
$login = db_fetch_result($result, 0, "login");
+ $email = db_fetch_result($result, 0, "email");
$tmp_user_pwd = make_password(8);
$pwd_hash = 'SHA1:' . sha1($tmp_user_pwd);
WHERE id = '$uid'");
print "<div class=\"notice\">Changed password of
- user <b>$login</b> to <b>$tmp_user_pwd</b>.</div>";
+ user <b>$login</b> to <b>$tmp_user_pwd</b>.";
+
+ if (MAIL_RESET_PASS && $email) {
+ print " Notifying <b>$email</b>.";
+
+ mail("$login <$email>", "Password reset notification",
+ "Hi, $login.\n".
+ "\n".
+ "Your password for this TT-RSS installation was reset by".
+ " an administrator.\n".
+ "\n".
+ "Your new password is $tmp_user_pwd, please remember".
+ " it for later reference.\n".
+ "\n".
+ "Sincerely, TT-RSS Mail Daemon.", "From: " . MAIL_FROM);
+ }
+
+ print "</div>";
}
}
print "<div class=\"prefGenericAddBox\">
- <input id=\"uadd_box\" size=\"40\"> ";
+ <input id=\"uadd_box\" onchange=\"javascript:addUser()\" size=\"40\"> ";
print"<input type=\"submit\" class=\"button\"
onclick=\"javascript:addUser()\" value=\"Add user\"></div>";
$result = db_query($link, "SELECT
- id,login,access_level,
+ id,login,access_level,email,
SUBSTRING(last_login,1,16) as last_login
FROM
ttrss_users
print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
- print "<p><table width=\"100%\" class=\"prefUserList\" id=\"prefUserList\">";
+ print "<p><table width=\"100%\" cellspacing=\"0\"
+ class=\"prefUserList\" id=\"prefUserList\">";
print "<tr><td class=\"selectPrompt\" colspan=\"8\">
Select:
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
- <td width='30%'>Username</td>
- <td width='30%'>Access Level</td>
- <td width='30%'>Last login</td></tr>";
+ <td align='center' width=\"5%\"> </td>
+ <td width='20%'>Username</td>
+ <td width='20%'>E-mail</td>
+ <td width='20%'>Access Level</td>
+ <td width='20%'>Last login</td></tr>";
$lnum = 0;
$uid = $line["id"];
$edit_uid = $_GET["id"];
- if ($uid == $_SESSION["uid"] || ($subop == "edit" && $uid != $edit_uid)) {
+ if ($subop == "edit" && $uid != $edit_uid) {
$class .= "Grayed";
$this_row_id = "";
} else {
$line["login"] = htmlspecialchars($line["login"]);
- if ($uid == $_SESSION["uid"]) {
+ $line["last_login"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
+ strtotime($line["last_login"]));
+
+/* 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>";
- print "<td>".$line["access_level"]."</td>";
+ print "<td>".$line["login"]."</td>";
+ print "<td>".$line["email"]."</td>";
+ print "<td>".$line["access_level"]."</td>";
- } else if (!$edit_uid || $subop != "edit") {
+ } 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);\">" .
$line["login"] . "</td>";
-
+
+ print "<td><a href=\"javascript:editUser($uid);\">" .
+ $line["email"] . "</td>";
+
print "<td><a href=\"javascript:editUser($uid);\">" .
$line["access_level"] . "</td>";
} else if ($uid != $edit_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>";
+ print "<td>".$line["email"]."</td>";
print "<td>".$line["access_level"]."</td>";
} else {
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+ print "<td align='center'>
+ <input disabled=\"true\" type=\"checkbox\" checked></td>";
print "<td><input id=\"iedit_ulogin\" value=\"".$line["login"].
"\"></td>";
+ print "<td><input id=\"iedit_email\" value=\"".$line["email"].
+ "\"></td>";
+
print "<td><input id=\"iedit_ulevel\" value=\"".$line["access_level"].
"\"></td>";
print "<table width='100%'>";
$login = db_fetch_result($result, 0, "login");
- $last_login = db_fetch_result($result, 0, "last_login");
+ $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
+ strtotime(db_fetch_result($result, 0, "last_login")));
$access_level = db_fetch_result($result, 0, "access_level");
$stored_articles = db_fetch_result($result, 0, "stored_articles");
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");
- print "<ul class=\"nomarks\">";
+ print "<ul class=\"userFeedList\">";
while ($line = db_fetch_assoc($result)) {
$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) {
+ // FIXME - add link to show ALL subscribed feeds here somewhere
+ print "<li><img
+ class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\"> ...</li>";
+ }
+
print "</ul>";
print "</div>";
if ($op == "feed-details") {
- $feed_id = $_GET["id"];
-
- $result = db_query($link,
- "SELECT
- title,feed_url,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 = 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 = "";
- }
-
- print "<h1>$feed_icon $title</h1>";
+ foreach ($feed_ids as $feed_id) {
- 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\">(" .$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