Merge branch 'master' of dim0x69/tt-rss into master

[tt-rss.git] / include / feedbrowser.php

diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index e5ee4a70d6f96472a2711cee556bfc193a3608ce..b70e47fdfbc7891fb7ad3a81f5c94376676cfaec 100644 (file)
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -1,5 +1,7 @@
 <?php
-       function make_feed_browser($link, $search, $limit, $mode = 1) {
+       function make_feed_browser($search, $limit, $mode = 1) {
+
+               if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
                $owner_uid = $_SESSION["uid"];
                $rv = '';
@@ -12,13 +14,13 @@
                }
 
                if ($mode == 1) {
-                       /* $result = db_query($link, "SELECT feed_url, subscribers FROM
+                       /* $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($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+                       $result = db_query("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
@@ -28,7 +30,7 @@
                                                GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
 
                } else if ($mode == 2) {
-                       $result = db_query($link, "SELECT *,
+                       $result = db_query("SELECT *,
                                                (SELECT COUNT(*) FROM ttrss_user_entries WHERE
                                                        orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
                                                FROM
@@ -57,13 +59,13 @@
 
                                $class = ($feedctr % 2) ? "even" : "odd";
 
-                               $site_url = "<a target=\"_blank\"
+                               $site_url = "<a target=\"_blank\" rel=\"noopener noreferrer\"
                                                        href=\"$site_url\">
                                                        <span class=\"fb_feedTitle\">".
                                htmlspecialchars($line["title"])."</span></a>";
 
-                               $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/pub_set.svg'
+                               $feed_url = "<a target=\"_blank\" rel=\"noopener noreferrer\" class=\"fb_feedUrl\"
+                                                       href=\"$feed_url\"><img src='images/pub_set.png'
                                                        style='vertical-align : middle'></a>";
 
                                $rv .= "<li>$check_box $feed_url $site_url".
@@ -72,7 +74,6 @@
                        } else if ($mode == 2) {
                                $feed_url = htmlspecialchars($line["feed_url"]);
                                $site_url = htmlspecialchars($line["site_url"]);
-                               $title = htmlspecialchars($line["title"]);
 
                                $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
                                                        type=\"checkbox\">";
@@ -80,19 +81,19 @@
                                $class = ($feedctr % 2) ? "even" : "odd";
 
                                if ($line['articles_archived'] > 0) {
-                                       $archived = sprintf(ngettext("%d archived article", "%d archived articles", $line['articles_archived']), $line['articles_archived']);
+                                       $archived = sprintf(_ngettext("%d archived article", "%d archived articles", (int) $line['articles_archived']), $line['articles_archived']);
                                        $archived = "&nbsp;<span class='subscribers'>($archived)</span>";
                                } else {
                                        $archived = '';
                                }
 
-                               $site_url = "<a target=\"_blank\"
+                               $site_url = "<a target=\"_blank\" rel=\"noopener noreferrer\"
                                                        href=\"$site_url\">
                                                        <span class=\"fb_feedTitle\">".
                                htmlspecialchars($line["title"])."</span></a>";
 
-                               $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
-                                                       href=\"$feed_url\"><img src='images/pub_set.svg'
+                               $feed_url = "<a target=\"_blank\" rel=\"noopener noreferrer\" class=\"fb_feedUrl\"
+                                                       href=\"$feed_url\"><img src='images/pub_set.png'
                                                        style='vertical-align : middle'></a>";
 
 
@@ -109,4 +110,3 @@
 
                return $rv;
        }
-?>