valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into shared-feedbrowser

This commit is contained in:
Andrew Dolgov 2011-04-20 11:52:30 +04:00
parent 58fa1bbc00 0ae2bb2a69
commit 34846e514f
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend.php
View File

@ -124,7 +124,7 @@
$error = sanity_check($link); $error = sanity_check($link);
if ($error['code'] != 0) { if ($error['code'] != 0 && $op != "logout") {
print json_encode(array("error" => $error)); print json_encode(array("error" => $error));
return; return;
} }

23
db-updater.php
View File

@ -36,7 +36,7 @@ function confirmOP() {
} }
</script> </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> <h1><?php echo __("Database Updater") ?></h1>
@ -92,10 +92,8 @@ function confirmOP() {
</form>"; </form>";
} }
return; } else if ($version <= $latest_version && !$op) {
}
if (!$op) {
print_warning(__("Please backup your database before proceeding.")); 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>"; 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>";
@ -155,10 +153,25 @@ function confirmOP() {
print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema print "<p>".T_sprintf("Finished. Performed <b>%d</b> update(s) up to schema
version <b>%d</b>.", $num_updates, $version)."</p>"; version <b>%d</b>.", $num_updates, $version)."</p>";
print "<form method=\"GET\" action=\"backend.php?op=logout\"> print "<form method=\"GET\" action=\"backend.php\">
<input type=\"hidden\" name=\"op\" value=\"logout\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </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>";
} }
?> ?>

2
opml.php
View File

@ -158,7 +158,7 @@
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head> </head>
<body> <body>
<div class=\"floatingLogo\"><img src=\"images/logo.png\"></div> <div class=\"floatingLogo\"><img src=\"images/logo_wide.png\"></div>
<h1>".__('OPML Utility')."</h1>"; <h1>".__('OPML Utility')."</h1>";
db_query($link, "BEGIN"); db_query($link, "BEGIN");

5
register.php
View File

@ -140,7 +140,7 @@
<body> <body>
<div class="floatingLogo"><img src="images/logo.png"></div> <div class="floatingLogo"><img src="images/logo_wide.png"></div>
<h1><?php echo __("Create new account") ?></h1> <h1><?php echo __("Create new account") ?></h1>
@ -148,7 +148,8 @@
if (!ENABLE_REGISTRATION) { if (!ENABLE_REGISTRATION) {
print_error(__("New user registrations are administratively disabled.")); print_error(__("New user registrations are administratively disabled."));
print "<p><form method=\"GET\" action=\"backend.php?op=logout\"> print "<p><form method=\"GET\" action=\"backend.php\">
<input type=\"hidden\" name=\"op\" value=\"logout\">
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\"> <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form>"; </form>";
return; return;