diff options
author | Andrew Dolgov <[email protected]> | 2018-12-16 19:05:37 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-12-16 19:05:37 +0300 |
commit | 957c44d177e6577e2f3b98560c8f2b67883806d4 (patch) | |
tree | b0f4de5b06289d68c841f00e720ce7bef3165b0f /include | |
parent | c3b8b6a2a19102f958a9e4c2c007d83abe52ef9b (diff) |
rework git update checking to be initiated by frontend, outside of runtime info output
Diffstat (limited to 'include')
-rwxr-xr-x | include/functions.php | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/functions.php b/include/functions.php index d5095b071..1d83a41da 100755 --- a/include/functions.php +++ b/include/functions.php @@ -679,8 +679,6 @@ $_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']); $_SESSION["pwd_hash"] = $row["pwd_hash"]; - $_SESSION["last_version_check"] = time(); - initialize_user_prefs($_SESSION["uid"]); return true; @@ -1068,6 +1066,7 @@ $params[strtolower($param)] = (int) get_pref($param); } + $params["check_for_updates"] = CHECK_FOR_UPDATES; $params["icons_url"] = ICONS_URL; $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; $params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE"); @@ -1270,27 +1269,7 @@ return array($prefixes, $hotkeys); } - function check_for_update() { - if (defined("GIT_VERSION_TIMESTAMP")) { - $content = @fetch_file_contents(array("url" => "http://tt-rss.org/version.json", "timeout" => 5)); - - if ($content) { - $content = json_decode($content, true); - - if ($content && isset($content["changeset"])) { - if ((int)GIT_VERSION_TIMESTAMP < (int)$content["changeset"]["timestamp"] && - GIT_VERSION_HEAD != $content["changeset"]["id"]) { - - return $content["changeset"]["id"]; - } - } - } - } - - return ""; - } - - function make_runtime_info($disable_update_check = false) { + function make_runtime_info() { $data = array(); $pdo = Db::pdo(); @@ -1323,14 +1302,6 @@ } } - if (CHECK_FOR_UPDATES && !$disable_update_check && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { - $update_result = @check_for_update(); - - $data["update_result"] = $update_result; - - $_SESSION["last_version_check"] = time(); - } - if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) { $data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock"); |