}
}
- function getFeedCounter($link, $id) {
+/* function getFeedCounter($link, $id) {
$result = db_query($link, "SELECT
count(id) as count,last_error
$last_error = htmlspecialchars(db_fetch_result($result, 0, "last_error"));
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
- }
+ } */
function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
$old_counters = $_SESSION["fctr_last_value"];
- $result = db_query($link, "SELECT id,last_error,
+ $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
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;
$id = $line["id"];
$count = $line["count"];
- $last_error = htmlspecialchars($line["last_error"]);
-
+ $last_error = htmlspecialchars($line["last_error"]);
+
$has_img = is_file(ICONS_DIR . "/$id.ico");
+ $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;
$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,
cat_id,last_error,
- (SELECT collapsed FROM ttrss_feed_categories
- WHERE id = cat_id) AS collapsed
- FROM ttrss_feeds WHERE
- owner_uid = '$owner_uid' AND parent_feed IS NULL
- ORDER BY $order_by_qpart");
-
+ 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 */
$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 (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
print "<td class=\"headlineActions\">
Select:
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
- 'RROW-', 'RCHK-', true)\">All</a>,
+ 'RROW-', 'RCHK-', true, '', true)\">All</a>,
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
- 'RROW-', 'RCHK-', true, 'Unread')\">Unread</a>,
+ 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
'RROW-', 'RCHK-', false)\">None</a>
$subop = $_REQUEST["subop"];
$quiet = $_REQUEST["quiet"];
+ 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"]);
$parent_feed = db_fetch_result($result, 0, "parent_feed");
print "<select id=\"iedit_parent_feed\">";
- print "<option id=\"0\">None</option>";
+ 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"]." ORDER BY title");
+ WHERE owner_uid = ".$_SESSION["uid"]." $cat_qpart ORDER BY title");
if (db_num_rows($tmp_result) > 0) {
print "<option disabled>--------</option>";
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()\"
$_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) {
- $search_qpart = "(UPPER(title) LIKE UPPER('%$feed_search%') OR
- UPPER(feed_url) LIKE UPPER('%$feed_search%')) AND";
+ $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,cat_id,
- parent_feed AS parent_feed_id,
- (SELECT title FROM ttrss_feed_categories
- WHERE id = cat_id) AS category,
- (SELECT title FROM ttrss_feeds
- WHERE id = parent_feed_id) AS parent_title
+ 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
+ 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 owner_uid = '".$_SESSION["uid"]."'
+ $search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
ORDER by category,$feeds_sort,title");
if (db_num_rows($result) != 0) {
ttrss_filter_types.description AS filter_type_descr,
feed_id,
ttrss_filter_actions.description AS action_description,
- (SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
+ ttrss_feeds.title AS feed_title
FROM
- ttrss_filters,ttrss_filter_types,ttrss_filter_actions
+ 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
$_SESSION["prefs_op_result"] = "save-config";
+ $_SESSION["prefs_cache"] = false;
+
foreach (array_keys($_POST) as $pref_name) {
$pref_name = db_escape_string($pref_name);
$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 {
print "<h1>Subscribed feeds</h1>";
$result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
- WHERE owner_uid = '$uid' ORDER BY title LIMIT 20");
+ WHERE owner_uid = '$uid' ORDER BY title");
- print "<ul class=\"nomarks\">";
+ print "<ul class=\"userFeedList\">";
while ($line = db_fetch_assoc($result)) {