X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Ffeedbrowser.php;h=8ebeb20ccd898e292265c566eda9dc5c4c9617d4;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hp=7bafe68acec7100844d1dd6ef7989d695c680a40;hpb=57bac1bea99cdac24305c53272a48821e52a7c2e;p=tt-rss.git
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index 7bafe68a..8ebeb20c 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -1,34 +1,34 @@
quote($search);
+
+ $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
UPPER(title) LIKE UPPER('%$search%'))";
} else {
$search_qpart = "";
}
if ($mode == 1) {
- /* $result = db_query( "SELECT feed_url, subscribers FROM
- ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
- WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
- AND owner_uid = '$owner_uid') $search_qpart
- ORDER BY subscribers DESC LIMIT $limit"); */
-
- $result = db_query( "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+ $sth = $pdo->prepare("SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
(SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
WHERE
(SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
WHERE tf.feed_url = qqq.feed_url
- AND owner_uid = '$owner_uid') $search_qpart
- GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
+ AND owner_uid = ?) $search_qpart
+ GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT " . (int)$limit);
+ $sth->execute([$_SESSION['uid']]);
} else if ($mode == 2) {
- $result = db_query( "SELECT *,
+ $sth = $pdo->prepare("SELECT *,
(SELECT COUNT(*) FROM ttrss_user_entries WHERE
orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
FROM
@@ -36,14 +36,16 @@
WHERE
(SELECT COUNT(*) FROM ttrss_feeds
WHERE ttrss_feeds.feed_url = ttrss_archived_feeds.feed_url AND
- owner_uid = '$owner_uid') = 0 AND
- owner_uid = '$owner_uid' $search_qpart
- ORDER BY id DESC LIMIT $limit");
+ owner_uid = :uid) = 0 AND
+ owner_uid = :uid $search_qpart
+ ORDER BY id DESC LIMIT " . (int)$limit);
+
+ $sth->execute([":uid" => $_SESSION['uid']]);
}
$feedctr = 0;
- while ($line = db_fetch_assoc($result)) {
+ while ($line = $sth->fetch()) {
if ($mode == 1) {
@@ -57,13 +59,13 @@
$class = ($feedctr % 2) ? "even" : "odd";
- $site_url = "
".
htmlspecialchars($line["title"])."";
- $feed_url = "";
$rv .= "