Release 4.14

Thanks to @OmlineEditor (https://github.com/adminerevo/adminerevo/issues/113)

.editorconfig

@@ -7,7 +7,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{php,css,js,xml}]
+[*.{php,css,js}]
 indent_style = tab
 
 [*.json]

.gitattributes

@@ -1,6 +0,0 @@
-/.gitattributes export-ignore
-/.github export-ignore
-/.gitignore export-ignore
-/.gitmodules export-ignore
-/.travis.yml export-ignore
-/tests export-ignore

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: vrana
-patreon: jakubvrana
-custom: ["https://www.paypal.com/donate/?item_name=Donation+to+Adminer&business=jakub%40vrana.cz"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Adminer version:** please use latest published or Git
-**Driver:** e.g. MySQL
-**Database version:** e.g. 10.1.48-MariaDB
-
-Please provide reproducible steps including a SQL dump (with no personal information) if applicable.

.gitignore

@@ -1,4 +1,7 @@
 /adminer/adminer.css
 /adminer*.php
 /editor*.php
+/**/compiled
 /vendor/
+/composer.lock
+/export/

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "jush"]
-	path = externals/jush
-	url = https://github.com/vrana/jush
-[submodule "JsShrink"]
-	path = externals/JsShrink
-	url = https://github.com/vrana/JsShrink

.travis.yml

@@ -6,8 +6,4 @@ php:
   - 7.3
   - 7.4
   - 8.0
-  - 8.1
-  - 8.2
-  - 8.3
-  - 8.4
 script: git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.php$' | xargs -n1 -P8 php -l | grep -v 'No syntax errors'; test $? -eq 1

LICENSE

@@ -1 +0,0 @@
-Apache License 2.0 or GPL 2

LICENSE.md

@@ -0,0 +1,8 @@
+Licenses
+========
+
+You may use AdminerNeo under the terms of either the Apache License Version 2.0 
+or the GNU General Public License (GPL) version 2.
+
+- [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+- [GPL version 2](http://www.gnu.org/licenses/gpl-2.0.html)

README.md

@@ -0,0 +1,171 @@
+AdminerNeo
+==========
+
+**AdminerNeo** is a full-featured database management tool written in PHP. It consists of a single file ready to deploy 
+to the target server. As a companion, **AdminerNeo Editor** offers data manipulation for end-users. 
+
+Supported database drivers:
+- MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, MongoDB
+- With plugin: SimpleDB, Elasticsearch (beta), Firebird (alpha), ClickHouse (alpha)
+
+AdminerNeo is based on the [Adminer](https://www.adminer.org/) project by Jakub Vrána.
+
+<img src="docs/images/screenshot.webp" width="830px" alt="Screenshot"/>
+
+Requirements
+------------
+
+- PHP 5.6+ with enabled sessions.
+
+Migration from Adminer
+----------------------
+
+- Remove plugin AdminerTablesFilter (plugins/tables-filter.php).
+- If you use complex custom theme, you will probably need to adjust a thing or two.
+
+More information can be found in [Upgrade Guide](docs/upgrade.md).
+
+Please, read also 👉 **[What to expect](#what-to-expect)** section before you decide to switch to this project.
+
+Usage
+-----
+
+Download one for the latest [release files](https://github.com/adminerneo/adminerneo/releases), upload to the HTTP server 
+with PHP and enjoy 😉 If you are not satisfied with any combination of the database driver and language, you can 
+download the source code and compile your own AdminerNeo:
+
+- Download the source code.
+- Run `composer install` to install dependencies.
+- Run compile.php:
+
+```shell
+# AdminerNeo
+php compile.php <drivers> <languages>
+
+# AdminerNeo Editor
+php compile.php editor <drivers> <languages>
+```
+
+For example:
+```shell
+php compile.php pgsql cs
+php compile.php mysql,pgsql en,de,cs,sk
+```
+
+[Available drivers](https://github.com/adminerneo/adminerneo/tree/main/adminer/drivers), 
+[languages](https://github.com/adminerneo/adminerneo/tree/main/adminer/lang).
+
+Security
+--------
+
+AdminerNeo does not allow connecting to databases without a password and it rate-limits the connection attempts to protect 
+against brute-force attacks. Still, it is highly recommended to 🔒 **restrict access to AdminerNeo** 🔒 by whitelisting IP 
+addresses allowed to connect to it, by password-protecting the access in your web server or by enabling security plugins 
+(e.g. to require an OTP).
+
+Plugins
+-------
+
+* Download plugins you want and place them into the `plugins` folder.
+* Create `index.php` file specifying which plugins do you want to use.
+
+File structure will be:
+
+```
+- plugins
+    - drivers
+        - elastic.php
+    - dump-xml.php
+    - tinymce.php
+    - file-upload.php
+    - ...
+- adminer.php
+- index.php
+```
+
+Index.php:
+```php
+<?php
+function adminer_object() {
+    // Required to run any plugin.
+    include_once "./plugins/plugin.php";
+    
+    // Autoloader.
+    foreach (glob("plugins/*.php") as $filename) {
+        include_once "./$filename";
+    }
+    
+    // Enable extra drivers just by including them.
+    include_once "./plugins/drivers/elastic.php";
+    
+    // Specify enabled plugins.
+    $plugins = [
+        new AdminerDumpXml(),
+        new AdminerTinymce(),
+        new AdminerFileUpload("data/"),
+        // ...
+    ];
+    
+    // It is possible to combine customization and plugins.
+    // class AdminerCustomization extends AdminerPlugin {
+    // }
+    // return new AdminerCustomization($plugins);
+    
+    return new AdminerPlugin($plugins);
+}
+
+// Include original Adminer or Adminer Editor.
+include "./adminer.php";
+```
+
+[Available plugins](https://github.com/adminerneo/adminerneo/tree/main/plugins).
+
+Main project files
+------------------
+
+- adminer/index.php - Run development version of AdminerNeo.
+- editor/index.php - Run development version of AdminerNeo Editor.
+- editor/example.php - Example customization.
+- plugins/readme.txt - Plugins for AdminerNeo and AdminerNeo Editor.
+- adminer/plugin.php - Plugin demo.
+- adminer/sqlite.php - Development version of AdminerNeo with SQLite allowed.
+- editor/sqlite.php - Development version of Editor with SQLite allowed.
+- adminer/designs.php - Development version of AdminerNeo with adminer.css switcher.
+- compile.php - Create a single file version.
+- lang.php - Update translations.
+- tests/katalon.html - Katalon Automation Recorder test suite.
+
+Project history
+---------------
+
+Adminer was originally developed by Jakub Vrána, and it can be still found on [official pages](https://www.adminer.org/).
+Unfortunately, it is not maintained for several years. In the meantime, I (@peterpp) created for my company a set of
+custom plugins, modern theme, fixed some bugs and practically rewrote the Elasticsearch driver. I also looked closely 
+and contributed to the [AdminerEvo](https://www.adminerevo.org/) project that looked promising. However, I finally 
+decided to continue working on this fork and fulfill my own vision.
+
+What to expect
+--------------
+
+Our top priority is fixing the security issues and reported bugs. But we really want to move forward and transform
+AdminerNeo to a tool that will keep its simplicity, yet looks much better, is even easier to use and can be configured
+without requirement of additional plugins.
+
+### Version 4.x
+
+Original design and backward compatibility is kept. Many issues were fixed, and we introduced several functional and 
+UI improvements.
+
+### Version 5
+
+Bridges will be burned 🔥🔥🔥. It's in development already, so you [can check](https://github.com/adminerneo/adminerneo/tree/version-5) 
+what's going on. Or you can become the early adopter and help us with testing 😉
+
+Our goals are:
+
+- **Requirements** - Bump minimal PHP to 7.1, maybe even higher. 
+- **Themes** – Modernize the current old-school theme, add new default theme based on our [Adminer theme](https://github.com/pematon/adminer-theme), 
+support dark mode, configurable color variants for production/devel environment. All current designs will be removed. 
+- **Plugins** - Integrate several basic plugins, enable them by optional configuration.
+- **Codebase** - Prefer code readability before minimalism, use PER coding style, add namespaces.
+- **Compilation** - Allow to export selected drivers, themes, languages and plugins into a single adminer.php file.

SECURITY.md

@@ -1,11 +1,13 @@
-# Security Policy
+Reporting security issues
+=========================
 
-## Supported Versions
+To report a security issue, please [open a draft security advisory](https://github.com/adminerneo/adminerneo/security/advisories).
 
-I support only the last published version and the last development version (last commit).
+Security issues are handled with top priority. Once acknowledged, a fix should be available and new version released
+as soon as possible. Security advisories will be made public after a fix and new version have been released,
+or the advisory has been declined.
 
-## Reporting a Vulnerability
+Supported versions
+------------------
 
-To report a vulnerability, add a new draft security advisory at https://github.com/vrana/adminer/security/advisories/new.
-
-I handle security issues with top priority. If you don't hear from me in a week then please ping the bug. Once I accept the bug, the fix should be available and new version released within days. I will mark the bug as public after releasing a new version or declining the bug.
+Only the last published version and the last development version (last commit) are supported.

adminer/call.inc.php

@@ -1,5 +1,4 @@
 <?php
-namespace Adminer;
 
 $PROCEDURE = ($_GET["name"] ?: $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
@@ -40,7 +39,7 @@ if (!$error && $_POST) {
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		$connection2 = connect($adminer->credentials());
+		$connection2 = connect();
 		if (is_object($connection2)) {
 			$connection2->select_db(DB);
 		}
@@ -61,20 +60,22 @@ if (!$error && $_POST) {
 		}
 	}
 }
-?>
 
-<form action="" method="post">
-<?php
+echo "<form action='' method='post'>\n";
+
 if ($in) {
-	echo "<table class='layout'>\n";
+	echo "<table cellspacing='0' class='layout'>\n";
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$value = $_POST["fields"][$name];
 		if ($value != "") {
+			if ($field["type"] == "enum") {
+				$value = +$value;
+			}
 			if ($field["type"] == "set") {
-				$value = implode(",", $value);
+				$value = array_sum($value);
 			}
 		}
 		input($field, $value, (string) $_POST["function"][$name]); // param name can be empty
@@ -82,30 +83,28 @@ if ($in) {
 	}
 	echo "</table>\n";
 }
-?>
-<p>
-<input type="submit" value="<?php echo lang('Call'); ?>">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</form>
 
-<pre>
-<?php
-function pre_tr($s) {
-	return preg_replace('~^~m', '<tr>', preg_replace('~\|~', '<td>', preg_replace('~\|$~m', "", rtrim($s))));
+echo "<p>",
+	"<input type='submit' value='", lang('Call'), "'>",
+	"<input type='hidden' name='token' value='$token'>",
+	"</p>\n",
+	"</form>\n";
+
+$comment = $routine["comment"];
+if ($comment !== null && $comment !== "") {
+	$comment = h(trim($routine["comment"], "\n"));
+
+	// Remove indenting of all lines (used in MySQL routines in 'sys' database).
+	if (preg_match('~^ +~', $comment, $matches)) {
+		preg_match_all("~^($matches[0]|$)~m", $comment, $linesWithIndent);
+
+		if (count($linesWithIndent[0]) == substr_count($comment, "\n")) {
+			$comment = preg_replace("~^($matches[0])~m", "", $comment);
+		}
+	}
+
+	// Format common headlines (used in MySQL routines in 'sys' database).
+	$comment = preg_replace('~(^|[^\n]\n)(Description|Parameters|Example)\n~', "$1\n<strong>$2</strong>\n", $comment);
+
+	echo "<pre class='comment'>$comment</pre>\n";
 }
-$table = '(\+--[-+]+\+\n)';
-$row = '(\| .* \|\n)';
-echo preg_replace_callback(
-	"~^$table?$row$table?($row*)$table?~m",
-	function ($match) {
-		$first_row = pre_tr($match[2]);
-		return "<table>\n" . ($match[1] ? "<thead>$first_row</thead>\n" : $first_row) . pre_tr($match[4]) . "\n</table>";
-	},
-	preg_replace(
-		'~(\n(    -|mysql)&gt; )(.+)~',
-		"\\1<code class='jush-sql'>\\3</code>",
-		preg_replace('~(.+)\n---+\n~', "<b>\\1</b>\n", h($routine['comment']))
-	)
-);
-?>
-</pre>

adminer/check.inc.php

@@ -1,51 +0,0 @@
-<?php
-namespace Adminer;
-
-$TABLE = $_GET["check"];
-$name = $_GET["name"];
-$row = $_POST;
-
-if ($row && !$error) {
-	if (JUSH == "sqlite") {
-		$result = recreate_table($TABLE, $TABLE, array(), array(), array(), 0, array(), $name, ($row["drop"] ? "" : $row["clause"]));
-	} else {
-		$result = ($name == "" || queries("ALTER TABLE " . table($TABLE) . " DROP CONSTRAINT " . idf_escape($name)));
-		if (!$row["drop"]) {
-			$result = queries("ALTER TABLE " . table($TABLE) . " ADD" . ($row["name"] != "" ? " CONSTRAINT " . idf_escape($row["name"]) : "") . " CHECK ($row[clause])"); //! SQL injection
-		}
-	}
-	queries_redirect(
-		ME . "table=" . urlencode($TABLE),
-		($row["drop"] ? lang('Check has been dropped.') : ($name != "" ? lang('Check has been altered.') : lang('Check has been created.'))),
-		$result
-	);
-}
-
-page_header(($name != "" ? lang('Alter check') . ": " . h($name) : lang('Create check')), $error, array("table" => $TABLE));
-
-if (!$row) {
-	$checks = $driver->checkConstraints($TABLE);
-	$row = array("name" => $name, "clause" => $checks[$name]);
-}
-?>
-
-<form action="" method="post">
-<p><?php
-if (JUSH != "sqlite") {
-	echo lang('Name') . ': <input name="name" value="' . h($row["name"]) . '" data-maxlength="64" autocapitalize="off"> ';
-}
-echo doc_link(array(
-	'sql' => "create-table-check-constraints.html",
-	'mariadb' => "constraint/",
-	'pgsql' => "ddl-constraints.html#DDL-CONSTRAINTS-CHECK-CONSTRAINTS",
-	'mssql' => "relational-databases/tables/create-check-constraints",
-	'sqlite' => "lang_createtable.html#check_constraints",
-), "?");
-?>
-<p><?php textarea("clause", $row["clause"]); ?>
-<p><input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($name != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
-<?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</form>

adminer/create.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["create"];
 $partition_by = array();
 foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
@@ -48,19 +46,22 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 			$foreign_key = $foreign_keys[$field["type"]];
 			$type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
 			if ($field["field"] != "") {
-				if (!$field["generated"]) {
+				if (!$field["has_default"]) {
 					$field["default"] = null;
 				}
+				if ($key == $row["auto_increment_col"]) {
+					$field["auto_increment"] = true;
+				}
 				$process_field = process_field($field, $type_field);
 				$all_fields[] = array($field["orig"], $process_field, $after);
-				if (!$orig_field || $process_field !== process_field($orig_field, $orig_field)) {
+				if (!$orig_field || $process_field != process_field($orig_field, $orig_field)) {
 					$fields[] = array($field["orig"], $process_field, $after);
 					if ($field["orig"] != "" || $after) {
 						$use_all_fields = true;
 					}
 				}
 				if ($foreign_key !== null) {
-					$foreign[idf_escape($field["field"])] = ($TABLE != "" && JUSH != "sqlite" ? "ADD" : " ") . format_foreign_key(array(
+					$foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . format_foreign_key(array(
 						'table' => $foreign_keys[$field["type"]],
 						'source' => array($field["field"]),
 						'target' => array($type_field["field"]),
@@ -88,14 +89,14 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 				}, ARRAY_FILTER_USE_KEY);
 
 				foreach ($params["partition_names"] as $key => $name) {
-					if ($name == "") {
+					if ($name === "") {
 						unset($params["partition_names"][$key]);
 						unset($params["partition_values"][$key]);
 					}
 				}
 
 				if ($params != get_partitions_info($TABLE)) {
-					$partitions = array();
+					$partitions = [];
 					if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
 						foreach ($params["partition_names"] as $key => $name) {
 							$value = $params["partition_values"][$key];
@@ -104,11 +105,11 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 					}
 
 					// $params["partition"] can be expression, not only column
-					$partitioning .= "\nPARTITION BY $params[partition_by]($params[partition])";
+					$partitioning .= "\nPARTITION BY {$params["partition_by"]}({$params["partition"]})";
 					if ($partitions) {
 						$partitioning .= " (" . implode(",", $partitions) . "\n)";
 					} elseif ($params["partitions"]) {
-						$partitioning .= " PARTITIONS " . (+$params["partitions"]);
+						$partitioning .= " PARTITIONS " . (int)$params["partitions"];
 					}
 				}
 			} elseif (preg_match("~partitioned~", $table_status["Create_options"])) {
@@ -126,7 +127,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		queries_redirect(ME . (support("table") ? "table=" : "select=") . urlencode($name), $message, alter_table(
 			$TABLE,
 			$name,
-			(JUSH == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
+			($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
 			$foreign,
 			($row["Comment"] != $table_status["Comment"] ? $row["Comment"] : null),
 			($row["Engine"] && $row["Engine"] != $table_status["Engine"] ? $row["Engine"] : ""),
@@ -140,7 +141,6 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error, array("table" => $TABLE), h($TABLE));
 
 if (!$_POST) {
-	$types = $driver->types();
 	$row = array(
 		"Engine" => $_COOKIE["adminer_engine"],
 		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")), "on_update" => "")),
@@ -155,7 +155,7 @@ if (!$_POST) {
 			$row["Auto_increment"] = "";
 		}
 		foreach ($orig_fields as $field) {
-			$field["generated"] = $field["generated"] ?: (isset($field["default"]) ? "DEFAULT" : "");
+			$field["has_default"] = isset($field["default"]);
 			$row["fields"][] = $field;
 		}
 
@@ -181,66 +181,59 @@ foreach ($engines as $engine) {
 <form action="" method="post" id="form">
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
-<?php echo lang('Table name'); ?>: <input name="name"<?php echo ($TABLE == "" && !$_POST ? " autofocus" : ""); ?> data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
- <?php
-	if ($collations) {
-		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>";
-		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>");
-	}
-	?>
+<?php echo lang('Table name'); ?>: <input name="name" data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php if ($TABLE == "" && !$_POST) { echo script("focus(gid('form')['name']);"); } ?>
+<?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . help_script_command("value", true) : ""); ?>
+ <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
 <?php if (support("columns")) { ?>
 <div class="scrollable">
-<table id="edit-fields" class="nowrap">
+<table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
-	edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
-	?>
+edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
+?>
 </table>
 <?php echo script("editFields();"); ?>
 </div>
 <p>
-<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" class="size" value="<?php echo h($row["Auto_increment"]); ?>">
-<?php echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : adminer_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
+<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
 <?php
-	$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
-	echo (support("comment")
-		? checkbox("comments", 1, $comments, lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
-			. ' ' . (preg_match('~\n~', $row["Comment"])
-				? "<textarea name='Comment' rows='2' cols='20'" . ($comments ? "" : " class='hidden'") . ">" . h($row["Comment"]) . "</textarea>"
-				: '<input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '"' . ($comments ? "" : " class='hidden'") . '>'
-			)
-		: '')
-	;
-	?>
+$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
+echo (support("comment")
+	? checkbox("comments", 1, $comments, lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
+		. ' ' . (preg_match('~\n~', $row["Comment"])
+			? "<textarea name='Comment' rows='2' cols='20'" . ($comments ? "" : " class='hidden'") . ">" . h($row["Comment"]) . "</textarea>"
+			: '<input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '"' . ($comments ? "" : " class='hidden'") . '>'
+		)
+	: '')
+;
+?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
-<?php if ($TABLE != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?>
-<?php } ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = preg_match('~RANGE|LIST~', $row["partition_by"]);
 	print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
 	?>
 <p>
-<?php echo html_select("partition_by", array("" => "") + $partition_by, $row["partition_by"]) . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
+<?php echo "<select name='partition_by'>" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>" . help_script_command("value.replace(/./, 'PARTITION BY \$&')", true) . script("qsl('select').onchange = partitionByChange;"); ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
-<table id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
+<table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
 <thead><tr><th><?php echo lang('Partition name'); ?><th><?php echo lang('Values'); ?></thead>
 <?php
-	foreach ($row["partition_names"] as $key => $val) {
-		echo '<tr>';
-		echo '<td><input name="partition_names[]" value="' . h($val) . '" autocapitalize="off">';
-		echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
-		echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
-	}
-	?>
+foreach ($row["partition_names"] as $key => $val) {
+	echo '<tr>';
+	echo '<td><input name="partition_names[]" value="' . h($val) . '" autocapitalize="off">';
+	echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
+	echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
+}
+?>
 </table>
 </div></fieldset>
 <?php

adminer/database.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $row = $_POST;
 
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
@@ -46,7 +44,7 @@ if ($_POST) {
 	$name = $row["name"];
 } elseif (DB != "") {
 	$row["collation"] = db_collation(DB, $collations);
-} elseif (JUSH == "sql") {
+} elseif ($jush == "sql") {
 	// propose database name with limited privileges
 	foreach (get_vals("SHOW GRANTS") as $grant) {
 		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\.\*)?~', $grant, $match) && $match[1]) {
@@ -61,13 +59,14 @@ if ($_POST) {
 <p>
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
-	? '<textarea autofocus name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input name="name" autofocus value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
+	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
+	: '<input name="name" id="name" value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
 	'sql' => "charset-charsets.html",
 	'mariadb' => "supported-character-sets-and-collations/",
-	'mssql' => "relational-databases/system-functions/sys-fn-helpcollations-transact-sql",
+	'mssql' => "ms187963.aspx",
 )) : "");
+echo script("focus(gid('name'));");
 ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php

adminer/db.inc.php

@@ -1,12 +1,10 @@
 <?php
-namespace Adminer;
-
 $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);
 
 if ($tables_views && !$error && !$_POST["search"]) {
 	$result = true;
 	$message = "";
-	if (JUSH == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
+	if ($jush == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
 		queries("SET foreign_key_checks = 0"); // allows to truncate or drop several tables at once
 	}
 
@@ -29,21 +27,15 @@ if ($tables_views && !$error && !$_POST["search"]) {
 			$result = drop_tables($_POST["tables"]);
 		}
 		$message = lang('Tables have been dropped.');
-	} elseif (JUSH == "sqlite" && $_POST["check"]) {
-		foreach ((array) $_POST["tables"] as $table) {
-			foreach (get_rows("PRAGMA integrity_check(" . q($table) . ")") as $row) {
-				$message .= "<b>" . h($table) . "</b>: " . h($row["integrity_check"]) . "<br>";
-			}
-		}
-	} elseif (JUSH != "sql") {
-		$result = (JUSH == "sqlite"
+	} elseif ($jush != "sql") {
+		$result = ($jush == "sqlite"
 			? queries("VACUUM")
 			: apply_queries("VACUUM" . ($_POST["optimize"] ? "" : " ANALYZE"), $_POST["tables"])
 		);
 		$message = lang('Tables have been optimized.');
 	} elseif (!$_POST["tables"]) {
 		$message = lang('No tables.');
-	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('Adminer\idf_escape', $_POST["tables"])))) {
+	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('idf_escape', $_POST["tables"])))) {
 		while ($row = $result->fetch_assoc()) {
 			$message .= "<b>" . h($row["Table"]) . "</b>: " . h($row["Msg_text"]) . "<br>";
 		}
@@ -55,7 +47,28 @@ if ($tables_views && !$error && !$_POST["search"]) {
 page_header(($_GET["ns"] == "" ? lang('Database') . ": " . h(DB) : lang('Schema') . ": " . h($_GET["ns"])), $error, true);
 
 if ($adminer->homepage()) {
-	if ($_GET["ns"] !== "") {
+	if ($_GET["ns"] === "") {
+		echo "<h3 id='schemas'>" . lang('Schemas') . "</h3>\n";
+		$schemas = schemas();
+		if (!$schemas) {
+			echo "<p class='message'>" . lang('No schemas.') . "\n";
+		} else {
+			// TODO: Checkboxes for batch dropping of schemas.
+			echo "<div class='scrollable'>\n",
+				"<table class='nowrap'>\n",
+				'<thead><tr class="wrap">',
+				'<th>', lang('Schema'), "</th>",
+				'</tr></thead>';
+
+			foreach ($schemas as $name) {
+				echo "<tr", odd(), ">",
+					"<th><a href='", h(ME), "ns=" . urlencode($name), "' title='", lang('Show schema'), "'>" . h($name) . "</a></th>",
+					"</tr>";
+			}
+
+			echo '</table></div>';
+		}
+	} else {
 		echo "<h3 id='tables-views'>" . lang('Tables and views') . "</h3>\n";
 		$tables_list = tables_list();
 		if (!$tables_list) {
@@ -67,17 +80,21 @@ if ($adminer->homepage()) {
 				echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'>";
 				echo script("qsl('input').onkeydown = partialArg(bodyKeydown, 'search');", "");
 				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
+				if ($adminer->operator_regexp !== null) {
+					echo "<p><label><input type='checkbox' name='regexp' value='1'" . (empty($_POST['regexp']) ? '' : ' checked') . '>' . lang('as a regular expression') . '</label>';
+					echo doc_link(['sql' => 'regexp.html', 'pgsql' => 'functions-matching.html#FUNCTIONS-POSIX-REGEXP', 'elastic' => "regexp-syntax.html"]) . "</p>\n";
+				}
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
-					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
+					$_GET["where"][0]["op"] = $adminer->operator_regexp !== null && !empty($_POST['regexp']) ? $adminer->operator_regexp : $adminer->operator_like;
 					search_tables();
 				}
 			}
 			echo "<div class='scrollable'>\n";
-			echo "<table class='nowrap checkable odds'>\n";
+			echo "<table cellspacing='0' class='nowrap checkable'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo '<thead><tr class="wrap">';
-			echo '<td><input id="check-all" type="checkbox" class="jsonly">' . script("qs('#check-all').onclick = partial(formCheck, /^(tables|views)\[/);", "");
+			echo '<td><input id="check-all" type="checkbox" class="jsonly">' . script("gid('check-all').onclick = partial(formCheck, /^(tables|views)\[/);", "");
 			echo '<th>' . lang('Table');
 			echo '<td>' . lang('Engine') . doc_link(array('sql' => 'storage-engines.html'));
 			echo '<td>' . lang('Collation') . doc_link(array('sql' => 'charset-charsets.html', 'mariadb' => 'supported-character-sets-and-collations/'));
@@ -93,23 +110,21 @@ if ($adminer->homepage()) {
 			foreach ($tables_list as $name => $type) {
 				$view = ($type !== null && !preg_match('~table|sequence~i', $type));
 				$id = h("Table-" . $name);
-				echo '<tr><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $id);
+				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $id);
 				echo '<th>' . (support("table") || support("indexes") ? "<a href='" . h(ME) . "table=" . urlencode($name) . "' title='" . lang('Show structure') . "' id='$id'>" . h($name) . '</a>' : h($name));
 				if ($view) {
 					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View')) . '</a>';
 					echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
 				} else {
-					foreach (
-						array(
-							"Engine" => array(),
-							"Collation" => array(),
-							"Data_length" => array("create", lang('Alter table')),
-							"Index_length" => array("indexes", lang('Alter indexes')),
-							"Data_free" => array("edit", lang('New item')),
-							"Auto_increment" => array("auto_increment=1&create", lang('Alter table')),
-							"Rows" => array("select", lang('Select data')),
-						) as $key => $link
-					) {
+					foreach (array(
+						"Engine" => array(),
+						"Collation" => array(),
+						"Data_length" => array("create", lang('Alter table')),
+						"Index_length" => array("indexes", lang('Alter indexes')),
+						"Data_free" => array("edit", lang('New item')),
+						"Auto_increment" => array("auto_increment=1&create", lang('Alter table')),
+						"Rows" => array("select", lang('Select data')),
+					) as $key => $link) {
 						$id = " id='$key-" . h($name) . "'";
 						echo ($link ? "<td align='right'>" . (support("table") || $key == "Rows" || (support("indexes") && $key != "Data_length")
 							? "<a href='" . h(ME . "$link[0]=") . urlencode($name) . "'$id title='$link[1]'>?</a>"
@@ -119,35 +134,32 @@ if ($adminer->homepage()) {
 					$tables++;
 				}
 				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>" : "");
-				echo "\n";
 			}
 
 			echo "<tr><td><th>" . lang('%d in total', count($tables_list));
-			echo "<td>" . h(JUSH == "sql" ? get_val("SELECT @@default_storage_engine") : "");
+			echo "<td>" . h($jush == "sql" ? $connection->result("SELECT @@default_storage_engine") : "");
 			echo "<td>" . h(db_collation(DB, collations()));
 			foreach (array("Data_length", "Index_length", "Data_free") as $key) {
 				echo "<td align='right' id='sum-$key'>";
 			}
-			echo "\n";
 
 			echo "</table>\n";
 			echo "</div>\n";
 			if (!information_schema(DB)) {
 				echo "<div class='footer'><div>\n";
-				$vacuum = "<input type='submit' value='" . lang('Vacuum') . "'> " . on_help("'VACUUM'");
-				$optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . on_help(JUSH == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'");
+				$vacuum = "<input type='submit' value='" . lang('Vacuum') . "'> " . help_script("VACUUM");
+				$optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . help_script($jush == "sql" ? "OPTIMIZE TABLE" : "VACUUM OPTIMIZE");
 				echo "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>"
-				. (JUSH == "sqlite" ? $vacuum . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'PRAGMA integrity_check'")
-				: (JUSH == "pgsql" ? $vacuum . $optimize
-				: (JUSH == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'")
-					. $optimize
-					. "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'CHECK TABLE'")
-					. "<input type='submit' name='repair' value='" . lang('Repair') . "'> " . on_help("'REPAIR TABLE'")
+				. ($jush == "sqlite" ? $vacuum
+				: ($jush == "pgsql" ? $vacuum . $optimize
+				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . help_script("ANALYZE TABLE") . $optimize
+					. "<input type='submit' name='check' value='" . lang('Check') . "'> " . help_script("CHECK TABLE")
+					. "<input type='submit' name='repair' value='" . lang('Repair') . "'> " . help_script("REPAIR TABLE")
 				: "")))
-				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help(JUSH == "sqlite" ? "'DELETE'" : "'TRUNCATE" . (JUSH == "pgsql" ? "'" : " TABLE'")) . confirm()
-				. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . on_help("'DROP TABLE'") . confirm() . "\n";
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . help_script($jush == "sqlite" ? "DELETE" : ("TRUNCATE" . ($jush == "pgsql" ? "" : " TABLE"))) . confirm()
+				. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . help_script("DROP TABLE") . confirm() . "\n";
 				$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
-				if (count($databases) != 1 && JUSH != "sqlite") {
+				if (count($databases) != 1 && $jush != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
 					echo "<p>" . lang('Move to other database') . ": ";
 					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
@@ -170,35 +182,59 @@ if ($adminer->homepage()) {
 
 		if (support("routine")) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
+
 			$routines = routines();
 			if ($routines) {
-				echo "<table class='odds'>\n";
-				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td></thead>\n";
+				$commentsSupported = $routines[0]["ROUTINE_COMMENT"] !== null;
+
+				echo "<table>\n";
+				echo '<thead><tr>',
+					'<th>', lang('Name'), '</th><td>', lang('Type'), '</td><td>', lang('Return type'), "</td>";
+					if ($commentsSupported) {
+						echo "<td>", lang('Comment'), "</td>";
+					}
+				echo "<td></td>",
+					"</tr></thead>\n";
+
+				odd('');
 				foreach ($routines as $row) {
-					$name = ($row["SPECIFIC_NAME"] == $row["ROUTINE_NAME"] ? "" : "&name=" . urlencode($row["ROUTINE_NAME"])); // not computed on the pages to be able to print the header first
-					echo '<tr>';
-					echo '<th><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
-					echo '<td>' . h($row["ROUTINE_TYPE"]);
-					echo '<td>' . h($row["DTD_IDENTIFIER"]);
-					echo '<td><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . lang('Alter') . "</a>";
+					// not computed on the pages to be able to print the header first
+					$name = ($row["SPECIFIC_NAME"] == $row["ROUTINE_NAME"] ? "" : "&name=" . urlencode($row["ROUTINE_NAME"]));
+
+					echo '<tr', odd(), '>',
+						'<th><a href="', h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["SPECIFIC_NAME"]) . $name), '">', h($row["ROUTINE_NAME"]), '</a></th>',
+						'<td>', h($row["ROUTINE_TYPE"]), '</td>',
+						'<td>', h($row["DTD_IDENTIFIER"]), '</td>';
+
+					if ($commentsSupported) {
+						echo '<td>', shorten_utf8(preg_replace('~\s{2,}~', " ", trim($row["ROUTINE_COMMENT"])), 50), '</td>';
+					}
+
+					echo '<td><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . lang('Alter') . "</a></td>";
 				}
+
 				echo "</table>\n";
 			}
-			echo '<p class="links">'
-				. (support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a>' : '')
-				. '<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n"
-			;
+
+			echo '<p class="links">',
+				(support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a>' : ''),
+				'<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n";
 		}
 
 		if (support("sequence")) {
 			echo "<h3 id='sequences'>" . lang('Sequences') . "</h3>\n";
 			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema() ORDER BY sequence_name");
 			if ($sequences) {
-				echo "<table class='odds'>\n";
-				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
+				echo "<table>\n",
+					"<thead><tr><th>", lang('Name'), "</th><td></td></tr></thead>\n";
+
+				odd('');
 				foreach ($sequences as $val) {
-					echo "<tr><th><a href='" . h(ME) . "sequence=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr", odd(), ">",
+						"<th>", h($val), "</th>",
+						"<td><a href='", h(ME), "sequence=", urlencode($val), "'>", lang('Alter'), "</a></td>\n";
 				}
+
 				echo "</table>\n";
 			}
 			echo "<p class='links'><a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>\n";
@@ -208,11 +244,16 @@ if ($adminer->homepage()) {
 			echo "<h3 id='user-types'>" . lang('User types') . "</h3>\n";
 			$user_types = types();
 			if ($user_types) {
-				echo "<table class='odds'>\n";
-				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
+				echo "<table>\n",
+					"<thead><tr><th>", lang('Name'), "</th><td></td></tr></thead>\n";
+
+				odd('');
 				foreach ($user_types as $val) {
-					echo "<tr><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
+					echo "<tr", odd(), ">",
+						"<th>", h($val), "</th>",
+						"<td><a href='", h(ME), "type=", urlencode($val), "'>", lang('Alter'), "</a></td>\n";
 				}
+
 				echo "</table>\n";
 			}
 			echo "<p class='links'><a href='" . h(ME) . "type='>" . lang('Create type') . "</a>\n";
@@ -232,7 +273,7 @@ if ($adminer->homepage()) {
 					echo '<td><a href="' . h(ME) . 'event=' . urlencode($row["Name"]) . '">' . lang('Alter') . '</a>';
 				}
 				echo "</table>\n";
-				$event_scheduler = get_val("SELECT @@event_scheduler");
+				$event_scheduler = $connection->result("SELECT @@event_scheduler");
 				if ($event_scheduler && $event_scheduler != "ON") {
 					echo "<p class='error'><code class='jush-sqlset'>event_scheduler</code>: " . h($event_scheduler) . "\n";
 				}

adminer/download.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["download"];
 $fields = fields($TABLE);
 header("Content-Type: application/octet-stream");

adminer/drivers/mongo.inc.php

@@ -1,30 +1,226 @@
 <?php
-namespace Adminer;
-
 $drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
-	define('Adminer\DRIVER', "mongo");
+	define("DRIVER", "mongo");
 
-	if (class_exists('MongoDB\Driver\Manager')) {
-		class Db {
-			public $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
-			/** @var MongoDB\Driver\Manager */
-			public $_link;
-			public $_db, $_db_name;
+	if (class_exists('MongoDB')) {
+		class Min_DB {
+			var $extension = "Mongo", $server_info = MongoClient::VERSION, $error, $last_id, $_link, $_db;
 
 			function connect($uri, $options) {
-				$this->_link = new \MongoDB\Driver\Manager($uri, $options);
-				$this->executeDbCommand($options["db"], array('ping' => 1));
-			}
-
-			function executeCommand($command) {
-				return $this->executeDbCommand($this->_db_name);
-			}
-
-			function executeDbCommand($db, $command) {
 				try {
-					return $this->_link->executeCommand($db, new \MongoDB\Driver\Command($command));
+					$this->_link = new MongoClient($uri, $options);
+					if ($options["password"] != "") {
+						$options["password"] = "";
+						try {
+							new MongoClient($uri, $options);
+							$this->error = lang('Database does not support password.');
+						} catch (Exception $e) {
+							// this is what we want
+						}
+					}
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
+				}
+			}
+
+			function query($query) {
+				return false;
+			}
+
+			function select_db($database) {
+				try {
+					$this->_db = $this->_link->selectDB($database);
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+
+			function quote($string) {
+				return $string;
+			}
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
+
+			function __construct($result) {
+				foreach ($result as $item) {
+					$row = array();
+					foreach ($item as $key => $val) {
+						if (is_a($val, 'MongoBinData')) {
+							$this->_charset[$key] = 63;
+						}
+						$row[$key] =
+							(is_a($val, 'MongoId') ? "ObjectId(\"$val\")" :
+							(is_a($val, 'MongoDate') ? gmdate("Y-m-d H:i:s", $val->sec) . " GMT" :
+							(is_a($val, 'MongoBinData') ? $val->bin : //! allow downloading
+							(is_a($val, 'MongoRegex') ? "$val" :
+							(is_object($val) ? get_class($val) : // MongoMinKey, MongoMaxKey
+							$val
+						)))));
+					}
+					$this->_rows[] = $row;
+					foreach ($row as $key => $val) {
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
+						}
+					}
+				}
+				$this->num_rows = count($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$row = current($this->_rows);
+				if (!$row) {
+					return $row;
+				}
+				$return = array();
+				foreach ($this->_rows[0] as $key => $val) {
+					$return[$key] = $row[$key];
+				}
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				$return = $this->fetch_assoc();
+				if (!$return) {
+					return $return;
+				}
+				return array_values($return);
+			}
+
+			function fetch_field() {
+				$keys = array_keys($this->_rows[0]);
+				$name = $keys[$this->_offset++];
+				return (object) array(
+					'name' => $name,
+					'charsetnr' => $this->_charset[$name],
+				);
+			}
+
+		}
+
+
+
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
+
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, true)
+				);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				return new Min_Result($this->_conn->_db->selectCollection($table)
+					->find(array(), $select)
+					->sort($sort)
+					->limit($limit != "" ? +$limit : 0)
+					->skip($page * $limit)
+				);
+			}
+
+			function insert($table, $set) {
+				try {
+					$return = $this->_conn->_db->selectCollection($table)->insert($set);
+					$this->_conn->errno = $return['code'];
+					$this->_conn->error = $return['err'];
+					$this->_conn->last_id = $set['_id'];
+					return !$return['err'];
+				} catch (Exception $ex) {
+					$this->_conn->error = $ex->getMessage();
+					return false;
+				}
+			}
+		}
+
+		function get_databases($flush) {
+			global $connection;
+			$return = array();
+			$dbs = $connection->_link->listDBs();
+			foreach ($dbs['databases'] as $db) {
+				$return[] = $db['name'];
+			}
+			return $return;
+		}
+
+		function count_tables($databases) {
+			global $connection;
+			$return = array();
+			foreach ($databases as $db) {
+				$return[$db] = count($connection->_link->selectDB($db)->getCollectionNames(true));
+			}
+			return $return;
+		}
+
+		function tables_list() {
+			global $connection;
+			return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+		}
+
+		function drop_databases($databases) {
+			global $connection;
+			foreach ($databases as $db) {
+				$response = $connection->_link->selectDB($db)->drop();
+				if (!$response['ok']) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		function indexes($table, $connection2 = null) {
+			global $connection;
+			$return = array();
+			foreach ($connection->_db->selectCollection($table)->getIndexInfo() as $index) {
+				$descs = array();
+				foreach ($index["key"] as $column => $type) {
+					$descs[] = ($type == -1 ? '1' : null);
+				}
+				$return[$index["name"]] = array(
+					"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
+					"columns" => array_keys($index["key"]),
+					"lengths" => array(),
+					"descs" => $descs,
+				);
+			}
+			return $return;
+		}
+
+		function fields($table) {
+			return fields_from_edit();
+		}
+
+		function found_rows($table_status, $where) {
+			global $connection;
+			//! don't call count_rows()
+			return $connection->_db->selectCollection($_GET["select"])->count($where);
+		}
+
+	} elseif (class_exists('MongoDB\Driver\Manager')) {
+		class Min_DB {
+			var $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
+			/** @var MongoDB\Driver\Manager */
+			var $_link;
+			var $_db, $_db_name;
+
+			function connect($uri, $options) {
+
+				$this->_link = new MongoDB\Driver\Manager($uri, $options);
+				$this->executeCommand('admin', array('ping' => 1));
+			}
+
+			function executeCommand($db, $command) {
+				try {
+					return $this->_link->executeCommand($db, new MongoDB\Driver\Command($command));
 				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					return array();
@@ -56,16 +252,15 @@ if (isset($_GET["mongo"])) {
 			}
 		}
 
-		class Result {
-			public $num_rows;
-			private $rows = array(), $offset = 0, $charset = array();
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
 
 			function __construct($result) {
 				foreach ($result as $item) {
 					$row = array();
 					foreach ($item as $key => $val) {
 						if (is_a($val, 'MongoDB\BSON\Binary')) {
-							$this->charset[$key] = 63;
+							$this->_charset[$key] = 63;
 						}
 						$row[$key] =
 							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . "$val\")" :
@@ -76,26 +271,26 @@ if (isset($_GET["mongo"])) {
 							$val // MongoMinKey, MongoMaxKey
 						)))));
 					}
-					$this->rows[] = $row;
+					$this->_rows[] = $row;
 					foreach ($row as $key => $val) {
-						if (!isset($this->rows[0][$key])) {
-							$this->rows[0][$key] = null;
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
 						}
 					}
 				}
-				$this->num_rows = count($this->rows);
+				$this->num_rows = count($this->_rows);
 			}
 
 			function fetch_assoc() {
-				$row = current($this->rows);
+				$row = current($this->_rows);
 				if (!$row) {
 					return $row;
 				}
 				$return = array();
-				foreach ($this->rows[0] as $key => $val) {
+				foreach ($this->_rows[0] as $key => $val) {
 					$return[$key] = $row[$key];
 				}
-				next($this->rows);
+				next($this->_rows);
 				return $return;
 			}
 
@@ -108,21 +303,96 @@ if (isset($_GET["mongo"])) {
 			}
 
 			function fetch_field() {
-				$keys = array_keys($this->rows[0]);
-				$name = $keys[$this->offset++];
+				$keys = array_keys($this->_rows[0]);
+				$name = $keys[$this->_offset++];
 				return (object) array(
 					'name' => $name,
-					'charsetnr' => $this->charset[$name],
+					'charsetnr' => $this->_charset[$name],
 				);
 			}
+
 		}
 
 
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
+
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				global $connection;
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, 1)
+				);
+				if (count($select) && !isset($select['_id'])) {
+					$select['_id'] = 0;
+				}
+				$where = where_to_query($where);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
+					$limit = $_GET['limit'];
+				}
+				$limit = min(200, max(1, (int) $limit));
+				$skip = $page * $limit;
+				try {
+					return new Min_Result($connection->_link->executeQuery("$connection->_db_name.$table", new MongoDB\Driver\Query($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
+				} catch (Exception $e) {
+					$connection->error = $e->getMessage();
+					return false;
+				}
+			}
+
+			function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$bulk = new MongoDB\Driver\BulkWrite(array());
+				if (isset($set['_id'])) {
+					unset($set['_id']);
+				}
+				$removeFields = array();
+				foreach ($set as $key => $value) {
+					if ($value == 'NULL') {
+						$removeFields[$key] = 1;
+						unset($set[$key]);
+					}
+				}
+				$update = array('$set' => $set);
+				if (count($removeFields)) {
+					$update['$unset'] = $removeFields;
+				}
+				$bulk->update($where, $update, array('upsert' => false));
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
+			}
+
+			function delete($table, $queryWhere, $limit = 0) {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$bulk = new MongoDB\Driver\BulkWrite(array());
+				$bulk->delete($where, array('limit' => $limit));
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
+			}
+
+			function insert($table, $set) {
+				global $connection;
+				$db = $connection->_db_name;
+				$bulk = new MongoDB\Driver\BulkWrite(array());
+				if ($set['_id'] == '') {
+					unset($set['_id']);
+				}
+				$bulk->insert($set);
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
+			}
+		}
 
 		function get_databases($flush) {
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand(array('listDatabases' => 1)) as $dbs) {
+			foreach ($connection->executeCommand('admin', array('listDatabases' => 1)) as $dbs) {
 				foreach ($dbs->databases as $db) {
 					$return[] = $db->name;
 				}
@@ -138,7 +408,7 @@ if (isset($_GET["mongo"])) {
 		function tables_list() {
 			global $connection;
 			$collections = array();
-			foreach ($connection->executeCommand(array('listCollections' => 1)) as $result) {
+			foreach ($connection->executeCommand($connection->_db_name, array('listCollections' => 1)) as $result) {
 				$collections[$result->name] = 'table';
 			}
 			return $collections;
@@ -151,7 +421,7 @@ if (isset($_GET["mongo"])) {
 		function indexes($table, $connection2 = null) {
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand(array('listIndexes' => $table)) as $index) {
+			foreach ($connection->executeCommand($connection->_db_name, array('listIndexes' => $table)) as $index) {
 				$descs = array();
 				$columns = array();
 				foreach (get_object_vars($index->key) as $column => $type) {
@@ -200,7 +470,7 @@ if (isset($_GET["mongo"])) {
 		function found_rows($table_status, $where) {
 			global $connection;
 			$where = where_to_query($where);
-			$toArray = $connection->executeCommand(array('count' => $table_status['Name'], 'query' => $where))->toArray();
+			$toArray = $connection->executeCommand($connection->_db_name, array('count' => $table_status['Name'], 'query' => $where))->toArray();
 			return $toArray[0]->n;
 		}
 
@@ -242,8 +512,8 @@ if (isset($_GET["mongo"])) {
 							$val = (float) $val;
 							$op = $match[1];
 						} elseif (preg_match('~^\(date\)(.+)~', $op, $match)) {
-							$dateTime = new \DateTime($val);
-							$val = new \MongoDB\BSON\UTCDatetime($dateTime->getTimestamp() * 1000);
+							$dateTime = new DateTime($val);
+							$val = new MongoDB\BSON\UTCDatetime($dateTime->getTimestamp() * 1000);
 							$op = $match[1];
 						}
 						switch ($op) {
@@ -283,108 +553,6 @@ if (isset($_GET["mongo"])) {
 		}
 	}
 
-
-
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("mongodb");
-		static $jush = "mongo";
-
-		public $editFunctions = array(array("json"));
-
-		public $operators = array(
-			"=",
-			"!=",
-			">",
-			"<",
-			">=",
-			"<=",
-			"regex",
-			"(f)=",
-			"(f)!=",
-			"(f)>",
-			"(f)<",
-			"(f)>=",
-			"(f)<=",
-			"(date)=",
-			"(date)!=",
-			"(date)>",
-			"(date)<",
-			"(date)>=",
-			"(date)<=",
-		);
-
-		public $primary = "_id";
-
-		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			$select = ($select == array("*")
-				? array()
-				: array_fill_keys($select, 1)
-			);
-			if (count($select) && !isset($select['_id'])) {
-				$select['_id'] = 0;
-			}
-			$where = where_to_query($where);
-			$sort = array();
-			foreach ($order as $val) {
-				$val = preg_replace('~ DESC$~', '', $val, 1, $count);
-				$sort[$val] = ($count ? -1 : 1);
-			}
-			if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
-				$limit = $_GET['limit'];
-			}
-			$limit = min(200, max(1, (int) $limit));
-			$skip = $page * $limit;
-			try {
-				return new Result($this->conn->_link->executeQuery($this->conn->_db_name . ".$table", new \MongoDB\Driver\Query($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
-			} catch (Exception $e) {
-				$this->conn->error = $e->getMessage();
-				return false;
-			}
-		}
-
-		function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
-			$db = $this->conn->_db_name;
-			$where = sql_query_where_parser($queryWhere);
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			if (isset($set['_id'])) {
-				unset($set['_id']);
-			}
-			$removeFields = array();
-			foreach ($set as $key => $value) {
-				if ($value == 'NULL') {
-					$removeFields[$key] = 1;
-					unset($set[$key]);
-				}
-			}
-			$update = array('$set' => $set);
-			if (count($removeFields)) {
-				$update['$unset'] = $removeFields;
-			}
-			$bulk->update($where, $update, array('upsert' => false));
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
-		}
-
-		function delete($table, $queryWhere, $limit = 0) {
-			$db = $this->conn->_db_name;
-			$where = sql_query_where_parser($queryWhere);
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			$bulk->delete($where, array('limit' => $limit));
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
-		}
-
-		function insert($table, $set) {
-			$db = $this->conn->_db_name;
-			$bulk = new \MongoDB\Driver\BulkWrite(array());
-			if ($set['_id'] == '') {
-				unset($set['_id']);
-			}
-			$bulk->insert($set);
-			return $this->conn->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
-		}
-	}
-
-
-
 	function table($idf) {
 		return $idf;
 	}
@@ -428,10 +596,10 @@ if (isset($_GET["mongo"])) {
 		return $credentials[1];
 	}
 
-	function connect($credentials) {
+	function connect() {
 		global $adminer;
-		$connection = new Db;
-		list($server, $username, $password) = $credentials;
+		$connection = new Min_DB;
+		list($server, $username, $password) = $adminer->credentials();
 
 		if ($server == "") {
 			$server = "localhost:27017";
@@ -542,4 +710,49 @@ if (isset($_GET["mongo"])) {
 		}
 		return true;
 	}
+
+	function driver_config() {
+		if (class_exists('MongoDB')) {
+			$operators = ["="];
+			$operator_regexp = null;
+		} elseif (class_exists('MongoDB\Driver\Manager')) {
+			$operators = [
+				"=",
+				"!=",
+				">",
+				"<",
+				">=",
+				"<=",
+				"regex",
+				"(f)=",
+				"(f)!=",
+				"(f)>",
+				"(f)<",
+				"(f)>=",
+				"(f)<=",
+				"(date)=",
+				"(date)!=",
+				"(date)>",
+				"(date)<",
+				"(date)>=",
+				"(date)<=",
+			];
+
+			$operator_regexp = 'regex';
+		} else {
+			$operators = ["="];
+			$operator_regexp = null;
+		}
+
+		return array(
+			'possible_drivers' => array("mongo", "mongodb"),
+			'jush' => "mongo",
+			'operators' => $operators,
+			'operator_like' => "LIKE %%", // TODO: LIKE operator is not listed in operators.
+			'operator_regexp' => $operator_regexp,
+			'functions' => array(),
+			'grouping' => array(),
+			'edit_functions' => array(array("json")),
+		);
+	}
 }

adminer/drivers/mssql.inc.php

@@ -5,18 +5,15 @@
 * @author Jakub Vrana
 */
 
-namespace Adminer;
-
-$drivers["mssql"] = "MS SQL";
+$drivers["mssql"] = "MS SQL (beta)";
 
 if (isset($_GET["mssql"])) {
-	define('Adminer\DRIVER', "mssql");
+	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
-		class Db {
-			public $extension = "sqlsrv", $server_info, $affected_rows, $errno, $error;
-			private $link, $result;
+		class Min_DB {
+			var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $errno, $error;
 
-			private function get_error() {
+			function _get_error() {
 				$this->error = "";
 				foreach (sqlsrv_errors() as $error) {
 					$this->errno = $error["code"];
@@ -27,7 +24,13 @@ if (isset($_GET["mssql"])) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
+
+				$connection_info = [
+					"UID" => $username,
+					"PWD" => $password,
+					"CharacterSet" => "UTF-8",
+				];
+
 				$ssl = $adminer->connectSsl();
 				if (isset($ssl["Encrypt"])) {
 					$connection_info["Encrypt"] = $ssl["Encrypt"];
@@ -35,18 +38,21 @@ if (isset($_GET["mssql"])) {
 				if (isset($ssl["TrustServerCertificate"])) {
 					$connection_info["TrustServerCertificate"] = $ssl["TrustServerCertificate"];
 				}
+
 				$db = $adminer->database();
 				if ($db != "") {
 					$connection_info["Database"] = $db;
 				}
-				$this->link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
-				if ($this->link) {
-					$info = sqlsrv_server_info($this->link);
+
+				$this->_link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
+				if ($this->_link) {
+					$info = sqlsrv_server_info($this->_link);
 					$this->server_info = $info['SQLServerVersion'];
 				} else {
-					$this->get_error();
+					$this->_get_error();
 				}
-				return (bool) $this->link;
+
+				return (bool) $this->_link;
 			}
 
 			function quote($string) {
@@ -55,24 +61,24 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				return $this->query(use_sql($database));
+				return $this->query("USE " . idf_escape($database));
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = sqlsrv_query($this->link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
+				$result = sqlsrv_query($this->_link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
 				$this->error = "";
 				if (!$result) {
-					$this->get_error();
+					$this->_get_error();
 					return false;
 				}
 				return $this->store_result($result);
 			}
 
 			function multi_query($query) {
-				$this->result = sqlsrv_query($this->link, $query);
+				$this->_result = sqlsrv_query($this->_link, $query);
 				$this->error = "";
-				if (!$this->result) {
-					$this->get_error();
+				if (!$this->_result) {
+					$this->_get_error();
 					return false;
 				}
 				return true;
@@ -80,20 +86,20 @@ if (isset($_GET["mssql"])) {
 
 			function store_result($result = null) {
 				if (!$result) {
-					$result = $this->result;
+					$result = $this->_result;
 				}
 				if (!$result) {
 					return false;
 				}
 				if (sqlsrv_field_metadata($result)) {
-					return new Result($result);
+					return new Min_Result($result);
 				}
 				$this->affected_rows = sqlsrv_rows_affected($result);
 				return true;
 			}
 
 			function next_result() {
-				return $this->result ? sqlsrv_next_result($this->result) : null;
+				return $this->_result ? sqlsrv_next_result($this->_result) : null;
 			}
 
 			function result($query, $field = 0) {
@@ -106,16 +112,15 @@ if (isset($_GET["mssql"])) {
 			}
 		}
 
-		class Result {
-			public $num_rows;
-			private $result, $offset = 0, $fields;
+		class Min_Result {
+			var $_result, $_offset = 0, $_fields, $num_rows;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				// $this->num_rows = sqlsrv_num_rows($result); // available only in scrollable results
 			}
 
-			private function convert($row) {
+			function _convert($row) {
 				foreach ((array) $row as $key => $val) {
 					if (is_a($val, 'DateTime')) {
 						$row[$key] = $val->format("Y-m-d H:i:s");
@@ -126,19 +131,19 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_ASSOC));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
 			}
 
 			function fetch_row() {
-				return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_NUMERIC));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
 			}
 
 			function fetch_field() {
-				if (!$this->fields) {
-					$this->fields = sqlsrv_field_metadata($this->result);
+				if (!$this->_fields) {
+					$this->_fields = sqlsrv_field_metadata($this->_result);
 				}
-				$field = $this->fields[$this->offset++];
-				$return = new \stdClass;
+				$field = $this->_fields[$this->_offset++];
+				$return = new stdClass;
 				$return->name = $field["Name"];
 				$return->orgname = $field["Name"];
 				$return->type = ($field["Type"] == 1 ? 254 : 0);
@@ -147,33 +152,116 @@ if (isset($_GET["mssql"])) {
 
 			function seek($offset) {
 				for ($i=0; $i < $offset; $i++) {
-					sqlsrv_fetch($this->result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
+					sqlsrv_fetch($this->_result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
 				}
 			}
 
 			function __destruct() {
-				sqlsrv_free_stmt($this->result);
+				sqlsrv_free_stmt($this->_result);
 			}
 		}
 
-	} elseif (extension_loaded("pdo_sqlsrv")) {
-		class Db extends PdoDb {
-			public $extension = "PDO_SQLSRV";
+	} elseif (extension_loaded("mssql")) {
+		class Min_DB {
+			var $extension = "MSSQL", $_link, $_result, $server_info, $affected_rows, $error;
 
 			function connect($server, $username, $password) {
-				$this->dsn("sqlsrv:Server=" . str_replace(":", ",", $server), $username, $password);
-				return true;
+				$this->_link = @mssql_connect($server, $username, $password);
+				if ($this->_link) {
+					$result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')");
+					if ($result) {
+						$row = $result->fetch_row();
+						$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					}
+				} else {
+					$this->error = mssql_get_last_message();
+				}
+				return (bool) $this->_link;
+			}
+
+			function quote($string) {
+				$unicode = strlen($string) != strlen(utf8_decode($string));
+				return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
 			}
 
 			function select_db($database) {
-				// database selection is separated from the connection so dbname in DSN can't be used
-				return $this->query(use_sql($database));
+				return mssql_select_db($database);
+			}
+
+			function query($query, $unbuffered = false) {
+				$result = @mssql_query($query, $this->_link); //! $unbuffered
+				$this->error = "";
+				if (!$result) {
+					$this->error = mssql_get_last_message();
+					return false;
+				}
+				if ($result === true) {
+					$this->affected_rows = mssql_rows_affected($this->_link);
+					return true;
+				}
+				return new Min_Result($result);
+			}
+
+			function multi_query($query) {
+				return $this->_result = $this->query($query);
+			}
+
+			function store_result() {
+				return $this->_result;
+			}
+
+			function next_result() {
+				return mssql_next_result($this->_result->_result);
+			}
+
+			function result($query, $field = 0) {
+				$result = $this->query($query);
+				if (!is_object($result)) {
+					return false;
+				}
+				return mssql_result($result->_result, 0, $field);
+			}
+		}
+
+		class Min_Result {
+			var $_result, $_offset = 0, $_fields, $num_rows;
+
+			function __construct($result) {
+				$this->_result = $result;
+				$this->num_rows = mssql_num_rows($result);
+			}
+
+			function fetch_assoc() {
+				return mssql_fetch_assoc($this->_result);
+			}
+
+			function fetch_row() {
+				return mssql_fetch_row($this->_result);
+			}
+
+			function num_rows() {
+				return mssql_num_rows($this->_result);
+			}
+
+			function fetch_field() {
+				$return = mssql_fetch_field($this->_result);
+				$return->orgtable = $return->table;
+				$return->orgname = $return->name;
+				return $return;
+			}
+
+			function seek($offset) {
+				mssql_data_seek($this->_result, $offset);
+			}
+
+			function __destruct() {
+				mssql_free_result($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_dblib")) {
-		class Db extends PdoDb {
-			public $extension = "PDO_DBLIB";
+		class Min_DB extends Min_PDO {
+			var $extension = "PDO_DBLIB";
 
 			function connect($server, $username, $password) {
 				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)), $username, $password);
@@ -181,95 +269,40 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				return $this->query(use_sql($database));
+				// database selection is separated from the connection so dbname in DSN can't be used
+				return $this->query("USE " . idf_escape($database));
 			}
 		}
 	}
 
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB");
-		static $jush = "mssql";
-
-		public $editFunctions = array(
-			array(
-				"date|time" => "getdate",
-			), array(
-				"int|decimal|real|float|money|datetime" => "+/-",
-				"char|text" => "+",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
-		public $functions = array("len", "lower", "round", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-		public $onActions = "NO ACTION|CASCADE|SET NULL|SET DEFAULT";
-		public $generated = array("PERSISTED", "VIRTUAL");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array( //! use sys.types
-				lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
-				lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
-				lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
-				lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
-			);
-		}
+	class Min_Driver extends Min_SQL {
 
 		function insertUpdate($table, $rows, $primary) {
-			$fields = fields($table);
-			$update = array();
-			$where = array();
-			$set = reset($rows);
-			$columns = "c" . implode(", c", range(1, count($set)));
-			$c = 0;
-			$insert = array();
-			foreach ($set as $key => $val) {
-				$c++;
-				$name = idf_unescape($key);
-				if (!$fields[$name]["auto_increment"]) {
-					$insert[$key] = "c$c";
-				}
-				if (isset($primary[$name])) {
-					$where[] = "$key = c$c";
-				} else {
-					$update[] = "$key = c$c";
-				}
-			}
-			$values = array();
 			foreach ($rows as $set) {
-				$values[] = "(" . implode(", ", $set) . ")";
-			}
-			if ($where) {
-				$identity = queries("SET IDENTITY_INSERT " . table($table) . " ON");
-				$return = queries(
-					"MERGE " . table($table) . " USING (VALUES\n\t" . implode(",\n\t", $values) . "\n) AS source ($columns) ON " . implode(" AND ", $where) //! source, c1 - possible conflict
-					. ($update ? "\nWHEN MATCHED THEN UPDATE SET " . implode(", ", $update) : "")
-					. "\nWHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($identity ? $set : $insert)) . ") VALUES (" . ($identity ? $columns : implode(", ", $insert)) . ");" // ; is mandatory
-				);
-				if ($identity) {
-					queries("SET IDENTITY_INSERT " . table($table) . " OFF");
+				$update = array();
+				$where = array();
+				foreach ($set as $key => $val) {
+					$update[] = "$key = $val";
+					if (isset($primary[idf_unescape($key)])) {
+						$where[] = "$key = $val";
+					}
+				}
+				//! can use only one query for all rows
+				if (!queries("MERGE " . table($table) . " USING (VALUES(" . implode(", ", $set) . ")) AS source (c" . implode(", c", range(1, count($set))) . ") ON " . implode(" AND ", $where) //! source, c1 - possible conflict
+					. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
+					. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
+				)) {
+					return false;
 				}
-			} else {
-				$return = queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES\n" . implode(",\n", $values));
 			}
-			return $return;
+			return true;
 		}
 
 		function begin() {
 			return queries("BEGIN TRANSACTION");
 		}
 
-		function tableHelp($name, $is_view = false) {
-			$links = array(
-				"sys" => "catalog-views/sys-",
-				"INFORMATION_SCHEMA" => "information-schema-views/",
-			);
-			$link = $links[get_schema()];
-			if ($link) {
-				return "relational-databases/system-$link" . preg_replace('~_~', '-', strtolower($name)) . "-transact-sql";
-			}
-		}
 	}
 
 
@@ -282,11 +315,15 @@ if (isset($_GET["mssql"])) {
 		return ($_GET["ns"] != "" ? idf_escape($_GET["ns"]) . "." : "") . idf_escape($idf);
 	}
 
-	function connect($credentials) {
-		$connection = new Db;
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
+
 		if ($credentials[0] == "") {
 			$credentials[0] = "localhost:1433";
 		}
+
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -306,7 +343,8 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
+		global $connection;
+		return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
 	}
 
 	function engines() {
@@ -314,7 +352,8 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function logged_user() {
-		return get_val("SELECT SUSER_NAME()");
+		global $connection;
+		return $connection->result("SELECT SUSER_NAME()");
 	}
 
 	function tables_list() {
@@ -326,18 +365,14 @@ if (isset($_GET["mssql"])) {
 		$return = array();
 		foreach ($databases as $db) {
 			$connection->select_db($db);
-			$return[$db] = get_val("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES");
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES");
 		}
 		return $return;
 	}
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (
-			get_rows("SELECT ao.name AS Name, ao.type_desc AS Engine, (SELECT value FROM fn_listextendedproperty(default, 'SCHEMA', schema_name(schema_id), 'TABLE', ao.name, null, null)) AS Comment
-FROM sys.all_objects AS ao
-WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row
-		) {
+		foreach (get_rows("SELECT ao.name AS Name, ao.type_desc AS Engine, (SELECT value FROM fn_listextendedproperty(default, 'SCHEMA', schema_name(schema_id), 'TABLE', ao.name, null, null)) AS Comment FROM sys.all_objects AS ao WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
 			if ($name != "") {
 				return $row;
 			}
@@ -357,53 +392,41 @@ WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V')
 	function fields($table) {
 		$comments = get_key_vals("SELECT objname, cast(value as varchar(max)) FROM fn_listextendedproperty('MS_DESCRIPTION', 'schema', " . q(get_schema()) . ", 'table', " . q($table) . ", 'column', NULL)");
 		$return = array();
-		$table_id = get_val("SELECT object_id FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') AND name = " . q($table));
-		foreach (
-			get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default], d.name default_constraint, i.is_primary_key
+		foreach (get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default]
 FROM sys.all_columns c
+JOIN sys.all_objects o ON c.object_id = o.object_id
 JOIN sys.types t ON c.user_type_id = t.user_type_id
-LEFT JOIN sys.default_constraints d ON c.default_object_id = d.object_id
-LEFT JOIN sys.index_columns ic ON c.object_id = ic.object_id AND c.column_id = ic.column_id
-LEFT JOIN sys.indexes i ON ic.object_id = i.object_id AND ic.index_id = i.index_id
-WHERE c.object_id = " . q($table_id)) as $row
-		) {
+LEFT JOIN sys.default_constraints d ON c.default_object_id = d.parent_column_id
+WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table)
+		) as $row) {
 			$type = $row["type"];
-			$length = (preg_match("~char|binary~", $type)
-				? $row["max_length"] / ($type[0] == 'n' ? 2 : 1)
-				: ($type == "decimal" ? "$row[precision],$row[scale]" : "")
-			);
+			$length = (preg_match("~char|binary~", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
 			$return[$row["name"]] = array(
 				"field" => $row["name"],
 				"full_type" => $type . ($length ? "($length)" : ""),
 				"type" => $type,
 				"length" => $length,
-				"default" => (preg_match("~^\('(.*)'\)$~", $row["default"], $match) ? str_replace("''", "'", $match[1]) : $row["default"]),
-				"default_constraint" => $row["default_constraint"],
+				"default" => $row["default"],
 				"null" => $row["is_nullable"],
 				"auto_increment" => $row["is_identity"],
 				"collation" => $row["collation_name"],
 				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
-				"primary" => $row["is_primary_key"],
+				"primary" => $row["is_identity"], //! or indexes.is_primary_key
 				"comment" => $comments[$row["name"]],
 			);
 		}
-		foreach (get_rows("SELECT * FROM sys.computed_columns WHERE object_id = " . q($table_id)) as $row) {
-			$return[$row["name"]]["generated"] = ($row["is_persisted"] ? "PERSISTED" : "VIRTUAL");
-			$return[$row["name"]]["default"] = $row["definition"];
-		}
 		return $return;
 	}
 
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		// sp_statistics doesn't return information about primary key
-		foreach (
-			get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
+		foreach (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
 FROM sys.indexes i
 INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
 INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
-WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
-		) {
+WHERE OBJECT_NAME(i.object_id) = " . q($table)
+		, $connection2) as $row) {
 			$name = $row["name"];
 			$return[$name]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
 			$return[$name]["lengths"] = array();
@@ -414,7 +437,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function view($name) {
-		return array("select" => preg_replace('~^(?:[^[]|\[[^]]*])*\s+AS\s+~isU', '', get_val("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
+		global $connection;
+		return array("select" => preg_replace('~^(?:[^[]|\[[^]]*])*\s+AS\s+~isU', '', $connection->result("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
 	}
 
 	function collations() {
@@ -426,12 +450,12 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "INFORMATION_SCHEMA";
+		return false;
 	}
 
 	function error() {
 		global $connection;
-		return nl_br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
+		return nl2br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
 	}
 
 	function create_database($db, $collation) {
@@ -439,7 +463,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function drop_databases($databases) {
-		return queries("DROP DATABASE " . implode(", ", array_map('Adminer\idf_escape', $databases)));
+		return queries("DROP DATABASE " . implode(", ", array_map('idf_escape', $databases)));
 	}
 
 	function rename_database($name, $collation) {
@@ -457,7 +481,6 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		$comments = array();
-		$orig_fields = fields($table);
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -467,28 +490,14 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", '\1\2', $val[1]);
 				$comments[$field[0]] = $val[5];
 				unset($val[5]);
-				if (preg_match('~ AS ~', $val[3])) {
-					unset($val[1], $val[2]);
-				}
 				if ($field[0] == "") {
 					$alter["ADD"][] = "\n  " . implode("", $val) . ($table == "" ? substr($foreign[$val[0]], 16 + strlen($val[0])) : ""); // 16 - strlen("  FOREIGN KEY ()")
 				} else {
-					$default = $val[3];
-					unset($val[3]); // default values are set separately
 					unset($val[6]); //! identity can't be removed
 					if ($column != $val[0]) {
 						queries("EXEC sp_rename " . q(table($table) . ".$column") . ", " . q(idf_unescape($val[0])) . ", 'COLUMN'");
 					}
 					$alter["ALTER COLUMN " . implode("", $val)][] = "";
-					$orig_field = $orig_fields[$field[0]];
-					if (default_value($orig_field) != $default) {
-						if ($orig_field["default"] !== null) {
-							$alter["DROP"][] = " " . idf_escape($orig_field["default_constraint"]);
-						}
-						if ($default) {
-							$alter["ADD"][] = "\n $default FOR $column";
-						}
-					}
 				}
 			}
 		}
@@ -502,7 +511,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 			$alter[""] = $foreign;
 		}
 		foreach ($alter as $key => $val) {
-			if (!queries("ALTER TABLE " . table($name) . " $key" . implode(",", $val))) {
+			if (!queries("ALTER TABLE " . idf_escape($name) . " $key" . implode(",", $val))) {
 				return false;
 			}
 		}
@@ -524,12 +533,10 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 				} else {
 					$index[] = idf_escape($val[1]) . " ON " . table($table);
 				}
-			} elseif (
-				!queries(($val[0] != "PRIMARY"
-					? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
-					: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
-				) . " (" . implode(", ", $val[2]) . ")")
-			) {
+			} elseif (!queries(($val[0] != "PRIMARY"
+				? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
+				: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
+			) . " (" . implode(", ", $val[2]) . ")")) {
 				return false;
 			}
 		}
@@ -539,7 +546,8 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function last_id() {
-		return get_val("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
+		global $connection;
+		return $connection->result("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
 	}
 
 	function explain($connection, $query) {
@@ -554,14 +562,10 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 
 	function foreign_keys($table) {
 		$return = array();
-		$on_actions = array("CASCADE", "NO ACTION", "SET NULL", "SET DEFAULT");
-		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table) . ", @fktable_owner = " . q(get_schema())) as $row) {
+		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
 			$foreign_key = &$return[$row["FK_NAME"]];
 			$foreign_key["db"] = $row["PKTABLE_QUALIFIER"];
-			$foreign_key["ns"] = $row["PKTABLE_OWNER"];
 			$foreign_key["table"] = $row["PKTABLE_NAME"];
-			$foreign_key["on_update"] = $on_actions[$row["UPDATE_RULE"]];
-			$foreign_key["on_delete"] = $on_actions[$row["DELETE_RULE"]];
 			$foreign_key["source"][] = $row["FKCOLUMN_NAME"];
 			$foreign_key["target"][] = $row["PKCOLUMN_NAME"];
 		}
@@ -573,11 +577,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 	}
 
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
+		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
 	}
 
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
+		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
 	}
 
 	function move_tables($tables, $views, $target) {
@@ -588,8 +592,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table), $connection2) as $row
 		if ($name == "") {
 			return array();
 		}
-		$rows = get_rows(
-			"SELECT s.name [Trigger],
+		$rows = get_rows("SELECT s.name [Trigger],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(s.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(s.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing],
 c.text
@@ -606,14 +609,13 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 
 	function triggers($table) {
 		$return = array();
-		foreach (
-			get_rows("SELECT sys1.name,
+		foreach (get_rows("SELECT sys1.name,
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing]
 FROM sysobjects sys1
 JOIN sysobjects sys2 ON sys1.parent_obj = sys2.id
-WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
-		) { // triggers are not schema-scoped
+WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
+		) as $row) { // triggers are not schema-scoped
 			$return[$row["name"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
@@ -632,70 +634,38 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
 	}
 
 	function get_schema() {
+		global $connection;
 		if ($_GET["ns"] != "") {
 			return $_GET["ns"];
 		}
-		return get_val("SELECT SCHEMA_NAME()");
+		return $connection->result("SELECT SCHEMA_NAME()");
 	}
 
 	function set_schema($schema) {
-		$_GET["ns"] = $schema;
 		return true; // ALTER USER is permanent
 	}
 
-	function create_sql($table, $auto_increment, $style) {
-		global $driver;
-		if (is_view(table_status($table))) {
-			$view = view($table);
-			return "CREATE VIEW " . table($table) . " AS $view[select]";
-		}
-		$fields = array();
-		$primary = false;
-		foreach (fields($table) as $name => $field) {
-			$val = process_field($field, $field);
-			if ($val[6]) {
-				$primary = true;
-			}
-			$fields[] = implode("", $val);
-		}
-		foreach (indexes($table) as $name => $index) {
-			if (!$primary || $index["type"] != "PRIMARY") {
-				$columns = array();
-				foreach ($index["columns"] as $key => $val) {
-					$columns[] = idf_escape($val) . ($index["descs"][$key] ? " DESC" : "");
-				}
-				$name = idf_escape($name);
-				$fields[] = ($index["type"] == "INDEX" ? "INDEX $name" : "CONSTRAINT $name " . ($index["type"] == "UNIQUE" ? "UNIQUE" : "PRIMARY KEY")) . " (" . implode(", ", $columns) . ")";
-			}
-		}
-		foreach ($driver->checkConstraints($table) as $name => $check) {
-			$fields[] = "CONSTRAINT " . idf_escape($name) . " CHECK ($check)";
-		}
-		return "CREATE TABLE " . table($table) . " (\n\t" . implode(",\n\t", $fields) . "\n)";
-	}
-
-	function foreign_keys_sql($table) {
-		$fields = array();
-		foreach (foreign_keys($table) as $foreign) {
-			$fields[] = ltrim(format_foreign_key($foreign));
-		}
-		return ($fields ? "ALTER TABLE " . table($table) . " ADD\n\t" . implode(",\n\t", $fields) . ";\n\n" : "");
-	}
-
-	function truncate_sql($table) {
-		return "TRUNCATE TABLE " . table($table);
-	}
-
 	function use_sql($database) {
 		return "USE " . idf_escape($database);
 	}
 
-	function trigger_sql($table) {
-		$return = "";
-		foreach (triggers($table) as $name => $trigger) {
-			$return .= create_trigger(" ON " . table($table), trigger($name)) . ";";
-		}
-		return $return;
+	function show_variables() {
+		return array();
+	}
+
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
+	function show_status() {
+		return array();
 	}
 
 	function convert_field($field) {
@@ -706,6 +676,39 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)) as $row
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|comment|columns|database|drop_col|dump|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
+		return preg_match('~^(comment|columns|database|drop_col|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
+	}
+
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array( //! use sys.types
+			lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
+			lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
+			lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
+			lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("SQLSRV", "MSSQL", "PDO_DBLIB"),
+			'jush' => "mssql",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"),
+			'operator_like' => "LIKE %%",
+			'functions' => array("len", "lower", "round", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
+			'edit_functions' => array(
+				array(
+					"date|time" => "getdate",
+				), array(
+					"int|decimal|real|float|money|datetime" => "+/-",
+					"char|text" => "+",
+				)
+			),
+		);
 	}
 }

adminer/drivers/oracle.inc.php

@@ -1,15 +1,12 @@
 <?php
-namespace Adminer;
-
 $drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-	define('Adminer\DRIVER', "oracle");
+	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
-		class Db {
-			public $extension = "oci8", $server_info, $affected_rows, $errno, $error;
-			public $_current_db;
-			private $link, $result;
+		class Min_DB {
+			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;
+			var $_current_db;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -20,9 +17,9 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->link = @oci_new_connect($username, $password, $server, "AL32UTF8");
-				if ($this->link) {
-					$this->server_info = oci_server_version($this->link);
+				$this->_link = @oci_new_connect($username, $password, $server, "AL32UTF8");
+				if ($this->_link) {
+					$this->server_info = oci_server_version($this->_link);
 					return true;
 				}
 				$error = oci_error();
@@ -40,10 +37,10 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = oci_parse($this->link, $query);
+				$result = oci_parse($this->_link, $query);
 				$this->error = "";
 				if (!$result) {
-					$error = oci_error($this->link);
+					$error = oci_error($this->_link);
 					$this->errno = $error["code"];
 					$this->error = $error["message"];
 					return false;
@@ -53,7 +50,7 @@ if (isset($_GET["oracle"])) {
 				restore_error_handler();
 				if ($return) {
 					if (oci_num_fields($result)) {
-						return new Result($result);
+						return new Min_Result($result);
 					}
 					$this->affected_rows = oci_num_rows($result);
 					oci_free_statement($result);
@@ -62,32 +59,34 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
 				return false;
 			}
 
-			function result($query, $field = 0) {
+			function result($query, $field = 1) {
 				$result = $this->query($query);
-				return (is_object($result) ? $result->fetch_column($field) : false);
+				if (!is_object($result) || !oci_fetch($result->_result)) {
+					return false;
+				}
+				return oci_result($result->_result, $field);
 			}
 		}
 
-		class Result {
-			public $num_rows;
-			private $result, $offset = 1;
+		class Min_Result {
+			var $_result, $_offset = 1, $num_rows;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 			}
 
-			private function convert($row) {
+			function _convert($row) {
 				foreach ((array) $row as $key => $val) {
 					if (is_a($val, 'OCI-Lob')) {
 						$row[$key] = $val->load();
@@ -97,36 +96,32 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->convert(oci_fetch_assoc($this->result));
+				return $this->_convert(oci_fetch_assoc($this->_result));
 			}
 
 			function fetch_row() {
-				return $this->convert(oci_fetch_row($this->result));
-			}
-
-			function fetch_column($field) {
-				return (oci_fetch($this->result) ? oci_result($this->result, $field + 1) : false);
+				return $this->_convert(oci_fetch_row($this->_result));
 			}
 
 			function fetch_field() {
-				$column = $this->offset++;
-				$return = new \stdClass;
-				$return->name = oci_field_name($this->result, $column);
+				$column = $this->_offset++;
+				$return = new stdClass;
+				$return->name = oci_field_name($this->_result, $column);
 				$return->orgname = $return->name;
-				$return->type = oci_field_type($this->result, $column);
+				$return->type = oci_field_type($this->_result, $column);
 				$return->charsetnr = (preg_match("~raw|blob|bfile~", $return->type) ? 63 : 0); // 63 - binary
 				return $return;
 			}
 
 			function __destruct() {
-				oci_free_statement($this->result);
+				oci_free_statement($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_oci")) {
-		class Db extends PdoDb {
-			public $extension = "PDO_OCI";
-			public $_current_db;
+		class Min_DB extends Min_PDO {
+			var $extension = "PDO_OCI";
+			var $_current_db;
 
 			function connect($server, $username, $password) {
 				$this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
@@ -143,34 +138,7 @@ if (isset($_GET["oracle"])) {
 
 
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("OCI8", "PDO_OCI");
-		static $jush = "oracle";
-
-		public $editFunctions = array(
-			array( //! no parentheses
-				"date" => "current_date",
-				"timestamp" => "current_timestamp",
-			), array(
-				"number|float|double" => "+/-",
-				"date|timestamp" => "+ interval/- interval",
-				"char|clob" => "||",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
-		public $functions = array("length", "lower", "round", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array(
-				lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
-				lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
-				lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
-				lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
-			);
-		}
+	class Min_Driver extends Min_SQL {
 
 		//! support empty $set in insert()
 
@@ -189,22 +157,24 @@ if (isset($_GET["oracle"])) {
 						$where[] = "$key = $val";
 					}
 				}
-				if (
-					!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")"))
-				) {
+				if (!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
+					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
+				)) {
 					return false;
 				}
 			}
 			return true;
 		}
-
-		function hasCStyleEscapes() {
-			return true;
-		}
 	}
 
-
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath) {
+		// EasyConnect host+path format: host[/[service_name][:server_type][/instance_name]]
+		return (bool)preg_match('~^[^/]+(/([^/:]+)?(:[^/:]+)?(/[^/:]+)?)?$~', $hostPath);
+	}
 
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
@@ -214,8 +184,10 @@ if (isset($_GET["oracle"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
-		$connection = new Db;
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -223,13 +195,7 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals(
-			"SELECT DISTINCT tablespace_name FROM (
-SELECT tablespace_name FROM user_tablespaces
-UNION SELECT tablespace_name FROM all_tables WHERE tablespace_name IS NOT NULL
-)
-ORDER BY 1"
-		);
+		return get_vals("SELECT tablespace_name FROM user_tablespaces ORDER BY 1");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -244,7 +210,8 @@ ORDER BY 1"
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT value FROM nls_database_parameters WHERE parameter = 'NLS_CHARACTERSET'"); //! respect $db
+		global $connection;
+		return $connection->result("SELECT value FROM nls_database_parameters WHERE parameter = 'NLS_CHARACTERSET'"); //! respect $db
 	}
 
 	function engines() {
@@ -252,12 +219,13 @@ ORDER BY 1"
 	}
 
 	function logged_user() {
-		return get_val("SELECT USER FROM DUAL");
+		global $connection;
+		return $connection->result("SELECT USER FROM DUAL");
 	}
 
 	function get_current_db() {
 		global $connection;
-		$db = $connection->_current_db ?: DB;
+		$db = $connection->_current_db ? $connection->_current_db : DB;
 		unset($connection->_current_db);
 		return $db;
 	}
@@ -271,23 +239,23 @@ ORDER BY 1"
 
 	function views_table($columns) {
 		$owner = where_owner('');
-		return "(SELECT $columns FROM all_views WHERE " . ($owner ?: "rownum < 0") . ")";
+		return "(SELECT $columns FROM all_views WHERE " . ($owner ? $owner : "rownum < 0") . ")";
 	}
 
 	function tables_list() {
 		$view = views_table("view_name");
 		$owner = where_owner(" AND ");
-		return get_key_vals(
-			"SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "$owner
+		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "$owner
 UNION SELECT view_name, 'view' FROM $view
 ORDER BY 1"
 		); //! views don't have schema
 	}
 
 	function count_tables($databases) {
+		global $connection;
 		$return = array();
 		foreach ($databases as $db) {
-			$return[$db] = get_val("SELECT COUNT(*) FROM all_tables WHERE tablespace_name = " . q($db));
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM all_tables WHERE tablespace_name = " . q($db));
 		}
 		return $return;
 	}
@@ -298,11 +266,10 @@ ORDER BY 1"
 		$db = get_current_db();
 		$view = views_table("view_name");
 		$owner = where_owner(" AND ");
-		foreach (
-			get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q($db) . $owner . ($name != "" ? " AND table_name = $search" : "") . "
+		foreach (get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q($db) . $owner . ($name != "" ? " AND table_name = $search" : "") . "
 UNION SELECT view_name, 'view', 0, 0 FROM $view" . ($name != "" ? " WHERE view_name = $search" : "") . "
-ORDER BY 1") as $row
-		) {
+ORDER BY 1"
+		) as $row) {
 			if ($name != "") {
 				return $row;
 			}
@@ -348,14 +315,12 @@ ORDER BY 1") as $row
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		$owner = where_owner(" AND ", "aic.table_owner");
-		foreach (
-			get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
+		foreach (get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
 FROM all_ind_columns aic
 LEFT JOIN all_constraints ac ON aic.index_name = ac.constraint_name AND aic.table_name = ac.table_name AND aic.index_owner = ac.owner
 LEFT JOIN all_tab_cols atc ON aic.column_name = atc.column_name AND aic.table_name = atc.table_name AND aic.index_owner = atc.owner
 WHERE aic.table_name = " . q($table) . "$owner
-ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
-		) {
+ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) {
 			$index_name = $row["INDEX_NAME"];
 			$column_name = $row["DATA_DEFAULT"];
 			$column_name = ($column_name ? trim($column_name, '"') : $row["COLUMN_NAME"]); // trim - possibly wrapped in quotes but never contains quotes inside
@@ -378,7 +343,7 @@ ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "INFORMATION_SCHEMA";
+		return false;
 	}
 
 	function error() {
@@ -501,11 +466,12 @@ AND c_src.TABLE_NAME = " . q($table);
 
 	function schemas() {
 		$return = get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX')) ORDER BY 1");
-		return ($return ?: get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
+		return ($return ? $return : get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
 	}
 
 	function get_schema() {
-		return get_val("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
+		global $connection;
+		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
 
 	function set_schema($scheme, $connection2 = null) {
@@ -520,6 +486,17 @@ AND c_src.TABLE_NAME = " . q($table);
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
 	function process_list() {
 		return get_rows('SELECT sess.process AS "process", sess.username AS "user", sess.schemaname AS "schema", sess.status AS "status", sess.wait_class AS "wait_class", sess.seconds_in_wait AS "seconds_in_wait", sql.sql_text AS "sql_text", sess.machine AS "machine", sess.port AS "port"
 FROM v$session sess LEFT OUTER JOIN v$sql sql
@@ -544,4 +521,39 @@ ORDER BY PROCESS
 	function support($feature) {
 		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view)$~', $feature); //!
 	}
+
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array(
+			lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
+			lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
+			lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
+			lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("OCI8", "PDO_OCI"),
+			'jush' => "oracle",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"),
+			'operator_like' => "LIKE %%",
+			'functions' => array("length", "lower", "round", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
+			'edit_functions' => array(
+				array( //! no parentheses
+					"date" => "current_date",
+					"timestamp" => "current_timestamp",
+				), array(
+					"number|float|double" => "+/-",
+					"date|timestamp" => "+ interval/- interval",
+					"char|clob" => "||",
+				)
+			),
+		);
+	}
 }

adminer/drivers/pgsql.inc.php

@@ -1,14 +1,11 @@
 <?php
-namespace Adminer;
-
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-	define('Adminer\DRIVER', "pgsql");
+	define("DRIVER", "pgsql");
 	if (extension_loaded("pgsql")) {
-		class Db {
-			public $extension = "PgSQL", $server_info, $affected_rows, $error, $timeout;
-			private $link, $result, $string, $database = true;
+		class Min_DB {
+			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -22,28 +19,31 @@ if (isset($_GET["pgsql"])) {
 				global $adminer;
 				$db = $adminer->database();
 				set_error_handler(array($this, '_error'));
-				$this->string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
+
+				$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
+
 				$ssl = $adminer->connectSsl();
 				if (isset($ssl["mode"])) {
-					$this->string .= " sslmode='" . $ssl["mode"] . "'";
+					$this->_string .= " sslmode='" . $ssl["mode"] . "'";
 				}
-				$this->link = @pg_connect("$this->string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
-				if (!$this->link && $db != "") {
+
+				$this->_link = @pg_connect("$this->_string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
+				if (!$this->_link && $db != "") {
 					// try to connect directly with database for performance
-					$this->database = false;
-					$this->link = @pg_connect("$this->string dbname='postgres'", PGSQL_CONNECT_FORCE_NEW);
+					$this->_database = false;
+					$this->_link = @pg_connect("$this->_string dbname='postgres'", PGSQL_CONNECT_FORCE_NEW);
 				}
 				restore_error_handler();
-				if ($this->link) {
-					$version = pg_version($this->link);
+				if ($this->_link) {
+					$version = pg_version($this->_link);
 					$this->server_info = $version["server"];
-					pg_set_client_encoding($this->link, "UTF8");
+					pg_set_client_encoding($this->_link, "UTF8");
 				}
-				return (bool) $this->link;
+				return (bool) $this->_link;
 			}
 
 			function quote($string) {
-				return pg_escape_literal($this->link, $string);
+				return pg_escape_literal($this->_link, $string);
 			}
 
 			function value($val, $field) {
@@ -51,36 +51,41 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function quoteBinary($string) {
-				return "'" . pg_escape_bytea($this->link, $string) . "'";
+				return "'" . pg_escape_bytea($this->_link, $string) . "'";
 			}
 
 			function select_db($database) {
 				global $adminer;
 				if ($database == $adminer->database()) {
-					return $this->database;
+					return $this->_database;
 				}
-				$return = @pg_connect("$this->string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
+				$return = @pg_connect("$this->_string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
 				if ($return) {
-					$this->link = $return;
+					$this->_link = $return;
 				}
 				return $return;
 			}
 
 			function close() {
-				$this->link = @pg_connect("$this->string dbname='postgres'");
+				$this->_link = @pg_connect("$this->_string dbname='postgres'");
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = @pg_query($this->link, $query);
+				if (!$this->_link) {
+					$this->error = "Invalid connection";
+					return false;
+				}
+
+				$result = @pg_query($this->_link, $query);
 				$this->error = "";
 				if (!$result) {
-					$this->error = pg_last_error($this->link);
+					$this->error = pg_last_error($this->_link);
 					$return = false;
 				} elseif (!pg_num_fields($result)) {
 					$this->affected_rows = pg_affected_rows($result);
 					$return = true;
 				} else {
-					$return = new Result($result);
+					$return = new Min_Result($result);
 				}
 				if ($this->timeout) {
 					$this->timeout = 0;
@@ -90,11 +95,11 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function store_result() {
-				return $this->result;
+				return $this->_result;
 			}
 
 			function next_result() {
@@ -104,67 +109,70 @@ if (isset($_GET["pgsql"])) {
 
 			function result($query, $field = 0) {
 				$result = $this->query($query);
-				return ($result ? $result->fetch_column($field) : false);
+				if (!$result || !$result->num_rows) {
+					return false;
+				}
+				return pg_fetch_result($result->_result, 0, $field);
 			}
 
 			function warnings() {
-				return h(pg_last_notice($this->link)); // second parameter is available since PHP 7.1.0
+				return h(pg_last_notice($this->_link)); // second parameter is available since PHP 7.1.0
 			}
 		}
 
-		class Result {
-			public $num_rows;
-			private $result, $offset = 0;
+		class Min_Result {
+			var $_result, $_offset = 0, $num_rows;
 
 			function __construct($result) {
-				$this->result = $result;
+				$this->_result = $result;
 				$this->num_rows = pg_num_rows($result);
 			}
 
 			function fetch_assoc() {
-				return pg_fetch_assoc($this->result);
+				return pg_fetch_assoc($this->_result);
 			}
 
 			function fetch_row() {
-				return pg_fetch_row($this->result);
-			}
-
-			function fetch_column($field) {
-				return ($this->num_rows ? pg_fetch_result($this->result, 0, $field) : false);
+				return pg_fetch_row($this->_result);
 			}
 
 			function fetch_field() {
-				$column = $this->offset++;
-				$return = new \stdClass;
+				$column = $this->_offset++;
+				$return = new stdClass;
 				if (function_exists('pg_field_table')) {
-					$return->orgtable = pg_field_table($this->result, $column);
+					$return->orgtable = pg_field_table($this->_result, $column);
 				}
-				$return->name = pg_field_name($this->result, $column);
+				$return->name = pg_field_name($this->_result, $column);
 				$return->orgname = $return->name;
-				$return->type = pg_field_type($this->result, $column);
+				$return->type = pg_field_type($this->_result, $column);
 				$return->charsetnr = ($return->type == "bytea" ? 63 : 0); // 63 - binary
 				return $return;
 			}
 
 			function __destruct() {
-				pg_free_result($this->result);
+				pg_free_result($this->_result);
 			}
 		}
 
 	} elseif (extension_loaded("pdo_pgsql")) {
-		class Db extends PdoDb {
-			public $extension = "PDO_PgSQL", $timeout;
+		class Min_DB extends Min_PDO {
+			var $extension = "PDO_PgSQL", $timeout;
 
 			function connect($server, $username, $password) {
 				global $adminer;
+
 				$db = $adminer->database();
+
 				//! client_encoding is supported since 9.1, but we can't yet use min_version here
 				$dsn = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'";
+
 				$ssl = $adminer->connectSsl();
 				if (isset($ssl["mode"])) {
 					$dsn .= " sslmode='" . $ssl["mode"] . "'";
 				}
+
 				$this->dsn($dsn, $username, $password);
+
 				return true;
 			}
 
@@ -198,53 +206,7 @@ if (isset($_GET["pgsql"])) {
 
 
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("PgSQL", "PDO_PgSQL");
-		static $jush = "pgsql";
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
-		public $functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
-		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			$this->types = array( //! arrays
-				lang('Numbers') => array("smallint" => 5, "integer" => 10, "bigint" => 19, "boolean" => 1, "numeric" => 0, "real" => 7, "double precision" => 16, "money" => 20),
-				lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
-				lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
-				lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
-				lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "macaddr8" => 23, "txid_snapshot" => 0),
-				lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
-			);
-			if (min_version(9.2, 0, $connection)) {
-				$this->types[lang('Strings')]["json"] = 4294967295;
-				if (min_version(9.4, 0, $connection)) {
-					$this->types[lang('Strings')]["jsonb"] = 4294967295;
-				}
-			}
-			$this->editFunctions = array(
-				array(
-					"char" => "md5",
-					"date|time" => "now",
-				), array(
-					number_type() => "+/-",
-					"date|time" => "+ interval/- interval", //! escape
-					"char|text" => "||",
-				)
-			);
-			if (min_version(12, 0, $connection)) {
-				$this->generated = array("STORED");
-			}
-		}
-
-		function enumLength($field) {
-			$enum = $this->types[lang('User types')][$field["type"]];
-			return ($enum ? type_values($enum) : "");
-		}
-
-		function setUserTypes($types) {
-			$this->types[lang('User types')] = array_flip($types);
-		}
+	class Min_Driver extends Min_SQL {
 
 		function insertUpdate($table, $rows, $primary) {
 			global $connection;
@@ -257,10 +219,9 @@ if (isset($_GET["pgsql"])) {
 						$where[] = "$key = $val";
 					}
 				}
-				if (
-					!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")"))
-				) {
+				if (!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
+					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
+				)) {
 					return false;
 				}
 			}
@@ -268,14 +229,14 @@ if (isset($_GET["pgsql"])) {
 		}
 
 		function slowQuery($query, $timeout) {
-			$this->conn->query("SET statement_timeout = " . (1000 * $timeout));
-			$this->conn->timeout = 1000 * $timeout;
+			$this->_conn->query("SET statement_timeout = " . (1000 * $timeout));
+			$this->_conn->timeout = 1000 * $timeout;
 			return $query;
 		}
 
-		function convertSearch($idf, $val, $field) {
+		function convertSearch($idf, array $where, array $field) {
 			$textTypes = "char|text";
-			if (strpos($val["op"], "LIKE") === false) {
+			if (strpos($where["op"], "LIKE") === false) {
 				$textTypes .= "|date|time(stamp)?|boolean|uuid|inet|cidr|macaddr|" . number_type();
 			}
 
@@ -283,17 +244,17 @@ if (isset($_GET["pgsql"])) {
 		}
 
 		function quoteBinary($s) {
-			return $this->conn->quoteBinary($s);
+			return $this->_conn->quoteBinary($s);
 		}
 
 		function warnings() {
-			return $this->conn->warnings();
+			return $this->_conn->warnings();
 		}
 
-		function tableHelp($name, $is_view = false) {
+		function tableHelp($name) {
 			$links = array(
 				"information_schema" => "infoschema",
-				"pg_catalog" => ($is_view ? "view" : "catalog"),
+				"pg_catalog" => "catalog",
 			);
 			$link = $links[$_GET["ns"]];
 			if ($link) {
@@ -301,18 +262,6 @@ if (isset($_GET["pgsql"])) {
 			}
 		}
 
-		function supportsIndex($table_status) {
-			// returns true for "materialized view"
-			return $table_status["Engine"] != "view";
-		}
-
-		function hasCStyleEscapes() {
-			static $c_style;
-			if ($c_style === null) {
-				$c_style = ($this->conn->result("SHOW standard_conforming_strings") == "off");
-			}
-			return $c_style;
-		}
 	}
 
 
@@ -325,11 +274,21 @@ if (isset($_GET["pgsql"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
-		$connection = new Db;
+	function connect() {
+		global $adminer, $types, $structured_types;
+		$connection = new Min_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'");
+				if (min_version(9.2, 0, $connection)) {
+					$structured_types[lang('Strings')][] = "json";
+					$types["json"] = 4294967295;
+					if (min_version(9.4, 0, $connection)) {
+						$structured_types[lang('Strings')][] = "jsonb";
+						$types["jsonb"] = 4294967295;
+					}
+				}
 			}
 			return $connection;
 		}
@@ -337,9 +296,9 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database
-WHERE datallowconn = TRUE AND has_database_privilege(datname, 'CONNECT')
-ORDER BY datname");
+		return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid
+                 WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
+                 ORDER BY d.datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -354,7 +313,8 @@ ORDER BY datname");
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
+		global $connection;
+		return $connection->result("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
 	}
 
 	function engines() {
@@ -362,12 +322,13 @@ ORDER BY datname");
 	}
 
 	function logged_user() {
-		return get_val("SELECT user");
+		global $connection;
+		return $connection->result("SELECT user");
 	}
 
 	function tables_list() {
 		$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
-		if (support("materializedview")) {
+		if (support('materializedview')) { // ' - support("materializedview") could be removed by compile.php
 			$query .= "
 UNION ALL
 SELECT matviewname, 'MATERIALIZED VIEW'
@@ -380,38 +341,17 @@ ORDER BY 1";
 	}
 
 	function count_tables($databases) {
-		global $connection;
-		$return = array();
-		foreach ($databases as $db) {
-			if ($connection->select_db($db)) {
-				$return[$db] = count(tables_list());
-			}
-		}
-		return $return;
+		return array(); // would require reconnect
 	}
 
 	function table_status($name = "") {
-		static $has_size;
-		if ($has_size === null) {
-			// https://github.com/cockroachdb/cockroach/issues/40391
-			$has_size = get_val("SELECT 'pg_table_size'::regproc");
-		}
 		$return = array();
-		foreach (
-			get_rows("SELECT
-	c.relname AS \"Name\",
-	CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\"" . ($has_size ? ",
-	pg_table_size(c.oid) AS \"Data_length\",
-	pg_indexes_size(c.oid) AS \"Index_length\"" : "") . ",
-	obj_description(c.oid, 'pg_class') AS \"Comment\",
-	" . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\",
-	c.reltuples as \"Rows\",
-	n.nspname
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_table_size(c.oid) AS \"Data_length\", pg_indexes_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
 WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
-" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")) as $row //! Index_length, Auto_increment
-		) {
+" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
+		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
 		}
 		return ($name != "" ? $return[$name] : $return);
@@ -431,8 +371,8 @@ WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 			'timestamp without time zone' => 'timestamp',
 			'timestamp with time zone' => 'timestamptz',
 		);
-		foreach (
-			get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment" . (min_version(10) ? ", a.attidentity" . (min_version(12) ? ", a.attgenerated" : "") : "") . "
+
+		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment" . (min_version(10) ? ", a.attidentity" : "") . "
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
 JOIN pg_attribute a ON c.oid = a.attrelid
@@ -441,8 +381,8 @@ WHERE c.relname = " . q($table) . "
 AND n.nspname = current_schema()
 AND NOT a.attisdropped
 AND a.attnum > 0
-ORDER BY a.attnum") as $row
-		) {
+ORDER BY a.attnum"
+		) as $row) {
 			//! collation, primary
 			preg_match('~([^([]+)(\((.*)\))?([a-z ]+)?((\[[0-9]*])*)$~', $row["full_type"], $match);
 			list(, $type, $length, $row["length"], $addon, $array) = $match;
@@ -458,7 +398,6 @@ ORDER BY a.attnum") as $row
 			if (in_array($row['attidentity'], array('a', 'd'))) {
 				$row['default'] = 'GENERATED ' . ($row['attidentity'] == 'd' ? 'BY DEFAULT' : 'ALWAYS') . ' AS IDENTITY';
 			}
-			$row["generated"] = ($row["attgenerated"] == "s" ? "STORED" : "");
 			$row["null"] = !$row["attnotnull"];
 			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
 			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1);
@@ -478,18 +417,16 @@ ORDER BY a.attnum") as $row
 		$return = array();
 		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
 		$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
-		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid ORDER BY indisprimary DESC, indisunique DESC", $connection2) as $row) {
+		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption, (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
 			$relname = $row["relname"];
 			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
 			$return[$relname]["columns"] = array();
+			foreach (explode(" ", $row["indkey"]) as $indkey) {
+				$return[$relname]["columns"][] = $columns[$indkey];
+			}
 			$return[$relname]["descs"] = array();
-			if ($row["indkey"]) {
-				foreach (explode(" ", $row["indkey"]) as $indkey) {
-					$return[$relname]["columns"][] = $columns[$indkey];
-				}
-				foreach (explode(" ", $row["indoption"]) as $indoption) {
-					$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
-				}
+			foreach (explode(" ", $row["indoption"]) as $indoption) {
+				$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
 			}
 			$return[$relname]["lengths"] = array();
 		}
@@ -497,32 +434,48 @@ ORDER BY a.attnum") as $row
 	}
 
 	function foreign_keys($table) {
-		global $driver;
+		global $on_actions;
 		$return = array();
-		foreach (
-			get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
+		foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
 FROM pg_constraint
 WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema())
 AND contype = 'f'::char
-ORDER BY conkey, conname") as $row
-		) {
+ORDER BY conkey, conname") as $row) {
 			if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {
-				$row['source'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[1])));
+				$row['source'] = array_map('idf_unescape', array_map('trim', explode(',', $match[1])));
 				if (preg_match('~^(("([^"]|"")+"|[^"]+)\.)?"?("([^"]|"")+"|[^"]+)$~', $match[2], $match2)) {
 					$row['ns'] = idf_unescape($match2[2]);
 					$row['table'] = idf_unescape($match2[4]);
 				}
-				$row['target'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[3])));
-				$row['on_delete'] = (preg_match("~ON DELETE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
-				$row['on_update'] = (preg_match("~ON UPDATE ($driver->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['target'] = array_map('idf_unescape', array_map('trim', explode(',', $match[3])));
+				$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$return[$row['conname']] = $row;
 			}
 		}
 		return $return;
 	}
 
+	function constraints($table) {
+		global $on_actions;
+		$return = array();
+		foreach (get_rows("SELECT conname, consrc
+FROM pg_catalog.pg_constraint
+INNER JOIN pg_catalog.pg_namespace ON pg_constraint.connamespace = pg_namespace.oid
+INNER JOIN pg_catalog.pg_class ON pg_constraint.conrelid = pg_class.oid AND pg_constraint.connamespace = pg_class.relnamespace
+WHERE pg_constraint.contype = 'c'
+AND conrelid != 0 -- handle only CONSTRAINTs here, not TYPES
+AND nspname = current_schema()
+AND relname = " . q($table) . "
+ORDER BY connamespace, conname") as $row) {
+			$return[$row['conname']] = $row['consrc'];
+		}
+		return $return;
+	}
+
 	function view($name) {
-		return array("select" => trim(get_val("SELECT pg_get_viewdef(" . get_val("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
+		global $connection;
+		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
 	}
 
 	function collations() {
@@ -531,7 +484,7 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function information_schema($db) {
-		return get_schema() == "information_schema";
+		return ($db == "information_schema");
 	}
 
 	function error() {
@@ -540,7 +493,7 @@ ORDER BY conkey, conname") as $row
 		if (preg_match('~^(.*\n)?([^\n]*)\n( *)\^(\n.*)?$~s', $return, $match)) {
 			$return = $match[1] . preg_replace('~((?:[^&]|&[^;]*;){' . strlen($match[3]) . '})(.*)~', '\1<b>\2</b>', $match[2]) . $match[4];
 		}
-		return nl_br($return);
+		return nl2br($return);
 	}
 
 	function create_database($db, $collation) {
@@ -549,13 +502,17 @@ ORDER BY conkey, conname") as $row
 
 	function drop_databases($databases) {
 		global $connection;
+
 		$connection->close();
-		return apply_queries("DROP DATABASE", $databases, 'Adminer\idf_escape');
+
+		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
 	}
 
 	function rename_database($name, $collation) {
 		global $connection;
+
 		$connection->close();
+
 		return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name));
 	}
 
@@ -569,7 +526,6 @@ ORDER BY conkey, conname") as $row
 		if ($table != "" && $table != $name) {
 			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
 		}
-		$sequence = "";
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -591,15 +547,10 @@ ORDER BY conkey, conname") as $row
 						$queries[] = "ALTER TABLE " . table($name) . " RENAME $column TO $val[0]";
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
-					$sequence_name = $table . "_" . idf_unescape($val[0]) . "_seq";
-					$alter[] = "ALTER $column " . ($val[3] ? "SET" . preg_replace('~GENERATED ALWAYS(.*) STORED~', 'EXPRESSION\1', $val[3])
-						: (isset($val[6]) ? "SET DEFAULT nextval(" . q($sequence_name) . ")"
-						: "DROP DEFAULT" //! change to DROP EXPRESSION with generated columns
-					));
-					if (isset($val[6])) {
-						$sequence = "CREATE SEQUENCE IF NOT EXISTS " . idf_escape($sequence_name) . " OWNED BY " . idf_escape($table) . ".$val[0]";
+					if (!$val[6]) {
+						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT");
+						$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 					}
-					$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 				}
 				if ($field[0] != "" || $val5 != "") {
 					$queries[] = "COMMENT ON COLUMN " . table($name) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
@@ -612,15 +563,12 @@ ORDER BY conkey, conname") as $row
 		} elseif ($alter) {
 			array_unshift($queries, "ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
 		}
-		if ($sequence) {
-			array_unshift($queries, $sequence);
-		}
 		if ($comment !== null) {
 			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
 		}
-		// if ($auto_increment != "") {
+		if ($auto_increment != "") {
 			//! $queries[] = "SELECT setval(pg_get_serial_sequence(" . q($name) . ", ), $auto_increment)";
-		// }
+		}
 		foreach ($queries as $query) {
 			if (!queries($query)) {
 				return false;
@@ -661,7 +609,8 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function truncate_tables($tables) {
-		return queries("TRUNCATE " . implode(", ", array_map('Adminer\table', $tables)));
+		return queries("TRUNCATE " . implode(", ", array_map('table', $tables)));
+		return true;
 	}
 
 	function drop_views($views) {
@@ -670,10 +619,10 @@ ORDER BY conkey, conname") as $row
 
 	function drop_tables($tables) {
 		foreach ($tables as $table) {
-			$status = table_status($table);
-			if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
-				return false;
-			}
+				$status = table_status($table);
+				if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
+					return false;
+				}
 		}
 		return true;
 	}
@@ -729,23 +678,29 @@ ORDER BY conkey, conname") as $row
 	}
 
 	function routine($name, $type) {
-		$rows = get_rows('SELECT routine_definition AS definition, LOWER(external_language) AS language, *
-FROM information_schema.routines
-WHERE routine_schema = current_schema() AND specific_name = ' . q($name));
-		$return = $rows[0];
-		$return["returns"] = array("type" => $return["type_udt_name"]);
-		$return["fields"] = get_rows('SELECT parameter_name AS field, data_type AS type, character_maximum_length AS length, parameter_mode AS inout
-FROM information_schema.parameters
-WHERE specific_schema = current_schema() AND specific_name = ' . q($name) . '
-ORDER BY ordinal_position');
-		return $return;
+		$info = get_rows('SELECT routine_definition, external_language, type_udt_name
+			FROM information_schema.routines
+			WHERE routine_schema = current_schema() AND specific_name = ' . q($name))[0];
+
+		$fields = get_rows('SELECT parameter_name AS field, data_type AS type, character_maximum_length AS length, parameter_mode AS inout
+			FROM information_schema.parameters
+			WHERE specific_schema = current_schema() AND specific_name = ' . q($name) . '
+			ORDER BY ordinal_position');
+
+		return [
+			"fields" => $fields,
+			"returns" => ["type" => $info["type_udt_name"]],
+			"definition" => $info["routine_definition"],
+			"language" => strtolower($info["external_language"]),
+			"comment" => null, // Comments are not supported.
+		];
 	}
 
 	function routines() {
-		return get_rows('SELECT specific_name AS "SPECIFIC_NAME", routine_type AS "ROUTINE_TYPE", routine_name AS "ROUTINE_NAME", type_udt_name AS "DTD_IDENTIFIER"
-FROM information_schema.routines
-WHERE routine_schema = current_schema()
-ORDER BY SPECIFIC_NAME');
+		return get_rows('SELECT specific_name AS "SPECIFIC_NAME", routine_name AS "ROUTINE_NAME", routine_type AS "ROUTINE_TYPE", type_udt_name AS "DTD_IDENTIFIER", null AS ROUTINE_COMMENT
+			FROM information_schema.routines
+			WHERE routine_schema = current_schema()
+			ORDER BY SPECIFIC_NAME');
 	}
 
 	function routine_languages() {
@@ -769,15 +724,19 @@ ORDER BY SPECIFIC_NAME');
 	}
 
 	function found_rows($table_status, $where) {
-		if (preg_match("~ rows=([0-9]+)~", get_val("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")), $regs)) {
+		global $connection;
+		if (preg_match(
+			"~ rows=([0-9]+)~",
+			$connection->result("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")),
+			$regs
+		)) {
 			return $regs[1];
 		}
 		return false;
 	}
 
 	function types() {
-		return get_key_vals(
-			"SELECT oid, typname
+		return get_vals("SELECT typname
 FROM pg_type
 WHERE typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
 AND typtype IN ('b','d','e')
@@ -785,27 +744,27 @@ AND typelem = 0"
 		);
 	}
 
-	function type_values($id) {
-		// to get values from type string: unnest(enum_range(NULL::"$type"))
-		$enums = get_vals("SELECT enumlabel FROM pg_enum WHERE enumtypid = $id ORDER BY enumsortorder");
-		return ($enums ? "'" . implode("', '", array_map('addslashes', $enums)) . "'" : "");
-	}
-
 	function schemas() {
 		return get_vals("SELECT nspname FROM pg_namespace ORDER BY nspname");
 	}
 
 	function get_schema() {
-		return get_val("SELECT current_schema()");
+		global $connection;
+		return $connection->result("SELECT current_schema()");
 	}
 
 	function set_schema($schema, $connection2 = null) {
-		global $connection, $driver;
+		global $connection, $types, $structured_types;
 		if (!$connection2) {
 			$connection2 = $connection;
 		}
 		$return = $connection2->query("SET search_path TO " . idf_escape($schema));
-		$driver->setUserTypes(types()); //! get types from current_schemas('t')
+		foreach (types() as $type) { //! get types from current_schemas('t')
+			if (!isset($types[$type])) {
+				$types[$type] = 0;
+				$structured_types[lang('User types')][] = $type;
+			}
+		}
 		return $return;
 	}
 
@@ -827,7 +786,6 @@ AND typelem = 0"
 	}
 
 	function create_sql($table, $auto_increment, $style) {
-		global $driver;
 		$return_parts = array();
 		$sequences = array();
 
@@ -837,6 +795,9 @@ AND typelem = 0"
 			return rtrim("CREATE VIEW " . idf_escape($table) . " AS $view[select]", ";");
 		}
 		$fields = fields($table);
+		$indexes = indexes($table);
+		ksort($indexes);
+		$constraints = constraints($table);
 
 		if (!$status || empty($fields)) {
 			return false;
@@ -854,15 +815,16 @@ AND typelem = 0"
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$sq = reset(get_rows((min_version(10)
+				$rows = get_rows(min_version(10)
 					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
 					: "SELECT * FROM $sequence_name"
-				), null, "-- "));
-				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "")
-					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]"
-					. ($auto_increment && $sq['last_value'] ? " START " . ($sq["last_value"] + 1) : "")
-					. " CACHE $sq[cache_value];"
-				;
+				);
+				$sq = reset($rows);
+
+				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "") .
+					"CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]" .
+					($auto_increment && $sq['last_value'] ? " START " . ($sq["last_value"] + 1) : "") .
+					" CACHE $sq[cache_value];";
 			}
 		}
 
@@ -871,20 +833,31 @@ AND typelem = 0"
 			$return = implode("\n\n", $sequences) . "\n\n$return";
 		}
 
-		$primary = "";
-		foreach (indexes($table) as $index_name => $index) {
-			if ($index['type'] == 'PRIMARY') {
-				$primary = $index_name;
-				$return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('Adminer\idf_escape', $index['columns'])) . ")";
+		// primary + unique keys
+		foreach ($indexes as $index_name => $index) {
+			switch($index['type']) {
+				case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+				case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
 			}
 		}
 
-		foreach ($driver->checkConstraints($table) as $conname => $consrc) {
+		foreach ($constraints as $conname => $consrc) {
 			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " CHECK $consrc";
 		}
 
 		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
 
+		// "basic" indexes after table definition
+		foreach ($indexes as $index_name => $index) {
+			if ($index['type'] == 'INDEX') {
+				$columns = array();
+				foreach ($index['columns'] as $key => $val) {
+					$columns[] = idf_escape($val) . ($index['descs'][$key] ? " DESC" : "");
+				}
+				$return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', $columns) . ");";
+			}
+		}
+
 		// comments for table & fields
 		if ($status['Comment']) {
 			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
@@ -896,10 +869,6 @@ AND typelem = 0"
 			}
 		}
 
-		foreach (get_rows("SELECT indexdef FROM pg_catalog.pg_indexes WHERE schemaname = current_schema() AND tablename = " . q($table) . ($primary ? " AND indexname != " . q($primary) : ""), null, "-- ") as $row) {
-			$return .= "\n\n$row[indexdef];";
-		}
-
 		return rtrim($return, ';');
 	}
 
@@ -926,10 +895,30 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		static $c_style = null;
+
+		if ($c_style === null) {
+			$c_style = get_vals("SHOW standard_conforming_strings")[0] == "off";
+		}
+
+		return $c_style;
+	}
+
 	function process_list() {
 		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
 
+	function show_status() {
+	}
+
 	function convert_field($field) {
 	}
 
@@ -938,18 +927,58 @@ AND typelem = 0"
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
+		return preg_match('~^(database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
 	}
 
 	function kill_process($val) {
 		return queries("SELECT pg_terminate_backend(" . number($val) . ")");
 	}
 
-	function connection_id() {
+	function connection_id(){
 		return "SELECT pg_backend_pid()";
 	}
 
 	function max_connections() {
-		return get_val("SHOW max_connections");
+		global $connection;
+		return $connection->result("SHOW max_connections");
+	}
+
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array( //! arrays
+			lang('Numbers') => array("smallint" => 5, "integer" => 10, "bigint" => 19, "boolean" => 1, "numeric" => 0, "real" => 7, "double precision" => 16, "money" => 20),
+			lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
+			lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
+			lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
+			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "macaddr8" => 23, "txid_snapshot" => 0),
+			lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
+		) as $key => $val) { //! can be retrieved from pg_type
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("PgSQL", "PDO_PgSQL"),
+			'jush' => "pgsql",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "~", "~*", "!~", "!~*", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"), // no "SQL" to avoid CSRF
+			'operator_like' => "LIKE %%",
+			'operator_regexp' => '~*',
+			'functions' => array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
+			'edit_functions' => array(
+				array(
+					"char" => "md5",
+					"date|time" => "now",
+				), array(
+					number_type() => "+/-",
+					"date|time" => "+ interval/- interval", //! escape
+					"char|text" => "||",
+				)
+			),
+			'c_style_escapes' => true,
+		);
 	}
 }

adminer/drivers/sqlite.inc.php

@@ -1,105 +1,185 @@
 <?php
-namespace Adminer;
+$drivers["sqlite"] = "SQLite 3";
+$drivers["sqlite2"] = "SQLite 2";
 
-$drivers["sqlite"] = "SQLite";
+if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
+	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
+	if (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
+		if (isset($_GET["sqlite"])) {
 
-if (isset($_GET["sqlite"])) {
-	define('Adminer\DRIVER', "sqlite");
-	if (class_exists("SQLite3")) {
+			class Min_SQLite {
+				var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
 
-		class SqliteDb {
-			public $extension = "SQLite3", $server_info, $affected_rows, $errno, $error;
-			private $link;
-
-			function __construct($filename) {
-				$this->link = new \SQLite3($filename);
-				$version = $this->link->version();
-				$this->server_info = $version["versionString"];
-			}
-
-			function query($query) {
-				$result = @$this->link->query($query);
-				$this->error = "";
-				if (!$result) {
-					$this->errno = $this->link->lastErrorCode();
-					$this->error = $this->link->lastErrorMsg();
-					return false;
-				} elseif ($result->numColumns()) {
-					return new Result($result);
+				function __construct($filename) {
+					$this->_link = new SQLite3($filename);
+					$version = $this->_link->version();
+					$this->server_info = $version["versionString"];
 				}
-				$this->affected_rows = $this->link->changes();
-				return true;
-			}
 
-			function quote($string) {
-				return (is_utf8($string)
-					? "'" . $this->link->escapeString($string) . "'"
-					: "x'" . reset(unpack('H*', $string)) . "'"
-				);
-			}
-
-			function store_result() {
-				return $this->result;
-			}
-
-			function result($query, $field = 0) {
-				$result = $this->query($query);
-				if (!is_object($result)) {
-					return false;
+				function query($query) {
+					$result = @$this->_link->query($query);
+					$this->error = "";
+					if (!$result) {
+						$this->errno = $this->_link->lastErrorCode();
+						$this->error = $this->_link->lastErrorMsg();
+						return false;
+					} elseif ($result->numColumns()) {
+						return new Min_Result($result);
+					}
+					$this->affected_rows = $this->_link->changes();
+					return true;
 				}
-				$row = $result->fetch_row();
-				return $row ? $row[$field] : false;
-			}
-		}
 
-		class Result {
-			public $num_rows;
-			private $result, $offset = 0;
+				function quote($string) {
+					return (is_utf8($string)
+						? "'" . $this->_link->escapeString($string) . "'"
+						: "x'" . reset(unpack('H*', $string)) . "'"
+					);
+				}
 
-			function __construct($result) {
-				$this->result = $result;
+				function store_result() {
+					return $this->_result;
+				}
+
+				function result($query, $field = 0) {
+					$result = $this->query($query);
+					if (!is_object($result)) {
+						return false;
+					}
+					$row = $result->_result->fetchArray();
+					return $row ? $row[$field] : false;
+				}
 			}
 
-			function fetch_assoc() {
-				return $this->result->fetchArray(SQLITE3_ASSOC);
+			class Min_Result {
+				var $_result, $_offset = 0, $num_rows;
+
+				function __construct($result) {
+					$this->_result = $result;
+				}
+
+				function fetch_assoc() {
+					return $this->_result->fetchArray(SQLITE3_ASSOC);
+				}
+
+				function fetch_row() {
+					return $this->_result->fetchArray(SQLITE3_NUM);
+				}
+
+				function fetch_field() {
+					$column = $this->_offset++;
+					$type = $this->_result->columnType($column);
+					return (object) array(
+						"name" => $this->_result->columnName($column),
+						"type" => $type,
+						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
+					);
+				}
+
+				function __desctruct() {
+					return $this->_result->finalize();
+				}
 			}
 
-			function fetch_row() {
-				return $this->result->fetchArray(SQLITE3_NUM);
+		} else {
+
+			class Min_SQLite {
+				var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
+
+				function __construct($filename) {
+					$this->server_info = sqlite_libversion();
+					$this->_link = new SQLiteDatabase($filename);
+				}
+
+				function query($query, $unbuffered = false) {
+					$method = ($unbuffered ? "unbufferedQuery" : "query");
+					$result = @$this->_link->$method($query, SQLITE_BOTH, $error);
+					$this->error = "";
+					if (!$result) {
+						$this->error = $error;
+						return false;
+					} elseif ($result === true) {
+						$this->affected_rows = $this->changes();
+						return true;
+					}
+					return new Min_Result($result);
+				}
+
+				function quote($string) {
+					return "'" . sqlite_escape_string($string) . "'";
+				}
+
+				function store_result() {
+					return $this->_result;
+				}
+
+				function result($query, $field = 0) {
+					$result = $this->query($query);
+					if (!is_object($result)) {
+						return false;
+					}
+					$row = $result->_result->fetch();
+					return $row[$field];
+				}
 			}
 
-			function fetch_field() {
-				$column = $this->offset++;
-				$type = $this->result->columnType($column);
-				return (object) array(
-					"name" => $this->result->columnName($column),
-					"type" => $type,
-					"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
-				);
+			class Min_Result {
+				var $_result, $_offset = 0, $num_rows;
+
+				function __construct($result) {
+					$this->_result = $result;
+					if (method_exists($result, 'numRows')) { // not available in unbuffered query
+						$this->num_rows = $result->numRows();
+					}
+				}
+
+				function fetch_assoc() {
+					$row = $this->_result->fetch(SQLITE_ASSOC);
+					if (!$row) {
+						return false;
+					}
+					$return = array();
+					foreach ($row as $key => $val) {
+						$return[idf_unescape($key)] = $val;
+					}
+					return $return;
+				}
+
+				function fetch_row() {
+					return $this->_result->fetch(SQLITE_NUM);
+				}
+
+				function fetch_field() {
+					$name = $this->_result->fieldName($this->_offset++);
+					$pattern = '(\[.*]|"(?:[^"]|"")*"|(.+))';
+					if (preg_match("~^($pattern\\.)?$pattern\$~", $name, $match)) {
+						$table = ($match[3] != "" ? $match[3] : idf_unescape($match[2]));
+						$name = ($match[5] != "" ? $match[5] : idf_unescape($match[4]));
+					}
+					return (object) array(
+						"name" => $name,
+						"orgname" => $name,
+						"orgtable" => $table,
+					);
+				}
+
 			}
 
-			function __desctruct() {
-				return $this->result->finalize();
-			}
 		}
 
 	} elseif (extension_loaded("pdo_sqlite")) {
-		class SqliteDb extends PdoDb {
-			public $extension = "PDO_SQLite";
+		class Min_SQLite extends Min_PDO {
+			var $extension = "PDO_SQLite";
 
 			function __construct($filename) {
 				$this->dsn(DRIVER . ":$filename", "", "");
 			}
-
-			function select_db($db) {
-				return false;
-			}
 		}
 
 	}
 
-	if (class_exists('Adminer\SqliteDb')) {
-		class Db extends SqliteDb {
+	if (class_exists("Min_SQLite")) {
+		class Min_DB extends Min_SQLite {
 
 			function __construct() {
 				parent::__construct(":memory:");
@@ -117,7 +197,7 @@ if (isset($_GET["sqlite"])) {
 			}
 
 			function multi_query($query) {
-				return $this->result = $this->query($query);
+				return $this->_result = $this->query($query);
 			}
 
 			function next_result() {
@@ -128,36 +208,7 @@ if (isset($_GET["sqlite"])) {
 
 
 
-	class Driver extends SqlDriver {
-		static $possibleDrivers = array("SQLite3", "PDO_SQLite");
-		static $jush = "sqlite";
-
-		protected $types = array(array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0));
-
-		public $editFunctions = array(
-			array(
-				// "text" => "date('now')/time('now')/datetime('now')",
-			), array(
-				"integer|real|numeric" => "+/-",
-				// "text" => "date/time/datetime",
-				"text" => "||",
-			)
-		);
-
-		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
-		public $functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
-		public $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
-
-		function __construct($connection) {
-			parent::__construct($connection);
-			if (min_version(3.31, 0, $connection)) {
-				$this->generated = array("STORED", "VIRTUAL");
-			}
-		}
-
-		function structuredTypes() {
-			return array_keys($this->types[0]);
-		}
+	class Min_Driver extends Min_SQL {
 
 		function insertUpdate($table, $rows, $primary) {
 			$values = array();
@@ -167,7 +218,7 @@ if (isset($_GET["sqlite"])) {
 			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
 		}
 
-		function tableHelp($name, $is_view = false) {
+		function tableHelp($name) {
 			if ($name == "sqlite_sequence") {
 				return "fileformat2.html#seqtab";
 			}
@@ -176,10 +227,6 @@ if (isset($_GET["sqlite"])) {
 			}
 		}
 
-		function checkConstraints($table) {
-			preg_match_all('~ CHECK *(\( *(((?>[^()]*[^() ])|(?1))*) *\))~', $this->conn->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table)), $matches); //! could be inside a comment
-			return array_combine($matches[2], $matches[2]);
-		}
 	}
 
 
@@ -192,12 +239,13 @@ if (isset($_GET["sqlite"])) {
 		return idf_escape($idf);
 	}
 
-	function connect($credentials) {
-		list(, , $password) = $credentials;
+	function connect() {
+		global $adminer;
+		list(, , $password) = $adminer->credentials();
 		if ($password != "") {
 			return lang('Database does not support password.');
 		}
-		return new Db;
+		return new Min_DB;
 	}
 
 	function get_databases() {
@@ -209,14 +257,16 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function limit1($table, $query, $where, $separator = "\n") {
-		return (preg_match('~^INTO~', $query) || get_val("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
+		global $connection;
+		return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
 			? limit($query, $where, 1, 0, $separator)
 			: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" //! use primary key in tables with WITHOUT rowid
 		);
 	}
 
 	function db_collation($db, $collations) {
-		return get_val("PRAGMA encoding"); // there is no database list so $db == DB
+		global $connection;
+		return $connection->result("PRAGMA encoding"); // there is no database list so $db == DB
 	}
 
 	function engines() {
@@ -236,9 +286,10 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function table_status($name = "") {
+		global $connection;
 		$return = array();
 		foreach (get_rows("SELECT name AS Name, type AS Engine, 'rowid' AS Oid, '' AS Auto_increment FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
-			$row["Rows"] = get_val("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
+			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
 		}
 		foreach (get_rows("SELECT * FROM sqlite_sequence", null, "") as $row) {
@@ -252,13 +303,15 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function fk_support($table_status) {
-		return !get_val("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
+		global $connection;
+		return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
 		$primary = "";
-		foreach (get_rows("PRAGMA table_" . (min_version(3.31) ? "x" : "") . "info(" . table($table) . ")") as $row) {
+		foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
 			$name = $row["name"];
 			$type = strtolower($row["type"]);
 			$default = $row["dflt_value"];
@@ -266,7 +319,7 @@ if (isset($_GET["sqlite"])) {
 				"field" => $name,
 				"type" => (preg_match('~int~i', $type) ? "integer" : (preg_match('~char|clob|text~i', $type) ? "text" : (preg_match('~blob~i', $type) ? "blob" : (preg_match('~real|floa|doub~i', $type) ? "real" : "numeric")))),
 				"full_type" => $type,
-				"default" => (preg_match("~^'(.*)'$~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
+				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
 				"privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"primary" => $row["pk"],
@@ -280,21 +333,14 @@ if (isset($_GET["sqlite"])) {
 				$primary = $name;
 			}
 		}
-		$sql = get_val("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
-		$idf = '(("[^"]*+")+|[a-z0-9_]+)';
-		preg_match_all('~' . $idf . '\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
+		$sql = $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
+		preg_match_all('~(("[^"]*+")+|[a-z0-9_]+)\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
 		foreach ($matches as $match) {
 			$name = str_replace('""', '"', preg_replace('~^"|"$~', '', $match[1]));
 			if ($return[$name]) {
 				$return[$name]["collation"] = trim($match[3], "'");
 			}
 		}
-		preg_match_all('~' . $idf . '\s.*GENERATED ALWAYS AS \((.+)\) (STORED|VIRTUAL)~i', $sql, $matches, PREG_SET_ORDER);
-		foreach ($matches as $match) {
-			$name = str_replace('""', '"', preg_replace('~^"|"$~', '', $match[1]));
-			$return[$name]["default"] = $match[3];
-			$return[$name]["generated"] = strtoupper($match[4]);
-		}
 		return $return;
 	}
 
@@ -349,6 +395,7 @@ if (isset($_GET["sqlite"])) {
 		$return = array();
 		foreach (get_rows("PRAGMA foreign_key_list(" . table($table) . ")") as $row) {
 			$foreign_key = &$return[$row["id"]];
+			//! idf_unescape in SQLite2
 			if (!$foreign_key) {
 				$foreign_key = $row;
 			}
@@ -359,7 +406,8 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function view($name) {
-		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', get_val("SELECT sql FROM sqlite_master WHERE type = 'view' AND name = " . q($name)))); //! identifiers may be inside []
+		global $connection;
+		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)))); //! identifiers may be inside []
 	}
 
 	function collations() {
@@ -396,7 +444,7 @@ if (isset($_GET["sqlite"])) {
 			return false;
 		}
 		try {
-			$link = new SqliteDb($db);
+			$link = new Min_SQLite($db);
 		} catch (Exception $ex) {
 			$connection->error = $ex->getMessage();
 			return false;
@@ -430,11 +478,12 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function auto_increment() {
-		return " PRIMARY KEY AUTOINCREMENT";
+		return " PRIMARY KEY" . (DRIVER == "sqlite" ? " AUTOINCREMENT" : "");
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		global $connection;
+
 		$use_all_fields = ($table == "" || $foreign);
 		foreach ($fields as $field) {
 			if ($field[0] != "" || !$field[1] || $field[2]) {
@@ -442,96 +491,105 @@ if (isset($_GET["sqlite"])) {
 				break;
 			}
 		}
-		$alter = array();
-		$originals = array();
+
+		$alter_fields = [];
+		$originals = [];
+
 		foreach ($fields as $field) {
-			if ($field[1]) {
-				$alter[] = ($use_all_fields ? $field[1] : "ADD " . implode($field[1]));
-				if ($field[0] != "") {
-					$originals[$field[0]] = $field[1][0];
-				}
+			if (!$field[1]) continue;
+
+			if ($field[0] != "") {
+				$originals[$field[0]] = $field[1][0];
 			}
+
+			$alter_fields[] = ($use_all_fields ? $field[1] : "ADD " . implode($field[1]));
 		}
+
 		if (!$use_all_fields) {
-			foreach ($alter as $val) {
+			foreach ($alter_fields as $val) {
 				if (!queries("ALTER TABLE " . table($table) . " $val")) {
 					return false;
 				}
 			}
+
 			if ($table != $name && !queries("ALTER TABLE " . table($table) . " RENAME TO " . table($name))) {
 				return false;
 			}
-		} elseif (!recreate_table($table, $name, $alter, $originals, $foreign, $auto_increment)) {
+		} elseif (!recreate_table($table, $name, $alter_fields, $originals, $foreign, $auto_increment)) {
 			return false;
 		}
+
 		if ($auto_increment) {
 			queries("BEGIN");
 			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
+
 			if (!$connection->affected_rows) {
 				queries("INSERT INTO sqlite_sequence (name, seq) VALUES (" . q($name) . ", $auto_increment)");
 			}
+
 			queries("COMMIT");
 		}
+
 		return true;
 	}
 
-	/** Recreate table
-	* @param string original name
-	* @param string new name
-	* @param array [process_field()], empty to preserve
-	* @param array [$original => idf_escape($new_column)], empty to preserve
-	* @param string [format_foreign_key()], empty to preserve
-	* @param int set auto_increment to this value, 0 to preserve
-	* @param array [[$type, $name, $columns]], empty to preserve
-	* @param string CHECK constraint to drop
-	* @param string CHECK constraint to add
-	* @return bool
-	*/
-	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment = 0, $indexes = array(), $drop_check = "", $add_check = "") {
-		global $driver;
+	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment, $indexes = []) {
+		global $connection;
+
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
 					if ($indexes) {
 						$field["auto_increment"] = 0;
 					}
+
 					$fields[] = process_field($field, $field);
 					$originals[$key] = idf_escape($key);
 				}
 			}
+
 			$primary_key = false;
 			foreach ($fields as $field) {
 				if ($field[6]) {
 					$primary_key = true;
 				}
 			}
-			$drop_indexes = array();
+
+			$drop_indexes = [];
 			foreach ($indexes as $key => $val) {
 				if ($val[2] == "DROP") {
 					$drop_indexes[$val[1]] = true;
 					unset($indexes[$key]);
 				}
 			}
+
 			foreach (indexes($table) as $key_name => $index) {
-				$columns = array();
+				$columns = [];
 				foreach ($index["columns"] as $key => $column) {
-					if (!$originals[$column]) {
+					if (!isset($originals[$column])) {
 						continue 2;
 					}
 					$columns[] = $originals[$column] . ($index["descs"][$key] ? " DESC" : "");
 				}
+
 				if (!$drop_indexes[$key_name]) {
 					if ($index["type"] != "PRIMARY" || !$primary_key) {
+						// Remove sqlite_ prefix from internal index created by UNIQUE column constraint.
+						// This will transform column constrain to basic index.
+						$key_name = preg_replace('~^sqlite_~', "", $key_name);
+
 						$indexes[] = array($index["type"], $key_name, $columns);
 					}
 				}
 			}
+
 			foreach ($indexes as $key => $val) {
 				if ($val[0] == "PRIMARY") {
 					unset($indexes[$key]);
 					$foreign[] = "  PRIMARY KEY (" . implode(", ", $val[2]) . ")";
 				}
 			}
+
 			foreach (foreign_keys($table) as $key_name => $foreign_key) {
 				foreach ($foreign_key["source"] as $key => $column) {
 					if (!$originals[$column]) {
@@ -539,59 +597,58 @@ if (isset($_GET["sqlite"])) {
 					}
 					$foreign_key["source"][$key] = idf_unescape($originals[$column]);
 				}
+
 				if (!isset($foreign[" $key_name"])) {
 					$foreign[] = " " . format_foreign_key($foreign_key);
 				}
 			}
+
 			queries("BEGIN");
 		}
+
 		foreach ($fields as $key => $field) {
-			if (preg_match('~GENERATED~', $field[3])) {
-				unset($originals[array_search($field[0], $originals)]);
-			}
 			$fields[$key] = "  " . implode($field);
 		}
+
 		$fields = array_merge($fields, array_filter($foreign));
-		foreach ($driver->checkConstraints($table) as $check) {
-			if ($check != $drop_check) {
-				$fields[] = "  CHECK ($check)";
-			}
-		}
-		if ($add_check) {
-			$fields[] = "  CHECK ($add_check)";
-		}
 		$temp_name = ($table == $name ? "adminer_$name" : $name);
 		if (!queries("CREATE TABLE " . table($temp_name) . " (\n" . implode(",\n", $fields) . "\n)")) {
 			// implicit ROLLBACK to not overwrite $connection->error
 			return false;
 		}
+
 		if ($table != "") {
-			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('Adminer\idf_escape', array_keys($originals))) . " FROM " . table($table))) {
+			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
 				return false;
 			}
-			$triggers = array();
+
+			$triggers = [];
 			foreach (triggers($table) as $trigger_name => $timing_event) {
 				$trigger = trigger($trigger_name);
 				$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
 			}
-			$auto_increment = $auto_increment ? 0 : get_val("SELECT seq FROM sqlite_sequence WHERE name = " . q($table)); // if $auto_increment is set then it will be updated later
-			if (
-				!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
+
+			$auto_increment = $auto_increment ? 0 : $connection->result("SELECT seq FROM sqlite_sequence WHERE name = " . q($table)); // if $auto_increment is set then it will be updated later
+			if (!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
 				|| ($table == $name && !queries("ALTER TABLE " . table($temp_name) . " RENAME TO " . table($name)))
 				|| !alter_indexes($name, $indexes)
 			) {
 				return false;
 			}
+
 			if ($auto_increment) {
 				queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
 			}
+
 			foreach ($triggers as $trigger) {
 				if (!queries($trigger)) {
 					return false;
 				}
 			}
+
 			queries("COMMIT");
 		}
+
 		return true;
 	}
 
@@ -604,20 +661,21 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function alter_indexes($table, $alter) {
-		foreach ($alter as $primary) {
-			if ($primary[0] == "PRIMARY") {
-				return recreate_table($table, $table, array(), array(), array(), 0, $alter);
+		foreach ($alter as $index) {
+			if ($index[0] == "PRIMARY" || (preg_match('~^sqlite_~', $index[1]))) {
+				return recreate_table($table, $table, [], [], [], 0, $alter);
 			}
 		}
+
 		foreach (array_reverse($alter) as $val) {
-			if (
-				!queries($val[2] == "DROP"
+			if (!queries($val[2] == "DROP"
 				? "DROP INDEX " . idf_escape($val[1])
-				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")"))
-			) {
+				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")")
+			)) {
 				return false;
 			}
 		}
+
 		return true;
 	}
 
@@ -638,6 +696,7 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function trigger($name) {
+		global $connection;
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
@@ -645,7 +704,7 @@ if (isset($_GET["sqlite"])) {
 		$trigger_options = trigger_options();
 		preg_match(
 			"~^CREATE\\s+TRIGGER\\s*$idf\\s*(" . implode("|", $trigger_options["Timing"]) . ")\\s+([a-z]+)(?:\\s+OF\\s+($idf))?\\s+ON\\s*$idf\\s*(?:FOR\\s+EACH\\s+ROW\\s)?(.*)~is",
-			get_val("SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = " . q($name)),
+			$connection->result("SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = " . q($name)),
 			$match
 		);
 		$of = $match[3];
@@ -681,7 +740,8 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function last_id() {
-		return get_val("SELECT LAST_INSERT_ROWID()");
+		global $connection;
+		return $connection->result("SELECT LAST_INSERT_ROWID()");
 	}
 
 	function explain($connection, $query) {
@@ -695,14 +755,31 @@ if (isset($_GET["sqlite"])) {
 		return array();
 	}
 
+	function schemas() {
+		return array();
+	}
+
+	function get_schema() {
+		return "";
+	}
+
+	function set_schema($scheme) {
+		return true;
+	}
+
 	function create_sql($table, $auto_increment, $style) {
-		$return = get_val("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
+		global $connection;
+
+		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
 		foreach (indexes($table) as $name => $index) {
-			if ($name == '') {
+			// Skip primary key and internal indexes.
+			if ($name == '' || strpos($name, "sqlite_") === 0) {
 				continue;
 			}
-			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('Adminer\idf_escape', $index['columns'])) . ")");
+
+			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('idf_escape', $index['columns'])) . ")");
 		}
+
 		return $return;
 	}
 
@@ -718,18 +795,25 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function show_variables() {
+		global $connection;
 		$return = array();
-		foreach (get_rows("PRAGMA pragma_list") as $row) {
-			$name = $row["name"];
-			if ($name != "pragma_list" && $name != "compile_options") {
-				foreach (get_rows("PRAGMA $name") as $row) {
-					$return[$name] .= implode(", ", $row) . "\n";
-				}
-			}
+		foreach (array("auto_vacuum", "cache_size", "count_changes", "default_cache_size", "empty_result_callbacks", "encoding", "foreign_keys", "full_column_names", "fullfsync", "journal_mode", "journal_size_limit", "legacy_file_format", "locking_mode", "page_size", "max_page_count", "read_uncommitted", "recursive_triggers", "reverse_unordered_selects", "secure_delete", "short_column_names", "synchronous", "temp_store", "temp_store_directory", "schema_version", "integrity_check", "quick_check") as $key) {
+			$return[$key] = $connection->result("PRAGMA $key");
 		}
 		return $return;
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {
@@ -747,6 +831,30 @@ if (isset($_GET["sqlite"])) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(check|columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
+		return preg_match('~^(columns|database|drop_col|dump|indexes|descidx|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
+	}
+
+	function driver_config() {
+		$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
+		return array(
+			'possible_drivers' => array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite"),
+			'jush' => "sqlite",
+			'types' => $types,
+			'structured_types' => array_keys($types),
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"), // REGEXP can be user defined function
+			'operator_like' => "LIKE %%",
+			'functions' => array("hex", "length", "lower", "round", "unixepoch", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"),
+			'edit_functions' => array(
+				array(
+					// "text" => "date('now')/time('now')/datetime('now')",
+				), array(
+					"integer|real|numeric" => "+/-",
+					// "text" => "date/time/datetime",
+					"text" => "||",
+				)
+			),
+		);
 	}
 }

adminer/dump.inc.php

@@ -1,24 +1,21 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["dump"];
 
 if ($_POST && !$error) {
 	$cookie = "";
-	foreach (array("output", "format", "db_style", "types", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
+	foreach (array("output", "format", "db_style", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
 		$cookie .= "&$key=" . urlencode($_POST[$key]);
 	}
 	cookie("adminer_export", substr($cookie, 1));
 	$tables = array_flip((array) $_POST["tables"]) + array_flip((array) $_POST["data"]);
 	$ext = dump_headers(
 		(count($tables) == 1 ? key($tables) : DB),
-		(DB == "" || count($tables) > 1)
-	);
+		(DB == "" || count($tables) > 1));
 	$is_sql = preg_match('~sql~', $_POST["format"]);
 
 	if ($is_sql) {
 		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " " . str_replace("\n", " ", $connection->server_info) . " dump\n\n";
-		if (JUSH == "sql") {
+		if ($jush == "sql") {
 			echo "SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;
@@ -42,7 +39,7 @@ SET foreign_key_checks = 0;
 	foreach ((array) $databases as $db) {
 		$adminer->dumpDatabase($db);
 		if ($connection->select_db($db)) {
-			if ($is_sql && preg_match('~CREATE~', $style) && ($create = get_val("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+			if ($is_sql && preg_match('~CREATE~', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
 				set_utf8mb4($create);
 				if ($style == "DROP+CREATE") {
 					echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
@@ -55,37 +52,27 @@ SET foreign_key_checks = 0;
 				}
 				$out = "";
 
-				if ($_POST["types"]) {
-					foreach (types() as $id => $type) {
-						$enums = type_values($id);
-						if ($enums) {
-							$out .= ($style != 'DROP+CREATE' ? "DROP TYPE IF EXISTS " . idf_escape($type) . ";;\n" : "") . "CREATE TYPE " . idf_escape($type) . " AS ENUM ($enums);\n\n";
-						} else {
-							//! https://github.com/postgres/postgres/blob/REL_17_4/src/bin/pg_dump/pg_dump.c#L10846
-							$out .= "-- Could not export type $type\n\n";
-						}
-					}
-				}
-
 				if ($_POST["routines"]) {
-					foreach (routines() as $row) {
-						$name = $row["ROUTINE_NAME"];
-						$routine = $row["ROUTINE_TYPE"];
-						$create = create_routine($routine, array("name" => $name) + routine($row["SPECIFIC_NAME"], $routine));
-						set_utf8mb4($create);
-						$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($name) . ";;\n" : "") . "$create;\n\n";
+					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
+						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
+							$create = remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2));
+							set_utf8mb4($create);
+							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
+						}
 					}
 				}
 
 				if ($_POST["events"]) {
 					foreach (get_rows("SHOW EVENTS", null, "-- ") as $row) {
-						$create = remove_definer(get_val("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
+						$create = remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
 						set_utf8mb4($create);
 						$out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
 					}
 				}
 
-				echo ($out && JUSH == 'sql' ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : $out);
+				if ($out) {
+					echo "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n";
+				}
 			}
 
 			if ($_POST["table_style"] || $_POST["data_style"]) {
@@ -120,7 +107,7 @@ SET foreign_key_checks = 0;
 				}
 
 				// add FKs after creating tables (except in MySQL which uses SET FOREIGN_KEY_CHECKS=0)
-				if (function_exists('Adminer\foreign_keys_sql')) {
+				if (function_exists('foreign_keys_sql')) {
 					foreach (table_status('', true) as $name => $table_status) {
 						$table = (DB == "" || in_array($name, (array) $_POST["tables"]));
 						if ($table && !is_view($table_status)) {
@@ -140,7 +127,9 @@ SET foreign_key_checks = 0;
 		}
 	}
 
-	$adminer->dumpFooter();
+	if ($is_sql) {
+		echo "-- " . $connection->result("SELECT NOW()") . "\n";
+	}
 	exit;
 }
 
@@ -148,29 +137,26 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_
 ?>
 
 <form action="" method="post">
-<table class="layout">
+<table cellspacing="0" class="layout">
 <?php
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
 $data_style = array('', 'TRUNCATE+INSERT', 'INSERT');
-if (JUSH == "sql") { //! use insertUpdate() in all drivers
+if ($jush == "sql") { //! use insertUpdate() in all drivers
 	$data_style[] = 'INSERT+UPDATE';
 }
 parse_str($_COOKIE["adminer_export"], $row);
 if (!$row) {
-	$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
+	$row = array("output" => "file", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
 }
 if (!isset($row["events"])) { // backwards compatibility
 	$row["routines"] = $row["events"] = ($_GET["dump"] == "");
 	$row["triggers"] = $row["table_style"];
 }
 
-echo "<tr><th>" . lang('Output') . "<td>" . html_radios("output", $adminer->dumpOutput(), $row["output"]) . "\n";
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], false) . "\n"; // false = radio
 
-echo "<tr><th>" . lang('Format') . "<td>" . html_radios("format", $adminer->dumpFormat(), $row["format"]) . "\n";
-
-echo (JUSH == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
-	. (support("type") ? checkbox("types", 1, $row["types"], lang('User types')) : "")
+echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
 	. (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "")
 	. (support("event") ? checkbox("events", 1, $row["events"], lang('Events')) : "")
 );
@@ -181,20 +167,23 @@ echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_st
 ;
 
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
+
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], false) . "\n"; // false = radio
+
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 
-<table>
+<table cellspacing="0">
 <?php
 echo script("qsl('table').onclick = dumpClick;");
 $prefixes = array();
 if (DB != "") {
 	$checked = ($TABLE != "" ? "" : " checked");
 	echo "<thead><tr>";
-	echo "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked>" . lang('Tables') . "</label>" . script("qs('#check-tables').onclick = partial(formCheck, /^tables\\[/);", "");
-	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked></label>" . script("qs('#check-data').onclick = partial(formCheck, /^data\\[/);", "");
+	echo "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked>" . lang('Tables') . "</label>" . script("gid('check-tables').onclick = partial(formCheck, /^tables\\[/);", "");
+	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked></label>" . script("gid('check-data').onclick = partial(formCheck, /^data\\[/);", "");
 	echo "</thead>\n";
 
 	$views = "";
@@ -219,7 +208,7 @@ if (DB != "") {
 } else {
 	echo "<thead><tr><th style='text-align: left;'>";
 	echo "<label class='block'><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . ">" . lang('Database') . "</label>";
-	echo script("qs('#check-databases').onclick = partial(formCheck, /^databases\\[/);", "");
+	echo script("gid('check-databases').onclick = partial(formCheck, /^databases\\[/);", "");
 	echo "</thead>\n";
 	$databases = $adminer->databases();
 	if ($databases) {

adminer/edit.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["edit"];
 $fields = fields($TABLE);
 $where = (isset($_GET["select"]) ? ($_POST["check"] && count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
@@ -68,7 +66,13 @@ if ($_POST["save"]) {
 	$select = array();
 	foreach ($fields as $name => $field) {
 		if (isset($field["privileges"]["select"])) {
-			$as = ($_POST["clone"] && $field["auto_increment"] ? "''" : convert_field($field));
+			$as = convert_field($field);
+			if ($_POST["clone"] && $field["auto_increment"]) {
+				$as = "''";
+			}
+			if ($jush == "sql" && preg_match("~enum|set~", $field["type"])) {
+				$as = "1*" . idf_escape($name);
+			}
 			$select[] = ($as ? "$as AS " : "") . idf_escape($name);
 		}
 	}

adminer/elastic.php

@@ -1,14 +1,13 @@
 <?php
-// To create Adminer just for Elasticsearch, run `../compile.php elastic`.
-
 function adminer_object() {
 	include_once "../plugins/plugin.php";
 	include_once "../plugins/login-password-less.php";
 	include_once "../plugins/drivers/elastic.php";
-	return new AdminerPlugin(array(
-			// TODO: inline the result of password_hash() so that the password is not visible in source codes
-			new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
-	));
+	include_once "../plugins/drivers/elastic5.php";
+	return new AdminerPlugin([
+		// TODO: inline the result of password_hash() so that the password is not visible in source codes
+		new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
+	]);
 }
 
 include "./index.php";

adminer/event.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $EVENT = $_GET["event"];
 $intervals = array("YEAR", "QUARTER", "MONTH", "DAY", "HOUR", "MINUTE", "WEEK", "SECOND", "YEAR_MONTH", "DAY_HOUR", "DAY_MINUTE", "DAY_SECOND", "HOUR_MINUTE", "HOUR_SECOND", "MINUTE_SECOND");
 $statuses = array("ENABLED" => "ENABLE", "DISABLED" => "DISABLE", "SLAVESIDE_DISABLED" => "DISABLE ON SLAVE");
@@ -17,18 +15,14 @@ if ($_POST && !$error) {
 			: "AT " . q($row["STARTS"])
 			) . " ON COMPLETION" . ($row["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
-
-		queries_redirect(
-			substr(ME, 0, -1),
-			($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')),
-			queries(
-				($EVENT != ""
-				? "ALTER EVENT " . idf_escape($EVENT) . $schedule . ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
-				: "CREATE EVENT " . idf_escape($row["EVENT_NAME"]) . $schedule
-				) . "\n" . $statuses[$row["STATUS"]] . " COMMENT " . q($row["EVENT_COMMENT"])
-				. rtrim(" DO\n$row[EVENT_DEFINITION]", ";") . ";"
-			)
-		);
+		
+		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), queries(($EVENT != ""
+			? "ALTER EVENT " . idf_escape($EVENT) . $schedule
+			. ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
+			: "CREATE EVENT " . idf_escape($row["EVENT_NAME"]) . $schedule
+			) . "\n" . $statuses[$row["STATUS"]] . " COMMENT " . q($row["EVENT_COMMENT"])
+			. rtrim(" DO\n$row[EVENT_DEFINITION]", ";") . ";"
+		));
 	}
 }
 
@@ -41,7 +35,7 @@ if (!$row && $EVENT != "") {
 ?>
 
 <form action="" method="post">
-<table class="layout">
+<table cellspacing="0" class="layout">
 <tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" data-maxlength="64" autocapitalize="off">
 <tr><th title="datetime"><?php echo lang('Start'); ?><td><input name="STARTS" value="<?php echo h("$row[EXECUTE_AT]$row[STARTS]"); ?>">
 <tr><th title="datetime"><?php echo lang('End'); ?><td><input name="ENDS" value="<?php echo h($row["ENDS"]); ?>">
@@ -53,8 +47,6 @@ if (!$row && $EVENT != "") {
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?>
-<?php } ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/file.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 // caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
@@ -8,40 +6,21 @@ if ($_GET["file"] == "favicon.ico") {
 	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
+	echo lzw_decompress(compile_file('../adminer/static/default.css;../vendor/vrana/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;
-../externals/jush/modules/jush-textarea.js;
-../externals/jush/modules/jush-txt.js;
-../externals/jush/modules/jush-js.js;
-../externals/jush/modules/jush-sql.js;
-../externals/jush/modules/jush-pgsql.js;
-../externals/jush/modules/jush-sqlite.js;
-../externals/jush/modules/jush-mssql.js;
-../externals/jush/modules/jush-oracle.js;
-../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+	echo lzw_decompress(compile_file('../vendor/vrana/jush/modules/jush.js;../vendor/vrana/jush/modules/jush-textarea.js;../vendor/vrana/jush/modules/jush-txt.js;../vendor/vrana/jush/modules/jush-js.js;../vendor/vrana/jush/modules/jush-sql.js;../vendor/vrana/jush/modules/jush-pgsql.js;../vendor/vrana/jush/modules/jush-sqlite.js;../vendor/vrana/jush/modules/jush-mssql.js;../vendor/vrana/jush/modules/jush-oracle.js;../vendor/vrana/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {
-		case "plus.gif":
-			echo compile_file('../adminer/static/plus.gif');
-			break;
-		case "cross.gif":
-			echo compile_file('../adminer/static/cross.gif');
-			break;
-		case "up.gif":
-			echo compile_file('../adminer/static/up.gif');
-			break;
-		case "down.gif":
-			echo compile_file('../adminer/static/down.gif');
-			break;
-		case "arrow.gif":
-			echo compile_file('../adminer/static/arrow.gif');
-			break;
+		case "plus.gif": echo compile_file('../adminer/static/plus.gif'); break;
+		case "cross.gif": echo compile_file('../adminer/static/cross.gif'); break;
+		case "up.gif": echo compile_file('../adminer/static/up.gif'); break;
+		case "down.gif": echo compile_file('../adminer/static/down.gif'); break;
+		case "arrow.gif": echo compile_file('../adminer/static/arrow.gif'); break;
 	}
 }
 exit;

adminer/foreign.inc.php

@@ -1,11 +1,12 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["foreign"];
 $name = $_GET["name"];
 $row = $_POST;
 
 if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-js"]) {
+	$message = ($_POST["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
+	$location = ME . "table=" . urlencode($TABLE);
+	
 	if (!$_POST["drop"]) {
 		$row["source"] = array_filter($row["source"], 'strlen');
 		ksort($row["source"]); // enforce input order
@@ -15,24 +16,19 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 		}
 		$row["target"] = $target;
 	}
-
-	if (JUSH == "sqlite") {
-		$result = recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($row["drop"] ? "" : " " . format_foreign_key($row))));
+	
+	if ($jush == "sqlite") {
+		queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
 	} else {
 		$alter = "ALTER TABLE " . table($TABLE);
-		$result = ($name == "" || queries("$alter DROP " . (JUSH == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name)));
-		if (!$row["drop"]) {
-			$result = queries("$alter ADD" . format_foreign_key($row));
+		$drop = "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name);
+		if ($_POST["drop"]) {
+			query_redirect($alter . $drop, $location, $message);
+		} else {
+			query_redirect($alter . ($name != "" ? "$drop," : "") . "\nADD" . format_foreign_key($row), $location, $message);
+			$error = lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.') . "<br>$error"; //! no partitioning
 		}
 	}
-	queries_redirect(
-		ME . "table=" . urlencode($TABLE),
-		($row["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.'))),
-		$result
-	);
-	if (!$row["drop"]) {
-		$error = "$error<br>" . lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.'); //! no partitioning
-	}
 }
 
 page_header(lang('Foreign key'), $error, array("table" => $TABLE), h($TABLE));
@@ -61,22 +57,15 @@ if ($row["db"] != "") {
 	$connection->select_db($row["db"]);
 }
 if ($row["ns"] != "") {
-	$orig_schema = get_schema();
 	set_schema($row["ns"]);
 }
-$referencable = array_keys(array_filter(table_status('', true), 'Adminer\fk_support'));
+$referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
 $target = array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable)));
 $onchange = "this.form['change-js'].value = '1'; this.form.submit();";
 echo "<p>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "\n";
-if (support("scheme")) {
-	$schemas = array_filter($adminer->schemas(), function ($schema) {
-		return !preg_match('~^information_schema$~i', $schema);
-	});
-	echo lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
-	if ($row["ns"] != "") {
-		set_schema($orig_schema);
-	}
-} elseif (JUSH != "sqlite") {
+if ($jush == "pgsql") {
+	echo lang('Schema') . ": " . html_select("ns", $adminer->schemas(), $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
+} elseif ($jush != "sqlite") {
 	$dbs = array();
 	foreach ($adminer->databases() as $db) {
 		if (!information_schema($db)) {
@@ -88,33 +77,31 @@ if (support("scheme")) {
 ?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
-<table>
+<table cellspacing="0">
 <thead><tr><th id="label-source"><?php echo lang('Source'); ?><th id="label-target"><?php echo lang('Target'); ?></thead>
 <?php
 $j = 0;
 foreach ($row["source"] as $key => $val) {
 	echo "<tr>";
-	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : ""), "label-source");
-	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], "", "label-target");
+	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : 1), "label-source");
+	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
 	$j++;
 }
 ?>
 </table>
 <p>
-<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $driver->onActions), $row["on_delete"]); ?>
- <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $driver->onActions), $row["on_update"]); ?>
+<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $on_actions), $row["on_delete"]); ?>
+ <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $on_actions), $row["on_update"]); ?>
 <?php echo doc_link(array(
 	'sql' => "innodb-foreign-key-constraints.html",
 	'mariadb' => "foreign-keys/",
 	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
-	'mssql' => "t-sql/statements/create-table-transact-sql",
-	'oracle' => "SQLRF01111",
+	'mssql' => "ms174979.aspx",
+	'oracle' => "https://docs.oracle.com/cd/B19306_01/server.102/b14200/clauses002.htm#sthref2903",
 )); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
-<?php if ($name != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
-<?php } ?>
+<?php if ($name != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/include/adminer.inc.php

@@ -1,38 +1,44 @@
 <?php
-namespace Adminer;
-
 // any method change in this file should be transferred to editor/include/adminer.inc.php and plugins/plugin.php
 
 class Adminer {
 	/** @var array operators used in select, null for all operators */
-	public $operators;
+	var $operators = null;
+	/** @var string operator for LIKE condition */
+	var $operator_like = null;
+	/** @var string operator for regular expression condition */
+	var $operator_regexp = null;
 
 	/** Name in title and navigation
 	* @return string HTML code
 	*/
 	function name() {
-		return "<a href='https://www.adminer.org/'" . target_blank() . " id='h1'>Adminer</a>";
+		return "<a id='h1' href='" . h(HOME_URL) . "'>AdminerNeo</a>";
 	}
 
 	/** Connection parameters
-	* @return array [$server, $username, $password]
+	* @return array ($server, $username, $password)
 	*/
 	function credentials() {
 		return array(SERVER, $_GET["username"], get_password());
 	}
 
 	/** Get SSL connection options
-	* @return array ["key" => filename, "cert" => filename, "ca" => filename] or null
+	* @return array array("key" => filename, "cert" => filename, "ca" => filename) or null
 	*/
 	function connectSsl() {
 	}
 
-	/** Get key used for permanent login
-	* @param bool
-	* @return string cryptic string which gets combined with password or false in case of an error
-	*/
+	/**
+	 * Gets a private key used for permanent login.
+	 *
+	 * @param bool $create
+	 *
+	 * @return string|false Cryptic string which gets combined with password or false in case of an error.
+	 * @throws \Random\RandomException
+	 */
 	function permanentLogin($create = false) {
-		return password_file($create);
+		return get_private_key($create);
 	}
 
 	/** Return key used to group brute force attacks; behind a reverse proxy, you want to return the last part of X-Forwarded-For
@@ -98,7 +104,7 @@ class Adminer {
 	*/
 	function head() {
 		?>
-<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
+<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">
 <?php
 		return true;
 	}
@@ -120,12 +126,12 @@ class Adminer {
 	*/
 	function loginForm() {
 		global $drivers;
-		echo "<table class='layout'>\n";
-		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"));
-		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">');
-		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" autofocus value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("qs('#username').form['auth[driver]'].onchange();"));
-		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">');
-		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">');
+		echo "<table cellspacing='0' class='layout'>\n";
+		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n");
+		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
+		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(gid('username')); gid('username').form['auth[driver]'].onchange();"));
+		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">' . "\n");
+		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">' . "\n");
 		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
@@ -138,7 +144,7 @@ class Adminer {
 	* @return string
 	*/
 	function loginFormField($name, $heading, $value) {
-		return $heading . $value . "\n";
+		return $heading . $value;
 	}
 
 	/** Authorize the user
@@ -176,16 +182,14 @@ class Adminer {
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
-		global $driver;
+		global $jush, $driver;
 		echo '<p class="links">';
 		$links = array("select" => lang('Select data'));
 		if (support("table") || support("indexes")) {
 			$links["table"] = lang('Show structure');
 		}
-		$is_view = false;
 		if (support("table")) {
-			$is_view = is_view($tableStatus);
-			if ($is_view) {
+			if (is_view($tableStatus)) {
 				$links["view"] = lang('Alter view');
 			} else {
 				$links["create"] = lang('Alter table');
@@ -198,7 +202,7 @@ class Adminer {
 		foreach ($links as $key => $val) {
 			echo " <a href='" . h(ME) . "$key=" . urlencode($name) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
 		}
-		echo doc_link(array(JUSH => $driver->tableHelp($name, $is_view)), "?");
+		echo doc_link(array($jush => $driver->tableHelp($name)), "?");
 		echo "\n";
 	}
 
@@ -234,25 +238,34 @@ class Adminer {
 	* @return string
 	*/
 	function selectQuery($query, $start, $failed = false) {
-		global $driver;
-		$return = "</p>\n"; // required for IE9 inline edit
+		global $jush, $driver;
+
+        $supportSql = support("sql");
+
+		$result = "<p>"
+            . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> "
+            . "<span class='time'>(" . format_time($start) . ")</span>"
+			. ($supportSql ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "");
+
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
-			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
-				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
-			;
+			$result .= ($supportSql ? "," : "")
+                . " <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+                . "</p>\n"
+                . "<div id='$id' class='hidden'>\n$warnings</div>\n";
+		} else {
+			$result .= "</p>\n";
 		}
-		return "<p><code class='jush-" . JUSH . "'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
-			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
-			. $return
-		;
+
+        return $result;
 	}
 
 	/** Query printed in SQL command before execution
 	* @param string query to be executed
 	* @return string escaped query to be printed
 	*/
-	function sqlCommandQuery($query) {
+	function sqlCommandQuery($query)
+	{
 		return shorten_utf8(trim($query), 1000);
 	}
 
@@ -296,7 +309,7 @@ class Adminer {
 		if (preg_match('~json~', $field["type"])) {
 			$return = "<code class='jush-js'>$return</code>";
 		}
-		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : "") . ">$return</a>" : $return);
+		return ($link ? "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -305,6 +318,11 @@ class Adminer {
 	* @return string
 	*/
 	function editVal($val, $field) {
+		// Format Elasticsearch boolean value, but do not touch PostgreSQL boolean that use string value 't' or 'f'.
+		if ($field["type"] == "boolean" && is_bool($val)) {
+			return $val ? "true" : "false";
+		}
+
 		return $val;
 	}
 
@@ -313,22 +331,15 @@ class Adminer {
 	* @return null
 	*/
 	function tableStructurePrint($fields) {
-		global $driver;
 		echo "<div class='scrollable'>\n";
-		echo "<table class='nowrap odds'>\n";
+		echo "<table cellspacing='0' class='nowrap'>\n";
 		echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
-		$structured_types = $driver->structuredTypes();
 		foreach ($fields as $field) {
-			echo "<tr><th>" . h($field["field"]);
-			$type = h($field["full_type"]);
-			echo "<td><span title='" . h($field["collation"]) . "'>"
-				. (in_array($type, (array) $structured_types[lang('User types')]) ? "<a href='" . h(ME . 'type=' . urlencode($type)) . "'>$type</a>" : $type)
-				. "</span>"
-			;
+			echo "<tr" . odd() . "><th>" . h($field["field"]);
+			echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
 			echo ($field["null"] ? " <i>NULL</i>" : "");
 			echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
-			$default = h($field["default"]);
-			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . ($field["generated"] ? "<code class='jush-" . JUSH . "'>$default</code>" : $default) . "</b>]</span>" : "");
+			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
 			echo (support("comment") ? "<td>" . h($field["comment"]) : "");
 			echo "\n";
 		}
@@ -336,15 +347,40 @@ class Adminer {
 		echo "</div>\n";
 	}
 
+	function tablePartitionsPrint($partition_info) {
+		$showList = $partition_info["partition_by"] == "RANGE" || $partition_info["partition_by"] == "LIST";
+
+		echo "<p>";
+		echo "<code>{$partition_info["partition_by"]} ({$partition_info["partition"]})</code>";
+		if (!$showList) {
+			echo " " . lang('Partitions') . ": " . h($partition_info["partitions"]);
+		}
+		echo "</p>";
+
+		if ($showList) {
+			echo "<table>\n";
+			echo "<thead><tr><th>" . lang('Partition') . "</th><td>" . lang('Values') . "</td></tr></thead>\n";
+
+			foreach ($partition_info["partition_names"] as $key => $name) {
+				echo "<tr><th>" . h($name) . "</th><td>" . h($partition_info["partition_values"][$key]) . "\n";
+			}
+
+			echo "</table>\n";
+		}
+	}
+
 	/** Print list of indexes on table in tabular format
 	* @param array data about all indexes on a table
 	* @return null
 	*/
 	function tableIndexesPrint($indexes) {
 		echo "<table>\n";
+		echo "<thead><tr><th>" . lang('Type') . "</th><td>" . lang('Column (length)') . "</td></tr></thead>\n";
+
 		foreach ($indexes as $name => $index) {
 			ksort($index["columns"]); // enforce correct columns order
-			$print = array();
+			$print = [];
+
 			foreach ($index["columns"] as $key => $val) {
 				$print[] = "<i>" . h($val) . "</i>"
 					. ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
@@ -353,91 +389,127 @@ class Adminer {
 			}
 			echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
 		}
+
 		echo "</table>\n";
 	}
 
-	/** Print columns box in select
-	* @param array result of selectColumnsProcess()[0]
-	* @param array selectable columns
-	* @return null
-	*/
+	/**
+	 * Prints columns box in select filter.
+	 *
+	 * @param array $select result of selectColumnsProcess()[0]
+	 * @param array $columns selectable columns
+	 */
 	function selectColumnsPrint($select, $columns) {
-		global $driver;
-		print_fieldset("select", lang('Select'), $select);
+		global $functions, $grouping;
+
+		print_fieldset("select", lang('Select'), $select, true);
+
+		$_GET["columns"][""] = [];
 		$i = 0;
-		$select[""] = array();
-		foreach ($select as $key => $val) {
-			$val = $_GET["columns"][$key];
+
+		foreach ($_GET["columns"] as $key => $val) {
+			if ($key != "" && $val["col"] == "") continue;
+
 			$column = select_input(
-				" name='columns[$i][col]'",
+				"name='columns[$i][col]'",
 				$columns,
 				$val["col"],
-				($key !== "" ? "selectFieldChange" : "selectAddRow")
+				$key !== "" ? "selectFieldChange" : "selectAddRow"
 			);
-			echo "<div>" . ($driver->functions || $driver->grouping ? html_select("columns[$i][fun]", array(-1 => "") + array_filter(array(lang('Functions') => $driver->functions, lang('Aggregation') => $driver->grouping)), $val["fun"])
-				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
-				. script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
-				. "($column)" : $column) . "</div>\n";
+
+			echo "<div ", ($key != "" ? "" : "class='no-sort'"), ">",
+				"<span class='jsonly handle'></span>";
+
+			if ($functions || $grouping) {
+				echo "<select name='columns[$i][fun]'>",
+					optionlist([-1 => ""] + array_filter([lang('Functions') => $functions, lang('Aggregation') => $grouping]), $val["fun"]),
+					"</select>",
+					help_script_command("value && value.replace(/ |\$/, '(') + ')'", true),
+					script("qsl('select').onchange = (event) => { " . ($key !== "" ? "" : " qsl('select, input:not(.remove)', event.target.parentNode).onchange();") . " };", ""),
+					"($column)";
+			} else {
+				echo $column;
+			}
+
+			echo " <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
+				script("qsl('#fieldset-select .remove').onclick = selectRemoveRow;", ""),
+				"</div>\n";
+
 			$i++;
 		}
-		echo "</div></fieldset>\n";
+
+		echo "</div>", script("initSortable('#fieldset-select');"), "</fieldset>\n";
 	}
 
-	/** Print search box in select
-	* @param array result of selectSearchProcess()
-	* @param array selectable columns
-	* @param array
-	* @return null
-	*/
+	/**
+	 * Prints search box in select.
+	 *
+	 * @param array $where result of selectSearchProcess()
+	 * @param array $columns selectable columns
+	 */
 	function selectSearchPrint($where, $columns, $indexes) {
 		print_fieldset("search", lang('Search'), $where);
+
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
-				echo "<div>(<i>" . implode("</i>, <i>", array_map('Adminer\h', $index["columns"])) . "</i>) AGAINST";
-				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
-				echo script("qsl('input').oninput = selectFieldChange;", "");
-				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
-				echo "</div>\n";
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST",
+					" <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>",
+					script("qsl('input').oninput = selectFieldChange;", ""),
+					checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL"),
+					"</div>\n";
 			}
 		}
+
 		$change_next = "this.parentNode.firstChild.onchange();";
 		foreach (array_merge((array) $_GET["where"], array(array())) as $i => $val) {
 			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
-				echo "<div>" . select_input(
-					" name='where[$i][col]'",
-					$columns,
-					$val["col"],
-					($val ? "selectFieldChange" : "selectAddRow"),
-					"(" . lang('anywhere') . ")"
-				);
-				echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
-				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>";
-				echo script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", "");
-				echo "</div>\n";
+				echo "<div>",
+					select_input(
+						" name='where[$i][col]'",
+						$columns,
+						$val["col"],
+						($val ? "selectFieldChange" : "selectAddRow"),
+						"(" . lang('anywhere') . ")"
+					),
+					html_select("where[$i][op]", $this->operators, $val["op"], $change_next),
+					"<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>",
+					script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", ""),
+					" <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
+					script('qsl("#fieldset-search .remove").onclick = selectRemoveRow;', ""),
+					"</div>\n";
 			}
 		}
+
 		echo "</div></fieldset>\n";
 	}
 
-	/** Print order box in select
-	* @param array result of selectOrderProcess()
-	* @param array selectable columns
-	* @param array
-	* @return null
-	*/
+	/**
+	 * Prints order box in select filter.
+	 *
+	 * @param array $order result of selectOrderProcess()
+	 * @param array $columns selectable columns
+	 */
 	function selectOrderPrint($order, $columns, $indexes) {
-		print_fieldset("sort", lang('Sort'), $order);
+		print_fieldset("sort", lang('Sort'), $order, true);
+
+		$_GET["order"][""] = "";
 		$i = 0;
+
 		foreach ((array) $_GET["order"] as $key => $val) {
-			if ($val != "") {
-				echo "<div>" . select_input(" name='order[$i]'", $columns, $val, "selectFieldChange");
-				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
-				$i++;
-			}
+			if ($key != "" && $val == "") continue;
+
+			echo "<div ", ($key != "" ? "" : "class='no-sort'"), ">",
+				"<span class='jsonly handle'></span>",
+				select_input("name='order[$i]'", $columns, $val, $key !== "" ? "selectFieldChange" : "selectAddRow"),
+				checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')),
+				" <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
+				script('qsl("#fieldset-sort .remove").onclick = selectRemoveRow;', ""),
+				"</div>\n";
+
+			$i++;
 		}
-		echo "<div>" . select_input(" name='order[$i]'", $columns, "", "selectAddRow");
-		echo checkbox("desc[$i]", 1, false, lang('descending')) . "</div>\n";
-		echo "</div></fieldset>\n";
+
+		echo "</div>", script("initSortable('#fieldset-sort');"), "</fieldset>\n";
 	}
 
 	/** Print limit box in select
@@ -485,7 +557,7 @@ class Adminer {
 			json_row($key);
 		}
 		echo ";\n";
-		echo "selectFieldChange.call(qs('#form')['select']);\n";
+		echo "selectFieldChange.call(gid('form')['select']);\n";
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
@@ -515,16 +587,16 @@ class Adminer {
 	/** Process columns box in select
 	* @param array selectable columns
 	* @param array
-	* @return array [[select_expressions], [group_expressions]]
+	* @return array (array(select_expressions), array(group_expressions))
 	*/
 	function selectColumnsProcess($columns, $indexes) {
-		global $driver;
+		global $functions, $grouping;
 		$select = array(); // select expressions, empty for *
 		$group = array(); // expressions without aggregation - will be used for GROUP BY if an aggregation function is used
 		foreach ((array) $_GET["columns"] as $key => $val) {
-			if ($val["fun"] == "count" || ($val["col"] != "" && (!$val["fun"] || in_array($val["fun"], $driver->functions) || in_array($val["fun"], $driver->grouping)))) {
+			if ($val["fun"] == "count" || ($val["col"] != "" && (!$val["fun"] || in_array($val["fun"], $functions) || in_array($val["fun"], $grouping)))) {
 				$select[$key] = apply_sql_function($val["fun"], ($val["col"] != "" ? idf_escape($val["col"]) : "*"));
-				if (!in_array($val["fun"], $driver->grouping)) {
+				if (!in_array($val["fun"], $grouping)) {
 					$group[] = $select[$key];
 				}
 			}
@@ -538,51 +610,62 @@ class Adminer {
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $connection, $driver;
-		$return = array();
+		global $driver;
+
+		$return = [];
+
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
-				$return[] = "MATCH (" . implode(", ", array_map('Adminer\idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
+				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-		foreach ((array) $_GET["where"] as $key => $val) {
-			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
+
+		foreach ((array) $_GET["where"] as $where) {
+			$col = $where["col"];
+			$op = $where["op"];
+			$val = $where["val"];
+
+			if ("$col$val" != "" && in_array($op, $this->operators)) {
 				$prefix = "";
-				$cond = " $val[op]";
-				if (preg_match('~IN$~', $val["op"])) {
-					$in = process_length($val["val"]);
+				$cond = " $op";
+
+				if (preg_match('~IN$~', $op)) {
+					$in = process_length($val);
 					$cond .= " " . ($in != "" ? $in : "(NULL)");
-				} elseif ($val["op"] == "SQL") {
-					$cond = " $val[val]"; // SQL injection
-				} elseif ($val["op"] == "LIKE %%") {
-					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
-				} elseif ($val["op"] == "ILIKE %%") {
-					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
-				} elseif ($val["op"] == "FIND_IN_SET") {
-					$prefix = "$val[op](" . q($val["val"]) . ", ";
+				} elseif ($op == "SQL") {
+					$cond = " $val"; // SQL injection
+				} elseif ($op == "LIKE %%") {
+					$cond = " LIKE " . $this->processInput($fields[$col], "%$val%");
+				} elseif ($op == "ILIKE %%") {
+					$cond = " ILIKE " . $this->processInput($fields[$col], "%$val%");
+				} elseif ($op == "FIND_IN_SET") {
+					$prefix = "$op(" . q($val) . ", ";
 					$cond = ")";
-				} elseif (!preg_match('~NULL$~', $val["op"])) {
-					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
+				} elseif (!preg_match('~NULL$~', $op)) {
+					$cond .= " " . $this->processInput($fields[$col], $val);
 				}
-				if ($val["col"] != "") {
-					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
+
+				if ($col != "") {
+					$return[] = $prefix . $driver->convertSearch(idf_escape($col), $where, $fields[$col]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if (
-							isset($field["privileges"]["where"])
-							&& (preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
+						if (isset($field["privileges"]["where"])
+                            && (preg_match('~^[-\d.' . (preg_match('~IN$~', $op) ? ',' : '') . ']+$~', $val) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val) || preg_match('~char|text|enum|set~', $field["type"]))
+							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val))
+							&& (!preg_match('~^elastic~', DRIVER) || $field["type"] != "boolean" || preg_match('~true|false~', $val)) // Elasticsearch needs boolean value properly formatted.
+							&& (!preg_match('~^elastic~', DRIVER) || strpos($op, "regexp") === false || preg_match('~text|keyword~', $field["type"])) // Elasticsearch can use regexp only on text and keyword fields.
 						) {
-							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $where, $field) . $cond;
 						}
 					}
 					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
+
 		return $return;
 	}
 
@@ -646,7 +729,7 @@ class Adminer {
 	* @return string
 	*/
 	function messageQuery($query, $time, $failed = false) {
-		global $driver;
+		global $jush, $driver;
 		restart_session();
 		$history = &get_session("queries");
 		if (!$history[$_GET["db"]]) {
@@ -663,7 +746,7 @@ class Adminer {
 			$return = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
 		}
 		return " <span class='time'>" . @date("H:i:s") . "</span>" // @ - time zone may be not set
-			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-" . JUSH . "'>" . shorten_utf8($query, 1000) . "</code></pre>"
+			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . "</code></pre>"
 			. ($time ? " <span class='time'>($time)</span>" : '')
 			. (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
 			. '</div>'
@@ -685,10 +768,10 @@ class Adminer {
 	* @return array
 	*/
 	function editFunctions($field) {
-		global $driver;
+		global $edit_functions;
 		$return = ($field["null"] ? "NULL/" : "");
 		$update = isset($_GET["select"]) || where($_GET);
-		foreach ($driver->editFunctions as $key => $functions) {
+		foreach ($edit_functions as $key => $functions) {
 			if (!$key || (!isset($_GET["call"]) && $update)) { // relative functions
 				foreach ($functions as $pattern => $val) {
 					if (!$pattern || preg_match("~$pattern~", $field["type"])) {
@@ -713,11 +796,11 @@ class Adminer {
 	* @param string
 	* @return string custom input field or empty string for default
 	*/
-	function editInput($table, $field, $attrs, $value) {
+	function editInput($table, $field, $attrs, $value, $function) {
 		if ($field["type"] == "enum") {
 			return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
 				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
-				. enum_input("radio", $attrs, $field, $value, $value === 0 ? 0 : null) // 0 - empty value
+				. enum_input("radio", $attrs, $field, $value, 0) // 0 - empty
 			;
 		}
 		return "";
@@ -765,10 +848,11 @@ class Adminer {
 	* @return array
 	*/
 	function dumpOutput() {
-		$return = array('text' => lang('open'), 'file' => lang('save'));
+		$return = array('file' => lang('save'), 'text' => lang('open'));
 		if (function_exists('gzencode')) {
 			$return['gz'] = 'gzip';
 		}
+
 		return $return;
 	}
 
@@ -776,7 +860,7 @@ class Adminer {
 	* @return array empty to disable export
 	*/
 	function dumpFormat() {
-		return (support("dump") ? array('sql' => 'SQL') : array()) + array('csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
+		return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
 	}
 
 	/** Export database structure
@@ -828,32 +912,21 @@ class Adminer {
 	* @return null prints data
 	*/
 	function dumpData($table, $style, $query) {
-		global $connection;
+		global $connection, $jush;
+		$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
 		if ($style) {
-			$max_packet = (JUSH == "sqlite" ? 0 : 1048576); // default, minimum is 1024
-			$fields = array();
-			$identity_insert = false;
 			if ($_POST["format"] == "sql") {
 				if ($style == "TRUNCATE+INSERT") {
 					echo truncate_sql($table) . ";\n";
 				}
 				$fields = fields($table);
-				if (JUSH == "mssql") {
-					foreach ($fields as $field) {
-						if ($field["auto_increment"]) {
-							echo "SET IDENTITY_INSERT " . table($table) . " ON;\n";
-							$identity_insert = true;
-							break;
-						}
-					}
-				}
 			}
 			$result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
 			if ($result) {
 				$insert = "";
 				$buffer = "";
 				$keys = array();
-				$generated = array();
+				$generatedKeys = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -861,10 +934,10 @@ class Adminer {
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
-							if ($fields[$field->name]['generated']) {
-								$generated[$field->name] = true;
+							if (!empty($fields[$field->name]['generated'])) {
+								$generatedKeys[$field->name] = true;
 								continue;
-							}
+                            }
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -879,13 +952,13 @@ class Adminer {
 						dump_csv($row);
 					} else {
 						if (!$insert) {
-							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('Adminer\idf_escape', $keys)) . ") VALUES";
+							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
-							if ($generated[$key]) {
+							if (isset($generatedKeys[$key])) {
 								unset($row[$key]);
 								continue;
-							}
+                            }
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
 								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
@@ -909,9 +982,6 @@ class Adminer {
 			} elseif ($_POST["format"] == "sql") {
 				echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
 			}
-			if ($identity_insert) {
-				echo "SET IDENTITY_INSERT " . table($table) . " OFF;\n";
-			}
 		}
 	}
 
@@ -937,26 +1007,16 @@ class Adminer {
 			($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
 		)));
 		if ($output == "gz") {
-			ob_start(function ($string) {
-				// ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
-				return gzencode($string);
-			}, 1e6);
+			ob_start('ob_gzencode', 1e6);
 		}
 		return $ext;
 	}
 
-	/** Print text after export
-	* @return null prints data
-	*/
-	function dumpFooter() {
-		if ($_POST["format"] == "sql") {
-			echo "-- " . gmdate("Y-m-d H:i:s e") . "\n";
-		}
-	}
-
-	/** Set the path of the file for webserver load
-	* @return string path of the sql dump file
-	*/
+	/**
+	 * Gets the path of the file for webserver load.
+	 *
+	 * @return string Path of the sql import file.
+	 */
 	function importServerPath() {
 		return "adminer.sql";
 	}
@@ -977,17 +1037,28 @@ class Adminer {
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $drivers, $connection;
-		?>
+		global $VERSION, $jush, $drivers, $connection;
+?>
+
 <h1>
-<?php echo $this->name(); ?>
-<span class="version">
-<?php echo $VERSION; ?>
- <a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-</span>
+	<?php echo $this->name(); ?>
+
+	<?php if ($missing != "auth"): ?>
+		<span class="version">
+			<?php echo $VERSION; ?>
+			<a href="https://github.com/adminerneo/adminerneo/releases"<?php echo target_blank(); ?> id="version">
+				<?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?>
+			</a>
+		</span>
+		<?php
+		if (!isset($_COOKIE["adminer_version"])) {
+			echo script("verifyVersion('" . js_escape(ME) . "', '" . get_token() . "');");
+		}
+		?>
+    <?php endif; ?>
 </h1>
+
 <?php
-		switch_lang();
 		if ($missing == "auth") {
 			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
@@ -996,14 +1067,21 @@ class Adminer {
 						if ($password !== null) {
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
+								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>"
+									. h($drivers[$vendor])
+									. ($username != "" || $server != "" ? " - " : "")
+									. h($username)
+									. ($username != "" && $server != "" ? "@" : "")
+									. ($server != "" ? h($this->serverName($server)) : "")
+									. ($db != "" ? h(" - $db") : "")
+									. "</a></li>\n";
 							}
 						}
 					}
 				}
 			}
 			if ($output) {
-				echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
+				echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(gid('logins'), {onmouseover: menuOver, onmouseout: menuOut});");
 			}
 		} else {
 			$tables = array();
@@ -1011,12 +1089,12 @@ class Adminer {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
-			echo script_src("../externals/jush/modules/jush.js");
-			echo script_src("../externals/jush/modules/jush-textarea.js");
-			echo script_src("../externals/jush/modules/jush-txt.js");
-			echo script_src("../externals/jush/modules/jush-js.js");
+			echo script_src("../vendor/vrana/jush/modules/jush.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-textarea.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-txt.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-js.js");
 			if (support("sql")) {
-				echo script_src("../externals/jush/modules/jush-" . JUSH . ".js");
+				echo script_src("../vendor/vrana/jush/modules/jush-$jush.js");
 				?>
 <script<?php echo nonce(); ?>>
 <?php
@@ -1025,9 +1103,9 @@ class Adminer {
 					foreach ($tables as $table => $type) {
 						$links[] = preg_quote($table, '/');
 					}
-					echo "var jushLinks = { " . JUSH . ": [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+					echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
 					foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
-						echo "jushLinks.$val = jushLinks." . JUSH . ";\n";
+						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
 				}
 				$server_info = $connection->server_info;
@@ -1036,22 +1114,29 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 </script>
 <?php
 			}
+
 			$this->databasesPrint($missing);
-			$actions = array();
+
+			$actions = [];
 			if (DB == "" || !$missing) {
 				if (support("sql")) {
 					$actions[] = "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>";
 					$actions[] = "<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>";
 				}
-				$actions[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
+				if (support("dump")) {
+					$actions[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
+				}
 			}
-			$in_db = $_GET["ns"] !== "" && !$missing && DB != "";
-			if ($in_db) {
-				$actions[] = '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>";
+			if ($_GET["ns"] !== "" && !$missing && DB != "") {
+				$actions[] = '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
 			}
-			echo ($actions ? "<p class='links'>\n" . implode("\n", $actions) . "\n" : "");
-			if ($in_db) {
+			if ($actions) {
+				echo "<p class='links'>" . implode("\n", $actions) . "</p>";
+			}
+
+			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				if ($tables) {
+					$this->printTablesFilter();
 					$this->tablesPrint($tables);
 				} else {
 					echo "<p class='message'>" . lang('No tables.') . "</p>\n";
@@ -1060,65 +1145,97 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		}
 	}
 
-	/** Prints databases list in menu
-	* @param string
-	* @return null
-	*/
+	/**
+	 * Prints databases select in menu.
+	 *
+	 * @param $missing string
+	 * @return null
+	 */
 	function databasesPrint($missing) {
 		global $adminer, $connection;
+
 		$databases = $this->databases();
 		if (DB && $databases && !in_array(DB, $databases)) {
 			array_unshift($databases, DB);
 		}
-		?>
-<form action="">
-<p id="dbs">
-<?php
+
+		echo "<form action=''><p id='dbs'>";
 		hidden_fields_get();
-		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
-		echo "<span title='" . lang('Database') . "'>" . lang('DB') . "</span>: " . ($databases
-			? html_select("db", array("" => "") + $databases, DB) . $db_events
-			: "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
-		);
+
+		if ($databases) {
+			echo "<select id='database-select' name='db'>" . optionlist(["" => lang('Database')] + $databases, DB) . "</select>"
+				. script("mixin(gid('database-select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+		} else {
+			echo "<input id='database-select' name='db' value='" . h(DB) . "' autocapitalize='off'>\n";
+		}
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-		if (support("scheme")) {
-			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-				echo "<br>" . lang('Schema') . ": " . html_select("ns", array("" => "") + $adminer->schemas(), $_GET["ns"]) . $db_events;
-				if ($_GET["ns"] != "") {
-					set_schema($_GET["ns"]);
-				}
+
+		if (support("scheme") && $missing != "db" && DB != "" && $connection->select_db(DB)) {
+			echo "<br><select id='scheme-select' name='ns'>" . optionlist(["" => lang('Schema')] + $adminer->schemas(), $_GET["ns"]) . "</select>"
+				. script("mixin(gid('scheme-select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+
+			if ($_GET["ns"] != "") {
+				set_schema($_GET["ns"]);
 			}
 		}
-		foreach (array("import", "sql", "schema", "dump", "privileges") as $val) {
+
+		foreach (["import", "sql", "schema", "dump", "privileges"] as $val) {
 			if (isset($_GET[$val])) {
 				echo "<input type='hidden' name='$val' value=''>";
 				break;
 			}
 		}
+
 		echo "</p></form>\n";
+
+		return null;
 	}
 
-	/** Prints table list in menu
-	* @param array result of table_status('', true)
-	* @return null
-	*/
+	function printTablesFilter()
+	{
+		global $adminer;
+
+		echo "<div class='tables-filter jsonly'>"
+			. "<input id='tables-filter' autocomplete='off' placeholder='" . lang('Table') . "'>"
+			. script("initTablesFilter(" . json_encode($adminer->database()) . ");")
+			. "</div>\n";
+	}
+
+	/**
+	 * Prints table list in menu.
+	 *
+	 * @param array $tables Result of table_status('', true)
+	 * @return null
+	 */
 	function tablesPrint($tables) {
-		echo "<ul id='tables'>" . script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
+		echo "<ul id='tables'>" . script("mixin(gid('tables'), {onmouseover: menuOver, onmouseout: menuOut});");
+
 		foreach ($tables as $table => $status) {
 			$name = $this->tableName($status);
 			if ($name != "") {
+				$active = $table == $_GET["select"] || $table == $_GET["edit"];
+
 				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"'
-					. bold($_GET["select"] == $table || $_GET["edit"] == $table, "select")
-					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> "
-				;
-				echo (support("table") || support("indexes")
-					? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
-						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
-						. " title='" . lang('Show structure') . "'>$name</a>"
-					: "<span>$name</span>"
-				) . "\n";
+					. bold($active, "select")
+					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> ";
+
+				if (support("table") || support("indexes")) {
+					$active = in_array($table, [$_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"]]);
+					$class = is_view($status) ? "view" : "structure";
+
+					echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold($active, $class)
+						. " title='" . lang('Show structure') . "' data-main='true'>$name</a>";
+				} else {
+					echo "<span data-main='true'>$name</span>";
+				}
+
+				echo "</li>\n";
 			}
 		}
+
 		echo "</ul>\n";
+
+		return null;
 	}
+
 }

adminer/include/auth.inc.php

@@ -1,5 +1,4 @@
 <?php
-namespace Adminer;
 
 $connection = '';
 
@@ -17,13 +16,78 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
-function add_invalid_login() {
-	global $adminer;
-	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
-	if (!$fp) {
+function validate_server_input() {
+	if (SERVER == "") {
 		return;
 	}
-	$invalids = unserialize(stream_get_contents($fp));
+
+	$parts = parse_url(SERVER);
+	if (!$parts) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check proper URL parts.
+	if (isset($parts['user']) || isset($parts['pass']) || isset($parts['query']) || isset($parts['fragment'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Allow only HTTP/S scheme.
+	if (isset($parts['scheme']) && !preg_match('~^(https?)$~i', $parts['scheme'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Note that "localhost" and IP address without a scheme is parsed as a path.
+	$hostPath = (isset($parts['host']) ? $parts['host'] : '') . (isset($parts['path']) ? $parts['path'] : '');
+
+	// Validate host.
+	if (!is_server_host_valid($hostPath)) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check privileged ports.
+	if (isset($parts['port']) && ($parts['port'] < 1024 || $parts['port'] > 65535)) {
+		auth_error(lang('Connecting to privileged ports is not allowed.'));
+	}
+}
+
+if (!function_exists('is_server_host_valid')) {
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos($hostPath, '/') === false;
+	}
+}
+
+/**
+ * @param string $server
+ * @param string $username
+ * @param string $password
+ * @param string $defaultServer
+ * @param int|null $defaultPort
+ * @return string
+ */
+function build_http_url($server, $username, $password, $defaultServer, $defaultPort = null) {
+	if (!preg_match('~^(https?://)?([^:]*)(:\d+)?$~', rtrim($server, '/'), $matches)) {
+		auth_error(lang('Invalid server or credentials.'));
+		return false;
+	}
+
+	return ($matches[1] ?: "http://") .
+		($username !== "" || $password !== "" ? "$username:$password@" : "") .
+		($matches[2] !== "" ? $matches[2] : $defaultServer) .
+		(isset($matches[3]) ? $matches[3] : ($defaultPort ? ":$defaultPort" : ""));
+}
+
+function add_invalid_login() {
+	global $adminer;
+	$file = open_file_with_lock(get_temp_dir() . "/adminer.invalid");
+	if (!$file) {
+		return;
+	}
+	$invalids = unserialize(stream_get_contents($file));
 	$time = time();
 	if ($invalids) {
 		foreach ($invalids as $ip => $val) {
@@ -37,13 +101,16 @@ function add_invalid_login() {
 		$invalid = array($time + 30*60, 0); // active for 30 minutes
 	}
 	$invalid[1]++;
-	file_write_unlock($fp, serialize($invalids));
+	write_and_unlock_file($file, serialize($invalids));
 }
 
 function check_invalid_login() {
 	global $adminer;
-	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
-	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
+
+	$filename = get_temp_dir() . "/adminer.invalid";
+	$invalids = file_exists($filename) ? unserialize(file_get_contents($filename)) : [];
+	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : []);
+
 	$next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
 	if ($next_attempt > 0) { //! do the same with permanent login
 		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
@@ -54,7 +121,7 @@ $auth = $_POST["auth"];
 if ($auth) {
 	session_regenerate_id(); // defense against session fixation
 	$vendor = $auth["driver"];
-	$server = $auth["server"];
+	$server = trim($auth["server"]);
 	$username = $auth["username"];
 	$password = (string) $auth["password"];
 	$db = $auth["db"];
@@ -66,8 +133,7 @@ if ($auth) {
 		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($password, $private) : "");
 		cookie("adminer_permanent", implode(" ", $permanent));
 	}
-	if (
-		count($_POST) == 1 // 1 - auth
+	if (count($_POST) == 1 // 1 - auth
 		|| DRIVER != $vendor
 		|| SERVER != $server
 		|| $_GET["username"] !== $username // "0" == "00"
@@ -81,7 +147,7 @@ if ($auth) {
 		set_session($key, null);
 	}
 	unset_permanent();
-	redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.') . ' ' . lang('Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.'));
+	redirect(HOME_URL, lang('Logout successful.'));
 
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
@@ -106,9 +172,10 @@ function unset_permanent() {
 }
 
 /** Renders an error message and a login form
-* @param string plain text
-* @return null exits
-*/
+ * @param string plain text
+ * @return null exits
+ * @throws \Random\RandomException
+ */
 function auth_error($error) {
 	global $adminer, $has_token;
 	$session_name = session_name();
@@ -133,7 +200,7 @@ function auth_error($error) {
 		$error = lang('Session support must be enabled.');
 	}
 	$params = session_get_cookie_params();
-	cookie("adminer_key", ($_COOKIE["adminer_key"] ?: rand_string()), $params["lifetime"]);
+	cookie("adminer_key", ($_COOKIE["adminer_key"] ?: get_random_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
 	echo "<form action='' method='post'>\n";
 	echo "<div>";
@@ -147,10 +214,16 @@ function auth_error($error) {
 	exit;
 }
 
-if (isset($_GET["username"]) && !class_exists('Adminer\Db')) {
+if (isset($_GET["username"]) && !DRIVER) {
+	page_header(lang('No driver'), lang('Database driver not found.'), false);
+	page_footer("auth");
+	exit;
+}
+
+if (isset($_GET["username"]) && !class_exists("Min_DB")) {
 	unset($_SESSION["pwds"][DRIVER]);
 	unset_permanent();
-	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", Driver::$possibleDrivers)), false);
+	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
 	page_footer("auth");
 	exit;
 }
@@ -158,23 +231,16 @@ if (isset($_GET["username"]) && !class_exists('Adminer\Db')) {
 stop_session(true);
 
 if (isset($_GET["username"]) && is_string(get_password())) {
-	list($host, $port) = explode(":", SERVER, 2);
-	if (preg_match('~^\s*([-+]?\d+)~', $port, $match) && ($match[1] < 1024 || $match[1] > 65535)) { // is_numeric('80#') would still connect to port 80
-		auth_error(lang('Connecting to privileged ports is not allowed.'));
-	}
+	validate_server_input();
 	check_invalid_login();
-	$connection = connect($adminer->credentials());
-	if (is_object($connection)) {
-		$driver = new Driver($connection);
-		if ($adminer->operators === null) {
-			$adminer->operators = $driver->operators;
-		}
-	}
+
+	$connection = connect();
+	$driver = new Min_Driver($connection);
 }
 
 $login = null;
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-	$error = (is_string($connection) ? nl_br(h($connection)) : (is_string($login) ? $login : lang('Invalid credentials.')));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid server or credentials.')));
 	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
 }
 

adminer/include/bootstrap.inc.php

@@ -1,8 +1,12 @@
 <?php
-namespace Adminer;
+function adminer_errors($errno, $errstr) {
+	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
+}
 
-include "../adminer/include/version.inc.php";
-include "../adminer/include/errors.inc.php";
+error_reporting(6135); // errors and warnings
+set_error_handler('adminer_errors', E_WARNING);
+
+include "../adminer/include/debug.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -28,14 +32,14 @@ if (isset($_GET["file"])) {
 }
 
 if ($_GET["script"] == "version") {
-	$fp = file_open_lock(get_temp_dir() . "/adminer.version");
-	if ($fp) {
-		file_write_unlock($fp, serialize(array("signature" => $_POST["signature"], "version" => $_POST["version"])));
+	$file = open_file_with_lock(get_temp_dir() . "/adminer.version");
+	if ($file) {
+		write_and_unlock_file($file, serialize(["version" => $_POST["version"]]));
 	}
 	exit;
 }
 
-global $adminer, $connection, $driver, $drivers, $error, $HTTPS, $LANG, $langs, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $driver, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $languages, $on_actions, $permanent, $structured_types, $has_token, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
@@ -52,7 +56,11 @@ $HTTPS = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off")) || ini_bool
 if (!defined("SID")) {
 	session_cache_limiter(""); // to allow restarting session
 	session_name("adminer_sid"); // use specific session name to get own namespace
-	session_set_cookie_params(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS, true); // ini_set() may be disabled
+	$params = array(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
+	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+		$params[] = true; // HttpOnly
+	}
+	call_user_func_array('session_set_cookie_params', $params); // ini_set() may be disabled
 	session_start();
 }
 
@@ -65,33 +73,87 @@ if (function_exists("get_magic_quotes_runtime") && get_magic_quotes_runtime()) {
 @ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
 @ini_set("precision", 15); // @ - can be disabled, 15 - internal PHP precision
 
+// Migration for backward compatibility. This will keep MySQL users logged in.
+if (isset($_GET["username"])) {
+	// Old 'server' URL param.
+	if (isset($_GET["server"])) {
+		$_GET["mysql"] = $_GET["server"];
+		unset($_GET["server"]);
+	}
+
+	// No URL param for any driver.
+	$driver_params = array_filter(["mysql", "pgsql", "sqlite", "sqlite2", "oracle", "mssql", "mongo", "clickhouse", "elastic", "elastic5", "firebird", "simpledb"], function ($driver) {
+		return isset($_GET[$driver]);
+	});
+	if (!$driver_params) {
+		$_GET["mysql"] = "";
+	}
+
+	// Migrate session data.
+	if (isset($_SESSION["pwds"]["server"])) {
+		foreach (["pwds", "db", "dbs", "queries"] as $key) {
+			if (isset($_SESSION[$key]["server"])) {
+				$_SESSION[$key]["mysql"] = $_SESSION[$key]["server"];
+				unset($_SESSION[$key]["server"]);
+			}
+		}
+	}
+}
+
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";
+
 include "../adminer/include/pdo.inc.php";
 include "../adminer/include/driver.inc.php";
-include "../adminer/drivers/sqlite.inc.php";
+
+include "../adminer/drivers/mysql.inc.php";
 include "../adminer/drivers/pgsql.inc.php";
+include "../adminer/drivers/sqlite.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
 include "../adminer/drivers/mongo.inc.php";
+
 include "./include/adminer.inc.php";
-$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
-include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
+$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer());
 
-define('Adminer\JUSH', Driver::$jush);
-define('Adminer\SERVER', $_GET[DRIVER]); // read from pgsql=localhost
-define('Adminer\DB', $_GET["db"]); // for the sake of speed and size
-define(
-	'Adminer\ME',
-	preg_replace('~\?.*~', '', relative_uri()) . '?'
-		. (sid() ? SID . '&' : '')
-		. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
-		. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
-		. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')
+if (defined("DRIVER")) {
+	$config = driver_config();
+	$possible_drivers = $config['possible_drivers'];
+	$jush = $config['jush'];
+	$types = $config['types'];
+	$structured_types = $config['structured_types'];
+	$unsigned = $config['unsigned'];
+	$operators = $config['operators'];
+	$operator_like = $config['operator_like'];
+	$operator_regexp = $config['operator_regexp'];
+	$functions = $config['functions'];
+	$grouping = $config['grouping'];
+	$edit_functions = $config['edit_functions'];
+
+	if ($adminer->operators === null) {
+		$adminer->operators = $operators;
+		$adminer->operator_like = $operator_like;
+		$adminer->operator_regexp = $operator_regexp;
+	}
+} else {
+	define("DRIVER", null);
+}
+
+define("SERVER", DRIVER ? $_GET[DRIVER] : null); // read from pgsql=localhost
+define("DB", $_GET["db"]); // for the sake of speed and size
+define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
+	. (sid() ? SID . '&' : '')
+	. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
+	. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
+	. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')
 );
+define("HOME_URL", substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1) ?: ".");
 
+include "../adminer/include/version.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 include "./include/editing.inc.php";
 include "./include/connect.inc.php";
+
+$on_actions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()

adminer/include/connect.inc.php

@@ -1,18 +1,6 @@
 <?php
-namespace Adminer;
-
-if (isset($_GET["status"])) {
-	$_GET["variables"] = $_GET["status"];
-}
-if (isset($_GET["import"])) {
-	$_GET["sql"] = $_GET["import"];
-}
-
-if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
-	if (DB != "" || $_GET["refresh"]) {
-		restart_session();
-		set_session("dbs", null);
-	}
+function connect_error() {
+	global $adminer, $connection, $token, $error, $drivers;
 	if (DB != "") {
 		header("HTTP/1.1 404 Not Found");
 		page_header(lang('Database') . ": " . h(DB), lang('Invalid database.'), true);
@@ -20,18 +8,16 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 		if ($_POST["db"] && !$error) {
 			queries_redirect(substr(ME, 0, -1), lang('Databases have been dropped.'), drop_databases($_POST["db"]));
 		}
-
+		
 		page_header(lang('Select database'), $error, false);
 		echo "<p class='links'>\n";
-		foreach (
-			array(
-				'database' => lang('Create database'),
-				'privileges' => lang('Privileges'),
-				'processlist' => lang('Process list'),
-				'variables' => lang('Variables'),
-				'status' => lang('Status'),
-			) as $key => $val
-		) {
+		foreach (array(
+			'database' => lang('Create database'),
+			'privileges' => lang('Privileges'),
+			'processlist' => lang('Process list'),
+			'variables' => lang('Variables'),
+			'status' => lang('Status'),
+		) as $key => $val) {
 			if (support($key)) {
 				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 			}
@@ -43,23 +29,23 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table class='checkable odds'>\n";
+			echo "<table cellspacing='0' class='checkable'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
 				. (support("database") ? "<td>" : "")
-				. "<th>" . lang('Database') . (get_session("dbs") !== null ? " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>" : "")
+				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
 				. "<td>" . lang('Collation')
 				. "<td>" . lang('Tables')
 				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1'>" . lang('Compute') . "</a>" . script("qsl('a').onclick = partial(ajaxSetHtml, '" . js_escape(ME) . "script=connect');", "")
 				. "</thead>\n"
 			;
-
+			
 			$databases = ($_GET["dbsize"] ? count_tables($databases) : array_flip($databases));
-
+			
 			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
 				$id = h("Db-" . $db);
-				echo "<tr>" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
+				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
 				echo "<th><a href='$root' id='$id'>" . h($db) . "</a>";
 				$collation = h(db_collation($db, $collations));
 				echo "<td>" . (support("database") ? "<a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database=' title='" . lang('Alter database') . "'>$collation</a>" : $collation);
@@ -67,7 +53,7 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 				echo "<td align='right' id='size-" . h($db) . "'>" . ($_GET["dbsize"] ? db_size($db) : "?");
 				echo "\n";
 			}
-
+			
 			echo "</table>\n";
 			echo (support("database")
 				? "<div class='footer'><div>\n"
@@ -83,8 +69,23 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 			echo script("tableCheck();");
 		}
 	}
-
+	
 	page_footer("db");
+}
+
+if (isset($_GET["status"])) {
+	$_GET["variables"] = $_GET["status"];
+}
+if (isset($_GET["import"])) {
+	$_GET["sql"] = $_GET["import"];
+}
+
+if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
+	if (DB != "" || $_GET["refresh"]) {
+		restart_session();
+		set_session("dbs", null);
+	}
+	connect_error(); // separate function to catch SQLite error
 	exit;
 }
 

adminer/include/coverage.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 // coverage is used in tests and removed in compilation
 if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_coverage.ser")) {
 	function save_coverage() {
@@ -16,5 +14,5 @@ if (extension_loaded("xdebug") && file_exists(sys_get_temp_dir() . "/adminer_cov
 		}
 	}
 	xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
-	register_shutdown_function('Adminer\save_coverage');
+	register_shutdown_function('save_coverage');
 }

adminer/include/debug.inc.php

@@ -0,0 +1,27 @@
+<?php
+
+function dump($value)
+{
+	$cli = PHP_SAPI == 'cli';
+
+	if (!$cli)  {
+		echo "<pre>";
+	}
+
+	$export = var_export($value, true);
+	$export = preg_replace('~=>\s+array\s*~', "=> array", $export);
+	$export = preg_replace('~\(\s+\)~', "()", $export);
+	echo $export;
+
+	if (!$cli) {
+		echo "</pre>";
+	}
+
+	echo "\n";
+}
+
+function dumpe($value)
+{
+	dump($value);
+	exit;
+}

adminer/include/design.inc.php

@@ -1,19 +1,13 @@
 <?php
-namespace Adminer;
-
-if (!ob_get_level()) {
-	ob_start(null, 4096);
-}
-
 /** Print HTML header
 * @param string used in title, breadcrumb and heading, should be HTML escaped
 * @param string
-* @param mixed ["key" => "link", "key2" => ["link", "desc"]], null for nothing, false for driver only, true for driver and server
+* @param mixed array("key" => "link", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server
 * @param string used after colon in title and heading, should be HTML escaped
 * @return null
 */
-function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-	global $LANG, $VERSION, $adminer, $drivers;
+function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
+	global $LANG, $VERSION, $adminer, $drivers, $jush;
 	page_headers();
 	if (is_ajax() && $error) {
 		page_messages($error);
@@ -21,16 +15,24 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	}
 	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
+
+	// Load Adminer version from file if cookie is missing.
+	$filename = get_temp_dir() . "/adminer.version";
+	if (!$_COOKIE["adminer_version"] && file_exists($filename) && ($lifetime = filemtime($filename) + 86400 - time()) > 0) { // 86400 - 1 day in seconds
+		$data = unserialize(file_get_contents($filename));
+
+		$_COOKIE["adminer_version"] = $data["version"];
+		cookie("adminer_version", $data["version"], $lifetime); // Sync expiration with the file.
+	}
 	?>
 <!DOCTYPE html>
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex">
-<meta name="viewport" content="width=device-width">
 <title><?php echo $title_page; ?></title>
-<link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
-<?php echo script_src("../adminer/static/functions.js"); ?>
-<?php echo script_src("static/editing.js"); ?>
+<link rel="stylesheet" type="text/css" href="../adminer/static/default.css?<?php echo filemtime("../adminer/static/default.css"); ?>">
+<?php echo script_src("../adminer/static/functions.js?" . filemtime("../adminer/static/functions.js")); ?>
+<?php echo script_src("static/editing.js?" . filemtime("../adminer/static/editing.js")); ?>
 <?php if ($adminer->head()) { ?>
 <link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
 <link rel="apple-touch-icon" href="../adminer/static/favicon.ico">
@@ -40,56 +42,51 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <?php } ?>
 
 <body class="<?php echo lang('ltr'); ?> nojs">
-<?php
-	$filename = get_temp_dir() . "/adminer.version";
-	if (!$_COOKIE["adminer_version"] && function_exists('openssl_verify') && file_exists($filename) && filemtime($filename) + 86400 > time()) { // 86400 - 1 day in seconds
-		$version = unserialize(file_get_contents($filename));
-		$public = "-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwqWOVuF5uw7/+Z70djoK
-RlHIZFZPO0uYRezq90+7Amk+FDNd7KkL5eDve+vHRJBLAszF/7XKXe11xwliIsFs
-DFWQlsABVZB3oisKCBEuI71J4kPH8dKGEWR9jDHFw3cWmoH3PmqImX6FISWbG3B8
-h7FIx3jEaw5ckVPVTeo5JRm/1DZzJxjyDenXvBQ/6o9DgZKeNDgxwKzH+sw9/YCO
-jHnq1cFpOIISzARlrHMa/43YfeNRAm/tsBXjSxembBPo7aQZLAWHmaj5+K19H10B
-nCpz9Y++cipkVEiKRGih4ZEvjoFysEOdRLj6WiD/uUNky4xGeA6LaJqh5XpkFkcQ
-fQIDAQAB
------END PUBLIC KEY-----
-";
-		if (openssl_verify($version["version"], base64_decode($version["signature"]), $public) == 1) {
-			$_COOKIE["adminer_version"] = $version["version"]; // doesn't need to send to the browser
-		}
-	}
-	?>
 <script<?php echo nonce(); ?>>
-mixin(document.body, {onkeydown: bodyKeydown, onclick: bodyClick<?php
-	echo (isset($_COOKIE["adminer_version"]) ? "" : ", onload: partial(verifyVersion, '$VERSION', '" . js_escape(ME) . "', '" . get_token() . "')"); // $token may be empty in auth.inc.php
-	?>});
-document.body.className = document.body.className.replace(/ nojs/, ' js');
-var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
-var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
+	const body = document.body;
+
+	body.onkeydown = bodyKeydown;
+	body.onclick = bodyClick;
+	body.classList.remove("nojs");
+	body.classList.add("js");
+
+	var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
+	var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
-<div id="help" class="jush-<?php echo JUSH; ?> jsonly hidden"></div>
-<?php echo script("mixin(qs('#help'), {onmouseover: function () { helpOpen = 1; }, onmouseout: helpMouseout});"); ?>
+<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
+<?php echo script("initHelpPopup();"); ?>
 
 <div id="content">
 <?php
 	if ($breadcrumb !== null) {
-		$link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1);
-		echo '<p id="breadcrumb"><a href="' . h($link ?: ".") . '">' . $drivers[DRIVER] . '</a> » ';
-		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
-		$server = $adminer->serverName(SERVER);
-		$server = ($server != "" ? $server : lang('Server'));
+		echo '<p id="breadcrumb">';
+
+		echo '<a href="' . h(HOME_URL) . '">' . lang('Home') . '</a> » ';
+
+		$server = "";
 		if ($breadcrumb === false) {
-			echo "$server\n";
+			$server .= h($drivers[DRIVER]) . ": ";
+		}
+
+		$server_name = $adminer->serverName(SERVER);
+		$server .= $server_name != "" ? h($server_name) : lang('Server');
+
+		if ($breadcrumb === false) {
+			echo h($server), "\n";
 		} else {
+			$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
 			echo "<a href='" . h($link) . "' accesskey='1' title='Alt+Shift+1'>$server</a> » ";
+
 			if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
 				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> » ';
 			}
+
 			if (is_array($breadcrumb)) {
 				if ($_GET["ns"] != "") {
 					echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> » ';
 				}
+
 				foreach ($breadcrumb as $key => $val) {
 					$desc = (is_array($val) ? $val[1] : h($val));
 					if ($desc != "") {
@@ -97,9 +94,11 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 					}
 				}
 			}
+
 			echo "$title\n";
 		}
 	}
+
 	echo "<h2>$title_all</h2>\n";
 	echo "<div id='ajaxstatus' class='jsonly hidden'></div>\n";
 	restart_session();
@@ -109,7 +108,7 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 		$databases = null;
 	}
 	stop_session();
-	define('Adminer\PAGE_HEADER', 1);
+	define("PAGE_HEADER", 1);
 }
 
 /** Send HTTP headers
@@ -133,30 +132,40 @@ function page_headers() {
 	$adminer->headers();
 }
 
-/** Get Content Security Policy headers
-* @return array of arrays with directive name in key, allowed sources in value
-*/
+/**
+ * Gets Content Security Policy headers.
+ *
+ * @return array of arrays with directive name in key, allowed sources in value
+ * @throws \Random\RandomException
+ */
 function csp() {
-	return array(
-		array(
-			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'", // 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
-			"connect-src" => "'self'",
-			"frame-src" => "https://www.adminer.org",
+	return [
+		[
+			// 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
+			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'",
+			"connect-src" => "'self' https://api.github.com/repos/adminerneo/adminerneo/releases/latest",
+			"frame-src" => "'self'",
 			"object-src" => "'none'",
 			"base-uri" => "'none'",
 			"form-action" => "'self'",
-		),
-	);
+		],
+	];
 }
 
-/** Get a CSP nonce
-* @return string Base64 value
-*/
-function get_nonce() {
+/**
+ * Gets a CSP nonce.
+ *
+ * @return string Base64 value.
+ * @throws \Random\RandomException
+ */
+function get_nonce()
+{
 	static $nonce;
+
 	if (!$nonce) {
-		$nonce = base64_encode(rand_string());
+		$nonce = base64_encode(get_random_string(true));
 	}
+
 	return $nonce;
 }
 
@@ -176,28 +185,38 @@ function page_messages($error) {
 	}
 }
 
-/** Print HTML footer
-* @param string "auth", "db", "ns"
-* @return null
-*/
-function page_footer($missing = "") {
+/**
+ * Prints HTML footer.
+ *
+ * @param ?string $missing "auth", "db", "ns"
+ */
+function page_footer($missing = null)
+{
 	global $adminer, $token;
-	?>
-</div>
 
-<div id="menu">
-<?php $adminer->navigation($missing); ?>
-</div>
+	echo "</div>"; // #content
+
+	echo "<div id='footer'>\n";
+	language_select();
+
+	if ($missing != "auth") {
+?>
+
+	<div class="logout">
+		<form action="" method="post">
+			<?php echo h($_GET["username"]); ?>
+			<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
+			<input type="hidden" name="token" value="<?php echo $token; ?>">
+		</form>
+	</div>
 
-<?php if ($missing != "auth") { ?>
-<form action="" method="post">
-<p class="logout">
-<span><?php echo h($_GET["username"]) . "\n"; ?></span>
-<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</p>
-</form>
-<?php } ?>
 <?php
+	}
+	echo "</div>\n";
+
+	echo "<div id='menu'>\n";
+	$adminer->navigation($missing);
+	echo "</div>\n";
+
 	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $drivers = array();
 
 /** Add a driver
@@ -22,48 +20,14 @@ function get_driver($id) {
 	return $drivers[$id];
 }
 
-abstract class SqlDriver {
-	static $possibleDrivers = array();
-	static $jush; ///< @var string JUSH identifier
-
-	protected $conn;
-	protected $types = array(); ///< @var array [$description => [$type => $maximum_unsigned_length, ...], ...]
-	public $editFunctions = array(); ///< @var array of ["$type|$type2" => "$function/$function2"] functions used in editing, [0] - edit and insert, [1] - edit only
-	public $unsigned = array(); ///< @var array number variants
-	public $operators = array(); ///< @var array operators used in select
-	public $functions = array(); ///< @var array functions used in select
-	public $grouping = array(); ///< @var array grouping functions used in select
-	public $onActions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()
-	public $inout = "IN|OUT|INOUT"; ///< @var string used in routines
-	public $enumLength = "'(?:''|[^'\\\\]|\\\\.)*'"; ///< @var string regular expression for parsing enum lengths
-	public $generated = array(); ///< @var array allowed types of generated columns
+/*abstract*/ class Min_SQL {
+	var $_conn;
 
 	/** Create object for performing database operations
-	* @param Db
+	* @param Min_DB
 	*/
 	function __construct($connection) {
-		$this->conn = $connection;
-	}
-
-	/** Get all types
-	* @return array [$type => $maximum_unsigned_length, ...]
-	*/
-	function types() {
-		return call_user_func_array('array_merge', array_values($this->types));
-	}
-
-	/** Get structured types
-	* @return array [$description => [$type, ...], ...]
-	*/
-	function structuredTypes() {
-		return array_map('array_keys', $this->types);
-	}
-
-	/** Get enum values
-	* @param array
-	* @return string or null
-	*/
-	function enumLength($field) {
+		$this->_conn = $connection;
 	}
 
 	/** Select data from table
@@ -75,15 +39,15 @@ abstract class SqlDriver {
 	* @param int result of $adminer->selectLimitProcess()
 	* @param int index of page starting at zero
 	* @param bool whether to print the query
-	* @return Result
+	* @return Min_Result
 	*/
 	function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-		global $adminer;
+		global $adminer, $jush;
 		$is_group = (count($group) < count($select));
 		$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
 		if (!$query) {
 			$query = "SELECT" . limit(
-				($_GET["page"] != "last" && $limit != "" && $group && $is_group && JUSH == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
+				($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
 				($where ? "\nWHERE " . implode(" AND ", $where) : "") . ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""),
 				($limit != "" ? +$limit : null),
 				($page ? $limit * $page : 0),
@@ -91,7 +55,7 @@ abstract class SqlDriver {
 			);
 		}
 		$start = microtime(true);
-		$return = $this->conn->query($query);
+		$return = $this->_conn->query($query);
 		if ($print) {
 			echo $adminer->selectQuery($query, $start, !$return);
 		}
@@ -144,7 +108,7 @@ abstract class SqlDriver {
 	* @param array of arrays with escaped columns in keys and quoted data in values
 	* @return bool
 	*/
-	function insertUpdate($table, $rows, $primary) {
+	/*abstract*/ function insertUpdate($table, $rows, $primary) {
 		return false;
 	}
 
@@ -179,30 +143,22 @@ abstract class SqlDriver {
 
 	/** Convert column to be searchable
 	* @param string escaped column name
-	* @param array ["op" => , "val" => ]
+	* @param array array("op" => , "val" => )
 	* @param array
 	* @return string
 	*/
-	function convertSearch($idf, $val, $field) {
+	function convertSearch($idf, array $where, array $field) {
 		return $idf;
 	}
 
-	/** Convert operator so it can be used in search
-	* @param string $operator
-	* @return string
-	*/
-	function convertOperator($operator) {
-		return $operator;
-	}
-
 	/** Convert value returned by database to actual value
 	* @param string
 	* @param array
 	* @return string
 	*/
 	function value($val, $field) {
-		return (method_exists($this->conn, 'value')
-			? $this->conn->value($val, $field)
+		return (method_exists($this->_conn, 'value')
+			? $this->_conn->value($val, $field)
 			: (is_resource($val) ? stream_get_contents($val) : $val)
 		);
 	}
@@ -224,38 +180,9 @@ abstract class SqlDriver {
 
 	/** Get help link for table
 	* @param string
-	* @param bool
 	* @return string relative URL or null
 	*/
-	function tableHelp($name, $is_view = false) {
+	function tableHelp($name) {
 	}
 
-	/** Check if C-style escapes are supported
-	* @return bool
-	*/
-	function hasCStyleEscapes() {
-		return false;
-	}
-
-	/** Check whether table supports indexes
-	* @param array result of table_status()
-	* @return bool
-	*/
-	function supportsIndex($table_status) {
-		return !is_view($table_status);
-	}
-
-	/** Get defined check constraints
-	* @param string
-	* @return array [$name => $clause]
-	*/
-	function checkConstraints($table) {
-		// MariaDB contains CHECK_CONSTRAINTS.TABLE_NAME, MySQL and PostrgreSQL not
-		return get_key_vals("SELECT c.CONSTRAINT_NAME, CHECK_CLAUSE
-FROM INFORMATION_SCHEMA.CHECK_CONSTRAINTS c
-JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS t ON c.CONSTRAINT_SCHEMA = t.CONSTRAINT_SCHEMA AND c.CONSTRAINT_NAME = t.CONSTRAINT_NAME
-WHERE c.CONSTRAINT_SCHEMA = " . q($_GET["ns"] != "" ? $_GET["ns"] : DB) . "
-AND t.TABLE_NAME = " . q($table) . "
-AND CHECK_CLAUSE NOT LIKE '% IS NOT NULL'"); // ignore default IS NOT NULL checks in PostrgreSQL
-	}
 }

adminer/include/editing.inc.php

@@ -1,34 +1,32 @@
 <?php
-namespace Adminer;
-
-// This file is not used in Adminer Editor.
-
 /** Print select result
-* @param Result
-* @param Db connection to examine indexes
+* @param Min_Result
+* @param Min_DB connection to examine indexes
 * @param array
 * @param int
 * @return array $orgtables
 */
 function select($result, $connection2 = null, $orgtables = array(), $limit = 0) {
+	global $jush;
 	$links = array(); // colno => orgtable - create links from these columns
 	$indexes = array(); // orgtable => array(column => colno) - primary keys
 	$columns = array(); // orgtable => array(column => ) - not selected columns in primary key
 	$blobs = array(); // colno => bool - display bytes for blobs
 	$types = array(); // colno => type - display char in <code>
 	$return = array(); // table => orgtable - mapping to use in EXPLAIN
+	odd(''); // reset odd for each result
 	for ($i=0; (!$limit || $i < $limit) && ($row = $result->fetch_row()); $i++) {
 		if (!$i) {
 			echo "<div class='scrollable'>\n";
-			echo "<table class='nowrap odds'>\n";
+			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
-				$field = $result->fetch_field();
-				$name = $field->name;
-				$orgtable = $field->orgtable;
-				$orgname = $field->orgname;
-				$return[$field->table] = $orgtable;
-				if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
+				$field = (array)$result->fetch_field();
+				$name = $field["name"];
+				$orgtable = $field["orgtable"];
+				$orgname = $field["orgname"];
+				$return[$field["table"]] = $orgtable;
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
 					if (!isset($indexes[$orgtable])) {
@@ -48,11 +46,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$links[$j] = $orgtable;
 					}
 				}
-				if ($field->charsetnr == 63) { // 63 - binary
+				if ($field["charsetnr"] == 63) { // 63 - binary
 					$blobs[$j] = true;
 				}
-				$types[$j] = $field->type;
-				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+				$types[$j] = $field["type"];
+				echo "<th" . ($orgtable != "" || $field["name"] != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
 					. ($orgtables ? doc_link(array(
 						'sql' => "explain-output.html#explain_" . strtolower($name),
 						'mariadb' => "explain/#the-columns-in-explain-select",
@@ -61,11 +59,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 			}
 			echo "</thead>\n";
 		}
-		echo "<tr>";
+		echo "<tr" . odd() . ">";
 		foreach ($row as $key => $val) {
 			$link = "";
 			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$table = $row[array_search("table=", $links)];
 					$link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
 				} else {
@@ -74,7 +72,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
 					}
 				}
-			} elseif (is_url($val)) {
+			} elseif (is_web_url($val)) {
 				$link = $val;
 			}
 			if ($val === null) {
@@ -88,7 +86,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 				}
 			}
 			if ($link) {
-				$val = "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : '') . ">$val</a>";
+				$val = "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : '') . ">$val</a>";
 			}
 			echo "<td>$val";
 		}
@@ -99,7 +97,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 
 /** Get referencable tables with single column primary key except self
 * @param string
-* @return array [$table_name => $field]
+* @return array ($table_name => $field)
 */
 function referencable_primary($self) {
 	$return = array(); // table_name => field
@@ -152,7 +150,8 @@ function set_adminer_settings($settings) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-	echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-" . JUSH . "' spellcheck='false' wrap='off'>";
+	global $jush;
+	echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
 	if (is_array($value)) {
 		foreach ($value as $val) { // not implode() to save memory
 			echo h($val[0]) . "\n\n\n"; // $val == array($query, $time, $elapsed)
@@ -163,41 +162,6 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "</textarea>";
 }
 
-/** Generate HTML <select> or <input> if $options are empty
-* @param string
-* @param array
-* @param string
-* @param string
-* @param string
-* @return string
-*/
-function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
-	$tag = ($options ? "select" : "input");
-	return "<$tag$attrs" . ($options
-		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
-		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
-	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
-}
-
-/** Print one row in JSON object
-* @param string or "" to close the object
-* @param string
-* @return null
-*/
-function json_row($key, $val = null) {
-	static $first = true;
-	if ($first) {
-		echo "{";
-	}
-	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
-		$first = false;
-	} else {
-		echo "\n}\n";
-		$first = true;
-	}
-}
-
 /** Print table columns for type edit
 * @param string
 * @param array
@@ -207,46 +171,22 @@ function json_row($key, $val = null) {
 * @return null
 */
 function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
-	global $driver;
+	global $structured_types, $types, $unsigned, $on_actions;
 	$type = $field["type"];
-	?><td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
-	if ($type && !array_key_exists($type, $driver->types()) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
-		$extra_types[] = $type;
-	}
-	$structured_types = $driver->structuredTypes();
-	if ($foreign_keys) {
-		$structured_types[lang('Foreign keys')] = $foreign_keys;
-	}
-	echo optionlist(array_merge($extra_types, $structured_types), $type);
-	?></select><td><input
-	name="<?php echo h($key); ?>[length]"
-	value="<?php echo h($field["length"]); ?>"
-	size="3"
-	<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); //! type="number" with enabled JavaScript ?>
-	aria-labelledby="label-length"><td class="options"><?php
-	echo ($collations ? "<input list='collations' name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . " value='" . h($field["collation"]) . "' placeholder='(" . lang('collation') . ")'>" : '');
-	echo ($driver->unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $type) ? "" : " class='hidden'") . '><option>' . optionlist($driver->unsigned, $field["unsigned"]) . '</select>' : '');
-	echo (isset($field['on_update']) ? "<select name='" . h($key) . "[on_update]'" . (preg_match('~timestamp|datetime~', $type) ? "" : " class='hidden'") . '>'
-		. optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? "CURRENT_TIMESTAMP" : $field["on_update"]))
-		. '</select>' : ''
-	);
-	echo ($foreign_keys ? "<select name='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $driver->onActions), $field["on_delete"]) . "</select> " : " "); // space for IE
+	?>
+<td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
+	$extra_types[] = $type;
 }
-
-/** Get partition info
-* @param string
-* @return array
-*/
-function get_partitions_info($table) {
-	global $connection;
-	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
-	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
-	$return = array();
-	list($return["partition_by"], $return["partition"], $return["partitions"]) = $result->fetch_row();
-	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
-	$return["partition_names"] = array_keys($partitions);
-	$return["partition_values"] = array_values($partitions);
-	return $return;
+if ($foreign_keys) {
+	$structured_types[lang('Foreign keys')] = $foreign_keys;
+}
+echo optionlist(array_merge($extra_types, $structured_types), $type);
+?></select><td><input name="<?php echo h($key); ?>[length]" value="<?php echo h($field["length"]); ?>" size="3"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); //! type="number" with enabled JavaScript ?> aria-labelledby="label-length"><td class="options"><?php
+	echo "<select name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
+	echo ($unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $type) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
+	echo (isset($field['on_update']) ? "<select name='" . h($key) . "[on_update]'" . (preg_match('~timestamp|datetime~', $type) ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? "CURRENT_TIMESTAMP" : $field["on_update"])) . '</select>' : '');
+	echo ($foreign_keys ? "<select name='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
 }
 
 /** Filter length value including enums
@@ -254,8 +194,7 @@ function get_partitions_info($table) {
 * @return string
 */
 function process_length($length) {
-	global $driver;
-	$enum_length = $driver->enumLength;
+	global $enum_length;
 	return (preg_match("~^\\s*\\(?\\s*$enum_length(?:\\s*,\\s*$enum_length)*+\\s*\\)?\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches)
 		? "(" . implode(",", $matches[0]) . ")"
 		: preg_replace('~^[0-9].*~', '(\0)', preg_replace('~[^-0-9,+()[\]]~', '', $length))
@@ -268,30 +207,31 @@ function process_length($length) {
 * @return string
 */
 function process_type($field, $collate = "COLLATE") {
-	global $driver;
+	global $unsigned;
 	return " $field[type]"
 		. process_length($field["length"])
-		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $driver->unsigned) ? " $field[unsigned]" : "")
-		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . (JUSH == "mssql" ? $field["collation"] : q($field["collation"])) : "")
+		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
 	;
 }
 
 /** Create SQL string from field
 * @param array basic field information
 * @param array information about field type
-* @return array ["field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT"]
+* @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
 	// MariaDB exports CURRENT_TIMESTAMP as a function.
 	if ($field["on_update"]) {
 		$field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
 	}
+
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
 		default_value($field),
-		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
+		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE " . $field["on_update"] : ""),
 		(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
 		($field["auto_increment"] ? auto_increment() : null),
 	);
@@ -302,16 +242,19 @@ function process_field($field, $type_field) {
 * @return string
 */
 function default_value($field) {
-	global $driver;
 	$default = $field["default"];
-	$generated = $field["generated"];
-	return ($default === null ? "" : (in_array($generated, $driver->generated)
-		? (JUSH == "mssql" ? " AS ($default)" . ($generated == "VIRTUAL" ? "" : " $generated") . "" : " GENERATED ALWAYS AS ($default) $generated")
-		: " DEFAULT " . (!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-			? (JUSH == "sql" && preg_match('~text~', $field["type"]) ? "(" . q($default) . ")" : q($default)) // MySQL requires () around default value of text column
-			: str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", (JUSH == "sqlite" ? "($default)" : $default))
-		)
-	));
+	if ($default === null) return "";
+
+	if (stripos($default, "GENERATED ") === 0) {
+		return " $default";
+	}
+
+	// MariaDB exports CURRENT_TIMESTAMP as a function.
+	$default = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $default);
+
+	$quote = preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default);
+
+	return " DEFAULT " . ($quote ? q($default) : $default);
 }
 
 /** Get type class to use in CSS
@@ -319,88 +262,118 @@ function default_value($field) {
 * @return string class=''
 */
 function type_class($type) {
-	foreach (
-		array(
-			'char' => 'text',
-			'date' => 'time|year',
-			'binary' => 'blob',
-			'enum' => 'set',
-		) as $key => $val
-	) {
+	foreach (array(
+		'char' => 'text',
+		'date' => 'time|year',
+		'binary' => 'blob',
+		'enum' => 'set',
+	) as $key => $val) {
 		if (preg_match("~$key|$val~", $type)) {
 			return " class='$key'";
 		}
 	}
 }
 
-/** Print table interior for fields editing
-* @param array
-* @param array
-* @param string TABLE or PROCEDURE
-* @param array returned by referencable_primary()
-* @return null
-*/
-function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
-	global $driver;
+/**
+ * Prints table interior for fields editing.
+ *
+ * @param string $type TABLE, FUNCTION or PROCEDURE
+ * @param array $foreign_keys returned by referencable_primary()
+ */
+function edit_fields(array $fields, array $collations, $type = "TABLE", $foreign_keys = []) {
+	global $inout;
+
 	$fields = array_values($fields);
-	$default_class = (($_POST ? $_POST["defaults"] : adminer_setting("defaults")) ? "" : " class='hidden'");
-	$comment_class = (($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : " class='hidden'");
+	$comment_class = ($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : "class='hidden'";
 	?>
+
 <thead><tr>
-<?php echo ($type == "PROCEDURE" ? "<td>" : ""); ?>
-<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
-<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?>
-<td id="label-length"><?php echo lang('Length'); ?>
-<td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
-<?php if ($type == "TABLE") { ?>
-<td id="label-null">NULL
-<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
-	'sql' => "example-auto-increment.html",
-	'mariadb' => "auto_increment/",
-	'sqlite' => "autoinc.html",
-	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
-	'mssql' => "t-sql/statements/create-table-transact-sql-identity-property",
-)); ?>
-<td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
-<?php echo (support("comment") ? "<td id='label-comment'$comment_class>" . lang('Comment') : ""); ?>
-<?php } ?>
-<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>" . script("row_count = " . count($fields) . ";"); ?>
-</thead>
-<tbody>
+	<?php
+		if (support("move_col")) {
+			echo "<td class='jsonly'></td>";
+		}
+		if ($type == "PROCEDURE") {
+			echo "<td></td>";
+		}
+	?>
+	<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?></th>
+	<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("gid('enum-edit').onblur = editingLengthBlur;"); ?></td>
+	<td id="label-length"><?php echo lang('Length'); ?></td>
+	<td><?php echo lang('Options'); /* no label required, options have their own label */ ?></td>
+	<?php if ($type == "TABLE") { ?>
+		<td id="label-null">NULL</td>
+		<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link([
+			'sql' => "example-auto-increment.html",
+			'mariadb' => "auto_increment/",
+			'sqlite' => "autoinc.html",
+			'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
+			'mssql' => "ms186775.aspx",
+		]); ?>
+		</td>
+		<td id="label-default"><?php echo lang('Default value'); ?></td>
+		<?php echo (support("comment") ? "<td id='label-comment' $comment_class>" . lang('Comment') . "</td>" : ""); ?>
+	<?php } ?>
+	<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>" . script("row_count = " . count($fields) . ";"); ?></td>
+</tr></thead>
 <?php
-	echo script("mixin(qsl('tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput});");
+	echo "<tbody>\n";
+
 	foreach ($fields as $i => $field) {
 		$i++;
 		$orig = $field[($_POST ? "orig" : "field")];
 		$display = (isset($_POST["add"][$i-1]) || (isset($field["field"]) && !$_POST["drop_col"][$i])) && (support("drop_col") || $orig == "");
-		?>
-<tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
-<?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $driver->inout), $field["inout"]) : "") . "<th>"; ?>
-<?php if ($display) { ?>
-<input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" data-maxlength="64" autocapitalize="off" aria-labelledby="label-name">
-<?php } ?>
-<input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>"><?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
-<?php
-		if ($type == "TABLE") {
-			?>
-<td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"); ?>
-<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php echo ($field["auto_increment"] ? " checked" : ""); ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
-			echo ($driver->generated
-				? html_select("fields[$i][generated]", array_merge(array("", "DEFAULT"), $driver->generated), $field["generated"]) . " "
-				: checkbox("fields[$i][generated]", 1, $field["generated"], "", "", "", "label-default")
-			);
-			?>
-<input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" aria-labelledby="label-default"><?php
-			echo (support("comment") ? "<td$comment_class><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' data-maxlength='" . (min_version(5.5) ? 1024 : 255) . "' aria-labelledby='label-comment'>" : "");
+
+		$style = $display ? "" : "style='display: none;'";
+		echo "<tr $style>\n";
+
+		if (support("move_col")) {
+			echo "<th class='handle jsonly'></th>";
 		}
+		if ($type == "PROCEDURE") {
+			echo "<td>", html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]), "</td>\n";
+		}
+
+		echo "<th>";
+		if ($display) {
+			echo "<input name='fields[$i][field]' value='", h($field["field"]), "' data-maxlength='64' autocapitalize='off' aria-labelledby='label-name'>";
+		}
+		echo "<input type='hidden' name='fields[$i][orig]' value='",  h($orig), "'>";
+		edit_type("fields[$i]", $field, $collations, $foreign_keys);
+		echo "</th>\n";
+
+		if ($type == "TABLE") {
+			echo "<td>", checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"), "</td>\n";
+
+			$checked = $field["auto_increment"] ? "checked" : "";
+			echo "<td><label class='block'><input type='radio' name='auto_increment_col' value='$i' $checked aria-labelledby='label-ai'></label></td>\n";
+
+			echo "<td>",
+				checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"),
+				"<input name='fields[$i][default]' value='", h($field["default"]), "' aria-labelledby='label-default'>",
+				"</td>\n";
+
+			if (support("comment")) {
+				$max_length = min_version(5.5) ? 1024 : 255;
+				echo "<td $comment_class>",
+					"<input name='fields[$i][comment]' value='", h($field["comment"]), "' data-maxlength='$max_length' aria-labelledby='label-comment'>",
+					"</td>\n";
+			}
+		}
+
 		echo "<td>";
-		echo (support("move_col") ?
-			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'> "
-			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='↑' title='" . lang('Move up') . "'> "
-			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='↓' title='" . lang('Move down') . "'> "
-		: "");
-		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" : "");
+		if (support("move_col")) {
+			echo "<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'> ",
+				"<input type='image' class='icon hidden' name='up[$i]' src='../adminer/static/up.gif' alt='↑' title='" . lang('Move up') . "'> ",
+				"<input type='image' class='icon hidden' name='down[$i]' src='../adminer/static/down.gif' alt='↓' title='" . lang('Move down') . "'> ";
+		}
+		if ($orig == "" || support("drop_col")) {
+			echo "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>";
+		}
+		echo "</td>\n</tr>\n";
 	}
+
+	echo "</tbody>";
+	echo script("mixin(qs('#edit-fields tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput}); initSortable('#edit-fields tbody');");
 }
 
 /** Move fields up and down or add field
@@ -452,25 +425,43 @@ function normalize_enum($match) {
 	return "'" . str_replace("'", "''", addcslashes(stripcslashes(str_replace($match[0][0] . $match[0][0], $match[0][0], substr($match[0], 1, -1))), '\\')) . "'";
 }
 
-/** Issue grant or revoke commands
-* @param string GRANT or REVOKE
-* @param array
-* @param string
-* @param string
-* @return bool
-*/
-function grant($grant, $privileges, $columns, $on) {
-	if (!$privileges) {
-		return true;
+/**
+ * Issue grant or revoke commands.
+ *
+ * @param bool $grant
+ * @param array $privileges
+ * @param string $columns
+ * @param string $on
+ * @param string $user
+ *
+ * @return bool
+ */
+function grant($grant, array $privileges, $columns, $on, $user) {
+	if (!$privileges) return true;
+
+	if ($privileges == ["ALL PRIVILEGES", "GRANT OPTION"]) {
+		if ($grant) {
+			return (bool) queries("GRANT ALL PRIVILEGES ON $on TO $user WITH GRANT OPTION");
+		} else {
+			return queries("REVOKE ALL PRIVILEGES ON $on FROM $user") &&
+				queries("REVOKE GRANT OPTION ON $on FROM $user");
+		}
 	}
-	if ($privileges == array("ALL PRIVILEGES", "GRANT OPTION")) {
-		// can't be granted or revoked together
-		return ($grant == "GRANT"
-			? queries("$grant ALL PRIVILEGES$on WITH GRANT OPTION")
-			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
-		);
+
+	if ($privileges == ["GRANT OPTION", "PROXY"]) {
+		if ($grant) {
+			return (bool) queries("GRANT PROXY ON $on TO $user WITH GRANT OPTION");
+		} else {
+			return (bool) queries("REVOKE PROXY ON $on FROM $user");
+		}
 	}
-	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
+
+	return (bool) queries(
+		($grant ? "GRANT " : "REVOKE ") .
+		preg_replace('~(GRANT OPTION)\([^)]*\)~', '$1', implode("$columns, ", $privileges) . $columns) .
+		" ON $on " .
+		($grant ? "TO " : "FROM ") . $user
+	);
 }
 
 /** Drop old object and create a new one
@@ -513,10 +504,11 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 * @return string
 */
 function create_trigger($on, $row) {
+	global $jush;
 	$timing_event = " $row[Timing] $row[Event]" . (preg_match('~ OF~', $row["Event"]) ? " $row[Of]" : ""); // SQL injection
 	return "CREATE TRIGGER "
 		. idf_escape($row["Trigger"])
-		. (JUSH == "mssql" ? $on . $timing_event : $timing_event . $on)
+		. ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
 		. rtrim(" $row[Type]\n$row[Statement]", ";")
 		. ";"
 	;
@@ -528,22 +520,22 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-	global $driver;
+	global $inout, $jush;
 	$set = array();
 	$fields = (array) $row["fields"];
 	ksort($fields); // enforce fields order
 	foreach ($fields as $field) {
 		if ($field["field"] != "") {
-			$set[] = (preg_match("~^($driver->inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
+			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
-	$definition = rtrim($row["definition"], ";");
+	$definition = rtrim("\n$row[definition]", ";");
 	return "CREATE $routine "
 		. idf_escape(trim($row["name"]))
 		. " (" . implode(", ", $set) . ")"
-		. ($routine == "FUNCTION" ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
+		. (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
 		. ($row["language"] ? " LANGUAGE $row[language]" : "")
-		. (JUSH == "pgsql" ? " AS " . q($definition) : "\n$definition;")
+		. ($jush == "pgsql" ? " AS " . q($definition) : "$definition;")
 	;
 }
 
@@ -556,20 +548,20 @@ function remove_definer($query) {
 }
 
 /** Format foreign key to use in SQL query
-* @param array ["db" => string, "ns" => string, "table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions]
+* @param array ("db" => string, "ns" => string, "table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions)
 * @return string
 */
 function format_foreign_key($foreign_key) {
-	global $driver;
+	global $on_actions;
 	$db = $foreign_key["db"];
 	$ns = $foreign_key["ns"];
-	return " FOREIGN KEY (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["source"])) . ") REFERENCES "
+	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES "
 		. ($db != "" && $db != $_GET["db"] ? idf_escape($db) . "." : "")
 		. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
-		. idf_escape($foreign_key["table"])
-		. " (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
-		. (preg_match("~^($driver->onActions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
-		. (preg_match("~^($driver->onActions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
+		. table($foreign_key["table"])
+		. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
 	;
 }
 
@@ -598,37 +590,55 @@ function tar_file($filename, $tmp_file) {
 function ini_bytes($ini) {
 	$val = ini_get($ini);
 	switch (strtolower(substr($val, -1))) {
-		case 'g':
-			$val = (int) $val * 1024; // no break
-		case 'm':
-			$val = (int) $val * 1024; // no break
-		case 'k':
-			$val = (int) $val * 1024;
+		case 'g': $val = (int)$val * 1024; // no break
+		case 'm': $val = (int)$val * 1024; // no break
+		case 'k': $val = (int)$val * 1024;
 	}
 	return $val;
 }
 
-/** Create link to database documentation
-* @param array JUSH => $path
-* @param string HTML code
-* @return string HTML code
-*/
-function doc_link($paths, $text = "<sup>?</sup>") {
-	global $connection;
+/**
+ * Creates link to database documentation.
+ *
+ * @param array $paths $jush => $path
+ * @param string $text HTML code
+ *
+ * @return string HTML code
+ */
+function doc_link(array $paths, $text = "<sup>?</sup>") {
+	global $jush, $connection;
+
 	$server_info = $connection->server_info;
 	$version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
-	$urls = array(
+
+	$urls = [
 		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
 		'sqlite' => "https://www.sqlite.org/",
 		'pgsql' => "https://www.postgresql.org/docs/$version/",
-		'mssql' => "https://learn.microsoft.com/en-us/sql/",
+		'mssql' => "https://msdn.microsoft.com/library/",
 		'oracle' => "https://www.oracle.com/pls/topic/lookup?ctx=db" . preg_replace('~^.* (\d+)\.(\d+)\.\d+\.\d+\.\d+.*~s', '\1\2', $server_info) . "&id=",
-	);
+		'elastic' => "https://www.elastic.co/guide/en/elasticsearch/reference/$version/",
+	];
+
 	if (preg_match('~MariaDB~', $server_info)) {
 		$urls['sql'] = "https://mariadb.com/kb/en/";
 		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
 	}
-	return ($paths[JUSH] ? "<a href='" . h($urls[JUSH] . $paths[JUSH] . (JUSH == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
+
+	if (!isset($paths[$jush]) || !$paths[$jush] ) {
+		return "";
+	}
+
+	return "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>";
+}
+
+/** Wrap gzencode() for usage in ob_start()
+* @param string
+* @return string
+*/
+function ob_gzencode($string) {
+	// ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
+	return gzencode($string);
 }
 
 /** Compute size of database

adminer/include/errors.inc.php

@@ -1,7 +0,0 @@
-<?php
-namespace Adminer;
-
-error_reporting(6135); // errors and warnings
-set_error_handler(function ($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on( value of type)? null|Undefined (array key|property))~', $errstr);
-}, E_WARNING);

adminer/include/functions.inc.php

@@ -1,10 +1,7 @@
 <?php
-namespace Adminer;
-
-// This file is used both in Adminer and Adminer Editor.
 
 /** Get database connection
-* @return Db
+* @return Min_DB
 */
 function connection() {
 	// can be used in customization, $connection is minified
@@ -98,7 +95,7 @@ function bracket_escape($idf, $back = false) {
 /** Check if connection has at least the given version
 * @param string required version
 * @param string required MariaDB version
-* @param Db defaults to $connection
+* @param Min_DB defaults to $connection
 * @return bool
 */
 function min_version($version, $maria_db = "", $connection2 = null) {
@@ -111,11 +108,14 @@ function min_version($version, $maria_db = "", $connection2 = null) {
 		$server_info = $match[1];
 		$version = $maria_db;
 	}
-	return $version && version_compare($server_info, $version) >= 0;
+	if ($version == "") {
+		return false;
+	}
+	return (version_compare($server_info, $version) >= 0);
 }
 
 /** Get connection charset
-* @param Db
+* @param Min_DB
 * @return string
 */
 function charset($connection) {
@@ -161,14 +161,6 @@ function h($string) {
 	return str_replace("\0", "&#0;", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
-/** Convert \n to <br>
-* @param string
-* @return string
-*/
-function nl_br($string) {
-	return str_replace("\n", "<br>", $string); // nl2br() uses XHTML before PHP 5.3
-}
-
 /** Generate HTML checkbox
 * @param string
 * @param string
@@ -204,11 +196,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 			$opts = $v;
 		}
 		foreach ($opts as $key => $val) {
-			$return .= '<option'
-				. ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '')
-				. ($selected !== null && ($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '')
-				. '>' . h($val)
-			;
+			$return .= '<option' . ($use_keys || is_string($key) ? ' value="' . h($key) . '"' : '') . (($use_keys || is_string($key) ? (string) $key : $val) === $selected ? ' selected' : '') . '>' . h($val);
 		}
 		if (is_array($v)) {
 			$return .= '</optgroup>';
@@ -217,29 +205,22 @@ function optionlist($options, $selected = null, $use_keys = false) {
 	return $return;
 }
 
-/** Generate HTML <select>
-* @param string
-* @param array
-* @param string
-* @param string
-* @param string
-* @return string
-*/
-function html_select($name, $options, $value = "", $onchange = "", $labelled_by = "") {
-	return "<select name='" . h($name) . "'"
-		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
-		. ">" . optionlist($options, $value) . "</select>"
-		. ($onchange ? script("qsl('select').onchange = function () { $onchange };", "") : "")
-	;
-}
-
 /** Generate HTML radio list
 * @param string
 * @param array
 * @param string
+* @param string|bool true for no onchange, false for radio
+* @param string
 * @return string
 */
-function html_radios($name, $options, $value = "") {
+function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
+	if ($onchange) {
+		return "<select name='" . h($name) . "'"
+			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
+			. ">" . optionlist($options, $value) . "</select>"
+			. (is_string($onchange) ? script("qsl('select').onchange = function () { $onchange };", "") : "")
+		;
+	}
 	$return = "";
 	foreach ($options as $key => $val) {
 		$return .= "<label><input type='radio' name='" . h($name) . "' value='" . h($key) . "'" . ($key == $value ? " checked" : "") . ">" . h($val) . "</label>";
@@ -247,6 +228,22 @@ function html_radios($name, $options, $value = "") {
 	return $return;
 }
 
+/** Generate HTML <select> or <input> if $options are empty
+* @param string
+* @param array
+* @param string
+* @param string
+* @param string
+* @return string
+*/
+function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
+	$tag = ($options ? "select" : "input");
+	return "<$tag $attrs" . ($options
+		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
+}
+
 /** Get onclick confirmation
 * @param string
 * @param string
@@ -256,18 +253,17 @@ function confirm($message = "", $selector = "qsl('input')") {
 	return script("$selector.onclick = function () { return confirm('" . ($message ? js_escape($message) : lang('Are you sure?')) . "'); };", "");
 }
 
-/** Print header for hidden fieldset (close by </div></fieldset>)
-* @param string
-* @param string
-* @param bool
-* @return null
-*/
-function print_fieldset($id, $legend, $visible = false) {
+/**
+ * Prints header for hidden fieldset (close by </div></fieldset>)
+ * @param $id string
+ * @param $legend string
+ */
+function print_fieldset($id, $legend, $visible = false, $sortable = false) {
 	echo "<fieldset><legend>";
 	echo "<a href='#fieldset-$id'>$legend</a>";
 	echo script("qsl('a').onclick = partial(toggle, 'fieldset-$id');", "");
 	echo "</legend>";
-	echo "<div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
+	echo "<div id='fieldset-$id' class='" . ($visible ? "" : "hidden") . ($sortable ? " sortable" : "") . "'>\n";
 }
 
 /** Return class='active' if $bold is true
@@ -279,6 +275,18 @@ function bold($bold, $class = "") {
 	return ($bold ? " class='active $class'" : ($class ? " class='$class'" : ""));
 }
 
+/** Generate class for odd rows
+* @param string return this for odd rows, empty to reset counter
+* @return string
+*/
+function odd($return = ' class="odd"') {
+	static $i = 0;
+	if (!$return) { // reset counter
+		$i = -1;
+	}
+	return ($i++ % 2 ? $return : '');
+}
+
 /** Escape string for JavaScript apostrophes
 * @param string
 * @return string
@@ -287,6 +295,25 @@ function js_escape($string) {
 	return addcslashes($string, "\r\n'\\/"); // slash for <script>
 }
 
+/** Print one row in JSON object
+* @param string or "" to close the object
+* @param string
+* @return null
+*/
+function json_row($key, $val = null) {
+	static $first = true;
+	if ($first) {
+		echo "{";
+	}
+	if ($key != "") {
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
+		$first = false;
+	} else {
+		echo "\n}\n";
+		$first = true;
+	}
+}
+
 /** Get INI boolean value
 * @param string
 * @return bool
@@ -344,16 +371,6 @@ function q($string) {
 	return $connection->quote($string);
 }
 
-/** Get single value from database
-* @param string
-* @param int
-* @return string or false if error
-*/
-function get_val($query, $field = 0) {
-	global $connection;
-	return $connection->result($query, $field);
-}
-
 /** Get list of values from database
 * @param string
 * @param mixed
@@ -373,7 +390,7 @@ function get_vals($query, $column = 0) {
 
 /** Get keys from first column and values from second
 * @param string
-* @param Db
+* @param Min_DB
 * @param bool
 * @return array
 */
@@ -398,7 +415,7 @@ function get_key_vals($query, $connection2 = null, $set_keys = true) {
 
 /** Get all rows of result
 * @param string
-* @param Db
+* @param Min_DB
 * @param string
 * @return array of associative arrays
 */
@@ -411,7 +428,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 		while ($row = $result->fetch_assoc()) {
 			$return[] = $row;
 		}
-	} elseif (!$result && !is_object($connection2) && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
+	} elseif (!$result && !is_object($connection2) && $error && defined("PAGE_HEADER")) {
 		echo $error . error() . "\n";
 	}
 	return $return;
@@ -454,26 +471,37 @@ function escape_key($key) {
 * @return string
 */
 function where($where, $fields = array()) {
-	global $connection;
-	$return = array();
+	global $connection, $jush;
+
+	$conditions = [];
+
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
-		$return[] = $column
-			. (JUSH == "sql" && $fields[$key]["type"] == "json" ? " = CAST(" . q($val) . " AS JSON)"
-				: (JUSH == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
-				: (JUSH == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
-				: " = " . unconvert_field($fields[$key], q($val))
-			)))
-		; //! enum and set
-		if (JUSH == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
-			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
+
+		if ($jush == "sql" && $fields[$key]["type"] == "json") {
+			$conditions[] = "$column = CAST(" . q($val) . " AS JSON)";
+		} elseif ($jush == "sql" && is_numeric($val) && strpos($val, ".") !== false) {
+			// LIKE because of floats but slow with ints.
+			$conditions[] = "$column LIKE " . q($val);
+		} elseif ($jush == "mssql") {
+			// LIKE because of text.
+			$conditions[] = "$column LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val));
+		} else {
+			$conditions[] = "$column = " . unconvert_field($fields[$key], q($val));
+		}
+
+		// Not just [a-z] to catch non-ASCII characters.
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) {
+			$conditions[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
+
 	foreach ((array) $where["null"] as $key) {
-		$return[] = escape_key($key) . " IS NULL";
+		$conditions[] = escape_key($key) . " IS NULL";
 	}
-	return implode(" AND ", $return);
+
+	return implode(" AND ", $conditions);
 }
 
 /** Create SQL condition from query string
@@ -521,19 +549,17 @@ function convert_fields($columns, $fields, $select = array()) {
 /** Set cookie valid on current path
 * @param string
 * @param string
-* @param int number of seconds, 0 for session cookie, 2592000 - 30 days
+* @param int number of seconds, 0 for session cookie
 * @return bool
 */
-function cookie($name, $value, $lifetime = 2592000) {
+function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
 	global $HTTPS;
-	return header(
-		"Set-Cookie: $name=" . urlencode($value)
-			. ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
-			. "; path=" . preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"])
-			. ($HTTPS ? "; secure" : "")
-			. "; HttpOnly; SameSite=lax",
-		false
-	);
+	return header("Set-Cookie: $name=" . urlencode($value)
+		. ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
+		. "; path=" . preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"])
+		. ($HTTPS ? "; secure" : "")
+		. "; HttpOnly; SameSite=lax",
+		false);
 }
 
 /** Restart stopped session
@@ -588,7 +614,7 @@ function auth_url($vendor, $server, $username, $db = null) {
 	preg_match('~([^?]*)\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . ($db !== null ? "db|" : "") . session_name()), $match);
 	return "$match[1]?"
 		. (sid() ? SID . "&" : "")
-		. ($vendor != "server" || $server != "" ? urlencode($vendor) . "=" . urlencode($server) . "&" : "")
+		. urlencode($vendor) . "=" . urlencode($server) . "&"
 		. "username=" . urlencode($username)
 		. ($db != "" ? "&db=" . urlencode($db) : "")
 		. ($match[2] ? "&$match[2]" : "")
@@ -654,7 +680,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 
 /** Execute and remember query
 * @param string or null to return remembered queries, end with ';' to use DELIMITER
-* @return Result or [$queries, $time] if $query = null
+* @return Min_Result or array($queries, $time) if $query = null
 */
 function queries($query) {
 	global $connection;
@@ -677,7 +703,7 @@ function queries($query) {
 * @param callback
 * @return bool
 */
-function apply_queries($query, $tables, $escape = 'Adminer\table') {
+function apply_queries($query, $tables, $escape = 'table') {
 	foreach ($tables as $table) {
 		if (!queries("$query " . $escape($table))) {
 			return false;
@@ -735,10 +761,9 @@ function pagination($page, $current) {
 /** Get file contents from $_FILES
 * @param string
 * @param bool
-* @param string
 * @return mixed int for error, string otherwise
 */
-function get_file($key, $decompress = false, $delimiter = "") {
+function get_file($key, $decompress = false) {
 	$file = $_FILES[$key];
 	if (!$file) {
 		return null;
@@ -753,24 +778,23 @@ function get_file($key, $decompress = false, $delimiter = "") {
 		}
 		$name = $file["name"][$key];
 		$tmp_name = $file["tmp_name"][$key];
-		$content = file_get_contents(
-			$decompress && preg_match('~\.gz$~', $name)
+		$content = file_get_contents($decompress && preg_match('~\.gz$~', $name)
 			? "compress.zlib://$tmp_name"
 			: $tmp_name
 		); //! may not be reachable because of open_basedir
 		if ($decompress) {
 			$start = substr($content, 0, 3);
-			if (function_exists("iconv") && preg_match("~^\xFE\xFF|^\xFF\xFE~", $start)) { // not ternary operator to save memory
+			if (function_exists("iconv") && preg_match("~^\xFE\xFF|^\xFF\xFE~", $start, $regs)) { // not ternary operator to save memory
 				$content = iconv("utf-16", "utf-8", $content);
 			} elseif ($start == "\xEF\xBB\xBF") { // UTF-8 BOM
 				$content = substr($content, 3);
 			}
-		}
-		$return .= $content;
-		if ($delimiter) {
-			$return .= (preg_match("($delimiter\\s*\$)", $content) ? "" : $delimiter) . "\n\n";
+			$return .= $content . "\n\n";
+		} else {
+			$return .= $content;
 		}
 	}
+	//! support SQL files not ending with semicolon
 	return $return;
 }
 
@@ -809,6 +833,8 @@ function is_utf8($val) {
 * @return string escaped string with appended ...
 */
 function shorten_utf8($string, $length = 80, $suffix = "") {
+	if ($string == "") return $suffix;
+
 	if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{10FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
 		preg_match("(^(" . repeat_pattern("[\t\r\n -~]", $length) . ")($)?)", $string, $match);
 	}
@@ -829,7 +855,7 @@ function format_number($val) {
 */
 function friendly_url($val) {
 	// used for blobs and export
-	return preg_replace('~\W~i', '-', $val);
+	return preg_replace('~[^a-z0-9_]~i', '-', $val);
 }
 
 /** Print hidden fields
@@ -874,7 +900,7 @@ function table_status1($table, $fast = false) {
 
 /** Find out foreign keys for each column
 * @param string
-* @return array [$col => []]
+* @return array array($col => array())
 */
 function column_foreign_keys($table) {
 	global $adminer;
@@ -891,19 +917,22 @@ function column_foreign_keys($table) {
 * @param string "radio"|"checkbox"
 * @param string
 * @param array
-* @param mixed string|array
+* @param mixed int|string|array
 * @param string
 * @return null
 */
 function enum_input($type, $attrs, $field, $value, $empty = null) {
 	global $adminer;
+
+	$return = ($empty !== null && !is_strict_mode() ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
+
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
-	$return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === $empty) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $val));
-		$checked = (is_array($value) ? in_array($val, $value) : $value === $val);
-		$return .= " <label><input type='$type'$attrs value='" . h($val) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
+		$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
+		$return .= " <label><input type='$type'$attrs value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
 	}
+
 	return $return;
 }
 
@@ -914,74 +943,75 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $driver, $adminer;
+	global $types, $adminer, $jush;
+
 	$name = h(bracket_escape($field["field"]));
-	echo "<td class='function'>";
+
 	if (is_array($value) && !$function) {
-		$value = json_encode($value, 128); // 128 - JSON_PRETTY_PRINT available since PHP 5.4
+		$args = array($value);
+		if (version_compare(PHP_VERSION, 5.4) >= 0) {
+			$args[] = JSON_PRETTY_PRINT;
+		}
+		$value = call_user_func_array('json_encode', $args);
 		$function = "json";
 	}
-	$reset = (JUSH == "mssql" && $field["auto_increment"]);
+	$reset = ($jush == "mssql" && $field["auto_increment"]);
 	if ($reset && !$_POST["save"]) {
 		$function = null;
 	}
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
+
 	$disabled = stripos($field["default"], "GENERATED ALWAYS AS ") === 0 ? " disabled=''" : "";
-	$attrs = " name='fields[$name]'$disabled";
-	$enums = $driver->enumLength($field);
-	if ($enums) {
-		$field["type"] = "enum";
-		$field["length"] = $enums;
-	}
+	$attrs = " name='fields[$name]' $disabled";
+
+	echo "<td class='function'>";
+
 	if ($field["type"] == "enum") {
-		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
+		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value, $function);
 	} else {
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
-			? "<select name='function[$name]'$disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
-				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
+			? "<select name='function[$name]' $disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+				. help_script_command("value.replace(/^SQL\$/, '')", true)
 				. script("qsl('select').onchange = functionChange;", "")
 			: h(reset($functions))
 		) . '<td>';
-		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
+		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value, $function); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
 		} elseif (preg_match('~bool~', $field["type"])) {
-			echo "<input type='hidden'$attrs value='0'>"
-				. "<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
-		} elseif ($field["type"] == "set") {
+			echo "<input type='hidden'$attrs value='0'>" .
+				"<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
+		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
 				$val = stripcslashes(str_replace("''", "'", $val));
-				$checked = in_array($val, explode(",", $value), true);
-				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . h($val) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
+				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
+				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
 			}
 		} elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
 			echo "<input type='file' name='fields-$name'>";
 		} elseif (($text = preg_match('~text|lob|memo~i', $field["type"])) || preg_match("~\n~", $value)) {
-			if ($text && JUSH != "sqlite") {
+			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
 			} else {
 				$rows = min(12, substr_count($value, "\n") + 1);
-				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
+				$attrs .= " cols='30' rows='$rows'";
 			}
 			echo "<textarea$attrs>" . h($value) . '</textarea>';
 		} elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
 			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
-			$types = $driver->types();
-			$maxlength = (!preg_match('~int~', $field["type"]) && preg_match('~^(\d+)(,(\d+))?$~', $field["length"], $match)
-				? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0))
-				: ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0)
-			);
-			if (JUSH == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
+			$maxlength = (!preg_match('~int~', $field["type"]) && preg_match('~^(\d+)(,(\d+))?$~', $field["length"], $match) ? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
+			if ($jush == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
 				$maxlength += 7; // microtime
 			}
 			// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
 			echo "<input"
 				. ((!$has_function || $function === "") && preg_match('~(?<!o)int(?!er)~', $field["type"]) && !preg_match('~\[\]~', $field["full_type"]) ? " type='number'" : "")
-				. " value='" . h($value) . "'" . ($maxlength ? " data-maxlength='$maxlength'" : "")
+				. ($function != "now" ? " value='" . h($value) . "'" : " data-last-value='" . h($value) . "'")
+				. ($maxlength ? " data-maxlength='$maxlength'" : "")
 				. (preg_match('~char|binary~', $field["type"]) && $maxlength > 20 ? " size='40'" : "")
 				. "$attrs>"
 			;
@@ -995,9 +1025,7 @@ function input($field, $value, $function) {
 			}
 			$first++;
 		}
-		if ($first) {
-			echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
-		}
+		echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
 	}
 }
 
@@ -1015,13 +1043,14 @@ function process_input($field) {
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
-	if ($field["type"] == "enum" || $driver->enumLength($field)) {
+	if ($field["type"] == "enum") {
 		if ($value == -1) {
 			return false;
 		}
 		if ($value == "") {
 			return "NULL";
 		}
+		return +$value;
 	}
 	if ($field["auto_increment"] && $value == "") {
 		return null;
@@ -1033,7 +1062,7 @@ function process_input($field) {
 		return "NULL";
 	}
 	if ($field["type"] == "set") {
-		$value = implode(",", (array) $value);
+		return array_sum((array) $value);
 	}
 	if ($function == "json") {
 		$function = "";
@@ -1101,6 +1130,27 @@ function search_tables() {
 	echo ($sep ? "<p class='message'>" . lang('No tables.') : "</ul>") . "\n";
 }
 
+/**
+ * @param string $table
+ * @return array
+ */
+function get_partitions_info($table) {
+	global $connection;
+
+	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
+
+	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+
+	$info = [];
+	list($info["partition_by"], $info["partition"],  $info["partitions"]) = $result->fetch_row();
+
+	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+	$info["partition_names"] = array_keys($partitions);
+	$info["partition_values"] = array_values($partitions);
+
+	return $info;
+}
+
 /** Send headers for export
 * @param string
 * @param bool
@@ -1161,60 +1211,98 @@ function get_temp_dir() {
 	return $return;
 }
 
-/** Open and exclusively lock a file
-* @param string
-* @return resource or null for error
-*/
-function file_open_lock($filename) {
-	$fp = @fopen($filename, "r+"); // @ - may not exist
-	if (!$fp) { // c+ is available since PHP 5.2.6
-		$fp = @fopen($filename, "w"); // @ - may not be writable
-		if (!$fp) {
-			return;
-		}
-		chmod($filename, 0660);
+/**
+ * Opens and exclusively lock a file.
+ *
+ * @param string $filename
+ * @return resource|null
+ */
+function open_file_with_lock($filename)
+{
+	$file = fopen($filename, "c+");
+	if (!$file) {
+		return null;
 	}
-	flock($fp, LOCK_EX);
-	return $fp;
+
+	chmod($filename, 0660);
+
+	if (!flock($file, LOCK_EX)) {
+		fclose($file);
+		return null;
+	}
+
+	return $file;
 }
 
-/** Write and unlock a file
-* @param resource
-* @param string
-*/
-function file_write_unlock($fp, $data) {
-	rewind($fp);
-	fwrite($fp, $data);
-	ftruncate($fp, strlen($data));
-	flock($fp, LOCK_UN);
-	fclose($fp);
+/**
+ * Writes and unlocks a file.
+ *
+ * @param resource $file
+ * @param string $data
+ */
+function write_and_unlock_file($file, $data)
+{
+	rewind($file);
+	fwrite($file, $data);
+	ftruncate($file, strlen($data));
+
+	unlock_file($file);
 }
 
-/** Read password from file adminer.key in temporary directory or create one
-* @param bool
-* @return string or false if the file can not be created
-*/
-function password_file($create) {
+/**
+ * Unlocks and closes the file.
+ *
+ * @param resource $file
+ */
+function unlock_file($file)
+{
+	flock($file, LOCK_UN);
+	fclose($file);
+}
+
+/**
+ * Reads password from file adminer.key in temporary directory or create one.
+ *
+ * @param $create bool
+ * @return string|false Returns false if the file can not be created.
+ * @throws \Random\RandomException
+ */
+function get_private_key($create)
+{
 	$filename = get_temp_dir() . "/adminer.key";
-	$return = @file_get_contents($filename); // @ - may not exist
-	if ($return || !$create) {
-		return $return;
+
+	if (!$create && !file_exists($filename)) {
+		return false;
 	}
-	$fp = @fopen($filename, "w"); // @ - can have insufficient rights //! is not atomic
-	if ($fp) {
-		chmod($filename, 0660);
-		$return = rand_string();
-		fwrite($fp, $return);
-		fclose($fp);
+
+	$file = open_file_with_lock($filename);
+	if (!$file) {
+		return false;
 	}
-	return $return;
+
+	$key = stream_get_contents($file);
+	if (!$key) {
+		$key = get_random_string();
+		write_and_unlock_file($file, $key);
+	} else {
+		unlock_file($file);
+	}
+
+	return $key;
 }
 
-/** Get a random string
-* @return string 32 hexadecimal characters
-*/
-function rand_string() {
-	return md5(uniqid(mt_rand(), true));
+/**
+ * Returns a random 32 characters long string.
+ *
+ * @param $binary bool
+ * @return string
+ * @throws \Random\RandomException
+ */
+function get_random_string($binary = false)
+{
+	$bytes = function_exists('random_bytes') ? random_bytes(32) : uniqid(mt_rand(), true);
+
+	return $binary ? $bytes : md5($bytes);
 }
 
 /** Format value to use in select
@@ -1243,7 +1331,7 @@ function select_value($val, $link, $field, $text_length) {
 		if (is_mail($val)) {
 			$link = "mailto:$val";
 		}
-		if (is_url($val)) {
+		if (is_web_url($val)) {
 			$link = $val; // IE 11 and all modern browsers hide referrer
 		}
 	}
@@ -1264,20 +1352,32 @@ function select_value($val, $link, $field, $text_length) {
 * @param string
 * @return bool
 */
-function is_mail($email) {
-	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
-	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
-	return is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
+function is_mail($value) {
+	return is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL);
 }
 
-/** Check whether the string is URL address
+/** Check whether the string is web URL address
 * @param string
 * @return bool
 */
-function is_url($string) {
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
-	return preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
+function is_web_url($value) {
+	if (!is_string($value) || !preg_match('~^https?://~i', $value)) {
+		return false;
+	}
+
+	$components = parse_url($value);
+    if (!$components) {
+        return false;
+    }
+
+    // Encode URL path. If path was encoded already, it will be encoded twice, but we are OK with that.
+	$encodedParts = array_map('urlencode', explode('/', $components['path']));
+	$url = str_replace($components['path'], implode('/', $encodedParts), $value);
+
+	parse_str($components['query'], $params);
+	$url = str_replace($components['query'], http_build_query($params), $url);
+
+	return (bool)filter_var($url, FILTER_VALIDATE_URL);
 }
 
 /** Check if field should be shortened
@@ -1296,8 +1396,9 @@ function is_shortable($field) {
 * @return string
 */
 function count_rows($table, $where, $is_group, $group) {
+	global $jush;
 	$query = " FROM " . table($table) . ($where ? " WHERE " . implode(" AND ", $where) : "");
-	return ($is_group && (JUSH == "sql" || count($group) == 1)
+	return ($is_group && ($jush == "sql" || count($group) == 1)
 		? "SELECT COUNT(DISTINCT " . implode(", ", $group) . ")$query"
 		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query GROUP BY " . implode(", ", $group) . ") x" : $query)
 	);
@@ -1312,8 +1413,7 @@ function slow_query($query) {
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
 	$slow_query = $driver->slowQuery($query, $timeout);
-	$connection2 = null;
-	if (!$slow_query && support("kill") && is_object($connection2 = connect($adminer->credentials())) && ($db == "" || $connection2->select_db($db))) {
+	if (!$slow_query && support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
 		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
 <script<?php echo nonce(); ?>>
@@ -1323,10 +1423,12 @@ var timeout = setTimeout(function () {
 }, <?php echo 1000 * $timeout; ?>);
 </script>
 <?php
+	} else {
+		$connection2 = null;
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals(($slow_query ?: $query), $connection2, false); // @ - may be killed
+	$return = @get_key_vals(($slow_query ? $slow_query : $query), $connection2, false); // @ - may be killed
 	if ($connection2) {
 		echo script("clearTimeout(timeout);");
 		ob_flush();
@@ -1389,13 +1491,26 @@ function lzw_decompress($binary) {
 	return $return;
 }
 
-/** Return events to display help on mouse over
-* @param string JS expression
-* @param bool JS expression
-* @return string
-*/
-function on_help($command, $side = 0) {
-	return script("mixin(qsl('select, input'), {onmouseover: function (event) { helpMouseover.call(this, event, $command, $side) }, onmouseout: helpMouseout});", "");
+/**
+ * @param string $text Help text.
+ * @param bool $side Side position.
+ *
+ * @return string
+ */
+function help_script($text, $side = false)
+{
+	return script("initHelpFor(qsl('select, input'), '" . h($text) . "', $side);", "");
+}
+
+/**
+ * @param string $command JS expression for returning the help text.
+ * @param bool $side Side position.
+ *
+ * @return string
+ */
+function help_script_command($command, $side = false)
+{
+	return script("initHelpFor(qsl('select, input'), (value) => { return $command; }, $side);", "");
 }
 
 /** Print edit data form
@@ -1406,7 +1521,7 @@ function on_help($command, $side = 0) {
 * @return null
 */
 function edit_form($table, $fields, $row, $update) {
-	global $adminer, $token, $error;
+	global $adminer, $jush, $token, $error;
 	$table_name = $adminer->tableName(table_status1($table, true));
 	page_header(
 		($update ? lang('Edit') : lang('Insert')),
@@ -1422,11 +1537,11 @@ function edit_form($table, $fields, $row, $update) {
 	?>
 <form action="" method="post" enctype="multipart/form-data" id="form">
 <?php
-	$first = 0;
 	if (!$fields) {
 		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
 	} else {
-		echo "<table class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+		echo "<table cellspacing='0' class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
+
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
 			$default = $_GET["set"][bracket_escape($name)];
@@ -1437,8 +1552,8 @@ function edit_form($table, $fields, $row, $update) {
 				}
 			}
 			$value = ($row !== null
-				? ($row[$name] != "" && JUSH == "sql" && preg_match("~enum|set~", $field["type"]) && is_array($row[$name])
-					? implode(",", $row[$name])
+				? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
+					? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
 					: (is_bool($row[$name]) ? +$row[$name] : $row[$name])
 				)
 				: (!$update && $field["auto_increment"]
@@ -1467,9 +1582,6 @@ function edit_form($table, $fields, $row, $update) {
 				$value = "";
 				$function = "uuid";
 			}
-			if ($field["auto_increment"] || $function == "now" || $function == "uuid") {
-				$first++;
-			}
 			input($field, $value, $function);
 			echo "\n";
 		}
@@ -1496,7 +1608,7 @@ function edit_form($table, $fields, $row, $update) {
 		}
 	}
 	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'>" . confirm() . "\n"
-		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[2*$first+1].firstChild);"))
+		: ($_POST || !$fields ? "" : script("focus(qsa('td', gid('form'))[1].firstChild);"))
 	);
 	if (isset($_GET["select"])) {
 		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));

adminer/include/lang.inc.php

@@ -1,13 +1,10 @@
 <?php
-namespace Adminer;
 
-// not used in a single language version
-
-$langs = array(
+$languages = [
 	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com, Hossain Ahmed Saiman - hossain.ahmed@altscope.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com | Hossain Ahmed Saiman - hossain.ahmed@altscope.com
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
@@ -27,8 +24,8 @@ $langs = array(
 	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
 	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
-	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
+	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
@@ -48,24 +45,59 @@ $langs = array(
 	'vi' => 'Tiếng Việt', // Giang Manh @ manhgd google mail
 	'zh' => '简体中文', // Mr. Lodar, vea - urn2.net - vea.urn2@gmail.com
 	'zh-tw' => '繁體中文', // http://tzangms.com
-);
+];
 
-/** Get current language
-* @return string
-*/
-function get_lang() {
+/**
+ * Returns the list of available languages.
+ * In compiled version, only selected languages are returned.
+ *
+ * @return array
+ */
+function get_available_languages()
+{
+	global $languages;
+	return $languages; // compile: available languages
+}
+
+/**
+ * Converts translation key into the right form.
+ * In compiled version, string keys used in plugins are dynamically translated to numeric keys.
+ *
+ * @param string|int $key
+ *
+ * @return string|int
+ */
+function convert_translation_key($key)
+{
+	return $key; // compile: convert translation key
+}
+
+/**
+ * Returns current language.
+ *
+ * @return string
+ */
+function get_lang()
+{
 	global $LANG;
 	return $LANG;
 }
 
-/** Translate string
-* @param string
-* @param int
-* @return string
-*/
-function lang($idf, $number = null) {
+/**
+ * Returns translated text.
+ *
+ * @param string|int $key Numeric key is used in compiled version.
+ * @param ?int $number
+ *
+ * @return string
+ */
+function lang($key, $number = null)
+{
 	global $LANG, $translations;
-	$translation = ($translations[$idf] ?: $idf);
+
+	$key = convert_translation_key($key);
+	$translation = $translations[$key] ?: $key;
+
 	if (is_array($translation)) {
 		$pos = ($number == 1 ? 0
 			: ($LANG == 'cs' || $LANG == 'sk' ? ($number && $number < 5 ? 1 : 2) // different forms for 1, 2-4, other
@@ -73,57 +105,80 @@ function lang($idf, $number = null) {
 			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4 except 12-14, other
 			: ($LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
 			: ($LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: ($LANG == 'lv' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number ? 1 : 2)) // different forms for 1 except 11, other, 0
 			: ($LANG == 'bs' || $LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1 except 11, 2-4 except 12-14, other
 			: 1 // different forms for 1, other
-		)))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
+		))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
+
 		$translation = $translation[$pos];
 	}
+
 	$args = func_get_args();
 	array_shift($args);
+
 	$format = str_replace("%d", "%s", $translation);
 	if ($format != $translation) {
 		$args[0] = format_number($number);
 	}
+
 	return vsprintf($format, $args);
 }
 
-function switch_lang() {
-	global $LANG, $langs;
-	echo "<form action='' method='post'>\n<div id='lang'>";
-	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
+function language_select()
+{
+	global $LANG, $languages;
+
+	$available_languages = get_available_languages();
+	if (count($available_languages) == 1) {
+		return;
+	}
+
+	$options = [];
+	foreach ($languages as $language => $title) {
+		if (isset($available_languages[$language])) {
+			$options[$language] = $title;
+		}
+	}
+
+	echo "<div id='lang'><form action='' method='post'>\n";
+	echo lang('Language') . ": " . html_select("lang", $options, $LANG, "this.form.submit();");
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
 	echo "<input type='hidden' name='token' value='" . get_token() . "'>\n"; // $token may be empty in auth.inc.php
-	echo "</div>\n</form>\n";
+	echo "</form></div>\n";
 }
 
 if (isset($_POST["lang"]) && verify_token()) { // $error not yet available
 	cookie("adminer_lang", $_POST["lang"]);
+
 	$_SESSION["lang"] = $_POST["lang"]; // cookies may be disabled
-	$_SESSION["translations"] = array(); // used in compiled version
+	$_SESSION["translations"] = []; // used in compiled version
+
 	redirect(remove_from_uri());
 }
 
-$LANG = "en";
-if (isset($langs[$_COOKIE["adminer_lang"]])) {
+$available_languages = get_available_languages();
+$LANG = array_keys($available_languages)[0];
+
+if (isset($_COOKIE["adminer_lang"]) && isset($available_languages[$_COOKIE["adminer_lang"]])) {
 	cookie("adminer_lang", $_COOKIE["adminer_lang"]);
 	$LANG = $_COOKIE["adminer_lang"];
-} elseif (isset($langs[$_SESSION["lang"]])) {
+} elseif (isset($available_languages[$_SESSION["lang"]])) {
 	$LANG = $_SESSION["lang"];
-} else {
-	$accept_language = array();
+} elseif (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+	$accept_language = [];
 	preg_match_all('~([-a-z]+)(;q=([0-9.]+))?~', str_replace("_", "-", strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"])), $matches, PREG_SET_ORDER);
 	foreach ($matches as $match) {
 		$accept_language[$match[1]] = (isset($match[3]) ? $match[3] : 1);
 	}
+
 	arsort($accept_language);
 	foreach ($accept_language as $key => $q) {
-		if (isset($langs[$key])) {
+		if (isset($available_languages[$key])) {
 			$LANG = $key;
 			break;
 		}
+
 		$key = preg_replace('~-.*~', '', $key);
-		if (!isset($accept_language[$key]) && isset($langs[$key])) {
+		if (!isset($accept_language[$key]) && isset($available_languages[$key])) {
 			$LANG = $key;
 			break;
 		}

adminer/include/pdo.inc.php

@@ -1,25 +1,29 @@
 <?php
-namespace Adminer;
-
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	abstract class PdoDb {
-		public $server_info, $affected_rows, $errno, $error;
-		protected $pdo;
-		private $result;
+	/*abstract*/ class Min_PDO {
+		var $_result, $server_info, $affected_rows, $errno, $error, $pdo;
 
-		function dsn($dsn, $username, $password, $options = array()) {
-			$options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
-			$options[\PDO::ATTR_STATEMENT_CLASS] = array('Adminer\PdoDbStatement');
+		function __construct() {
+			global $adminer;
+			$pos = array_search("SQL", $adminer->operators);
+			if ($pos !== false) {
+				unset($adminer->operators[$pos]);
+			}
+		}
+
+		function dsn($dsn, $username, $password, $options = []) {
+			$options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT;
+			$options[PDO::ATTR_STATEMENT_CLASS] = [Min_PDOStatement::class];
 			try {
-				$this->pdo = new \PDO($dsn, $username, $password, $options);
+				$this->pdo = new PDO($dsn, $username, $password, $options);
 			} catch (Exception $ex) {
 				auth_error(h($ex->getMessage()));
 			}
-			$this->server_info = @$this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
+			$this->server_info = @$this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
 		}
 
-		abstract function select_db($database);
+		/*abstract function select_db($database);*/
 
 		function quote($string) {
 			return $this->pdo->quote($string);
@@ -40,12 +44,12 @@ if (extension_loaded('pdo')) {
 		}
 
 		function multi_query($query) {
-			return $this->result = $this->query($query);
+			return $this->_result = $this->query($query);
 		}
 
 		function store_result($result = null) {
 			if (!$result) {
-				$result = $this->result;
+				$result = $this->_result;
 				if (!$result) {
 					return false;
 				}
@@ -59,11 +63,11 @@ if (extension_loaded('pdo')) {
 		}
 
 		function next_result() {
-			if (!$this->result) {
+			if (!$this->_result) {
 				return false;
 			}
-			$this->result->_offset = 0;
-			return @$this->result->nextRowset(); // @ - PDO_PgSQL doesn't support it
+			$this->_result->_offset = 0;
+			return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
 		}
 
 		function result($query, $field = 0) {
@@ -76,15 +80,15 @@ if (extension_loaded('pdo')) {
 		}
 	}
 
-	class PdoDbStatement extends \PDOStatement {
-		public $_offset = 0, $num_rows;
+	class Min_PDOStatement extends PDOStatement {
+		var $_offset = 0, $num_rows;
 
 		function fetch_assoc() {
-			return $this->fetch(\PDO::FETCH_ASSOC);
+			return $this->fetch(PDO::FETCH_ASSOC);
 		}
 
 		function fetch_row() {
-			return $this->fetch(\PDO::FETCH_NUM);
+			return $this->fetch(PDO::FETCH_NUM);
 		}
 
 		function fetch_field() {
@@ -94,11 +98,5 @@ if (extension_loaded('pdo')) {
 			$row->charsetnr = (in_array("blob", (array) $row->flags) ? 63 : 0);
 			return $row;
 		}
-
-		function seek($offset) {
-			for ($i=0; $i < $offset; $i++) {
-				$this->fetch();
-			}
-		}
 	}
 }

adminer/include/tmpfile.inc.php

@@ -1,21 +1,22 @@
 <?php
-namespace Adminer;
 
 class TmpFile {
-	private $handler, $size;
-
+	var $handler;
+	var $size;
+	
 	function __construct() {
 		$this->handler = tmpfile();
 	}
-
+	
 	function write($contents) {
 		$this->size += strlen($contents);
 		fwrite($this->handler, $contents);
 	}
-
+	
 	function send() {
 		fseek($this->handler, 0);
 		fpassthru($this->handler);
 		fclose($this->handler);
 	}
+	
 }

adminer/include/version.inc.php

@@ -1,4 +1,2 @@
 <?php
-namespace Adminer;
-
-$VERSION = "5.0.4";
+$VERSION = "4.14";

adminer/include/xxtea.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 /** PHP implementation of XXTEA encryption algorithm
 * @author Ma Bingyao <andot@ujn.edu.cn>
 * @link http://www.coolcode.cn/?action=show&id=128

adminer/index.php

@@ -1,17 +1,21 @@
 <?php
-/** Adminer - Compact database management
-* @link https://www.adminer.org/
-* @author Jakub Vrana, https://www.vrana.cz/
-* @copyright 2007 Jakub Vrana
-* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
-*/
-
-namespace Adminer;
+/**
+ * AdminerNeo - Database management in a single PHP file
+ *
+ * @link https://github.com/adminerneo/adminerneo
+ * @author Jakub Vrana (https://www.vrana.cz/)
+ * @author Peter Knut
+ * @copyright 2007-2021 Jakub Vrana, 2024 Peter Knut
+ * @license Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+ * @license GNU General Public License, version 2 (https://www.gnu.org/licenses/gpl-2.0.html)
+ */
 
 include "./include/bootstrap.inc.php";
 include "./include/tmpfile.inc.php";
 
+$enum_length = "'(?:''|[^'\\\\]|\\\\.)*'";
+$inout = "IN|OUT|INOUT";
+
 if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {
 	$_GET["edit"] = $_GET["select"];
 }
@@ -58,8 +62,6 @@ if (isset($_GET["download"])) {
 	include "./sequence.inc.php";
 } elseif (isset($_GET["type"])) {
 	include "./type.inc.php";
-} elseif (isset($_GET["check"])) {
-	include "./check.inc.php";
 } elseif (isset($_GET["trigger"])) {
 	include "./trigger.inc.php";
 } elseif (isset($_GET["user"])) {

adminer/indexes.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
@@ -12,15 +10,13 @@ if (preg_match('~MyISAM|M?aria' . (min_version(5.7, '10.2.2') ? '|InnoDB' : '')
 }
 $indexes = indexes($TABLE);
 $primary = array();
-if (JUSH == "mongo") { // doesn't support primary key
+if ($jush == "mongo") { // doesn't support primary key
 	$primary = $indexes["_id_"];
 	unset($index_types[0]);
 	unset($indexes["_id_"]);
 }
 $row = $_POST;
-if ($row) {
-	set_adminer_settings(array("index_options" => $row["options"]));
-}
+
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 	$alter = array();
 	foreach ($row["indexes"] as $index) {
@@ -37,28 +33,27 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 					$desc = $index["descs"][$key];
 					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "") . ($desc ? " DESC" : "");
 					$columns[] = $column;
-					$lengths[] = ($length ?: null);
+					$lengths[] = ($length ? $length : null);
 					$descs[] = $desc;
 				}
 			}
 
-			$existing = $indexes[$name];
-			if ($existing) {
-				ksort($existing["columns"]);
-				ksort($existing["lengths"]);
-				ksort($existing["descs"]);
-				if (
-					$index["type"] == $existing["type"]
-					&& array_values($existing["columns"]) === $columns
-					&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
-					&& array_values($existing["descs"]) === $descs
-				) {
-					// skip existing index
-					unset($indexes[$name]);
-					continue;
-				}
-			}
 			if ($columns) {
+				$existing = $indexes[$name];
+				if ($existing) {
+					ksort($existing["columns"]);
+					ksort($existing["lengths"]);
+					ksort($existing["descs"]);
+					if ($index["type"] == $existing["type"]
+						&& array_values($existing["columns"]) === $columns
+						&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
+						&& array_values($existing["descs"]) === $descs
+					) {
+						// skip existing index
+						unset($indexes[$name]);
+						continue;
+					}
+				}
 				$alter[] = array($index["type"], $name, $set);
 			}
 		}
@@ -96,21 +91,14 @@ if (!$row) {
 	$indexes[] = array("columns" => array(1 => ""));
 	$row["indexes"] = $indexes;
 }
-$lengths = (JUSH == "sql" || JUSH == "mssql");
-$show_options = ($_POST ? $_POST["options"] : adminer_setting("index_options"));
 ?>
 
 <form action="" method="post">
 <div class="scrollable">
-<table class="nowrap">
+<table cellspacing="0" class="nowrap">
 <thead><tr>
 <th id="label-type"><?php echo lang('Index Type'); ?>
-<th><input type="submit" class="wayoff"><?php
-echo lang('Column') . ($lengths ? "<span class='idxopts" . ($show_options ? "" : " hidden") . "'> (" . lang('length') . ")</span>" : "");
-if ($lengths || support("descidx")) {
-	echo checkbox("options", 1, $show_options, lang('Options'), "indexOptionsShow(this.checked)", "jsonly") . "\n";
-}
-?>
+<th><input type="submit" class="wayoff"><?php echo lang('Column (length)'); ?>
 <th id="label-name"><?php echo lang('Name'); ?>
 <th><noscript><?php echo "<input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?></noscript>
 </thead>
@@ -126,7 +114,7 @@ if ($primary) {
 $j = 1;
 foreach ($row["indexes"] as $index) {
 	if (!$_POST["drop_col"] || $j != key($_POST["drop_col"])) {
-		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : ""), "label-type");
+		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : 1), "label-type");
 
 		echo "<td>";
 		ksort($index["columns"]);
@@ -136,12 +124,11 @@ foreach ($row["indexes"] as $index) {
 				" name='indexes[$j][columns][$i]' title='" . lang('Column') . "'",
 				($fields ? array_combine($fields, $fields) : $fields),
 				$column,
-				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape(JUSH == "sql" ? "" : $_GET["indexes"] . "_") . "')"
+				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"
 			);
-			echo "<span class='idxopts" . ($show_options ? "" : " hidden") . "'>";
-			echo ($lengths ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
+			echo ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
 			echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
-			echo "</span> </span>";
+			echo " </span>";
 			$i++;
 		}
 

adminer/lang/ar.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
-	'Invalid credentials.' => 'بيانات الدخول غير صالحة.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'الخادم',
 	'Username' => 'اسم المستخدم',
 	'Password' => 'كلمة المرور',
@@ -68,7 +67,6 @@ $translations = array(
 	'Unable to select the table' => 'يتعذر اختيار الجدول',
 	'Invalid CSRF token. Send the form again.' => 'رمز CSRF غير صالح. المرجو إرسال الاستمارة مرة أخرى.',
 	'Comment' => 'تعليق',
-	'Default values' => 'القيم الافتراضية',
 	'%d byte(s)' => '%d بايت',
 	'No commands to execute.' => 'لا توجد أوامر للتنفيذ.',
 	'Unable to upload a file.' => 'يتعذر رفع ملف ما.',
@@ -77,7 +75,7 @@ $translations = array(
 	'Routine has been called, %d row(s) affected.' => 'تم استدعاء الروتين, عدد الأسطر المعدلة %d.',
 	'Call' => 'استدعاء',
 	'No extension' => 'امتداد غير موجود',
-	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php (%s) المدعومة غير موجودة.',
+	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php المدعومة غير موجودة.',
 	'Session support must be enabled.' => 'عليك تفعيل نظام الجلسات.',
 	'Session expired, please login again.' => 'إنتهت الجلسة، من فضلك أعد تسجيل الدخول.',
 	'Text length' => 'طول النص',
@@ -95,7 +93,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'نوع المؤشر',
-	'length' => 'الطول',
+	'Column (length)' => 'العمود (الطول)',
 	'View has been dropped.' => 'تم مسح العرض.',
 	'View has been altered.' => 'تم تعديل العرض.',
 	'View has been created.' => 'تم إنشاء العرض.',
@@ -171,8 +169,8 @@ $translations = array(
 	'Tables and views' => 'الجداول و العروض',
 	'Engine' => 'المحرك',
 	'Collation' => 'ترتيب',
-	'Data Length' => 'طول المعطيات',
-	'Index Length' => 'طول المؤشر',
+	'Data Length' => 'طول المعطيات.',
+	'Index Length' => 'طول المؤشر.',
 	'Data Free' => 'المساحة الحرة',
 	'Rows' => 'الأسطر',
 	',' => ',',
@@ -189,10 +187,11 @@ $translations = array(
 	'Clone' => 'نسخ',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s.',
 	'Partition by' => 'مقسم بواسطة',
+	'Partition' => null,
 	'Partitions' => 'التقسيمات',
 	'Partition name' => 'اسم التقسيم',
 	'Values' => 'القيم',
-	'%d row(s) have been imported.' => 'تم استيراد %d سطرا.',
+	'%d row(s) have been imported.' => 'تم استيراد %d سطرا',
 	'anywhere' => 'في اي مكان',
 	'Import' => 'استيراد',
 	'Stop on error' => 'أوقف في حالة حدوث خطأ',
@@ -224,6 +223,7 @@ $translations = array(
 	'Databases have been dropped.' => 'تم حذف قواعد البيانات.',
 	'Database has been dropped.' => 'تم حذف قاعدة البيانات.',
 	'Search data in tables' => 'بحث في الجداول',
+	'as a regular expression' => null,
 	'Schema' => 'المخطط',
 	'Alter schema' => 'تعديل المخطط',
 	'Create schema' => 'إنشاء مخطط',
@@ -251,8 +251,8 @@ $translations = array(
 	'Network' => 'شبكة',
 	'Geometry' => 'هندسة',
 	'File exists.' => 'الملف موجود.',
-	'Attachments' => 'ملفات مرفقة',
-	'Item%s has been inserted.' => '%sتم إدراج العنصر.',
+	'Attachments' => 'ملفات مرفقة.',
+	'Item%s has been inserted.' => 'تم إدراج العنصر.',
 	'now' => 'الآن',
 	'%d query(s) executed OK.' => array('تم تنفيذ الاستعلام %d بنجاح.', 'تم تنفيذ الاستعلامات %d بنجاح.'),
 	'Show only errors' => 'إظهار الأخطاء فقط',
@@ -265,4 +265,55 @@ $translations = array(
 	'Permanent link' => 'رابط دائم',
 	'Edit all' => 'تعديل الكل',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/bg.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Система',
 	'Server' => 'Сървър',
 	'Username' => 'Потребител',
@@ -12,12 +11,14 @@ $translations = array(
 	'Logout' => 'Изход',
 	'Logged as: %s' => 'Текущ потребител: %s',
 	'Logout successful.' => 'Излизането е успешно.',
-	'Invalid credentials.' => 'Невалидни потребителски данни.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Прекалено много неуспешни опити за вход, опитайте пак след %d минута.', 'Прекалено много неуспешни опити за вход, опитайте пак след %d минути.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Главната парола вече е невалидна. <a href="https://www.adminer.org/en/extension/"%s>Изберете</a> %s метод, за да я направите постоянна.',
 	'Language' => 'Език',
 	'Invalid CSRF token. Send the form again.' => 'Невалиден шифроващ ключ. Попълнете и изпратете формуляра отново.',
 	'If you did not send this request from Adminer then close this page.' => 'Ако не сте изпратили тази заявка през Adminer, затворете тази страница.',
+	'No driver' => null,
+	'Database driver not found.' => null,
 	'No extension' => 'Няма разширение',
 	'None of the supported PHP extensions (%s) are available.' => 'Никое от поддържаните PHP разширения (%s) не е налично.',
 	'Session support must be enabled.' => 'Поддръжката на сесии трябва да е разрешена.',
@@ -166,7 +167,6 @@ $translations = array(
 	'Options' => 'Опции',
 	'Comment' => 'Коментар',
 	'Default value' => 'Стойност по подразбиране',
-	'Default values' => 'Стойности по подразбиране',
 	'Drop' => 'Премахване',
 	'Are you sure?' => 'Сигурни ли сте?',
 	'Size' => 'Големина',
@@ -177,6 +177,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Максималния брой полета е превишен. Моля, увеличете %s.',
 
 	'Partition by' => 'Разделяне на',
+	'Partition' => null,
 	'Partitions' => 'Раздели',
 	'Partition name' => 'Име на раздела',
 	'Values' => 'Стойности',
@@ -194,7 +195,7 @@ $translations = array(
 	'Alter indexes' => 'Промяна на индекси',
 	'Add next' => 'Добавяне на следващ',
 	'Index Type' => 'Вид на индекса',
-	'length' => 'дължина',
+	'Column (length)' => 'Колона (дължина)',
 
 	'Foreign keys' => 'Препратки',
 	'Foreign key' => 'Препратка',
@@ -231,6 +232,7 @@ $translations = array(
 	'Search' => 'Търсене',
 	'anywhere' => 'навсякъде',
 	'Search data in tables' => 'Търсене на данни в таблиците',
+	'as a regular expression' => null,
 	'Sort' => 'Сортиране',
 	'descending' => 'низходящо',
 	'Limit' => 'Редове',
@@ -312,12 +314,15 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Моля, използвайте някое от разширенията %s.',
 
 	// PostgreSQL and MS SQL schema support
+	'Schema' => 'Схема',
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
 	'Alter schema' => 'Промяна на схемата',
 	'Create schema' => 'Създаване на схема',
 	'Schema has been dropped.' => 'Схемата беше премахната.',
 	'Schema has been created.' => 'Схемата беше създадена.',
 	'Schema has been altered.' => 'Схемата беше променена.',
-	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невалидна схема.',
 
 	// PostgreSQL sequences support
@@ -334,4 +339,25 @@ $translations = array(
 	'Type has been dropped.' => 'Вида беше пермахнат.',
 	'Type has been created.' => 'Вида беше създаден.',
 	'Alter type' => 'Промяна на вид',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Не',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/bn.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'লগইন',
 	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
-	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
+	'Invalid server or credentials.' => null,
 	'Server' => 'সার্ভার',
 	'Username' => 'ইউজারের নাম',
 	'Password' => 'পাসওয়ার্ড',
@@ -38,7 +37,7 @@ $translations = array(
 	'select' => 'নির্বাচন',
 	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
 	'Item has been updated.' => 'বিষয়বস্তু হালনাগাদ করা হয়েছে।',
-	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ%s সংযোজন করা হয়েছে।',
+	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
 	'Edit' => 'সম্পাদনা',
 	'Insert' => 'সংযোজন',
 	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন করুন',
@@ -61,7 +60,7 @@ $translations = array(
 	'edit' => 'সম্পাদনা',
 	'Page' => 'পৃষ্ঠা',
 	'Query executed OK, %d row(s) affected.' => array('কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।', 'কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।'),
-	'Error in query' => 'অনুসন্ধানে ভুল আছে',
+	'Error in query' => 'অনুসন্ধানে ভুল আছে।',
 	'Execute' => 'সম্পাদন করো',
 	'Table' => 'টেবিল',
 	'Foreign keys' => 'ফরেন কী',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'টেবিল নির্বাচন করতে অক্ষম',
 	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্মটি আবার পাঠান।',
 	'Comment' => 'মন্তব্য',
-	'Default values' => 'ডিফল্ট মান',
 	'%d byte(s)' => array('%d বাইট', '%d বাইটসমূহ'),
 	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নেই।',
 	'Unable to upload a file.' => 'ফাইল আপলোড করা সম্ভব হচ্ছে না।',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'অন ডিলিট',
 	'ON UPDATE' => 'অন আপডেট',
 	'Index Type' => 'সূচী-ধরণ',
-	'length' => 'দৈর্ঘ্য',
+	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
 	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
 	'View has been altered.' => 'ভিউ পরিবর্তন করা হয়েছে।',
 	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',
@@ -139,7 +137,7 @@ $translations = array(
 	'Routine' => 'রুটিন',
 	'Grant' => 'অনুমতি',
 	'Revoke' => 'প্রত্যাহার',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো।',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো',
 	'Logged as: %s' => '%s হিসাবে লগড',
 	'Move up' => 'উপরে স্থানান্তর',
 	'Move down' => 'নীচে স্থানান্তর',
@@ -175,7 +173,7 @@ $translations = array(
 	'Check' => 'পরীক্ষা',
 	'Repair' => 'মেরামত',
 	'Truncate' => 'ছাঁটাই',
-	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে।',
+	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
 	'Rows' => 'সারিসমূহ',
 	',' => ',',
 	'0123456789' => '০১২৩৪৫৬৭৮৯',
@@ -186,11 +184,12 @@ $translations = array(
 	'Save and continue edit' => 'সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান',
 	'original' => 'প্রকৃত',
 	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
-	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে।',
+	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
 	'Whole result' => 'সম্পূর্ণ ফলাফল',
 	'Clone' => 'ক্লোন',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
 	'Partition by' => 'পার্টিশন যার মাধ্যমে',
+	'Partition' => null,
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
 	'Values' => 'মানসমূহ',
@@ -207,7 +206,7 @@ $translations = array(
 	'Relations' => 'সম্পর্ক',
 	'Run file' => 'ফাইল চালাও',
 	'Clear' => 'সাফ করো',
-	'Maximum allowed file size is %sB.' => 'সর্বাধিক অনুমোদিত ফাইল সাইজ %sB।',
+	'Maximum allowed file size is %sB.' => 'সর্বাধিক অনুমোদিত ফাইল সাইজ %sB.',
 	'Numbers' => 'সংখ্যা',
 	'Date and time' => 'তারিখ এবং সময়',
 	'Strings' => 'স্ট্রিং',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
 	'Search data in tables' => 'টেবিলে তথ্য খুঁজুন',
+	'as a regular expression' => null,
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -253,7 +253,7 @@ $translations = array(
 	'Geometry' => 'জ্যামিতি',
 	'File exists.' => 'ফাইল রয়েছে।',
 	'Attachments' => 'সংযুক্তিগুলো',
-	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে।', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে।'),
+	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে'),
 	'Show only errors' => 'শুধুমাত্র ত্রুটিগুলো দেখান',
 	'Refresh' => 'রিফ্রেশ',
 	'Invalid schema.' => 'অবৈধ স্কিমা।',
@@ -265,4 +265,55 @@ $translations = array(
 	'Permanent link' => 'স্থায়ী লিংক',
 	'Edit all' => 'সবগুলো সম্পাদনা করুন',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/bs.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Server',
 	'Username' => 'Korisničko ime',
@@ -12,11 +11,11 @@ $translations = array(
 	'Logout' => 'Odjava',
 	'Logged as: %s' => 'Prijavi se kao: %s',
 	'Logout successful.' => 'Uspešna odjava.',
-	'Invalid credentials.' => 'Nevažeće dozvole.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
 	'No extension' => 'Bez dodataka',
-	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka (%s) nije dostupan.',
+	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka nije dostupan.',
 	'Session support must be enabled.' => 'Morate omogućiti podršku za sesije.',
 	'Session expired, please login again.' => 'Vaša sesija je istekla, prijavite se ponovo.',
 	'%s version: %s through PHP extension %s' => '%s verzija: %s pomoću PHP dodatka je %s',
@@ -159,7 +158,6 @@ $translations = array(
 	'Auto Increment' => 'Auto-priraštaj',
 	'Options' => 'Opcije',
 	'Comment' => 'Komentar',
-	'Default values' => 'Podrazumijevane vrijednosti',
 	'Drop' => 'Izbriši',
 	'Are you sure?' => 'Da li ste sigurni?',
 	'Move up' => 'Pomijeri na gore',
@@ -168,6 +166,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Premašen je maksimalni broj dozvoljenih polja. Molim uvećajte %s.',
 
 	'Partition by' => 'Podijeli po',
+	'Partition' => null,
 	'Partitions' => 'Podijele',
 	'Partition name' => 'Ime podijele',
 	'Values' => 'Vrijednosti',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Ažuriraj indekse',
 	'Add next' => 'Dodaj slijedeći',
 	'Index Type' => 'Tip indeksa',
-	'length' => 'dužina',
+	'Column (length)' => 'kolumna (dužina)',
 
 	'Foreign keys' => 'Strani ključevi',
 	'Foreign key' => 'Strani ključ',
@@ -222,6 +221,7 @@ $translations = array(
 	'Search' => 'Pretraga',
 	'anywhere' => 'bilo gdje',
 	'Search data in tables' => 'Pretraži podatke u tabelama',
+	'as a regular expression' => null,
 	'Sort' => 'Poređaj',
 	'descending' => 'opadajuće',
 	'Limit' => 'Granica',
@@ -319,4 +319,46 @@ $translations = array(
 	'Type has been dropped.' => 'Tip je izbrisan.',
 	'Type has been created.' => 'tip je spašen.',
 	'Alter type' => 'Ažuriraj tip',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Da',
+	'No' => 'Ne',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ca.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlides.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Impossible seleccionar la taula',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF invàlid. Torna a enviar el formulari.',
 	'Comment' => 'Comentari',
-	'Default values' => 'Valors per defecte',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Cap comanda per executar.',
 	'Unable to upload a file.' => 'Impossible adjuntar el fitxer.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipus d\'índex',
-	'length' => 'longitud',
+	'Column (length)' => 'Columna (longitud)',
 	'View has been dropped.' => 'S\'ha suprimit la vista.',
 	'View has been altered.' => 'S\'ha modificat la vista.',
 	'View has been created.' => 'S\'ha creat la vista.',
@@ -190,6 +188,7 @@ $translations = array(
 	'Tables have been dropped.' => 'S\'han suprimit les taules.',
 	'Clone' => 'Clona',
 	'Partition by' => 'Fes particions segons',
+	'Partition' => null,
 	'Partitions' => 'Particions',
 	'Partition name' => 'Nom de la partició',
 	'Values' => 'Valors',
@@ -252,6 +251,7 @@ $translations = array(
 	'Type has been created.' => 'S\'ha creat el tipus.',
 	'Alter type' => 'Modifica el tipus',
 	'Search data in tables' => 'Cerca dades en les taules',
+	'as a regular expression' => null,
 	'From server' => 'En el servidor',
 	'empty' => 'buit',
 	'now' => 'ara',
@@ -266,4 +266,54 @@ $translations = array(
 	'Permanent link' => 'Enllaç permanent',
 	'Edit all' => 'Edita-ho tot',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/cs.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => 'Domů',
 	'System' => 'Systém',
 	'Server' => 'Server',
 	'Username' => 'Uživatel',
@@ -12,8 +11,7 @@ $translations = array(
 	'Logout' => 'Odhlásit',
 	'Logged as: %s' => 'Přihlášen jako: %s',
 	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Díky za použití Admineru, <a href="https://www.adminer.org/cs/donation/">přispějte</a> na vývoj.',
-	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
+	'Invalid server or credentials.' => 'Neplatný server nebo přihlašovací údaje.',
 	'There is a space in the input password which might be the cause.' => 'Problém může být, že je v zadaném hesle mezera.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje přístup k databázi bez hesla, <a href="https://www.adminer.org/cs/password/"%s>více informací</a>.',
 	'Database does not support password.' => 'Databáze nepodporuje heslo.',
@@ -22,6 +20,8 @@ $translations = array(
 	'Language' => 'Jazyk',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
 	'If you did not send this request from Adminer then close this page.' => 'Pokud jste tento požadavek neposlali z Adminera, tak tuto stránku zavřete.',
+	'No driver' => 'Žádný ovladač',
+	'Database driver not found.' => 'Databázový ovladač se nenašel.',
 	'No extension' => 'Žádné rozšíření',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Připojování k privilegovaným portům není povoleno.',
@@ -178,7 +178,6 @@ $translations = array(
 	'Options' => 'Volby',
 	'Comment' => 'Komentář',
 	'Default value' => 'Výchozí hodnota',
-	'Default values' => 'Výchozí hodnoty',
 	'Drop' => 'Odstranit',
 	'Drop %s?' => 'Odstranit %s?',
 	'Are you sure?' => 'Opravdu?',
@@ -190,6 +189,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
 
 	'Partition by' => 'Rozdělit podle',
+	'Partition' => 'Oddíl',
 	'Partitions' => 'Oddíly',
 	'Partition name' => 'Název oddílu',
 	'Values' => 'Hodnoty',
@@ -207,7 +207,7 @@ $translations = array(
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Index Type' => 'Typ indexu',
-	'length' => 'délka',
+	'Column (length)' => 'Sloupec (délka)',
 
 	'Foreign keys' => 'Cizí klíče',
 	'Foreign key' => 'Cizí klíč',
@@ -244,6 +244,7 @@ $translations = array(
 	'Search' => 'Vyhledat',
 	'anywhere' => 'kdekoliv',
 	'Search data in tables' => 'Vyhledat data v tabulkách',
+	'as a regular expression' => 'jako regulární výraz',
 	'Sort' => 'Seřadit',
 	'descending' => 'sestupně',
 	'Limit' => 'Limit',
@@ -325,12 +326,15 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Prosím použijte jednu z koncovek %s.',
 
 	// PostgreSQL and MS SQL schema support
+	'Schema' => 'Schéma',
+	'Schemas' => 'Schémy',
+	'No schemas.' => 'Žádné schémy.',
+	'Show schema' => 'Zobrazit schéma',
 	'Alter schema' => 'Pozměnit schéma',
 	'Create schema' => 'Vytvořit schéma',
 	'Schema has been dropped.' => 'Schéma bylo odstraněno.',
 	'Schema has been created.' => 'Schéma bylo vytvořeno.',
 	'Schema has been altered.' => 'Schéma bylo změněno.',
-	'Schema' => 'Schéma',
 	'Invalid schema.' => 'Nesprávné schéma.',
 
 	// PostgreSQL sequences support
@@ -348,11 +352,12 @@ $translations = array(
 	'Type has been created.' => 'Typ byl vytvořen.',
 	'Alter type' => 'Pozměnit typ',
 
-	// Table check constraints
-	'Checks' => 'Kontroly',
-	'Create check' => 'Vytvořit kontrolu',
-	'Alter check' => 'Změnit kontrolu',
-	'Check has been created.' => 'Kontrola byla vytvořena.',
-	'Check has been altered.' => 'Kontrola byla změněna.',
-	'Check has been dropped.' => 'Kontrola byla odstraněna.',
+	// Plugins
+	'Columns' => 'Sloupce',
+	'Nullable' => 'Povoleno null',
+	'Default' => 'Výchozí',
+	'Yes' => 'Ano',
+	'No' => 'Ne',
+	'One Time Password' => 'Jednorázové heslo',
+	'Invalid OTP code.' => 'Neplatný kód OTP.',
 );

adminer/lang/da.inc.php

@@ -1,7 +1,6 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Brugernavn',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Log ud',
 	'Logged as: %s' => 'Logget ind som: %s',
 	'Logout successful.' => 'Log af vellykket.',
-	'Invalid credentials.' => 'Ugyldige log ind oplysninger.',
+	'Invalid server or credentials.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for at gøre det permanent.',
 	'Language' => 'Sprog',
 	'Invalid CSRF token. Send the form again.' => 'Ugyldigt CSRF-token - Genindsend formen.',
@@ -144,7 +143,6 @@ $translations = array(
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Valg',
 	'Comment' => 'Kommentarer',
-	'Default values' => 'Standardværdier',
 	'Drop' => 'Drop',
 	'Are you sure?' => 'Er du sikker?',
 	'Move up' => 'Flyt op',
@@ -152,6 +150,7 @@ $translations = array(
 	'Remove' => 'Fjern',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antal feltnavne overskredet - øg venligst %s.',
 	'Partition by' => 'Partition ved',
+	'Partition' => null,
 	'Partitions' => 'Partitioner',
 	'Partition name' => 'Partitionsnavn',
 	'Values' => 'Værdier',
@@ -166,7 +165,7 @@ $translations = array(
 	'Alter indexes' => 'Ændre indekser',
 	'Add next' => 'Læg til næste',
 	'Index Type' => 'Indekstype',
-	'length' => 'længde',
+	'Column (length)' => 'Kolonne (længde)',
 	'Foreign keys' => 'Fremmednøgler',
 	'Foreign key' => 'Fremmednøgle',
 	'Foreign key has been dropped.' => 'Fremmednøglen er slettet.',
@@ -200,6 +199,7 @@ $translations = array(
 	'Search' => 'Søg',
 	'anywhere' => 'hvorsomhelst',
 	'Search data in tables' => 'Søg data i tabeller',
+	'as a regular expression' => null,
 	'Sort' => 'Sorter',
 	'descending' => 'faldende',
 	'Limit' => 'Limit',
@@ -280,4 +280,40 @@ $translations = array(
 	'Type has been created.' => 'Typen er oprettet.',
 	'Alter type' => 'Ændre type',
 	'Saving' => 'Gemmer',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nej',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/de.inc.php

@@ -1,11 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => 'Startseite',
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>.',
-	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
+	'Invalid server or credentials.' => 'Ungültige Server oder Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
 	'Password' => 'Passwort',
@@ -71,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Auswahl der Tabelle fehlgeschlagen',
 	'Invalid CSRF token. Send the form again.' => 'CSRF Token ungültig. Bitte die Formulardaten erneut abschicken.',
 	'Comment' => 'Kommentar',
-	'Default values' => 'Vorgabewerte festlegen',
 	'%d byte(s)' => array('%d Byte', '%d Bytes'),
 	'No commands to execute.' => 'Kein Kommando vorhanden.',
 	'Unable to upload a file.' => 'Hochladen von Datei fehlgeschlagen.',
@@ -98,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index-Typ',
-	'length' => 'Länge',
+	'Column (length)' => 'Spalte (Länge)',
 	'View has been dropped.' => 'View wurde entfernt.',
 	'View has been altered.' => 'View wurde geändert.',
 	'View has been created.' => 'View wurde erstellt.',
@@ -192,6 +189,7 @@ $translations = array(
 	'Clone' => 'Klonen',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s erhöhen.',
 	'Partition by' => 'Partitionieren um',
+	'Partition' => 'Partition',
 	'Partitions' => 'Partitionen',
 	'Partition name' => 'Name der Partition',
 	'Values' => 'Werte',
@@ -226,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Passwort speichern',
 	'Databases have been dropped.' => 'Datenbanken wurden entfernt.',
 	'Search data in tables' => 'Suche in Tabellen',
+	'as a regular expression' => 'als regulärer Ausdruck',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema ändern',
 	'Create schema' => 'Schema erstellen',
@@ -281,12 +280,13 @@ $translations = array(
 	'If you did not send this request from Adminer then close this page.' => 'Wenn Sie diese Anfrage nicht von Adminer gesendet haben, schließen Sie diese Seite.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Sie können eine große SQL-Datei per FTP hochladen und dann vom Server importieren.',
 	'You are offline.' => 'Sie sind offline.',
-	'You have no privileges to update this table.' => 'Sie haben keine Rechte, diese Tabelle zu aktualisieren.',
+	'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.',
 	'Saving' => 'Speichere',
 	'yes' => 'ja',
 	'no' => 'nein',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
+
 	'Drop %s?' => '%s entfernen?',
 	'Materialized view' => 'Strukturierte Ansicht',
 	'Vacuum' => 'Vacuum',
@@ -302,4 +302,18 @@ $translations = array(
 	'Unknown error.' => 'Unbekannter Fehler.',
 	'Database does not support password.' => 'Die Datenbank unterstützt kein Passwort.',
 	'Disable %s or enable %s or %s extensions.' => 'Deaktivieren Sie %s oder aktivieren Sie die Erweiterungen %s oder %s.',
+
+	'Columns' => 'Spalten',
+	'Nullable' => 'Nullbar',
+	'Default' => 'Standard',
+	'Yes' => 'Ja',
+	'No' => 'Nein',
+	'One Time Password' => 'Einmal-Passwort',
+	'Invalid OTP code.' => 'Ungültiger OTP-Code.',
+
+	'Schemas' => 'Schemata',
+	'No schemas.' => 'Keine Schemata.',
+	'Show schema' => 'Zeige Schemata',
+	'No driver' => 'Kein Treiber',
+	'Database driver not found.' => 'Datenbanktreiber nicht gefunden.',
 );

adminer/lang/el.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Σύστημα',
 	'Server' => 'Διακομιστής',
 	'Username' => 'Όνομα Χρήστη',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Αποσύνδεση',
 	'Logged as: %s' => 'Συνδεθήκατε ως %s',
 	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
-	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έληξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
 	'Language' => 'Γλώσσα',
@@ -167,7 +166,6 @@ $translations = array(
 	'Options' => 'Επιλογές',
 	'Comment' => 'Σχόλιο',
 	'Default value' => 'Προεπιλεγμένη τιμή',
-	'Default values' => 'Προεπιλεγμένες τιμές',
 	'Drop' => 'Διαγραφή',
 	'Are you sure?' => 'Είστε σίγουρος;',
 	'Size' => 'Μέγεθος',
@@ -178,6 +176,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Υπέρβαση μέγιστου επιτρεπόμενου αριθμού πεδίων. Παρακαλώ αυξήστε %s.',
 
 	'Partition by' => 'Τμηματοποίηση ανά',
+	'Partition' => null,
 	'Partitions' => 'Τμήματα',
 	'Partition name' => 'Όνομα Τμήματος',
 	'Values' => 'Τιμές',
@@ -195,7 +194,7 @@ $translations = array(
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
-	'length' => 'μήκος',
+	'Column (length)' => 'Στήλη (μήκος)',
 
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
@@ -232,6 +231,7 @@ $translations = array(
 	'Search' => 'Αναζήτηση',
 	'anywhere' => 'παντού',
 	'Search data in tables' => 'Αναζήτηση δεδομένων στους πίνακες',
+	'as a regular expression' => null,
 	'Sort' => 'Ταξινόμηση',
 	'descending' => 'Φθίνουσα',
 	'Limit' => 'Όριο',
@@ -334,4 +334,31 @@ $translations = array(
 	'Type has been dropped.' => 'Ο τύπος διαγράφηκε.',
 	'Type has been created.' => 'Ο τύπος δημιουργήθηκε.',
 	'Alter type' => 'Τροποποίηση τύπου',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/en.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Too many unsuccessful logins, try again in %d minute.', 'Too many unsuccessful logins, try again in %d minutes.'),
 	'Query executed OK, %d row(s) affected.' => array('Query executed OK, %d row affected.', 'Query executed OK, %d rows affected.'),

adminer/lang/es.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
-	'Invalid credentials.' => 'Usuario y/o clave de acceso incorrecta.',
+	'Invalid server or credentials.' => 'Servidor o credenciales no válidos.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'No es posible seleccionar la tabla',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Vuelva a enviar los datos del formulario.',
 	'Comment' => 'Comentario',
-	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'No es posible ejecutar ningún comando.',
 	'Unable to upload a file.' => 'No es posible importar el archivo.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'AL BORRAR',
 	'ON UPDATE' => 'AL ACTUALIZAR',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'longitud',
+	'Column (length)' => 'Columna (longitud)',
 	'View has been dropped.' => 'Vista eliminada.',
 	'View has been altered.' => 'Vista modificada.',
 	'View has been created.' => 'Vista creada.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Excedida la cantidad máxima de campos permitidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
+	'Partition' => null,
 	'Partitions' => 'Particiones',
 	'Partition name' => 'Nombre de partición',
 	'Values' => 'Valores',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Guardar contraseña',
 	'Databases have been dropped.' => 'Bases de datos eliminadas.',
 	'Search data in tables' => 'Buscar datos en tablas',
+	'as a regular expression' => 'como una expresión regular',
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Crear esquema',
@@ -266,4 +266,54 @@ $translations = array(
 	'Permanent link' => 'Enlace permanente',
 	'Edit all' => 'Editar todos',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => '¿Eliminar %s?',
+	'Tables have been optimized.' => 'Tablas optimizadas.',
+	'Materialized view' => 'Vista materializada',
+	'Vacuum' => 'Vacio',
+	'Selected' => 'Seleccionado',
+	'overwrite' => 'sobreescribir',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'El archivo debe estar codificado en UTF-8.',
+	'Modify' => 'Modificar',
+	'Load more data' => 'Cargar mas datos',
+	'Loading' => 'Cargando',
+	'ATTACH queries are not supported.' => 'ATTACH consultas no está soportado.',
+	'Warnings' => 'Advertencias',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Limitar filas',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer no soporta el acceso a bases de datos sin contraseña, <a href="https://www.adminer.org/en/password/"%s>más informacion</a>.',
+	'Default value' => 'Valor por defecto',
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos erroneos, pruebe de nuevo en %d minuto.', 'Demasiados intentos erroneos, pruebe de nuevo en %d minutos.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'La contraseña Maestra ha expirado. <a href="https://www.adminer.org/en/extension/"%s>Implementar</a> %s un metodo para hacerla permanente.',
+	'The action will be performed after successful login with the same credentials.' => 'La acción se realizará tras iniciar sesión de nuevo con las mismas credenciales.',
+	'Connecting to privileged ports is not allowed.' => 'La conexion a puertos especiales no está permitida.',
+	'There is a space in the input password which might be the cause.' => 'Hay un espacio en la contraseña introducida, lo que puede ser la causa.',
+	'If you did not send this request from Adminer then close this page.' => 'Si no mandó ésta solicitud desde Adminer entonces cierre esta página.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Puede cargar un fichero SQL grande por FTP e importarlo desde el servidor.',
+	'Size' => 'Tamaño',
+	'Compute' => 'Procesar',
+	'You are offline.' => 'Se encuentra desconectado.',
+	'You have no privileges to update this table.' => 'No tiene privilegios para actualizar esta tabla.',
+	'Saving' => 'Guardando',
+	'Unknown error.' => 'Error desconocido.',
+	'Database does not support password.' => 'La Base de Datos no soporta el uso de contraseña.',
+	'Disable %s or enable %s or %s extensions.' => 'Deshabilitar %s o habilitar %s o %s extensiones.',
+	'yes' => 'si',
+	'no' => 'no',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/et.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
-	'Invalid credentials.' => 'Ebakorrektsed andmed.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Kasutajanimi',
 	'Password' => 'Parool',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Tabeli valimine ebaõnnestus',
 	'Invalid CSRF token. Send the form again.' => 'Sobimatu CSRF, palun postitage vorm uuesti.',
 	'Comment' => 'Kommentaar',
-	'Default values' => 'Vaikimisi väärtused',
 	'%d byte(s)' => array('%d bait', '%d baiti'),
 	'No commands to execute.' => 'Käsk puudub.',
 	'Unable to upload a file.' => 'Faili üleslaadimine pole võimalik.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Indeksi tüüp',
-	'length' => 'pikkus',
+	'Column (length)' => 'Veerg (pikkus)',
 	'View has been dropped.' => 'Vaade (VIEW) on edukalt kustutatud.',
 	'View has been altered.' => 'Vaade (VIEW) on edukalt muudetud.',
 	'View has been created.' => 'Vaade (VIEW) on edukalt loodud.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Kloon',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s.',
 	'Partition by' => 'Partitsiooni',
+	'Partition' => null,
 	'Partitions' => 'Partitsioonid',
 	'Partition name' => 'Partitsiooni nimi',
 	'Values' => 'Väärtused',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Jäta mind meelde',
 	'Databases have been dropped.' => 'Andmebaasid on edukalt kustutatud.',
 	'Search data in tables' => 'Otsi kogu andmebaasist',
+	'as a regular expression' => null,
 	'Schema' => 'Struktuur',
 	'Alter schema' => 'Muuda struktuuri',
 	'Create schema' => 'Loo struktuur',
@@ -266,4 +266,54 @@ $translations = array(
 	'Permanent link' => 'Püsilink',
 	'Edit all' => 'Muuda kõiki',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/fa.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'سیستم',
 	'Server' => 'سرور',
 	'Username' => 'نام کاربری',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'خروج',
 	'Logged as: %s' => 'ورود به عنوان: %s',
 	'Logout successful.' => 'با موفقیت خارج شدید.',
-	'Invalid credentials.' => 'اعتبار سنجی نامعتبر.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.', 'ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://www.adminer.org/en/extension/"%s>پیاده سازی</a> کرده تا آن را دائمی سازید.',
 	'Language' => 'زبان',
@@ -146,7 +145,7 @@ $translations = array(
 	'Tables' => 'جدولها',
 	'Tables and views' => 'جدولها و نمایه ها',
 	'Table' => 'جدول',
-	'No tables.' => 'جدولی وجود ندارد.',
+	'No tables.' => 'جدولی وجود ندارد',
 	'Alter table' => 'ویرایش جدول',
 	'Create table' => 'ایجاد جدول',
 	'Table has been dropped.' => 'جدول حذف شد.',
@@ -165,7 +164,6 @@ $translations = array(
 	'Options' => 'اختیارات',
 	'Comment' => 'توضیح',
 	'Default value' => 'مقدار پیش فرض',
-	'Default values' => 'مقادیر پیش فرض',
 	'Drop' => 'حذف',
 	'Are you sure?' => 'مطمئن هستید؟',
 	'Size' => 'حجم',
@@ -176,6 +174,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
 
 	'Partition by' => 'بخشبندی توسط',
+	'Partition' => null,
 	'Partitions' => 'بخشبندیها',
 	'Partition name' => 'نام بخش',
 	'Values' => 'مقادیر',
@@ -193,7 +192,7 @@ $translations = array(
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
-	'length' => 'طول',
+	'Column (length)' => 'ستون (طول)',
 
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
@@ -230,6 +229,7 @@ $translations = array(
 	'Search' => 'جستجو',
 	'anywhere' => 'هرکجا',
 	'Search data in tables' => 'جستجوی داده در جدول',
+	'as a regular expression' => null,
 	'Sort' => 'مرتب کردن',
 	'descending' => 'نزولی',
 	'Limit' => 'محدودیت',
@@ -238,7 +238,7 @@ $translations = array(
 	'Action' => 'عملیات',
 	'Full table scan' => 'اسکن کامل جدول',
 	'Unable to select the table' => 'قادر به انتخاب جدول نیستید',
-	'No rows.' => 'سطری وجود ندارد.',
+	'No rows.' => 'سطری وجود ندارد',
 	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d سطر', '%d سطر'),
 	'Page' => 'صفحه',
@@ -332,4 +332,33 @@ $translations = array(
 	'Type has been dropped.' => 'نوع حذف شد.',
 	'Type has been created.' => 'نوع ایجاد شد.',
 	'Alter type' => 'ویرایش نوع',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/fi.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Järjestelmä',
 	'Server' => 'Palvelin',
 	'Username' => 'Käyttäjänimi',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Kirjaudu ulos',
 	'Logged as: %s' => 'Olet kirjautunut käyttäjänä: %s',
 	'Logout successful.' => 'Uloskirjautuminen onnistui.',
-	'Invalid credentials.' => 'Virheelliset kirjautumistiedot.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.', 'Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-salasana ei ole enää voimassa. <a href="https://www.adminer.org/en/extension/"%s>Toteuta</a> %s-metodi sen tekemiseksi pysyväksi.',
 	'Language' => 'Kieli',
@@ -167,7 +166,6 @@ $translations = array(
 	'Options' => 'Asetukset',
 	'Comment' => 'Kommentit',
 	'Default value' => 'Oletusarvo',
-	'Default values' => 'Oletusarvot',
 	'Drop' => 'Poista',
 	'Are you sure?' => 'Oletko varma?',
 	'Size' => 'Koko',
@@ -178,6 +176,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
 
 	'Partition by' => 'Osioi arvolla',
+	'Partition' => null,
 	'Partitions' => 'Osiot',
 	'Partition name' => 'Osion nimi',
 	'Values' => 'Arvot',
@@ -195,7 +194,7 @@ $translations = array(
 	'Alter indexes' => 'Muuta indeksejä',
 	'Add next' => 'Lisää seuraava',
 	'Index Type' => 'Indeksityyppi',
-	'length' => 'pituus',
+	'Column (length)' => 'Sarake (pituus)',
 
 	'Foreign keys' => 'Vieraat avaimet',
 	'Foreign key' => 'Vieras avain',
@@ -232,6 +231,7 @@ $translations = array(
 	'Search' => 'Hae',
 	'anywhere' => 'kaikkialta',
 	'Search data in tables' => 'Hae dataa tauluista',
+	'as a regular expression' => null,
 	'Sort' => 'Lajittele',
 	'descending' => 'alenevasti',
 	'Limit' => 'Raja',
@@ -335,7 +335,6 @@ $translations = array(
 	'Type has been created.' => 'Tyyppi luotiin.',
 	'Alter type' => 'Muuta tyyppiä',
 
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Kiitos, kun käytät Admineriä, voit <a href="https://www.adminer.org/en/donation/">tehdä lahjoituksen tästä</a>.',
 	'Drop %s?' => 'Poistetaanko %s?',
 	'overwrite' => 'kirjoittaen päälle',
 	'DB' => 'TK',
@@ -348,4 +347,18 @@ $translations = array(
 	'Unknown error.' => 'Tuntematon virhe.',
 	'Database does not support password.' => 'Tietokanta ei tue salasanaa.',
 	'Disable %s or enable %s or %s extensions.' => 'Poista käytöstä %s tai ota käyttöön laajennus %s tai %s.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Kyllä',
+	'No' => 'Ei',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/fr.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
-	'Invalid credentials.' => 'Authentification échouée.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
@@ -68,7 +67,6 @@ $translations = array(
 	'Unable to select the table' => 'Impossible de sélectionner la table',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalide. Veuillez renvoyer le formulaire.',
 	'Comment' => 'Commentaire',
-	'Default values' => 'Valeurs par défaut',
 	'%d byte(s)' => array('%d octet', '%d octets'),
 	'No commands to execute.' => 'Aucune commande à exécuter.',
 	'Unable to upload a file.' => 'Impossible d\'importer le fichier.',
@@ -95,7 +93,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Type d\'index',
-	'length' => 'longueur',
+	'Column (length)' => 'Colonne (longueur)',
 	'View has been dropped.' => 'La vue a été effacée.',
 	'View has been altered.' => 'La vue a été modifiée.',
 	'View has been created.' => 'La vue a été créée.',
@@ -189,6 +187,7 @@ $translations = array(
 	'Clone' => 'Cloner',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s.',
 	'Partition by' => 'Partitionner par',
+	'Partition' => null,
 	'Partitions' => 'Partitions',
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
@@ -224,6 +223,7 @@ $translations = array(
 	'Databases have been dropped.' => 'Les bases de données ont été supprimées.',
 	'Database has been dropped.' => 'La base de données a été supprimée.',
 	'Search data in tables' => 'Rechercher dans les tables',
+	'as a regular expression' => 'sous forme d\'expression régulière',
 	'Schema' => 'Schéma',
 	'Alter schema' => 'Modifier le schéma',
 	'Create schema' => 'Créer un schéma',
@@ -289,6 +289,7 @@ $translations = array(
 	'Default value' => 'Valeur par défaut',
 	'If you did not send this request from Adminer then close this page.' => 'Si vous n\'avez pas envoyé cette requête depuis Adminer, alors fermez cette page.',
 	'You are offline.' => 'Vous êtes hors ligne.',
+
 	'Drop %s?' => 'Supprimer %s?',
 	'overwrite' => 'écraser',
 	'DB' => 'BD',
@@ -298,7 +299,21 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => 'Cette action sera exécutée après s\'être connecté avec les mêmes données de connexion.',
 	'Connecting to privileged ports is not allowed.' => 'La connexion aux ports privilégiés n\'est pas autorisée.',
 	'There is a space in the input password which might be the cause.' => 'Il y a un espace dans le mot de passe entré qui pourrait en être la cause.',
-	'Unknown error.' => 'Erreur inconnue.',
-	'Database does not support password.' => 'La base de données ne support pas les mots de passe.',
+	'Unknown error.' => 'Erreur inconnue',
+	'Database does not support password.' => 'La base de données ne support pas les mots de passe',
 	'Disable %s or enable %s or %s extensions.' => 'Désactiver %s ou activer %s or %s extensions.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Oui',
+	'No' => 'Non',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/gl.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
-	'Invalid credentials.' => 'Credenciais (usuario e/ou contrasinal) inválidos.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contrasinal',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'No é posible seleccionar a táboa',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Envíe de novo os datos do formulario.',
 	'Comment' => 'Comentario',
-	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Non hai comandos para executar.',
 	'Unable to upload a file.' => 'Non é posible importar o ficheiro.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'AO BORRAR (ON DELETE)',
 	'ON UPDATE' => 'AO ACTUALIZAR (ON UPDATE)',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'lonxitude',
+	'Column (length)' => 'Columna (lonxitude)',
 	'View has been dropped.' => 'Eliminouse a vista.',
 	'View has been altered.' => 'Modificouse a vista.',
 	'View has been created.' => 'Creouse a vista.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Excedida o número máximo de campos permitidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
+	'Partition' => null,
 	'Partitions' => 'Particións',
 	'Partition name' => 'Nome da Partición',
 	'Values' => 'Valores',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Permanecer conectado',
 	'Databases have been dropped.' => 'Elimináronse as bases de datos.',
 	'Search data in tables' => 'Buscar datos en táboas',
+	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Crear esquema',
@@ -266,11 +266,11 @@ $translations = array(
 	'Permanent link' => 'Ligazón permanente',
 	'Edit all' => 'Editar todo',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Tables have been optimized.' => 'Optimizáronse as táboas.',
+	'Tables have been optimized.' => 'Optimizáronse as táboas',
 	'Materialized view' => 'Vista materializada',
 	'Vacuum' => 'Baleirar',
 	'Selected' => 'Selección',
-	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8.',
+	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8',
 	'Modify' => 'Modificar',
 	'Loading' => 'Cargando',
 	'Load more data' => 'Cargar máis datos',
@@ -278,15 +278,42 @@ $translations = array(
 	'Limit rows' => 'Limitar filas',
 	'Default value' => 'Valor por defecto',
 	'Full table scan' => 'Escaneo completo da táboa',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto.', 'Demasiados intentos de conexión, intentao de novo en %d minutos.'),
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto', 'Demasiados intentos de conexión, intentao de novo en %d minutos'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'O contrasinal principal caducou. <a href="https://www.adminer.org/en/extension/"%s>Implementa</a> o método %s para facelo permanente.',
-	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor.',
+	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor',
 	'Size' => 'Tamaño',
 	'Compute' => 'Calcular',
-	'You are offline.' => 'Non tes conexión.',
-	'You have no privileges to update this table.' => 'Non tes privilexios para actualizar esta táboa.',
+	'You are offline.' => 'Non tes conexión',
+	'You have no privileges to update this table.' => 'Non tes privilexios para actualizar esta táboa',
 	'Saving' => 'Gardando',
 	'yes' => 'si',
 	'no' => 'non',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Si',
+	'No' => 'Non',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/he.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
-	'Invalid credentials.' => 'פרטי התחברות שגויים',
+	'Invalid server or credentials.' => null,
 	'Server' => 'שרת',
 	'Username' => 'שם משתמש',
 	'Password' => 'סיסמה',
@@ -68,7 +67,6 @@ $translations = array(
 	'Unable to select the table' => 'בחירת הטבלה נכשלה',
 	'Invalid CSRF token. Send the form again.' => 'כשל באבטחת נתונים, שלח טופס שוב',
 	'Comment' => 'הערה',
-	'Default values' => 'ערכי ברירת מחדל',
 	'%d byte(s)' => '%d בתים',
 	'No commands to execute.' => 'לא נמצאו פקודות להרצה',
 	'Unable to upload a file.' => 'העלאת הקובץ נכשלה',
@@ -95,7 +93,7 @@ $translations = array(
 	'ON DELETE' => 'בעת מחיקה',
 	'ON UPDATE' => 'בעת עידכון',
 	'Index Type' => 'סוג אינדקס',
-	'length' => 'אורך',
+	'Column (length)' => 'עמודה (אורך)',
 	'View has been dropped.' => 'התצוגה הושלכה',
 	'View has been altered.' => 'התצוגה שונתה',
 	'View has been created.' => 'התצוגה נוצרה',
@@ -189,6 +187,7 @@ $translations = array(
 	'Clone' => 'שכפל',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'הגעת למספר השדות המרבי. בבקשה הגדל את %s',
 	'Partition by' => 'מחיצות ע"י',
+	'Partition' => null,
 	'Partitions' => 'מחיצות',
 	'Partition name' => 'שם מחיצה',
 	'Values' => 'ערכים',
@@ -224,6 +223,7 @@ $translations = array(
 	'Databases have been dropped.' => 'מסד הנתונים הושלך',
 	'Database has been dropped.' => 'מסד הנתונים הושלך',
 	'Search data in tables' => 'חפש מידע בטבלאות',
+	'as a regular expression' => null,
 	'Schema' => 'סכמה',
 	'Alter schema' => 'שנה סכמה',
 	'Create schema' => 'צור סכמה',
@@ -280,7 +280,6 @@ $translations = array(
 	'Default value' => 'ערך ברירת מחדל',
 	'Full table scan' => 'סריקה טבלה מלאה',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="https://www.adminer.org/en/donation/">לתרום</a>',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'סיסמת המאסטר פגה <a href="https://www.adminer.org/en/extension/"%s>התקן תוסף</a> על מנת להפוך את זה לתמידי',
 	'If you did not send this request from Adminer then close this page.' => 'אם לא אתה שלחת בקשה ל-Adminer הינך יכול לסגור חלון זה',
 	'You can upload a big SQL file via FTP and import it from server.' => 'ניתן לעלות קבצים ב-FTP ואז למשוך אותם מהשרת',
@@ -291,4 +290,30 @@ $translations = array(
 	'Saving' => 'שומר',
 	'yes' => 'כן',
 	'no' => 'לא',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/hu.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
-	'Invalid credentials.' => 'Érvénytelen adatok.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Szerver',
 	'Username' => 'Felhasználó',
 	'Password' => 'Jelszó',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Nem tudom kiválasztani a táblát',
 	'Invalid CSRF token. Send the form again.' => 'Érvénytelen CSRF azonosító. Küldd újra az űrlapot.',
 	'Comment' => 'Megjegyzés',
-	'Default values' => 'Alapértelmezett értékek',
 	'%d byte(s)' => array('%d bájt', '%d bájt', '%d bájt'),
 	'No commands to execute.' => 'Nincs végrehajtható parancs.',
 	'Unable to upload a file.' => 'Nem tudom feltölteni a fájlt.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'törléskor',
 	'ON UPDATE' => 'frissítéskor',
 	'Index Type' => 'Index típusa',
-	'length' => 'méret',
+	'Column (length)' => 'Oszop (méret)',
 	'View has been dropped.' => 'A nézet eldobva.',
 	'View has been altered.' => 'A nézet módosult.',
 	'View has been created.' => 'A nézet létrejött.',
@@ -190,6 +188,7 @@ $translations = array(
 	'Tables have been dropped.' => 'Táblák eldobva.',
 	'Clone' => 'Klónoz',
 	'Partition by' => 'Particionálás ezzel',
+	'Partition' => null,
 	'Partitions' => 'Particiók',
 	'Partition name' => 'Partició neve',
 	'Values' => 'Értékek',
@@ -251,6 +250,7 @@ $translations = array(
 	'Type has been created.' => 'Típus létrehozva.',
 	'Alter type' => 'Típus módosítása',
 	'Search data in tables' => 'Keresés a táblákban',
+	'as a regular expression' => null,
 	'From server' => 'Szerverről',
 	'empty' => 'üres',
 	'now' => 'most',
@@ -265,4 +265,55 @@ $translations = array(
 	'Permanent link' => 'Hivatkozás',
 	'Edit all' => 'Összes szerkesztése',
 	'HH:MM:SS' => 'óó:pp:mm',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/id.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Server',
 	'Username' => 'Pengguna',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Keluar',
 	'Logged as: %s' => 'Masuk sebagai: %s',
 	'Logout successful.' => 'Berhasil keluar.',
-	'Invalid credentials.' => 'Akses tidak sah.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Bahasa',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Kirim ulang formulir.',
 	'No extension' => 'Ekstensi tidak ada',
@@ -159,7 +158,6 @@ $translations = array(
 	'Auto Increment' => 'Inkrementasi Otomatis',
 	'Options' => 'Opsi',
 	'Comment' => 'Komentar',
-	'Default values' => 'Nilai bawaan',
 	'Drop' => 'Hapus',
 	'Are you sure?' => 'Anda yakin?',
 	'Move up' => 'Naik',
@@ -168,6 +166,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sudah lebih dumlah ruas maksimum yang diizinkan. Harap naikkan %s.',
 
 	'Partition by' => 'Partisi menurut',
+	'Partition' => null,
 	'Partitions' => 'Partisi',
 	'Partition name' => 'Nama partisi',
 	'Values' => 'Nilai',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah setelahnya',
 	'Index Type' => 'Jenis Indeks',
-	'length' => 'panjang',
+	'Column (length)' => 'Kolom (panjang)',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',
@@ -221,6 +220,7 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana pun',
 	'Search data in tables' => 'Cari data dalam tabel',
+	'as a regular expression' => null,
 	'Sort' => 'Urutkan',
 	'descending' => 'menurun',
 	'Limit' => 'Batas',
@@ -314,4 +314,51 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis berhasil dihapus.',
 	'Type has been created.' => 'Jenis berhasil dibuat.',
 	'Alter type' => 'Ubah jenis',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/it.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
-	'Invalid credentials.' => 'Credenziali non valide.',
+	'Invalid server or credentials.' => 'Server o credenziali non valide.',
 	'Server' => 'Server',
 	'Username' => 'Utente',
 	'Password' => 'Password',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Selezione della tabella non riuscita',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF non valido. Reinvia la richiesta.',
 	'Comment' => 'Commento',
-	'Default values' => 'Valori predefiniti',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nessun commando da eseguire.',
 	'Unable to upload a file.' => 'Caricamento del file non riuscito.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo indice',
-	'length' => 'lunghezza',
+	'Column (length)' => 'Colonna (lunghezza)',
 	'View has been dropped.' => 'Vista eliminata.',
 	'View has been altered.' => 'Vista modificata.',
 	'View has been created.' => 'Vista creata.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Clona',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Troppi campi. Per favore aumentare %s.',
 	'Partition by' => 'Partiziona per',
+	'Partition' => null,
 	'Partitions' => 'Partizioni',
 	'Partition name' => 'Nome partizione',
 	'Values' => 'Valori',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Login permanente',
 	'Databases have been dropped.' => 'Database eliminati.',
 	'Search data in tables' => 'Cerca nelle tabelle',
+	'as a regular expression' => 'come espressione regolare',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifica schema',
 	'Create schema' => 'Crea schema',
@@ -266,8 +266,9 @@ $translations = array(
 	'Permanent link' => 'Link permanente',
 	'Edit all' => 'Modifica tutto',
 	'HH:MM:SS' => 'HH:MM:SS',
+
 	'Drop %s?' => 'Scartare %s?',
-	'Tables have been optimized.' => 'Le tabelle sono state ottimizzate.',
+	'Tables have been optimized.' => 'Le tabelle sono state ottimizzate',
 	'Materialized view' => 'Vista materializzata',
 	'Vacuum' => 'Aspira',
 	'Selected' => 'Selezionato',
@@ -279,7 +280,7 @@ $translations = array(
 	'Loading' => 'Caricamento',
 	'ATTACH queries are not supported.' => 'ATTACH queries non sono supportate.',
 	'Warnings' => 'Attenzione',
-	'%d / ' => '%d / ',
+	'%d / ' => array('%d / '),
 	'Limit rows' => 'Limite righe',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer non supporta accesso a databse senza password, <a href="https://www.adminer.org/it/password/"%s>piú informazioni</a>.',
 	'Default value' => 'Valore predefinito',
@@ -296,9 +297,23 @@ $translations = array(
 	'You are offline.' => 'Sei disconnesso.',
 	'You have no privileges to update this table.' => 'Non hai i privilegi per aggiornare questa tabella.',
 	'Saving' => 'Salvataggio',
-	'Unknown error.' => 'Errore sconosciuto.',
+	'Unknown error.' => 'Errore sconosciuto',
 	'Database does not support password.' => 'Il database non supporta password.',
 	'Disable %s or enable %s or %s extensions.' => 'Disabilita %s o abilita %s oppure %s estensioni.',
 	'yes' => 'si',
 	'no' => 'no',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Si',
+	'No' => 'No',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ja.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
-	'Invalid credentials.' => '不正なログイン',
+	'Invalid server or credentials.' => null,
 	'Server' => 'サーバ',
 	'Username' => 'ユーザ名',
 	'Password' => 'パスワード',
@@ -69,7 +68,6 @@ $translations = array(
 	'Unable to select the table' => 'テーブルを選択できません',
 	'Invalid CSRF token. Send the form again.' => '不正なCSRFトークン。再送信してください',
 	'Comment' => 'コメント',
-	'Default values' => '規定値',
 	'%d byte(s)' => '%d バイト',
 	'No commands to execute.' => '実行するコマンドがありません',
 	'Unable to upload a file.' => 'ファイルをアップロードできません',
@@ -96,7 +94,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => '索引の型',
-	'length' => '長さ',
+	'Column (length)' => '列（長さ）',
 	'View has been dropped.' => 'ビューを削除しました',
 	'View has been altered.' => 'ビューを変更しました',
 	'View has been created.' => 'ビューを作成しました',
@@ -190,6 +188,7 @@ $translations = array(
 	'Clone' => 'クローン',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
 	'Partition by' => 'パーティション',
+	'Partition' => null,
 	'Partitions' => 'パーティション',
 	'Partition name' => 'パーティション名',
 	'Values' => '値',
@@ -226,6 +225,7 @@ $translations = array(
 	'Permanent login' => '永続的にログイン',
 	'Databases have been dropped.' => 'データベースを削除しました',
 	'Search data in tables' => 'データを検索する',
+	'as a regular expression' => null,
 	'Schema' => 'スキーマ',
 	'Alter schema' => 'スキーマ変更',
 	'Create schema' => 'スキーマ追加',
@@ -275,4 +275,45 @@ $translations = array(
 	'yes' => 'はい',
 	'no' => 'いいえ',
 	'Default value' => '既定値',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ka.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
-	'Invalid credentials.' => 'არასწორი მომხმარებელი ან პაროლი.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'სერვერი',
 	'Username' => 'მომხმარებელი',
 	'Password' => 'პაროლი',
@@ -69,7 +68,6 @@ $translations = array(
 	'Unable to select the table' => 'ცხრილიდან ინფორმაცია ვერ მოვიპოვე',
 	'Invalid CSRF token. Send the form again.' => 'უმოქმედო CSRF-ტოკენი. ფორმის კიდევ ერთხელ გაგზავნა.',
 	'Comment' => 'კომენტარები',
-	'Default values' => 'სტანდარტული მნიშვნელობა',
 	'%d byte(s)' => '%d ბაიტი',
 	'No commands to execute.' => 'შესასრულებელი ბრძანება არაა.',
 	'Unable to upload a file.' => 'ფაილი არ აიტვირთა სერვერზე.',
@@ -95,7 +93,7 @@ $translations = array(
 	'ON DELETE' => 'წაშლისას',
 	'ON UPDATE' => 'განახლებისას',
 	'Index Type' => 'ინდექსის სახეობა',
-	'length' => 'სიგრძე',
+	'Column (length)' => 'ველი (სიგრძე)',
 	'View has been dropped.' => 'წარმოდგენა წაიშალა.',
 	'View has been altered.' => 'წარმოდგენა შეიცვალა.',
 	'View has been created.' => 'წარმოდგენა შეიქმნა.',
@@ -188,6 +186,7 @@ $translations = array(
 	'Tables have been dropped.' => 'ცხრილები წაიშალა.',
 	'Clone' => 'კლონირება',
 	'Partition by' => 'დაყოფა',
+	'Partition' => null,
 	'Partitions' => 'დანაყოფები',
 	'Partition name' => 'დანაყოფის სახელი',
 	'Values' => 'პარამეტრები',
@@ -221,6 +220,7 @@ $translations = array(
 	'Permanent login' => 'სისტემაში დარჩენა',
 	'Databases have been dropped.' => 'ბაზა წაიშალა.',
 	'Search data in tables' => 'ცხრილებში ძებნა',
+	'as a regular expression' => null,
 	'Schema' => 'სქემა',
 	'Alter schema' => 'სქემის შეცვლა',
 	'Create schema' => 'ახალი სქემა',
@@ -294,11 +294,26 @@ $translations = array(
 	'Warnings' => 'გაფრთხილება',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'უპაროლო წვდომა ბაზასთან არაა დაშვებული Adminer-ში, მეტი ინფორმაციისთვის ეწვიეთ <a href="https://www.adminer.org/en/password/"%s>ბმულს</a>.',
 	'DB' => 'ბაზა',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'მადლობას გიხდით Adminer-ით სარგებლობისთვის, გადახედეთ ბმულს <a href="https://www.adminer.org/en/donation/">შემოწირულობა</a>.',
 	'The action will be performed after successful login with the same credentials.' => 'მოქმედება შესრულდება იგივე მომხმარებლით წარმატებული ავტორიზაციის შემდეგ.',
 	'Connecting to privileged ports is not allowed.' => 'პრივილეგირებულ პორტთან წვდომა დაუშვებელია.',
 	'There is a space in the input password which might be the cause.' => 'პაროლში არის გამოტოვება, შეიძლება ეს ქმნის პრობლემას.',
 	'Unknown error.' => 'უცნობი შეცდომა.',
 	'Database does not support password.' => 'ბაზაში არაა მხარდაჭერილი პაროლი.',
 	'Disable %s or enable %s or %s extensions.' => 'გათიშეთ %s ან ჩართეთ %s ან %s გაფართოება.',
+
+	'overwrite' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ko.inc.php

@@ -1,7 +1,6 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'$1-$3-$5' => '$1-$3-$5',
 	'%.3f s' => '%.3f 초',
 	'%d byte(s)' => '%d 바이트',
@@ -48,7 +47,7 @@ $translations = array(
 	'Clone' => '복제',
 	'collation' => '정렬',
 	'Collation' => '정렬',
-	'length' => '길이',
+	'Column (length)' => '열 (길이)',
 	'Column name' => '열 이름',
 	'Column' => '열',
 	'Comment' => '주석',
@@ -76,7 +75,6 @@ $translations = array(
 	'Database' => '데이터베이스',
 	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
 	'Date and time' => '시간',
-	'Default values' => '기본값',
 	'Delete' => '삭제',
 	'descending' => '역순',
 	'Drop' => '삭제',
@@ -122,7 +120,7 @@ $translations = array(
 	'Indexes have been altered.' => '색인을 변경했습니다.',
 	'Indexes' => '색인',
 	'Insert' => '삽입',
-	'Invalid credentials.' => '잘못된 로그인.',
+	'Invalid server or credentials.' => null,
 	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
 	'Invalid database.' => '잘못된 데이터베이스입니다.',
 	'Invalid schema.' => '잘못된 스키마입니다.',
@@ -143,7 +141,7 @@ $translations = array(
 	'Logout successful.' => '로그아웃을 성공했습니다.',
 	'Logout' => '로그아웃',
 	'ltr' => 'ltr',
-	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB.',
+	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s(을)를 늘리십시오.',
 	'Modify' => '수정',
 	'Move down' => '아래로',
@@ -154,7 +152,7 @@ $translations = array(
 	'Network' => '네트워크 형',
 	'New item' => '항목 만들기',
 	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
-	'No extension' => '확장이 없습니다',
+	'No extension' => '확장이 없습니다.',
 	'No rows.' => '행이 없습니다.',
 	'No tables.' => '테이블이 없습니다.',
 	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장(%s)이 설치되어 있지 않습니다.',
@@ -173,6 +171,7 @@ $translations = array(
 	'Parameter name' => '매개변수 이름',
 	'Partition by' => '파티션',
 	'Partition name' => '파티션 이름',
+	'Partition' => null,
 	'Partitions' => '파티션',
 	'Password' => '비밀번호',
 	'Permanent link' => '영구적으로 링크',
@@ -205,9 +204,10 @@ $translations = array(
 	'Schema has been dropped.' => '스키마를 삭제했습니다.',
 	'Schema' => '스키마',
 	'Search data in tables' => '테이블 내 데이터 검색',
+	'as a regular expression' => null,
 	'Search' => '검색',
-	'Select data' => '데이터를 선택하십시오',
-	'Select database' => '데이터베이스를 선택하십시오',
+	'Select data' => '데이터를 선택하십시오.',
+	'Select database' => '데이터베이스를 선택하십시오.',
 	'Select' => '선택',
 	'select' => '선택',
 	'Selected' => '선택됨',
@@ -238,7 +238,7 @@ $translations = array(
 	'Table name' => '테이블 이름',
 	'Table' => '테이블',
 	'Tables and views' => '테이블과 뷰',
-	'Tables have been copied.' => '테이블을 복사했습니다.',
+	'Tables have been copied.' => '테이블을 복사했습니다',
 	'Tables have been dropped.' => '테이블을 삭제했습니다.',
 	'Tables have been moved.' => '테이블을 옮겼습니다.',
 	'Tables have been truncated.' => '테이블의 데이터 내용만 지웠습니다.',
@@ -256,7 +256,7 @@ $translations = array(
 	'Type has been created.' => '유형을 추가했습니다.',
 	'Type has been dropped.' => '유형을 삭제했습니다.',
 	'Type' => '형',
-	'Unable to select the table' => '테이블을 선택할 수 없습니다',
+	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
 	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
 	'Use edit link to modify this value.' => '이 값을 수정하려면 편집 링크를 사용하십시오.',
 	'Use' => '사용',
@@ -278,4 +278,42 @@ $translations = array(
 	'You are offline.' => '오프라인입니다.',
 	'You can upload a big SQL file via FTP and import it from server.' => '큰 SQL 파일은 FTP를 통하여 업로드하여 서버에서 가져올 수 있습니다.',
 	'You have no privileges to update this table.' => '이 테이블을 업데이트할 권한이 없습니다.',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'User types' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'%d / ' => array(),
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/lt.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistema',
 	'Server' => 'Serveris',
 	'Username' => 'Vartotojas',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Atsijungti',
 	'Logged as: %s' => 'Prisijungęs kaip: %s',
 	'Logout successful.' => 'Jūs atsijungėte nuo sistemos.',
-	'Invalid credentials.' => 'Neteisingi prisijungimo duomenys.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Kalba',
 	'Invalid CSRF token. Send the form again.' => 'Neteisingas CSRF tokenas. Bandykite siųsti formos duomenis dar kartą.',
 	'No extension' => 'Nėra plėtiio',
@@ -158,7 +157,6 @@ $translations = array(
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Nustatymai',
 	'Comment' => 'Komentaras',
-	'Default values' => 'Reikšmės pagal nutylėjimą',
 	'Drop' => 'Pašalinti',
 	'Are you sure?' => 'Tikrai?',
 	'Move up' => 'Perkelti į viršų',
@@ -167,6 +165,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
 
 	'Partition by' => 'Skirstyti pagal',
+	'Partition' => null,
 	'Partitions' => 'Skirsniai',
 	'Partition name' => 'Skirsnio pavadinimas',
 	'Values' => 'Reikšmės',
@@ -183,7 +182,7 @@ $translations = array(
 	'Alter indexes' => 'Redaguoti indeksus',
 	'Add next' => 'Pridėti kitą',
 	'Index Type' => 'Indekso tipas',
-	'length' => 'ilgis',
+	'Column (length)' => 'Stulpelis (ilgis)',
 
 	'Foreign keys' => 'Išoriniai raktai',
 	'Foreign key' => 'Išorinis raktas',
@@ -220,6 +219,7 @@ $translations = array(
 	'Search' => 'Ieškoti',
 	'anywhere' => 'visur',
 	'Search data in tables' => 'Ieškoti duomenų lentelėse',
+	'as a regular expression' => null,
 	'Sort' => 'Rikiuoti',
 	'descending' => 'mažėjimo tvarka',
 	'Limit' => 'Limitas',
@@ -310,4 +310,55 @@ $translations = array(
 	'Type has been dropped.' => 'Tipas pašalintas.',
 	'Type has been created.' => 'Tipas sukurtas.',
 	'Alter type' => 'Keisti tipą',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/lv.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Ieiet',
 	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
-	'Invalid credentials.' => 'Nepareizs lietotāja vārds vai parole.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Serveris',
 	'Username' => 'Lietotājs',
 	'Password' => 'Parole',
@@ -38,7 +37,7 @@ $translations = array(
 	'select' => 'izvēlēties',
 	'Item has been deleted.' => 'Ieraksts dzests.',
 	'Item has been updated.' => 'Ieraksts atjaunots.',
-	'Item%s has been inserted.' => 'Ieraksti%s tika ievietoti.',
+	'Item%s has been inserted.' => 'Ieraksti tika ievietoti.',
 	'Edit' => 'Rediģēt',
 	'Insert' => 'Ievietot',
 	'Save and insert next' => 'Saglabāt un ievietot nākamo',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Tabula nav pieejama',
 	'Invalid CSRF token. Send the form again.' => 'Nederīgs CSRF žetons. Nosūtiet formu vēl vienu reizi.',
 	'Comment' => 'Komentārs',
-	'Default values' => 'Noklusētā vērtība',
 	'%d byte(s)' => array('%d baits', '%d baiti', '%d baiti'),
 	'No commands to execute.' => 'Nav izpildāmu komandu.',
 	'Unable to upload a file.' => 'Neizdevās ielādēt failu uz servera.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'Pie dzēšanas',
 	'ON UPDATE' => 'Pie atjaunošanas',
 	'Index Type' => 'Indeksa tips',
-	'length' => 'garums',
+	'Column (length)' => 'Lauks (garums)',
 	'View has been dropped.' => 'Skats dzēsts.',
 	'View has been altered.' => 'Skats izmainīts.',
 	'View has been created.' => 'Skats izveidots.',
@@ -190,6 +188,7 @@ $translations = array(
 	'Tables have been dropped.' => 'Tabulas dzēstas.',
 	'Clone' => 'Klonēt',
 	'Partition by' => 'Sadalīt pēc',
+	'Partition' => null,
 	'Partitions' => 'Partīcijas',
 	'Partition name' => 'Partīcijas nosaukums',
 	'Values' => 'Vērtības',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Atcerēties mani',
 	'Databases have been dropped.' => 'Datubāzes dzēstas.',
 	'Search data in tables' => 'Meklēt tabulās',
+	'as a regular expression' => null,
 	'Schema' => 'Shēma',
 	'Alter schema' => 'Izmainīt shēmu',
 	'Create schema' => 'Jauna shēma',
@@ -286,19 +286,34 @@ $translations = array(
 	'Size' => 'Izmērs',
 	'Compute' => 'Izskaitļot',
 	'You are offline.' => 'Jūs est bezsasaistē.',
-	'You have no privileges to update this table.' => 'jums nav pieejas labot šo tabulu.',
+	'You have no privileges to update this table.' => 'Jums nav pieejas labot šo tabulu.',
 	'Saving' => 'Saglabāšana',
-	'yes' => 'Jā',
-	'no' => 'Nē',
+	'yes' => 'jā',
+	'no' => 'nē',
 	'Drop %s?' => 'Dzēst %s?',
 	'overwrite' => 'pārrakstīt',
 	'DB' => 'DB',
 	'Warnings' => 'Brīdinājumi',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer neatbalsta pieeju bez paroles, <a href="https://www.adminer.org/en/password/"%s>vairāk informācijas šeit</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Paldies, ka izmantoji Adminer, vai vēlies veikt <a href="https://www.adminer.org/en/donation/">ziedojumu</a>.',
 	'The action will be performed after successful login with the same credentials.' => 'Darbība tiks pabeigta pēc derīgas pieteikšanās sistēmā.',
 	'Connecting to privileged ports is not allowed.' => 'Pieeja priviliģētiem portiem nav atļauta.',
 	'There is a space in the input password which might be the cause.' => 'Parole satur atstarpi, kas varētu būt lieka.',
 	'Unknown error.' => 'Nezināma kļūda.',
 	'Database does not support password.' => 'Datubāze neatbalsta paroli.',
+
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Jā',
+	'No' => 'Nē',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ms.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Pelayan',
 	'Username' => 'Nama pengguna',
@@ -12,8 +11,7 @@ $translations = array(
 	'Logout' => 'Log keluar',
 	'Logged as: %s' => 'Log masuk sebagai: %s',
 	'Logout successful.' => 'Log keluar berjaya.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Terima kasih kerana menggunakan Adminer, pertimbangkan untuk <a href="https://www.adminer.org/en/donation/">menderma</a>.',
-	'Invalid credentials.' => 'Akses tidak sah.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Terlalu banyak percubaan log masuk yang gagal, sila cuba lagi dalam masa %d minit.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Kata laluan utama telah luput. <a href="https://www.adminer.org/en/extension/"%s>Gunakan</a> cara %s untuk mengekalkannya.',
 	'Language' => 'Bahasa',
@@ -170,7 +168,6 @@ $translations = array(
 	'Options' => 'Pilihan',
 	'Comment' => 'Komen',
 	'Default value' => 'Nilai lalai',
-	'Default values' => 'Nilai lalai',
 	'Drop' => 'Jatuh',
 	'Drop %s?' => 'Jatuhkan %s?',
 	'Are you sure?' => 'Anda pasti?',
@@ -182,6 +179,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bilangan medan telah melebihi had yang dibenarkan. Sila tingkatkan %s.',
 
 	'Partition by' => 'Partition mengikut',
+	'Partition' => null,
 	'Partitions' => 'Partition',
 	'Partition name' => 'Nama partition',
 	'Values' => 'Nilai',
@@ -199,7 +197,7 @@ $translations = array(
 	'Alter indexes' => 'Ubah indeks',
 	'Add next' => 'Tambah yang seterusnya',
 	'Index Type' => 'Jenis Indeks',
-	'length' => 'kepanjangan',
+	'Column (length)' => 'Kolum (kepanjangan)',
 
 	'Foreign keys' => 'Kunci asing',
 	'Foreign key' => 'Kunci asing',
@@ -236,6 +234,7 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana-mana',
 	'Search data in tables' => 'Cari data dalam jadual',
+	'as a regular expression' => null,
 	'Sort' => 'Susun',
 	'descending' => 'menurun',
 	'Limit' => 'Had',
@@ -338,4 +337,28 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis telah dijatuhkan.',
 	'Type has been created.' => 'Jenis telah dibuat.',
 	'Alter type' => 'Ubah jenis',
+
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ya',
+	'No' => 'Tidak',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/nl.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Aanmelden',
 	'Logout successful.' => 'Successvol afgemeld.',
-	'Invalid credentials.' => 'Ongeldige gebruikersgegevens.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Gebruikersnaam',
 	'Password' => 'Wachtwoord',
@@ -71,7 +70,6 @@ $translations = array(
 	'Unable to select the table' => 'Onmogelijk tabel te selecteren',
 	'Invalid CSRF token. Send the form again.' => 'Ongeldig CSRF token. Verstuur het formulier opnieuw.',
 	'Comment' => 'Commentaar',
-	'Default values' => 'Standaard waarden',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Geen opdrachten uit te voeren.',
 	'Unable to upload a file.' => 'Onmogelijk bestand te uploaden.',
@@ -98,7 +96,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index type',
-	'length' => 'lengte',
+	'Column (length)' => 'Kolom (lengte)',
 	'View has been dropped.' => 'View verwijderd.',
 	'View has been altered.' => 'View aangepast.',
 	'View has been created.' => 'View aangemaakt.',
@@ -192,6 +190,7 @@ $translations = array(
 	'Clone' => 'Dupliceer',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maximum aantal velden bereikt. Verhoog %s.',
 	'Partition by' => 'Partitioneren op',
+	'Partition' => null,
 	'Partitions' => 'Partities',
 	'Partition name' => 'Partitie naam',
 	'Values' => 'Waarden',
@@ -225,6 +224,7 @@ $translations = array(
 	'%d in total' => '%d in totaal',
 	'Permanent login' => 'Blijf aangemeld',
 	'Search data in tables' => 'Zoeken in database',
+	'as a regular expression' => 'als een regular expression',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema wijzigen',
 	'Create schema' => 'Schema maken',
@@ -254,7 +254,7 @@ $translations = array(
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Bestand bestaat reeds.',
 	'Attachments' => 'Bijlagen',
-	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd.'),
+	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd'),
 	'Show only errors' => 'Enkel fouten tonen',
 	'Refresh' => 'Vernieuwen',
 	'Invalid schema.' => 'Ongeldig schema.',
@@ -266,6 +266,7 @@ $translations = array(
 	'Permanent link' => 'Permanente link',
 	'Edit all' => 'Alles bewerken',
 	'HH:MM:SS' => 'HH:MM:SS',
+
 	'Drop %s?' => 'Verwijder %s?',
 	'Tables have been optimized.' => 'Tabellen zijn geoptimaliseerd.',
 	'Materialized view' => 'Materialized view',
@@ -277,7 +278,7 @@ $translations = array(
 	'Modify' => 'Aanpassen',
 	'Load more data' => 'Meer data inladen',
 	'Loading' => 'Aan het laden',
-	'ATTACH queries are not supported.' => 'ATTACH queries worden niet ondersteund.',
+	'ATTACH queries are not supported.' => 'ATTACH queries worden niet ondersteund',
 	'Warnings' => 'Waarschuwingen',
 	'%d / ' => '%d / ',
 	'Limit rows' => 'Rijen beperken',
@@ -286,7 +287,7 @@ $translations = array(
 	'Full table scan' => 'Full table scan',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuut.', 'Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuten.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master wachtwoord verlopen. <a href="https://www.adminer.org/en/extension/"%s>Implementeer</a> de %s methode om het permanent te maken.',
-	'The action will be performed after successful login with the same credentials.' => 'Deze actie zal uitgevoerd worden na het succesvol aanmelden met dezelfde gebruikersgegevens.',
+	'The action will be performed after successful login with the same credentials.' => 'Deze actie zal uitgevoerd worden na het succesvol aanmelden met dezelfde gebruikersgegevens',
 	'Connecting to privileged ports is not allowed.' => 'Verbindingen naar geprivilegieerde poorten is niet toegestaan.',
 	'There is a space in the input password which might be the cause.' => 'Er staat een spatie in het wachtwoord, wat misschien de oorzaak is.',
 	'If you did not send this request from Adminer then close this page.' => 'Als u deze actie niet via Adminer hebt gedaan, gelieve deze pagina dan te sluiten.',
@@ -296,9 +297,23 @@ $translations = array(
 	'You are offline.' => 'U bent offline.',
 	'You have no privileges to update this table.' => 'U bent niet gemachtigd om deze tabel aan te passen.',
 	'Saving' => 'Opslaan',
-	'Unknown error.' => 'Onbekende fout.',
+	'Unknown error.' => 'Onbekende fout',
 	'Database does not support password.' => 'Database ondersteunt het wachtwoord niet.',
 	'Disable %s or enable %s or %s extensions.' => 'Schakel %s uit or schakel extensies %s of %s in.',
 	'yes' => 'ja',
 	'no' => 'neen',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Neen',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/no.inc.php

@@ -1,7 +1,6 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Brukernavn',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Logg ut',
 	'Logged as: %s' => 'Logget inn som: %s',
 	'Logout successful.' => 'Utlogging vellykket.',
-	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
+	'Invalid server or credentials.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for å gjøre det permanent.',
 	'Language' => 'Språk',
 	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
@@ -144,7 +143,6 @@ $translations = array(
 	'Auto Increment' => 'Autoinkrement',
 	'Options' => 'Valg',
 	'Comment' => 'Kommentarer',
-	'Default values' => 'Standardverdier',
 	'Drop' => 'Dropp',
 	'Are you sure?' => 'Er du sikker?',
 	'Move up' => 'Flytt opp',
@@ -152,6 +150,7 @@ $translations = array(
 	'Remove' => 'Fjern',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antall feltnavn overskredet - venligst øk %s.',
 	'Partition by' => 'Partisjoner ved',
+	'Partition' => null,
 	'Partitions' => 'Partisjoner',
 	'Partition name' => 'Partisjonsnavn',
 	'Values' => 'Verdier',
@@ -166,7 +165,7 @@ $translations = array(
 	'Alter indexes' => 'Endre indekser',
 	'Add next' => 'Legg til neste',
 	'Index Type' => 'Indekstype',
-	'length' => 'lengde',
+	'Column (length)' => 'Kolonne (lengde)',
 	'Foreign keys' => 'Fremmednøkler',
 	'Foreign key' => 'Fremmednøkkel',
 	'Foreign key has been dropped.' => 'Fremmednøkkelen er slettet.',
@@ -200,6 +199,7 @@ $translations = array(
 	'Search' => 'Søk',
 	'anywhere' => 'hvorsomhelst',
 	'Search data in tables' => 'Søk data i tabeller',
+	'as a regular expression' => null,
 	'Sort' => 'Sorter',
 	'descending' => 'minkende',
 	'Limit' => 'Skranke',
@@ -280,4 +280,40 @@ $translations = array(
 	'Type has been created.' => 'Type er opprettet.',
 	'Alter type' => 'Endre type',
 	'Saving' => 'Lagrer',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nei',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/pl.inc.php

@@ -1,22 +1,17 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Rodzaj bazy',
 	'Server' => 'Serwer',
 	'Username' => 'Użytkownik',
 	'Password' => 'Hasło',
 	'Permanent login' => 'Zapamiętaj sesję',
 	'Login' => 'Zaloguj się',
-	'Logout' => 'Wyloguj się',
+	'Logout' => 'Wyloguj',
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
-	'Invalid credentials.' => 'Nieprawidłowe dane logowania.',
-	'There is a space in the input password which might be the cause.' => 'W haśle wejściowym znajduje się spacja, która może być przyczyną.',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nie obsługuje dostępu do bazy danych bez hasła, <a href="https://www.adminer.org/pl/password/"%s>więcej informacji</a>.',
-	'Database does not support password.' => 'Baza danych nie obsługuje hasła.',
+	'Invalid server or credentials.' => 'Nieprawidłowy serwer lub dane logowania.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Za dużo nieudanych prób logowania, spróbuj ponownie za %d minutę.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minuty.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minut.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="https://www.adminer.org/pl/extension/"%s>Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
 	'Language' => 'Język',
@@ -25,10 +20,8 @@ $translations = array(
 	'No extension' => 'Brak rozszerzenia',
 	'None of the supported PHP extensions (%s) are available.' => 'Żadne z rozszerzeń PHP umożliwiających połączenie się z bazą danych (%s) nie jest dostępne.',
 	'Connecting to privileged ports is not allowed.' => 'Łączenie do portów uprzywilejowanych jest niedozwolone.',
-	'Disable %s or enable %s or %s extensions.' => 'Wyłącz %s lub włącz rozszerzenia %s lub %s.',
 	'Session support must be enabled.' => 'Wymagana jest obsługa sesji w PHP.',
 	'Session expired, please login again.' => 'Sesja wygasła, zaloguj się ponownie.',
-	'The action will be performed after successful login with the same credentials.' => 'Czynność zostanie wykonana po pomyślnym zalogowaniu przy użyciu tych samych danych logowania.',
 	'%s version: %s through PHP extension %s' => 'Wersja %s: %s za pomocą %s',
 	'Refresh' => 'Odśwież',
 
@@ -58,8 +51,6 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Zapytanie wykonane pomyślnie, zmieniono %d rekord.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordy.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordów.'),
 	'No commands to execute.' => 'Nic do wykonania.',
 	'Error in query' => 'Błąd w zapytaniu',
-	'Unknown error.' => 'Nieznany błąd.',
-	'Warnings' => 'Ostrzeżenia',
 	'ATTACH queries are not supported.' => 'Zapytania ATTACH są niewspierane.',
 	'Execute' => 'Wykonaj',
 	'Stop on error' => 'Zatrzymaj w przypadku błędu',
@@ -82,7 +73,7 @@ $translations = array(
 	'You can upload a big SQL file via FTP and import it from server.' => 'Większe pliki SQL możesz wgrać na serwer poprzez FTP przed zaimportowaniem.',
 	'You are offline.' => 'Jesteś offline.',
 
-	'Export' => 'Eksportuj',
+	'Export' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
@@ -90,7 +81,6 @@ $translations = array(
 	'Data' => 'Dane',
 
 	'Database' => 'Baza danych',
-	'DB' => 'BD',
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
 	'Invalid database.' => 'Nie znaleziono bazy danych.',
@@ -128,7 +118,6 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele zostały przeniesione.',
 	'Copy' => 'Kopiuj',
 	'Tables have been copied.' => 'Tabele zostały skopiowane.',
-	'overwrite' => 'nadpisz',
 
 	'Routines' => 'Procedury i funkcje',
 	'Routine has been called, %d row(s) affected.' => array('Procedura została uruchomiona, zmieniono %d rekord.', 'Procedura została uruchomiona, zmieniono %d rekordy.', 'Procedura została uruchomiona, zmieniono %d rekordów.'),
@@ -174,15 +163,14 @@ $translations = array(
 	'Column name' => 'Nazwa kolumny',
 	'Type' => 'Typ',
 	'Length' => 'Długość',
-	'Auto Increment' => 'Automatyczny przyrost',
+	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Opcje',
 	'Comment' => 'Komentarz',
 	'Default value' => 'Wartość domyślna',
-	'Default values' => 'Wartości domyślne',
 	'Drop' => 'Usuń',
 	'Drop %s?' => 'Usunąć %s?',
-	'Are you sure?' => 'Czy na pewno?',
-	'Size' => 'Rozmiar',
+	'Are you sure?' => 'Czy jesteś pewien?',
+	'Size' => 'Wielkość',
 	'Compute' => 'Oblicz',
 	'Move up' => 'Przesuń w górę',
 	'Move down' => 'Przesuń w dół',
@@ -190,6 +178,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
 
 	'Partition by' => 'Partycjonowanie',
+	'Partition' => null,
 	'Partitions' => 'Partycje',
 	'Partition name' => 'Nazwa partycji',
 	'Values' => 'Wartości',
@@ -207,7 +196,7 @@ $translations = array(
 	'Alter indexes' => 'Zmień indeksy',
 	'Add next' => 'Dodaj następny',
 	'Index Type' => 'Typ indeksu',
-	'length' => 'długość',
+	'Column (length)' => 'Kolumna (długość)',
 
 	'Foreign keys' => 'Klucze obce',
 	'Foreign key' => 'Klucz obcy',
@@ -244,6 +233,7 @@ $translations = array(
 	'Search' => 'Szukaj',
 	'anywhere' => 'gdziekolwiek',
 	'Search data in tables' => 'Wyszukaj we wszystkich tabelach',
+	'as a regular expression' => null,
 	'Sort' => 'Sortuj',
 	'descending' => 'malejąco',
 	'Limit' => 'Limit',
@@ -262,14 +252,14 @@ $translations = array(
 	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
 
-	'Import' => 'Importuj',
+	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('%d rekord został zaimportowany.', '%d rekordy zostały zaimportowane.', '%d rekordów zostało zaimportowanych.'),
 	'File must be in UTF-8 encoding.' => 'Kodowanie pliku musi być ustawione na UTF-8.',
 
 	// in-place editing in select
 	'Modify' => 'Zmień',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknij wartość, aby ją edytować.',
-	'Use edit link to modify this value.' => 'Użyj linku edycji, aby zmienić tę wartość.',
+	'Use edit link to modify this value.' => 'Użyj linku edycji aby zmienić tę wartość.',
 
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Rekord%s został dodany.',
@@ -290,7 +280,7 @@ $translations = array(
 	'Selected' => 'Zaznaczone',
 	'Clone' => 'Duplikuj',
 	'Delete' => 'Usuń',
-	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli.',
+	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli',
 
 	'E-mail' => 'E-mail',
 	'From' => 'Nadawca',
@@ -348,11 +338,27 @@ $translations = array(
 	'Type has been created.' => 'Typ został utworzony.',
 	'Alter type' => 'Zmień typ',
 
-	// Table check constraints
-	'Checks' => 'Kontrole',
-	'Create check' => 'Utwórz kontrolę',
-	'Alter check' => 'Zmień kontrolę',
-	'Check has been created.' => 'Kontrola została utworzona.',
-	'Check has been altered.' => 'Kontrola została zmieniona.',
-	'Check has been dropped.' => 'Kontrola została usunięta.',
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Tak',
+	'No' => 'Nie',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/pt-br.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
-	'Invalid credentials.' => 'Identificação inválida.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuário',
 	'Password' => 'Senha',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Não é possível selecionar a Tabela',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Enviar o formulário novamente.',
 	'Comment' => 'Comentário',
-	'Default values' => 'Valores padrões',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nenhum comando para executar.',
 	'Unable to upload a file.' => 'Não é possível enviar o arquivo.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'tamanho',
+	'Column (length)' => 'Coluna (tamanho)',
 	'View has been dropped.' => 'A Visão foi apagada.',
 	'View has been altered.' => 'A Visão foi alterada.',
 	'View has been created.' => 'A Visão foi criada.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
+	'Partition' => null,
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
 	'Values' => 'Valores',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Login permanente',
 	'Databases have been dropped.' => 'A Base de dados foi apagada.',
 	'Search data in tables' => 'Buscar dados nas Tabelas',
+	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Alterar esquema',
 	'Create schema' => 'Criar esquema',
@@ -261,4 +261,59 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
+
+	'Drop %s?' => null,
+	'Tables have been copied.' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'Copy' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/pt.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
-	'Invalid credentials.' => 'Identificação inválida.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Nome de utilizador',
 	'Password' => 'Senha',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Não é possivel selecionar a Tabela',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Enviar o formulario novamente.',
 	'Comment' => 'Comentário',
-	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nenhum comando para executar.',
 	'Unable to upload a file.' => 'Não é possível enviar o ficheiro.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'length' => 'tamanho',
+	'Column (length)' => 'coluna (tamanho)',
 	'View has been dropped.' => 'Vista eliminada.',
 	'View has been altered.' => 'Vista modificada.',
 	'View has been created.' => 'Vista criada.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
+	'Partition' => null,
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
 	'Values' => 'Valores',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Memorizar a senha',
 	'Databases have been dropped.' => 'Bases de dados eliminadas.',
 	'Search data in tables' => 'Pesquisar dados nas Tabelas',
+	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Criar esquema',
@@ -261,4 +261,59 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
+
+	'Drop %s?' => null,
+	'Tables have been copied.' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'Copy' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ro.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
-	'Invalid credentials.' => 'Numele de utilizator sau parola este greșită.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Nume de utilizator',
 	'Password' => 'Parola',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Nu am putut selecta date din tabel',
 	'Invalid CSRF token. Send the form again.' => 'CSRF token imposibil. Retrimite forma.',
 	'Comment' => 'Comentariu',
-	'Default values' => 'Valoarea inițială',
 	'%d byte(s)' => array('%d octet', '%d octeți'),
 	'No commands to execute.' => 'Nu sunt comenzi de executat.',
 	'Unable to upload a file.' => 'Nu am putut încărca fișierul pe server.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'La ștergere',
 	'ON UPDATE' => 'La modificare',
 	'Index Type' => 'Tipul indexului',
-	'length' => 'lungimea',
+	'Column (length)' => 'Coloană (lungimea)',
 	'View has been dropped.' => 'Reprezentarea a fost ștearsă.',
 	'View has been altered.' => 'Reprezentarea a fost modificată.',
 	'View has been created.' => 'Reprezentarea a fost creată.',
@@ -190,6 +188,7 @@ $translations = array(
 	'Tables have been dropped.' => 'Tabelele au fost șterse.',
 	'Clone' => 'Clonează',
 	'Partition by' => 'Împarte',
+	'Partition' => null,
 	'Partitions' => 'Secțiuni',
 	'Partition name' => 'Denumirea secțiunii',
 	'Values' => 'Parametru',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Logare permanentă',
 	'Databases have been dropped.' => 'Bazele de date au fost șterse.',
 	'Search data in tables' => 'Caută în tabele',
+	'as a regular expression' => null,
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifică schema',
 	'Create schema' => 'Crează o schemă',
@@ -261,9 +261,59 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Folosiți una din următoarele extensii %s.',
 	'now' => 'acum',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => 'Tabelele au fost copiate.',
+	'Tables have been copied.' => 'Tabelele au fost copiate',
 	'Copy' => 'Copiază',
 	'Permanent link' => 'Adresă permanentă',
 	'Edit all' => 'Editează tot',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ru.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
-	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Сервер',
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'Не удалось получить данные из таблицы',
 	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF-токен. Отправите форму ещё раз.',
 	'Comment' => 'Комментарий',
-	'Default values' => 'Значения по умолчанию',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтов'),
 	'No commands to execute.' => 'Нет команд для выполнения.',
 	'Unable to upload a file.' => 'Не удалось загрузить файл на сервер.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'При стирании',
 	'ON UPDATE' => 'При обновлении',
 	'Index Type' => 'Тип индекса',
-	'length' => 'длина',
+	'Column (length)' => 'Поле (длина)',
 	'View has been dropped.' => 'Представление было удалено.',
 	'View has been altered.' => 'Представление было изменено.',
 	'View has been created.' => 'Представление было создано.',
@@ -190,6 +188,7 @@ $translations = array(
 	'Tables have been dropped.' => 'Таблицы были удалены.',
 	'Clone' => 'Клонировать',
 	'Partition by' => 'Разделить по',
+	'Partition' => null,
 	'Partitions' => 'Разделы',
 	'Partition name' => 'Название раздела',
 	'Values' => 'Параметры',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'Оставаться в системе',
 	'Databases have been dropped.' => 'Базы данных удалены.',
 	'Search data in tables' => 'Поиск в таблицах',
+	'as a regular expression' => 'как регулярное выражение',
 	'Schema' => 'Схема',
 	'Alter schema' => 'Изменить схему',
 	'Create schema' => 'Новая схема',
@@ -288,18 +288,32 @@ $translations = array(
 	'You are offline.' => 'Вы не выполнили вход.',
 	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
 	'Saving' => 'Сохранение',
-	'yes' => 'Да',
-	'no' => 'Нет',
+	'yes' => 'да',
+	'no' => 'нет',
 	'Drop %s?' => 'Удалить %s?',
 	'overwrite' => 'перезаписать',
 	'DB' => 'DB',
 	'Warnings' => 'Предупреждения',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer не поддерживает доступ к базе данных без пароля, <a href="https://www.adminer.org/en/password/"%s>больше информации</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Спасибо за использование Adminer, рассмотрите возможность <a href="https://www.adminer.org/en/donation/">пожертвования</a>.',
 	'The action will be performed after successful login with the same credentials.' => 'Действие будет выполнено после успешного входа в систему с теми же учетными данными.',
 	'Connecting to privileged ports is not allowed.' => 'Подключение к привилегированным портам не допускается.',
 	'There is a space in the input password which might be the cause.' => 'В введеном пароле есть пробел, это может быть причиною.',
 	'Unknown error.' => 'Неизвестная ошибка.',
 	'Database does not support password.' => 'База данных не поддерживает пароль.',
+
 	'Disable %s or enable %s or %s extensions.' => 'Отключите %s или включите расширения %s или %s.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Нет',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/sk.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => 'Domov',
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
-	'Invalid credentials.' => 'Neplatné prihlasovacie údaje.',
+	'Invalid server or credentials.' => 'Neplatný server alebo prihlasovacie údaje.',
 	'Server' => 'Server',
 	'Username' => 'Používateľ',
 	'Password' => 'Heslo',
@@ -71,7 +70,6 @@ $translations = array(
 	'Unable to select the table' => 'Tabuľku sa nepodarilo vypísať',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
-	'Default values' => 'Predvolené hodnoty',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtov'),
 	'No commands to execute.' => 'Žiadne príkazy na vykonanie.',
 	'Unable to upload a file.' => 'Súbor sa nepodarilo nahrať.',
@@ -79,6 +77,8 @@ $translations = array(
 	'File uploads are disabled.' => 'Nahrávánie súborov nie je povolené.',
 	'Routine has been called, %d row(s) affected.' => array('Procedúra bola zavolaná, bol zmenený %d záznam.', 'Procedúra bola zavolaná, boli zmenené %d záznamy.', 'Procedúra bola zavolaná, bolo zmenených %d záznamov.'),
 	'Call' => 'Zavolať',
+	'No driver' => 'Žiadny ovládač',
+	'Database driver not found.' => 'Databázový ovládač sa nenašiel.',
 	'No extension' => 'Žiadne rozšírenie',
 	'None of the supported PHP extensions (%s) are available.' => 'Nie je dostupné žiadne z podporovaných rozšírení (%s).',
 	'Session support must be enabled.' => 'Session premenné musia byť povolené.',
@@ -98,7 +98,7 @@ $translations = array(
 	'ON DELETE' => 'Pri zmazaní',
 	'ON UPDATE' => 'Pri aktualizácii',
 	'Index Type' => 'Typ indexu',
-	'length' => 'dĺžka',
+	'Column (length)' => 'Stĺpec (dĺžka)',
 	'View has been dropped.' => 'Pohľad bol odstránený.',
 	'View has been altered.' => 'Pohľad bol zmenený.',
 	'View has been created.' => 'Pohľad bol vytvorený.',
@@ -191,6 +191,7 @@ $translations = array(
 	'Whole result' => 'Celý výsledok',
 	'Clone' => 'Klonovať',
 	'Partition by' => 'Rozdeliť podľa',
+	'Partition' => 'Oddiel',
 	'Partitions' => 'Oddiely',
 	'Partition name' => 'Názov oddielu',
 	'Values' => 'Hodnoty',
@@ -225,6 +226,7 @@ $translations = array(
 	'Permanent login' => 'Trvalé prihlásenie',
 	'%d in total' => '%d celkom',
 	'Search data in tables' => 'Vyhľadať dáta v tabuľkách',
+	'as a regular expression' => 'ako regulárny výraz',
 	'Alter schema' => 'Pozmeniť schému',
 	'Create schema' => 'Vytvoriť schému',
 	'Schema has been dropped.' => 'Schéma bola odstránená.',
@@ -257,7 +259,7 @@ $translations = array(
 	'%d query(s) executed OK.' => array('Bol vykonaný %d dotaz.', 'Boli vykonané %d dotazy.', 'Bolo vykonaných %d dotazov.'),
 	'Show only errors' => 'Zobraziť iba chyby',
 	'Refresh' => 'Obnoviť',
-	'Invalid schema.' => 'Neplatné schéma.',
+	'Invalid schema.' => 'Neplatná schéma.',
 	'Please use one of the extensions %s.' => 'Prosím vyberte jednu z koncoviek %s.',
 	'now' => 'teraz',
 	'ltr' => 'ltr',
@@ -285,11 +287,10 @@ $translations = array(
 	'Default value' => 'Predvolená hodnota',
 	'Full table scan' => 'Prechod celej tabuľky',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Príliš veľa pokusov o prihlásenie, skúste to znova za %d minutu.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minuty.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minút.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Vďaka za používanie Admineru, <a href="https://www.adminer.org/sk/donation/">prispejte</a> na vývoj.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Platnosť hlavného hesla vypršala. <a href="https://www.adminer.org/cs/extension/"%s>Implementujte</a> metodu %s, aby platilo natrvalo.',
 	'The action will be performed after successful login with the same credentials.' => 'Akcia sa vykoná po úspešnom prihlásení s rovnakými prihlasovacími údajmi.',
 	'Connecting to privileged ports is not allowed.' => 'Pripojenie k privilegovaným portom nie je povolené.',
-	'There is a space in the input password which might be the cause.' => 'V zadanom hesle je medzera, ktorá môže byť príčinou.',
+	'There is a space in the input password which might be the cause.' =>  'V zadanom hesle je medzera, ktorá môže byť príčinou.',
 	'If you did not send this request from Adminer then close this page.' => 'Pokiaľ ste tento požiadavok neodoslali z Adminera, zatvorte túto stránku.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Veľký SQL soubor môžete nahrať pomocou FTP a importovať ho zo servera.',
 	'Size' => 'Veľkosť',
@@ -302,10 +303,14 @@ $translations = array(
 	'Disable %s or enable %s or %s extensions.' => 'Zakážte %s alebo povoľte rozšírenie %s alebo %s.',
 	'yes' => 'áno',
 	'no' => 'nie',
-	'Checks' => 'Kontroly',
-	'Create check' => 'Vytvoriť kontrolu',
-	'Alter check' => 'Zmeniť kontrolu',
-	'Check has been created.' => 'Kontrola bola vytvorená.',
-	'Check has been altered.' => 'Kontrola bola zmenená.',
-	'Check has been dropped.' => 'Kontrola bola odstránená.',
+	'Yes' => 'Áno',
+	'No' => 'Nie',
+	'Columns' => 'Stĺpce',
+	'Nullable' => 'Povolené null',
+	'Default' => 'Predvolené',
+	'One Time Password' => 'Jednorázové heslo',
+	'Invalid OTP code.' => 'Neplatný kód OTP.',
+	'Schemas' => 'Schémy',
+	'No schemas.' => 'Žiadne schémy.',
+	'Show schema' => 'Zobraziť schému',
 );

adminer/lang/sl.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Strežnik',
 	'Username' => 'Uporabniško ime',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Odjavi se',
 	'Logged as: %s' => 'Prijavljen kot: %s',
 	'Logout successful.' => 'Prijava uspešna.',
-	'Invalid credentials.' => 'Neveljavne pravice.',
+	'Invalid server or credentials.' => 'Neveljaven strežnik ali pravice.',
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Neveljaven token CSRF. Pošljite formular še enkrat.',
 	'No extension' => 'Brez dodatkov',
@@ -154,7 +153,6 @@ $translations = array(
 	'Auto Increment' => 'Samodejno povečevanje',
 	'Options' => 'Možnosti',
 	'Comment' => 'Komentar',
-	'Default values' => 'Privzete vrednosti',
 	'Drop' => 'Zavrzi',
 	'Are you sure?' => 'Ste prepričani?',
 	'Move up' => 'Premakni gor',
@@ -163,6 +161,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
 
 	'Partition by' => 'Porazdeli po',
+	'Partition' => null,
 	'Partitions' => 'Porazdelitve',
 	'Partition name' => 'Ime porazdelitve',
 	'Values' => 'Vrednosti',
@@ -179,7 +178,7 @@ $translations = array(
 	'Alter indexes' => 'Spremeni indekse',
 	'Add next' => 'Dodaj naslednjega',
 	'Index Type' => 'Tip indeksa',
-	'length' => 'dolžina',
+	'Column (length)' => 'Stolpec (dolžina)',
 
 	'Foreign keys' => 'Tuji ključi',
 	'Foreign key' => 'Tuj ključ',
@@ -216,6 +215,7 @@ $translations = array(
 	'Search' => 'Išči',
 	'anywhere' => 'kjerkoli',
 	'Search data in tables' => 'Išče podatke po tabelah',
+	'as a regular expression' => null,
 	'Sort' => 'Sortiraj',
 	'descending' => 'padajoče',
 	'Limit' => 'Limita',
@@ -305,4 +305,57 @@ $translations = array(
 	'Type has been dropped.' => 'Tip je zavržen.',
 	'Type has been created.' => 'Tip je ustvarjen.',
 	'Alter type' => 'Spremeni tip',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/sr.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Систем',
 	'Server' => 'Сервер',
 	'Username' => 'Корисничко име',
@@ -12,11 +11,11 @@ $translations = array(
 	'Logout' => 'Одјава',
 	'Logged as: %s' => 'Пријави се као: %s',
 	'Logout successful.' => 'Успешна одјава.',
-	'Invalid credentials.' => 'Неважеће дозволе.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Језик',
 	'Invalid CSRF token. Send the form again.' => 'Неважећи CSRF код. Проследите поново форму.',
 	'No extension' => 'Без додатака',
-	'None of the supported PHP extensions (%s) are available.' => 'Ниједан од подржаних PHP додатака (%s) није доступан.',
+	'None of the supported PHP extensions (%s) are available.' => 'Ниједан од подржаних PHP додатака није доступан.',
 	'Session support must be enabled.' => 'Морате омогућити подршку за сесије.',
 	'Session expired, please login again.' => 'Ваша сесија је истекла, пријавите се поново.',
 	'%s version: %s through PHP extension %s' => '%s верзија: %s помоћу PHP додатка је %s',
@@ -159,7 +158,6 @@ $translations = array(
 	'Auto Increment' => 'Ауто-прираштај',
 	'Options' => 'Опције',
 	'Comment' => 'Коментар',
-	'Default values' => 'Подразумеване вредности',
 	'Drop' => 'Избриши',
 	'Are you sure?' => 'Да ли сте сигурни?',
 	'Move up' => 'Помери на горе',
@@ -168,6 +166,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s.',
 
 	'Partition by' => 'Подели по',
+	'Partition' => null,
 	'Partitions' => 'Поделе',
 	'Partition name' => 'Име поделе',
 	'Values' => 'Вредности',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Уреди индексе',
 	'Add next' => 'Додај следећи',
 	'Index Type' => 'Тип индекса',
-	'length' => 'дужина',
+	'Column (length)' => 'Колона (дужина)',
 
 	'Foreign keys' => 'Страни кључеви',
 	'Foreign key' => 'Страни кључ',
@@ -221,6 +220,7 @@ $translations = array(
 	'Search' => 'Претрага',
 	'anywhere' => 'било где',
 	'Search data in tables' => 'Претражи податке у табелама',
+	'as a regular expression' => null,
 	'Sort' => 'Поређај',
 	'descending' => 'опадајуће',
 	'Limit' => 'Граница',
@@ -317,4 +317,48 @@ $translations = array(
 	'Type has been dropped.' => 'Тип је избрисан.',
 	'Type has been created.' => 'тип је креиран.',
 	'Alter type' => 'Уреди тип',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Не',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/sv.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Användarnamn',
@@ -12,8 +11,7 @@ $translations = array(
 	'Logout' => 'Logga ut',
 	'Logged as: %s' => 'Inloggad som: %s',
 	'Logout successful.' => 'Du är nu utloggad.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Tack för att du använder Adminer, vänligen fundera över att <a href="https://www.adminer.org/en/donation/">donera</a>.',
-	'Invalid credentials.' => 'Ogiltiga inloggningsuppgifter.',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => 'Det finns ett mellanslag i lösenordet, vilket kan vara anledningen.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer tillåter inte att ansluta till en databas utan lösenord. <a href="https://www.adminer.org/en/password/"%s>Mer information</a>.',
 	'Database does not support password.' => 'Databasen stödjer inte lösenord.',
@@ -179,7 +177,6 @@ $translations = array(
 	'Options' => 'Inställningar',
 	'Comment' => 'Kommentar',
 	'Default value' => 'Standardvärde',
-	'Default values' => 'Standardvärden',
 	'Drop' => 'Ta bort',
 	'Drop %s?' => 'Ta bort %s?',
 	'Are you sure?' => 'Är du säker?',
@@ -191,6 +188,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Högsta nummer tillåtna fält är överskridet. Vänligen höj %s.',
 
 	'Partition by' => 'Partitionera om',
+	'Partition' => null,
 	'Partitions' => 'Partitioner',
 	'Partition name' => 'Partition',
 	'Values' => 'Värden',
@@ -208,7 +206,7 @@ $translations = array(
 	'Alter indexes' => 'Ändra index',
 	'Add next' => 'Lägg till nästa',
 	'Index Type' => 'Indextyp',
-	'length' => 'längd',
+	'Column (length)' => 'Kolumn (längd)',
 
 	'Foreign keys' => 'Främmande nycklar',
 	'Foreign key' => 'Främmande nyckel',
@@ -245,6 +243,7 @@ $translations = array(
 	'Search' => 'Sök',
 	'anywhere' => 'överallt',
 	'Search data in tables' => 'Sök data i tabeller',
+	'as a regular expression' => null,
 	'Sort' => 'Sortera',
 	'descending' => 'Fallande',
 	'Limit' => 'Begränsning',
@@ -347,4 +346,18 @@ $translations = array(
 	'Type has been dropped.' => 'Typ har, typ, tagits bort.',
 	'Type has been created.' => 'Typ har skapats.',
 	'Alter type' => 'Ändra typ',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nej',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/ta.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
-	'Invalid credentials.' => 'ச‌ரியான‌ விப‌ர‌ங்க‌ள் இல்லை.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'வ‌ழ‌ங்கி (Server)',
 	'Username' => 'ப‌ய‌னாள‌ர் (User)',
 	'Password' => 'க‌ட‌வுச்சொல்',
@@ -69,7 +68,6 @@ $translations = array(
 	'Unable to select the table' => 'அட்ட‌வ‌ணையை தேர்வு செய்ய‌ முடிய‌வில்லை',
 	'Invalid CSRF token. Send the form again.' => 'CSRF டோக்க‌ன் செல்லாது. ப‌டிவ‌த்தை மீண்டும் அனுப்ப‌வும்.',
 	'Comment' => 'குறிப்பு',
-	'Default values' => 'உள்ளிருக்கும் (Default) ம‌திப்புக‌ள் ',
 	'%d byte(s)' => array('%d பைட்', '%d பைட்டுக‌ள்'),
 	'No commands to execute.' => 'செய‌ல் ப‌டுத்த‌ எந்த‌ க‌ட்ட‌ளைக‌ளும் இல்லை.',
 	'Unable to upload a file.' => 'கோப்பை மேலேற்ற‌ம் (upload) செய்ய‌ இயல‌வில்லை.',
@@ -95,7 +93,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'அக‌வ‌ரிசை வ‌கை (Index Type)',
-	'length' => 'நீள‌ம்',
+	'Column (length)' => 'நெடுவ‌ரிசை (நீள‌ம்)',
 	'View has been dropped.' => 'தோற்ற‌ம் நீக்க‌ப்ப‌ட்ட‌து.',
 	'View has been altered.' => 'தோற்றம் மாற்றப்ப‌ட்ட‌து.',
 	'View has been created.' => 'தோற்ற‌ம் உருவாக்க‌ப்ப‌ட்ட‌து.',
@@ -188,6 +186,7 @@ $translations = array(
 	'Clone' => 'ந‌க‌லி (Clone)',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
 	'Partition by' => 'பிரித்த‌து',
+	'Partition' => null,
 	'Partitions' => 'பிரிவுக‌ள்',
 	'Partition name' => 'பிரிவின் பெய‌ர்',
 	'Values' => 'ம‌திப்புக‌ள்',
@@ -225,11 +224,12 @@ $translations = array(
 	'Alter schema' => 'அமைப்புமுறையை மாற்று',
 	'Create schema' => 'அமைப்புமுறையை உருவாக்கு',
 	'Search data in tables' => 'த‌க‌வ‌லை அட்ட‌வ‌ணையில் தேடு',
+	'as a regular expression' => null,
 	'Sequences' => 'வ‌ரிசைமுறை',
 	'Create sequence' => 'வ‌ரிசைமுறையை உருவாக்கு',
 	'User types' => 'ப‌ய‌னாள‌ர் வ‌கைக‌ள்',
 	'Create type' => 'வ‌கையை உருவாக்கு',
-	'Item%s has been inserted.' => 'உருப்ப‌டி (Item%s) சேர்க்க‌ப்ப‌ட்ட‌து.',
+	'Item%s has been inserted.' => 'உருப்ப‌டி (Item) சேர்க்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been dropped.' => 'அமைப்புமுறை நீக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been created.' => 'அமைப்புமுறை உருவாக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been altered.' => 'அமைப்புமுறை மாற்ற‌ப்ப‌ட்ட‌து.',
@@ -265,4 +265,55 @@ $translations = array(
 	'Permanent link' => 'நிரந்தர இணைப்பு',
 	'Edit all' => 'அனைத்தையும் தொகு',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/th.inc.php

@@ -1,10 +1,9 @@
 <?php
-namespace Adminer;
-
 $translations = array(
+	'Home' => null,
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
-	'Invalid credentials.' => 'ข้อมูลไม่ถูกต้อง.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'เซอเวอร์',
 	'Username' => 'ชื่อผู้ใช้งาน',
 	'Password' => 'รหัสผ่าน',
@@ -70,7 +69,6 @@ $translations = array(
 	'Unable to select the table' => 'ไม่สามารถเลือกตารางได้',
 	'Invalid CSRF token. Send the form again.' => 'เครื่องหมาย CSRF ไม่ถูกต้อง ส่งข้อมูลใหม่อีกครั้ง.',
 	'Comment' => 'หมายเหตุ',
-	'Default values' => 'ค่าเริ่มต้น',
 	'%d byte(s)' => '%d ไบท์',
 	'No commands to execute.' => 'ไม่มีคำสั่งที่จะประมวลผล.',
 	'Unable to upload a file.' => 'ไม่สามารถอัปโหลดไฟล์ได้.',
@@ -97,7 +95,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'ชนิดของดัชนี',
-	'length' => 'ความยาว',
+	'Column (length)' => 'คอลัมน์ (ความยาว)',
 	'View has been dropped.' => 'วิวถูกลบแล้ว.',
 	'View has been altered.' => 'วิวถูกเปลี่ยนแปลงแล้ว.',
 	'View has been created.' => 'วิวถูกสร้างแล้ว.',
@@ -191,6 +189,7 @@ $translations = array(
 	'Clone' => 'ทำซ้ำ',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'จำนวนสูงสุดของฟิลด์อนุญาตให้เกิน กรุณาเพิ่มอีก %s.',
 	'Partition by' => 'พาร์ทิชันโดย',
+	'Partition' => null,
 	'Partitions' => 'พาร์ทิชัน',
 	'Partition name' => 'ชื่อของพาร์ทิชัน',
 	'Values' => 'ค่า',
@@ -225,6 +224,7 @@ $translations = array(
 	'Permanent login' => 'จดจำการเข้าสู่ระบบตลอดไป',
 	'Databases have been dropped.' => 'ฐานข้อมูลถูกลบแล้ว.',
 	'Search data in tables' => 'ค้นหาในตาราง',
+	'as a regular expression' => null,
 	'Schema' => 'Schema',
 	'Alter schema' => 'เปลี่ยนแปลง schema',
 	'Create schema' => 'สร้าง schema',
@@ -266,4 +266,54 @@ $translations = array(
 	'Permanent link' => 'ลิงค์ถาวร',
 	'Edit all' => 'แก้ไขทั้งหมด',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/tr.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Sunucu',
 	'Username' => 'Kullanıcı',
@@ -12,8 +11,7 @@ $translations = array(
 	'Logout' => 'Çıkış',
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
 	'Logout successful.' => 'Oturum başarıyla sonlandı.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Adminer kullandığınız için teşekkür ederiz <a href="https://www.adminer.org/en/donation/">bağış yapmayı düşünün</a>.',
-	'Invalid credentials.' => 'Geçersiz kimlik bilgileri.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Çok fazla oturum açma denemesi yapıldı.', '%d Dakika sonra tekrar deneyiniz.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ana şifrenin süresi doldu. Kalıcı olması için <a href="https://www.adminer.org/en/extension/"%s>%s medodunu</a> kullanın.',
 	'Language' => 'Dil',
@@ -58,7 +56,7 @@ $translations = array(
 	'ATTACH queries are not supported.' => 'ATTACH sorguları desteklenmiyor.',
 	'Execute' => 'Çalıştır',
 	'Stop on error' => 'Hata oluşursa dur',
-	'Show only errors' => 'Sadece hataları göster',
+	'Show only errors' => 'Sadece hataları göster.',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
 	'History' => 'Geçmiş',
@@ -173,7 +171,6 @@ $translations = array(
 	'Options' => 'Seçenekler',
 	'Comment' => 'Yorum',
 	'Default value' => 'Varsayılan değer',
-	'Default values' => 'Varsayılan değerler',
 	'Drop' => 'Sil',
 	'Drop %s?' => 'Sil %s?',
 	'Are you sure?' => 'Emin misiniz?',
@@ -185,6 +182,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'İzin verilen en fazla alan sayısı aşıldı. Lütfen %s değerlerini artırın.',
 
 	'Partition by' => 'Bununla bölümle',
+	'Partition' => null,
 	'Partitions' => 'Bölümler',
 	'Partition name' => 'Bölüm adı',
 	'Values' => 'Değerler',
@@ -202,7 +200,7 @@ $translations = array(
 	'Alter indexes' => 'İndeksleri değiştir',
 	'Add next' => 'Bundan sonra ekle',
 	'Index Type' => 'İndex Türü',
-	'length' => 'uzunluğu',
+	'Column (length)' => 'Kolon (uzunluğu)',
 
 	'Foreign keys' => 'Dış anahtarlar',
 	'Foreign key' => 'Dış anahtar',
@@ -225,7 +223,7 @@ $translations = array(
 	'Trigger has been dropped.' => 'Tetik silindi.',
 	'Trigger has been altered.' => 'Tetik değiştirildi.',
 	'Trigger has been created.' => 'Tetik oluşturuldu.',
-	'Alter trigger' => 'Tetiği değiştir',
+	'Alter trigger' => 'Tetiği değiştir.',
 	'Create trigger' => 'Tetik oluştur',
 	'Time' => 'Zaman',
 	'Event' => 'Olay',
@@ -239,6 +237,7 @@ $translations = array(
 	'Search' => 'Ara',
 	'anywhere' => 'hiçbir yerde',
 	'Search data in tables' => 'Tablolarda veri ara',
+	'as a regular expression' => null,
 	'Sort' => 'Sırala',
 	'descending' => 'Azalan',
 	'Limit' => 'Limit',
@@ -341,4 +340,25 @@ $translations = array(
 	'Type has been dropped.' => 'Tür silindi.',
 	'Type has been created.' => 'Tür oluşturuldu.',
 	'Alter type' => 'Türü değiştir',
+
+	'overwrite' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Evet',
+	'No' => 'Hayır',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/uk.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Система Бази Даних',
 	'Server' => 'Сервер',
 	'Username' => 'Користувач',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Вийти',
 	'Logged as: %s' => 'Ви увійшли як: %s',
 	'Logout successful.' => 'Ви вдало вийшли з системи.',
-	'Invalid credentials.' => 'Неправильні дані входу.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Мова',
 	'Invalid CSRF token. Send the form again.' => 'Недійсний CSRF токен. Надішліть форму ще раз.',
 	'No extension' => 'Нема розширень',
@@ -159,7 +158,6 @@ $translations = array(
 	'Auto Increment' => 'Автоматичне збільшення',
 	'Options' => 'Опції',
 	'Comment' => 'Коментарі',
-	'Default values' => 'Значення за замовчуванням',
 	'Drop' => 'Видалити',
 	'Are you sure?' => 'Ви впевнені?',
 	'Move up' => 'Пересунути вгору',
@@ -168,6 +166,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
 
 	'Partition by' => 'Розділити по',
+	'Partition' => null,
 	'Partitions' => 'Розділи',
 	'Partition name' => 'Назва розділу',
 	'Values' => 'Значення',
@@ -184,7 +183,7 @@ $translations = array(
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
-	'length' => 'довжина',
+	'Column (length)' => 'Стовпець (довжина)',
 
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
@@ -221,6 +220,7 @@ $translations = array(
 	'Search' => 'Пошук',
 	'anywhere' => 'будь-де',
 	'Search data in tables' => 'Шукати дані в таблицях',
+	'as a regular expression' => null,
 	'Sort' => 'Сортувати',
 	'descending' => 'по спаданню',
 	'Limit' => 'Обмеження',
@@ -330,7 +330,6 @@ $translations = array(
 	'Default value' => 'Значення за замовчуванням',
 	'Full table scan' => 'Повне сканування таблиці',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилину.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилини.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилин.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Дякуємо, що користуєтесь Adminer, подумайте про <a href="https://www.adminer.org/en/donation/">внесок</a>.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Термін дії майстер пароля минув. <a href="https://www.adminer.org/en/extension/"%s>Реалізуйте</a> метод %s, щоб зробити його постійним.',
 	'The action will be performed after successful login with the same credentials.' => 'Дія буде виконуватися після успішного входу в систему з тими ж обліковими даними.',
 	'Connecting to privileged ports is not allowed.' => 'Підключення до привілейованих портів заборонено.',
@@ -344,4 +343,22 @@ $translations = array(
 	'Saving' => 'Збереження',
 	'Unknown error.' => 'Невідома помилка.',
 	'Database does not support password.' => 'База даних не підтримує пароль.',
+
+	'Vacuum' => null,
+	'%d / ' => array(),
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Так',
+	'No' => 'Ні',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/vi.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => 'Hệ thống',
 	'Server' => 'Máy chủ',
 	'Username' => 'Tên người dùng',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logout' => 'Thoát',
 	'Logged as: %s' => 'Vào dưới tên: %s',
 	'Logout successful.' => 'Đã thoát xong.',
-	'Invalid credentials.' => 'Tài khoản sai.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Bạn gõ sai tài khoản quá nhiều lần, hãy thử lại sau %d phút nữa.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="https://www.adminer.org/en/extension/"%s>Thử cách làm</a> để giữ cố định.',
 	'Language' => 'Ngôn ngữ',
@@ -61,7 +60,7 @@ $translations = array(
 
 	'File upload' => 'Tải tệp lên',
 	'From server' => 'Dùng tệp trên máy chủ',
-	'Webserver file %s' => 'Tệp trên máy chủ %s',
+	'Webserver file %s' => 'Tệp trên máy chủ',
 	'Run file' => 'Chạy tệp',
 	'File does not exist.' => 'Tệp không tồn tại.',
 	'File uploads are disabled.' => 'Chức năng tải tệp lên đã bị cấm.',
@@ -162,7 +161,6 @@ $translations = array(
 	'Auto Increment' => 'Tăng tự động',
 	'Options' => 'Tuỳ chọn',
 	'Comment' => 'Chú thích',
-	'Default values' => 'Giá trị mặc định',
 	'Drop' => 'Xoá',
 	'Are you sure?' => 'Bạn có chắc',
 	'Size' => 'Kích thước',
@@ -173,6 +171,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Thiết lập %s cần tăng thêm. (Đã vượt giới hạnố trường tối đa cho phép trong một biểu mẫu).',
 
 	'Partition by' => 'Phân chia bằng',
+	'Partition' => null,
 	'Partitions' => 'Phân hoạch',
 	'Partition name' => 'Tên phân hoạch',
 	'Values' => 'Giá trị',
@@ -189,7 +188,7 @@ $translations = array(
 	'Alter indexes' => 'Sửa chỉ mục',
 	'Add next' => 'Thêm tiếp',
 	'Index Type' => 'Loại chỉ mục',
-	'length' => 'độ dài',
+	'Column (length)' => 'Cột (độ dài)',
 
 	'Foreign keys' => 'Các khoá ngoại',
 	'Foreign key' => 'Khoá ngoại',
@@ -226,6 +225,7 @@ $translations = array(
 	'Search' => 'Tìm kiếm',
 	'anywhere' => 'bất cứ đâu',
 	'Search data in tables' => 'Tìm kiếm dữ liệu trong các bảng',
+	'as a regular expression' => null,
 	'Sort' => 'Sắp xếp',
 	'descending' => 'giảm dần',
 	'Limit' => 'Giới hạn',
@@ -326,4 +326,38 @@ $translations = array(
 	'Type has been dropped.' => 'Đã xoá kiểu.',
 	'Type has been created.' => 'Đã tạo kiểu.',
 	'Alter type' => 'Sửa kiểu dữ liệu',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You are offline.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Có',
+	'No' => 'Không',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/xx.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => 'Xx',
 	'System' => 'Xx',
 	'Server' => 'Xx',
 	'Username' => 'Xx',
@@ -12,18 +11,18 @@ $translations = array(
 	'Logout' => 'Xx',
 	'Logged as: %s' => 'Xx: %s',
 	'Logout successful.' => 'Xx.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Xx <a href="https://www.adminer.org/en/donation/">xx</a>.',
-	'Invalid credentials.' => 'Xx.',
+	'Invalid server or credentials.' => 'Xx.',
 	'There is a space in the input password which might be the cause.' => 'Xx.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Xx, <a href="https://www.adminer.org/en/password/"%s>xx</a>.',
 	'Database does not support password.' => 'Xx.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx %d.', 'Xx %d.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Xx. <a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s xx.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '<a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s xx.',
 	'Language' => 'Xx',
 	'Invalid CSRF token. Send the form again.' => 'Xx.',
 	'If you did not send this request from Adminer then close this page.' => 'Xx.',
+	'No driver' => 'Xx',
+	'Database driver not found.' => 'Xx.',
 	'No extension' => 'Xx',
-	// %s contains the list of the extensions, e.g. 'mysqli, PDO_MySQL'
 	'None of the supported PHP extensions (%s) are available.' => 'Xx (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Xx.',
 	'Disable %s or enable %s or %s extensions.' => 'Xx %s xx %s xx %s xx.',
@@ -34,7 +33,7 @@ $translations = array(
 	'Refresh' => 'Xx',
 
 	// text direction - 'ltr' or 'rtl'
-	'ltr' => 'ltr',
+	'ltr' => 'xx',
 
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
@@ -180,7 +179,6 @@ $translations = array(
 	'Options' => 'Xx',
 	'Comment' => 'Xx',
 	'Default value' => 'Xx',
-	'Default values' => 'Xx',
 	'Drop' => 'Xx',
 	'Drop %s?' => 'Xx %s?',
 	'Are you sure?' => 'Xx?',
@@ -192,6 +190,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
 
 	'Partition by' => 'Xx',
+	'Partition' => 'Xx',
 	'Partitions' => 'Xx',
 	'Partition name' => 'Xx',
 	'Values' => 'Xx',
@@ -209,7 +208,7 @@ $translations = array(
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
-	'length' => 'xx',
+	'Column (length)' => 'Xx',
 
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
@@ -246,6 +245,7 @@ $translations = array(
 	'Search' => 'Xx',
 	'anywhere' => 'xx',
 	'Search data in tables' => 'Xx',
+	'as a regular expression' => 'xx',
 	'Sort' => 'Xx',
 	'descending' => 'xx',
 	'Limit' => 'Xx',
@@ -255,7 +255,6 @@ $translations = array(
 	'Full table scan' => 'Xx',
 	'Unable to select the table' => 'Xx',
 	'No rows.' => 'Xx.',
-	// used in SQL query limit and it is followed by another number, e.g. '10 / 50 rows' meaning 10 of 50 rows
 	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d xx', '%d xx'),
 	'Page' => 'Xx',
@@ -274,7 +273,7 @@ $translations = array(
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
 
-	// %s can contain auto-increment value, e.g. ' 123'
+	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
 	'Item has been updated.' => 'Xx.',
@@ -327,12 +326,15 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Xx %s.',
 
 	// PostgreSQL and MS SQL schema support
+	'Schema' => 'Xx',
+	'Schemas' => 'Xx',
+	'No schemas.' => 'Xx.',
+	'Show schema' => 'Xx',
 	'Alter schema' => 'Xx',
 	'Create schema' => 'Xx',
 	'Schema has been dropped.' => 'Xx.',
 	'Schema has been created.' => 'Xx.',
 	'Schema has been altered.' => 'Xx.',
-	'Schema' => 'Xx',
 	'Invalid schema.' => 'Xx.',
 
 	// PostgreSQL sequences support
@@ -350,11 +352,12 @@ $translations = array(
 	'Type has been created.' => 'Xx.',
 	'Alter type' => 'Xx',
 
-	// Table check constraints
-	'Checks' => 'Xx',
-	'Create check' => 'Xx',
-	'Alter check' => 'Xx',
-	'Check has been created.' => 'Xx.',
-	'Check has been altered.' => 'Xx.',
-	'Check has been dropped.' => 'Xx.',
+	// Plugins
+	'Columns' => 'Xx',
+	'Nullable' => 'Xx',
+	'Default' => 'Xx',
+	'Yes' => 'Xx',
+	'No' => 'Xx',
+	'One Time Password' => 'Xx',
+	'Invalid OTP code.' => 'Xx.',
 );

adminer/lang/zh-tw.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => '資料庫系統',
 	'Server' => '伺服器',
 	'Username' => '帳號',
@@ -12,10 +11,9 @@ $translations = array(
 	'Logout' => '登出',
 	'Logged as: %s' => '登錄為： %s',
 	'Logout successful.' => '成功登出。',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>。',
-	'Invalid credentials.' => '無效的憑證。',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => '您輸入的密碼中有一個空格，這可能是導致問題的原因。',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>.',
 	'Database does not support password.' => '資料庫不支援密碼。',
 	'Too many unsuccessful logins, try again in %d minute(s).' => '登錄失敗次數過多，請 %d 分鐘後重試。',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密碼已過期。<a href="https://www.adminer.org/en/extension/"%s>請擴展</a> %s 方法讓它永久化。',
@@ -47,7 +45,7 @@ $translations = array(
 	'Revoke' => '廢除',
 
 	'Process list' => '處理程序列表',
-	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止。',
+	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
 
 	'Variables' => '變數',
@@ -74,10 +72,10 @@ $translations = array(
 	'From server' => '從伺服器',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
 	'Run file' => '執行檔案',
-	'File does not exist.' => '檔案不存在。',
+	'File does not exist.' => '檔案不存在',
 	'File uploads are disabled.' => '檔案上傳已經被停用。',
 	'Unable to upload a file.' => '無法上傳檔案。',
-	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為 %sB。',
+	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為 %sB',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
 	'You can upload a big SQL file via FTP and import it from server.' => '您可以通過FTP上傳大型SQL檔並從伺服器導入。',
 	'You are offline.' => '您離線了。',
@@ -128,11 +126,11 @@ $translations = array(
 	'Move' => '轉移',
 	'Tables have been moved.' => '已轉移資料表。',
 	'Copy' => '複製',
-	'Tables have been copied.' => '資料表已經複製。',
+	'Tables have been copied.' => '資料表已經複製',
 	'overwrite' => '覆蓋',
 
 	'Routines' => '程序',
-	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響。',
+	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
 	'Parameter name' => '參數名稱',
 	'Create procedure' => '建立預存程序',
@@ -179,7 +177,6 @@ $translations = array(
 	'Options' => '選項',
 	'Comment' => '註解',
 	'Default value' => '預設值',
-	'Default values' => '預設值',
 	'Drop' => '刪除',
 	'Drop %s?' => '刪除 %s?',
 	'Are you sure?' => '你確定嗎？',
@@ -191,6 +188,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加 %s。',
 
 	'Partition by' => '分區類型',
+	'Partition' => null,
 	'Partitions' => '分區',
 	'Partition name' => '分區名稱',
 	'Values' => '值',
@@ -208,7 +206,7 @@ $translations = array(
 	'Alter indexes' => '修改索引',
 	'Add next' => '新增下一筆',
 	'Index Type' => '索引類型',
-	'length' => '長度',
+	'Column (length)' => '欄位（長度）',
 
 	'Foreign keys' => '外來鍵',
 	'Foreign key' => '外來鍵',
@@ -245,6 +243,7 @@ $translations = array(
 	'Search' => '搜尋',
 	'anywhere' => '任意位置',
 	'Search data in tables' => '在資料庫搜尋',
+	'as a regular expression' => null,
 	'Sort' => '排序',
 	'descending' => '降冪 (遞減)',
 	'Limit' => '限定',
@@ -274,7 +273,7 @@ $translations = array(
 
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '已新增項目 %s。',
-	'Item has been deleted.' => '該項目已被刪除。',
+	'Item has been deleted.' => '該項目已被刪除',
 	'Item has been updated.' => '已更新項目。',
 	'%d item(s) have been affected.' => '%d 個項目受到影響。',
 	'New item' => '新增項目',
@@ -347,4 +346,19 @@ $translations = array(
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
 	'Alter type' => '修改類型',
+
+	// Plugins
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/lang/zh.inc.php

@@ -1,8 +1,7 @@
 <?php
-namespace Adminer;
-
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
+	'Home' => null,
 	'System' => '系统',
 	'Server' => '服务器',
 	'Username' => '用户名',
@@ -12,10 +11,9 @@ $translations = array(
 	'Logout' => '登出',
 	'Logged as: %s' => '登录用户：%s',
 	'Logout successful.' => '成功登出。',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>。',
-	'Invalid credentials.' => '无效凭据。',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => '您输入的密码中有一个空格，这可能是导致问题的原因。',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>.',
 	'Database does not support password.' => '数据库不支持密码。',
 	'Too many unsuccessful logins, try again in %d minute(s).' => '登录失败次数过多，请 %d 分钟后重试。',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密码已过期。<a href="https://www.adminer.org/en/extension/"%s>请扩展</a> %s 方法让它永久化。',
@@ -47,7 +45,7 @@ $translations = array(
 	'Revoke' => '废除',
 
 	'Process list' => '进程列表',
-	'%d process(es) have been killed.' => '%d 个进程被终止。',
+	'%d process(es) have been killed.' => '%d 个进程被终止',
 	'Kill' => '终止',
 
 	'Variables' => '变量',
@@ -179,7 +177,6 @@ $translations = array(
 	'Options' => '选项',
 	'Comment' => '注释',
 	'Default value' => '默认值',
-	'Default values' => '默认值',
 	'Drop' => '删除',
 	'Drop %s?' => '删除 %s?',
 	'Are you sure?' => '您确定吗？',
@@ -191,6 +188,7 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超过最多允许的字段数量。请增加 %s。',
 
 	'Partition by' => '分区类型',
+	'Partition' => null,
 	'Partitions' => '分区',
 	'Partition name' => '分区名',
 	'Values' => '值',
@@ -208,7 +206,7 @@ $translations = array(
 	'Alter indexes' => '修改索引',
 	'Add next' => '下一行插入',
 	'Index Type' => '索引类型',
-	// 'Column (length)' => '列（长度）',
+	'Column (length)' => '列（长度）',
 
 	'Foreign keys' => '外键',
 	'Foreign key' => '外键',
@@ -245,6 +243,7 @@ $translations = array(
 	'Search' => '搜索',
 	'anywhere' => '任意位置',
 	'Search data in tables' => '在表中搜索数据',
+	'as a regular expression' => null,
 	'Sort' => '排序',
 	'descending' => '降序',
 	'Limit' => '范围',
@@ -347,4 +346,18 @@ $translations = array(
 	'Type has been dropped.' => '已删除类型。',
 	'Type has been created.' => '已创建类型。',
 	'Alter type' => '修改类型',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+
+	'Schemas' => null,
+	'No schemas.' => null,
+	'Show schema' => null,
+	'No driver' => null,
+	'Database driver not found.' => null,
 );

adminer/plugin.php

@@ -20,15 +20,17 @@ function adminer_object() {
 		new AdminerDumpXml,
 		new AdminerDumpAlter,
 		//~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
+		//~ new AdminerEditCalendar(script_src("../externals/jquery-ui/jquery-1.4.4.js") . script_src("../externals/jquery-ui/ui/jquery.ui.core.js") . script_src("../externals/jquery-ui/ui/jquery.ui.widget.js") . script_src("../externals/jquery-ui/ui/jquery.ui.datepicker.js") . script_src("../externals/jquery-ui/ui/jquery.ui.mouse.js") . script_src("../externals/jquery-ui/ui/jquery.ui.slider.js") . script_src("../externals/jquery-timepicker/jquery-ui-timepicker-addon.js") . "<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
 		//~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
+		//~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
 		new AdminerFileUpload(""),
 		new AdminerJsonColumn,
 		new AdminerSlugify,
 		new AdminerTranslation,
 		new AdminerForeignSystem,
 		new AdminerEnumOption,
-		new AdminerTablesFilter,
 		new AdminerEditForeign,
+		new AdminerLoginSsl(["TrustServerCertificate" => true]),
 	);
 
 	/* It is possible to combine customization and plugins:

adminer/privileges.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 page_header(lang('Privileges'));
 
 echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
@@ -16,15 +14,15 @@ echo "<form action=''><p>\n";
 hidden_fields_get();
 echo "<input type='hidden' name='db' value='" . h(DB) . "'>\n";
 echo ($grant ? "" : "<input type='hidden' name='grant' value=''>\n");
-echo "<table class='odds'>\n";
+echo "<table>\n";
 echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th></thead>\n";
 
 while ($row = $result->fetch_assoc()) {
-	echo '<tr><td>' . h($row["User"]) . "<td>" . h($row["Host"]) . '<td><a href="' . h(ME . 'user=' . urlencode($row["User"]) . '&host=' . urlencode($row["Host"])) . '">' . lang('Edit') . "</a>\n";
+	echo '<tr' . odd() . '><td>' . h($row["User"]) . "<td>" . h($row["Host"]) . '<td><a href="' . h(ME . 'user=' . urlencode($row["User"]) . '&host=' . urlencode($row["Host"])) . '">' . lang('Edit') . "</a>\n";
 }
 
 if (!$grant || DB != "") {
-	echo "<tr><td><input name='user' autocapitalize='off'><td><input name='host' value='localhost' autocapitalize='off'><td><input type='submit' value='" . lang('Edit') . "'>\n";
+	echo "<tr" . odd() . "><td><input name='user' autocapitalize='off'><td><input name='host' value='localhost' autocapitalize='off'><td><input type='submit' value='" . lang('Edit') . "'>\n";
 }
 
 echo "</table>\n";

adminer/procedure.inc.php

@@ -1,7 +1,5 @@
 <?php
-namespace Adminer;
-
-$PROCEDURE = ($_GET["name"] ?: $_GET["procedure"]);
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
 $row["fields"] = (array) $row["fields"];
@@ -34,7 +32,6 @@ if (!$_POST && $PROCEDURE != "") {
 $collations = get_vals("SHOW CHARACTER SET");
 sort($collations);
 $routine_languages = routine_languages();
-echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</datalist>" : "");
 ?>
 
 <form action="" method="post" id="form">
@@ -42,12 +39,17 @@ echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</
 <?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <div class="scrollable">
-<table class="nowrap">
+<table cellspacing="0" class="nowrap" id="edit-fields">
 <?php
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
-	echo "<tr><td>" . lang('Return type');
-	edit_type("returns", $row["returns"], $collations, array(), (JUSH == "pgsql" ? array("void", "trigger") : array()));
+	echo "<tbody><tr>",
+		(support("move_col") ? "<th></th>" : ""),
+		"<th>", lang('Return type'), "</th>";
+
+	edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
+
+	echo "<td></td></tr></tbody>\n";
 }
 ?>
 </table>
@@ -56,8 +58,6 @@ if (isset($_GET["function"])) {
 <p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($PROCEDURE != "") { ?>
-<input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?>
-<?php } ?>
+<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/processlist.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 if (support("kill")) {
 	if ($_POST && !$error) {
 		$killed = 0;
@@ -18,12 +16,13 @@ page_header(lang('Process list'), $error);
 
 <form action="" method="post">
 <div class="scrollable">
-<table class="nowrap checkable odds">
+<table cellspacing="0" class="nowrap checkable">
 <?php
 echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 // HTML valid because there is always at least one process
 $i = -1;
 foreach (process_list() as $i => $row) {
+
 	if (!$i) {
 		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>" : "");
 		foreach ($row as $key => $val) {
@@ -35,13 +34,13 @@ foreach (process_list() as $i => $row) {
 		}
 		echo "</thead>\n";
 	}
-	echo "<tr>" . (support("kill") ? "<td>" . checkbox("kill[]", $row[JUSH == "sql" ? "Id" : "pid"], 0) : "");
+	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
 	foreach ($row as $key => $val) {
 		echo "<td>" . (
-			(JUSH == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
-			(JUSH == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
-			(JUSH == "oracle" && $key == "sql_text" && $val != "")
-			? "<code class='jush-" . JUSH . "'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
+			($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
+			($jush == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
+			($jush == "oracle" && $key == "sql_text" && $val != "")
+			? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
 			: h($val)
 		);
 	}

adminer/schema.inc.php

@@ -1,11 +1,9 @@
 <?php
-namespace Adminer;
-
 page_header(lang('Database schema'), "", array(), h(DB . ($_GET["ns"] ? ".$_GET[ns]" : "")));
 
 $table_pos = array();
 $table_pos_js = array();
-$SCHEMA = ($_GET["schema"] ?: $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
+$SCHEMA = ($_GET["schema"] ? $_GET["schema"] : $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
 preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $SCHEMA, $matches, PREG_SET_ORDER);
 foreach ($matches as $i => $match) {
 	$table_pos[$match[1]] = array($match[2], $match[3]);
@@ -28,7 +26,7 @@ foreach (table_status('', true) as $table => $table_status) {
 		$field["pos"] = $pos;
 		$schema[$table]["fields"][$name] = $field;
 	}
-	$schema[$table]["pos"] = ($table_pos[$table] ?: array($top, 0));
+	$schema[$table]["pos"] = ($table_pos[$table] ? $table_pos[$table] : array($top, 0));
 	foreach ($adminer->foreignKeys($table) as $val) {
 		if (!$val["db"]) {
 			$left = $base_left;
@@ -52,9 +50,9 @@ foreach (table_status('', true) as $table => $table_status) {
 ?>
 <div id="schema" style="height: <?php echo $top; ?>em;">
 <script<?php echo nonce(); ?>>
-qs('#schema').onselectstart = function () { return false; };
+gid('schema').onselectstart = function () { return false; };
 var tablePos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
-var em = qs('#schema').offsetHeight / <?php echo $top; ?>;
+var em = gid('schema').offsetHeight / <?php echo $top; ?>;
 document.onmousemove = schemaMousemove;
 document.onmouseup = partialArg(schemaMouseup, '<?php echo js_escape(DB); ?>');
 </script>
@@ -84,10 +82,7 @@ foreach ($schema as $name => $table) {
 			$left1 = $left - $table_pos[$name][1];
 			$i = 0;
 			foreach ($columns as $target) {
-				echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'>"
-					. "<div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div>"
-					. "</div>"
-				;
+				echo "\n<div class='references' title='" . h($target_name) . "' id='refd$left-" . ($i++) . "' style='left: $left1" . "em; top: " . $table["fields"][$target]["pos"] . "em; height: 1.25em; background: url(../adminer/static/arrow.gif) no-repeat right center;'><div style='height: .5em; border-bottom: 1px solid Gray; width: " . (-$left1) . "em;'></div></div>";
 			}
 		}
 	}

adminer/scheme.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 $row = $_POST;
 
 if ($_POST && !$error) {
@@ -28,7 +26,8 @@ if (!$row) {
 ?>
 
 <form action="" method="post">
-<p><input name="name" autofocus value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php echo script("focus(gid('name'));"); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {

adminer/script.inc.php

@@ -1,6 +1,4 @@
 <?php
-namespace Adminer;
-
 header("Content-Type: text/javascript; charset=utf-8");
 
 if ($_GET["script"] == "db") {
@@ -14,12 +12,10 @@ if ($_GET["script"] == "db") {
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = format_number($table_status[$key]);
-					if ($val >= 0) {
-						json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == (JUSH == "pgsql" ? "table" : "InnoDB")
-							? "~ $val"
-							: $val
-						));
-					}
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
+						? "~ $val"
+						: $val
+					));
 					if (isset($sums[$key])) {
 						// ignore innodb_file_per_table because it is not active for tables created before it was enabled
 						$sums[$key] += ($table_status["Engine"] != "InnoDB" || $key != "Data_free" ? $table_status[$key] : 0);