" . lang('%s version: %s through PHP extension %s', get_driver(DRIVER), "" . h($connection->server_info) . "", "$connection->extension") . "\n"; + echo "
" . lang('%s version: %s through PHP extension %s', get_driver(DRIVER), "" . h(connection()->server_info) . "", "" . connection()->extension . "") . "\n"; echo "
" . lang('Logged as: %s', "" . h(logged_user()) . "") . "\n"; if (isset(adminer()->plugins) && is_array(adminer()->plugins)) { echo "
" . lang('Loaded plugins') . ":\n
"): array { - global $connection; - $conn = (is_object($connection2) ? $connection2 : $connection); + $conn = (is_object($connection2) ? $connection2 : connection()); $return = array(); $result = $conn->query($query); if (is_object($result)) { // can return true @@ -256,7 +251,6 @@ function escape_key(string $key): string { * @param Field[] $fields */ function where(array $where, array $fields = array()): string { - global $connection; $return = array(); foreach ((array) $where["where"] as $key => $val) { $key = bracket_escape($key, true); // true - back @@ -270,7 +264,7 @@ function where(array $where, array $fields = array()): string { : " = " . unconvert_field($field, q($val))))) ; //! enum and set if (JUSH == "sql" && preg_match('~char|text~', $field_type) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters - $return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin"; + $return[] = "$column = " . q($val) . " COLLATE " . charset(connection()) . "_bin"; } } foreach ((array) $where["null"] as $key) { @@ -430,10 +424,9 @@ function redirect(?string $location, string $message = null): void { * @param bool $redirect */ function query_redirect(string $query, ?string $location, string $message, $redirect = true, bool $execute = true, bool $failed = false, string $time = ""): bool { - global $connection; if ($execute) { $start = microtime(true); - $failed = !$connection->query($query); + $failed = !connection()->query($query); $time = format_time($start); } $sql = ($query ? adminer()->messageQuery($query, $time, $failed) : ""); @@ -457,12 +450,11 @@ class Queries { * @return Result|bool */ function queries(string $query) { - global $connection; if (!Queries::$start) { Queries::$start = microtime(true); } Queries::$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query) . ";"; - return $connection->query($query); + return connection()->query($query); } /** Apply command to all array items diff --git a/adminer/include/html.inc.php b/adminer/include/html.inc.php index 7f744151..04469ad7 100644 --- a/adminer/include/html.inc.php +++ b/adminer/include/html.inc.php @@ -331,13 +331,12 @@ function process_input(array $field) { * @uses $_POST["tables"] */ function search_tables(): void { - global $connection; $_GET["where"][0]["val"] = $_POST["query"]; $sep = "
$print: " . error()) . "\n"; diff --git a/adminer/privileges.inc.php b/adminer/privileges.inc.php index 975548ad..3e6fc26d 100644 --- a/adminer/privileges.inc.php +++ b/adminer/privileges.inc.php @@ -5,11 +5,11 @@ page_header(lang('Privileges')); echo '
' . lang('Create user') . ""; -$result = $connection->query("SELECT User, Host FROM mysql." . (DB == "" ? "user" : "db WHERE " . q(DB) . " LIKE Db") . " ORDER BY Host, User"); +$result = connection()->query("SELECT User, Host FROM mysql." . (DB == "" ? "user" : "db WHERE " . q(DB) . " LIKE Db") . " ORDER BY Host, User"); $grant = $result; if (!$result) { // list logged user, information_schema.USER_PRIVILEGES lists just the current user too - $result = $connection->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host"); + $result = connection()->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host"); } echo "