From 229a871be7eec8e96c9fa0efab50e40ccc6c4ef0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 16 Oct 2014 09:01:23 +0400 Subject: do not force sslversion in any cases --- include/functions2.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 69f447e8c..672373e6d 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -2243,10 +2243,6 @@ curl_setopt($curl, CURLOPT_PROXY, _CURL_HTTP_PROXY); } - if ((OPENSSL_VERSION_NUMBER >= 0x0090808f) && (OPENSSL_VERSION_NUMBER < 0x10000000)) { - curl_setopt($curl, CURLOPT_SSLVERSION, 3); - } - $html = curl_exec($curl); $status = curl_getinfo($curl); -- cgit v1.2.3-54-g00ecf From 59b5d5f3e6df7264349c136b5e981cc355deaa96 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 25 Nov 2014 13:45:02 +0300 Subject: allow embedding videos from youtube and vimeo natively --- include/functions2.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 672373e6d..866c92ec9 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -826,6 +826,21 @@ } + function iframe_whitelisted($entry) { + $whitelist = array("youtube.com", "youtu.be", "vimeo.com"); + + @$src = parse_url($entry->getAttribute("src"), PHP_URL_HOST); + + if ($src) { + foreach ($whitelist as $w) { + if ($src == $w || $src == "www.$w") + return true; + } + } + + return false; + } + function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) { if (!$owner) $owner = $_SESSION["uid"]; @@ -894,7 +909,9 @@ $entries = $xpath->query('//iframe'); foreach ($entries as $entry) { - $entry->setAttribute('sandbox', 'allow-scripts'); + if (!iframe_whitelisted($entry)) { + $entry->setAttribute('sandbox', 'allow-scripts'); + } } -- cgit v1.2.3-54-g00ecf From 8458a312aecb64d651c28a14ea4a0f50cf1a58ec Mon Sep 17 00:00:00 2001 From: tmo-github Date: Thu, 27 Nov 2014 20:04:24 +0100 Subject: Modify query to avoid a full table scan on MySQL --- include/functions2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 866c92ec9..29594076c 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1975,8 +1975,8 @@ } function getLastArticleId() { - $result = db_query("SELECT MAX(ref_id) AS id FROM ttrss_user_entries - WHERE owner_uid = " . $_SESSION["uid"]); + $result = db_query("SELECT ref_id AS id FROM ttrss_user_entries + WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY ref_id DESC LIMIT 1"); if (db_num_rows($result) == 1) { return db_fetch_result($result, 0, "id"); -- cgit v1.2.3-54-g00ecf From c63850fad00f228ae9613d8f662dd4d2ff05e528 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 6 Dec 2014 08:52:43 +0300 Subject: if loaded over ssl and iframe is whitelisted, set its source to https --- include/functions2.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 29594076c..31ca98035 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -911,8 +911,13 @@ foreach ($entries as $entry) { if (!iframe_whitelisted($entry)) { $entry->setAttribute('sandbox', 'allow-scripts'); + } else { + if ($_SERVER['HTTPS'] == "on") { + $entry->setAttribute("src", + str_replace("http://", "https://", + $entry->getAttribute("src"))); + } } - } $allowed_elements = array('a', 'address', 'audio', 'article', 'aside', -- cgit v1.2.3-54-g00ecf From f6cbe9a5a03056be4e8f20747ef5f933e2a55f12 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 9 Dec 2014 15:16:53 +0300 Subject: require version information in all additional themes --- classes/pref/prefs.php | 3 ++- include/functions2.php | 22 +++++++++++++++++++++- index.php | 2 +- prefs.php | 2 +- themes/night.css | 1 + 5 files changed, 26 insertions(+), 4 deletions(-) (limited to 'include/functions2.php') diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 571237239..da11f55e1 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -571,7 +571,8 @@ class Pref_Prefs extends Handler_Protected { } else if ($pref_name == "USER_CSS_THEME") { - $themes = array_map("basename", glob("themes/*.css")); + $themes = array_filter(array_map("basename", glob("themes/*.css")), + "theme_valid"); print_select($pref_name, $value, $themes, 'dojoType="dijit.form.Select"'); diff --git a/include/functions2.php b/include/functions2.php index 31ca98035..45c73b373 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -17,7 +17,10 @@ $params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY"); $params["bw_limit"] = (int) $_SESSION["bw_limit"]; $params["label_base_index"] = (int) LABEL_BASE_INDEX; - $params["theme"] = get_pref("USER_CSS_THEME", false, false); + + $theme = get_pref( "USER_CSS_THEME", false, false); + $params["theme"] = theme_valid("$theme") ? $theme : ""; + $params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names()); $params["php_platform"] = PHP_OS; @@ -2422,4 +2425,21 @@ return LABEL_BASE_INDEX - 1 + abs($feed); } + function theme_valid($file) { + if ($file == "default.css") return true; // needed for array_filter + $file = "themes/" . basename($file); + + if (file_exists($file) && is_readable($file)) { + $fh = fopen($file, "r"); + + if ($fh) { + $header = fgets($fh); + fclose($fh); + + return strpos($header, "supports-version:" . VERSION_STATIC) !== FALSE; + } + } + + return false; + } ?> diff --git a/index.php b/index.php index 74498b8f4..4f2a9a860 100644 --- a/index.php +++ b/index.php @@ -65,7 +65,7 @@ Date: Tue, 9 Dec 2014 23:54:28 +0300 Subject: disable version checking for night.css --- include/functions2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 45c73b373..669bbe038 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -2426,7 +2426,7 @@ } function theme_valid($file) { - if ($file == "default.css") return true; // needed for array_filter + if ($file == "default.css" || $file == "night.css") return true; // needed for array_filter $file = "themes/" . basename($file); if (file_exists($file) && is_readable($file)) { -- cgit v1.2.3-54-g00ecf From ed775e4e8dba0e3a527ea13b5581c1ce6ee752bc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 31 Jan 2015 15:08:55 +0300 Subject: remove obsolete code related to version checking and tarball updater plugin --- classes/dlg.php | 47 ------ config.php-dist | 5 +- include/functions2.php | 28 ---- include/sanity_config.php | 4 +- index.php | 7 - js/tt-rss.js | 30 ---- plugins/updater/init.php | 409 --------------------------------------------- plugins/updater/updater.js | 69 -------- 8 files changed, 3 insertions(+), 596 deletions(-) delete mode 100644 plugins/updater/init.php delete mode 100644 plugins/updater/updater.js (limited to 'include/functions2.php') diff --git a/classes/dlg.php b/classes/dlg.php index 25a194bed..e3931bc3a 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -220,52 +220,5 @@ class Dlg extends Handler_Protected { //return; } - function newVersion() { - - $version_data = check_for_update(); - $version = $version_data['version']; - $id = $version_data['version_id']; - - if ($version && $id) { - print "
"; - - print T_sprintf("New version of Tiny Tiny RSS is available (%s).", - "$version"); - - print "
"; - - $details = "http://tt-rss.org/redmine/versions/$id"; - $download = "http://tt-rss.org/#Download"; - - print "

".__("You can update using built-in updater in the Preferences or by using update.php")."

"; - - print "
"; - print ""; - print ""; - print ""; - - } else { - print "
"; - - print "

".__("Error receiving version information or no new version available.")."

"; - - print "
"; - - print "
"; - print ""; - print "
"; - - } - print "
"; - - } - - } ?> diff --git a/config.php-dist b/config.php-dist index 0c3e92b74..d821329d0 100644 --- a/config.php-dist +++ b/config.php-dist @@ -177,9 +177,6 @@ // *** Other settings (less important) *** // *************************************** - define('CHECK_FOR_NEW_VERSION', true); - // Check for new versions of tt-rss automatically. - define('DETECT_ARTICLE_LANGUAGE', false); // Detect article language when updating feeds, presently this is only // used for hyphenation. This may increase amount of CPU time used by @@ -193,7 +190,7 @@ // if you experience weird errors and tt-rss failing to start, blank pages // after login, or content encoding errors, disable it. - define('PLUGINS', 'auth_internal, note, updater'); + define('PLUGINS', 'auth_internal, note'); // Comma-separated list of plugins to load automatically for all users. // System plugins have to be specified here. Please enable at least one // authentication plugin here (auth_*). diff --git a/include/functions2.php b/include/functions2.php index 669bbe038..4e133dde4 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -248,15 +248,6 @@ } } - if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { - $new_version_details = @check_for_update(); - - $data['new_version_available'] = (int) ($new_version_details != false); - - $_SESSION["last_version_check"] = time(); - $_SESSION["version_data"] = $new_version_details; - } - return $data; } @@ -1019,25 +1010,6 @@ return $doc; } - function check_for_update() { - if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) { - $version_url = "http://tt-rss.org/version.php?ver=" . VERSION . - "&iid=" . sha1(SELF_URL_PATH); - - $version_data = @fetch_file_contents($version_url); - - if ($version_data) { - $version_data = json_decode($version_data, true); - if ($version_data && $version_data['version']) { - if (version_compare(VERSION_STATIC, $version_data['version']) == -1) { - return $version_data; - } - } - } - } - return false; - } - function catchupArticlesById($ids, $cmode, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; diff --git a/include/sanity_config.php b/include/sanity_config.php index 76fba4b81..890c0c050 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ - +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> diff --git a/index.php b/index.php index 058e7d8e3..309ca2e29 100644 --- a/index.php +++ b/index.php @@ -221,13 +221,6 @@ src="images/error.png" /> - - -
diff --git a/js/tt-rss.js b/js/tt-rss.js index 84f2e67b1..26749d108 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -756,15 +756,6 @@ function parse_runtime_info(data) { // console.log("RI: " + k + " => " + v); - if (k == "new_version_available") { - if (v == "1") { - Element.show(dijit.byId("newVersionIcon").domNode); - } else { - Element.hide(dijit.byId("newVersionIcon").domNode); - } - return; - } - if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) { if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) { window.location.reload(); @@ -968,27 +959,6 @@ function reverseHeadlineOrder() { } } -function newVersionDlg() { - try { - var query = "backend.php?op=dlg&method=newVersion"; - - if (dijit.byId("newVersionDlg")) - dijit.byId("newVersionDlg").destroyRecursive(); - - dialog = new dijit.Dialog({ - id: "newVersionDlg", - title: __("New version available!"), - style: "width: 600px", - href: query, - }); - - dialog.show(); - - } catch (e) { - exception_error("newVersionDlg", e); - } -} - function handle_rpc_json(transport, scheduled_call) { try { var reply = JSON.parse(transport.responseText); diff --git a/plugins/updater/init.php b/plugins/updater/init.php deleted file mode 100644 index 6ee018f74..000000000 --- a/plugins/updater/init.php +++ /dev/null @@ -1,409 +0,0 @@ -host = $host; - - $host->add_hook($host::HOOK_PREFS_TAB, $this); - - $host->add_command("update-self", - "update tt-rss installation to latest version", - $this); - } - - function update_self_step($step, $params, $force = false) { - // __FILE__ is in plugins/updater so we need to go one level up - $work_dir = dirname(dirname(dirname(__FILE__))); - $parent_dir = dirname($work_dir); - // Set PATH to run "which" - putenv('PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"'); - - $log = array(); - if (!is_array($params)) $params = array(); - - $stop = false; - - if (!chdir($work_dir)) { - array_push($log, "Unable to change to work directory: $work_dir"); - $stop = true; - } - - if (!$stop) { - switch ($step) { - case 0: - array_push($log, "Work directory: $work_dir"); - - if (!is_writable($work_dir) || !is_writable("$parent_dir")) { - $user = posix_getpwuid(posix_geteuid()); - $user = $user["name"]; - array_push($log, "Both tt-rss and parent directories should be writable as current user ($user)."); - $stop = true; break; - } - - if (!file_exists("$work_dir/config.php") || !file_exists("$work_dir/include/sanity_check.php")) { - array_push($log, "Work directory $work_dir doesn't look like tt-rss installation."); - $stop = true; break; - } - - if (!is_writable(sys_get_temp_dir())) { - array_push($log, "System temporary directory should be writable as current user."); - $stop = true; break; - } - - // bah, also humbug - putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" . - PATH_SEPARATOR . "/usr/bin"); - - array_push($log, "Checking for system() call..."); - - $disabled = explode(',', ini_get('disable_functions')); - foreach ($disabled as $function) { - if ( trim($function) == 'system' ) { - array_push($log, "Can not execute commands with PHP's system() function."); - $stop = true; - } - } - - if ( $stop == true ) { - break; - } - - array_push($log, "Checking for tar..."); - - $system_rc = 0; - system("which tar >/dev/null", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Could not run tar executable (RC=$system_rc)."); - $stop = true; break; - } - - array_push($log, "Checking for gunzip..."); - - $system_rc = 0; - system("which gunzip >/dev/null", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Could not run gunzip executable (RC=$system_rc)."); - $stop = true; break; - } - - array_push($log, "Checking for latest version..."); - - $version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"), - true); - - if (!is_array($version_info)) { - array_push($log, "Unable to fetch version information."); - $stop = true; break; - } - - $target_version = $version_info["version"]; - $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version"; - - array_push($log, "Target version: $target_version"); - $params["target_version"] = $target_version; - - if (version_compare(VERSION, $target_version) != -1 && !$force) { - array_push($log, "Your Tiny Tiny RSS installation is up to date."); - $stop = true; break; - } - - if (file_exists($target_dir)) { - array_push($log, "Target directory $target_dir already exists."); - $stop = true; break; - } - - break; - case 1: - $target_version = $params["target_version"]; - -/* array_push($log, "Downloading checksums..."); - $md5sum_data = fetch_file_contents("http://tt-rss.org/download/md5sum.txt"); - - if (!$md5sum_data) { - array_push($log, "Could not download checksums."); - $stop = true; break; - } - - $md5sum_data = explode("\n", $md5sum_data); - - foreach ($md5sum_data as $line) { - $pair = explode(" ", $line); - - if ($pair[1] == "tt-rss-$target_version.tar.gz") { - $target_md5sum = $pair[0]; - break; - } - } - - if (!$target_md5sum) { - array_push($log, "Unable to locate checksum for target version."); - $stop = true; break; - } - - $params["target_md5sum"] = $target_md5sum; */ - - array_push($log, "Proceeding to download..."); - - break; - case 2: - $target_version = $params["target_version"]; - // $target_md5sum = $params["target_md5sum"]; - - array_push($log, "Downloading distribution tarball..."); - - $tarball_url = "https://github.com/gothfox/Tiny-Tiny-RSS/archive/$target_version.tar.gz"; - $data = fetch_file_contents($tarball_url); - - if (!$data) { - array_push($log, "Could not download distribution tarball ($tarball_url)."); - $stop = true; break; - } - - /* array_push($log, "Verifying tarball checksum..."); - - $test_md5sum = md5($data); - - if ($test_md5sum != $target_md5sum) { - array_push($log, "Downloaded checksum doesn't match (got $test_md5sum, expected $target_md5sum)."); - $stop = true; break; - } */ - - $tmp_file = tempnam(sys_get_temp_dir(), 'tt-rss'); - array_push($log, "Saving download to $tmp_file"); - - if (!file_put_contents($tmp_file, $data)) { - array_push($log, "Unable to save download."); - $stop = true; break; - } - - $params["tmp_file"] = $tmp_file; - - break; - case 3: - $tmp_file = $params["tmp_file"]; - $target_version = $params["target_version"]; - - if (!chdir($parent_dir)) { - array_push($log, "Unable to change into parent directory."); - $stop = true; break; - } - - array_push($log, "Extracting tarball..."); - system("tar zxf $tmp_file", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Error while extracting tarball (RC=$system_rc)."); - $stop = true; break; - } - - $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version"; - - if (!is_dir($target_dir)) { - array_push($log, "Target directory ($target_dir) not found."); - $stop = true; break; - } - - $old_dir = tmpdirname($parent_dir, "tt-rss-old"); - - array_push($log, "Renaming tt-rss directory to ".basename($old_dir)); - if (!rename($work_dir, $old_dir)) { - array_push($log, "Unable to rename tt-rss directory."); - $stop = true; break; - } - - array_push($log, "Renaming target directory..."); - if (!rename($target_dir, $work_dir)) { - array_push($log, "Unable to rename target directory."); - $stop = true; break; - } - - if (!chdir($work_dir)) { - array_push($log, "Unable to change to work directory: $work_dir"); - $stop = true; break; - } - - array_push($log, "Copying config.php..."); - if (!copy("$old_dir/config.php", "$work_dir/config.php")) { - array_push($log, "Unable to copy config.php to $work_dir."); - $stop = true; break; - } - - array_push($log, "Cleaning up..."); - unlink($tmp_file); - - array_push($log, "Fixing permissions..."); - - $directories = array( - CACHE_DIR, - CACHE_DIR . "/export", - CACHE_DIR . "/images", - CACHE_DIR . "/js", - CACHE_DIR . "/simplepie", - CACHE_DIR . "/upload", - ICONS_DIR, - LOCK_DIRECTORY); - - foreach ($directories as $dir) { - array_push($log, "-> $dir"); - chmod($dir, 0777); - } - - if (ICONS_DIR == "feed-icons") { - array_push($log, "Migrating feed icons..."); - - $icons = glob("$old_dir/feed-icons/*.ico"); - $icons_copied = 0; - - foreach ($icons as $icon) { - $icon = basename($icon); - - if (copy("$old_dir/feed-icons/$icon", "$work_dir/feed-icons/$icon")) { - ++$icons_copied; - } - } - - array_push($log, "Done; $icons_copied files copied"); - - } else { - array_push($log, "Not migrating feed icons, ICONS_DIR modified."); - } - - array_push($log, "Upgrade completed."); - array_push($log, "Your old tt-rss directory is saved at $old_dir. ". - "Please migrate locally modified files (if any) and remove it."); - array_push($log, "You might need to re-enter current directory in shell to see new files."); - - $stop = true; - break; - default: - $stop = true; - } - } - - return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log); - } - - function update_self_cli($force = false) { - $step = 0; - $stop = false; - $params = array(); - - while (!$stop) { - $rc = $this->update_self_step($step, $params, $force); - - $params = $rc['params']; - $stop = $rc['stop']; - - foreach ($rc['log'] as $line) { - _debug($line); - } - ++$step; - } - } - - function update_self($args) { - _debug("READ THE FOLLOWING BEFORE CONTINUING!"); - _debug("* It is suggested to backup your tt-rss directory first."); - _debug("* Your database will not be modified."); - _debug("* Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."); - _debug("Type 'yes' to continue."); - - $input = read_stdin(); - - if ($input != 'yes' && $input != 'force') - exit; - - $this->update_self_cli($input == 'force'); - } - - function get_prefs_js() { - return file_get_contents(dirname(__FILE__) . "/updater.js"); - } - - function hook_prefs_tab($args) { - if ($args != "prefPrefs") return; - - if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) { - print "
"; - - if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) { - $_SESSION["version_data"] = @check_for_update(); - $_SESSION["pref_last_version_check"] = time(); - } - - if (is_array($_SESSION["version_data"])) { - $version = $_SESSION["version_data"]["version"]; - $version_id = $_SESSION["version_data"]["version_id"]; - print_notice(T_sprintf("New version of Tiny Tiny RSS is available (%s).", "$version")); - - $details = "http://tt-rss.org/redmine/versions/$version_id"; - - print "

"; - - print "

"; - - } else { - print_notice(__("Your Tiny Tiny RSS installation is up to date.")); - - print "

"; - - } - - print "
"; #pane - } - } - - function updateSelf() { - print_warning(__("Do not close this dialog until updating is finished.")); - - print "
"; - - print ""; - - print "
    "; - print "
  • " .__("It is suggested to backup your tt-rss directory first.") . "
    • "; - print "
  • " . __("Your database will not be modified.") . "
    • "; - print "
  • " . __("Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.") . "
    • "; - print "
  • " . __("Ready to update.") . "
    • "; - print "
"; - - print "
"; - print ""; - print ""; - print "
"; - print "
"; - } - - function performUpdate() { - $step = (int) $_REQUEST["step"]; - $params = json_decode($_REQUEST["params"], true); - $force = (bool) $_REQUEST["force"]; - - if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) { - print json_encode($this->update_self_step($step, $params, $force)); - } - } - - function api_version() { - return 2; - } - -} -?> diff --git a/plugins/updater/updater.js b/plugins/updater/updater.js deleted file mode 100644 index 4a1847372..000000000 --- a/plugins/updater/updater.js +++ /dev/null @@ -1,69 +0,0 @@ -function updateSelf() { - try { - var query = "backend.php?op=pluginhandler&plugin=updater&method=updateSelf"; - - if (dijit.byId("updateSelfDlg")) - dijit.byId("updateSelfDlg").destroyRecursive(); - - var dialog = new dijit.Dialog({ - id: "updateSelfDlg", - title: __("Update Tiny Tiny RSS"), - style: "width: 600px", - closable: false, - performUpdate: function(step) { - dijit.byId("self_update_start_btn").attr("disabled", true); - dijit.byId("self_update_stop_btn").attr("disabled", true); - - notify_progress("Loading, please wait...", true); - new Ajax.Request("backend.php", { - parameters: "op=pluginhandler&plugin=updater&method=performUpdate&step=" + step + - "¶ms=" + param_escape(JSON.stringify(dialog.attr("update-params"))), - onComplete: function(transport) { - try { - rv = JSON.parse(transport.responseText); - if (rv) { - notify(''); - - rv['log'].each(function(line) { - $("self_update_log").innerHTML += "
  • " + line + "
    • "; - }); - - dialog.attr("update-params", rv['params']); - - if (!rv['stop']) { - window.setTimeout("dijit.byId('updateSelfDlg').performUpdate("+(step+1)+")", 500); - } else { - dijit.byId("self_update_stop_btn").attr("disabled", false); - } - - } else { - console.log(transport.responseText); - notify_error("Received invalid data from server."); - } - - dialog.attr("updated", true); - } catch (e) { - exception_error("updateSelf/inner", e); - } - } }); - }, - close: function() { - if (dialog.attr("updated")) { - window.location.reload(); - } else { - dialog.hide(); - } - }, - start: function() { - if (prompt(__("Backup your tt-rss directory before continuing. Please type 'yes' to continue.")) == 'yes') { - dialog.performUpdate(0); - } - }, - href: query}); - - dialog.show(); - } catch (e) { - exception_error("batchSubscribe", e); - } -} - -- cgit v1.2.3-54-g00ecf From efcc5d365db4d1b0f3a26098011319daf50e018e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 3 Feb 2015 14:39:15 +0300 Subject: add placeholder update checker using git changesets --- include/functions2.php | 29 +++++++++++++++++++++++++++++ include/version.php | 4 ++++ index.php | 4 ++++ js/tt-rss.js | 10 ++++++++++ 4 files changed, 47 insertions(+) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 4e133dde4..0207c1240 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -203,6 +203,26 @@ return array($prefixes, $hotkeys); } + function check_for_update() { + if (defined("GIT_VERSION_TIMESTAMP")) { + $content = @fetch_file_contents("http://tt-rss.org/version.json"); + + 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 false; + } + function make_runtime_info() { $data = array(); @@ -221,6 +241,15 @@ $data['dep_ts'] = calculate_dep_timestamp(); $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); + + if (true || $_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"); diff --git a/include/version.php b/include/version.php index a7ca8a32b..34c11e6e7 100644 --- a/include/version.php +++ b/include/version.php @@ -8,6 +8,10 @@ if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/refs/heads/master")) { $suffix = substr(trim(file_get_contents("$root_dir/.git/refs/heads/master")), 0, 7); + $timestamp = filemtime("$root_dir/.git/refs/heads/master"); + + define("GIT_VERSION_HEAD", $suffix); + define("GIT_VERSION_TIMESTAMP", $timestamp); return VERSION_STATIC . ".$suffix"; } else { diff --git a/index.php b/index.php index 309ca2e29..322635978 100644 --- a/index.php +++ b/index.php @@ -252,6 +252,10 @@
    + + diff --git a/js/tt-rss.js b/js/tt-rss.js index 26749d108..df41a9cc5 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -767,6 +767,16 @@ function parse_runtime_info(data) { return; } + if (k == "update_result") { + var updatesIcon = dijit.byId("updatesIcon").domNode; + + if (v != "") { + Element.show(updatesIcon); + } else { + Element.hide(updatesIcon); + } + } + if (k == "daemon_stamp_ok" && v != 1) { notify_error("Update daemon is not updating feeds.", true); return; -- cgit v1.2.3-54-g00ecf From 119ba03bd4fefdcf65dc044fb5ee1a9a34d47e58 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 3 Feb 2015 14:42:20 +0300 Subject: minor fixes for previous --- include/functions2.php | 2 +- js/tt-rss.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 0207c1240..13b92225e 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -220,7 +220,7 @@ } } - return false; + return ""; } function make_runtime_info() { diff --git a/js/tt-rss.js b/js/tt-rss.js index df41a9cc5..e79f47176 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -770,7 +770,7 @@ function parse_runtime_info(data) { if (k == "update_result") { var updatesIcon = dijit.byId("updatesIcon").domNode; - if (v != "") { + if (v) { Element.show(updatesIcon); } else { Element.hide(updatesIcon); -- cgit v1.2.3-54-g00ecf From 480b2de3b130a10ead9c3c1c0e5048c56ba69b85 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 3 Feb 2015 14:43:11 +0300 Subject: minor fixes for previous (2) --- include/functions2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/functions2.php') diff --git a/include/functions2.php b/include/functions2.php index 13b92225e..75f9bebdd 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -242,7 +242,7 @@ $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); - if (true || $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { + if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { $update_result = @check_for_update(); $data["update_result"] = $update_result; -- cgit v1.2.3-54-g00ecf From 4ca621a36016de1fbb5447e1c1de0b607ba94a7c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 3 Feb 2015 14:46:51 +0300 Subject: add config option CHECK_FOR_UPDATES --- config.php-dist | 3 +++ include/functions2.php | 2 +- include/sanity_config.php | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include/functions2.php') diff --git a/config.php-dist b/config.php-dist index d821329d0..c0729b61b 100644 --- a/config.php-dist +++ b/config.php-dist @@ -177,6 +177,9 @@ // *** Other settings (less important) *** // *************************************** + define('CHECK_FOR_UPDATES', true); + // Check for updates automatically if running Git version + define('DETECT_ARTICLE_LANGUAGE', false); // Detect article language when updating feeds, presently this is only // used for hyphenation. This may increase amount of CPU time used by diff --git a/include/functions2.php b/include/functions2.php index 75f9bebdd..17d8acb3e 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -242,7 +242,7 @@ $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); - if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { + if (CHECK_FOR_UPDATES && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { $update_result = @check_for_update(); $data["update_result"] = $update_result; diff --git a/include/sanity_config.php b/include/sanity_config.php index 890c0c050..6120e5fe0 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ - +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> -- cgit v1.2.3-54-g00ecf