update_daemon2: make proper lockfile

[tt-rss.git] / update.php

diff --git a/update.php b/update.php
index 4e1eb923aa52831653e7b6356374d2cec1d940bf..f59f9ef3e56c04397c6a2d7de718df1d7305f353 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,4 +1,6 @@
 <?php
+       error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
        require_once "sessions.php";
        
        require_once "sanity_check.php";
@@ -11,18 +13,23 @@
        if (DB_TYPE == "pgsql") {
                pg_query($link, "set client_encoding = 'utf-8'");
                pg_set_client_encoding("UNICODE");
+       } else {
+               if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+                       db_query($link, "SET NAMES " . MYSQL_CHARSET);
+//                     db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET);
+               }
        }
-       
+
        login_sequence($link);
        
        $owner_uid = $_SESSION["uid"];
        
-       if ($_SESSION["access_level"] < 10) { 
-               print "<p>Error: your access level is insufficient to run this script.</p>";
+       if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) { 
+               $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+               render_login_form($link);
                exit;
        }
-       
-       define('SCHEMA_VERSION', 13);
+
 
 ?>
 
@@ -37,13 +44,13 @@
 
 <script type='text/javascript'>
 function confirmOP() {
-       return confirm("Update the database?");
+       return confirm(__("Update the database?"));
 }
 </script>
 
 <div class="floatingLogo"><img src="images/ttrss_logo.png"></div>
 
-<h1>Database Updater</h1>
+<h1><?php echo __("Database Updater") ?></h1>
 
 <?php
        function getline($fp, $delim) {
@@ -80,21 +87,30 @@ function confirmOP() {
        ksort($update_versions, SORT_NUMERIC);
        
        $latest_version = max(array_keys($update_versions));
-       
+
        if ($version == $latest_version) {
-               print "<p>Tiny Tiny RSS database is up to date (version $version).</p>";
-               print "<form method=\"GET\" action=\"tt-rss.php\">
-                       <input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
-                       </form>";
+
+               if ($version != SCHEMA_VERSION) {
+                       print_error(__("Could not update database"));
+
+                       print "<p>" . 
+                               __("Could not find necessary schema file, need version:") .
+                               " " . SCHEMA_VERSION . __(", found: ") . $latest_version . "</p>";
+
+               } else {
+                       print "<p>".__("Tiny Tiny RSS database is up to date.")."</p>";
+                       print "<form method=\"GET\" action=\"tt-rss.php\">
+                               <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+                               </form>";
+               }
 
                return;
        }
        
        if (!$op) {
-               print "<p class='warning'><b>Warning:</b> Please backup your database before proceeding.</p>";
+               print_warning(__("Please backup your database before proceeding."));
        
-               print "<p>Your Tiny Tiny RSS database needs update to the latest 
-                       version ($version &mdash;&gt; $latest_version).</p>";
+               print "<p>" . T_sprintf("Your Tiny Tiny RSS database needs update to the latest version (<b>%d</b> to <b>%d</b>).", $version, $latest_version) . "</p>";
        
        /*              print "<p>Available incremental updates:";
        
@@ -108,39 +124,39 @@ function confirmOP() {
        
                print "<form method='POST'>
                        <input type='hidden' name='op' value='do'>
-                       <input type='submit' onclick='return confirmOP()' value='Perform updates'>
+                       <input type='submit' onclick='return confirmOP()' value='".__("Perform updates")."'>
                        </form>";
        
        } else if ($op == "do") {
        
-               print "<p>Performing updates (from version $version)...</p>";
+               print "<p>".__("Performing updates...")."</p>";
        
                $num_updates = 0;
        
                foreach (array_keys($update_versions) as $v) {
                        if ($v == $version + 1) {
-                               print "<p>Updating to version $v...</p>";
+                               print "<p>".T_sprintf("Updating to version %d...", $v)."</p>";
                                $fp = fopen($update_versions[$v], "r");
                                if ($fp) {
                                        while (!feof($fp)) {
                                                $query = trim(getline($fp, ";"));
                                                if ($query != "") {
-                                                       print "<p class='query'><b>QUERY:</b> $query</p>";
+                                                       print "<p class='query'>$query</p>";
                                                        db_query($link, $query);
                                                }
                                        }
                                }
                                fclose($fp);
        
-                               print "<p>Checking version... ";
+                               print "<p>".__("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! ($version)";
+                                       print __("OK!");
                                } else {
-                                       print "<b>ERROR!</b>";
+                                       print "<b>".__("ERROR!")."</b>";
                                        return;
                                }
        
@@ -148,11 +164,11 @@ function confirmOP() {
                        }
                }
        
-               print "<p>Finished. Performed $num_updates updates up to schema
-                       version $version.</p>";
+               print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
+                       version <b>%d</b>.", $num_updates, $version)."</p>";
        
-               print "<form method=\"GET\" action=\"tt-rss.php\">
-                       <input type=\"submit\" value=\"Return to Tiny Tiny RSS\">
+               print "<form method=\"GET\" action=\"logout.php\">
+                       <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
                        </form>";
 
        }