unify houskeeping stuff, increase spawn interval

[tt-rss.git] / classes / handler / public.php

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 439cc7d4d62bdd04d67bf5515b3b53d36ceec011..0d9b046869eb02eece62bb788f3afa55ddec1757 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -368,17 +368,9 @@ class Handler_Public extends Handler {
                include "rssfuncs.php";
                // Update all feeds needing a update.
                update_daemon_common(0, true, false);
+               housekeeping_common(false);
 
-               // Update feedbrowser
-               update_feedbrowser_cache();
-
-               // Purge orphans and cleanup tags
-               purge_orphans();
-
-               cleanup_tags(14, 50000);
-
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 
        }
 
@@ -509,8 +501,6 @@ class Handler_Public extends Handler {
        }
 
        function login() {
-               $_SESSION["prefs_cache"] = array();
-
                if (!SINGLE_USER_MODE) {
 
                        $login = $this->dbh->escape_string($_POST["login"]);
@@ -541,7 +531,6 @@ class Handler_Public extends Handler {
 
                                        if ($this->dbh->num_rows($result) != 0) {
                                                $_SESSION["profile"] = $profile;
-                                               $_SESSION["prefs_cache"] = array();
                                        }
                                }
                        } else {
@@ -869,7 +858,7 @@ class Handler_Public extends Handler {
 
                        <?php
                                @$op = $_REQUEST["subop"];
-                               $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+                               $updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
 
                                if ($op == "performupdate") {
                                        if ($updater->isUpdateRequired()) {
@@ -933,7 +922,7 @@ class Handler_Public extends Handler {
 
                                        } else {
 
-                                               print "<h2>" . "Tiny Tiny RSS database is up to date." . "</h2>";
+                                               print_notice("Tiny Tiny RSS database is up to date.");
 
                                                print "<p><form method=\"GET\" action=\"index.php\">
                                                        <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">