Nemcio/adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2026-04-12 23:48:12 +02:00
Code Issues Packages Projects Releases Activity

Move connect() to Driver

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-30 07:51:47 +02:00
parent 992561f75e
commit 7ee6f4f7ac
13 changed files with 96 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/drivers/elastic.php
View File

@@ -110,6 +110,16 @@ if (isset($_GET["elastic"])) {
public array $insertFunctions = array("json");
public array $operators = array("=", "must", "should", "must_not");
static function connect(?string $server, string $username, string $password) {
if (!preg_match('~^(https?://)?[-a-z\d.]+(:\d+)?$~', $server)) {
return lang('Invalid server.');
}
if ($password != "" && is_object(parent::connect($server, $username, ""))) {
return lang('Database does not support password.');
}
return parent::connect($server, $username, $password);
}
function __construct(Db $connection) {
parent::__construct($connection);
$this->types = array(
@@ -283,20 +293,6 @@ if (isset($_GET["elastic"])) {
}
}
function connect($credentials) {
$connection = new Db;
list($server, $username, $password) = $credentials;
if (!preg_match('~^(https?://)?[-a-z\d.]+(:\d+)?$~', $server)) {
return lang('Invalid server.');
}
if ($password != "" && $connection->attach($server, $username, "")) {
return lang('Database does not support password.');
}
return ($connection->attach($server, $username, $password) ?: $connection);
}
function support($feature) {
return preg_match("~table|columns~", $feature);
}