mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 17:44:07 +02:00
Code Issues Releases Wiki Activity

Pass credentials to connect()

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-07 12:03:29 +01:00
parent 95e6a65999
commit 9918f4155e
15 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adminer/drivers/mongo.inc.php
View File

@@ -421,10 +421,10 @@ if (isset($_GET["mongo"])) {
return $credentials[1];
}
function connect() {
function connect($credentials) {
global $adminer;
$connection = new Db;
list($server, $username, $password) = $adminer->credentials();
list($server, $username, $password) = $credentials;
if ($server == "") {
$server = "localhost:27017";

6
adminer/drivers/mssql.inc.php
View File

@@ -280,15 +280,11 @@ if (isset($_GET["mssql"])) {
return ($_GET["ns"] != "" ? idf_escape($_GET["ns"]) . "." : "") . idf_escape($idf);
}
function connect() {
global $adminer;
function connect($credentials) {
$connection = new Db;
$credentials = $adminer->credentials();
if ($credentials[0] == "") {
$credentials[0] = "localhost:1433";
}
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
return $connection;
}

5
adminer/drivers/mysql.inc.php
View File

@@ -421,12 +421,11 @@ if (!defined('Adminer\DRIVER')) {
}
/** Connect to the database
* @param array [$server, $username, $password]
* @return mixed Db or string for error
*/
function connect() {
global $adminer;
function connect($credentials) {
$connection = new Db;
$credentials = $adminer->credentials();
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
$connection->query("SET sql_quote_show_create = 1, autocommit = 1");

4
adminer/drivers/oracle.inc.php
View File

@@ -211,10 +211,8 @@ if (isset($_GET["oracle"])) {
return idf_escape($idf);
}
function connect() {
global $adminer;
function connect($credentials) {
$connection = new Db;
$credentials = $adminer->credentials();
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
return $connection;
}

4
adminer/drivers/pgsql.inc.php
View File

@@ -312,10 +312,8 @@ if (isset($_GET["pgsql"])) {
return idf_escape($idf);
}
function connect() {
global $adminer;
function connect($credentials) {
$connection = new Db;
$credentials = $adminer->credentials();
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
if (min_version(9, 0, $connection)) {
$connection->query("SET application_name = 'Adminer'");

5
adminer/drivers/sqlite.inc.php
View File

@@ -190,9 +190,8 @@ if (isset($_GET["sqlite"])) {
return idf_escape($idf);
}
function connect() {
global $adminer;
list(, , $password) = $adminer->credentials();
function connect($credentials) {
list(, , $password) = $credentials;
if ($password != "") {
return lang('Database does not support password.');
}