From: Andrew Dolgov
".__("Tiny Tiny RSS database is up to date.")."
"; + print ""; + } + + return; + } + + if (!$op) { + print_warning(__("Please backup your database before proceeding.")); + + print "" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (%d to %d).", $version, $latest_version) . "
"; + + /* print "Available incremental updates:"; + + foreach (array_keys($update_versions) as $v) { + if ($v > $version) { + print " $v"; + } + } */ + + print "
"; + + print ""; + + } else if ($op == "do") { + + print "".__("Performing updates...")."
"; + + $num_updates = 0; + + foreach (array_keys($update_versions) as $v) { + if ($v == $version + 1) { + print "".T_sprintf("Updating to version %d...", $v)."
"; + $fp = fopen($update_versions[$v], "r"); + if ($fp) { + while (!feof($fp)) { + $query = trim(getline($fp, ";")); + if ($query != "") { + print "$query
"; + db_query($link, $query); + } + } + } + fclose($fp); + + print "".__("Checking version... "); + + $result = db_query($link, "SELECT schema_version FROM ttrss_version"); + $version = db_fetch_result($result, 0, "schema_version"); + + if ($version == $v) { + print __("OK!"); + } else { + print "".__("ERROR!").""; + return; + } + + $num_updates++; + } + } + + print "
".T_sprintf("Finished. Performed %d update(s) up to schema + version %d.", $num_updates, $version)."
"; + + print ""; + + } + +?> + + + + diff --git a/digest.js b/digest.js index 0bb1638a..50d5e311 100644 --- a/digest.js +++ b/digest.js @@ -719,7 +719,7 @@ function fatal_error(code, msg) { if (code == 6) { window.location.href = "digest.php"; } else if (code == 5) { - window.location.href = "update.php"; + window.location.href = "db-updater.php"; } else { if (msg == "") msg = "Unknown error"; diff --git a/errors.php b/errors.php index bd7b53fe..b2e0841a 100644 --- a/errors.php +++ b/errors.php @@ -12,7 +12,7 @@ $ERRORS[4] = __("Frontend sanity check failed."); - $ERRORS[5] = __("Incorrect database schema version. <a href='update.php'>Please update</a>."); + $ERRORS[5] = __("Incorrect database schema version. <a href='db-updater.php'>Please update</a>."); $ERRORS[6] = __("Request not authorized."); diff --git a/functions.js b/functions.js index 9e990c44..ae7ecee3 100644 --- a/functions.js +++ b/functions.js @@ -1375,7 +1375,7 @@ function fatalError(code, msg, ext_info) { if (code == 6) { window.location.href = "tt-rss.php"; } else if (code == 5) { - window.location.href = "update.php"; + window.location.href = "db-updater.php"; } else { if (msg == "") msg = "Unknown error"; diff --git a/update-translations.sh b/update-translations.sh deleted file mode 100755 index 6968b20b..00000000 --- a/update-translations.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -TEMPLATE=messages.pot - -xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php modules/*.php help/*.php mobile/*.php - -xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE *.js - -update_lang() { - if [ -f $1.po ]; then - TMPFILE=/tmp/update-translations.$$ - - msgmerge -o $TMPFILE $1.po $TEMPLATE - mv $TMPFILE $1.po - msgfmt --statistics $1.po - msgfmt -o $1.mo $1.po - else - echo "Usage: $0 [-p|".__("Tiny Tiny RSS database is up to date.")."
"; - print ""; + $count = update_feedbrowser_cache($link); + _debug("Finished, $count feeds processed."); } - return; - } - - if (!$op) { - print_warning(__("Please backup your database before proceeding.")); - - print "" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (%d to %d).", $version, $latest_version) . "
"; - - /* print "Available incremental updates:"; - - foreach (array_keys($update_versions) as $v) { - if ($v > $version) { - print " $v"; - } - } */ - - print "
"; - - print ""; - - } else if ($op == "do") { - - print "".__("Performing updates...")."
"; - - $num_updates = 0; - - foreach (array_keys($update_versions) as $v) { - if ($v == $version + 1) { - print "".T_sprintf("Updating to version %d...", $v)."
"; - $fp = fopen($update_versions[$v], "r"); - if ($fp) { - while (!feof($fp)) { - $query = trim(getline($fp, ";")); - if ($query != "") { - print "$query
"; - db_query($link, $query); - } - } - } - fclose($fp); - - print "".__("Checking version... "); - - $result = db_query($link, "SELECT schema_version FROM ttrss_version"); - $version = db_fetch_result($result, 0, "schema_version"); - - if ($version == $v) { - print __("OK!"); - } else { - print "".__("ERROR!").""; - return; - } - - $num_updates++; - } - } - - print "
".T_sprintf("Finished. Performed %d update(s) up to schema - version %d.", $num_updates, $version)."
"; - - print ""; - } - -?> - - + db_close($link); + unlink(LOCK_DIRECTORY . "/$lock_filename"); +?> diff --git a/update_daemon.php b/update_daemon.php deleted file mode 100755 index 03d366b5..00000000 --- a/update_daemon.php +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/php - diff --git a/update_daemon_loop.php b/update_daemon_loop.php deleted file mode 100755 index 7fa22d19..00000000 --- a/update_daemon_loop.php +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/php - 50) { - update_daemon_common($link); - } else { - $count = update_feedbrowser_cache($link); - _debug("Finished, $count feeds processed."); - } - - db_close($link); - -?> diff --git a/update_feedbrowser.php b/update_feedbrowser.php deleted file mode 100755 index 0031ff31..00000000 --- a/update_feedbrowser.php +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/php - diff --git a/update_feeds.php b/update_feeds.php deleted file mode 100755 index 6a4aa2a1..00000000 --- a/update_feeds.php +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/php - diff --git a/utils/update-translations.sh b/utils/update-translations.sh new file mode 100755 index 00000000..6968b20b --- /dev/null +++ b/utils/update-translations.sh @@ -0,0 +1,29 @@ +#!/bin/sh +TEMPLATE=messages.pot + +xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php modules/*.php help/*.php mobile/*.php + +xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE *.js + +update_lang() { + if [ -f $1.po ]; then + TMPFILE=/tmp/update-translations.$$ + + msgmerge -o $TMPFILE $1.po $TEMPLATE + mv $TMPFILE $1.po + msgfmt --statistics $1.po + msgfmt -o $1.mo $1.po + else + echo "Usage: $0 [-p|