From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Fri, 1 Dec 2017 11:56:27 +0000 (+0300)
Subject: feedbrowser: PDO
X-Git-Tag: 17.12~95
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4ff8bdcb0021cd009fcaca9573c6c0e2976baed3;p=tt-rss.git

feedbrowser: PDO
---

diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index b70e47fd..a5a9f3dc 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -3,34 +3,32 @@
 
 		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
-		$owner_uid = $_SESSION["uid"];
 		$rv = '';
 
+        $pdo = Db::pdo();
+
 		if ($search) {
-			$search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
+            $search = $pdo->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 ?");
+			$sth->execute([$_SESSION['uid'], $limit]);
 
 		} 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
@@ -38,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 :limit");
+
+			$sth->execute([":uid" => $_SESSION['uid'], ":limit" => $limit]);
 		}
 
 		$feedctr = 0;
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $sth->fetch()) {
 
 			if ($mode == 1) {