From 0ae2bb2a69c3691c2301fc66b46624447d0c8d32 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 20 Apr 2011 11:52:17 +0400
Subject: db-updater: properly handle situation of newer active schema; utility
 scripts: fix incorrect logo

---
 db-updater.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'db-updater.php')

diff --git a/db-updater.php b/db-updater.php
index 8590ee82a..edee3bc83 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -36,7 +36,7 @@ function confirmOP() {
 }
 </script>
 
-<div class="floatingLogo"><img src="images/logo.png"></div>
+<div class="floatingLogo"><img src="images/logo_wide.png"></div>
 
 <h1><?php echo __("Database Updater") ?></h1>
 
@@ -92,10 +92,8 @@ function confirmOP() {
 				</form>";
 		}
 
-		return;
-	}
+	} else if ($version <= $latest_version && !$op) {
 
-	if (!$op) {
 		print_warning(__("Please backup your database before proceeding."));
 
 		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>";
@@ -160,6 +158,20 @@ function confirmOP() {
 			<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 			</form>";
 
+	} else if ($version >= $latest_version) {
+
+		print_error(__("Your database schema is from a newer version of Tiny Tiny RSS."));
+
+		print "<p>" . T_sprintf("Found schema version: <b>%d</b>, required: <b>%d</b>.", $version, $latest_version) . "</p>";
+
+		print "<p>" . __("Schema upgrade impossible. Please update Tiny Tiny RSS files to the newer version and continue.") . "</p>";
+
+		print "<form method=\"GET\" action=\"backend.php\">
+			<input type=\"hidden\" name=\"op\" value=\"logout\">
+			<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+			</form>";
+
+
 	}
 
 ?>
-- 
cgit v1.2.3