mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-10 00:28:34 +02:00
Code Issues Releases Wiki Activity

Display login in auth form (regression)

Browse Source
This commit is contained in:
Jakub Vrana
2010-12-01 18:44:17 +01:00
parent ac8ff42689
commit 9bb0fdc91b
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/include/adminer.inc.php
View File

@@ -702,7 +702,7 @@ DROP PROCEDURE adminer_alter;
foreach ($usernames as $username => $password) { foreach ($usernames as $username => $password) {
if (isset($password)) { if (isset($password)) {
if ($first) { if ($first) {
echo "<p>\n"; echo "<p onclick='eventStop(event);'>\n";
$first = false; $first = false;
} }
echo "<a href='" . h(auth_url($driver, $server, $username)) . "'>($drivers[$driver]) " . h($username . ($server != "" ? "@$server" : "")) . "</a><br>\n"; echo "<a href='" . h(auth_url($driver, $server, $username)) . "'>($drivers[$driver]) " . h($username . ($server != "" ? "@$server" : "")) . "</a><br>\n";

3
adminer/include/auth.inc.php
View File

@@ -73,9 +73,8 @@ function auth_error($exception = null) {
} }
} }
} }
unset($_GET["username"]); // checked in page_header() for successful login
page_header(lang('Login'), $error, null); page_header(lang('Login'), $error, null);
echo "<form action='' method='post'>\n"; echo "<form action='' method='post' onclick='eventStop(event);'>\n";
$adminer->loginForm(); $adminer->loginForm();
echo "<div>"; echo "<div>";
hidden_fields($_POST, array("driver", "server", "username", "password", "permanent")); // expired session hidden_fields($_POST, array("driver", "server", "username", "password", "permanent")); // expired session

2
adminer/include/design.inc.php
View File

@@ -32,7 +32,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<link rel="stylesheet" type="text/css" href="adminer.css"> <link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?> <?php } ?>
<body class="<?php echo lang('ltr'); ?>"<?php if (isset($_GET["username"])) { ?> onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');"<?php } ?> onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>"> <body class="<?php echo lang('ltr'); ?>" onclick="return bodyClick(event, '<?php echo js_escape(DB); ?>', '<?php echo js_escape($_GET["ns"]); ?>');" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
<script type="text/javascript" src="../adminer/static/functions.js"></script> <script type="text/javascript" src="../adminer/static/functions.js"></script>
<script type="text/javascript" src="static/editing.js"></script> <script type="text/javascript" src="static/editing.js"></script>

13
adminer/static/editing.js
View File

@@ -399,16 +399,3 @@ function schemaMouseup(ev) {
cookie('adminer_schema=' + encodeURIComponent(s.substr(1)), 30, '; path="' + location.pathname + location.search + '"'); cookie('adminer_schema=' + encodeURIComponent(s.substr(1)), 30, '; path="' + location.pathname + location.search + '"');
} }
} }
/** Stop event propagation
* @param Event
*/
function eventStop(event) {
if (event.stopPropagation) {
event.stopPropagation();
} else {
event.cancelBubble = true;
}
}

11
adminer/static/functions.js
View File

@@ -393,3 +393,14 @@ function bodyClick(event, db, ns) {
} }
return true; return true;
} }
/** Stop event propagation
* @param Event
*/
function eventStop(event) {
if (event.stopPropagation) {
event.stopPropagation();
} else {
event.cancelBubble = true;
}
}

2
editor/include/adminer.inc.php
View File

@@ -479,7 +479,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) { foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) {
if (isset($password)) { if (isset($password)) {
if ($first) { if ($first) {
echo "<p>\n"; echo "<p onclick='eventStop(event);'>\n";
$first = false; $first = false;
} }
echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n"; echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n";