From c4f7ba80184042e593fdf064ff671f7c563f21e9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Nov 2010 14:23:26 +0300 Subject: [PATCH] move runtime-info to JSON, simplify init-params format --- functions.js | 12 +++---- functions.php | 87 +++++++++++++++++++-------------------------------- tt-rss.js | 25 +++++---------- 3 files changed, 46 insertions(+), 78 deletions(-) diff --git a/functions.js b/functions.js index a0092f932..a4528b78f 100644 --- a/functions.js +++ b/functions.js @@ -2151,14 +2151,12 @@ function backend_sanity_check_callback(transport) { params = JSON.parse(params.firstChild.nodeValue); if (params) { - for (var i = 0; i < params.length; i++) { + for (k in params) { - var k = params[i].param; - var v = params[i].value; - - if (getURLParam('debug')) console.log(k + " => " + v); - init_params[k] = v; + var v = params[k]; + console.log("IP: " + k + " => " + v); + if (db) { db.execute("DELETE FROM init_params WHERE key = ?", [k]); db.execute("INSERT INTO init_params (key,value) VALUES (?, ?)", @@ -2166,6 +2164,8 @@ function backend_sanity_check_callback(transport) { } } } + + init_params = params; } sanity_check_done = true; diff --git a/functions.php b/functions.php index 04425ab06..813e35145 100644 --- a/functions.php +++ b/functions.php @@ -3128,85 +3128,64 @@ function make_init_params($link) { $params = array(); - array_push($params, make_init_param("theme", get_user_theme($link))); - array_push($params, make_init_param("theme_options", get_user_theme_options($link))); - array_push($params, make_init_param("daemon_enabled", ENABLE_UPDATE_DAEMON)); - array_push($params, make_init_param("feeds_frame_refresh", FEEDS_FRAME_REFRESH)); + $params["theme"] = get_user_theme($link); + $params["theme_options"] = get_user_theme_options($link); + $params["daemon_enabled"] = ENABLE_UPDATE_DAEMON; + $params["feeds_frame_refresh"] = FEEDS_FRAME_REFRESH; - array_push($params, make_init_param("sign_progress", - theme_image($link, "images/indicator_white.gif"))); - - array_push($params, make_init_param("sign_progress_tiny", - theme_image($link, "images/indicator_tiny.gif"))); - - array_push($params, make_init_param("sign_excl", - theme_image($link, "images/sign_excl.png"))); - - array_push($params, make_init_param("sign_info", - theme_image($link, "images/sign_info.png"))); + $params["sign_progress"] = theme_image($link, "images/indicator_white.gif"); + $params["sign_progress_tiny"] = theme_image($link, "images/indicator_tiny.gif"); + $params["sign_excl"] = theme_image($link, "images/sign_excl.png"); + $params["sign_info"] = theme_image($link, "images/sign_info.png"); foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS", "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP", "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE", "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST") as $param) { - array_push($params, make_init_param(strtolower($param), - (int) get_pref($link, $param))); + $params[strtolower($param)] = (int) get_pref($link, $param); } - array_push($params, make_init_param("icons_url", ICONS_URL)); - - array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME)); - - array_push($params, make_init_param("default_view_mode", - get_pref($link, "_DEFAULT_VIEW_MODE"))); - - array_push($params, make_init_param("default_view_limit", - (int) get_pref($link, "_DEFAULT_VIEW_LIMIT"))); - - array_push($params, make_init_param("default_view_order_by", - get_pref($link, "_DEFAULT_VIEW_ORDER_BY"))); - - array_push($params, make_init_param("prefs_active_tab", - get_pref($link, "_PREFS_ACTIVE_TAB"))); - - array_push($params, make_init_param("infobox_disable_overlay", - get_pref($link, "_INFOBOX_DISABLE_OVERLAY"))); - - array_push($params, make_init_param("bw_limit", - (int) $_SESSION["bw_limit"])); - - array_push($params, make_init_param("offline_enabled", - (int) get_pref($link, "ENABLE_OFFLINE_READING"))); + $params["icons_url"] = ICONS_URL; + $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; + $params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE"); + $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT"); + $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY"); + $params["prefs_active_tab"] = get_pref($link, "_PREFS_ACTIVE_TAB"); + $params["infobox_disable_overlay"] = get_pref($link, "_INFOBOX_DISABLE_OVERLAY"); + $params["bw_limit"] = (int) $_SESSION["bw_limit"]; + $params["offline_enabled"] = (int) get_pref($link, "ENABLE_OFFLINE_READING"); $result = db_query($link, "SELECT COUNT(*) AS cf FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); $num_feeds = db_fetch_result($result, 0, "cf"); - array_push($params, make_init_param("num_feeds", - (int) $num_feeds)); - - array_push($params, make_init_param("collapsed_feedlist", - (int) get_pref($link, "_COLLAPSED_FEEDLIST"))); + $params["num_feeds"] = (int) $num_feeds; + $params["collapsed_feedlist"] = (int) get_pref($link, "_COLLAPSED_FEEDLIST"); return $params; } function print_runtime_info($link) { - print ""; + print ""; + } + function make_runtime_info($link) { $result = db_query($link, "SELECT COUNT(*) AS cf FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]); $num_feeds = db_fetch_result($result, 0, "cf"); - print ""; + $data = array(); + + $data['num_feeds'] = (int) $num_feeds; if (ENABLE_UPDATE_DAEMON) { - print ""; + + $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock"); if (time() - $_SESSION["daemon_stamp_check"] > 30) { @@ -3222,11 +3201,11 @@ $_SESSION["daemon_stamp_check"] = time(); } - print ""; + $data['daemon_stamp_ok'] = $stamp_check; $stamp_fmt = date("Y.m.d, G:i", $stamp); - print ""; + $data['daemon_stamp'] = $stamp_fmt; } } } @@ -3245,7 +3224,7 @@ // print ""; - print ""; + return $data; } function getSearchSql($search, $match_on) { diff --git a/tt-rss.js b/tt-rss.js index 82199cc14..5551dc2d1 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -579,18 +579,17 @@ function toggleDispRead() { } function parse_runtime_info(elem) { - if (!elem) { - console.log("parse_runtime_info: elem is null, aborting"); + + if (!elem || !elem.firstChild) { return; } - var param = elem.firstChild; + var data = JSON.parse(elem.firstChild.nodeValue); - console.log("parse_runtime_info: " + param); + console.log("parsing runtime info..."); - while (param) { - var k = param.getAttribute("key"); - var v = param.getAttribute("value"); + for (k in data) { + var v = data[k]; console.log("RI: " + k + " => " + v); @@ -623,18 +622,8 @@ function parse_runtime_info(elem) { if (!error_flag) { notify(''); - } + } -/* var w = $("noDaemonWarning"); - - if (w) { - if (k == "daemon_is_running" && v != 1) { - w.style.display = "block"; - } else { - w.style.display = "none"; - } - } */ - param = param.nextSibling; } }