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

misc interface cleanups, only allow daemon to start when ENABLE_UPDATE_DAEMON is enabled

This commit is contained in:
Andrew Dolgov 2006-02-12 08:50:35 +01:00
parent b2620faa9f
commit c6784aea9c
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend.php
View File

@ -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"];

21
tt-rss.js
View File

@ -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 @*/
@ -123,9 +123,11 @@ function refetch_callback() {
var f_document = window.frames["feeds-frame"].document; var f_document = window.frames["feeds-frame"].document;
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=";
@ -402,6 +403,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);

5
update_daemon.php
View File

@ -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";