beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Report connection error

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@650 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-06-03 18:35:16 +00:00
parent fbebb08722
commit 6563b5ed1e
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/auth.inc.php
View file

@ -1,17 +1,18 @@
<?php <?php
$ignore = array("server", "username", "password"); $ignore = array("server", "username", "password");
if (ini_get("session.use_trans_sid") && isset($_POST[session_name()])) { $session_name = session_name();
$ignore[] = session_name(); if (ini_get("session.use_trans_sid") && isset($_POST[$session_name])) {
$ignore[] = $session_name;
} }
if (isset($_POST["server"])) { if (isset($_POST["server"])) {
if (isset($_COOKIE[session_name()]) || isset($_POST[session_name()])) { if (isset($_COOKIE[$session_name]) || isset($_POST[$session_name])) {
session_regenerate_id(); session_regenerate_id();
$_SESSION["usernames"][$_POST["server"]] = $_POST["username"]; $_SESSION["usernames"][$_POST["server"]] = $_POST["username"];
$_SESSION["passwords"][$_POST["server"]] = $_POST["password"]; $_SESSION["passwords"][$_POST["server"]] = $_POST["password"];
$_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6); $_SESSION["tokens"][$_POST["server"]] = rand(1, 1e6);
if (count($_POST) == count($ignore)) { if (count($_POST) == count($ignore)) {
$location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : '')); $location = ((string) $_GET["server"] === $_POST["server"] ? remove_from_uri() : preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . (strlen($_POST["server"]) ? '?server=' . urlencode($_POST["server"]) : ''));
if (!isset($_COOKIE[session_name()])) { if (!isset($_COOKIE[$session_name])) {
$location .= (strpos($location, "?") === false ? "?" : "&") . SID; $location .= (strpos($location, "?") === false ? "?" : "&") . SID;
} }
header("Location: " . (strlen($location) ? $location : ".")); header("Location: " . (strlen($location) ? $location : "."));
@ -36,11 +37,11 @@ if (isset($_POST["server"])) {
} }
} }
function auth_error() { function auth_error($exception = null) {
global $ignore; global $ignore, $dbh;
$username = $_SESSION["usernames"][$_GET["server"]]; $username = $_SESSION["usernames"][$_GET["server"]];
unset($_SESSION["usernames"][$_GET["server"]]); unset($_SESSION["usernames"][$_GET["server"]]);
page_header(lang('Login'), (isset($username) ? lang('Invalid credentials.') : (isset($_POST["server"]) ? lang('Sessions must be enabled.') : ($_POST ? lang('Session expired, please login again.') : ""))), null); page_header(lang('Login'), (isset($username) ? htmlspecialchars($exception ? $exception->getMessage() : ($dbh ? $dbh : lang('Invalid credentials.'))) : (isset($_POST["server"]) ? lang('Sessions must be enabled.') : ($_POST ? lang('Session expired, please login again.') : ""))), null);
?> ?>
<form action="" method="post"> <form action="" method="post">
<table cellspacing="0"> <table cellspacing="0">
@ -66,8 +67,9 @@ $username = &$_SESSION["usernames"][$_GET["server"]];
if (!isset($username)) { if (!isset($username)) {
$username = $_GET["username"]; $username = $_GET["username"];
} }
if (!isset($username) || !$dbh->connect($_GET["server"], $username, $_SESSION["passwords"][$_GET["server"]])) { $dbh = (isset($username) ? connect() : '');
unset($username);
if (is_string($dbh)) {
auth_error(); auth_error();
exit; exit;
} }
unset($username);