]> git.joonet.de Git - adminer.git/commitdiff
projects / adminer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff85f12)
Check version on every page
authorjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Mon, 1 Jun 2009 21:32:11 +0000 (21:32 +0000)
committerjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Mon, 1 Jun 2009 21:32:11 +0000 (21:32 +0000)
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@643 7c3ca157-0c34-0410-bff1-cbf682f78f5c

include/connect.inc.php patch | blob | history
include/design.inc.php patch | blob | history

diff --git a/include/connect.inc.php b/include/connect.inc.php
index 222304e8056d9f72a7d98a01c7f67f79fa59731b..331bbc2609edf5bd36267e7561d9a435ce2391b0 100644 (file)
--- a/include/connect.inc.php
+++ b/include/connect.inc.php
@@ -9,16 +9,6 @@ function connect_error() {
                echo '<p><a href="' . htmlspecialchars($SELF) . 'privileges=">' . lang('Privileges') . "</a></p>\n";
                echo '<p><a href="' . htmlspecialchars($SELF) . 'processlist=">' . lang('Process list') . "</a></p>\n";
                echo "<p>" . lang('MySQL version: %s through PHP extension %s', "<b" . ($dbh->server_info < 4.1 ? " class='binary'" : "") . ">$dbh->server_info</b>", "<b>$dbh->extension</b>") . "</p>\n";
-               echo "<p>" . lang('phpMinAdmin version: %s', "<b>$VERSION</b>") . ", <a href='http://www.phpminadmin.net/'>" . lang('current version') . "<span id='version'>" . (version_compare($VERSION, $_COOKIE["phpMinAdmin_version"]) < 0 ? ": <b>" . htmlspecialchars($_COOKIE["phpMinAdmin_version"]) . "</b>" : "") . "</span></a></p>\n";
-               if (!isset($_COOKIE["phpMinAdmin_version"])) {
-                       ?>
-<script type="text/javascript">
-onload = function () {
-       verify_version('<?php echo $VERSION; ?>');
-};
-</script>
-<?php
-               }
                echo "<p>" . lang('Logged as: %s', "<b>" . htmlspecialchars($dbh->result($dbh->query("SELECT USER()"))) . "</b>") . "</p>\n";
        }
        page_footer("db");
diff --git a/include/design.inc.php b/include/design.inc.php
index 1683ccbd521428e035b8c461f046e737e9e8fd88..1ee8099f2b7ce73953e806a184609b65778f1c16 100644 (file)
--- a/include/design.inc.php
+++ b/include/design.inc.php
@@ -1,6 +1,6 @@
 <?php
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-       global $SELF, $LANG;
+       global $SELF, $LANG, $VERSION;
        header("Content-Type: text/html; charset=utf-8");
        ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -17,7 +17,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <?php } ?>
 </head>
 
-<body>
+<body onload="load_jush();<?php echo (isset($_COOKIE["phpMinAdmin_version"]) ? "" : " verify_version('$VERSION');"); ?>">
 <script type="text/javascript" src="functions.js"></script>
 
 <div id="content">
@@ -62,6 +62,7 @@ function page_footer($missing = false) {
 <?php switch_lang(); ?>
 <div id="menu">
 <h1><a href="http://www.phpminadmin.net/"><?php echo lang('phpMinAdmin'); ?></a> <?php echo $VERSION; ?></h1>
+<div class="version"><a href='http://www.phpminadmin.net/#download' id="version"><?php echo (version_compare($VERSION, $_COOKIE["phpMinAdmin_version"]) < 0 ? htmlspecialchars($_COOKIE["phpMinAdmin_version"]) : ""); ?></a></div>
 <?php if ($missing != "auth") { ?>
 <form action="" method="post">
 <p>
@@ -106,10 +107,6 @@ function page_footer($missing = false) {
        ?>
 </div>
 
-<?php if (!$missing) { ?>
-<script type="text/javascript">onload = load_jush;</script>
-<?php } ?>
-
 </body>
 </html>
 <?php
Sources of adminer, a webclient for database management systems.