valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: feed browser entry limit is broken (closes #68)

This commit is contained in:
Andrew Dolgov 2006-06-14 04:21:19 +01:00
parent cea10627ca
commit 0af33e8790
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend.php
View File

@ -1313,11 +1313,19 @@
print "<p>Showing top 25 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 = '' AND private = false
GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
# $result = db_query($link, "SELECT feed_url,count(id) AS subscribers
# FROM ttrss_feeds
# WHERE auth_login = '' AND auth_pass = '' AND private = false
# GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
$owner_uid = $_SESSION["uid"];
$result = db_query($link, "SELECT feed_url,COUNT(id) AS subscribers
FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = ttrss_feeds.feed_url
AND owner_uid = '$owner_uid') GROUP BY feed_url
ORDER BY subscribers DESC LIMIT 25");
print "<ul class='browseFeedList' id='browseFeedList'>";
$feedctr = 0;
@ -1326,14 +1334,6 @@
$feed_url = $line["feed_url"];
$subscribers = $line["subscribers"];
$sub_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid =" .
$_SESSION["uid"]);
if (db_num_rows($sub_result) > 0) {
continue; // already subscribed
}
$det_result = db_query($link, "SELECT site_url,title,id
FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
@ -3766,11 +3766,15 @@
if (!$limit) $limit = 25;
$result = db_query($link, "SELECT feed_url,count(id) AS subscribers
FROM ttrss_feeds
WHERE auth_login = '' AND auth_pass = '' AND private = false
GROUP BY feed_url ORDER BY subscribers DESC LIMIT $limit");
$owner_uid = $_SESSION["uid"];
$result = db_query($link, "SELECT feed_url,COUNT(id) AS subscribers
FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = ttrss_feeds.feed_url
AND owner_uid = '$owner_uid') GROUP BY feed_url
ORDER BY subscribers DESC LIMIT $limit");
print "<div style=\"float : right\">
Top <select id=\"feedBrowserLimit\">";
@ -3795,14 +3799,6 @@
while ($line = db_fetch_assoc($result)) {
$feed_url = $line["feed_url"];
$subscribers = $line["subscribers"];
$sub_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid =" .
$_SESSION["uid"]);
if (db_num_rows($sub_result) > 0) {
continue; // already subscribed
}
$det_result = db_query($link, "SELECT site_url,title,id
FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");