]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3bdc2b9)
update.php: display error message when running from the browser
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 23 Aug 2012 09:17:22 +0000 (13:17 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Thu, 23 Aug 2012 09:17:22 +0000 (13:17 +0400)
mention self-updating in new version dialog

classes/dlg.php patch | blob | blame | history
update.php patch | blob | blame | history

diff --git a/classes/dlg.php b/classes/dlg.php
index 008518a8aa5c0f528a76ca7e644724d9f72f1f67..2701a98b29d961bd7ebca098a899f5540ef59a13 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -899,6 +899,8 @@ class Dlg extends Handler_Protected {
                $details = "http://tt-rss.org/redmine/versions/show/$id";
                $download = "http://tt-rss.org/#Download";
 
+               print "<p align='center'>".__("You can try updating automatically using update.php")."</p>";
+
                print "<div style='text-align : center'>";
                print "<button dojoType=\"dijit.form.Button\"
                        onclick=\"return window.open('$details')\">".__("Details")."</button>";
diff --git a/update.php b/update.php
index f23244d84625538cf8e6abc76bcf99a42124593e..01ce6df81a590e385e138c29f60a34b08eac16be 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -14,6 +14,25 @@
        require_once "db.php";
        require_once "db-prefs.php";
 
+       if (!defined('STDIN')) {
+               ?> <html>
+               <head>
+               <title>Database Updater</title>
+               <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+               <link rel="stylesheet" type="text/css" href="utility.css">
+               </head>
+
+               <body>
+               <div class="floatingLogo"><img src="images/logo_wide.png"></div>
+               <h1><?php echo __("Update") ?></h1>
+
+               <?php print_error("Please run this script from the command line."); ?>
+
+               </body></html>
+       <?php
+               exit;
+       }
+
        if (!defined('PHP_EXECUTABLE'))
                define('PHP_EXECUTABLE', '/usr/bin/php');
 
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/