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

Use adminer() instead of $adminer

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-29 20:56:19 +01:00
parent 87f149ce1d
commit 845445baad
29 changed files with 184 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
namespace Adminer;
class Adminer {
static $instance;
public $error = '';
private $values = array();
@@ -30,9 +31,9 @@ class Adminer {
}
function database() {
global $connection, $adminer;
global $connection;
if ($connection) {
$databases = $adminer->databases(false);
$databases = adminer()->databases(false);
return (!$databases
? get_val("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1)") // username without the database list
: $databases[(information_schema($databases[0]) ? 1 : 0)] // first available database
@@ -79,10 +80,9 @@ class Adminer {
}
function loginForm() {
global $adminer;
echo "<table class='layout'>\n";
echo $adminer->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', input_hidden("auth[driver]", "server") . '<input name="auth[username]" autofocus value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">');
echo $adminer->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">');
echo adminer()->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', input_hidden("auth[driver]", "server") . '<input name="auth[username]" autofocus value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">');
echo adminer()->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">');
echo "</table>\n";
echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
@@ -119,20 +119,19 @@ class Adminer {
}
function backwardKeys($table, $tableName) {
global $adminer;
$return = array();
foreach (
get_rows("SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_COLUMN_NAME
FROM information_schema.KEY_COLUMN_USAGE
WHERE TABLE_SCHEMA = " . q($adminer->database()) . "
AND REFERENCED_TABLE_SCHEMA = " . q($adminer->database()) . "
WHERE TABLE_SCHEMA = " . q(adminer()->database()) . "
AND REFERENCED_TABLE_SCHEMA = " . q(adminer()->database()) . "
AND REFERENCED_TABLE_NAME = " . q($table) . "
ORDER BY ORDINAL_POSITION", null, "") as $row
) {
$return[$row["TABLE_NAME"]]["keys"][$row["CONSTRAINT_NAME"]][$row["COLUMN_NAME"]] = $row["REFERENCED_COLUMN_NAME"];
}
foreach ($return as $key => $val) {
$name = $adminer->tableName(table_status1($key, true));
$name = adminer()->tableName(table_status1($key, true));
if ($name != "") {
$search = preg_quote($tableName);
$separator = "(:|\\s*-)?\\s+";
@@ -238,7 +237,6 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function selectSearchPrint($where, $columns, $indexes) {
global $adminer;
$where = (array) $_GET["where"];
echo '<fieldset id="fieldset-search"><legend>' . lang('Search') . "</legend><div>\n";
$keys = array();
@@ -273,14 +271,14 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
foreach ($where as $val) {
if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
echo html_select("where[$i][op]", array(-1 => "") + $adminer->operators(), $val["op"]);
echo html_select("where[$i][op]", array(-1 => "") + adminer()->operators(), $val["op"]);
echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>" . script("mixin(qsl('input'), {onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", "") . "</div>\n";
$i++;
}
}
echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, null, true) . "</select>";
echo script("qsl('select').onchange = selectAddRow;", "");
echo html_select("where[$i][op]", array(-1 => "") + $adminer->operators());
echo html_select("where[$i][op]", array(-1 => "") + adminer()->operators());
echo "<input type='search' name='where[$i][val]'></div>";
echo script("mixin(qsl('input'), {onchange: function () { this.parentNode.firstChild.onchange(); }, onsearch: selectSearchSearch});");
echo "</div></fieldset>\n";
@@ -356,7 +354,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function selectSearchProcess($fields, $indexes) {
global $driver, $adminer;
global $driver;
$return = array();
foreach ((array) $_GET["where"] as $key => $where) {
$col = $where["col"];
@@ -371,9 +369,9 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
$conds[] = (in_array(0, $val) ? "$name IS NULL OR " : "") . "$name IN (" . implode(", ", array_map('intval', $val)) . ")";
} else {
$text_type = preg_match('~char|text|enum|set~', $field["type"]);
$value = $adminer->processInput($field, (!$op && $text_type && preg_match('~^[^%]+$~', $val) ? "%$val%" : $val));
$value = adminer()->processInput($field, (!$op && $text_type && preg_match('~^[^%]+$~', $val) ? "%$val%" : $val));
$conds[] = $driver->convertSearch($name, $where, $field) . ($value == "NULL" ? " IS" . ($op == ">=" ? " NOT" : "") . " $value"
: (in_array($op, $adminer->operators()) || $op == "=" ? " $op $value"
: (in_array($op, adminer()->operators()) || $op == "=" ? " $op $value"
: ($text_type ? " LIKE $value"
: " IN (" . str_replace(",", "', '", $value) . ")"
)));
@@ -426,7 +424,6 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function selectEmailProcess($where, $foreignKeys) {
global $adminer;
if ($_POST["email_append"]) {
return true;
}
@@ -444,10 +441,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
. ($_POST["all"] ? "" : " AND ((" . implode(") OR (", array_map('Adminer\where_check', (array) $_POST["check"])) . "))")
);
$fields = fields($_GET["select"]);
foreach ($adminer->rowDescriptions($rows, $foreignKeys) as $row) {
foreach (adminer()->rowDescriptions($rows, $foreignKeys) as $row) {
$replace = array('{\\' => '{'); // allow literal {$name}
foreach ($matches[1] as $val) {
$replace['{$' . "$val}"] = $adminer->editVal($row[$val], $fields[$val]);
$replace['{$' . "$val}"] = adminer()->editVal($row[$val], $fields[$val]);
}
$email = $row[$_POST["email_field"]];
if (is_mail($email) && send_mail($email, strtr($subject, $replace), strtr($message, $replace), $_POST["email_from"], $_FILES["email_files"])) {
@@ -596,8 +593,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function navigation($missing) {
global $adminer;
echo "<h1>" . $adminer->name() . " <span class='version'>" . VERSION;
echo "<h1>" . adminer()->name() . " <span class='version'>" . VERSION;
$new_version = $_COOKIE["adminer_version"];
echo " <a href='https://www.adminer.org/editor/#download'" . target_blank() . " id='version'>" . (version_compare(VERSION, $new_version) < 0 ? h($new_version) : "") . "</a>";
echo "</span></h1>\n";
@@ -617,13 +613,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
}
} else {
$adminer->databasesPrint($missing);
adminer()->databasesPrint($missing);
if ($missing != "db" && $missing != "ns") {
$table_status = table_status('', true);
if (!$table_status) {
echo "<p class='message'>" . lang('No tables.') . "\n";
} else {
$adminer->tablesPrint($table_status);
adminer()->tablesPrint($table_status);
}
}
}
@@ -636,12 +632,11 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function tablesPrint($tables) {
global $adminer;
echo "<ul id='tables'>";
echo script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
foreach ($tables as $row) {
echo '<li>';
$name = $adminer->tableName($row);
$name = adminer()->tableName($row);
if ($name != "") { // ignore tables without name
echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'"
. bold($_GET["select"] == $row["Name"] || $_GET["edit"] == $row["Name"], "select")
@@ -653,10 +648,9 @@ ORDER BY ORDINAL_POSITION", null, "") as $row
}
function _foreignColumn($foreignKeys, $column) {
global $adminer;
foreach ((array) $foreignKeys[$column] as $foreignKey) {
if (count($foreignKey["source"]) == 1) {
$name = $adminer->rowDescription($foreignKey["table"]);
$name = adminer()->rowDescription($foreignKey["table"]);
if ($name != "") {
$id = idf_escape($foreignKey["target"][0]);
return array($foreignKey["table"], $id, $name);