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

pref-feeds: check for inactive feeds asynchronously

This commit is contained in:
Andrew Dolgov 2015-08-12 16:19:42 +03:00
parent 1edff0d439
commit f9c1f8b0d4
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
classes/pref/feeds.php
View File

@ -1298,30 +1298,11 @@ class Pref_Feeds extends Handler_Protected {
__("Feeds with errors") . "</button>"; __("Feeds with errors") . "</button>";
} }
if (DB_TYPE == "pgsql") { $inactive_button = "<button dojoType=\"dijit.form.Button\"
$interval_qpart = "NOW() - INTERVAL '3 months'"; id=\"pref_feeds_inactive_btn\"
} else { style=\"display : none\"
$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; onclick=\"showInactiveFeeds()\">" .
} __("Inactive feeds") . "</button>";
// could be performance-intensive and prevent feeds pref-panel from showing
if (!defined('_DISABLE_INACTIVE_FEEDS') || !_DISABLE_INACTIVE_FEEDS) {
$result = $this->dbh->query("SELECT COUNT(*) 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 = ".$_SESSION["uid"]);
$num_inactive = $this->dbh->fetch_result($result, 0, "num_inactive");
} else {
$num_inactive = 0;
}
if ($num_inactive > 0) {
$inactive_button = "<button dojoType=\"dijit.form.Button\"
onclick=\"showInactiveFeeds()\">" .
__("Inactive feeds") . "</button>";
}
$feed_search = $this->dbh->escape_string($_REQUEST["search"]); $feed_search = $this->dbh->escape_string($_REQUEST["search"]);
@ -1433,6 +1414,8 @@ class Pref_Feeds extends Handler_Protected {
</script> </script>
<script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> <script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
Element.hide(\"feedlistLoading\"); Element.hide(\"feedlistLoading\");
checkInactiveFeeds();
</script> </script>
</div>"; </div>";
@ -1970,5 +1953,20 @@ class Pref_Feeds extends Handler_Protected {
return $c; return $c;
} }
function getinactivefeeds() {
if (DB_TYPE == "pgsql") {
$interval_qpart = "NOW() - INTERVAL '3 months'";
} else {
$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
}
$result = $this->dbh->query("SELECT COUNT(*) 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 = ".$_SESSION["uid"]);
print (int) $this->dbh->fetch_result($result, 0, "num_inactive");
}
} }
?> ?>

14
js/prefs.js
View File

@ -24,6 +24,20 @@ function updateFeedList(sort_key) {
} }); } });
} }
function checkInactiveFeeds() {
try {
new Ajax.Request("backend.php", {
parameters: "?op=pref-feeds&method=getinactivefeeds",
onComplete: function(transport) {
if (parseInt(transport.responseText) > 0) {
Element.show(dijit.byId("pref_feeds_inactive_btn").domNode);
}
} });
} catch (e) {
exception_error("checkInactiveFeeds", e);
}
}
function updateUsersList(sort_key) { function updateUsersList(sort_key) {
try { try {