From 43d8a1f2fffc3dd551ce80dc506dad79a65ca052 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 13 Feb 2021 23:08:20 +0300 Subject: [PATCH] remove getinactivefeeds (duplicate functionality) --- classes/pref/feeds.php | 19 ------------------- js/PrefFeedTree.js | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 2649d58a1..b9967e77f 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1652,25 +1652,6 @@ class Pref_Feeds extends Handler_Protected { return $c; } - function getinactivefeeds() { - if (DB_TYPE == "pgsql") { - $interval_qpart = "NOW() - INTERVAL '3 months'"; - } else { - $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; - } - - $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE - (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE - ttrss_entries.id = ref_id AND - ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND - ttrss_feeds.owner_uid = ?"); - $sth->execute([$_SESSION['uid']]); - - if ($row = $sth->fetch()) { - print (int)$row["num_inactive"]; - } - } - static function subscribe_to_feed_url() { $url_path = get_self_url_prefix() . "/public.php?op=subscribe&feed_url=%s"; diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index c3dda4187..e17b8744d 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -210,8 +210,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b return false; }, checkInactiveFeeds: function() { - xhrPost("backend.php", {op: "pref-feeds", method: "getinactivefeeds"}, (transport) => { - if (parseInt(transport.responseText) > 0) { + xhrJson("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => { + if (reply.length > 0) { Element.show(dijit.byId("pref_feeds_inactive_btn").domNode); } });