diff options
| -rw-r--r-- | backend.php | 1 | ||||
| -rw-r--r-- | tt-rss.js | 21 | ||||
| -rw-r--r-- | update_daemon.php | 5 |
3 files changed, 18 insertions, 9 deletions
diff --git a/backend.php b/backend.php index 1a741f897..d1ff69142 100644 --- a/backend.php +++ b/backend.php @@ -61,6 +61,7 @@ } setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH); + setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON); } $fetch = $_GET["fetch"]; @@ -5,7 +5,7 @@ var display_tags = false; var global_unread = -1; var active_title_text = ""; var current_subtitle = ""; - +var daemon_enabled = false; var _qfd_deleted_feed = 0; /*@cc_on @*/ @@ -123,9 +123,11 @@ function refetch_callback() { var f_document = window.frames["feeds-frame"].document; parse_counters(reply, f_document, window); - - updateTitle(""); - notify("All feeds updated."); + + if (!daemon_enabled) { + updateTitle(""); + notify("All feeds updated."); + } } catch (e) { exception_error("refetch_callback", e); updateTitle(""); @@ -167,11 +169,10 @@ function backend_sanity_check_callback() { function scheduleFeedUpdate(force) { - notify("Updating feeds, please wait."); - -// document.title = "Tiny Tiny RSS - Updating..."; - - updateTitle("Updating"); + if (!daemon_enabled) { + notify("Updating feeds, please wait."); + updateTitle("Updating"); + } var query_str = "backend.php?op=rpc&subop="; @@ -402,6 +403,8 @@ function init_second_stage() { dropboxSelect(viewbox, getCookie("ttrss_vf_vmode")); dropboxSelect(limitbox, getCookie("ttrss_vf_limit")); + + daemon_enabled = getCookie("ttrss_vf_daemon"); } catch (e) { exception_error("init_second_stage", e); diff --git a/update_daemon.php b/update_daemon.php index be118711b..b9d5d571a 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -11,6 +11,11 @@ require_once "sanity_check.php"; require_once "config.php"; + + if (!ENABLE_UPDATE_DAEMON) { + die("Please enable option ENABLE_UPDATE_DAEMON in config.php"); + } + require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; |