misc interface cleanups, only allow daemon to start when ENABLE_UPDATE_DAEMON is enabled
This commit is contained in:
parent
b2620faa9f
commit
c6784aea9c
|
@ -61,6 +61,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
|
setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
|
||||||
|
setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
|
||||||
}
|
}
|
||||||
|
|
||||||
$fetch = $_GET["fetch"];
|
$fetch = $_GET["fetch"];
|
||||||
|
|
19
tt-rss.js
19
tt-rss.js
|
@ -5,7 +5,7 @@ var display_tags = false;
|
||||||
var global_unread = -1;
|
var global_unread = -1;
|
||||||
var active_title_text = "";
|
var active_title_text = "";
|
||||||
var current_subtitle = "";
|
var current_subtitle = "";
|
||||||
|
var daemon_enabled = false;
|
||||||
var _qfd_deleted_feed = 0;
|
var _qfd_deleted_feed = 0;
|
||||||
|
|
||||||
/*@cc_on @*/
|
/*@cc_on @*/
|
||||||
|
@ -124,8 +124,10 @@ function refetch_callback() {
|
||||||
|
|
||||||
parse_counters(reply, f_document, window);
|
parse_counters(reply, f_document, window);
|
||||||
|
|
||||||
updateTitle("");
|
if (!daemon_enabled) {
|
||||||
notify("All feeds updated.");
|
updateTitle("");
|
||||||
|
notify("All feeds updated.");
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
exception_error("refetch_callback", e);
|
exception_error("refetch_callback", e);
|
||||||
updateTitle("");
|
updateTitle("");
|
||||||
|
@ -167,11 +169,10 @@ function backend_sanity_check_callback() {
|
||||||
|
|
||||||
function scheduleFeedUpdate(force) {
|
function scheduleFeedUpdate(force) {
|
||||||
|
|
||||||
notify("Updating feeds, please wait.");
|
if (!daemon_enabled) {
|
||||||
|
notify("Updating feeds, please wait.");
|
||||||
// document.title = "Tiny Tiny RSS - Updating...";
|
updateTitle("Updating");
|
||||||
|
}
|
||||||
updateTitle("Updating");
|
|
||||||
|
|
||||||
var query_str = "backend.php?op=rpc&subop=";
|
var query_str = "backend.php?op=rpc&subop=";
|
||||||
|
|
||||||
|
@ -403,6 +404,8 @@ function init_second_stage() {
|
||||||
dropboxSelect(viewbox, getCookie("ttrss_vf_vmode"));
|
dropboxSelect(viewbox, getCookie("ttrss_vf_vmode"));
|
||||||
dropboxSelect(limitbox, getCookie("ttrss_vf_limit"));
|
dropboxSelect(limitbox, getCookie("ttrss_vf_limit"));
|
||||||
|
|
||||||
|
daemon_enabled = getCookie("ttrss_vf_daemon");
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
exception_error("init_second_stage", e);
|
exception_error("init_second_stage", e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,11 @@
|
||||||
|
|
||||||
require_once "sanity_check.php";
|
require_once "sanity_check.php";
|
||||||
require_once "config.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.php";
|
||||||
require_once "db-prefs.php";
|
require_once "db-prefs.php";
|
||||||
require_once "functions.php";
|
require_once "functions.php";
|
||||||
|
|
Loading…
Reference in New Issue