Release 4.8.1

Minor ca translation corrections

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: jakubvrana
+custom: ["https://sourceforge.net/p/adminer/donate/"]

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '20 16 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitmodules

@@ -1,9 +1,12 @@
 [submodule "jush"]
 	path = externals/jush
-	url = git://git.code.sf.net/p/jush/git
-[submodule "wymeditor"]
-	path = externals/wymeditor
-	url = git://github.com/wymeditor/wymeditor.git
+	url = git://github.com/vrana/jush
 [submodule "JsShrink"]
 	path = externals/JsShrink
-	url = git://github.com/vrana/JsShrink.git
+	url = git://github.com/vrana/JsShrink
+[submodule "designs/hydra"]
+	path = designs/hydra
+	url = https://github.com/Niyko/Hydra-Dark-Theme-for-Adminer
+[submodule "designs/pepa-linha-dark"]
+	path = designs/pepa-linha-dark
+	url = https://github.com/pepa-linha/Adminer-Design-Dark/

.travis.yml

@@ -1,5 +1,9 @@
 language: php
 php:
-  - '5.6'
-  - '7.1'
+  - 5.6
+  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
 script: git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.php$' | xargs -n1 -P8 php -l | grep -v 'No syntax errors'; test $? -eq 1

Makefile

@@ -0,0 +1,39 @@
+ROOT_DIRECTORY = $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
+PHP := $(shell which php)
+PORT := 8000
+
+
+.DEFAULT_GOAL := default
+
+
+.PHONY: default
+default: compile
+
+.PHONY: compile
+compile:
+	$(PHP) $(ROOT_DIRECTORY)/compile.php
+
+.PHONY: server
+server:
+	php \
+	  --server 127.0.0.1:$(PORT) \
+	  --docroot $(ROOT_DIRECTORY)
+
+.PHONY: initialize
+initialize:
+	git \
+	  -C $(ROOT_DIRECTORY) \
+	  submodule \
+	  update \
+	  --init \
+	  --recursive
+
+.PHONY: clean
+clean:
+	rm \
+	  --recursive \
+	  --force \
+	  $(ROOT_DIRECTORY)/adminer.php
+
+.PHONY: clean.all
+clean.all: clean

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+I support only the last published version and the last development version (last commit).
+
+## Reporting a Vulnerability
+
+To report a vulnerability, create a private bug at https://sourceforge.net/p/adminer/bugs-and-features/new/?private=1.
+
+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.

adminer/call.inc.php

@@ -48,7 +48,9 @@ if (!$error && $_POST) {
 			if (is_object($result)) {
 				select($result, $connection2);
 			} else {
-				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $affected) . "\n";
+				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $affected)
+					. " <span class='time'>" . @date("H:i:s") . "</span>\n" // @ - time zone may be not set
+				;
 			}
 		} while ($connection->next_result());
 		
@@ -62,7 +64,7 @@ if (!$error && $_POST) {
 <form action="" method="post">
 <?php
 if ($in) {
-	echo "<table cellspacing='0'>\n";
+	echo "<table cellspacing='0' class='layout'>\n";
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];

adminer/create.inc.php

@@ -27,6 +27,10 @@ if ($row["auto_increment_col"]) {
 	$row["fields"][$row["auto_increment_col"]]["auto_increment"] = true;
 }
 
+if ($_POST) {
+	set_adminer_settings(array("comments" => $_POST["comments"], "defaults" => $_POST["defaults"]));
+}
+
 if ($_POST && !process_fields($row["fields"]) && !$error) {
 	if ($_POST["drop"]) {
 		queries_redirect(substr(ME, 0, -1), lang('Table has been dropped.'), drop_tables(array($TABLE)));
@@ -50,7 +54,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 				}
 				$process_field = process_field($field, $type_field);
 				$all_fields[] = array($field["orig"], $process_field, $after);
-				if ($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;
@@ -162,7 +166,7 @@ foreach ($engines as $engine) {
 <form action="" method="post" id="form">
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
-<?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?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(qs('#form')['name']);"); } ?>
 <?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
  <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
@@ -170,28 +174,20 @@ foreach ($engines as $engine) {
 <?php } ?>
 
 <?php if (support("columns")) { ?>
+<div class="scrollable">
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
-$comments = ($_POST ? $_POST["comments"] : $row["Comment"] != "");
-if (!$_POST && !$comments) {
-	foreach ($row["fields"] as $field) {
-		if ($field["comment"] != "") {
-			$comments = true;
-			break;
-		}
-	}
-}
-edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
+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" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
-<?php echo checkbox("defaults", 1, true, lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
-<?php if (!$_POST["defaults"]) { echo script("editingHideDefaults();"); } ?>
+<?php echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : adminer_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
 <?php echo (support("comment")
-	? "<label><input type='checkbox' name='comments' value='1' class='jsonly'" . ($comments ? " checked" : "") . ">" . lang('Comment') . "</label>"
-		. script("qsl('input').onclick = function () { columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus(); };")
-		. ' <input name="Comment" id="Comment" value="' . h($row["Comment"]) . '" maxlength="' . (min_version(5.5) ? 2048 : 60) . '"' . ($comments ? '' : ' class="hidden"') . '>'
+	? checkbox("comments", 1, ($_POST ? $_POST["comments"] : adminer_setting("comments")), lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
+		. ' <input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '">'
 	: '')
 ; ?>
 <p>

adminer/database.inc.php

@@ -47,7 +47,7 @@ if ($_POST) {
 } elseif ($jush == "sql") {
 	// propose database name with limited privileges
 	foreach (get_vals("SHOW GRANTS") as $grant) {
-		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\\.\\*)?~', $grant, $match) && $match[1]) {
+		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\.\*)?~', $grant, $match) && $match[1]) {
 			$name = stripcslashes(idf_unescape("`$match[2]`"));
 			break;
 		}
@@ -60,7 +60,7 @@ if ($_POST) {
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
 	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input name="name" id="name" value="' . h($name) . '" maxlength="64" autocapitalize="off">'
+	: '<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/",

adminer/db.inc.php

@@ -65,7 +65,7 @@ if ($adminer->homepage()) {
 					search_tables();
 				}
 			}
-			$doc_link = doc_link(array('sql' => 'show-table-status.html'));
+			echo "<div class='scrollable'>\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">';
@@ -73,17 +73,17 @@ if ($adminer->homepage()) {
 			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/'));
-			echo '<td>' . lang('Data Length') . $doc_link;
-			echo '<td>' . lang('Index Length') . $doc_link;
-			echo '<td>' . lang('Data Free') . $doc_link;
+			echo '<td>' . lang('Data Length') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-admin.html#FUNCTIONS-ADMIN-DBOBJECT', 'oracle' => 'REFRN20286'));
+			echo '<td>' . lang('Index Length') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-admin.html#FUNCTIONS-ADMIN-DBOBJECT'));
+			echo '<td>' . lang('Data Free') . doc_link(array('sql' => 'show-table-status.html'));
 			echo '<td>' . lang('Auto Increment') . doc_link(array('sql' => 'example-auto-increment.html', 'mariadb' => 'auto_increment/'));
-			echo '<td>' . lang('Rows') . $doc_link;
-			echo (support("comment") ? '<td>' . lang('Comment') . $doc_link : '');
+			echo '<td>' . lang('Rows') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'catalog-pg-class.html#CATALOG-PG-CLASS', 'oracle' => 'REFRN20286'));
+			echo (support("comment") ? '<td>' . lang('Comment') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-info.html#FUNCTIONS-INFO-COMMENT-TABLE')) : '');
 			echo "</thead>\n";
 
 			$tables = 0;
 			foreach ($tables_list as $name => $type) {
-				$view = ($type !== null && !preg_match('~table~i', $type));
+				$view = ($type !== null && !preg_match('~table|sequence~i', $type));
 				$id = h("Table-" . $name);
 				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));
@@ -104,23 +104,24 @@ if ($adminer->homepage()) {
 						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>"
 							: "<span$id>?</span>"
-						) : "<td id='$key-" . h($name) . "'>&nbsp;");
+						) : "<td id='$key-" . h($name) . "'>");
 					}
 					$tables++;
 				}
-				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>&nbsp;" : "");
+				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>" : "");
 			}
 
-			echo "<tr><td>&nbsp;<th>" . lang('%d in total', count($tables_list));
-			echo "<td>" . nbsp($jush == "sql" ? $connection->result("SELECT @@storage_engine") : "");
-			echo "<td>" . nbsp(db_collation(DB, collations()));
+			echo "<tr><td><th>" . lang('%d in total', count($tables_list));
+			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'>&nbsp;";
+				echo "<td align='right' id='sum-$key'>";
 			}
 
 			echo "</table>\n";
+			echo "</div>\n";
 			if (!information_schema(DB)) {
-				echo "<div class='footer'>\n";
+				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'");
 				echo "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>"
@@ -138,14 +139,14 @@ if ($adminer->homepage()) {
 					echo "<p>" . lang('Move to other database') . ": ";
 					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
 					echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
-					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
+					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'> " . checkbox("overwrite", 1, $_POST["overwrite"], lang('overwrite')) : "");
 					echo "\n";
 				}
 				echo "<input type='hidden' name='all' value=''>"; // used by trCheck()
 				echo script("qsl('input').onclick = function () { selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked(this, /^tables\[/) || $tables);" : "") . " }");
 				echo "<input type='hidden' name='token' value='$token'>\n";
 				echo "</div></fieldset>\n";
-				echo "</div>\n";
+				echo "</div></div>\n";
 			}
 			echo "</form>\n";
 			echo script("tableCheck();");
@@ -159,7 +160,7 @@ if ($adminer->homepage()) {
 			$routines = routines();
 			if ($routines) {
 				echo "<table cellspacing='0'>\n";
-				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td>&nbsp;</thead>\n";
+				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td></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

adminer/drivers/elastic.inc.php

@@ -2,12 +2,11 @@
 $drivers["elastic"] = "Elasticsearch (beta)";
 
 if (isset($_GET["elastic"])) {
-	$possible_drivers = array("json");
 	define("DRIVER", "elastic");
 
-	if (function_exists('json_decode')) {
+	if (function_exists('json_decode') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
-			var $extension = "JSON", $server_info, $errno, $error, $_url;
+			var $extension = "JSON", $server_info, $errno, $error, $_url, $_db;
 
 			/** Performs query
 			 * @param string
@@ -28,7 +27,7 @@ if (isset($_GET["elastic"])) {
 					return $file;
 				}
 				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-					$this->error = $file;
+					$this->error = lang('Invalid credentials.') . " $http_response_header[0]";
 					return false;
 				}
 				$return = json_decode($file, true);
@@ -84,7 +83,7 @@ if (isset($_GET["elastic"])) {
 			var $num_rows, $_rows;
 
 			function __construct($rows) {
-				$this->num_rows = count($this->_rows);
+				$this->num_rows = count($rows);
 				$this->_rows = $rows;
 				reset($this->_rows);
 			}
@@ -129,7 +128,7 @@ if (isset($_GET["elastic"])) {
 				}
 			}
 			foreach ($where as $val) {
-				list($col,$op,$val) = explode(" ",$val,3);
+				list($col, $op, $val) = explode(" ", $val, 3);
 				if ($col == "_id") {
 					$data["query"]["ids"]["values"][] = $val;
 				}
@@ -148,7 +147,7 @@ if (isset($_GET["elastic"])) {
 			$start = microtime(true);
 			$search = $this->_conn->query($query, $data);
 			if ($print) {
-				echo $adminer->selectQuery("$query: " . print_r($data, true), $start, !$search);
+				echo $adminer->selectQuery("$query: " . json_encode($data), $start, !$search);
 			}
 			if (!$search) {
 				return false;
@@ -177,7 +176,8 @@ if (isset($_GET["elastic"])) {
 			return new Min_Result($return);
 		}
 
-		function update($type, $record, $queryWhere) {
+		function update($type, $record, $queryWhere, $limit = 0, $separator = "\n") {
+			//! use $limit
 			$parts = preg_split('~ *= *~', $queryWhere);
 			if (count($parts) == 2) {
 				$id = trim($parts[1]);
@@ -195,7 +195,8 @@ if (isset($_GET["elastic"])) {
 			return $response['created'];
 		}
 
-		function delete($type, $queryWhere) {
+		function delete($type, $queryWhere, $limit = 0) {
+			//! use $limit
 			$ids = array();
 			if (is_array($_GET["where"]) && $_GET["where"]["_id"]) {
 				$ids[] = $_GET["where"]["_id"];
@@ -225,8 +226,11 @@ if (isset($_GET["elastic"])) {
 	function connect() {
 		global $adminer;
 		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
-		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
+		list($server, $username, $password) = $adminer->credentials();
+		if ($password != "" && $connection->connect($server, $username, "")) {
+			return lang('Database does not support password.');
+		}
+		if ($connection->connect($server, $username, $password)) {
 			return $connection;
 		}
 		return $connection->error;
@@ -279,6 +283,11 @@ if (isset($_GET["elastic"])) {
 
 	function tables_list() {
 		global $connection;
+
+		if (min_version(6)) {
+			return array('_doc' => 'table');
+		}
+
 		$return = $connection->query('_mapping');
 		if ($return) {
 			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
@@ -334,25 +343,35 @@ if (isset($_GET["elastic"])) {
 
 	function fields($table) {
 		global $connection;
-		$result = $connection->query("$table/_mapping");
-		$return = array();
-		if ($result) {
-			$mappings = $result[$table]['properties'];
-			if (!$mappings) {
-				$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+
+		$mappings = array();
+		if (min_version(6)) {
+			$result = $connection->query("_mapping");
+			if ($result) {
+				$mappings = $result[$connection->_db]['mappings']['properties'];
 			}
-			if ($mappings) {
-				foreach ($mappings as $name => $field) {
-					$return[$name] = array(
-						"field" => $name,
-						"full_type" => $field["type"],
-						"type" => $field["type"],
-						"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
-					);
-					if ($field["properties"]) { // only leaf fields can be edited
-						unset($return[$name]["privileges"]["insert"]);
-						unset($return[$name]["privileges"]["update"]);
-					}
+		} else {
+			$result = $connection->query("$table/_mapping");
+			if ($result) {
+				$mappings = $result[$table]['properties'];
+				if (!$mappings) {
+					$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+				}
+			}
+		}
+
+		$return = array();
+		if ($mappings) {
+			foreach ($mappings as $name => $field) {
+				$return[$name] = array(
+					"field" => $name,
+					"full_type" => $field["type"],
+					"type" => $field["type"],
+					"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				);
+				if ($field["properties"]) { // only leaf fields can be edited
+					unset($return[$name]["privileges"]["insert"]);
+					unset($return[$name]["privileges"]["update"]);
 				}
 			}
 		}
@@ -441,20 +460,27 @@ if (isset($_GET["elastic"])) {
 		return $connection->last_id;
 	}
 
-	$jush = "elastic";
-	$operators = array("=", "query");
-	$functions = array();
-	$grouping = array();
-	$edit_functions = array(array("json"));
-	$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
-	$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
-	foreach (array(
-		lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
-		lang('Date and time') => array("date" => 10),
-		lang('Strings') => array("string" => 65535, "text" => 65535),
-		lang('Binary') => array("binary" => 255),
-	) as $key => $val) {
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array(
+			lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
+			lang('Date and time') => array("date" => 10),
+			lang('Strings') => array("string" => 65535, "text" => 65535),
+			lang('Binary') => array("binary" => 255),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("json + allow_url_fopen"),
+			'jush' => "elastic",
+			'operators' => array("=", "query"),
+			'functions' => array(),
+			'grouping' => array(),
+			'edit_functions' => array(array("json")),
+			'types' => $types,
+			'structured_types' => $structured_types,
+		);
 	}
 }

adminer/drivers/mongo.inc.php

@@ -1,31 +1,27 @@
 <?php
-$drivers["mongo"] = "MongoDB (beta)";
+$drivers["mongo"] = "MongoDB (alpha)";
 
 if (isset($_GET["mongo"])) {
-	$possible_drivers = array("mongo", "mongodb");
 	define("DRIVER", "mongo");
 
 	if (class_exists('MongoDB')) {
 		class Min_DB {
-			var $extension = "Mongo", $error, $last_id, $_link, $_db;
+			var $extension = "Mongo", $server_info = MongoClient::VERSION, $error, $last_id, $_link, $_db;
 
-			function connect($server, $username, $password) {
-				global $adminer;
-				$db = $adminer->database();
-				$options = array();
-				if ($username != "") {
-					$options["username"] = $username;
-					$options["password"] = $password;
-				}
-				if ($db != "") {
-					$options["db"] = $db;
-				}
+			function connect($uri, $options) {
 				try {
-					$this->_link = @new MongoClient("mongodb://$server", $options);
-					return true;
-				} catch (Exception $ex) {
-					$this->error = $ex->getMessage();
-					return false;
+					$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();
 				}
 			}
 			
@@ -46,7 +42,6 @@ if (isset($_GET["mongo"])) {
 			function quote($string) {
 				return $string;
 			}
-
 		}
 
 		class Min_Result {
@@ -60,10 +55,10 @@ if (isset($_GET["mongo"])) {
 							$this->_charset[$key] = 63;
 						}
 						$row[$key] =
-							(is_a($val, 'MongoId') ? 'ObjectId("' . strval($val) . '")' :
+							(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') ? strval($val) :
+							(is_a($val, 'MongoRegex') ? "$val" :
 							(is_object($val) ? get_class($val) : // MongoMinKey, MongoMaxKey
 							$val
 						)))));
@@ -214,28 +209,34 @@ if (isset($_GET["mongo"])) {
 
 	} elseif (class_exists('MongoDB\Driver\Manager')) {
 		class Min_DB {
-			var $extension = "MongoDB", $error, $last_id;
+			var $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
 			/** @var MongoDB\Driver\Manager */
 			var $_link;
 			var $_db, $_db_name;
 
-			function connect($server, $username, $password) {
-				global $adminer;
-				$db = $adminer->database();
-				$options = array();
-				if ($username != "") {
-					$options["username"] = $username;
-					$options["password"] = $password;
-				}
-				if ($db != "") {
-					$options["db"] = $db;
-				}
+			function connect($uri, $options) {
+				$class = 'MongoDB\Driver\Manager';
+				$this->_link = new $class($uri, $options);
+				$this->executeCommand('admin', array('ping' => 1));
+			}
+			
+			function executeCommand($db, $command) {
+				$class = 'MongoDB\Driver\Command';
 				try {
-					$class = 'MongoDB\Driver\Manager';
-					$this->_link = new $class("mongodb://$server", $options);
+					return $this->_link->executeCommand($db, new $class($command));
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
+					return array();
+				}
+			}
+			
+			function executeBulkWrite($namespace, $bulk, $counter) {
+				try {
+					$results = $this->_link->executeBulkWrite($namespace, $bulk);
+					$this->affected_rows = $results->$counter();
 					return true;
-				} catch (Exception $ex) {
-					$this->error = $ex->getMessage();
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
 					return false;
 				}
 			}
@@ -245,19 +246,13 @@ if (isset($_GET["mongo"])) {
 			}
 
 			function select_db($database) {
-				try {
-					$this->_db_name = $database;
-					return true;
-				} catch (Exception $ex) {
-					$this->error = $ex->getMessage();
-					return false;
-				}
+				$this->_db_name = $database;
+				return true;
 			}
 
 			function quote($string) {
 				return $string;
 			}
-
 		}
 
 		class Min_Result {
@@ -271,13 +266,13 @@ if (isset($_GET["mongo"])) {
 							$this->_charset[$key] = 63;
 						}
 						$row[$key] =
-							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . strval($val) . '")' :
-								(is_a($val, 'MongoDB\BSON\UTCDatetime') ? $val->toDateTime()->format('Y-m-d H:i:s') :
-									(is_a($val, 'MongoDB\BSON\Binary') ? $val->bin : //! allow downloading
-										(is_a($val, 'MongoDB\BSON\Regex') ? strval($val) :
-											(is_object($val) ? json_encode($val, 256) : // 256 = JSON_UNESCAPED_UNICODE
-												$val // MongoMinKey, MongoMaxKey
-											)))));
+							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . "$val\")" :
+							(is_a($val, 'MongoDB\BSON\UTCDatetime') ? $val->toDateTime()->format('Y-m-d H:i:s') :
+							(is_a($val, 'MongoDB\BSON\Binary') ? $val->getData() : //! allow downloading
+							(is_a($val, 'MongoDB\BSON\Regex') ? "$val" :
+							(is_object($val) || is_array($val) ? json_encode($val, 256) : // 256 = JSON_UNESCAPED_UNICODE
+							$val // MongoMinKey, MongoMaxKey
+						)))));
 					}
 					$this->_rows[] = $row;
 					foreach ($row as $key => $val) {
@@ -286,7 +281,7 @@ if (isset($_GET["mongo"])) {
 						}
 					}
 				}
-				$this->num_rows = $result->count;
+				$this->num_rows = count($this->_rows);
 			}
 
 			function fetch_assoc() {
@@ -346,9 +341,12 @@ if (isset($_GET["mongo"])) {
 				$limit = min(200, max(1, (int) $limit));
 				$skip = $page * $limit;
 				$class = 'MongoDB\Driver\Query';
-				$query = new $class($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort));
-				$results = $connection->_link->executeQuery("$connection->_db_name.$table", $query);
-				return new Min_Result($results);
+				try {
+					return new Min_Result($connection->_link->executeQuery("$connection->_db_name.$table", new $class($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") {
@@ -372,9 +370,7 @@ if (isset($_GET["mongo"])) {
 					$update['$unset'] = $removeFields;
 				}
 				$bulk->update($where, $update, array('upsert' => false));
-				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
-				$connection->affected_rows = $results->getModifiedCount();
-				return true;
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
 			}
 
 			function delete($table, $queryWhere, $limit = 0) {
@@ -384,9 +380,7 @@ if (isset($_GET["mongo"])) {
 				$class = 'MongoDB\Driver\BulkWrite';
 				$bulk = new $class(array());
 				$bulk->delete($where, array('limit' => $limit));
-				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
-				$connection->affected_rows = $results->getDeletedCount();
-				return true;
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
 			}
 
 			function insert($table, $set) {
@@ -394,24 +388,18 @@ if (isset($_GET["mongo"])) {
 				$db = $connection->_db_name;
 				$class = 'MongoDB\Driver\BulkWrite';
 				$bulk = new $class(array());
-				if (isset($set['_id']) && empty($set['_id'])) {
+				if ($set['_id'] == '') {
 					unset($set['_id']);
 				}
 				$bulk->insert($set);
-				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
-				$connection->affected_rows = $results->getInsertedCount();
-				return true;
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
 			}
 		}
 
 		function get_databases($flush) {
-			/** @var $connection Min_DB */
 			global $connection;
 			$return = array();
-			$class = 'MongoDB\Driver\Command';
-			$command = new $class(array('listDatabases' => 1));
-			$results = $connection->_link->executeCommand('admin', $command);
-			foreach ($results as $dbs) {
+			foreach ($connection->executeCommand('admin', array('listDatabases' => 1)) as $dbs) {
 				foreach ($dbs->databases as $db) {
 					$return[] = $db->name;
 				}
@@ -426,11 +414,8 @@ if (isset($_GET["mongo"])) {
 
 		function tables_list() {
 			global $connection;
-			$class = 'MongoDB\Driver\Command';
-			$command = new $class(array('listCollections' => 1));
-			$results = $connection->_link->executeCommand($connection->_db_name, $command);
 			$collections = array();
-			foreach ($results as $result) {
+			foreach ($connection->executeCommand($connection->_db_name, array('listCollections' => 1)) as $result) {
 				$collections[$result->name] = 'table';
 			}
 			return $collections;
@@ -443,10 +428,7 @@ if (isset($_GET["mongo"])) {
 		function indexes($table, $connection2 = null) {
 			global $connection;
 			$return = array();
-			$class = 'MongoDB\Driver\Command';
-			$command = new $class(array('listIndexes' => $table));
-			$results = $connection->_link->executeCommand($connection->_db_name, $command);
-			foreach ($results 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) {
@@ -464,24 +446,26 @@ if (isset($_GET["mongo"])) {
 		}
 
 		function fields($table) {
+			global $driver;
 			$fields = fields_from_edit();
-			if (!count($fields)) {
-				global $driver;
+			if (!$fields) {
 				$result = $driver->select($table, array("*"), null, null, array(), 10);
-				while ($row = $result->fetch_assoc()) {
-					foreach ($row as $key => $val) {
-						$row[$key] = null;
-						$fields[$key] = array(
-							"field" => $key,
-							"type" => "string",
-							"null" => ($key != $driver->primary),
-							"auto_increment" => ($key == $driver->primary),
-							"privileges" => array(
-								"insert" => 1,
-								"select" => 1,
-								"update" => 1,
-							),
-						);
+				if ($result) {
+					while ($row = $result->fetch_assoc()) {
+						foreach ($row as $key => $val) {
+							$row[$key] = null;
+							$fields[$key] = array(
+								"field" => $key,
+								"type" => "string",
+								"null" => ($key != $driver->primary),
+								"auto_increment" => ($key == $driver->primary),
+								"privileges" => array(
+									"insert" => 1,
+									"select" => 1,
+									"update" => 1,
+								),
+							);
+						}
 					}
 				}
 			}
@@ -491,16 +475,12 @@ if (isset($_GET["mongo"])) {
 		function found_rows($table_status, $where) {
 			global $connection;
 			$where = where_to_query($where);
-			$class = 'MongoDB\Driver\Command';
-			$command = new $class(array('count' => $table_status['Name'], 'query' => $where));
-			$results = $connection->_link->executeCommand($connection->_db_name, $command);
-			$toArray = $results->toArray();
+			$toArray = $connection->executeCommand($connection->_db_name, array('count' => $table_status['Name'], 'query' => $where))->toArray();
 			return $toArray[0]->n;
 		}
 
 		function sql_query_where_parser($queryWhere) {
-			$queryWhere = trim(preg_replace('/WHERE[\s]?[(]?\(?/', '', $queryWhere));
-			$queryWhere = preg_replace('/\)\)\)$/', ')', $queryWhere);
+			$queryWhere = preg_replace('~^\sWHERE \(?\(?(.+?)\)?\)?$~', '\1', $queryWhere);
 			$wheres = explode(' AND ', $queryWhere);
 			$wheresOr = explode(') OR (', $queryWhere);
 			$where = array();
@@ -516,19 +496,17 @@ if (isset($_GET["mongo"])) {
 		}
 
 		function where_to_query($whereAnd = array(), $whereOr = array()) {
-			global $operators;
+			global $adminer;
 			$data = array();
 			foreach (array('and' => $whereAnd, 'or' => $whereOr) as $type => $where) {
 				if (is_array($where)) {
 					foreach ($where as $expression) {
 						list($col, $op, $val) = explode(" ", $expression, 3);
-						if ($col == "_id") {
-							$val = str_replace('MongoDB\BSON\ObjectID("', "", $val);
-							$val = str_replace('")', "", $val);
-							$class = 'MongoDB\BSON\ObjectID';
+						if ($col == "_id" && preg_match('~^(MongoDB\\\\BSON\\\\ObjectID)\("(.+)"\)$~', $val, $match)) {
+							list(, $class, $val) = $match;
 							$val = new $class($val);
 						}
-						if (!in_array($op, $operators)) {
+						if (!in_array($op, $adminer->operators)) {
 							continue;
 						}
 						if (preg_match('~^\(f\)(.+)~', $op, $match)) {
@@ -563,7 +541,7 @@ if (isset($_GET["mongo"])) {
 								$op = '$regex';
 								break;
 							default:
-								continue;
+								continue 2;
 						}
 						if ($type == 'and') {
 							$data['$and'][] = array($col => array($op => $val));
@@ -597,6 +575,7 @@ if (isset($_GET["mongo"])) {
 			"(date)>=",
 			"(date)<=",
 		);
+	
 	}
 
 	function table($idf) {
@@ -618,6 +597,10 @@ if (isset($_GET["mongo"])) {
 		return $return;
 	}
 
+	function create_database($db, $collation) {
+		return true;
+	}
+
 	function last_id() {
 		global $connection;
 		return $connection->last_id;
@@ -641,11 +624,24 @@ if (isset($_GET["mongo"])) {
 	function connect() {
 		global $adminer;
 		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
-		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
-			return $connection;
+		list($server, $username, $password) = $adminer->credentials();
+		$options = array();
+		if ($username . $password != "") {
+			$options["username"] = $username;
+			$options["password"] = $password;
 		}
-		return $connection->error;
+		$db = $adminer->database();
+		if ($db != "") {
+			$options["db"] = $db;
+		}
+		if (($auth_source = getenv("MONGO_AUTH_SOURCE"))) {
+			$options["authSource"] = $auth_source;
+		}
+		$connection->connect("mongodb://$server", $options);
+		if ($connection->error) {
+			return $connection->error;
+		}
+		return $connection;
 	}
 
 	function alter_indexes($table, $alter) {
@@ -675,7 +671,7 @@ if (isset($_GET["mongo"])) {
 	}
 
 	function support($feature) {
-		return preg_match("~database|indexes~", $feature);
+		return preg_match("~database|indexes|descidx~", $feature);
 	}
 
 	function db_collation($db, $collations) {
@@ -735,8 +731,15 @@ if (isset($_GET["mongo"])) {
 		return true;
 	}
 
-	$jush = "mongo";
-	$functions = array();
-	$grouping = array();
-	$edit_functions = array(array("json"));
+	function driver_config() {
+		global $operators;
+		return array(
+			'possible_drivers' => array("mongo", "mongodb"),
+			'jush' => "mongo",
+			'operators' => $operators,
+			'functions' => array(),
+			'grouping' => array(),
+			'edit_functions' => array(array("json")),
+		);
+	}
 }

adminer/drivers/mssql.inc.php

@@ -5,10 +5,9 @@
 * @author Jakub Vrana
 */
 
-$drivers["mssql"] = "MS SQL";
+$drivers["mssql"] = "MS SQL (beta)";
 
 if (isset($_GET["mssql"])) {
-	$possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
 	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
 		class Min_DB {
@@ -24,7 +23,13 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->_link = @sqlsrv_connect($server, array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8"));
+				global $adminer;
+				$db = $adminer->database();
+				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
+				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->server_info = $info['SQLServerVersion'];
@@ -147,8 +152,10 @@ if (isset($_GET["mssql"])) {
 				$this->_link = @mssql_connect($server, $username, $password);
 				if ($this->_link) {
 					$result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')");
-					$row = $result->fetch_row();
-					$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					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();
 				}
@@ -239,7 +246,7 @@ if (isset($_GET["mssql"])) {
 			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);
+				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)), $username, $password);
 				return true;
 			}
 
@@ -342,7 +349,7 @@ if (isset($_GET["mssql"])) {
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT name AS Name, type_desc AS Engine FROM sys.all_objects 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;
 			}
@@ -360,6 +367,7 @@ if (isset($_GET["mssql"])) {
 	}
 
 	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();
 		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
@@ -381,6 +389,7 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 				"collation" => $row["collation_name"],
 				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				"primary" => $row["is_identity"], //! or indexes.is_primary_key
+				"comment" => $comments[$row["name"]],
 			);
 		}
 		return $return;
@@ -406,7 +415,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function view($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))));
+		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() {
@@ -423,7 +432,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function error() {
 		global $connection;
-		return nl_br(h(preg_replace('~^(\\[[^]]*])+~m', '', $connection->error)));
+		return nl_br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
 	}
 
 	function create_database($db, $collation) {
@@ -448,13 +457,16 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
+		$comments = array();
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
 			if (!$val) {
 				$alter["DROP"][] = " COLUMN $column";
 			} else {
-				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", "\\1\\2", $val[1]);
+				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", '\1\2', $val[1]);
+				$comments[$field[0]] = $val[5];
+				unset($val[5]);
 				if ($field[0] == "") {
 					$alter["ADD"][] = "\n  " . implode("", $val) . ($table == "" ? substr($foreign[$val[0]], 16 + strlen($val[0])) : ""); // 16 - strlen("  FOREIGN KEY ()")
 				} else {
@@ -480,6 +492,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 				return false;
 			}
 		}
+		foreach ($comments as $key => $val) {
+			$comment = substr($val, 9); // 9 - strlen(" COMMENT ")
+			queries("EXEC sp_dropextendedproperty @name = N'MS_Description', @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key));
+			queries("EXEC sp_addextendedproperty @name = N'MS_Description', @value = " . $comment . ", @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key));
+		}
 		return true;
 	}
 
@@ -524,6 +541,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		$return = array();
 		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["table"] = $row["PKTABLE_NAME"];
 			$foreign_key["source"][] = $row["FKCOLUMN_NAME"];
 			$foreign_key["target"][] = $row["PKCOLUMN_NAME"];
@@ -561,7 +579,7 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 		); // triggers are not schema-scoped
 		$return = reset($rows);
 		if ($return) {
-			$return["Statement"] = preg_replace('~^.+\\s+AS\\s+~isU', '', $return["text"]); //! identifiers, comments
+			$return["Statement"] = preg_replace('~^.+\s+AS\s+~isU', '', $return["text"]); //! identifiers, comments
 		}
 		return $return;
 	}
@@ -624,31 +642,38 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|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|
 	}
 
-	$jush = "mssql";
-	$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);
+	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"),
+			'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" => "+",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
-	$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/mysql.inc.php

@@ -2,7 +2,6 @@
 $drivers = array("server" => "MySQL") + $drivers;
 
 if (!defined("DRIVER")) {
-	$possible_drivers = array("MySQLi", "MySQL", "PDO_MySQL");
 	define("DRIVER", "server"); // server - backwards compatibility
 	// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
 	if (extension_loaded("mysqli")) {
@@ -30,6 +29,7 @@ if (!defined("DRIVER")) {
 					(!is_numeric($port) ? $port : $socket),
 					($ssl ? 64 : 0) // 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
+				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
 			}
 
@@ -56,7 +56,7 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-	} elseif (extension_loaded("mysql") && !(ini_get("sql.safe_mode") && extension_loaded("pdo_mysql"))) {
+	} elseif (extension_loaded("mysql") && !((ini_bool("sql.safe_mode") || ini_bool("mysql.allow_local_infile")) && extension_loaded("pdo_mysql"))) {
 		class Min_DB {
 			var
 				$extension = "MySQL", ///< @var string extension name
@@ -74,6 +74,10 @@ if (!defined("DRIVER")) {
 			* @return bool
 			*/
 			function connect($server, $username, $password) {
+				if (ini_bool("mysql.allow_local_infile")) {
+					$this->error = lang('Disable %s or enable %s or %s extensions.', "'mysql.allow_local_infile'", "MySQLi", "PDO_MySQL");
+					return false;
+				}
 				$this->_link = @mysql_connect(
 					($server != "" ? $server : ini_get("mysql.default_host")),
 					("$server$username" != "" ? $username : ini_get("mysql.default_user")),
@@ -230,17 +234,21 @@ if (!defined("DRIVER")) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-				$options = array();
+				$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
 				$ssl = $adminer->connectSsl();
 				if ($ssl) {
-					$options = array(
-						PDO::MYSQL_ATTR_SSL_KEY => $ssl['key'],
-						PDO::MYSQL_ATTR_SSL_CERT => $ssl['cert'],
-						PDO::MYSQL_ATTR_SSL_CA => $ssl['ca'],
-					);
+					if (!empty($ssl['key'])) {
+						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+					}
+					if (!empty($ssl['cert'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+					}
+					if (!empty($ssl['ca'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
+					}
 				}
 				$this->dsn(
-					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)),
+					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)),
 					$username,
 					$password,
 					$options
@@ -258,7 +266,7 @@ if (!defined("DRIVER")) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$this->setAttribute(1000, !$unbuffered); // 1000 - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
+				$this->pdo->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
 				return parent::query($query, $unbuffered);
 			}
 		}
@@ -298,8 +306,18 @@ if (!defined("DRIVER")) {
 			return queries($prefix . implode(",\n", $values) . $suffix);
 		}
 		
+		function slowQuery($query, $timeout) {
+			if (min_version('5.7.8', '10.1.2')) {
+				if (preg_match('~MariaDB~', $this->_conn->server_info)) {
+					return "SET STATEMENT max_statement_time=$timeout FOR $query";
+				} elseif (preg_match('~^(SELECT\b)(.+)~is', $query, $match)) {
+					return "$match[1] /*+ MAX_EXECUTION_TIME(" . ($timeout * 1000) . ") */ $match[2]";
+				}
+			}
+		}
+
 		function convertSearch($idf, $val, $field) {
-			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"])
+			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val'])
 				? "CONVERT($idf USING " . charset($this->_conn) . ")"
 				: $idf
 			);
@@ -376,7 +394,7 @@ if (!defined("DRIVER")) {
 		$return = get_session("dbs");
 		if ($return === null) {
 			$query = (min_version(5)
-				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA"
+				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"
 				: "SHOW DATABASES"
 			); // SHOW DATABASES can be disabled by skip_show_database
 			$return = ($flush ? slow_query($query) : get_vals($query));
@@ -484,7 +502,7 @@ if (!defined("DRIVER")) {
 		) as $row) {
 			if ($row["Engine"] == "InnoDB") {
 				// ignore internal comment, unnecessary since MySQL 5.1.21
-				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["Comment"]);
+				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\1', $row["Comment"]);
 			}
 			if (!isset($row["Engine"])) {
 				$row["Comment"] = "";
@@ -521,14 +539,14 @@ if (!defined("DRIVER")) {
 	function fields($table) {
 		$return = array();
 		foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
-			preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
+			preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
 			$return[$row["Field"]] = array(
 				"field" => $row["Field"],
 				"full_type" => $row["Type"],
 				"type" => $match[1],
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? $row["Default"] : null),
+				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? (preg_match('~text~', $match[1]) ? stripslashes(preg_replace("~^'(.*)'\$~", '\1', $row["Default"])) : $row["Default"]) : null),
 				"null" => ($row["Null"] == "YES"),
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
 				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
@@ -536,6 +554,8 @@ if (!defined("DRIVER")) {
 				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
 				"comment" => $row["Comment"],
 				"primary" => ($row["Key"] == "PRI"),
+				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
+				"generated" => preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $row["Extra"]),
 			);
 		}
 		return $return;
@@ -564,7 +584,7 @@ if (!defined("DRIVER")) {
 	*/
 	function foreign_keys($table) {
 		global $connection, $on_actions;
-		static $pattern = '`(?:[^`]|``)+`';
+		static $pattern = '(?:`(?:[^`]|``)+`|"(?:[^"]|"")+")';
 		$return = array();
 		$create_table = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if ($create_table) {
@@ -591,7 +611,7 @@ if (!defined("DRIVER")) {
 	*/
 	function view($name) {
 		global $connection;
-		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\\s+AS\\s+~isU', '', $connection->result("SHOW CREATE VIEW " . table($name), 1)));
+		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\s+AS\s+~isU', '', $connection->result("SHOW CREATE VIEW " . table($name), 1)));
 	}
 
 	/** Get sorted grouped list of collations
@@ -658,17 +678,17 @@ if (!defined("DRIVER")) {
 	function rename_database($name, $collation) {
 		$return = false;
 		if (create_database($name, $collation)) {
-			//! move triggers
-			$rename = array();
+			$tables = array();
+			$views = array();
 			foreach (tables_list() as $table => $type) {
-				$rename[] = table($table) . " TO " . idf_escape($name) . "." . table($table);
+				if ($type == 'VIEW') {
+					$views[] = $table;
+				} else {
+					$tables[] = $table;
+				}
 			}
-			$return = (!$rename || queries("RENAME TABLE " . implode(", ", $rename)));
-			if ($return) {
-				queries("DROP DATABASE " . idf_escape(DB));
-			}
-			restart_session();
-			set_session("dbs", null);
+			$return = (!$tables && !$views) || move_tables($tables, $views, $name);
+			drop_databases($return ? array(DB) : array());
 		}
 		return $return;
 	}
@@ -777,12 +797,27 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function move_tables($tables, $views, $target) {
+		global $connection;
 		$rename = array();
-		foreach (array_merge($tables, $views) as $table) { // views will report SQL error
+		foreach ($tables as $table) {
 			$rename[] = table($table) . " TO " . idf_escape($target) . "." . table($table);
 		}
-		return queries("RENAME TABLE " . implode(", ", $rename));
+		if (!$rename || queries("RENAME TABLE " . implode(", ", $rename))) {
+			$definitions = array();
+			foreach ($views as $table) {
+				$definitions[table($table)] = view($table);
+			}
+			$connection->select_db($target);
+			$db = idf_escape(DB);
+			foreach ($definitions as $name => $view) {
+				if (!queries("CREATE VIEW $name AS " . str_replace(" $db.", " ", $view["select"])) || !queries("DROP VIEW $db.$name")) {
+					return false;
+				}
+			}
+			return true;
+		}
 		//! move triggers
+		return false;
 	}
 
 	/** Copy tables to other schema
@@ -795,19 +830,24 @@ if (!defined("DRIVER")) {
 		queries("SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'");
 		foreach ($tables as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
-			if (!queries("\nDROP TABLE IF EXISTS $name")
+			if (($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
 				|| !queries("CREATE TABLE $name LIKE " . table($table))
 				|| !queries("INSERT INTO $name SELECT * FROM " . table($table))
 			) {
 				return false;
 			}
+			foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\"))) as $row) {
+				$trigger = $row["Trigger"];
+				if (!queries("CREATE TRIGGER " . ($target == DB ? idf_escape("copy_$trigger") : idf_escape($target) . "." . idf_escape($trigger)) . " $row[Timing] $row[Event] ON $name FOR EACH ROW\n$row[Statement];")) {
+					return false;
+				}
+			}
 		}
 		foreach ($views as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
 			$view = view($table);
-			if (!queries("DROP VIEW IF EXISTS $name")
-				|| !queries("CREATE VIEW $name AS $view[select]") //! USE to avoid db.table
-			) {
+			if (($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
+				|| !queries("CREATE VIEW $name AS $view[select]")) { //! USE to avoid db.table
 				return false;
 			}
 		}
@@ -865,12 +905,11 @@ if (!defined("DRIVER")) {
 		$fields = array();
 		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
 		foreach ($matches as $param) {
-			$name = str_replace("``", "`", $param[2]) . $param[3];
 			$fields[] = array(
-				"field" => $name,
+				"field" => str_replace("``", "`", $param[2]) . $param[3],
 				"type" => strtolower($param[5]),
 				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
-				"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
+				"unsigned" => strtolower(preg_replace('~\s+~', ' ', trim("$param[8] $param[7]"))),
 				"null" => 1,
 				"full_type" => $param[4],
 				"inout" => strtoupper($param[1]),
@@ -925,7 +964,7 @@ if (!defined("DRIVER")) {
 	* @return Min_Result
 	*/
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN " . (min_version(5.1) ? "PARTITIONS " : "") . $query);
+		return $connection->query("EXPLAIN " . (min_version(5.1) && !min_version(5.7) ? "PARTITIONS " : "") . $query);
 	}
 
 	/** Get approximate number of rows
@@ -960,9 +999,10 @@ if (!defined("DRIVER")) {
 
 	/** Set current schema
 	* @param string
+	* @param Min_DB
 	* @return bool
 	*/
-	function set_schema($schema) {
+	function set_schema($schema, $connection2 = null) {
 		return true;
 	}
 
@@ -976,7 +1016,7 @@ if (!defined("DRIVER")) {
 		global $connection;
 		$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if (!$auto_increment) {
-			$return = preg_replace('~ AUTO_INCREMENT=\\d+~', '', $return); //! skip comments
+			$return = preg_replace('~ AUTO_INCREMENT=\d+~', '', $return); //! skip comments
 		}
 		return $return;
 	}
@@ -1059,60 +1099,80 @@ if (!defined("DRIVER")) {
 			$return = "CONV($return, 2, 10) + 0";
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-			$return = (min_version(8) ? "ST_" : "") . "GeomFromText($return)";
+			$return = (min_version(8) ? "ST_" : "") . "GeomFromText($return, SRID($field[field]))";
 		}
 		return $return;
 	}
 
 	/** Check whether a feature is supported
-	* @param string "comment", "copy", "database", "drop_col", "dump", "event", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
+	* @param string "comment", "copy", "database", "descidx", "drop_col", "dump", "event", "indexes", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
 	* @return bool
 	*/
 	function support($feature) {
-		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(5.1) ? "" : "|event|partitioning" . (min_version(5) ? "" : "|routine|trigger|view")) . "~", $feature);
+		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(8) ? "" : "|descidx" . (min_version(5.1) ? "" : "|event|partitioning" . (min_version(5) ? "" : "|routine|trigger|view"))) . "~", $feature);
 	}
 
+	/** Kill a process
+	* @param int
+	* @return bool
+	*/
 	function kill_process($val) {
 		return queries("KILL " . number($val));
 	}
 
+	/** Return query to get connection ID
+	* @return string
+	*/
 	function connection_id(){
 		return "SELECT CONNECTION_ID()";
 	}
 
+	/** Get maximum number of connections
+	* @return int
+	*/
 	function max_connections() {
 		global $connection;
 		return $connection->result("SELECT @@max_connections");
 	}
 
-	$jush = "sql"; ///< @var string JUSH identifier
-	$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
-	$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
-	foreach (array(
-		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
-		lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
-		lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
-		lang('Lists') => array("enum" => 65535, "set" => 64),
-		lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
-		lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
-	) as $key => $val) {
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	/** Get driver config
+	* @return array array('possible_drivers' => , 'jush' => , 'types' => , 'structured_types' => , 'unsigned' => , 'operators' => , 'functions' => , 'grouping' => , 'edit_functions' => )
+	*/
+	function driver_config() {
+		$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
+		$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
+		foreach (array(
+			lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
+			lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
+			lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
+			lang('Lists') => array("enum" => 65535, "set" => 64),
+			lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
+			lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("MySQLi", "MySQL", "PDO_MySQL"),
+			'jush' => "sql", ///< @var string JUSH identifier
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array("unsigned", "zerofill", "unsigned zerofill"), ///< @var array number variants
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"), ///< @var array operators used in select
+			'functions' => array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
+			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"), ///< @var array grouping functions used in select
+			'edit_functions' => array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
+				array(
+					"char" => "md5/sha1/password/encrypt/uuid",
+					"binary" => "md5/sha1",
+					"date|time" => "now",
+				), array(
+					number_type() => "+/-",
+					"date" => "+ interval/- interval",
+					"time" => "addtime/subtime",
+					"char|text" => "concat",
+				)
+			),
+		);
 	}
-	$unsigned = array("unsigned", "zerofill", "unsigned zerofill"); ///< @var array number variants
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"); ///< @var array operators used in select
-	$functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
-	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"); ///< @var array grouping functions used in select
-	$edit_functions = array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
-		array(
-			"char" => "md5/sha1/password/encrypt/uuid", //! JavaScript for disabling maxlength
-			"binary" => "md5/sha1",
-			"date|time" => "now",
-		), array(
-			number_type() => "+/-",
-			"date" => "+ interval/- interval",
-			"time" => "addtime/subtime",
-			"char|text" => "concat",
-		)
-	);
 }

adminer/drivers/oracle.inc.php

@@ -1,12 +1,12 @@
 <?php
-$drivers["oracle"] = "Oracle";
+$drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-	$possible_drivers = array("OCI8", "PDO_OCI");
 	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
 		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")) {
@@ -32,6 +32,7 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
+				$this->_current_db = $database;
 				return true;
 			}
 
@@ -52,6 +53,7 @@ if (isset($_GET["oracle"])) {
 						return new Min_Result($result);
 					}
 					$this->affected_rows = oci_num_rows($result);
+					oci_free_statement($result);
 				}
 				return $return;
 			}
@@ -119,6 +121,7 @@ if (isset($_GET["oracle"])) {
 	} elseif (extension_loaded("pdo_oci")) {
 		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);
@@ -126,6 +129,7 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
+				$this->_current_db = $database;
 				return true;
 			}
 		}
@@ -142,6 +146,25 @@ if (isset($_GET["oracle"])) {
 			return true; // automatic start
 		}
 
+		function insertUpdate($table, $rows, $primary) {
+			global $connection;
+			foreach ($rows as $set) {
+				$update = array();
+				$where = array();
+				foreach ($set as $key => $val) {
+					$update[] = "$key = $val";
+					if (isset($primary[idf_unescape($key)])) {
+						$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) . ")")
+				)) {
+					return false;
+				}
+			}
+			return true;
+		}
 	}
 
 
@@ -165,7 +188,7 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT tablespace_name FROM user_tablespaces");
+		return get_vals("SELECT tablespace_name FROM user_tablespaces ORDER BY 1");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -193,22 +216,51 @@ if (isset($_GET["oracle"])) {
 		return $connection->result("SELECT USER FROM DUAL");
 	}
 
+	function get_current_db() {
+		global $connection;
+		$db = $connection->_current_db ? $connection->_current_db : DB;
+		unset($connection->_current_db);
+		return $db;
+	}
+
+	function where_owner($prefix, $owner = "owner") {
+		if (!$_GET["ns"]) {
+			return '';
+		}
+		return "$prefix$owner = sys_context('USERENV', 'CURRENT_SCHEMA')";
+	}
+
+	function views_table($columns) {
+		$owner = where_owner('');
+		return "(SELECT $columns FROM all_views WHERE " . ($owner ? $owner : "rownum < 0") . ")";
+	}
+
 	function tables_list() {
-		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "
-UNION SELECT view_name, 'view' FROM user_views
+		$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
+UNION SELECT view_name, 'view' FROM $view
 ORDER BY 1"
 		); //! views don't have schema
 	}
 
 	function count_tables($databases) {
-		return array();
+		global $connection;
+		$return = array();
+		foreach ($databases as $db) {
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM all_tables WHERE tablespace_name = " . q($db));
+		}
+		return $return;
 	}
 
 	function table_status($name = "") {
 		$return = array();
 		$search = q($name);
-		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) . ($name != "" ? " AND table_name = $search" : "") . "
-UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "") . "
+		$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" : "") . "
+UNION SELECT view_name, 'view', 0, 0 FROM $view" . ($name != "" ? " WHERE view_name = $search" : "") . "
 ORDER BY 1"
 		) as $row) {
 			if ($name != "") {
@@ -229,11 +281,12 @@ ORDER BY 1"
 
 	function fields($table) {
 		$return = array();
-		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . " ORDER BY column_id") as $row) {
+		$owner = where_owner(" AND ");
+		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . "$owner ORDER BY column_id") as $row) {
 			$type = $row["DATA_TYPE"];
 			$length = "$row[DATA_PRECISION],$row[DATA_SCALE]";
 			if ($length == ",") {
-				$length = $row["DATA_LENGTH"];
+				$length = $row["CHAR_COL_DECL_LENGTH"];
 			} //! int
 			$return[$row["COLUMN_NAME"]] = array(
 				"field" => $row["COLUMN_NAME"],
@@ -254,22 +307,27 @@ ORDER BY 1"
 
 	function indexes($table, $connection2 = null) {
 		$return = array();
-		foreach (get_rows("SELECT uic.*, uc.constraint_type
-FROM user_ind_columns uic
-LEFT JOIN user_constraints uc ON uic.index_name = uc.constraint_name AND uic.table_name = uc.table_name
-WHERE uic.table_name = " . q($table) . "
-ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
+		$owner = where_owner(" AND ", "aic.table_owner");
+		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) {
 			$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
 			$return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
-			$return[$index_name]["columns"][] = $row["COLUMN_NAME"];
+			$return[$index_name]["columns"][] = $column_name;
 			$return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
-			$return[$index_name]["descs"][] = ($row["DESCEND"] ? '1' : null);
+			$return[$index_name]["descs"][] = ($row["DESCEND"] && $row["DESCEND"] == "DESC" ? '1' : null);
 		}
 		return $return;
 	}
 
 	function view($name) {
-		$rows = get_rows('SELECT text "select" FROM user_views WHERE view_name = ' . q($name));
+		$view = views_table("view_name, text");
+		$rows = get_rows('SELECT text "select" FROM ' . $view . ' WHERE view_name = ' . q($name));
 		return reset($rows);
 	}
 
@@ -294,13 +352,25 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 	function found_rows($table_status, $where) {
 	}
 
+	function auto_increment() {
+		return "";
+	}
+
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = $drop = array();
+		$orig_fields = ($table ? fields($table) : array());
 		foreach ($fields as $field) {
 			$val = $field[1];
 			if ($val && $field[0] != "" && idf_escape($field[0]) != $val[0]) {
 				queries("ALTER TABLE " . table($table) . " RENAME COLUMN " . idf_escape($field[0]) . " TO $val[0]");
 			}
+			$orig_field = $orig_fields[$field[0]];
+			if ($val && $orig_field) {
+				$old = process_field($orig_field, $orig_field);
+				if ($val[2] == $old[2]) {
+					$val[2] = "";
+				}
+			}
 			if ($val) {
 				$alter[] = ($table != "" ? ($field[0] != "" ? "MODIFY (" : "ADD (") : "  ") . implode($val) . ($table != "" ? ")" : ""); //! error with name change only
 			} else {
@@ -316,6 +386,35 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 		;
 	}
 
+	function alter_indexes($table, $alter) {
+		$drop = array();
+		$queries = array();
+		foreach ($alter as $val) {
+			if ($val[0] != "INDEX") {
+				//! descending UNIQUE indexes results in syntax error
+				$val[2] = preg_replace('~ DESC$~', '', $val[2]);
+				$create = ($val[2] == "DROP"
+					? "\nDROP CONSTRAINT " . idf_escape($val[1])
+					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . "(" . implode(", ", $val[2]) . ")"
+				);
+				array_unshift($queries, "ALTER TABLE " . table($table) . $create);
+			} elseif ($val[2] == "DROP") {
+				$drop[] = idf_escape($val[1]);
+			} else {
+				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
+			}
+		}
+		if ($drop) {
+			array_unshift($queries, "DROP INDEX " . implode(", ", $drop));
+		}
+		foreach ($queries as $query) {
+			if (!queries($query)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	function foreign_keys($table) {
 		$return = array();
 		$query = "SELECT c_list.CONSTRAINT_NAME as NAME,
@@ -359,7 +458,8 @@ 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'))");
+		$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 ? $return : get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
 	}
 
 	function get_schema() {
@@ -367,9 +467,12 @@ AND c_src.TABLE_NAME = " . q($table);
 		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
 
-	function set_schema($scheme) {
+	function set_schema($scheme, $connection2 = null) {
 		global $connection;
-		return $connection->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
+		if (!$connection2) {
+			$connection2 = $connection;
+		}
+		return $connection2->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
 	}
 
 	function show_variables() {
@@ -398,33 +501,40 @@ ORDER BY PROCESS
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
+		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view)$~', $feature); //!
 	}
 
-	$jush = "oracle";
-	$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);
+	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"),
+			'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" => "||",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
-	$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

@@ -2,11 +2,10 @@
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-	$possible_drivers = array("PgSQL", "PDO_PgSQL");
 	define("DRIVER", "pgsql");
 	if (extension_loaded("pgsql")) {
 		class Min_DB {
-			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error;
+			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -41,7 +40,7 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function value($val, $field) {
-				return ($field["type"] == "bytea" ? pg_unescape_bytea($val) : $val);
+				return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
 			}
 
 			function quoteBinary($string) {
@@ -69,12 +68,18 @@ if (isset($_GET["pgsql"])) {
 				$this->error = "";
 				if (!$result) {
 					$this->error = pg_last_error($this->_link);
-					return false;
+					$return = false;
 				} elseif (!pg_num_fields($result)) {
 					$this->affected_rows = pg_affected_rows($result);
-					return true;
+					$return = true;
+				} else {
+					$return = new Min_Result($result);
 				}
-				return new Min_Result($result);
+				if ($this->timeout) {
+					$this->timeout = 0;
+					$this->query("RESET statement_timeout");
+				}
+				return $return;
 			}
 
 			function multi_query($query) {
@@ -139,13 +144,12 @@ if (isset($_GET["pgsql"])) {
 
 	} elseif (extension_loaded("pdo_pgsql")) {
 		class Min_DB extends Min_PDO {
-			var $extension = "PDO_PgSQL";
+			var $extension = "PDO_PgSQL", $timeout;
 
 			function connect($server, $username, $password) {
 				global $adminer;
 				$db = $adminer->database();
-				$string = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' options='-c client_encoding=utf8'";
-				$this->dsn("$string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password);
+				$this->dsn("pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password); //! client_encoding is supported since 9.1 but we can't yet use min_version here
 				//! connect without DB in case of an error
 				return true;
 			}
@@ -155,14 +159,19 @@ if (isset($_GET["pgsql"])) {
 				return ($adminer->database() == $database);
 			}
 
-			function value($val, $field) {
-				return $val;
-			}
-
 			function quoteBinary($s) {
 				return q($s);
 			}
 
+			function query($query, $unbuffered = false) {
+				$return = parent::query($query, $unbuffered);
+				if ($this->timeout) {
+					$this->timeout = 0;
+					parent::query("RESET statement_timeout");
+				}
+				return $return;
+			}
+
 			function warnings() {
 				return ''; // not implemented in PDO_PgSQL as of PHP 7.2.1
 			}
@@ -197,17 +206,21 @@ if (isset($_GET["pgsql"])) {
 			return true;
 		}
 
+		function slowQuery($query, $timeout) {
+			$this->_conn->query("SET statement_timeout = " . (1000 * $timeout));
+			$this->_conn->timeout = 1000 * $timeout;
+			return $query;
+		}
+
 		function convertSearch($idf, $val, $field) {
-			return (preg_match('~char|text' . (is_numeric($val["val"]) && !preg_match('~LIKE~', $val["op"]) ? '|' . number_type() : '') . '~', $field["type"])
+			return (preg_match('~char|text'
+					. (!preg_match('~LIKE~', $val["op"]) ? '|date|time(stamp)?|boolean|uuid|' . number_type() : '')
+					. '~', $field["type"])
 				? $idf
 				: "CAST($idf AS text)"
 			);
 		}
 
-		function value($val, $field) {
-			return $this->_conn->value($val, $field);
-		}
-
 		function quoteBinary($s) {
 			return $this->_conn->quoteBinary($s);
 		}
@@ -271,13 +284,13 @@ if (isset($_GET["pgsql"])) {
 	function limit1($table, $query, $where, $separator = "\n") {
 		return (preg_match('~^INTO~', $query)
 			? limit($query, $where, 1, 0, $separator)
-			: " $query WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)"
+			: " $query" . (is_view(table_status1($table)) ? $where : " WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)")
 		);
 	}
 
 	function db_collation($db, $collations) {
 		global $connection;
-		return $connection->result("SHOW LC_COLLATE"); //! respect $db
+		return $connection->result("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
 	}
 
 	function engines() {
@@ -291,7 +304,7 @@ if (isset($_GET["pgsql"])) {
 
 	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'
@@ -309,10 +322,10 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$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\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", 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_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_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')
+WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 " . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
 		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
@@ -334,7 +347,8 @@ WHERE relkind IN ('r', 'm', 'v', 'f')
 			'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, d.adsrc AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment
+
+		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
@@ -357,11 +371,14 @@ ORDER BY a.attnum"
 				$row["type"] = $type;
 				$row["full_type"] = $row["type"] . $length . $addon . $array;
 			}
+			if (in_array($row['attidentity'], array('a', 'd'))) {
+				$row['default'] = 'GENERATED ' . ($row['attidentity'] == 'd' ? 'BY DEFAULT' : 'ALWAYS') . ' AS IDENTITY';
+			}
 			$row["null"] = !$row["attnotnull"];
-			$row["auto_increment"] = preg_match('~^nextval\\(~i', $row["default"]);
+			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
 			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
-			if (preg_match('~(.+)::[^)]+(.*)~', $row["default"], $match)) {
-				$row["default"] = ($match[1] == "NULL" ? null : (($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2]));
+			if (preg_match('~(.+)::[^,)]+(.*)~', $row["default"], $match)) {
+				$row["default"] = ($match[1] == "NULL" ? null : idf_unescape($match[1]) . $match[2]);
 			}
 			$return[$row["field"]] = $row;
 		}
@@ -376,7 +393,7 @@ ORDER BY a.attnum"
 		$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", $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();
@@ -401,12 +418,12 @@ WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS p
 AND contype = 'f'::char
 ORDER BY conkey, conname") as $row) {
 			if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {
-				$row['source'] = 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'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[2]));
-					$row['table'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[4]));
+					$row['ns'] = idf_unescape($match2[2]);
+					$row['table'] = idf_unescape($match2[4]);
 				}
-				$row['target'] = array_map('trim', explode(',', $match[3]));
+				$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;
@@ -415,11 +432,26 @@ ORDER BY conkey, conname") as $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) {
 		global $connection;
-		return array("select" => trim($connection->result("SELECT view_definition
-FROM information_schema.views
-WHERE table_schema = current_schema() AND table_name = " . q($name))));
+		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() {
@@ -434,8 +466,8 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 	function error() {
 		global $connection;
 		$return = h($connection->error);
-		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];
+		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);
 	}
@@ -462,6 +494,9 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		$queries = array();
+		if ($table != "" && $table != $name) {
+			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
+		}
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -470,14 +505,17 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 			} else {
 				$val5 = $val[5];
 				unset($val[5]);
-				if (isset($val[6]) && $field[0] == "") { // auto_increment
-					$val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial";
-				}
 				if ($field[0] == "") {
+					if (isset($val[6])) { // auto_increment
+						$val[1] = ($val[1] == " bigint" ? " big" : ($val[1] == " smallint" ? " small" : " ")) . "serial";
+					}
 					$alter[] = ($table != "" ? "ADD " : "  ") . implode($val);
+					if (isset($val[6])) {
+						$alter[] = ($table != "" ? "ADD" : " ") . " PRIMARY KEY ($val[0])";
+					}
 				} else {
 					if ($column != $val[0]) {
-						$queries[] = "ALTER TABLE " . table($table) . " RENAME $column TO $val[0]";
+						$queries[] = "ALTER TABLE " . table($name) . " RENAME $column TO $val[0]";
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
 					if (!$val[6]) {
@@ -486,7 +524,7 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 					}
 				}
 				if ($field[0] != "" || $val5 != "") {
-					$queries[] = "COMMENT ON COLUMN " . table($table) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
+					$queries[] = "COMMENT ON COLUMN " . table($name) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
 				}
 			}
 		}
@@ -496,9 +534,6 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 		} elseif ($alter) {
 			array_unshift($queries, "ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
 		}
-		if ($table != "" && $table != $name) {
-			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
-		}
 		if ($table != "" || $comment != "") {
 			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
 		}
@@ -573,21 +608,34 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 		return true;
 	}
 
-	function trigger($name, $table = null) {
+	function trigger($name, $table) {
 		if ($name == "") {
 			return array("Statement" => "EXECUTE PROCEDURE ()");
 		}
-		if ($table === null) {
-			$table = $_GET['trigger'];
+		$columns = array();
+		$where = "WHERE trigger_schema = current_schema() AND event_object_table = " . q($table) . " AND trigger_name = " . q($name);
+		foreach (get_rows("SELECT * FROM information_schema.triggered_update_columns $where") as $row) {
+			$columns[] = $row["event_object_column"];
 		}
-		$rows = get_rows('SELECT t.trigger_name AS "Trigger", t.action_timing AS "Timing", (SELECT STRING_AGG(event_manipulation, \' OR \') FROM information_schema.triggers WHERE event_object_table = t.event_object_table AND trigger_name = t.trigger_name ) AS "Events", t.event_manipulation AS "Event", \'FOR EACH \' || t.action_orientation AS "Type", t.action_statement AS "Statement" FROM information_schema.triggers t WHERE t.event_object_table = ' . q($table) . ' AND t.trigger_name = ' . q($name));
-		return reset($rows);
+		$return = array();
+		foreach (get_rows('SELECT trigger_name AS "Trigger", action_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers ' . "$where ORDER BY event_manipulation DESC") as $row) {
+			if ($columns && $row["Event"] == "UPDATE") {
+				$row["Event"] .= " OF";
+			}
+			$row["Of"] = implode(", ", $columns);
+			if ($return) {
+				$row["Event"] .= " OR $return[Event]";
+			}
+			$return = $row;
+		}
+		return $return;
 	}
 
 	function triggers($table) {
 		$return = array();
-		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE event_object_table = " . q($table)) as $row) {
-			$return[$row["trigger_name"]] = array($row["action_timing"], $row["event_manipulation"]);
+		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE trigger_schema = current_schema() AND event_object_table = " . q($table)) as $row) {
+			$trigger = trigger($row["trigger_name"], $table);
+			$return[$trigger["Trigger"]] = array($trigger["Timing"], $trigger["Event"]);
 		}
 		return $return;
 	}
@@ -595,7 +643,7 @@ WHERE table_schema = current_schema() AND table_name = " . q($name))));
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
-			"Event" => array("INSERT", "UPDATE", "DELETE"),
+			"Event" => array("INSERT", "UPDATE", "UPDATE OF", "DELETE", "INSERT OR UPDATE", "INSERT OR UPDATE OF", "DELETE OR INSERT", "DELETE OR UPDATE", "DELETE OR UPDATE OF", "DELETE OR INSERT OR UPDATE", "DELETE OR INSERT OR UPDATE OF"),
 			"Type" => array("FOR EACH ROW", "FOR EACH STATEMENT"),
 		);
 	}
@@ -670,9 +718,12 @@ AND typelem = 0"
 		return $connection->result("SELECT current_schema()");
 	}
 
-	function set_schema($schema) {
+	function set_schema($schema, $connection2 = null) {
 		global $connection, $types, $structured_types;
-		$return = $connection->query("SET search_path TO " . idf_escape($schema));
+		if (!$connection2) {
+			$connection2 = $connection;
+		}
+		$return = $connection2->query("SET search_path TO " . idf_escape($schema));
 		foreach (types() as $type) { //! get types from current_schemas('t')
 			if (!isset($types[$type])) {
 				$types[$type] = 0;
@@ -682,6 +733,23 @@ AND typelem = 0"
 		return $return;
 	}
 
+	// create_sql() produces CREATE TABLE without FK CONSTRAINTs
+	// foreign_keys_sql() produces all FK CONSTRAINTs as ALTER TABLE ... ADD CONSTRAINT
+	// so that all FKs can be added after all tables have been created, avoiding any need to reorder CREATE TABLE statements in order of their FK dependencies
+	function foreign_keys_sql($table) {
+		$return = "";
+
+		$status = table_status($table);
+		$fkeys = foreign_keys($table);
+		ksort($fkeys);
+
+		foreach ($fkeys as $fkey_name => $fkey) {
+			$return .= "ALTER TABLE ONLY " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " ADD CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE') . ";\n";
+		}
+
+		return ($return ? "$return\n" : $return);
+	}
+
 	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = '';
@@ -689,11 +757,14 @@ AND typelem = 0"
 		$sequences = array();
 
 		$status = table_status($table);
+		if (is_view($status)) {
+			$view = view($table);
+			return rtrim("CREATE VIEW " . idf_escape($table) . " AS $view[select]", ";");
+		}
 		$fields = fields($table);
 		$indexes = indexes($table);
 		ksort($indexes);
-		$fkeys = foreign_keys($table);
-		ksort($fkeys);
+		$constraints = constraints($table);
 
 		if (!$status || empty($fields)) {
 			return false;
@@ -704,16 +775,19 @@ AND typelem = 0"
 		// fields' definitions
 		foreach ($fields as $field_name => $field) {
 			$part = idf_escape($field['field']) . ' ' . $field['full_type']
-				. (is_null($field['default']) ? "" : " DEFAULT $field[default]")
+				. default_value($field)
 				. ($field['attnotnull'] ? " NOT NULL" : "");
 			$return_parts[] = $part;
 
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$sq = reset(get_rows("SELECT * FROM $sequence_name"));
-				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE $sequence_name;\n" : "")
-					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value] START " . ($auto_increment ? $sq['last_value'] : 1) . " CACHE $sq[cache_value];";
+				$sq = reset(get_rows(min_version(10)
+					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name)
+					: "SELECT * FROM $sequence_name"
+				));
+				$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]" : "") . " CACHE $sq[cache_value];";
 			}
 		}
 
@@ -730,9 +804,8 @@ AND typelem = 0"
 			}
 		}
 
-		// foreign keys
-		foreach ($fkeys as $fkey_name => $fkey) {
-			$return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+		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') . ");";
@@ -740,7 +813,11 @@ AND typelem = 0"
 		// "basic" indexes after table definition
 		foreach ($indexes as $index_name => $index) {
 			if ($index['type'] == 'INDEX') {
-				$return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', array_map('idf_escape', $index['columns'])) . ");";
+				$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) . ");";
 			}
 		}
 
@@ -767,7 +844,7 @@ AND typelem = 0"
 		$return = "";
 		foreach (triggers($table) as $trg_id => $trg) {
 			$trigger = trigger($trg_id, $status['Name']);
-			$return .= "\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Events] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];;\n";
+			$return .= "\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Event] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];;\n";
 		}
 		return $return;
 	}
@@ -796,7 +873,7 @@ AND typelem = 0"
 	}
 
 	function support($feature) {
-		return preg_match('~^(database|table|columns|sql|indexes|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) {
@@ -812,32 +889,39 @@ AND typelem = 0"
 		return $connection->result("SHOW max_connections");
 	}
 
-	$jush = "pgsql";
-	$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, "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);
+	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, "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
+			'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" => "||",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid SQL injection
-	$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" => "||",
-		)
-	);
 }

adminer/drivers/sqlite.inc.php

@@ -3,7 +3,6 @@ $drivers["sqlite"] = "SQLite 3";
 $drivers["sqlite2"] = "SQLite 2";
 
 if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
-	$possible_drivers = array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite");
 	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
 	if (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
 		if (isset($_GET["sqlite"])) {
@@ -141,7 +140,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					}
 					$return = array();
 					foreach ($row as $key => $val) {
-						$return[($key[0] == '"' ? idf_unescape($key) : $key)] = $val;
+						$return[idf_unescape($key)] = $val;
 					}
 					return $return;
 				}
@@ -152,7 +151,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 				function fetch_field() {
 					$name = $this->_result->fieldName($this->_offset++);
-					$pattern = '(\\[.*]|"(?:[^"]|"")*"|(.+))';
+					$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]));
@@ -191,6 +190,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				if (is_readable($filename) && $this->query("ATTACH " . $this->quote(preg_match("~(^[/\\\\]|:)~", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
 					parent::__construct($filename);
 					$this->query("PRAGMA foreign_keys = 1");
+					$this->query("PRAGMA busy_timeout = 500");
 					return true;
 				}
 				return false;
@@ -240,6 +240,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function connect() {
+		global $adminer;
+		list(, , $password) = $adminer->credentials();
+		if ($password != "") {
+			return lang('Database does not support password.');
+		}
 		return new Min_DB;
 	}
 
@@ -273,7 +278,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') ORDER BY (name = 'sqlite_sequence'), name", 1);
+		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') ORDER BY (name = 'sqlite_sequence'), name");
 	}
 
 	function count_tables($databases) {
@@ -402,7 +407,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 	function view($name) {
 		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 []
+		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() {
@@ -477,6 +482,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	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]) {
@@ -503,16 +509,22 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			if ($table != $name && !queries("ALTER TABLE " . table($table) . " RENAME TO " . table($name))) {
 				return false;
 			}
-		} elseif (!recreate_table($table, $name, $alter, $originals, $foreign)) {
+		} elseif (!recreate_table($table, $name, $alter, $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;
 	}
 
-	function recreate_table($table, $name, $fields, $originals, $foreign, $indexes = array()) {
+	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment, $indexes = array()) {
+		global $connection;
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
@@ -573,12 +585,13 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			$fields[$key] = "  " . implode($field);
 		}
 		$fields = array_merge($fields, array_filter($foreign));
-		if (!queries("CREATE TABLE " . table($table != "" ? "adminer_$name" : $name) . " (\n" . implode(",\n", $fields) . "\n)")) {
+		$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("adminer_$name") . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('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();
@@ -586,12 +599,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				$trigger = trigger($trigger_name);
 				$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
 			}
-			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;
 			}
-			queries("ALTER TABLE " . table("adminer_$name") . " RENAME TO " . table($name));
-			if (!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)) {
@@ -614,7 +630,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function alter_indexes($table, $alter) {
 		foreach ($alter as $primary) {
 			if ($primary[0] == "PRIMARY") {
-				return recreate_table($table, $table, array(), array(), array(), $alter);
+				return recreate_table($table, $table, array(), array(), array(), 0, $alter);
 			}
 		}
 		foreach (array_reverse($alter) as $val) {
@@ -649,7 +665,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
-		$idf = '(?:[^`"\\s]+|`[^`]*`|"[^"]*")+';
+		$idf = '(?:[^`"\s]+|`[^`]*`|"[^"]*")+';
 		$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",
@@ -660,7 +676,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return array(
 			"Timing" => strtoupper($match[1]),
 			"Event" => strtoupper($match[2]) . ($of ? " OF" : ""),
-			"Of" => ($of[0] == '`' || $of[0] == '"' ? idf_unescape($of) : $of),
+			"Of" => idf_unescape($of),
 			"Trigger" => $name,
 			"Statement" => $match[4],
 		);
@@ -670,7 +686,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		$return = array();
 		$trigger_options = trigger_options();
 		foreach (get_rows("SELECT * FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)) as $row) {
-			preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(' . implode("|", $trigger_options["Timing"]) . ')\\s*(.*)\\s+ON\\b~iU', $row["sql"], $match);
+			preg_match('~^CREATE\s+TRIGGER\s*(?:[^`"\s]+|`[^`]*`|"[^"]*")+\s*(' . implode("|", $trigger_options["Timing"]) . ')\s*(.*?)\s+ON\b~i', $row["sql"], $match);
 			$return[$row["name"]] = array($match[1], $match[2]);
 		}
 		return $return;
@@ -765,23 +781,29 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|dump|indexes|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);
 	}
 
-	$jush = "sqlite";
-	$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
-	$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
-	$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" => "||",
-		)
-	);
+	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
+			'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

@@ -14,15 +14,16 @@ if ($_POST && !$error) {
 	$is_sql = preg_match('~sql~', $_POST["format"]);
 
 	if ($is_sql) {
-		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump\n\n";
+		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " " . str_replace("\n", " ", $connection->server_info) . " dump\n\n";
 		if ($jush == "sql") {
 			echo "SET NAMES utf8;
 SET time_zone = '+00:00';
-" . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
-SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+SET foreign_key_checks = 0;
+" . ($_POST["data_style"] ? "SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
 ";
-			$connection->query("SET time_zone = '+00:00';");
+			$connection->query("SET time_zone = '+00:00'");
+			$connection->query("SET sql_mode = ''");
 		}
 	}
 
@@ -105,6 +106,16 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 					}
 				}
 
+				// add FKs after creating tables (except in MySQL which uses SET FOREIGN_KEY_CHECKS=0)
+				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)) {
+							echo foreign_keys_sql($name);
+						}
+					}
+				}
+
 				foreach ($views as $view) {
 					$adminer->dumpTable($view, $_POST["table_style"], 1);
 				}
@@ -126,7 +137,7 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_
 ?>
 
 <form action="" method="post">
-<table cellspacing="0">
+<table cellspacing="0" class="layout">
 <?php
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');

adminer/edit.inc.php

@@ -4,7 +4,7 @@ $fields = fields($TABLE);
 $where = (isset($_GET["select"]) ? ($_POST["check"] && count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
 $update = (isset($_GET["select"]) ? $_POST["edit"] : $where);
 foreach ($fields as $name => $field) {
-	if (!isset($field["privileges"][$update ? "update" : "insert"]) || $adminer->fieldName($field) == "") {
+	if (!isset($field["privileges"][$update ? "update" : "insert"]) || $adminer->fieldName($field) == "" || $field["generated"]) {
 		unset($fields[$name]);
 	}
 }

adminer/event.inc.php

@@ -35,14 +35,14 @@ if (!$row && $EVENT != "") {
 ?>
 
 <form action="" method="post">
-<table cellspacing="0">
-<tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" maxlength="64" autocapitalize="off">
+<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"]); ?>">
 <tr><th><?php echo lang('Every'); ?><td><input type="number" name="INTERVAL_VALUE" value="<?php echo h($row["INTERVAL_VALUE"]); ?>" class="size"> <?php echo html_select("INTERVAL_FIELD", $intervals, $row["INTERVAL_FIELD"]); ?>
 <tr><th><?php echo lang('Status'); ?><td><?php echo html_select("STATUS", $statuses, $row["STATUS"]); ?>
-<tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" maxlength="64">
-<tr><th>&nbsp;<td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>
+<tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" data-maxlength="64">
+<tr><th><td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>
 </table>
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>

adminer/file.inc.php

@@ -1,12 +1,5 @@
 <?php
-if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
-	header("HTTP/1.1 304 Not Modified");
-	exit;
-}
-
-header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: immutable");
+// caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");

adminer/foreign.inc.php

@@ -48,17 +48,33 @@ if ($_POST) {
 	$row["table"] = $TABLE;
 	$row["source"] = array("");
 }
-
-$source = array_keys(fields($TABLE)); //! no text and blob
-$target = ($TABLE === $row["table"] ? $source : array_keys(fields($row["table"])));
-$referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
 ?>
 
 <form action="" method="post">
-<p>
-<?php if ($row["db"] == "" && $row["ns"] == "") { ?>
-<?php echo lang('Target table'); ?>:
-<?php echo html_select("table", $referencable, $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
+<?php
+$source = array_keys(fields($TABLE)); //! no text and blob
+if ($row["db"] != "") {
+	$connection->select_db($row["db"]);
+}
+if ($row["ns"] != "") {
+	set_schema($row["ns"]);
+}
+$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 ($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)) {
+			$dbs[] = $db;
+		}
+	}
+	echo lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange);
+}
+?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
@@ -81,12 +97,11 @@ foreach ($row["source"] as $key => $val) {
 	'mariadb' => "foreign-keys/",
 	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
 	'mssql' => "ms174979.aspx",
-	'oracle' => "clauses002.htm#sthref2903",
+	'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 } ?>
 <?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

@@ -75,7 +75,7 @@ class Adminer {
 	* @return float number of seconds
 	*/
 	function queryTimeout() {
-		return 5;
+		return 2;
 	}
 
 	/** Headers to send before HTML output
@@ -108,7 +108,7 @@ class Adminer {
 		$return = array();
 		$filename = "adminer.css";
 		if (file_exists($filename)) {
-			$return[] = $filename;
+			$return[] = "$filename?v=" . crc32(file_get_contents($filename));
 		}
 		return $return;
 	}
@@ -118,19 +118,26 @@ class Adminer {
 	*/
 	function loginForm() {
 		global $drivers;
-		?>
-<table cellspacing="0">
-<tr><th><?php echo lang('System'); ?><td><?php echo html_select("auth[driver]", $drivers, DRIVER) . "\n"; ?>
-<tr><th><?php echo lang('Server'); ?><td><input name="auth[server]" value="<?php echo h(SERVER); ?>" title="hostname[:port]" placeholder="localhost" autocapitalize="off">
-<tr><th><?php echo lang('Username'); ?><td><input name="auth[username]" id="username" value="<?php echo h($_GET["username"]); ?>" autocapitalize="off">
-<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
-<tr><th><?php echo lang('Database'); ?><td><input name="auth[db]" value="<?php echo h($_GET["db"]); ?>" autocapitalize="off">
-</table>
-<?php
-		echo script("focus(qs('#username'));"); 
+		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(qs('#username')); qs('#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";
 	}
+	
+	/** Get login form field
+	* @param string
+	* @param string HTML
+	* @param string HTML
+	* @return string
+	*/
+	function loginFormField($name, $heading, $value) {
+		return $heading . $value;
+	}
 
 	/** Authorize the user
 	* @param string
@@ -138,9 +145,8 @@ class Adminer {
 	* @return mixed true for success, string for error message, false for unknown error
 	*/
 	function login($login, $password) {
-		global $jush;
-		if ($jush == "sqlite") {
-			return lang('<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.', target_blank(), '<code>login()</code>');
+		if ($password == "") {
+			return lang('Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.', target_blank());
 		}
 		return true;
 	}
@@ -304,6 +310,7 @@ class Adminer {
 	* @return null
 	*/
 	function tableStructurePrint($fields) {
+		echo "<div class='scrollable'>\n";
 		echo "<table cellspacing='0' class='nowrap'>\n";
 		echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
 		foreach ($fields as $field) {
@@ -312,10 +319,11 @@ class Adminer {
 			echo ($field["null"] ? " <i>NULL</i>" : "");
 			echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
 			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
-			echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
+			echo (support("comment") ? "<td>" . h($field["comment"]) : "");
 			echo "\n";
 		}
 		echo "</table>\n";
+		echo "</div>\n";
 	}
 
 	/** Print list of indexes on table in tabular format
@@ -472,7 +480,7 @@ class Adminer {
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
-
+	
 	/** Print command box in select
 	* @return bool whether to print default commands
 	*/
@@ -553,8 +561,9 @@ class Adminer {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if ((is_numeric($val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+						if ((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"]))
 						) {
 							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
@@ -575,7 +584,7 @@ class Adminer {
 		$return = array();
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if ($val != "") {
-				$return[] = (preg_match('~^((COUNT\\(DISTINCT |[A-Z0-9_]+\\()(`(?:[^`]|``)+`|"(?:[^"]|"")+")\\)|COUNT\\(\\*\\))$~', $val) ? $val : idf_escape($val)) //! MS SQL uses []
+				$return[] = (preg_match('~^((COUNT\(DISTINCT |[A-Z0-9_]+\()(`(?:[^`]|``)+`|"(?:[^"]|"")+")\)|COUNT\(\*\))$~', $val) ? $val : idf_escape($val)) //! MS SQL uses []
 					. (isset($_GET["desc"][$key]) ? " DESC" : "")
 				;
 			}
@@ -633,7 +642,7 @@ class Adminer {
 			$history[$_GET["db"]] = array();
 		}
 		if (strlen($query) > 1e6) {
-			$query = preg_replace('~[\x80-\xFF]+$~', '', substr($query, 0, 1e6)) . "\n..."; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
+			$query = preg_replace('~[\x80-\xFF]+$~', '', substr($query, 0, 1e6)) . "\n…"; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 		}
 		$history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
 		$sql_id = "sql-" . count($history[$_GET["db"]]);
@@ -650,6 +659,16 @@ class Adminer {
 		;
 	}
 
+	/** Print before edit form
+	* @param string
+	* @param array
+	* @param mixed
+	* @param bool
+	* @return null
+	*/
+	function editRowPrint($table, $fields, $row, $update) {
+	}
+
 	/** Functions displayed in edit form
 	* @param array single field from fields()
 	* @return array
@@ -657,19 +676,20 @@ class Adminer {
 	function editFunctions($field) {
 		global $edit_functions;
 		$return = ($field["null"] ? "NULL/" : "");
+		$update = isset($_GET["select"]) || where($_GET);
 		foreach ($edit_functions as $key => $functions) {
-			if (!$key || (!isset($_GET["call"]) && (isset($_GET["select"]) || where($_GET)))) { // relative functions
+			if (!$key || (!isset($_GET["call"]) && $update)) { // relative functions
 				foreach ($functions as $pattern => $val) {
 					if (!$pattern || preg_match("~$pattern~", $field["type"])) {
 						$return .= "/$val";
 					}
 				}
-				if ($key && !preg_match('~set|blob|bytea|raw|file~', $field["type"])) {
-					$return .= "/SQL";
-				}
+			}
+			if ($key && !preg_match('~set|blob|bytea|raw|file|bool~', $field["type"])) {
+				$return .= "/SQL";
 			}
 		}
-		if ($field["auto_increment"] && !isset($_GET["select"]) && !where($_GET)) {
+		if ($field["auto_increment"] && !$update) {
 			$return = lang('Auto Increment');
 		}
 		return explode("/", $return);
@@ -718,7 +738,7 @@ class Adminer {
 			$return = "$function()";
 		} elseif (preg_match('~^current_(date|timestamp)$~', $function)) {
 			$return = $function;
-		} elseif (preg_match('~^([+-]|\\|\\|)$~', $function)) {
+		} elseif (preg_match('~^([+-]|\|\|)$~', $function)) {
 			$return = idf_escape($name) . " $function $return";
 		} elseif (preg_match('~^[+-] interval$~', $function)) {
 			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+\$~i", $value) ? $value : $return);
@@ -837,7 +857,7 @@ class Adminer {
 						foreach ($row as $key => $val) {
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
-								? unconvert_field($field, preg_match(number_type(), $field["type"]) && $val != '' ? $val : q($val))
+								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
 								: "NULL"
 							);
 						}
@@ -919,24 +939,24 @@ class Adminer {
 </h1>
 <?php
 		if ($missing == "auth") {
-			$first = true;
+			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
 				foreach ($servers as $server => $usernames) {
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
-							if ($first) {
-								echo "<p id='logins'>" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
-								$first = false;
-							}
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								echo "<a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
+								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
 							}
 						}
 					}
 				}
 			}
+			if ($output) {
+				echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
+			}
 		} else {
+			$tables = array();
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
@@ -962,7 +982,7 @@ class Adminer {
 				}
 				$server_info = $connection->server_info;
 				?>
-bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s', '\\1', $server_info) : ""); ?>'<?php echo (preg_match('~MariaDB~', $server_info) ? ", true" : ""); ?>);
+bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '\1', $server_info) : ""); ?>'<?php echo (preg_match('~MariaDB~', $server_info) ? ", true" : ""); ?>);
 </script>
 <?php
 			}
@@ -991,6 +1011,9 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s'
 	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">
@@ -1002,19 +1025,20 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s'
 			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
 		);
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-			if (support("scheme")) {
+		if (support("scheme")) {
+			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
 				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
 			}
 		}
-		echo (isset($_GET["sql"]) ? '<input type="hidden" name="sql" value="">'
-			: (isset($_GET["schema"]) ? '<input type="hidden" name="schema" value="">'
-			: (isset($_GET["dump"]) ? '<input type="hidden" name="dump" value="">'
-			: (isset($_GET["privileges"]) ? '<input type="hidden" name="privileges" value="">'
-		: ""))));
+		foreach (array("import", "sql", "schema", "dump", "privileges") as $val) {
+			if (isset($_GET[$val])) {
+				echo "<input type='hidden' name='$val' value=''>";
+				break;
+			}
+		}
 		echo "</p></form>\n";
 	}
 
@@ -1027,7 +1051,10 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s'
 		foreach ($tables as $table => $status) {
 			$name = $this->tableName($status);
 			if ($name != "") {
-				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
+				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"))
@@ -1040,8 +1067,3 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s'
 	}
 
 }
-
-$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
-if ($adminer->operators === null) {
-	$adminer->operators = $operators;
-}

adminer/include/auth.inc.php

@@ -41,7 +41,7 @@ function add_invalid_login() {
 function check_invalid_login() {
 	global $adminer;
 	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
-	$invalid = $invalids[$adminer->bruteForceKey()];
+	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
 	$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)));
@@ -73,18 +73,12 @@ if ($auth) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
 	
-} elseif ($_POST["logout"]) {
-	if ($has_token && !verify_token()) {
-		page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
-		page_footer("db");
-		exit;
-	} else {
-		foreach (array("pwds", "db", "dbs", "queries") as $key) {
-			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="%s">donating</a>.', 'https://sourceforge.net/donate/index.php?group_id=264133'));
+} elseif ($_POST["logout"] && (!$has_token || verify_token())) {
+	foreach (array("pwds", "db", "dbs", "queries") as $key) {
+		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>.'));
 	
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
@@ -120,11 +114,12 @@ function auth_error($error) {
 		if (($_COOKIE[$session_name] || $_GET[$session_name]) && !$has_token) {
 			$error = lang('Session expired, please login again.');
 		} else {
+			restart_session();
 			add_invalid_login();
 			$password = get_password();
 			if ($password !== null) {
 				if ($password === false) {
-					$error .= '<br>' . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
+					$error .= ($error ? '<br>' : '') . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
 				}
 				set_password(DRIVER, SERVER, $_GET["username"], null);
 			}
@@ -149,16 +144,19 @@ function auth_error($error) {
 	exit;
 }
 
-if (isset($_GET["username"])) {
-	if (!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(", ", $possible_drivers)), 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(", ", $possible_drivers)), false);
+	page_footer("auth");
+	exit;
+}
+
+stop_session(true);
+
+if (isset($_GET["username"]) && is_string(get_password())) {
 	list($host, $port) = explode(":", SERVER, 2);
-	if (is_numeric($port) && $port < 1024) {
+	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.'));
 	}
 	check_invalid_login();
@@ -168,7 +166,14 @@ if (isset($_GET["username"])) {
 
 $login = null;
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-	auth_error((is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.'))));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.')));
+	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
+}
+
+if ($_POST["logout"] && $has_token && !verify_token()) {
+	page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
+	page_footer("db");
+	exit;
 }
 
 if ($auth && $_POST["token"]) {

adminer/include/bootstrap.inc.php

@@ -1,5 +1,10 @@
 <?php
+function adminer_errors($errno, $errstr) {
+	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
+}
+
 error_reporting(6135); // errors and warnings
+set_error_handler('adminer_errors', E_WARNING);
 
 include "../adminer/include/coverage.inc.php";
 
@@ -18,14 +23,22 @@ if (function_exists("mb_internal_encoding")) {
 	mb_internal_encoding("8bit");
 }
 
+include "../adminer/include/functions.inc.php";
+
 // used only in compiled file
 if (isset($_GET["file"])) {
 	include "../adminer/file.inc.php";
 }
 
-include "../adminer/include/functions.inc.php";
+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"])));
+	}
+	exit;
+}
 
-global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $has_token, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $driver, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $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"];
@@ -36,13 +49,13 @@ if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { /
 if ($_SERVER["HTTP_X_FORWARDED_PREFIX"]) {
 	$_SERVER["REQUEST_URI"] = $_SERVER["HTTP_X_FORWARDED_PREFIX"] . $_SERVER["REQUEST_URI"];
 }
-$HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");
+$HTTPS = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off")) || ini_bool("session.cookie_secure"); // session.cookie_secure could be set on HTTP if we are behind a reverse proxy
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
 if (!defined("SID")) {
 	session_cache_limiter(""); // to allow restarting session
 	session_name("adminer_sid"); // use specific session name to get own namespace
-	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
+	$params = array(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
 		$params[] = true; // HttpOnly
 	}
@@ -52,7 +65,7 @@ if (!defined("SID")) {
 
 // disable magic quotes to be able to use database escaping function
 remove_slashes(array(&$_GET, &$_POST, &$_COOKIE), $filter);
-if (get_magic_quotes_runtime()) {
+if (function_exists("get_magic_quotes_runtime") && get_magic_quotes_runtime()) {
 	set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
@@ -67,15 +80,29 @@ include "../adminer/drivers/sqlite.inc.php";
 include "../adminer/drivers/pgsql.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
-include "../adminer/drivers/firebird.inc.php";
-include "../adminer/drivers/simpledb.inc.php";
 include "../adminer/drivers/mongo.inc.php";
 include "../adminer/drivers/elastic.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
 
+$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'];
+$functions = $config['functions'];
+$grouping = $config['grouping'];
+$edit_functions = $config['edit_functions'];
+if ($adminer->operators === null) {
+	$adminer->operators = $operators;
+}
+
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
 define("DB", $_GET["db"]); // for the sake of speed and size
-define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?'
+define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
 	. (sid() ? SID . '&' : '')
 	. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
 	. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
@@ -83,15 +110,9 @@ define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"])
 );
 
 include "../adminer/include/version.inc.php";
-include "./include/adminer.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
-
-if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
-	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
-}
-
 include "./include/editing.inc.php";
 include "./include/connect.inc.php";
 

adminer/include/connect.inc.php

@@ -32,7 +32,7 @@ function connect_error() {
 			echo "<table cellspacing='0' class='checkable'>\n";
 			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
-				. (support("database") ? "<td>&nbsp;" : "")
+				. (support("database") ? "<td>" : "")
 				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
 				. "<td>" . lang('Collation')
 				. "<td>" . lang('Tables')
@@ -46,8 +46,8 @@ function connect_error() {
 				$root = h(ME) . "db=" . urlencode($db);
 				$id = h("Db-" . $db);
 				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
-				echo "<th><a href='$root' id='$db'>" . h($db) . "</a>";
-				$collation = nbsp(db_collation($db, $collations));
+				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);
 				echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "' title='" . lang('Database schema') . "'>" . ($_GET["dbsize"] ? $tables : "?") . "</a>";
 				echo "<td align='right' id='size-" . h($db) . "'>" . ($_GET["dbsize"] ? db_size($db) : "?");
@@ -56,12 +56,12 @@ function connect_error() {
 			
 			echo "</table>\n";
 			echo (support("database")
-				? "<div class='footer'>\n"
+				? "<div class='footer'><div>\n"
 					. "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>\n"
 					. "<input type='hidden' name='all' value=''>" . script("qsl('input').onclick = function () { selectCount('selected', formChecked(this, /^db/)); };") // used by trCheck()
 					. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm() . "\n"
 					. "</div></fieldset>\n"
-					. "</div>\n"
+					. "</div></div>\n"
 				: ""
 			);
 			echo "<input type='hidden' name='token' value='$token'>\n";
@@ -89,14 +89,16 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 	exit;
 }
 
-if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
-	if (!isset($_GET["ns"])) {
-		redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
-	}
-	if (!set_schema($_GET["ns"])) {
-		header("HTTP/1.1 404 Not Found");
-		page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
-		page_footer("ns");
-		exit;
+if (support("scheme")) {
+	if (DB != "" && $_GET["ns"] !== "") {
+		if (!isset($_GET["ns"])) {
+			redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
+		}
+		if (!set_schema($_GET["ns"])) {
+			header("HTTP/1.1 404 Not Found");
+			page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
+			page_footer("ns");
+			exit;
+		}
 	}
 }

adminer/include/design.inc.php

@@ -75,7 +75,7 @@ var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 		if ($breadcrumb === false) {
 			echo "$server\n";
 		} else {
-			echo "<a href='" . ($link ? h($link) : ".") . "' accesskey='1' title='Alt+Shift+1'>$server</a> &raquo; ";
+			echo "<a href='" . h($link) . "' accesskey='1' title='Alt+Shift+1'>$server</a> &raquo; ";
 			if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
 				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> &raquo; ';
 			}

adminer/include/driver.inc.php

@@ -1,4 +1,15 @@
 <?php
+$drivers = array();
+
+/** Add a driver
+* @param string
+* @param string
+* @return null
+*/
+function add_driver($id, $name) {
+	global $drivers;
+	$drivers[$id] = $name;
+}
 
 /*abstract*/ class Min_SQL {
 	var $_conn;
@@ -113,6 +124,14 @@
 		return queries("ROLLBACK");
 	}
 	
+	/** Return query with a timeout
+	* @param string
+	* @param int seconds
+	* @return string or null if the driver doesn't support query timeouts
+	*/
+	function slowQuery($query, $timeout) {
+	}
+	
 	/** Convert column to be searchable
 	* @param string escaped column name
 	* @param array array("op" => , "val" => )
@@ -129,7 +148,10 @@
 	* @return string
 	*/
 	function value($val, $field) {
-		return $val;
+		return (method_exists($this->_conn, 'value')
+			? $this->_conn->value($val, $field)
+			: (is_resource($val) ? stream_get_contents($val) : $val)
+		);
 	}
 
 	/** Quote binary string

adminer/include/editing.inc.php

@@ -17,6 +17,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 	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 cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
@@ -60,34 +61,37 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 		}
 		echo "<tr" . odd() . ">";
 		foreach ($row as $key => $val) {
+			$link = "";
+			if (isset($links[$key]) && !$columns[$links[$key]]) {
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+					$table = $row[array_search("table=", $links)];
+					$link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
+				} else {
+					$link = ME . "edit=" . urlencode($links[$key]);
+					foreach ($indexes[$links[$key]] as $col => $j) {
+						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
+					}
+				}
+			} elseif (is_url($val)) {
+				$link = $val;
+			}
 			if ($val === null) {
 				$val = "<i>NULL</i>";
 			} elseif ($blobs[$key] && !is_utf8($val)) {
 				$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
-			} elseif (!strlen($val)) { // strlen - SQLite can return int
-				$val = "&nbsp;"; // some content to print a border
 			} else {
 				$val = h($val);
 				if ($types[$key] == 254) { // 254 - char
 					$val = "<code>$val</code>";
 				}
 			}
-			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
-					$table = $row[array_search("table=", $links)];
-					$link = $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
-				} else {
-					$link = "edit=" . urlencode($links[$key]);
-					foreach ($indexes[$links[$key]] as $col => $j) {
-						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
-					}
-				}
-				$val = "<a href='" . h(ME . $link) . "'>$val</a>";
+			if ($link) {
+				$val = "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : '') . ">$val</a>";
 			}
 			echo "<td>$val";
 		}
 	}
-	echo ($i ? "</table>" : "<p class='message'>" . lang('No rows.')) . "\n";
+	echo ($i ? "</table>\n</div>" : "<p class='message'>" . lang('No rows.')) . "\n";
 	return $return;
 }
 
@@ -113,6 +117,31 @@ function referencable_primary($self) {
 	return $return;
 }
 
+/** Get settings stored in a cookie
+* @return array
+*/
+function adminer_settings() {
+	parse_str($_COOKIE["adminer_settings"], $settings);
+	return $settings;
+}
+
+/** Get setting stored in a cookie
+* @param string
+* @return array
+*/
+function adminer_setting($key) {
+	$settings = adminer_settings();
+	return $settings[$key];
+}
+
+/** Store settings to a cookie
+* @param array
+* @return bool
+*/
+function set_adminer_settings($settings) {
+	return cookie("adminer_settings", http_build_query($settings + adminer_settings()));
+}
+
 /** Print SQL <textarea> tag
 * @param string
 * @param string or array in which case [0] of every element is used
@@ -153,13 +182,10 @@ if ($foreign_keys) {
 	$structured_types[lang('Foreign keys')] = $foreign_keys;
 }
 echo optionlist(array_merge($extra_types, $structured_types), $type);
-?></select>
-<?php echo on_help("getTarget(event).value", 1); ?>
-<?php echo script("mixin(qsl('select'), {onfocus: function () { lastType = selectValue(this); }, onchange: editingTypeChange});", ""); ?>
-<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'" : ""); ?> aria-labelledby="label-length"><?php echo script("mixin(qsl('input'), {onfocus: editingLengthFocus, oninput: editingLengthChange});", ""); ?><td class="options"><?php //! type="number" with enabled JavaScript
+?></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"), $field["on_update"]) . '</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
 }
 
@@ -195,19 +221,26 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
-	global $jush;
-	$default = $field["default"];
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
-		(isset($default) ? " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default) : ""),
+		default_value($field),
 		(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),
 	);
 }
 
+/** Get default value clause
+* @param array
+* @return string
+*/
+function default_value($field) {
+	$default = $field["default"];
+	return ($default === null ? "" : " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default));
+}
+
 /** Get type class to use in CSS
 * @param string
 * @return string class=''
@@ -230,15 +263,16 @@ function type_class($type) {
 * @param array
 * @param string TABLE or PROCEDURE
 * @param array returned by referencable_primary()
-* @param bool display comments column
 * @return null
 */
-function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array(), $comments = false) {
+function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
 	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'");
 	?>
 <thead><tr>
-<?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
+<?php if ($type == "PROCEDURE") { ?><td><?php } ?>
 <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'); ?>
@@ -252,14 +286,14 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 	'pgsql' => "datatype.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
-<td id="label-default"><?php echo lang('Default value'); ?>
-<?php echo (support("comment") ? "<td id='label-comment'" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
+<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
-	echo script("qsl('tbody').onkeydown = editingKeydown;");
+	echo script("mixin(qsl('tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput});");
 	foreach ($fields as $i => $field) {
 		$i++;
 		$orig = $field[($_POST ? "orig" : "field")];
@@ -267,23 +301,21 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 		?>
 <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
 <?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" maxlength="64" autocapitalize="off" aria-labelledby="label-name"><?php echo script("qsl('input').oninput = function () { editingNameChange.call(this);" . ($field["field"] != "" || count($fields) > 1 ? "" : " editingAddRow.call(this);") . " };", ""); ?><?php } ?>
-<input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>">
-<?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
+<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 if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"><?php echo script("qsl('input').onclick = function () { var field = this.form['fields[' + this.value + '][field]']; if (!field.value) { field.value = 'id'; field.oninput(); } }"); ?></label><td><?php
-echo checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" aria-labelledby="label-default"><?php echo script("qsl('input').oninput = function () { this.previousSibling.checked = true; }", ""); ?>
-<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . "><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' maxlength='" . (min_version(5.5) ? 1024 : 255) . "' aria-labelledby='label-comment'>" : ""); ?>
-<?php } ?>
-<?php
+<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
+			echo checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "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'>" : "");
+		}
 		echo "<td>";
 		echo (support("move_col") ?
-			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>&nbsp;" . script("qsl('input').onclick = partial(editingAddRow, 1);", "")
-			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;" . script("qsl('input').onclick = partial(editingMoveRow, 1);", "")
-			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;" . script("qsl('input').onclick = partial(editingMoveRow, 0);", "")
+			"<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') . "'>" . script("qsl('input').onclick = partial(editingRemoveRow, 'fields\$1[field]');") : "");
+		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" : "");
 	}
 }
 
@@ -354,7 +386,7 @@ function grant($grant, $privileges, $columns, $on) {
 			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
 		);
 	}
-	return queries("$grant " . preg_replace('~(GRANT OPTION)\\([^)]*\\)~', '\\1', implode("$columns, ", $privileges) . $columns) . $on);
+	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
 }
 
 /** Drop old object and create a new one
@@ -398,7 +430,7 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 */
 function create_trigger($on, $row) {
 	global $jush;
-	$timing_event = " $row[Timing] $row[Event]" . ($row["Event"] == "UPDATE OF" ? " " . idf_escape($row["Of"]) : "");
+	$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)
@@ -437,16 +469,21 @@ function create_routine($routine, $row) {
 * @return string
 */
 function remove_definer($query) {
-	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $query); //! proper escaping of user
+	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\1)', logged_user()) . '`~', '\1', $query); //! proper escaping of user
 }
 
 /** Format foreign key to use in SQL query
-* @param array ("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 $on_actions;
-	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES " . table($foreign_key["table"])
+	$db = $foreign_key["db"];
+	$ns = $foreign_key["ns"];
+	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) . "." : "")
+		. 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]" : "")
@@ -493,19 +530,19 @@ function ini_bytes($ini) {
 function doc_link($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
+	$version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
 	$urls = array(
 		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
 		'sqlite' => "https://www.sqlite.org/",
-		'pgsql' => "https://www.postgresql.org/docs/$version/static/",
+		'pgsql' => "https://www.postgresql.org/docs/$version/",
 		'mssql' => "https://msdn.microsoft.com/library/",
-		'oracle' => "https://download.oracle.com/docs/cd/B19306_01/server.102/b14200/",
+		'oracle' => "https://www.oracle.com/pls/topic/lookup?ctx=db" . preg_replace('~^.* (\d+)\.(\d+)\.\d+\.\d+\.\d+.*~s', '\1\2', $server_info) . "&id=",
 	);
 	if (preg_match('~MariaDB~', $server_info)) {
 		$urls['sql'] = "https://mariadb.com/kb/en/library/";
 		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
 	}
-	return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]'" . target_blank() . ">$text</a>" : "");
+	return ($paths[$jush] ? "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>" : "");
 }
 
 /** Wrap gzencode() for usage in ob_start()

adminer/include/functions.inc.php

@@ -29,6 +29,9 @@ function version() {
 * @return string
 */
 function idf_unescape($idf) {
+	if (!preg_match('~^[`\'"]~', $idf)) {
+		return $idf;
+	}
 	$last = substr($idf, -1);
 	return str_replace($last . $last, $last, substr($idf, 1, -1));
 }
@@ -62,7 +65,7 @@ function number_type() {
 * @return null modified in place
 */
 function remove_slashes($process, $filter = false) {
-	if (get_magic_quotes_gpc()) {
+	if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
 		while (list($key, $val) = each($process)) {
 			foreach ($val as $k => $v) {
 				unset($process[$key][$k]);
@@ -154,14 +157,6 @@ function h($string) {
 	return str_replace("\0", "�", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
-/** Escape for TD
-* @param string
-* @return string
-*/
-function nbsp($string) {
-	return (trim($string) != "" ? h($string) : " ");
-}
-
 /** Convert \n to <br>
 * @param string
 * @return string
@@ -359,7 +354,7 @@ function set_password($vendor, $server, $username, $password) {
 }
 
 /** Get password from session
-* @return string
+* @return string or null for missing password or false for expired password
 */
 function get_password() {
 	$return = get_session("pwds");
@@ -401,19 +396,16 @@ function get_vals($query, $column = 0) {
 /** Get keys from first column and values from second
 * @param string
 * @param Min_DB
-* @param float
 * @param bool
 * @return array
 */
-function get_key_vals($query, $connection2 = null, $timeout = 0, $set_keys = true) {
+function get_key_vals($query, $connection2 = null, $set_keys = true) {
 	global $connection;
 	if (!is_object($connection2)) {
 		$connection2 = $connection;
 	}
 	$return = array();
-	$connection2->timeout = $timeout;
 	$result = $connection2->query($query);
-	$connection2->timeout = 0;
 	if (is_object($result)) {
 		while ($row = $result->fetch_row()) {
 			if ($set_keys) {
@@ -490,10 +482,10 @@ function where($where, $fields = array()) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
 		$return[] = $column
-			. ($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val) ? " LIKE " . q(addcslashes($val, "%_\\"))
-				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val))
+			. ($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))
-			)) // LIKE because of floats but slow with ints, in MS SQL because of text
+			))
 		; //! 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";
@@ -557,7 +549,7 @@ 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"])
+		. "; path=" . preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"])
 		. ($HTTPS ? "; secure" : "")
 		. "; HttpOnly; SameSite=lax",
 		false);
@@ -572,12 +564,17 @@ function restart_session() {
 	}
 }
 
-/** Stop session if it would be possible to restart it later
+/** Stop session if possible
+* @param bool
 * @return null
 */
-function stop_session() {
-	if (!ini_bool("session.use_cookies")) {
-		session_write_close();
+function stop_session($force = false) {
+	$use_cookies = ini_bool("session.use_cookies");
+	if (!$use_cookies || $force) {
+		session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
+		if ($use_cookies && @ini_set("session.use_cookies", false) === false) { // @ - may be disabled
+			session_start();
+		}
 	}
 }
 
@@ -607,7 +604,7 @@ function set_session($key, $val) {
 */
 function auth_url($vendor, $server, $username, $db = null) {
 	global $drivers;
-	preg_match('~([^?]*)\\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . ($db !== null ? "db|" : "") . session_name()), $match);
+	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) . "&" : "")
@@ -727,12 +724,19 @@ function format_time($start) {
 	return lang('%.3f s', max(0, microtime(true) - $start));
 }
 
+/** Get relative REQUEST_URI
+* @return string
+*/
+function relative_uri() {
+	return str_replace(":", "%3a", preg_replace('~^[^?]*/([^?]*)~', '\1', $_SERVER["REQUEST_URI"]));
+}
+
 /** Remove parameter from query string
 * @param string
 * @return string
 */
 function remove_from_uri($param = "") {
-	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', "$_SERVER[REQUEST_URI]&"), 0, -1);
+	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', relative_uri() . "&"), 0, -1);
 }
 
 /** Generate page number for pagination
@@ -767,7 +771,7 @@ function get_file($key, $decompress = false) {
 		}
 		$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
@@ -812,7 +816,7 @@ function repeat_pattern($pattern, $length) {
 */
 function is_utf8($val) {
 	// don't print control chars except \t\r\n
-	return (preg_match('~~u', $val) && !preg_match('~[\\0-\\x8\\xB\\xC\\xE-\\x1F]~', $val));
+	return (preg_match('~~u', $val) && !preg_match('~[\0-\x8\xB\xC\xE-\x1F]~', $val));
 }
 
 /** Shorten UTF-8 string
@@ -825,7 +829,7 @@ function shorten_utf8($string, $length = 80, $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);
 	}
-	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>...</i>");
+	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>…</i>");
 }
 
 /** Format decimal number
@@ -848,19 +852,18 @@ function friendly_url($val) {
 /** Print hidden fields
 * @param array
 * @param array
+* @param string
 * @return bool
 */
-function hidden_fields($process, $ignore = array()) {
+function hidden_fields($process, $ignore = array(), $prefix = '') {
 	$return = false;
-	while (list($key, $val) = each($process)) {
+	foreach ($process as $key => $val) {
 		if (!in_array($key, $ignore)) {
 			if (is_array($val)) {
-				foreach ($val as $k => $v) {
-					$process[$key . "[$k]"] = $v;
-				}
+				hidden_fields($val, array(), $key);
 			} else {
 				$return = true;
-				echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
+				echo '<input type="hidden" name="' . h($prefix ? $prefix . "[$key]" : $key) . '" value="' . h($val) . '">';
 			}
 		}
 	}
@@ -946,14 +949,14 @@ function input($field, $value, $function) {
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
 	$attrs = " name='fields[$name]'";
 	if ($field["type"] == "enum") {
-		echo nbsp($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
+		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
 			? "<select name='function[$name]'>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
 				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
 				. script("qsl('select').onchange = functionChange;", "")
-			: nbsp(reset($functions))
+			: h(reset($functions))
 		) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
@@ -970,7 +973,7 @@ function input($field, $value, $function) {
 			}
 		} 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~', $field["type"])) || preg_match("~\n~", $value)) {
+		} elseif (($text = preg_match('~text|lob|memo~i', $field["type"])) || preg_match("~\n~", $value)) {
 			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
 			} else {
@@ -982,7 +985,7 @@ function input($field, $value, $function) {
 			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
-			$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));
+			$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
 			}
@@ -1031,7 +1034,7 @@ function process_input($field) {
 		return null;
 	}
 	if ($function == "orig") {
-		return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
+		return (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? idf_escape($field["field"]) : false);
 	}
 	if ($function == "NULL") {
 		return "NULL";
@@ -1115,7 +1118,7 @@ function dump_headers($identifier, $multi_table = false) {
 	$return = $adminer->dumpHeaders($identifier, $multi_table);
 	$output = $_POST["output"];
 	if ($output != "text") {
-		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !preg_match('~[^0-9a-z]~', $output) ? ".$output" : ""));
+		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && preg_match('~^[0-9a-z]+$~', $output) ? ".$output" : ""));
 	}
 	session_write_close();
 	ob_flush();
@@ -1129,7 +1132,7 @@ function dump_headers($identifier, $multi_table = false) {
 */
 function dump_csv($row) {
 	foreach ($row as $key => $val) {
-		if (preg_match("~[\"\n,;\t]~", $val) || $val === "") {
+		if (preg_match('~["\n,;\t]|^0|\.\d*0$~', $val) || $val === "") {
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
@@ -1253,9 +1256,7 @@ function select_value($val, $link, $field, $text_length) {
 	}
 	$return = $adminer->editVal($val, $field);
 	if ($return !== null) {
-		if ($return === "") { // === - may be int
-			$return = "&nbsp;";
-		} elseif (!is_utf8($return)) {
+		if (!is_utf8($return)) {
 			$return = "\0"; // htmlspecialchars of binary data returns an empty string
 		} elseif ($text_length != "" && is_shortable($field)) {
 			$return = shorten_utf8($return, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
@@ -1291,7 +1292,7 @@ function is_url($string) {
 * @return bool
 */
 function is_shortable($field) {
-	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
+	return preg_match('~char|text|json|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
 }
 
 /** Get query to compute number of found rows
@@ -1315,10 +1316,11 @@ function count_rows($table, $where, $is_group, $group) {
 * @return array of strings
 */
 function slow_query($query) {
-	global $adminer, $token;
+	global $adminer, $token, $driver;
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
-	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
+	$slow_query = $driver->slowQuery($query, $timeout);
+	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(); ?>>
@@ -1333,7 +1335,7 @@ var timeout = setTimeout(function () {
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals($query, $connection2, $timeout, 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();
@@ -1412,15 +1414,16 @@ function on_help($command, $side = 0) {
 * @param bool
 * @return null
 */
-function edit_form($TABLE, $fields, $row, $update) {
+function edit_form($table, $fields, $row, $update) {
 	global $adminer, $jush, $token, $error;
-	$table_name = $adminer->tableName(table_status1($TABLE, true));
+	$table_name = $adminer->tableName(table_status1($table, true));
 	page_header(
 		($update ? lang('Edit') : lang('Insert')),
 		$error,
-		array("select" => array($TABLE, $table_name)),
+		array("select" => array($table, $table_name)),
 		$table_name
 	);
+	$adminer->editRowPrint($table, $fields, $row, $update);
 	if ($row === false) {
 		echo "<p class='error'>" . lang('No rows.') . "\n";
 	}
@@ -1430,7 +1433,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 	if (!$fields) {
 		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
 	} else {
-		echo "<table cellspacing='0'>" . 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);
@@ -1444,7 +1447,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 			$value = ($row !== null
 				? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
 					? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
-					: $row[$name]
+					: (is_bool($row[$name]) ? +$row[$name] : $row[$name])
 				)
 				: (!$update && $field["auto_increment"]
 					? ""
@@ -1456,12 +1459,15 @@ function edit_form($TABLE, $fields, $row, $update) {
 			}
 			$function = ($_POST["save"]
 				? (string) $_POST["function"][$name]
-				: ($update && $field["on_update"] == "CURRENT_TIMESTAMP"
+				: ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"])
 					? "now"
 					: ($value === false ? null : ($value !== null ? '' : 'NULL'))
 				)
 			);
-			if (preg_match("~time~", $field["type"]) && $value == "CURRENT_TIMESTAMP") {
+			if (!$_POST && !$update && $value == $field["default"] && preg_match('~^[\w.]+\(~', $value)) {
+				$function = "SQL";
+			}
+			if (preg_match("~time~", $field["type"]) && preg_match('~^CURRENT_TIMESTAMP~i', $value)) {
 				$value = "";
 				$function = "now";
 			}
@@ -1487,7 +1493,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 				? lang('Save and continue edit')
 				: lang('Save and insert next')
 			) . "' title='Ctrl+Shift+Enter'>\n";
-			echo ($update ? script("qsl('input').onclick = function () { return !ajaxForm(this.form, '" . lang('Saving') . "...', this); };") : "");
+			echo ($update ? script("qsl('input').onclick = function () { return !ajaxForm(this.form, '" . lang('Saving') . "…', this); };") : "");
 		}
 	}
 	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'>" . confirm() . "\n"

adminer/include/lang.inc.php

@@ -23,6 +23,7 @@ $langs = array(
 	'id' => 'Bahasa Indonesia', // Ivan Lanin - http://ivan.lanin.org
 	'it' => 'Italiano', // Alessandro Fiorotto, Paolo Asperti
 	'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
 	'ms' => 'Bahasa Melayu', // Pisyek
@@ -36,6 +37,7 @@ $langs = array(
 	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com, Juraj Krivda - http://www.jstudio.cz
 	'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
 	'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
+	'sv' => 'Svenska', // rasmusolle - https://github.com/rasmusolle
 	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
 	'th' => 'ภาษาไทย', // Panya Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
 	'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com

adminer/include/pdo.inc.php

@@ -1,8 +1,8 @@
 <?php
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	/*abstract*/ class Min_PDO extends PDO {
-		var $_result, $server_info, $affected_rows, $errno, $error;
+	/*abstract*/ class Min_PDO {
+		var $_result, $server_info, $affected_rows, $errno, $error, $pdo;
 		
 		function __construct() {
 			global $adminer;
@@ -13,22 +13,30 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function dsn($dsn, $username, $password, $options = array()) {
+			$options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT;
+			$options[PDO::ATTR_STATEMENT_CLASS] = array('Min_PDOStatement');
 			try {
-				parent::__construct($dsn, $username, $password, $options);
+				$this->pdo = new PDO($dsn, $username, $password, $options);
 			} catch (Exception $ex) {
 				auth_error(h($ex->getMessage()));
 			}
-			$this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
-			$this->server_info = @$this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
+			$this->server_info = @$this->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
 		}
 		
 		/*abstract function select_db($database);*/
 		
+		function quote($string) {
+			return $this->pdo->quote($string);
+		}
+		
 		function query($query, $unbuffered = false) {
-			$result = parent::query($query);
+			$result = $this->pdo->query($query);
 			$this->error = "";
 			if (!$result) {
-				list(, $this->errno, $this->error) = $this->errorInfo();
+				list(, $this->errno, $this->error) = $this->pdo->errorInfo();
+				if (!$this->error) {
+					$this->error = lang('Unknown error.');
+				}
 				return false;
 			}
 			$this->store_result($result);
@@ -76,11 +84,11 @@ if (extension_loaded('pdo')) {
 		var $_offset = 0, $num_rows;
 		
 		function fetch_assoc() {
-			return $this->fetch(2); // PDO::FETCH_ASSOC
+			return $this->fetch(PDO::FETCH_ASSOC);
 		}
 		
 		function fetch_row() {
-			return $this->fetch(3); // PDO::FETCH_NUM
+			return $this->fetch(PDO::FETCH_NUM);
 		}
 		
 		function fetch_field() {
@@ -92,5 +100,3 @@ if (extension_loaded('pdo')) {
 		}
 	}
 }
-
-$drivers = array();

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.6.1";
+$VERSION = "4.8.1";

adminer/indexes.inc.php

@@ -94,12 +94,13 @@ if (!$row) {
 ?>
 
 <form action="" method="post">
+<div class="scrollable">
 <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 (length)'); ?>
 <th id="label-name"><?php echo lang('Name'); ?>
-<th><noscript><input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='<?php echo lang('Add next'); ?>'></noscript>&nbsp;
+<th><noscript><?php echo "<input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?></noscript>
 </thead>
 <?php
 if ($primary) {
@@ -126,7 +127,7 @@ foreach ($row["indexes"] as $index) {
 				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"
 			);
 			echo ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
-			echo ($jush != "sql" ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
+			echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
 			echo " </span>";
 			$i++;
 		}
@@ -138,6 +139,7 @@ foreach ($row["indexes"] as $index) {
 }
 ?>
 </table>
+</div>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/lang/ar.inc.php

@@ -184,7 +184,7 @@ $translations = array(
 	'Move to other database' => 'نقل إلى قاعدة بيانات أخرى',
 	'Move' => 'نقل',
 	'%d item(s) have been affected.' => 'عدد العناصر المعدلة هو %d.',
-	'whole result' => 'نتيجة كاملة',
+	'Whole result' => 'نتيجة كاملة',
 	'Clone' => 'نسخ',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s.',
 	'Partition by' => 'مقسم بواسطة',

adminer/lang/bg.inc.php

@@ -245,7 +245,7 @@ $translations = array(
 	'last' => 'последен',
 	'Load more data' => 'Зареждане на повече данни',
 	'Loading' => 'Зареждане',
-	'whole result' => 'пълен резултат',
+	'Whole result' => 'Пълен резултат',
 	'%d byte(s)' => array('%d байт', '%d байта'),
 	
 	'Import' => 'Импорт',

adminer/lang/bn.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'প্রকৃত',
 	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
 	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
-	'whole result' => 'সম্পূর্ণ ফলাফল',
+	'Whole result' => 'সম্পূর্ণ ফলাফল',
 	'Clone' => 'ক্লোন',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
 	'Partition by' => 'পার্টিশন যার মাধ্যমে',

adminer/lang/bs.inc.php

@@ -234,7 +234,7 @@ $translations = array(
 	'last' => 'poslijednja',
 	'Loading' => 'Učitavam',
 	'Load more data' => 'Učitavam još podataka',
-	'whole result' => 'ceo rezultat',
+	'Whole result' => 'Ceo rezultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajtova'),
 
 	'Import' => 'Uvoz',

adminer/lang/ca.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlids.',
+	'Invalid credentials.' => 'Credencials invàlides.',
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -35,7 +35,7 @@ $translations = array(
 	'Use' => 'Utilitza',
 	'No tables.' => 'No hi ha cap taula.',
 	'select' => 'registres',
-	'Item has been deleted.' => 'S\'ha suprmit l\'element.',
+	'Item has been deleted.' => 'S\'ha suprimit l\'element.',
 	'Item has been updated.' => 'S\'ha actualitzat l\'element.',
 	'Item%s has been inserted.' => 'S\'ha insertat l\'element%s.',
 	'Edit' => 'Edita',
@@ -44,9 +44,9 @@ $translations = array(
 	'Delete' => 'Suprimeix',
 	'Database' => 'Base de dades',
 	'Routines' => 'Rutines',
-	'Indexes have been altered.' => 'S\'han modificat els índexs.',
+	'Indexes have been altered.' => 'S\'han modificat els índex.',
 	'Indexes' => 'Índexs',
-	'Alter indexes' => 'Modifica els índexs',
+	'Alter indexes' => 'Modifica els índex',
 	'Add next' => 'Afegeix el següent',
 	'Language' => 'Idioma',
 	'Select' => 'Selecciona',
@@ -74,11 +74,11 @@ $translations = array(
 	'No commands to execute.' => 'Cap comanda per executar.',
 	'Unable to upload a file.' => 'Impossible adjuntar el fitxer.',
 	'File upload' => 'Adjunta un fitxer',
-	'File uploads are disabled.' => 'L\'ddjunció de fitxers està desactivada.',
+	'File uploads are disabled.' => 'La pujada de fitxers està desactivada.',
 	'Routine has been called, %d row(s) affected.' => array('S\'ha cridat la rutina, %d registre modificat.', 'S\'ha cridat la rutina, %d registres modificats.'),
 	'Call' => 'Crida',
 	'No extension' => 'Cap extensió',
-	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP soporatades (%s) disponible.',
+	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP suportades (%s) disponible.',
 	'Session support must be enabled.' => 'Cal que estigui permès l\'us de sessions.',
 	'Session expired, please login again.' => 'La sessió ha expirat, torna a iniciar-ne una.',
 	'Text length' => 'Longitud del text',
@@ -86,7 +86,7 @@ $translations = array(
 	'Foreign key has been altered.' => 'S\'ha modificat la clau forana.',
 	'Foreign key has been created.' => 'S\'ha creat la clau forana.',
 	'Foreign key' => 'Clau forana',
-	'Target table' => 'Taula de destí',
+	'Target table' => 'Taula de destinació',
 	'Change' => 'Canvi',
 	'Source' => 'Font',
 	'Target' => 'Destí',
@@ -139,7 +139,7 @@ $translations = array(
 	'Grant' => 'Grant',
 	'Revoke' => 'Revoke',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Les dades POST són massa grans. Redueix les dades o incrementa la directiva de configuració %s.',
-	'Logged as: %s' => 'Connectat com: %s',
+	'Logged as: %s' => 'Connectat com a: %s',
 	'Move up' => 'Mou a dalt',
 	'Move down' => 'Mou a baix',
 	'Functions' => 'Funcions',
@@ -185,7 +185,7 @@ $translations = array(
 	'Save and continue edit' => 'Desa i segueix editant',
 	'original' => 'original',
 	'%d item(s) have been affected.' => array('S\'ha modificat %d element.', 'S\'han modificat %d elements.'),
-	'whole result' => 'tots els resultats',
+	'Whole result' => 'Tots els resultats',
 	'Tables have been dropped.' => 'S\'han suprimit les taules.',
 	'Clone' => 'Clona',
 	'Partition by' => 'Fes particions segons',
@@ -204,7 +204,7 @@ $translations = array(
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
 	'History' => 'Història',
 	'Variables' => 'Variables',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes origen i destí han de ser del mateix tipus, la columna destí ha d\'estar indexada i les dades referenciades han d\'existir.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes d\'origen i de destinació han de ser del mateix tipus, la columna de destinació ha d\'estar indexada i les dades referenciades han d\'existir.',
 	'E-mail' => 'Correu electrònic',
 	'From' => 'De',
 	'Subject' => 'Assumpte',

adminer/lang/cs.inc.php

@@ -10,9 +10,11 @@ $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="%s">donating</a>.' => 'Díky za použití Admineru, zvažte <a href="%s">příspěvek</a>.',
+	'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.',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => 'Pro přihlášení k SQLite <a href="https://www.adminer.org/cs/extension/"%s>implementujte</a> metodu %s.',
+	'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.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minutu.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minuty.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minut.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. <a href="https://www.adminer.org/cs/extension/"%s>Implementujte</a> metodu %s, aby platilo stále.',
 	'Language' => 'Jazyk',
@@ -21,6 +23,7 @@ $translations = array(
 	'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.',
+	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte extenze %s nebo %s.',
 	'Session support must be enabled.' => 'Session proměnné musí být povolené.',
 	'Session expired, please login again.' => 'Session vypršela, přihlašte se prosím znovu.',
 	'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
@@ -53,6 +56,7 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
 	'No commands to execute.' => 'Žádné příkazy k vykonání.',
 	'Error in query' => 'Chyba v dotazu',
+	'Unknown error.' => 'Neznámá chyba.',
 	'Warnings' => 'Varování',
 	'ATTACH queries are not supported.' => 'Dotazy ATTACH nejsou podporované.',
 	'Execute' => 'Provést',
@@ -123,6 +127,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabulky byly přesunuty.',
 	'Copy' => 'Zkopírovat',
 	'Tables have been copied.' => 'Tabulky byly zkopírovány.',
+	'overwrite' => 'přepsat',
 	
 	'Routines' => 'Procedury a funkce',
 	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
@@ -253,7 +258,7 @@ $translations = array(
 	'last' => 'poslední',
 	'Load more data' => 'Nahrát další data',
 	'Loading' => 'Nahrává se',
-	'whole result' => 'celý výsledek',
+	'Whole result' => 'Celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
 	
 	'Import' => 'Import',

adminer/lang/da.inc.php

@@ -212,7 +212,7 @@ $translations = array(
 	'last' => 'sidste',
 	'Load more data' => 'Indlæs mere data',
 	'Loading' => 'Indlæser',
-	'whole result' => 'hele resultatet',
+	'Whole result' => 'Hele resultatet',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'Import' => 'Importer',
 	'%d row(s) have been imported.' => array('%d række er importeret.', '%d rækker er importeret.'),

adminer/lang/de.inc.php

@@ -2,6 +2,7 @@
 $translations = array(
 	'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.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
@@ -186,7 +187,7 @@ $translations = array(
 	'original' => 'Original',
 	'Tables have been dropped.' => 'Tabellen wurden entfernt (drop).',
 	'%d item(s) have been affected.' => '%d Artikel betroffen.',
-	'whole result' => 'Gesamtergebnis',
+	'Whole result' => 'Gesamtergebnis',
 	'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',
@@ -279,7 +280,7 @@ $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, um 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',

adminer/lang/el.inc.php

@@ -11,12 +11,12 @@ $translations = array(
 	'Logged as: %s' => 'Συνδεθήκατε ως %s',
 	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
 	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
-	'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 για να τον κάνετε μόνιμο.',
+	'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' => 'Γλώσσα',
 	'Invalid CSRF token. Send the form again.' => 'Άκυρο κουπόνι CSRF. Στείλτε τη φόρμα ξανά.',
 	'If you did not send this request from Adminer then close this page.' => 'Αν δε στείλατε αυτό το αίτημα από το Adminer, τότε κλείστε αυτή τη σελίδα.',
-	'No extension' => 'Χωρίς Επεκτάσεις',
+	'No extension' => 'Καμία Επέκταση',
 	'None of the supported PHP extensions (%s) are available.' => 'Καμία από τις υποστηριζόμενες επεκτάσεις PHP (%s) δεν είναι διαθέσιμη.',
 	'Session support must be enabled.' => 'Πρέπει να είναι ενεργοποιημένη η υποστήριξη συνεδριών.',
 	'Session expired, please login again.' => 'Η συνεδρία έληξε, παρακαλώ συνδεθείτε ξανά.',
@@ -26,7 +26,7 @@ $translations = array(
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 	
-	'Privileges' => 'Προνόμια',
+	'Privileges' => 'Δικαιώματα',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
 	'User has been altered.' => 'Ο Χρήστης τροποποιήθηκε.',
@@ -38,7 +38,7 @@ $translations = array(
 	'Revoke' => 'Ανάκληση',
 	
 	'Process list' => 'Λίστα διεργασιών',
-	'%d process(es) have been killed.' => array('Τερματίστηκαν %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
+	'%d process(es) have been killed.' => array('Τερματίστηκε %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
 	'Kill' => 'Τερματισμός',
 	
 	'Variables' => 'Μεταβλητές',
@@ -46,8 +46,8 @@ $translations = array(
 	
 	'SQL command' => 'Εντολή SQL',
 	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
-	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκαν %d σειρές.'),
-	'No commands to execute.' => 'Δεν υπάρχει εντολή να εκτελεστεί.',
+	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
+	'No commands to execute.' => 'Δεν υπάρχουν εντολές να εκτελεστούν.',
 	'Error in query' => 'Σφάλμα στο ερώτημα',
 	'Execute' => 'Εκτέλεση',
 	'Stop on error' => 'Διακοπή όταν υπάρχει σφάλμα',
@@ -58,16 +58,16 @@ $translations = array(
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
 	
-	'File upload' => 'Ανέβασμα αρχείου',
+	'File upload' => 'Μεταφόρτωση αρχείου',
 	'From server' => 'Από διακομιστή',
 	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
 	'Run file' => 'Εκτέλεση αρχείου',
 	'File does not exist.' => 'Το αρχείο δεν υπάρχει.',
-	'File uploads are disabled.' => 'Έχει απενεργοποιηθεί το ανέβασμα αρχείων.',
-	'Unable to upload a file.' => 'Δεν είναι δυνατόν να ανεβεί το αρχείο.',
-	'Maximum allowed file size is %sB.' => 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείο για ανέβασμα είναι %sB.',
+	'File uploads are disabled.' => 'Έχει απενεργοποιηθεί η μεταφόρτωση αρχείων.',
+	'Unable to upload a file.' => 'Αδυναμία μεταφόρτωσης αρχείου.',
+	'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.' => 'Μπορείτε να ανεβάσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να μεταφορτώσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
 	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
 	
 	'Export' => 'Εξαγωγή',
@@ -82,7 +82,7 @@ $translations = array(
 	'database' => 'β. δεδομένων',
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
-	'Invalid database.' => 'Άκυρη Β.Δ.',
+	'Invalid database.' => 'Λανθασμένη Β.Δ.',
 	'Database has been dropped.' => 'Η Β.Δ. διαγράφηκε.',
 	'Databases have been dropped.' => 'Οι Β.Δ. διαγράφηκαν.',
 	'Database has been created.' => 'Η Β.Δ. δημιουργήθηκε.',
@@ -111,7 +111,7 @@ $translations = array(
 	'Check' => 'Έλεγχος',
 	'Repair' => 'Επιδιόρθωση',
 	'Truncate' => 'Περικοπή',
-	'Tables have been truncated.' => 'Οι πίνακες περικόπτηκαν.',
+	'Tables have been truncated.' => 'Οι πίνακες περικόπηκαν.',
 	'Move to other database' => 'Μεταφορά σε άλλη Β.Δ.',
 	'Move' => 'Μεταφορά',
 	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
@@ -119,11 +119,11 @@ $translations = array(
 	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
 	
 	'Routines' => 'Ρουτίνες',
-	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επιρρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επιρρεάστηκαν %d σειρές.'),
+	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
 	'Parameter name' => 'Όνομα παραμέτρου',
 	'Create procedure' => 'Δημιουργία διαδικασίας',
-	'Create function' => 'Δημιουργία Λειτουργίας',
+	'Create function' => 'Δημιουργία Συνάρτησης',
 	'Routine has been dropped.' => 'Η ρουτίνα διαγράφηκε.',
 	'Routine has been altered.' => 'Η ρουτίνα τροποποιήθηκε.',
 	'Routine has been created.' => 'Η ρουτίνα δημιουργήθηκε.',
@@ -151,7 +151,7 @@ $translations = array(
 	'Alter table' => 'Τροποποίηση πίνακα',
 	'Create table' => 'Δημιουργία πίνακα',
 	'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
-	'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
+	'Tables have been dropped.' => 'Οι πίνακες διαγράφηκαν.',
 	'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
 	'Table has been altered.' => 'Ο πίνακας τροποποιήθηκε.',
 	'Table has been created.' => 'Ο πίνακας δημιουργήθηκε.',
@@ -210,7 +210,7 @@ $translations = array(
 	'Add foreign key' => 'Προσθήκη εξαρτημένου κλειδιού',
 	'ON DELETE' => 'ΚΑΤΑ ΤΗ ΔΙΑΓΡΑΦΗ',
 	'ON UPDATE' => 'ΚΑΤΑ ΤΗΝ ΑΛΛΑΓΗ',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στη πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
 	
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
@@ -234,7 +234,7 @@ $translations = array(
 	'Sort' => 'Ταξινόμηση',
 	'descending' => 'Φθίνουσα',
 	'Limit' => 'Όριο',
-	'Limit rows' => 'Περιοριμός σειρών',
+	'Limit rows' => 'Περιορισμός σειρών',
 	'Text length' => 'Μήκος κειμένου',
 	'Action' => 'Ενέργεια',
 	'Full table scan' => 'Πλήρης σάρωση πινάκων',
@@ -246,7 +246,7 @@ $translations = array(
 	'last' => 'τελευταία',
 	'Load more data' => 'Φόρτωση κι άλλων δεδομένων',
 	'Loading' => 'Φορτώνει',
-	'whole result' => 'όλο το αποτέλεσμα',
+	'Whole result' => 'Όλο το αποτέλεσμα',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	
 	'Import' => 'Εισαγωγή',
@@ -262,7 +262,7 @@ $translations = array(
 	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
 	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
 	'Item has been updated.' => 'Η εγγραφή ενημερώθηκε.',
-	'%d item(s) have been affected.' => array('Επιρρεάστηκε %d εγγραφή.', 'Επιρρεάστηκαν %d εγγραφές.'),
+	'%d item(s) have been affected.' => array('Επηρεάστηκε %d εγγραφή.', 'Επηρεάστηκαν %d εγγραφές.'),
 	'New item' => 'Νέα εγγραφή',
 	'original' => 'πρωτότυπο',
 	// label for value '' in enum data type
@@ -274,7 +274,7 @@ $translations = array(
 	'Save and continue edit' => 'Αποθήκευση και συνέχεια επεξεργασίας',
 	'Save and insert next' => 'Αποθήκευση και εισαγωγή επόμενου',
 	'Selected' => 'Επιλεγμένα',
-	'Clone' => 'Κλονοποίηση',
+	'Clone' => 'Κλωνοποίηση',
 	'Delete' => 'Διαγραφή',
 	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
 	
@@ -283,7 +283,7 @@ $translations = array(
 	'Subject' => 'Θέμα',
 	'Attachments' => 'Συνημμένα',
 	'Send' => 'Αποστολή',
-	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλλει.', '%d e-mail απεστάλλησαν.'),
+	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
 	
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',

adminer/lang/es.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'original',
 	'Tables have been dropped.' => 'Tablas eliminadas.',
 	'%d item(s) have been affected.' => array('%d elemento afectado.', '%d elementos afectados.'),
-	'whole result' => 'resultado completo',
+	'Whole result' => 'Resultado completo',
 	'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',

adminer/lang/et.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'Move to other database' => 'Liiguta teise andmebaasi',
 	'Move' => 'Liiguta',
 	'%d item(s) have been affected.' => 'Mõjutatud kirjeid: %d.',
-	'whole result' => 'Täielikud tulemused',
+	'Whole result' => 'Täielikud tulemused',
 	'Clone' => 'Kloon',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s.',
 	'Partition by' => 'Partitsiooni',

adminer/lang/fa.inc.php

@@ -244,7 +244,7 @@ $translations = array(
 	'last' => 'آخری',
 	'Load more data' => 'بارگزاری اطلاعات بیشتر',
 	'Loading' => 'در حال بارگزاری',
-	'whole result' => 'همه نتایج',
+	'Whole result' => 'همه نتایج',
 	'%d byte(s)' => array('%d بایت', '%d بایت'),
 	
 	'Import' => 'وارد کردن',

adminer/lang/fi.inc.php

@@ -246,7 +246,7 @@ $translations = array(
 	'last' => 'viimeinen',
 	'Load more data' => 'Lataa lisää dataa',
 	'Loading' => 'Ladataan',
-	'whole result' => 'koko tulos',
+	'Whole result' => 'Koko tulos',
 	'%d byte(s)' => array('%d tavu', '%d tavua'),
 	
 	'Import' => 'Tuonti',
@@ -333,4 +333,18 @@ $translations = array(
 	'Type has been dropped.' => 'Tyyppi poistettiin.',
 	'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',
+	'ATTACH queries are not supported.' => 'ATTACH-komennolla tehtyjä kyselyjä ei tueta.',
+	'Warnings' => 'Varoitukset',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ei tue pääsyä tietokantaan ilman salasanaa, katso tarkemmin <a href="https://www.adminer.org/en/password/"%s>täältä</a>.',
+	'The action will be performed after successful login with the same credentials.' => 'Toiminto suoritetaan sen jälkeen, kun on onnistuttu kirjautumaan samoilla käyttäjätunnuksilla uudestaan.',
+	'Connecting to privileged ports is not allowed.' => 'Yhteydet etuoikeutettuihin portteihin eivät ole sallittuja.',
+	'There is a space in the input password which might be the cause.' => 'Syynä voi olla syötetyssä salasanassa oleva välilyönti.',
+	'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.',
 );

adminer/lang/fr.inc.php

@@ -184,7 +184,7 @@ $translations = array(
 	'Move to other database' => 'Déplacer vers une autre base de données',
 	'Move' => 'Déplacer',
 	'%d item(s) have been affected.' => array('%d élément a été modifié.', '%d éléments ont été modifiés.'),
-	'whole result' => 'résultat entier',
+	'Whole result' => 'Résultat entier',
 	'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',

adminer/lang/gl.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'orixinal',
 	'Tables have been dropped.' => 'Elimináronse as táboas.',
 	'%d item(s) have been affected.' => array('%d elemento afectado.', '%d elementos afectados.'),
-	'whole result' => 'resultado completo',
+	'Whole result' => 'Resultado completo',
 	'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',

adminer/lang/he.inc.php

@@ -184,7 +184,7 @@ $translations = array(
 	'Move to other database' => 'העבר למסד נתונים אחר',
 	'Move' => 'העבר',
 	'%d item(s) have been affected.' => '%d פריטים הושפעו',
-	'whole result' => 'כל התוצאות',
+	'Whole result' => 'כל התוצאות',
 	'Clone' => 'שכפל',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'הגעת למספר השדות המרבי. בבקשה הגדל את %s',
 	'Partition by' => 'מחיצות ע"י',
@@ -276,11 +276,10 @@ $translations = array(
 	'ATTACH queries are not supported.' => 'שאילתת ATTACH אינה נתמכת',
 	'%d / ' => '%d / ',
 	'Limit rows' => 'הגבל שורות',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/en/extension/"%s>התקן</a> את תוסף SQLite בשביל להתחבר',
 	'Default value' => 'ערך ברירת מחדל',
 	'Full table scan' => 'סריקה טבלה מלאה',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
-	'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="%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>.',
 	'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 ואז למשוך אותם מהשרת',

adminer/lang/hu.inc.php

@@ -175,7 +175,7 @@ $translations = array(
 	'Repair' => 'Javít',
 	'Truncate' => 'Felszabadít',
 	'Tables have been truncated.' => 'A tábla felszabadítva.',
-	'Rows' => 'Oszlop',
+	'Rows' => 'Sorok',
 	',' => ' ',
 	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Táblák áthelyezve.',
@@ -185,7 +185,7 @@ $translations = array(
 	'Save and continue edit' => 'Mentés és szerkesztés folytatása',
 	'original' => 'eredeti',
 	'%d item(s) have been affected.' => array('%d tétel érintett.', '%d tétel érintett.', '%d tétel érintett.'),
-	'whole result' => 'összes eredményt mutatása',
+	'Whole result' => 'Összes eredményt mutatása',
 	'Tables have been dropped.' => 'Táblák eldobva.',
 	'Clone' => 'Klónoz',
 	'Partition by' => 'Particionálás ezzel',

adminer/lang/id.inc.php

@@ -231,7 +231,7 @@ $translations = array(
 	'%d row(s)' => '%d baris',
 	'Page' => 'Halaman',
 	'last' => 'terakhir',
-	'whole result' => 'Seluruh hasil',
+	'Whole result' => 'Seluruh hasil',
 	'%d byte(s)' => '%d bita',
 
 	'Import' => 'Impor',

adminer/lang/it.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'Move to other database' => 'Sposta in altro database',
 	'Move' => 'Sposta',
 	'%d item(s) have been affected.' => array('Il risultato consiste in %d elemento.', 'Il risultato consiste in %d elementi.'),
-	'whole result' => 'intero risultato',
+	'Whole result' => 'Intero risultato',
 	'Clone' => 'Clona',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Troppi campi. Per favore aumentare %s.',
 	'Partition by' => 'Partiziona per',

adminer/lang/ja.inc.php

@@ -178,13 +178,13 @@ $translations = array(
 	'Optimize' => '最適化',
 	'Check' => 'チェック',
 	'Repair' => '修復',
-	'Truncate' => 'Truncate',
+	'Truncate' => '空にする',
 	'Move to other database' => '別のデータベースへ移動',
 	'Move' => '移動',
 	'Save and continue edit' => '保存して継続',
 	'original' => '元',
 	'%d item(s) have been affected.' => '%d を更新しました',
-	'whole result' => '全結果',
+	'Whole result' => '全結果',
 	'Tables have been dropped.' => 'テーブルを削除しました',
 	'Clone' => 'クローン',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
@@ -264,4 +264,14 @@ $translations = array(
 	'Permanent link' => 'パーマネントリンク',
 	'Edit all' => 'すべて編集',
 	'HH:MM:SS' => '時:分:秒',
+	'Selected' => '選択済',
+	'Modify' => '修正',
+	'Load more data' => '続きを読み込み',
+	'Loading' => '読み込み中',
+	'Size' => 'サイズ',
+	'Compute' => '算出',
+	'Saving' => '保存中',
+	'yes' => 'はい',
+	'no' => 'いいえ',
+	'Default value' => '既定値',
 );

adminer/lang/ka.inc.php

@@ -0,0 +1,303 @@
+<?php
+$translations = array(
+	'Login' => 'შესვლა',
+	'Logout successful.' => 'გამოხვედით სისტემიდან.',
+	'Invalid credentials.' => 'არასწორი მომხმარებელი ან პაროლი.',
+	'Server' => 'სერვერი',
+	'Username' => 'მომხმარებელი',
+	'Password' => 'პაროლი',
+	'Select database' => 'ბაზა',
+	'Invalid database.' => 'არასწორი ბაზა.',
+	'Table has been dropped.' => 'ცხრილი წაიშალა.',
+	'Table has been altered.' => 'ცხრილი შეიცვალა.',
+	'Table has been created.' => 'ცხრილი შეიქმნა.',
+	'Alter table' => 'ცხრილის შეცვლა',
+	'Create table' => 'ცხრილის შექმნა',
+	'Table name' => 'სახელი',
+	'engine' => 'სახეობა',
+	'collation' => 'კოდირება',
+	'Column name' => 'ველი',
+	'Type' => 'სახეობა',
+	'Length' => 'სიგრძე',
+	'Auto Increment' => 'ავტომატურად გაზრდა',
+	'Options' => 'მოქმედება',
+	'Save' => 'შენახვა',
+	'Drop' => 'წაშლა',
+	'Database has been dropped.' => 'ბაზა წაიშალა.',
+	'Database has been created.' => 'ბაზა შეიქმნა.',
+	'Database has been renamed.' => 'ბაზას გადაერქვა.',
+	'Database has been altered.' => 'ბაზა შეიცვალა.',
+	'Alter database' => 'ბაზის შეცვლა',
+	'Create database' => 'ბაზის შექმნა',
+	'SQL command' => 'SQL-ბრძანება',
+	'Logout' => 'გასვლა',
+	'database' => 'ბაზა',
+	'Use' => 'არჩევა',
+	'No tables.' => 'ბაზაში ცხრილი არაა.',
+	'select' => 'არჩევა',
+	'Item has been deleted.' => 'ჩანაწერი წაიშალა.',
+	'Item has been updated.' => 'ჩანაწერი განახლდა.',
+	'Item%s has been inserted.' => 'ჩანაწერი%s ჩაჯდა.',
+	'Edit' => 'შეცვლა',
+	'Insert' => 'ჩასმა',
+	'Save and insert next' => 'შენახვა და სხვის ჩასმა',
+	'Delete' => 'წაშლა',
+	'Database' => 'ბაზა',
+	'Indexes have been altered.' => 'შეიცვალა ინდექსები.',
+	'Indexes' => 'ინდექსები',
+	'Alter indexes' => 'ინდექსის შეცვლა',
+	'Add next' => 'კიდევ დამატება',
+	'Language' => 'ენა',
+	'Select' => 'არჩევა',
+	'New item' => 'ახალი ჩანაწერი',
+	'Search' => 'ძებნა',
+	'Sort' => 'დალაგება',
+	'descending' => 'კლებადობით',
+	'Limit' => 'ზღვარი',
+	'No rows.' => 'ჩანაწერი არაა.',
+	'Action' => 'მოქმედება',
+	'edit' => 'რედაქტირება',
+	'Page' => 'გვერდი',
+	'Query executed OK, %d row(s) affected.' => 'მოთხოვდა შესრულდა, შეიცვალა %d ჩანაწერი.',
+	'Error in query' => 'შეცდომა მოთხოვნაში',
+	'Execute' => 'შესრულება',
+	'Table' => 'ცხრილი',
+	'Foreign keys' => 'გარე გასაღები',
+	'Triggers' => 'ტრიგერები',
+	'View' => 'ნახვა',
+	'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.' => 'ფაილი არ აიტვირთა სერვერზე.',
+	'File upload' => 'ფაილის ატვირთვა სერვერზე',
+	'File uploads are disabled.' => 'ფაილის სერვერზე ატვირთვა გათიშულია.',
+	'Routine has been called, %d row(s) affected.' => 'გამოძახებულია პროცედურა, შეიცვალა %d ჩანაწერი.',
+	'Call' => 'გამოძახეება',
+	'No extension' => 'გაფართოება არაა',
+	'None of the supported PHP extensions (%s) are available.' => 'არც ერთი მხარდაჭერილი გაფართოება არ მოიძებნა (%s).',
+	'Session support must be enabled.' => 'ჩართული უნდა იყოს სესია.',
+	'Session expired, please login again.' => 'სესიის მოქმედების დრო ამოიწურა, გაიარეთ ხელახალი ავტორიზაცია.',
+	'Text length' => 'ტექსტის სიგრძე',
+	'Foreign key has been dropped.' => 'გარე გასაღები წაიშალა.',
+	'Foreign key has been altered.' => 'გარე გასაღები შეიცვალა.',
+	'Foreign key has been created.' => 'გარე გასაღები შეიქმნა.',
+	'Foreign key' => 'გარე გასაღები',
+	'Change' => 'შეცვლა',
+	'Source' => 'წყარო',
+	'Target' => 'სამიზნე',
+	'Add column' => 'ველის დამატება',
+	'Alter' => 'შეცვლა',
+	'Add foreign key' => 'გარე გასაღები დამატება',
+	'ON DELETE' => 'წაშლისას',
+	'ON UPDATE' => 'განახლებისას',
+	'Index Type' => 'ინდექსის სახეობა',
+	'Column (length)' => 'ველი (სიგრძე)',
+	'View has been dropped.' => 'წარმოდგენა წაიშალა.',
+	'View has been altered.' => 'წარმოდგენა შეიცვალა.',
+	'View has been created.' => 'წარმოდგენა შეიქმნა.',
+	'Alter view' => 'წარმოდგენის შეცვლა',
+	'Create view' => 'წარმოდგენის შექმნა',
+	'Name' => 'სახელი',
+	'Process list' => 'პროცესების სია',
+	'%d process(es) have been killed.' => 'გაითიშა %d პროცესი.',
+	'Kill' => 'დასრულება',
+	'Parameter name' => 'პარამეტრი',
+	'Database schema' => 'ბაზის სქემა',
+	'Create procedure' => 'პროცედურის შექმნა',
+	'Create function' => 'ფუნქციის შექმნა',
+	'Routine has been dropped.' => 'პროცედურა წაიშალა.',
+	'Routine has been altered.' => 'პროცედურა შეიცვალა.',
+	'Routine has been created.' => 'პროცედურა შეიქმნა.',
+	'Alter function' => 'ფუნქციის შეცვლა',
+	'Alter procedure' => 'პროცედურის შეცვლა',
+	'Return type' => 'დაბრუნების სახეობა',
+	'Add trigger' => 'ტრიგერის დამატება',
+	'Trigger has been dropped.' => 'ტრიგერი წაიშალა.',
+	'Trigger has been altered.' => 'ტრიგერი შეიცვალა.',
+	'Trigger has been created.' => 'ტრიგერი შეიქმნა.',
+	'Alter trigger' => 'ტრიგერის შეცვლა',
+	'Create trigger' => 'ტრიგერის შექმნა',
+	'Time' => 'დრო',
+	'Event' => 'ღონისძიება',
+	'%s version: %s through PHP extension %s' => 'ვერსია %s: %s PHP-გაფართოება %s',
+	'%d row(s)' => '%d რიგი',
+	'Remove' => 'წაშლა',
+	'Are you sure?' => 'ნამდვილად?',
+	'Privileges' => 'უფლებამოსილება',
+	'Create user' => 'მომხმარებლის შექმან',
+	'User has been dropped.' => 'მომხმარებელი წაიშალა.',
+	'User has been altered.' => 'მომხმარებელი შეიცვალა.',
+	'User has been created.' => 'მომხმარებელი შეიქმნა.',
+	'Hashed' => 'ჰეშირებული',
+	'Column' => 'ველი',
+	'Routine' => 'პროცედურა',
+	'Grant' => 'დაშვება',
+	'Revoke' => 'შეზღუდვა',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST ინფორმაცია ძალიან დიდია. შეამცირეთ ზომა ან გაზარდეს POST ინფორმაციის ზომა პარამეტრებიდან %s.',
+	'Logged as: %s' => 'შესული ხართ როგორც: %s',
+	'Move up' => 'ზემოთ ატანა',
+	'Move down' => 'ქვემოთ ჩატანა',
+	'Functions' => 'ფუნქციები',
+	'Aggregation' => 'აგრეგაცია',
+	'Export' => 'ექსპორტი',
+	'Output' => 'გამომავალი ინფორმაცია',
+	'open' => 'გახსნა',
+	'save' => 'შენახვა',
+	'Format' => 'ფორმატი',
+	'Tables' => 'ცხრილები',
+	'Data' => 'ინფორმაცია',
+	'Event has been dropped.' => 'ღონისძიება წაიშალა.',
+	'Event has been altered.' => 'ღონისძიება შეიცვალა.',
+	'Event has been created.' => 'ღონისძიება შეიქმნა.',
+	'Alter event' => 'ღონისძიების შეცვლა',
+	'Create event' => 'ღონისძიების შექმნა',
+	'At given time' => 'მოცემულ დროში',
+	'Every' => 'ყოველ',
+	'Events' => 'ღონისძიება',
+	'Schedule' => 'განრიგი',
+	'Start' => 'დასაწყისი',
+	'End' => 'დასასრული',
+	'Status' => 'მდგომარეობა',
+	'On completion preserve' => 'შენახვა დასრულებისას',
+	'Tables and views' => 'ცხრილები და წარმოდგენები',
+	'Data Length' => 'ინფორმაციის მოცულობა',
+	'Index Length' => 'ინდექსების მოცულობა',
+	'Data Free' => 'თავისუფალი სივრცე',
+	'Collation' => 'კოდირება',
+	'Analyze' => 'ანალიზი',
+	'Optimize' => 'ოპტიმიზაცია',
+	'Check' => 'შემოწმება',
+	'Repair' => 'გასწორება',
+	'Truncate' => 'გასუფთავება',
+	'Tables have been truncated.' => 'ცხრილი გასუფთავდა.',
+	'Rows' => 'რიგი',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Tables have been moved.' => 'ცხრილი გადაადგილდა.',
+	'Move to other database' => 'გადატანა სხვა ბაზაში',
+	'Move' => 'გადატანა',
+	'Engine' => 'ძრავი',
+	'Save and continue edit' => 'შენახვა და ცვლილების გაგრძელება',
+	'original' => 'საწყისი',
+	'%d item(s) have been affected.' => 'შეიცვალა %d ჩანაწერი.',
+	'Whole result' => 'სრული შედეგი',
+	'Tables have been dropped.' => 'ცხრილები წაიშალა.',
+	'Clone' => 'კლონირება',
+	'Partition by' => 'დაყოფა',
+	'Partitions' => 'დანაყოფები',
+	'Partition name' => 'დანაყოფის სახელი',
+	'Values' => 'პარამეტრები',
+	'%d row(s) have been imported.' => 'დაიმპორტდა %d რიგი.',
+	'Import' => 'იმპორტი',
+	'Stop on error' => 'გაჩერება შეცდომისას',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'მიღწეულია დაშვებული ველების მაქსიმალური რაოდენობა, გაზარდეთ %s.',
+	'anywhere' => 'ნებისმიერ ადგილას',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$5.$3.$1',
+	'[yyyy]-mm-dd' => 'დდ.თთ.[წწწწ]',
+	'History' => 'ისტორია',
+	'Variables' => 'ცვლადები',
+	'Relations' => 'ურთიერთობა',
+	'Run file' => 'ფაილის გაშვება',
+	'Clear' => 'გასუფთავება',
+	'Maximum allowed file size is %sB.' => 'ფაილის მაქსიმალური ზომა - %sB.',
+	'Numbers' => 'ციფრები',
+	'Date and time' => 'დრო და თარიღი',
+	'Binary' => 'ორობითი',
+	'Lists' => 'სია',
+	'Editor' => 'რედაქტორი',
+	'E-mail' => 'ელ. ფოსტა',
+	'From' => 'ავტორი:',
+	'Subject' => 'თემა',
+	'Send' => 'გაგზავნა',
+	'%d e-mail(s) have been sent.' => 'გაიგზავნა %d წერილი.',
+	'Webserver file %s' => 'ფაილი %s ვებსერვერზე',
+	'File does not exist.' => 'ასეთი ფაილი არ არსებობს.',
+	'%d in total' => 'სულ %d',
+	'Permanent login' => 'სისტემაში დარჩენა',
+	'Databases have been dropped.' => 'ბაზა წაიშალა.',
+	'Search data in tables' => 'ცხრილებში ძებნა',
+	'Schema' => 'სქემა',
+	'Alter schema' => 'სქემის შეცვლა',
+	'Create schema' => 'ახალი სქემა',
+	'Schema has been dropped.' => 'სქემა წაიშალა.',
+	'Schema has been created.' => 'შეიქმნა ახალი სქემა.',
+	'Schema has been altered.' => 'სქემა შეიცვალა.',
+	'Sequences' => 'მიმდევრობა',
+	'Create sequence' => 'მიმდევრობის შექმნა',
+	'Alter sequence' => 'მიმდევრობის შეცვლა',
+	'Sequence has been dropped.' => 'მიმდევრობა წაიშალა.',
+	'Sequence has been created.' => 'მიმდევრობა შეიქმნა.',
+	'Sequence has been altered.' => 'მიმდევრობა შეიცვალა.',
+	'User types' => 'მომხმარებლის სახეობა',
+	'Create type' => 'სახეობის შექმნა',
+	'Alter type' => 'სახეობის შეცვლა',
+	'Type has been dropped.' => 'სახეობა წაიშალა.',
+	'Type has been created.' => 'სახეობა შეიქმნა.',
+	'Ctrl+click on a value to modify it.' => 'შესაცვლელად გამოიყენეთ Ctrl+თაგვის ღილაკი.',
+	'Use edit link to modify this value.' => 'ამ მნიშვნელობის შესაცვლელად გამოიყენეთ ბმული «შეცვლა».',
+	'last' => 'ბოლო',
+	'From server' => 'სერვერიდან',
+	'System' => 'სისტემა',
+	'Select data' => 'არჩევა',
+	'Show structure' => 'სტრუქტურის ჩვენება',
+	'empty' => 'ცარიელი',
+	'Network' => 'ქსელი',
+	'Geometry' => 'გეომეტრია',
+	'File exists.' => 'ფაილი უკვე არსებობს.',
+	'Attachments' => 'მიმაგრებული ფაილები',
+	'%d query(s) executed OK.' => '%d მოთხოვნა შესრულდა.',
+	'Show only errors' => 'მხოლოდ შეცდომები',
+	'Refresh' => 'განახლება',
+	'Invalid schema.' => 'არასწორი სქემა.',
+	'Please use one of the extensions %s.' => 'გამოიყენეთ ერთ-ერთი გაფართოება %s.',
+	'now' => 'ახლა',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'ცხრილი დაკოპირდა.',
+	'Copy' => 'კოპირება',
+	'Permanent link' => 'მუდმივი ბმული',
+	'Edit all' => 'ყველას შეცვლა',
+	'HH:MM:SS' => 'სთ:წთ:წმ',
+	'Tables have been optimized.' => 'ცხრილებს გაუკეთდა ოპტიმიზაცია.',
+	'Materialized view' => 'მატერიალური ხედი',
+	'Vacuum' => 'ვაკუუმი',
+	'Selected' => 'არჩეული',
+	'File must be in UTF-8 encoding.' => 'ფაილი უნდა იყოს კოდირებაში UTF-8.',
+	'Modify' => 'შეცვლა',
+	'Loading' => 'ჩატვირთვა',
+	'Load more data' => 'მეტი ინფორმაციის ჩატვირთვა',
+	'ATTACH queries are not supported.' => 'ATTACH-მოთხოვნები არაა მხარდაჭერილი.',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'რიგების შეზღუდვა',
+	'Default value' => 'სტანდარტული მნიშვნელობა',
+	'Full table scan' => 'სრული ცხრილის ანალიზი',
+	'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, რათა ის მუდმივი გახადოთ.',
+	'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-თი და შემდეგ გაუკეთოთ იმპორტი სერვერიდან.',
+	'Size' => 'ზომა',
+	'Compute' => 'გამოთვლა',
+	'You are offline.' => 'არ გაგივლიათ ავტორიზაცია.',
+	'You have no privileges to update this table.' => 'ამ ცხრილის განახლების უფლება არ გაქვთ.',
+	'Saving' => 'შენახვა',
+	'yes' => 'კი',
+	'no' => 'არა',
+	'Routines' => 'რუტინები',
+	'Target table' => 'მიზნობრივი ცხრილი',
+	'Strings' => 'ველები',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'საწყისი და მიზნობრივი ველები უნდა იყოს ერთიდაიგივე სახეობის, მიზნობრივ ველზე უნდა იყოს ინდექსი და უნდა არსებობდეს შესაბამისი ინფორმაცია.',
+	'Drop %s?' => 'წაიშალოს %s?',
+	'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 გაფართოება.',
+);

adminer/lang/ko.inc.php

@@ -1,267 +1,280 @@
 <?php
 $translations = array(
-	'Login' => '로그인',
-	'Logout successful.' => '로그아웃',
-	'Invalid credentials.' => '잘못된 로그인',
-	'Server' => '서버',
-	'Username' => '사용자이름',
-	'Password' => '비밀번호',
-	'Select database' => '데이터베이스를 선택하십시오.',
-	'Invalid database.' => '잘못된 데이터베이스입니다.',
-	'Table has been dropped.' => '테이블을 삭제했습니다.',
-	'Table has been altered.' => '테이블을 변경했습니다.',
-	'Table has been created.' => '테이블을 만들었습니다.',
-	'Alter table' => '테이블 변경',
-	'Create table' => '테이블 만들기',
-	'Table name' => '테이블 이름',
-	'engine' => '엔진',
-	'collation' => '정렬',
-	'Column name' => '열 이름',
-	'Type' => '형',
-	'Length' => '길이',
-	'Auto Increment' => '자동증가',
-	'Options' => '설정',
-	'Save' => '저장',
-	'Drop' => '삭제',
-	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
-	'Database has been created.' => '데이터베이스를 만들었습니다.',
-	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
-	'Database has been altered.' => '데이터베이스를 변경했습니다.',
-	'Alter database' => '데이터베이스 변경',
-	'Create database' => '데이터베이스 만들기',
-	'SQL command' => 'SQL 명령',
-	'Logout' => '로그아웃',
-	'database' => '데이터베이스',
-	'Use' => '사용',
-	'No tables.' => '테이블이 없습니다.',
-	'select' => '선택',
-	'Item has been deleted.' => '항목을 삭제했습니다.',
-	'Item has been updated.' => '항목을 갱신했습니다.',
-	'Edit' => '편집',
-	'Insert' => '삽입',
-	'Save and insert next' => '저장하고 다음에 추가',
-	'Delete' => '삭제',
-	'Database' => '데이터베이스',
-	'Routines' => '루틴',
-	'Indexes have been altered.' => '인덱스를 변경했습니다.',
-	'Indexes' => '색인',
-	'Alter indexes' => '인덱스 변경',
-	'Add next' => '추가',
-	'Language' => '언어',
-	'Select' => '선택',
-	'New item' => '항목 만들기',
-	'Search' => '검색',
-	'Sort' => '정렬',
-	'descending' => '역순',
-	'Limit' => '제약',
-	'No rows.' => '행이 없습니다.',
-	'Action' => '실행',
-	'edit' => '편집',
-	'Page' => '페이지',
-	'Query executed OK, %d row(s) affected.' => '쿼리를 실행했습니다. %d 행을 변경했습니다.',
-	'Error in query' => '쿼리의 오류',
-	'Execute' => '실행',
-	'Table' => '테이블',
-	'Foreign keys' => '외부 키',
-	'Triggers' => '트리거',
-	'View' => '보기',
-	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
-	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰. 다시 보내주십시오.',
-	'Comment' => '코멘트',
-	'Default values' => '기본값',
+	'$1-$3-$5' => '$1-$3-$5',
+	'%.3f s' => '%.3f 초',
 	'%d byte(s)' => '%d 바이트',
-	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
-	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
-	'File upload' => '파일 올리기',
-	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
-	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
-	'Call' => '외침',
-	'No extension' => '확장 기능이 없습니다.',
-	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장 (%s)가 설치되어 있지 않습니다.',
-	'Session support must be enabled.' => '세션을 사용하십시오.',
-	'Session expired, please login again.' => '세션 만료. 다시 로그인하십시오.',
-	'Text length' => '문자열의 길이',
-	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
-	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
-	'Foreign key has been created.' => '외부 키를 만들었습니다.',
-	'Foreign key' => '외부 키',
-	'Target table' => '테이블',
-	'Change' => '변경',
-	'Source' => '소스',
-	'Target' => '타겟',
-	'Add column' => '열 추가',
-	'Alter' => '변경',
-	'Add foreign key' => '외부 키를 추가',
-	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => '인덱스 형',
-	'Column (length)' => '열 (길이)',
-	'View has been dropped.' => '보기를 삭제했습니다.',
-	'View has been altered.' => '보기를 변경했습니다.',
-	'View has been created.' => '보기를 만들었습니다.',
-	'Alter view' => '보기 변경',
-	'Create view' => '뷰 만들기',
-	'Name' => '이름',
-	'Process list' => '프로세스 목록',
-	'%d process(es) have been killed.' => '%d 프로세스를 강제 종료되었습니다.',
-	'Kill' => '강제 종료',
-	'Parameter name' => '참조 여명',
-	'Database schema' => '구조',
-	'Create procedure' => '시저 만들기',
-	'Create function' => '함수 만들기',
-	'Routine has been dropped.' => '루틴 만들기',
-	'Routine has been altered.' => '루틴 변경',
-	'Routine has been created.' => '루틴 만들기',
-	'Alter function' => '함수의 변경',
-	'Alter procedure' => '시저 변경',
-	'Return type' => '반환 형식',
-	'Add trigger' => '트리거 추가',
-	'Trigger has been dropped.' => '트리거를 제거했습니다.',
-	'Trigger has been altered.' => '트리거를 변경했습니다.',
-	'Trigger has been created.' => '트리거를 추가했습니다.',
-	'Alter trigger' => '트리거 변경',
-	'Create trigger' => '트리거 만들기',
-	'Time' => '시간',
-	'Event' => '이벤트',
+	'%d e-mail(s) have been sent.' => '%d개 메일을 보냈습니다.',
+	'%d in total' => '총 %d개',
+	'%d item(s) have been affected.' => '%d개 항목을 갱신했습니다.',
+	'%d process(es) have been killed.' => '%d개 프로세스를 강제 종료하였습니다.',
+	'%d query(s) executed OK.' => '%d개 쿼리를 잘 실행했습니다.',
+	'%d row(s) have been imported.' => '%d개 행을 가져 왔습니다.',
+	'%d row(s)' => '%d개 행',
 	'%s version: %s through PHP extension %s' => '%s 버전 %s, PHP 확장 %s',
-	'%d row(s)' => '%d 행',
-	'Remove' => '제외',
-	'Are you sure?' => '실행 하시겠습니까?',
-	'Privileges' => '권한',
-	'Create user' => '사용자 만들기',
-	'User has been dropped.' => '사용자 삭제',
-	'User has been altered.' => '사용자 변경',
-	'User has been created.' => '사용자 만들기',
-	'Hashed' => 'Hashed',
-	'Column' => '열',
-	'Routine' => '루틴',
-	'Grant' => '권한 부여',
-	'Revoke' => '권한 취소',
-	'Logged as: %s' => '로그 : %s',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
-	'Move up' => '상',
-	'Move down' => '아래',
-	'Export' => '내보내기',
-	'Tables' => '테이블',
-	'Data' => '데이터',
-	'Output' => '출력',
-	'open' => '열',
-	'save' => '저장',
-	'Format' => '형식',
-	'Functions' => '함수',
-	'Aggregation' => '집합',
-	'Event has been dropped.' => '삭제했습니다.',
-	'Event has been altered.' => '변경했습니다.',
-	'Event has been created.' => '만들었습니다.',
-	'Alter event' => '변경',
-	'Create event' => '만들기',
-	'Start' => '시작',
-	'End' => '종료',
-	'Every' => '매번',
-	'Status' => '상태',
-	'On completion preserve' => '완성 후 저장',
-	'Events' => '이벤트',
-	'Schedule' => '일정',
-	'At given time' => '지정 시간',
-	'Tables have been truncated.' => '테이블을 truncate했습니다.',
-	'Tables have been moved.' => '테이블을 옮겼습니다.',
-	'Tables and views' => '테이블과 뷰',
-	'Engine' => '엔진',
-	'Collation' => '정렬',
-	'Data Length' => '데이터 길이',
-	'Index Length' => '인덱스 길이',
-	'Data Free' => '여유',
-	'Rows' => '행',
 	',' => ',',
 	'0123456789' => '0123456789',
-	'Analyze' => '분석',
-	'Optimize' => '최적화',
-	'Check' => '확인',
-	'Repair' => '복구',
-	'Truncate' => 'Truncate',
-	'Move to other database' => '다른 데이터베이스로 이동',
-	'Move' => '이동',
-	'Save and continue edit' => '저장하고 계속',
-	'original' => '원래',
-	'%d item(s) have been affected.' => '%d를 갱신했습니다.',
-	'whole result' => '모든 결과',
-	'Tables have been dropped.' => '테이블을 삭제했습니다.',
-	'Clone' => '복제',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s를 늘리십시오.',
-	'Partition by' => '파티션',
-	'Partitions' => '파티션',
-	'Partition name' => '파티션 이름',
-	'Values' => '값',
-	'%d row(s) have been imported.' => '%d 행을 가져 왔습니다.',
-	'Show structure' => '구조',
-	'anywhere' => '모든',
-	'Import' => '가져 오기',
-	'Stop on error' => '오류의 경우 중지',
-	'Select data' => '데이터',
-	'%.3f s' => '%.3f 초',
-	'$1-$3-$5' => '$1-$3-$5',
 	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
-	'History' => '역사',
-	'Variables' => '변수',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '원본 및 대상 열은 동일한 데이터 형식이어야합니다. 목표 컬럼에 인덱스와 데이터가 존재해야합니다.',
-	'Relations' => '관계',
-	'Run file' => '파일을 실행',
-	'Clear' => '삭제',
-	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
-	'Numbers' => '숫자',
-	'Date and time' => '시간',
-	'Strings' => '문자열',
-	'Binary' => '이진',
-	'Lists' => '목록',
-	'Editor' => '에디터',
-	'E-mail' => '메일',
-	'From' => '보낸 사람',
-	'Subject' => '제목',
-	'Send' => '보내기',
-	'%d e-mail(s) have been sent.' => '%d 메일을 보냈습니다.',
-	'Webserver file %s' => 'Web 서버 파일 %s',
-	'File does not exist.' => '파일이 존재하지 않습니다.',
-	'%d in total' => '총 %d',
-	'Permanent login' => '영구적으로 로그인',
-	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
-	'Search data in tables' => '데이터 검색',
-	'Schema' => '스키마',
+	'Action' => '실행',
+	'Add column' => '열 추가',
+	'Add foreign key' => '외부 키를 추가',
+	'Add next' => '다음 추가',
+	'Add trigger' => '트리거 추가',
+	'Aggregation' => '집합',
+	'Alter database' => '데이터베이스 변경',
+	'Alter event' => '이벤트 변경',
+	'Alter function' => '함수 변경',
+	'Alter indexes' => '색인 변경',
+	'Alter procedure' => '시저 변경',
 	'Alter schema' => '스키마 변경',
-	'Create schema' => '스키마 추가',
-	'Schema has been dropped.' => '스키마를 삭제했습니다.',
-	'Schema has been created.' => '스키마를 추가했습니다.',
-	'Schema has been altered.' => '스키마를 변경했습니다.',
-	'Sequences' => '시퀀스',
-	'Create sequence' => '시퀀스 만들기',
 	'Alter sequence' => '순서 변경',
-	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
-	'Sequence has been created.' => '시퀀스를 추가했습니다.',
-	'Sequence has been altered.' => '순서를 변경했습니다.',
-	'User types' => '사용자 정의 형',
-	'Create type' => '사용자 정의 형식 만들기',
-	'Alter type' => '사용자 정의 형식 변경',
-	'Type has been dropped.' => '사용자 정의 형식을 삭제했습니다.',
-	'Type has been created.' => '사용자 정의 형식을 추가했습니다.',
-	'Use edit link to modify this value.' => '링크 편집',
-	'last' => '마지막',
-	'From server' => '서버에서 실행',
-	'System' => '데이터베이스 형식',
-	'empty' => '하늘',
-	'Network' => '네트워크 형',
-	'Geometry' => '기하 형',
-	'File exists.' => '파일이 이미 있습니다.',
+	'Alter table' => '테이블 변경',
+	'Alter trigger' => '트리거 변경',
+	'Alter type' => '형 변경',
+	'Alter view' => '보기 변경',
+	'Alter' => '변경',
+	'Analyze' => '분석',
+	'anywhere' => '모든',
+	'Are you sure?' => '실행 하시겠습니까?',
+	'At given time' => '지정 시간',
 	'Attachments' => '첨부 파일',
-	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
-	'now' => '현재 시간',
-	'%d query(s) executed OK.' => '%d 쿼리를 실행했습니다.',
-	'Show only errors' => '오류 만 표시',
-	'Refresh' => '새로 고침',
-	'Invalid schema.' => '잘못된 스키마',
-	'Please use one of the extensions %s.' => '하나의 확장 기능을 사용하십시오 %s',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => '테이블을 복사했습니다',
+	'Auto Increment' => '자동 증가',
+	'Binary' => '이진',
+	'Call' => '호출',
+	'Change' => '변경',
+	'Check' => '확인',
+	'Clear' => '삭제',
+	'Clone' => '복제',
+	'collation' => '정렬',
+	'Collation' => '정렬',
+	'Column (length)' => '열 (길이)',
+	'Column name' => '열 이름',
+	'Column' => '열',
+	'Comment' => '주석',
+	'Compute' => '계산하기',
 	'Copy' => '복사',
-	'Permanent link' => '영구 링크',
-	'Edit all' => '모든 편집',
+	'Create database' => '데이터베이스 만들기',
+	'Create event' => '만들기',
+	'Create function' => '함수 만들기',
+	'Create procedure' => '시저 만들기',
+	'Create schema' => '스키마 추가',
+	'Create sequence' => '시퀀스 만들기',
+	'Create table' => '테이블 만들기',
+	'Create trigger' => '트리거 만들기',
+	'Create type' => '사용자 정의 형식 만들기',
+	'Create user' => '사용자 만들기',
+	'Create view' => '뷰 만들기',
+	'Data Free' => '데이터 여유',
+	'Data Length' => '데이터 길이',
+	'Data' => '데이터',
+	'Database has been altered.' => '데이터베이스를 변경했습니다.',
+	'Database has been created.' => '데이터베이스를 만들었습니다.',
+	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
+	'Database schema' => '데이터베이스 구조',
+	'database' => '데이터베이스',
+	'Database' => '데이터베이스',
+	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Date and time' => '시간',
+	'Default values' => '기본값',
+	'Delete' => '삭제',
+	'descending' => '역순',
+	'Drop' => '삭제',
+	'E-mail' => '메일',
+	'Edit all' => '모두 편집',
+	'Edit' => '편집',
+	'edit' => '편집',
+	'Editor' => '에디터',
+	'empty' => '비어있음',
+	'End' => '종료',
+	'engine' => '엔진',
+	'Engine' => '엔진',
+	'Error in query' => '쿼리의 오류',
+	'Event has been altered.' => '변경했습니다.',
+	'Event has been created.' => '만들었습니다.',
+	'Event has been dropped.' => '삭제했습니다.',
+	'Event' => '이벤트',
+	'Events' => '이벤트',
+	'Every' => '매 번',
+	'Execute' => '실행',
+	'Export' => '내보내기',
+	'File does not exist.' => '파일이 존재하지 않습니다.',
+	'File exists.' => '파일이 이미 있습니다.',
+	'File upload' => '파일 올리기',
+	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
+	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
+	'Foreign key has been created.' => '외부 키를 만들었습니다.',
+	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
+	'Foreign key' => '외부 키',
+	'Foreign keys' => '외부 키',
+	'Format' => '형식',
+	'From server' => '서버에서 실행',
+	'From' => '보낸 사람',
+	'Functions' => '함수',
+	'Geometry' => '기하 형',
+	'Grant' => '권한 부여',
+	'Hashed' => 'Hashed',
 	'HH:MM:SS' => '시:분:초',
+	'History' => '이력',
+	'Import' => '가져 오기',
+	'Index Length' => '색인 길이',
+	'Index Type' => '색인 형',
+	'Indexes have been altered.' => '색인을 변경했습니다.',
+	'Indexes' => '색인',
+	'Insert' => '삽입',
+	'Invalid credentials.' => '잘못된 로그인',
+	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
+	'Invalid database.' => '잘못된 데이터베이스입니다.',
+	'Invalid schema.' => '잘못된 스키마입니다.',
+	'Item has been deleted.' => '항목을 삭제했습니다.',
+	'Item has been updated.' => '항목을 갱신했습니다.',
+	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
+	'Kill' => '강제 종료',
+	'Language' => '언어',
+	'last' => '마지막',
+	'Length' => '길이',
+	'Limit rows' => '행 제약',
+	'Limit' => '제약',
+	'Lists' => '목록',
+	'Load more data' => '더 많은 데이터 부르기',
+	'Loading' => '부르는 중',
+	'Logged as: %s' => '다음으로 로그인했습니다: %s',
+	'Login' => '로그인',
+	'Logout successful.' => '로그아웃을 성공했습니다.',
+	'Logout' => '로그아웃',
+	'ltr' => 'ltr',
+	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s(을)를 늘리십시오.',
+	'Modify' => '수정',
+	'Move down' => '아래로',
+	'Move to other database' => '다른 데이터베이스로 이동',
+	'Move up' => '위로',
+	'Move' => '이동',
+	'Name' => '이름',
+	'Network' => '네트워크 형',
+	'New item' => '항목 만들기',
+	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
+	'No extension' => '확장이 없습니다.',
+	'No rows.' => '행이 없습니다.',
+	'No tables.' => '테이블이 없습니다.',
+	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장(%s)이 설치되어 있지 않습니다.',
+	'now' => '현재 시간',
+	'Numbers' => '숫자',
+	'On completion preserve' => '완성 후 저장',
+	'ON DELETE' => '지울 때',
+	'ON UPDATE' => '업데이트할 때',
+	'open' => '열',
+	'Optimize' => '최적화',
+	'Options' => '설정',
+	'original' => '원본',
+	'Output' => '출력',
+	'overwrite' => '덮어쓰기',
+	'Page' => '페이지',
+	'Parameter name' => '매개변수 이름',
+	'Partition by' => '파티션',
+	'Partition name' => '파티션 이름',
+	'Partitions' => '파티션',
+	'Password' => '비밀번호',
+	'Permanent link' => '영구적으로 링크',
+	'Permanent login' => '영구적으로 로그인',
+	'Please use one of the extensions %s.' => '확장 %s 중 하나를 사용하십시오.',
+	'Privileges' => '권한',
+	'Process list' => '프로세스 목록',
+	'Query executed OK, %d row(s) affected.' => '쿼리를 잘 실행했습니다. %d행을 변경했습니다.',
+	'Refresh' => '새로 고침',
+	'Relations' => '관계',
+	'Remove' => '제거',
+	'Repair' => '복구',
+	'Return type' => '반환 형식',
+	'Revoke' => '권한 취소',
+	'Routine has been altered.' => '루틴을 변경했습니다.',
+	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
+	'Routine has been created.' => '루틴을 추가했습니다.',
+	'Routine has been dropped.' => '루틴을 제거했습니다.',
+	'Routine' => '루틴',
+	'Routines' => '루틴',
+	'Rows' => '행',
+	'Run file' => '파일을 실행',
+	'Save and continue edit' => '저장하고 계속 편집하기',
+	'Save and insert next' => '저장하고 다음에 추가',
+	'Save' => '저장',
+	'save' => '저장',
+	'Schedule' => '예약',
+	'Schema has been altered.' => '스키마를 변경했습니다.',
+	'Schema has been created.' => '스키마를 추가했습니다.',
+	'Schema has been dropped.' => '스키마를 삭제했습니다.',
+	'Schema' => '스키마',
+	'Search data in tables' => '테이블 내 데이터 검색',
+	'Search' => '검색',
+	'Select data' => '데이터를 선택하십시오.',
+	'Select database' => '데이터베이스를 선택하십시오.',
+	'Select' => '선택',
+	'select' => '선택',
+	'Selected' => '선택됨',
+	'Send' => '보내기',
+	'Sequence has been altered.' => '시퀀스를 변경했습니다.',
+	'Sequence has been created.' => '시퀀스를 추가했습니다.',
+	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
+	'Sequences' => '시퀀스',
+	'Server' => '서버',
+	'Session expired, please login again.' => '세션이 만료되었습니다. 다시 로그인하십시오.',
+	'Session support must be enabled.' => '세션 지원을 사용해야만 합니다.',
+	'Show only errors' => '오류 만 표시',
+	'Show structure' => '구조 표시',
+	'Size' => '크기',
+	'Sort' => '정렬',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '원본과 대상 열은 동일한 데이터 형식이어야만 합니다. 목표 열에 색인과 데이터가 존재해야만 합니다.',
+	'Source' => '소스',
+	'SQL command' => 'SQL 명령',
+	'Start' => '시작',
+	'Status' => '상태',
+	'Stop on error' => '오류의 경우 중지',
+	'Strings' => '문자열',
+	'Subject' => '제목',
+	'System' => '데이터베이스 형식',
+	'Table has been altered.' => '테이블을 변경했습니다.',
+	'Table has been created.' => '테이블을 만들었습니다.',
+	'Table has been dropped.' => '테이블을 삭제했습니다.',
+	'Table name' => '테이블 이름',
+	'Table' => '테이블',
+	'Tables and views' => '테이블과 뷰',
+	'Tables have been copied.' => '테이블을 복사했습니다',
+	'Tables have been dropped.' => '테이블을 삭제했습니다.',
+	'Tables have been moved.' => '테이블을 옮겼습니다.',
+	'Tables have been truncated.' => '테이블의 데이터 내용만 지웠습니다.',
+	'Tables' => '테이블',
+	'Target table' => '테이블',
+	'Target' => '타겟',
+	'Text length' => '문자열의 길이',
+	'Time' => '시간',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
+	'Trigger has been altered.' => '트리거를 변경했습니다.',
+	'Trigger has been created.' => '트리거를 추가했습니다.',
+	'Trigger has been dropped.' => '트리거를 제거했습니다.',
+	'Triggers' => '트리거',
+	'Truncate' => '데이터 내용만 지우기',
+	'Type has been created.' => '유형을 추가했습니다.',
+	'Type has been dropped.' => '유형을 삭제했습니다.',
+	'Type' => '형',
+	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
+	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
+	'Use edit link to modify this value.' => '이 값을 수정하려면 편집 링크를 사용하십시오.',
+	'Use' => '사용',
+	'User has been altered.' => '사용자를 변경했습니다.',
+	'User has been created.' => '사용자를 만들었습니다.',
+	'User has been dropped.' => '사용자를 제거했습니다.',
+	'Username' => '사용자이름',
+	'Vacuum' => '청소',
+	'Values' => '값',
+	'Variables' => '변수',
+	'View has been altered.' => '보기를 변경했습니다.',
+	'View has been created.' => '보기를 만들었습니다.',
+	'View has been dropped.' => '보기를 삭제했습니다.',
+	'View' => '보기',
+	'Warnings' => '경고',
+	'Webserver file %s' => '웹서버 파일 %s',
+	'Whole result' => '모든 결과',
+	'yes' => '네',
+	'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.' => '이 테이블을 업데이트할 권한이 없습니다.',
 );

adminer/lang/lt.inc.php

@@ -229,7 +229,7 @@ $translations = array(
 	'%d row(s)' => array('%d įrašas', '%d įrašai', '%d įrašų'),
 	'Page' => 'Puslapis',
 	'last' => 'paskutinis',
-	'whole result' => 'visas rezultatas',
+	'Whole result' => 'Visas rezultatas',
 	'%d byte(s)' => array('%d baitas', '%d baigai', '%d baitų'),
 	
 	'Import' => 'Importas',

adminer/lang/ms.inc.php

@@ -10,9 +10,8 @@ $translations = array(
 	'Logout' => 'Log keluar',
 	'Logged as: %s' => 'Log masuk sebagai: %s',
 	'Logout successful.' => 'Log keluar berjaya.',
-	'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'Terima kasih kerana menggunakan Adminer, pertimbangkan untuk <a href="%s">menderma</a>.',
+	'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.',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/en/extension/"%s>Gunakan</a> cara %s untuk menggunakan SQLite.',
 	'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',
@@ -251,7 +250,7 @@ $translations = array(
 	'last' => 'akhir',
 	'Load more data' => 'Load lebih data',
 	'Loading' => 'Loading',
-	'whole result' => 'keputusan keseluruhan',
+	'Whole result' => 'Keputusan keseluruhan',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 
 	'Import' => 'Import',

adminer/lang/nl.inc.php

@@ -187,7 +187,7 @@ $translations = array(
 	'Move to other database' => 'Verplaats naar andere database',
 	'Move' => 'Verplaats',
 	'%d item(s) have been affected.' => array('%d item aangepast.', '%d items aangepast.'),
-	'whole result' => 'volledig resultaat',
+	'Whole result' => 'Volledig resultaat',
 	'Clone' => 'Dupliceer',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maximum aantal velden bereikt. Verhoog %s.',
 	'Partition by' => 'Partitioneren op',

adminer/lang/no.inc.php

@@ -212,7 +212,7 @@ $translations = array(
 	'last' => 'siste',
 	'Load more data' => 'Last mer data',
 	'Loading' => 'Laster',
-	'whole result' => 'hele resultatet',
+	'Whole result' => 'Hele resultatet',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'Import' => 'Importer',
 	'%d row(s) have been imported.' => array('%d rad er importert.', '%d rader er importert.'),

adminer/lang/pl.inc.php

@@ -10,9 +10,8 @@ $translations = array(
 	'Logout' => 'Wyloguj',
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
-	'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ proszę <a href="%s">dotację</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ proszę <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
 	'Invalid credentials.' => 'Nieprawidłowe dane logowania.',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/pl/extension/"%s>Zaimplementuj</a> metodę %s aby użyć SQLite.',
 	'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',
@@ -250,7 +249,7 @@ $translations = array(
 	'last' => 'ostatni',
 	'Load more data' => 'Wczytaj więcej danych',
 	'Loading' => 'Wczytywanie',
-	'whole result' => 'wybierz wszystkie',
+	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
 	
 	'Import' => 'Import',

adminer/lang/pt-br.inc.php

@@ -47,7 +47,7 @@ $translations = array(
 	'Indexes have been altered.' => 'Os Índices foram alterados.',
 	'Indexes' => 'Índices',
 	'Alter indexes' => 'Alterar índices',
-	'Add next' => 'Adicionar proximo',
+	'Add next' => 'Adicionar próximo',
 	'Language' => 'Idioma',
 	'Select' => 'Selecionar',
 	'New item' => 'Novo Registro',
@@ -66,19 +66,19 @@ $translations = array(
 	'Foreign keys' => 'Chaves estrangeiras',
 	'Triggers' => 'Triggers',
 	'View' => 'Visão',
-	'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.',
+	'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.',
 	'File upload' => 'Importar arquivo',
-	'File uploads are disabled.' => 'Importação de arquivos desablilitada.',
+	'File uploads are disabled.' => 'Importação de arquivos desabilitada.',
 	'Routine has been called, %d row(s) affected.' => array('Rotina executada, %d registro afetado.', 'Rotina executada, %d registros afetados.'),
 	'Call' => 'Chamar',
 	'No extension' => 'Não há extension',
-	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP suportadas (%s) está disponivel.',
+	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP suportadas (%s) está disponível.',
 	'Session support must be enabled.' => 'Suporte a sessões deve estar habilitado.',
 	'Session expired, please login again.' => 'Sessão expirada, por favor logue-se novamente.',
 	'Text length' => 'Tamanho de texto',
@@ -169,7 +169,7 @@ $translations = array(
 	'Index Length' => 'Tamanho de índice',
 	'Data Free' => 'Espaço Livre',
 	'Collation' => 'Colação',
-	'Analyze' => 'Analizar',
+	'Analyze' => 'Analisar',
 	'Optimize' => 'Otimizar',
 	'Check' => 'Verificar',
 	'Repair' => 'Reparar',
@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'original',
 	'Tables have been dropped.' => 'As Tabelas foram eliminadas.',
 	'%d item(s) have been affected.' => array('%d item foi afetado.', '%d itens foram afetados.'),
-	'whole result' => 'resultado completo',
+	'Whole result' => 'Resultado completo',
 	'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',
@@ -209,7 +209,7 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo permitido é %sB.',
 	'Numbers' => 'Números',
 	'Date and time' => 'Data e hora',
-	'Strings' => 'Cadena',
+	'Strings' => 'Strings',
 	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',

adminer/lang/pt.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'original',
 	'Tables have been dropped.' => 'As tabelas foram eliminadas.',
 	'%d item(s) have been affected.' => array('%d item afetado.', '%d itens afetados.'),
-	'whole result' => 'resultado completo',
+	'Whole result' => 'Resultado completo',
 	'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',

adminer/lang/ro.inc.php

@@ -185,7 +185,7 @@ $translations = array(
 	'Save and continue edit' => 'Salvează și continuă editarea',
 	'original' => 'original',
 	'%d item(s) have been affected.' => array('A fost modificată %d înscriere.', 'Au fost modificate %d înscrieri.'),
-	'whole result' => 'tot rezultatul',
+	'Whole result' => 'Tot rezultatul',
 	'Tables have been dropped.' => 'Tabelele au fost șterse.',
 	'Clone' => 'Clonează',
 	'Partition by' => 'Împarte',

adminer/lang/ru.inc.php

@@ -185,7 +185,7 @@ $translations = array(
 	'Save and continue edit' => 'Сохранить и продолжить редактирование',
 	'original' => 'исходный',
 	'%d item(s) have been affected.' => array('Была изменена %d запись.', 'Были изменены %d записи.', 'Было изменено %d записей.'),
-	'whole result' => 'весь результат',
+	'Whole result' => 'Весь результат',
 	'Tables have been dropped.' => 'Таблицы были удалены.',
 	'Clone' => 'Клонировать',
 	'Partition by' => 'Разделить по',
@@ -276,7 +276,6 @@ $translations = array(
 	'ATTACH queries are not supported.' => 'ATTACH-запросы не поддерживаются.',
 	'%d / ' => '%d / ',
 	'Limit rows' => 'Лимит строк',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/en/extension/"%s>Реализуйте</a> метод %s, чтобы использовать SQLite.',
 	'Default value' => 'Значение по умолчанию',
 	'Full table scan' => 'Анализ полной таблицы',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Слишком много неудачных попыток входа. Попробуйте снова через %d минуту.', 'Слишком много неудачных попыток входа. Попробуйте снова через %d минуты.', 'Слишком много неудачных попыток входа. Попробуйте снова через %d минут.'),
@@ -290,4 +289,15 @@ $translations = array(
 	'Saving' => 'Сохранение',
 	'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.' => 'База данных не поддерживает пароль.',
 );

adminer/lang/sk.inc.php

@@ -187,7 +187,7 @@ $translations = array(
 	'Move to other database' => 'Presunúť do inej databázy',
 	'Move' => 'Presunúť',
 	'%d item(s) have been affected.' => '%d položiek bolo ovplyvnených.',
-	'whole result' => 'celý výsledok',
+	'Whole result' => 'Celý výsledok',
 	'Clone' => 'Klonovať',
 	'Partition by' => 'Rozdeliť podľa',
 	'Partitions' => 'Oddiely',

adminer/lang/sl.inc.php

@@ -225,7 +225,7 @@ $translations = array(
 	'%d row(s)' => array('%d vrstica', '%d vrstici', '%d vrstice', '%d vrstic'),
 	'Page' => 'Stran',
 	'last' => 'Zadnja',
-	'whole result' => 'cel razultat',
+	'Whole result' => 'Cel razultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajti', '%d bajtov'),
 	
 	'Import' => 'Uvozi',

adminer/lang/sr.inc.php

@@ -233,7 +233,7 @@ $translations = array(
 	'last' => 'последња',
 	'Loading' => 'Учитавам',
 	'Load more data' => 'Учитавам још података',
-	'whole result' => 'цео резултат',
+	'Whole result' => 'Цео резултат',
 	'%d byte(s)' => array('%d бајт', '%d бајта', '%d бајтова'),
 
 	'Import' => 'Увоз',

adminer/lang/sv.inc.php

@@ -0,0 +1,349 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'System',
+	'Server' => 'Server',
+	'Username' => 'Användarnamn',
+	'Password' => 'Lösenord',
+	'Permanent login' => 'Permanent inloggning',
+	'Login' => 'Logga in',
+	'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.',
+	'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öder inte lösenord.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('För många misslyckade inloggningar, försök igen om %d minut.', 'För många misslyckade inloggningar, försök igen om %d minuter.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Huvudlösenordet har löpt ut. <a href="https://www.adminer.org/en/extension/"%s>Implementera</a> %s en metod för att göra det permanent.',
+	'Language' => 'Språk',
+	'Invalid CSRF token. Send the form again.' => 'Ogiltig CSRF-token. Skicka formuläret igen.',
+	'If you did not send this request from Adminer then close this page.' => 'Om du inte skickade en förfrågan från Adminer så kan du stänga den här sidan.',
+	'No extension' => 'Inget tillägg',
+	'None of the supported PHP extensions (%s) are available.' => 'Inga av de PHP-tilläggen som stöds (%s) är tillgängliga.',
+	'Connecting to privileged ports is not allowed.' => 'Anslutning till privilegierade portar är inte tillåtet.',
+	'Disable %s or enable %s or %s extensions.' => 'Stäng av %s eller sätt på %s eller %s tilläggen.',
+	'Session support must be enabled.' => 'Support för sessioner måste vara på.',
+	'Session expired, please login again.' => 'Session har löpt ur, vänligen logga in igen.',
+	'The action will be performed after successful login with the same credentials.' => 'Åtgärden kommer att utföras efter en lyckad inloggning med samma inloggningsuppgifter.',
+	'%s version: %s through PHP extension %s' => '%s version: %s genom PHP-tillägg %s',
+	'Refresh' => 'Ladda om',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Privilegier',
+	'Create user' => 'Skapa användare',
+	'User has been dropped.' => 'Användare har blivit borttagen.',
+	'User has been altered.' => 'Användare har blivit ändrad.',
+	'User has been created.' => 'Användare har blivit skapad.',
+	'Hashed' => 'Hashad',
+	'Column' => 'Kolumn',
+	'Routine' => 'Rutin',
+	'Grant' => 'Tillåt',
+	'Revoke' => 'Neka',
+
+	'Process list' => 'Processlista',
+	'%d process(es) have been killed.' => array('%d process har avslutats.', '%d processer har avslutats.'),
+	'Kill' => 'Avsluta',
+
+	'Variables' => 'Variabler',
+	'Status' => 'Status',
+
+	'SQL command' => 'SQL-kommando',
+	'%d query(s) executed OK.' => array('%d förfrågan lyckades.', '%d förfrågor lyckades.'),
+	'Query executed OK, %d row(s) affected.' => array('Förfrågan lyckades, %d rad påverkades.', 'Förfrågan lyckades, %d rader påverkades.'),
+	'No commands to execute.' => 'Inga kommandon att köra.',
+	'Error in query' => 'Fel i förfrågan',
+	'Unknown error.' => 'Okänt fel.',
+	'Warnings' => 'Varningar',
+	'ATTACH queries are not supported.' => 'ATTACH-förfrågor stöds inte.',
+	'Execute' => 'Kör',
+	'Stop on error' => 'Stanna på fel',
+	'Show only errors' => 'Visa bara fel',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historia',
+	'Clear' => 'Rensa',
+	'Edit all' => 'Redigera alla',
+
+	'File upload' => 'Ladda upp fil',
+	'From server' => 'Från server',
+	'Webserver file %s' => 'Serverfil %s',
+	'Run file' => 'Kör fil',
+	'File does not exist.' => 'Filen finns inte.',
+	'File uploads are disabled.' => 'Filuppladdningar är avstängda.',
+	'Unable to upload a file.' => 'Det går inte add ladda upp filen.',
+	'Maximum allowed file size is %sB.' => 'Högsta tillåtna storlek är %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST-datan är för stor. Minska det eller höj %s-direktivet.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Du kan ladda upp en stor SQL-fil via FTP och importera det från servern.',
+	'You are offline.' => 'Du är offline.',
+
+	'Export' => 'Exportera',
+	'Output' => 'Utmatning',
+	'open' => 'Öppna',
+	'save' => 'Spara',
+	'Saving' => 'Sparar',
+	'Format' => 'Format',
+	'Data' => 'Data',
+
+	'Database' => 'Databas',
+	'database' => 'databas',
+	'DB' => 'DB',
+	'Use' => 'Använd',
+	'Select database' => 'Välj databas',
+	'Invalid database.' => 'Ogiltig databas.',
+	'Database has been dropped.' => 'Databasen har tagits bort.',
+	'Databases have been dropped.' => 'Databaserna har tagits bort.',
+	'Database has been created.' => 'Databasen har skapats.',
+	'Database has been renamed.' => 'Databasen har fått sitt namn ändrat.',
+	'Database has been altered.' => 'Databasen har ändrats.',
+	'Alter database' => 'Ändra databas',
+	'Create database' => 'Skapa databas',
+	'Database schema' => 'Databasschema',
+
+	// link to current database schema layout
+	'Permanent link' => 'Permanent länk',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Motor',
+	'Collation' => 'Kollationering',
+	'Data Length' => 'Datalängd',
+	'Index Length' => 'Indexlängd',
+	'Data Free' => 'Ledig data',
+	'Rows' => 'Rader',
+	'%d in total' => 'totalt %d',
+	'Analyze' => 'Analysera',
+	'Optimize' => 'Optimera',
+	'Vacuum' => 'Städa',
+	'Check' => 'Kolla',
+	'Repair' => 'Reparera',
+	'Truncate' => 'Avkorta',
+	'Tables have been truncated.' => 'Tabeller har blivit avkortade.',
+	'Move to other database' => 'Flytta till en annan databas',
+	'Move' => 'Flytta',
+	'Tables have been moved.' => 'Tabeller har flyttats.',
+	'Copy' => 'Kopiera',
+	'Tables have been copied.' => 'Tabeller har kopierats.',
+	'overwrite' => 'Skriv över',
+
+	'Routines' => 'Rutiner',
+	'Routine has been called, %d row(s) affected.' => array('Rutin har kallats, %d rad påverkades.', 'Rutin har kallats, %d rader påverkades.'),
+	'Call' => 'Kalla',
+	'Parameter name' => 'Namn på parameter',
+	'Create procedure' => 'Skapa procedur',
+	'Create function' => 'Skapa funktion',
+	'Routine has been dropped.' => 'Rutin har tagits bort.',
+	'Routine has been altered.' => 'Rutin har ändrats.',
+	'Routine has been created.' => 'Rutin har skapats.',
+	'Alter function' => 'Ändra funktion',
+	'Alter procedure' => 'Ändra procedur',
+	'Return type' => 'Återvändningstyp',
+
+	'Events' => 'Event',
+	'Event has been dropped.' => 'Event har tagits bort.',
+	'Event has been altered.' => 'Event har ändrats.',
+	'Event has been created.' => 'Event har skapats.',
+	'Alter event' => 'Ändra event',
+	'Create event' => 'Skapa event',
+	'At given time' => 'Vid en tid',
+	'Every' => 'Varje',
+	'Schedule' => 'Schemalägga',
+	'Start' => 'Start',
+	'End' => 'Slut',
+	'On completion preserve' => 'Bibehåll vid slutet',
+
+	'Tables' => 'Tabeller',
+	'Tables and views' => 'Tabeller och vyer',
+	'Table' => 'Tabell',
+	'No tables.' => 'Inga tabeller.',
+	'Alter table' => 'Ändra tabell',
+	'Create table' => 'Skapa tabell',
+	'Table has been dropped.' => 'Tabell har tagits bort.',
+	'Tables have been dropped.' => 'Tabeller har tagits bort.',
+	'Tables have been optimized.' => 'Tabeller har optimerats.',
+	'Table has been altered.' => 'Tabell har ändrats.',
+	'Table has been created.' => 'Tabell har skapats.',
+	'Table name' => 'Tabellnamn',
+	'Show structure' => 'Visa struktur',
+	'engine' => 'motor',
+	'collation' => 'kollationering',
+	'Column name' => 'Kolumnnamn',
+	'Type' => 'Typ',
+	'Length' => 'Längd',
+	'Auto Increment' => 'Automatisk uppräkning',
+	'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?',
+	'Size' => 'Storlek',
+	'Compute' => 'Beräkna',
+	'Move up' => 'Flytta upp',
+	'Move down' => 'Flytta ner',
+	'Remove' => 'Ta bort',
+	'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',
+	'Partitions' => 'Partitioner',
+	'Partition name' => 'Partition',
+	'Values' => 'Värden',
+
+	'View' => 'Vy',
+	'Materialized view' => 'Materialiserad vy',
+	'View has been dropped.' => 'Vy har tagits bort.',
+	'View has been altered.' => 'Vy har ändrats.',
+	'View has been created.' => 'Vy har skapats.',
+	'Alter view' => 'Ändra vy',
+	'Create view' => 'Skapa vy',
+
+	'Indexes' => 'Index',
+	'Indexes have been altered.' => 'Index har ändrats.',
+	'Alter indexes' => 'Ändra index',
+	'Add next' => 'Lägg till nästa',
+	'Index Type' => 'Indextyp',
+	'Column (length)' => 'Kolumn (längd)',
+
+	'Foreign keys' => 'Främmande nycklar',
+	'Foreign key' => 'Främmande nyckel',
+	'Foreign key has been dropped.' => 'Främmande nyckel har tagits bort.',
+	'Foreign key has been altered.' => 'Främmande nyckel har ändrats.',
+	'Foreign key has been created.' => 'Främmande nyckel har skapats.',
+	'Target table' => 'Måltabell',
+	'Change' => 'Ändra',
+	'Source' => 'Källa',
+	'Target' => 'Mål',
+	'Add column' => 'Lägg till kolumn',
+	'Alter' => 'Ändra',
+	'Add foreign key' => 'Lägg till främmande nyckel',
+	'ON DELETE' => 'VID BORTTAGNING',
+	'ON UPDATE' => 'VID UPPDATERING',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Käll- och mål-tabellen måste ha samma datatyp, ett index på målkolumnerna och refererad data måste finnas.',
+
+	'Triggers' => 'Avtryckare',
+	'Add trigger' => 'Lägg till avtryckare',
+	'Trigger has been dropped.' => 'Avtryckare har tagits bort.',
+	'Trigger has been altered.' => 'Avtryckare har ändrats.',
+	'Trigger has been created.' => 'Avtryckare har skapats.',
+	'Alter trigger' => 'Ändra avtryckare',
+	'Create trigger' => 'Skapa avtryckare',
+	'Time' => 'Tid',
+	'Event' => 'Event',
+	'Name' => 'Namn',
+
+	'select' => 'välj',
+	'Select' => 'Välj',
+	'Select data' => 'Välj data',
+	'Functions' => 'Funktioner',
+	'Aggregation' => 'Aggregation',
+	'Search' => 'Sök',
+	'anywhere' => 'överallt',
+	'Search data in tables' => 'Sök data i tabeller',
+	'Sort' => 'Sortera',
+	'descending' => 'Fallande',
+	'Limit' => 'Begränsning',
+	'Limit rows' => 'Begränsa rader',
+	'Text length' => 'Textlängd',
+	'Action' => 'Åtgärd',
+	'Full table scan' => 'Full tabellskanning',
+	'Unable to select the table' => 'Kunde inte välja tabellen',
+	'No rows.' => 'Inga rader.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d rad', '%d rader'),
+	'Page' => 'Sida',
+	'last' => 'sist',
+	'Load more data' => 'Ladda mer data',
+	'Loading' => 'Laddar',
+	'Whole result' => 'Hela resultatet',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+
+	'Import' => 'Importera',
+	'%d row(s) have been imported.' => array('%d rad har importerats.', '%d rader har importerats.'),
+	'File must be in UTF-8 encoding.' => 'Filer måste vara i UTF-8-format.',
+
+	// in-place editing in select
+	'Modify' => 'Ändra',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klicka på ett värde för att ändra det.',
+	'Use edit link to modify this value.' => 'Använd redigeringslänken för att ändra värdet.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Sak%s har skapats.',
+	'Item has been deleted.' => 'En sak har tagits bort.',
+	'Item has been updated.' => 'En sak har ändrats.',
+	'%d item(s) have been affected.' => array('%d sak har blivit förändrad.', '%d saker har blivit förändrade.'),
+	'New item' => 'Ny sak',
+	'original' => 'original',
+	// label for value '' in enum data type
+	'empty' => 'tom',
+	'edit' => 'redigera',
+	'Edit' => 'Redigera',
+	'Insert' => 'Infoga',
+	'Save' => 'Spara',
+	'Save and continue edit' => 'Spara och fortsätt att redigera',
+	'Save and insert next' => 'Spara och infoga nästa',
+	'Selected' => 'Vald',
+	'Clone' => 'Klona',
+	'Delete' => 'Ta bort',
+	'You have no privileges to update this table.' => 'Du har inga privilegier för att uppdatera den här tabellen.',
+
+	'E-mail' => 'Email',
+	'From' => 'Från',
+	'Subject' => 'Ämne',
+	'Attachments' => 'Bilagor',
+	'Send' => 'Skicka',
+	'%d e-mail(s) have been sent.' => array('%d email har blivit skickat.', '%d email har blivit skickade.'),
+
+	// data type descriptions
+	'Numbers' => 'Nummer',
+	'Date and time' => 'Datum och tid',
+	'Strings' => 'Strängar',
+	'Binary' => 'Binärt',
+	'Lists' => 'Listor',
+	'Network' => 'Nätverk',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relationer',
+
+	'Editor' => 'Redigerare',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$1-$3-$5',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'yyyy-mm-dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nu',
+	'yes' => 'ja',
+	'no' => 'nej',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Filen finns redan.',
+	'Please use one of the extensions %s.' => 'Vänligen använd en av filändelserna %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Redigera schema',
+	'Create schema' => 'Skapa schema',
+	'Schema has been dropped.' => 'Schema har tagits bort.',
+	'Schema has been created.' => 'Schema har skapats.',
+	'Schema has been altered.' => 'Schema har ändrats.',
+	'Schema' => 'Schema',
+	'Invalid schema.' => 'Ogiltigt schema.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Sekvenser',
+	'Create sequence' => 'Skapa sekvens',
+	'Sequence has been dropped.' => 'Sekvens har tagits bort.',
+	'Sequence has been created.' => 'Sekvens har skapats.',
+	'Sequence has been altered.' => 'Sekvens har ändrats.',
+	'Alter sequence' => 'Ändra sekvens',
+
+	// PostgreSQL user types support
+	'User types' => 'Användartyper',
+	'Create type' => 'Skapa typ',
+	'Type has been dropped.' => 'Typ har, typ, tagits bort.',
+	'Type has been created.' => 'Typ har skapats.',
+	'Alter type' => 'Ändra typ',
+);

adminer/lang/ta.inc.php

@@ -183,7 +183,7 @@ $translations = array(
 	'original' => 'அச‌ல்',
 	'Tables have been dropped.' => 'அட்ட‌வ‌ணை நீக்க‌ப்ப‌ட்ட‌து.',
 	'%d item(s) have been affected.' => array('%d உருப்ப‌டி மாற்ற‌ம‌டைந்தது.', '%d உருப்ப‌டிக‌ள் மாற்ற‌ம‌டைந்த‌ன‌.'),
-	'whole result' => 'முழுமையான‌ முடிவு',
+	'Whole result' => 'முழுமையான‌ முடிவு',
 	'Clone' => 'ந‌க‌லி (Clone)',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
 	'Partition by' => 'பிரித்த‌து',

adminer/lang/th.inc.php

@@ -186,7 +186,7 @@ $translations = array(
 	'original' => 'ต้นฉบับ',
 	'Tables have been dropped.' => 'ตารางถูกลบแล้ว.',
 	'%d item(s) have been affected.' => 'มี %d รายการถูกดำเนินการแล้ว.',
-	'whole result' => 'รวมผล',
+	'Whole result' => 'รวมผล',
 	'Clone' => 'ทำซ้ำ',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'จำนวนสูงสุดของฟิลด์อนุญาตให้เกิน กรุณาเพิ่มอีก %s.',
 	'Partition by' => 'พาร์ทิชันโดย',

adminer/lang/tr.inc.php

@@ -9,14 +9,20 @@ $translations = array(
 	'Login' => 'Giriş',
 	'Logout' => 'Çıkış',
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
-	'Logout successful.' => 'Başarıyla çıkış yapıldı.',
-	'Invalid credentials.' => 'Geçersiz kimlik.',
+	'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.',
+	'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',
 	'Invalid CSRF token. Send the form again.' => 'Geçersiz (CSRF) jetonu. Formu tekrar yolla.',
+	'If you did not send this request from Adminer then close this page.' => 'Bu isteği Adminer\'den göndermediyseniz bu sayfayı kapatın.',
 	'No extension' => 'Uzantı yok',
 	'None of the supported PHP extensions (%s) are available.' => 'Desteklenen PHP eklentilerinden (%s) hiçbiri mevcut değil.',
+	'Connecting to privileged ports is not allowed.' => 'Ayrıcalıklı bağlantı noktalarına bağlanmaya izin verilmiyor.',
 	'Session support must be enabled.' => 'Oturum desteği etkin olmalıdır.',
 	'Session expired, please login again.' => 'Oturum süresi doldu, lütfen tekrar giriş yapın.',
+	'The action will be performed after successful login with the same credentials.' => 'İşlem, aynı kimlik bilgileriyle başarıyla oturum açıldıktan sonra gerçekleştirilecektir.',
 	'%s version: %s through PHP extension %s' => '%s sürüm: %s, %s PHP eklentisi ile',
 	'Refresh' => 'Tazele',
 
@@ -46,6 +52,8 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Sorgu başarıyla çalıştırıldı, %d adet kayıt etkilendi.', 'Sorgu başarıyla çalıştırıldı, %d adet kayıt etkilendi.'),
 	'No commands to execute.' => 'Çalıştırılacak komut yok.',
 	'Error in query' => 'Sorguda hata',
+	'Warnings' => 'Uyarılar',
+	'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.',
@@ -64,16 +72,20 @@ $translations = array(
 	'Unable to upload a file.' => 'Dosya gönderilemiyor.',
 	'Maximum allowed file size is %sB.' => 'İzin verilen dosya boyutu sınırı %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Çok büyük POST verisi, veriyi azaltın ya da %s ayar yönergesini uygun olarak yapılandırın.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'FTP yoluyla büyük bir SQL dosyası yükleyebilir ve sunucudan içe aktarabilirsiniz.',
+	'You are offline.' => 'Çevrimdışısınız.',
 
 	'Export' => 'Dışarı Aktar',
 	'Output' => 'Çıktı',
 	'open' => 'aç',
 	'save' => 'kaydet',
+	'Saving' => 'Saydediliyor',
 	'Format' => 'Biçim',
 	'Data' => 'Veri',
 
 	'Database' => 'Veri Tabanı',
 	'database' => 'veri tabanı',
+	'DB' => 'DB',
 	'Use' => 'Kullan',
 	'Select database' => 'Veri tabanı seç',
 	'Invalid database.' => 'Geçersiz veri tabanı.',
@@ -95,12 +107,13 @@ $translations = array(
 	'Engine' => 'Motor',
 	'Collation' => 'Karşılaştırma',
 	'Data Length' => 'Veri Uzunluğu',
-	'Index Length' => 'Dizin Uzunluğu',
+	'Index Length' => 'İndex Uzunluğu',
 	'Data Free' => 'Boş Veri',
 	'Rows' => 'Kayıtlar',
 	'%d in total' => 'toplam %d',
 	'Analyze' => 'Çözümle',
-	'Optimize' => 'En uygun hale getir',
+	'Optimize' => 'Optimize Et',
+	'Vacuum' => 'Vakumla',
 	'Check' => 'Denetle',
 	'Repair' => 'Tamir Et',
 	'Truncate' => 'Boşalt',
@@ -158,9 +171,13 @@ $translations = array(
 	'Auto Increment' => 'Otomatik Artır',
 	'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?',
+	'Size' => 'Boyut',
+	'Compute' => 'Hesapla',
 	'Move up' => 'Yukarı taşı',
 	'Move down' => 'Aşağı taşı',
 	'Remove' => 'Sil',
@@ -172,17 +189,18 @@ $translations = array(
 	'Values' => 'Değerler',
 
 	'View' => 'Görünüm',
+	'Materialized view' => 'Materialized Görünüm',
 	'View has been dropped.' => 'Görünüm silindi.',
 	'View has been altered.' => 'Görünüm değiştirildi.',
 	'View has been created.' => 'Görünüm oluşturuldu.',
 	'Alter view' => 'Görünümü değiştir',
 	'Create view' => 'Görünüm oluştur',
 
-	'Indexes' => 'Dizinler',
-	'Indexes have been altered.' => 'Dizinler değiştirildi.',
-	'Alter indexes' => 'Dizinleri değiştir',
+	'Indexes' => 'İndeksler',
+	'Indexes have been altered.' => 'İndeksler değiştirildi.',
+	'Alter indexes' => 'İndeksleri değiştir',
 	'Add next' => 'Bundan sonra ekle',
-	'Index Type' => 'Dizin Türü',
+	'Index Type' => 'İndex Türü',
 	'Column (length)' => 'Kolon (uzunluğu)',
 
 	'Foreign keys' => 'Dış anahtarlar',
@@ -221,25 +239,29 @@ $translations = array(
 	'anywhere' => 'hiçbir yerde',
 	'Search data in tables' => 'Tablolarda veri ara',
 	'Sort' => 'Sırala',
-	'descending' => 'azalan',
-	'Limit' => 'sınır',
-	'Text length' => 'Yazı uzunluğu',
-	'Action' => 'Eylem',
-	'Full table scan' => 'Tam tablo tarama',
+	'descending' => 'Azalan',
+	'Limit' => 'Limit',
+	'Limit rows' => 'Satır Limiti',
+	'Text length' => 'Metin Boyutu',
+	'Action' => 'İşlem',
+	'Full table scan' => 'Tam tablo taraması',
 	'Unable to select the table' => 'Tablo seçilemedi',
 	'No rows.' => 'Kayıt yok.',
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d kayıt', '%d adet kayıt'),
 	'Page' => 'Sayfa',
 	'last' => 'son',
 	'Load more data' => 'Daha fazla veri yükle',
 	'Loading' => 'Yükleniyor',
-	'whole result' => 'tüm sonuç',
+	'Whole result' => 'Tüm sonuç',
 	'%d byte(s)' => array('%d bayt', '%d bayt'),
 
 	'Import' => 'İçeri Aktar',
 	'%d row(s) have been imported.' => array('%d kayıt içeri aktarıldı.', '%d adet kayıt içeri aktarıldı.'),
+	'File must be in UTF-8 encoding.' => 'Dosya UTF-8 kodlamasında olmalıdır.',
 
 	// in-place editing in select
+	'Modify' => 'Düzenle',
 	'Ctrl+click on a value to modify it.' => 'Bir değeri değiştirmek için üzerine Ctrl+tıklayın.',
 	'Use edit link to modify this value.' => 'Değeri değiştirmek için düzenleme bağlantısını kullanın.',
 
@@ -258,8 +280,10 @@ $translations = array(
 	'Save' => 'Kaydet',
 	'Save and continue edit' => 'Kaydet ve düzenlemeye devam et',
 	'Save and insert next' => 'Kaydet ve sonrakini ekle',
+	'Selected' => 'Seçildi',
 	'Clone' => 'Kopyala',
 	'Delete' => 'Sil',
+	'You have no privileges to update this table.' => 'Bu tabloyu güncellemek için yetkiniz yok.',
 
 	'E-mail' => 'E-posta',
 	'From' => 'Gönderen',

adminer/lang/uk.inc.php

@@ -230,7 +230,7 @@ $translations = array(
 	'%d row(s)' => array('%d рядок', '%d рядки', '%d рядків'),
 	'Page' => 'Сторінка',
 	'last' => 'остання',
-	'whole result' => 'весь результат',
+	'Whole result' => 'Весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
 	
 	'Import' => 'Імпортувати',
@@ -268,7 +268,7 @@ $translations = array(
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата і час',
-	'Strings' => 'Радки',
+	'Strings' => 'Рядки',
 	'Binary' => 'Двійкові',
 	'Lists' => 'Списки',
 	'Network' => 'Мережа',
@@ -313,4 +313,34 @@ $translations = array(
 	'Type has been dropped.' => 'Тип було видалено.',
 	'Type has been created.' => 'Тип було створено.',
 	'Alter type' => 'Змінити тип',
+	'Drop %s?' => 'Вилучити %s?',
+	'Materialized view' => 'Матеріалізований вигляд',
+	'Selected' => 'Вибрані',
+	'overwrite' => 'перезаписати',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'Файл повинен бути в кодуванні UTF-8.',
+	'Modify' => 'Змінити',
+	'Load more data' => 'Завантажити ще дані',
+	'Loading' => 'Завантаження',
+	'ATTACH queries are not supported.' => 'ATTACH-запити не підтримуються.',
+	'Warnings' => 'Попередження',
+	'Limit rows' => 'Обмеження рядків',
+	'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>.',
+	'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.' => 'Підключення до привілейованих портів заборонено.',
+	'There is a space in the input password which might be the cause.' => 'У вхідному паролі є пробіл, який може бути причиною.',
+	'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.' => 'Ви можете завантажити великий файл SQL через FTP та імпортувати його з сервера.',
+	'Size' => 'Розмір',
+	'Compute' => 'Обчислити',
+	'You are offline.' => 'Ви офлайн.',
+	'You have no privileges to update this table.' => 'Ви не маєте привілеїв для оновлення цієї таблиці.',
+	'Saving' => 'Збереження',
+	'Unknown error.' => 'Невідома помилка.',
+	'Database does not support password.' => 'База даних не підтримує пароль.',
 );

adminer/lang/vi.inc.php

@@ -206,8 +206,8 @@ $translations = array(
 	'ON UPDATE' => 'Khi cập nhật',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Cột gốc và cột đích phải cùng kiểu, phải đặt chỉ mục trong cột đích và dữ liệu tham chiếu phải tồn tại.',
 	
-	'Triggers' => 'xx',
-	'Add trigger' => 'xx',
+	'Triggers' => 'Phản xạ',
+	'Add trigger' => 'Thêm phản xạ',
 	'Trigger has been dropped.' => 'Đã xoá phản xạ.',
 	'Trigger has been altered.' => 'Đã sửa phản xạ.',
 	'Trigger has been created.' => 'Đã tạo phản xạ.',
@@ -238,7 +238,7 @@ $translations = array(
 	'last' => 'cuối',
 	'Load more data' => 'Xem thêm dữ liệu',
 	'Loading' => 'Đang nạp',
-	'whole result' => 'toàn bộ kết quả',
+	'Whole result' => 'Toàn bộ kết quả',
 	'%d byte(s)' => '%d byte(s)',
 	
 	'Import' => 'Nhập khẩu',
@@ -308,12 +308,12 @@ $translations = array(
 	'Schema has been dropped.' => 'Đã xoá schema.',
 	'Schema has been created.' => 'Đã tạo schema.',
 	'Schema has been altered.' => 'Đã thay đổi schema.',
-	'Schema' => 'schema',
-	'Invalid schema.' => 'Schema khong hợp lệ.',
+	'Schema' => 'Schema',
+	'Invalid schema.' => 'Schema không hợp lệ.',
 	
 	// PostgreSQL sequences support
 	'Sequences' => 'Dãy số',
-	'Create sequence' => 'Tạo đãy số',
+	'Create sequence' => 'Tạo dãy số',
 	'Sequence has been dropped.' => 'Dãy số đã bị xoá.',
 	'Sequence has been created.' => 'Đã tạo dãy số.',
 	'Sequence has been altered.' => 'Đã sửa dãy số.',

adminer/lang/xx.inc.php

@@ -10,9 +10,11 @@ $translations = array(
 	'Logout' => 'Xx',
 	'Logged as: %s' => 'Xx: %s',
 	'Logout successful.' => 'Xx.',
-	'Thanks for using Adminer, consider <a href="%s">donating</a>.' => 'Xx <a href="%s">xx</a>.',
+	'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.',
-	'<a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s 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.' => '<a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s xx.',
 	'Language' => 'Xx',
@@ -21,6 +23,7 @@ $translations = array(
 	'No extension' => 'Xx',
 	'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.',
 	'Session support must be enabled.' => 'Xx.',
 	'Session expired, please login again.' => 'Xx.',
 	'The action will be performed after successful login with the same credentials.' => 'Xx.',
@@ -53,6 +56,7 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'No commands to execute.' => 'Xx.',
 	'Error in query' => 'Xx',
+	'Unknown error.' => 'Xx.',
 	'Warnings' => 'Xx',
 	'ATTACH queries are not supported.' => 'Xx.',
 	'Execute' => 'Xx',
@@ -124,6 +128,7 @@ $translations = array(
 	'Tables have been moved.' => 'Xx.',
 	'Copy' => 'Xx',
 	'Tables have been copied.' => 'Xx.',
+	'overwrite' => 'xx',
 	
 	'Routines' => 'Xx',
 	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
@@ -254,7 +259,7 @@ $translations = array(
 	'last' => 'xx',
 	'Load more data' => 'Xx',
 	'Loading' => 'Xx',
-	'whole result' => 'xx',
+	'Whole result' => 'Xx',
 	'%d byte(s)' => array('%d xx', '%d xx'),
 	
 	'Import' => 'Xx',

adminer/lang/zh-tw.inc.php

@@ -1,119 +1,231 @@
 <?php
 $translations = array(
-	'Login' => '登入',
-	'Logout successful.' => '成功登出。',
-	'Invalid credentials.' => '無效的憑證。',
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => '資料庫系統',
 	'Server' => '伺服器',
 	'Username' => '帳號',
 	'Password' => '密碼',
+	'Permanent login' => '永久登入',
+	'Login' => '登入',
+	'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.' => '無效的憑證。',
+	'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>.',
+	'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 方法讓它永久化。',
+	'Language' => '語言',
+	'Invalid CSRF token. Send the form again.' => '無效的 CSRF token。請重新發送表單。',
+	'If you did not send this request from Adminer then close this page.' => '如果您並沒有從Adminer發送請求，請關閉此頁面。',
+	'No extension' => '無擴充模組',
+	'None of the supported PHP extensions (%s) are available.' => '沒有任何支援的 PHP 擴充模組（%s）。',
+	'Connecting to privileged ports is not allowed.' => '不允許連接到特權埠。',
+	'Disable %s or enable %s or %s extensions.' => '禁用 %s 或啟用 %s 或 %s 擴充模組。',
+	'Session support must be enabled.' => 'Session 必須被啟用。',
+	'Session expired, please login again.' => 'Session 已過期，請重新登入。',
+	'The action will be performed after successful login with the same credentials.' => '此操作將在成功使用相同的憑據登錄後執行。',
+	'%s version: %s through PHP extension %s' => '%s 版本：%s 透過 PHP 擴充模組 %s',
+	'Refresh' => '重新載入',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => '權限',
+	'Create user' => '建立使用者',
+	'User has been dropped.' => '已刪除使用者。',
+	'User has been altered.' => '已修改使用者。',
+	'User has been created.' => '已建立使用者。',
+	'Hashed' => 'Hashed',
+	'Column' => '欄位',
+	'Routine' => '程序',
+	'Grant' => '授權',
+	'Revoke' => '廢除',
+	
+	'Process list' => '處理程序列表',
+	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
+	'Kill' => '終止',
+	
+	'Variables' => '變數',
+	'Status' => '狀態',
+	
+	'SQL command' => 'SQL 命令',
+	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
+	'Query executed OK, %d row(s) affected.' => '執行查詢 OK，%d 行受影響。',
+	'No commands to execute.' => '沒有命令可執行。',
+	'Error in query' => '查詢發生錯誤',
+	'Unknown error.' => '未知錯誤。',
+	'Warnings' => '警告',
+	'ATTACH queries are not supported.' => '不支援ATTACH查詢。',
+	'Execute' => '執行',
+	'Stop on error' => '出錯時停止',
+	'Show only errors' => '僅顯示錯誤訊息',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f 秒',
+	'History' => '紀錄',
+	'Clear' => '清除',
+	'Edit all' => '編輯全部',
+	
+	'File upload' => '檔案上傳',
+	'From server' => '從伺服器',
+	'Webserver file %s' => '網頁伺服器檔案 %s',
+	'Run file' => '執行檔案',
+	'File does not exist.' => '檔案不存在',
+	'File uploads are disabled.' => '檔案上傳已經被停用。',
+	'Unable to upload a file.' => '無法上傳檔案。',
+	'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.' => '您離線了。',
+	
+	'Export' => '匯出',
+	'Output' => '輸出',
+	'open' => '打開',
+	'save' => '儲存',
+	'Saving' => '保存中',
+	'Format' => '格式',
+	'Data' => '資料',
+	
+	'Database' => '資料庫',
+	'database' => '資料庫',
+	'DB' => '資料庫',
+	'Use' => '使用',
 	'Select database' => '選擇資料庫',
 	'Invalid database.' => '無效的資料庫。',
-	'Table has been altered.' => '資料表已修改。',
-	'Table has been created.' => '資料表已修改。',
-	'Alter table' => '修改資料表',
-	'Create table' => '建立資料表',
-	'Table name' => '資料表名稱',
-	'engine' => '引擎',
-	'collation' => '校對',
-	'Column name' => '列名',
-	'Type' => '類型',
-	'Length' => '長度',
-	'Auto Increment' => '自動遞增',
-	'Options' => '選項',
-	'Save' => '儲存',
-	'Drop' => '刪除',
 	'Database has been dropped.' => '資料庫已刪除。',
+	'Databases have been dropped.' => '資料庫已刪除。',
 	'Database has been created.' => '已建立資料庫。',
 	'Database has been renamed.' => '已重新命名資料庫。',
 	'Database has been altered.' => '已修改資料庫。',
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
-	'SQL command' => 'SQL命令',
-	'Logout' => '登出',
-	'database' => '資料庫',
-	'Use' => '使用',
-	'No tables.' => '沒有資料表。',
-	'select' => '選擇',
-	'Item has been updated.' => '已更新項目。',
-	'Item%s has been inserted.' => '已新增項目%s。',
-	'Edit' => '編輯',
-	'Insert' => '新增',
-	'Save and insert next' => '儲存並新增下一筆',
-	'Delete' => '刪除',
-	'Database' => '資料庫',
+	'Database schema' => '資料庫結構',
+	
+	// link to current database schema layout
+	'Permanent link' => '永久連結',
+	
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => '引擎',
+	'Collation' => '校對',
+	'Data Length' => '資料長度',
+	'Index Length' => '索引長度',
+	'Data Free' => '資料空閒',
+	'Rows' => '行數',
+	'%d in total' => '總共 %d 個',
+	'Analyze' => '分析',
+	'Optimize' => '最佳化',
+	'Vacuum' => '整理（Vacuum）',
+	'Check' => '檢查',
+	'Repair' => '修復',
+	'Truncate' => '清空',
+	'Tables have been truncated.' => '已清空資料表。',
+	'Move to other database' => '轉移到其它資料庫',
+	'Move' => '轉移',
+	'Tables have been moved.' => '已轉移資料表。',
+	'Copy' => '複製',
+	'Tables have been copied.' => '資料表已經複製',
+	'overwrite' => '覆蓋',
+	
 	'Routines' => '程序',
-	'Indexes have been altered.' => '已修改索引。',
-	'Indexes' => '索引',
-	'Alter indexes' => '修改索引',
-	'Add next' => '新增下一筆',
-	'Language' => '語言',
-	'Select' => '選擇',
-	'New item' => '新增項目',
-	'Search' => '搜尋',
-	'Sort' => '排序',
-	'descending' => '降冪(遞減)',
-	'Limit' => '限定',
-	'No rows.' => '沒有行。',
-	'Action' => '動作',
-	'edit' => '編輯',
-	'Page' => '頁',
-	'Query executed OK, %d row(s) affected.' => '執行查詢OK，%d行受影響',
-	'Error in query' => '查詢發生錯誤',
-	'Execute' => '執行',
-	'Table' => '資料表',
-	'Foreign keys' => '外來鍵',
-	'Triggers' => '觸發器',
-	'View' => '檢視表',
-	'Unable to select the table' => '無法選擇該資料表',
-	'Invalid CSRF token. Send the form again.' => '無效的 CSRF token。請重新發送表單。',
-	'Comment' => '註解',
-	'Default values' => '預設值',
-	'%d byte(s)' => '%d byte(s)',
-	'No commands to execute.' => '沒有命令可執行。',
-	'Unable to upload a file.' => '無法上傳檔案。',
-	'File upload' => '檔案上傳',
-	'File uploads are disabled.' => '檔案上傳已經被停用。',
-	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d行被影響',
+	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
-	'No extension' => '無擴充模組',
-	'None of the supported PHP extensions (%s) are available.' => '沒有任何支援的PHP擴充模組（%s）。',
-	'Session support must be enabled.' => 'Session 必須被啟用。',
-	'Session expired, please login again.' => 'Session 已過期，請重新登入。',
-	'Text length' => 'Text 長度',
-	'Foreign key has been dropped.' => '已刪除外來鍵。',
-	'Foreign key has been altered.' => '已修改外來鍵。',
-	'Foreign key has been created.' => '已建立外來鍵。',
-	'Foreign key' => '外來鍵',
-	'Target table' => '目標資料表',
-	'Change' => '修改',
-	'Source' => '來源',
-	'Target' => '目標',
-	'Add column' => '新增資料列',
-	'Alter' => '修改',
-	'Add foreign key' => '新增外來鍵',
-	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => '索引類型',
-	'Column (length)' => '列（長度）',
+	'Parameter name' => '參數名稱',
+	'Create procedure' => '建立預存程序',
+	'Create function' => '建立函式',
+	'Routine has been dropped.' => '已刪除程序。',
+	'Routine has been altered.' => '已修改子程序。',
+	'Routine has been created.' => '已建立子程序。',
+	'Alter function' => '修改函式',
+	'Alter procedure' => '修改預存程序',
+	'Return type' => '回傳類型',
+	
+	'Events' => '事件',
+	'Event has been dropped.' => '已刪除事件。',
+	'Event has been altered.' => '已修改事件。',
+	'Event has been created.' => '已建立事件。',
+	'Alter event' => '修改事件',
+	'Create event' => '建立事件',
+	'At given time' => '在指定時間',
+	'Every' => '每',
+	'Schedule' => '排程',
+	'Start' => '開始',
+	'End' => '結束',
+	'On completion preserve' => '在完成後儲存',
+	
+	'Tables' => '資料表',
+	'Tables and views' => '資料表和檢視表',
+	'Table' => '資料表',
+	'No tables.' => '沒有資料表。',
+	'Alter table' => '修改資料表',
+	'Create table' => '建立資料表',
+	'Table has been dropped.' => '已經刪除資料表。',
+	'Tables have been dropped.' => '已經將資料表刪除。',
+	'Tables have been optimized.' => '已優化資料表。',
+	'Table has been altered.' => '資料表已修改。',
+	'Table has been created.' => '資料表已建立。',
+	'Table name' => '資料表名稱',
+	'Show structure' => '顯示結構',
+	'engine' => '引擎',
+	'collation' => '校對',
+	'Column name' => '欄位名稱',
+	'Type' => '類型',
+	'Length' => '長度',
+	'Auto Increment' => '自動遞增',
+	'Options' => '選項',
+	'Comment' => '註解',
+	'Default value' => '預設值',
+	'Default values' => '預設值',
+	'Drop' => '刪除',
+	'Drop %s?' => '刪除 %s?',
+	'Are you sure?' => '你確定嗎？',
+	'Size' => '大小',
+	'Compute' => '計算',
+	'Move up' => '上移',
+	'Move down' => '下移',
+	'Remove' => '移除',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加 %s。',
+	
+	'Partition by' => '分區類型',
+	'Partitions' => '分區',
+	'Partition name' => '分區名稱',
+	'Values' => '值',
+	
+	'View' => '檢視表',
+	'Materialized view' => '物化視圖',
 	'View has been dropped.' => '已刪除檢視表。',
 	'View has been altered.' => '已修改檢視表。',
 	'View has been created.' => '已建立檢視表。',
 	'Alter view' => '修改檢視表',
 	'Create view' => '建立檢視表',
-	'Name' => '名稱',
-	'Process list' => '處理程序列表',
-	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
-	'Kill' => '終止',
-	'Parameter name' => '參數名稱',
-	'Database schema' => '資料庫架構',
-	'Create procedure' => '建立預存程序',
-	'Create function' => '建立函數',
-	'Routine has been dropped.' => '已刪除程序。',
-	'Routine has been altered.' => '已修改子程序。',
-	'Routine has been created.' => '已建立子程序。',
-	'Alter function' => '修改函數',
-	'Alter procedure' => '修改過程',
-	'Return type' => '回傳類型',
+	
+	'Indexes' => '索引',
+	'Indexes have been altered.' => '已修改索引。',
+	'Alter indexes' => '修改索引',
+	'Add next' => '新增下一筆',
+	'Index Type' => '索引類型',
+	'Column (length)' => '欄位（長度）',
+	
+	'Foreign keys' => '外來鍵',
+	'Foreign key' => '外來鍵',
+	'Foreign key has been dropped.' => '已刪除外來鍵。',
+	'Foreign key has been altered.' => '已修改外來鍵。',
+	'Foreign key has been created.' => '已建立外來鍵。',
+	'Target table' => '目標資料表',
+	'Change' => '變更',
+	'Source' => '來源',
+	'Target' => '目標',
+	'Add column' => '新增欄位',
+	'Alter' => '修改',
+	'Add foreign key' => '新增外來鍵',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
+	
+	'Triggers' => '觸發器',
 	'Add trigger' => '建立觸發器',
 	'Trigger has been dropped.' => '已刪除觸發器。',
 	'Trigger has been altered.' => '已修改觸發器。',
@@ -122,146 +234,116 @@ $translations = array(
 	'Create trigger' => '建立觸發器',
 	'Time' => '時間',
 	'Event' => '事件',
-	'%s version: %s through PHP extension %s' => '%s版本：%s 透過PHP擴充模組 %s',
-	'%d row(s)' => '%d行',
-	'Remove' => '移除',
-	'Are you sure?' => '你確定嗎？',
-	'Privileges' => '權限',
-	'Create user' => '建立使用者',
-	'User has been dropped.' => '已刪除使用者。',
-	'User has been altered.' => '已修改使用者。',
-	'User has been created.' => '已建立使用者。',
-	'Hashed' => 'Hashed',
-	'Column' => '列',
-	'Routine' => '程序',
-	'Grant' => '授權',
-	'Revoke' => '廢除',
-	'Logged as: %s' => '登錄為：%s',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
-	'Move up' => '上移',
-	'Move down' => '下移',
-	'Export' => '匯出',
-	'Tables' => '資料表',
-	'Data' => '資料',
-	'Output' => '輸出',
-	'open' => '打開',
-	'save' => '儲存',
-	'Format' => '格式',
-	'Functions' => '函數',
+	'Name' => '名稱',
+	
+	'select' => '選擇',
+	'Select' => '選擇',
+	'Select data' => '選擇資料',
+	'Functions' => '函式',
 	'Aggregation' => '集合',
-	'Event has been dropped.' => '已刪除事件。',
-	'Event has been altered.' => '已修改事件。',
-	'Event has been created.' => '已建立事件。',
-	'Alter event' => '修改事件',
-	'Create event' => '建立事件',
-	'Start' => '開始',
-	'End' => '結束',
-	'Every' => '每',
-	'Status' => '狀態',
-	'On completion preserve' => '在完成後儲存',
-	'Events' => '事件',
-	'Schedule' => '排程',
-	'At given time' => '在指定時間',
-	'Tables have been truncated.' => '已清空資料表。',
-	'Tables have been moved.' => '已轉移資料表。',
-	'Tables and views' => '資料表和檢視表',
-	'Engine' => '引擎',
-	'Collation' => '校對',
-	'Data Length' => '資料長度',
-	'Index Length' => '索引長度',
-	'Data Free' => '資料空閒',
-	'Rows' => '行數',
-	',' => ',',
-	'0123456789' => '0123456789',
-	'Analyze' => '分析',
-	'Optimize' => '最佳化',
-	'Check' => '檢查',
-	'Repair' => '修復',
-	'Truncate' => '清空',
-	'Move to other database' => '轉移到其它資料庫',
-	'Move' => '轉移',
-	'Save and continue edit' => '儲存並繼續編輯',
-	'original' => '原始',
-	'%d item(s) have been affected.' => '%d個項目受到影響。',
-	'whole result' => '所有結果',
-	'Tables have been dropped.' => '已經將資料表刪除。',
-	'Clone' => '複製',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加%s。',
-	'Partition by' => '分區類型',
-	'Partitions' => '分區',
-	'Partition name' => '分區名稱',
-	'Values' => '值',
-	'%d row(s) have been imported.' => '已匯入%d行。',
+	'Search' => '搜尋',
 	'anywhere' => '任意位置',
+	'Search data in tables' => '在資料庫搜尋',
+	'Sort' => '排序',
+	'descending' => '降冪 (遞減)',
+	'Limit' => '限定',
+	'Limit rows' => '限制行數',
+	'Text length' => 'Text 長度',
+	'Action' => '動作',
+	'Full table scan' => '全資料表掃描',
+	'Unable to select the table' => '無法選擇該資料表',
+	'No rows.' => '沒有資料行。',
+	'%d / ' => '%d / ',
+	'%d row(s)' => '%d 行',
+	'Page' => '頁',
+	'last' => '最後一頁',
+	'Load more data' => '載入更多資料',
+	'Loading' => '載入中',
+	'Whole result' => '所有結果',
+	'%d byte(s)' => '%d byte(s)',
+	
 	'Import' => '匯入',
-	'Stop on error' => '出錯時停止',
-	'%.3f s' => '%.3f秒',
-	'$1-$3-$5' => '$1.$3.$5',
-	'[yyyy]-mm-dd' => '[yyyy].mm.dd',
-	'History' => '紀錄',
-	'Variables' => '變數',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
-	'Relations' => '關聯',
-	'Run file' => '執行檔案',
-	'Clear' => '清除',
-	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為%sB',
+	'%d row(s) have been imported.' => '已匯入 %d 行。',
+	'File must be in UTF-8 encoding.' => '檔必須使用UTF-8編碼。',
+	
+	// in-place editing in select
+	'Modify' => '修改',
+	'Ctrl+click on a value to modify it.' => '按住Ctrl並按一下某個值進行修改。',
+	'Use edit link to modify this value.' => '使用編輯連結來修改。',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => '已新增項目 %s。',
+	'Item has been deleted.' => '該項目已被刪除',
+	'Item has been updated.' => '已更新項目。',
+	'%d item(s) have been affected.' => '%d 個項目受到影響。',
+	'New item' => '新增項目',
+	'original' => '原始',
+	// label for value '' in enum data type
+	'empty' => '空值',
+	'edit' => '編輯',
+	'Edit' => '編輯',
+	'Insert' => '新增',
+	'Save' => '儲存',
+	'Save and continue edit' => '儲存並繼續編輯',
+	'Save and insert next' => '儲存並新增下一筆',
+	'Selected' => '已選中',
+	'Clone' => '複製',
+	'Delete' => '刪除',
+	'You have no privileges to update this table.' => '您沒有許可權更新這個資料表。',
+	
+	'E-mail' => '電子郵件',
+	'From' => '來自',
+	'Subject' => '主旨',
+	'Attachments' => '附件',
+	'Send' => '寄出',
+	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
+	
+	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
 	'Strings' => '字串',
 	'Binary' => '二進位',
 	'Lists' => '列表',
+	'Network' => '網路',
+	'Geometry' => '幾何',
+	'Relations' => '關聯',
+	
 	'Editor' => '編輯器',
-	'E-mail' => '電子郵件',
-	'From' => '來自',
-	'Subject' => '主旨',
-	'Send' => '寄出',
-	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-	'Webserver file %s' => '網頁伺服器檔案 %s',
-	'File does not exist.' => '檔案不存在',
-	'Item has been deleted.' => '該項目已被刪除',
-	'%d in total' => '總共 %d 個',
-	'Permanent login' => '永久登入',
-	'Table has been dropped.' => '已經刪除資料表。',
-	'Databases have been dropped.' => '資料庫已刪除。',
-	'Search data in tables' => '在資料庫搜尋',
-	'Schema' => '資料表結構',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$1.$3.$5',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => '[yyyy].mm.dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => '現在',
+	'yes' => '是',
+	'no' => '否',
+	
+	// general SQLite error in create, drop or rename database
+	'File exists.' => '檔案已存在。',
+	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
+	
+	// PostgreSQL and MS SQL schema support
 	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',
 	'Schema has been dropped.' => '已刪除資料表結構。',
 	'Schema has been created.' => '已建立資料表結構。',
 	'Schema has been altered.' => '已修改資料表結構。',
+	'Schema' => '資料表結構',
+	'Invalid schema.' => '無效的資料表結構。',
+	
+	// PostgreSQL sequences support
 	'Sequences' => '序列',
 	'Create sequence' => '建立序列',
-	'Alter sequence' => '修改序列',
 	'Sequence has been dropped.' => '已刪除序列。',
 	'Sequence has been created.' => '已建立序列。',
 	'Sequence has been altered.' => '已修改序列。',
+	'Alter sequence' => '修改序列',
+	
+	// PostgreSQL user types support
 	'User types' => '使用者類型',
 	'Create type' => '建立類型',
-	'Alter type' => '修改類型',
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
-	'Use edit link to modify this value.' => '使用編輯連結來修改。',
-	'last' => '最後一頁',
-	'From server' => '從伺服器',
-	'System' => '資料庫系統',
-	'Select data' => '選擇資料',
-	'Show structure' => '顯示結構',
-	'empty' => '空值',
-	'Network' => '網路',
-	'Geometry' => '幾何',
-	'File exists.' => '檔案已存在。',
-	'Attachments' => '附件',
-	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
-	'Show only errors' => '僅顯示錯誤訊息',
-	'Refresh' => '重新載入',
-	'Invalid schema.' => '無效的資料表結構。',
-	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
-	'now' => '現在',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => '資料表已經複製',
-	'Copy' => '複製',
-	'Permanent link' => '永久連結',
-	'Edit all' => '編輯全部',
-	'HH:MM:SS' => 'HH:MM:SS',
+	'Alter type' => '修改類型',
 );

adminer/lang/zh.inc.php

@@ -1,133 +1,38 @@
 <?php
 $translations = array(
-	'Login' => '登录',
-	'Logout successful.' => '注销成功。',
-	'Invalid credentials.' => '无效凭据。',
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => '系统',
 	'Server' => '服务器',
 	'Username' => '用户名',
 	'Password' => '密码',
-	'Select database' => '选择数据库',
-	'Invalid database.' => '无效数据库。',
-	'Table has been dropped.' => '已删除表。',
-	'Table has been altered.' => '已修改表。',
-	'Table has been created.' => '已创建表。',
-	'Alter table' => '修改表',
-	'Create table' => '创建表',
-	'Table name' => '表名',
-	'engine' => '引擎',
-	'collation' => '校对',
-	'Column name' => '字段名',
-	'Type' => '类型',
-	'Length' => '长度',
-	'Auto Increment' => '自动增量',
-	'Options' => '选项',
-	'Save' => '保存',
-	'Drop' => '删除',
-	'Database has been dropped.' => '已删除数据库。',
-	'Database has been created.' => '已创建数据库。',
-	'Database has been renamed.' => '已重命名数据库。',
-	'Database has been altered.' => '已修改数据库。',
-	'Alter database' => '修改数据库',
-	'Create database' => '创建数据库',
-	'SQL command' => 'SQL命令',
-	'Logout' => '注销',
-	'database' => '数据库',
-	'Use' => '使用',
-	'No tables.' => '没有表。',
-	'select' => '选择',
-	'Item has been deleted.' => '已删除项目。',
-	'Item has been updated.' => '已更新项目。',
-	'Item%s has been inserted.' => '已插入项目%s。',
-	'Edit' => '编辑',
-	'Insert' => '插入',
-	'Save and insert next' => '保存并插入下一个',
-	'Delete' => '删除',
-	'Database' => '数据库',
-	'Routines' => '子程序',
-	'Indexes have been altered.' => '已修改索引。',
-	'Indexes' => '索引',
-	'Alter indexes' => '修改索引',
-	'Add next' => '下一行插入',
+	'Permanent login' => '保持登录',
+	'Login' => '登录',
+	'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.' => '无效凭据。',
+	'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>.',
+	'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 方法让它永久化。',
 	'Language' => '语言',
-	'Select' => '选择',
-	'New item' => '新建数据',
-	'Search' => '搜索',
-	'Sort' => '排序',
-	'descending' => '降序',
-	'Limit' => '范围',
-	'No rows.' => '无数据。',
-	'Action' => '动作',
-	'edit' => '编辑',
-	'Page' => '页面',
-	'Query executed OK, %d row(s) affected.' => '查询执行完毕，%d 行受影响。',
-	'Error in query' => '查询出错',
-	'Execute' => '执行',
-	'Table' => '表',
-	'Foreign keys' => '外键',
-	'Triggers' => '触发器',
-	'View' => '视图',
-	'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.' => '不能上传文件。',
-	'File upload' => '文件上传',
-	'File uploads are disabled.' => '文件上传被禁用。',
-	'Routine has been called, %d row(s) affected.' => '子程序被调用，%d 行被影响。',
-	'Call' => '调用',
+	'Invalid CSRF token. Send the form again.' => '无效 CSRF 令牌。请重新发送表单。',
+	'If you did not send this request from Adminer then close this page.' => '如果您并没有从Adminer发送请求，请关闭此页面。',
 	'No extension' => '没有扩展',
 	'None of the supported PHP extensions (%s) are available.' => '没有支持的 PHP 扩展可用（%s）。',
-	'Session support must be enabled.' => 'Session 必须被启用。',
-	'Session expired, please login again.' => 'Session 已过期，请重新登录。',
-	'Text length' => '文本显示限制',
-	'Foreign key has been dropped.' => '已删除外键。',
-	'Foreign key has been altered.' => '已修改外键。',
-	'Foreign key has been created.' => '已创建外键。',
-	'Foreign key' => '外键',
-	'Target table' => '目标表',
-	'Change' => '修改',
-	'Source' => '源',
-	'Target' => '目标',
-	'Add column' => '增加列',
-	'Alter' => '修改',
-	'Add foreign key' => '添加外键',
-	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => '索引类型',
-	'Column (length)' => '列（长度）',
-	'View has been dropped.' => '已删除视图。',
-	'View has been altered.' => '已修改视图。',
-	'View has been created.' => '已创建视图。',
-	'Alter view' => '修改视图',
-	'Create view' => '创建视图',
-	'Name' => '名称',
-	'Process list' => '进程列表',
-	'%d process(es) have been killed.' => '%d 个进程被终止',
-	'Kill' => '终止',
-	'Parameter name' => '参数名',
-	'Database schema' => '数据库概要',
-	'Create procedure' => '创建过程',
-	'Create function' => '创建函数',
-	'Routine has been dropped.' => '已删除子程序。',
-	'Routine has been altered.' => '已修改子程序。',
-	'Routine has been created.' => '已创建子程序。',
-	'Alter function' => '修改函数',
-	'Alter procedure' => '修改过程',
-	'Return type' => '返回类型',
-	'Add trigger' => '创建触发器',
-	'Trigger has been dropped.' => '已删除触发器。',
-	'Trigger has been altered.' => '已修改触发器。',
-	'Trigger has been created.' => '已创建触发器。',
-	'Alter trigger' => '修改触发器',
-	'Create trigger' => '创建触发器',
-	'Time' => '时间',
-	'Event' => '事件',
+	'Connecting to privileged ports is not allowed.' => '不允许连接到特权端口。',
+	'Disable %s or enable %s or %s extensions.' => '禁用 %s 或启用 %s 或 %s 扩展。',
+	'Session support must be enabled.' => '必须启用会话支持。',
+	'Session expired, please login again.' => '会话已过期，请重新登录。',
+	'The action will be performed after successful login with the same credentials.' => '此操作将在成功使用相同的凭据登录后执行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
-	'%d row(s)' => '%d 行',
-	'Remove' => '移除',
-	'Are you sure?' => '你确定吗？',
+	'Refresh' => '刷新',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
 	'Privileges' => '权限',
 	'Create user' => '创建用户',
 	'User has been dropped.' => '已删除用户。',
@@ -138,130 +43,307 @@ $translations = array(
 	'Routine' => '子程序',
 	'Grant' => '授权',
 	'Revoke' => '废除',
-	'Logged as: %s' => '登录用户：%s',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => '太大的 POST 数据。减少数据或者增加 %s 配置命令。',
-	'Move up' => '上移',
-	'Move down' => '下移',
+
+	'Process list' => '进程列表',
+	'%d process(es) have been killed.' => '%d 个进程被终止',
+	'Kill' => '终止',
+
+	'Variables' => '变量',
+	'Status' => '状态',
+
+	'SQL command' => 'SQL命令',
+	'%d query(s) executed OK.' => '%d 条查询已成功执行。',
+	'Query executed OK, %d row(s) affected.' => '查询执行完毕，%d 行受影响。',
+	'No commands to execute.' => '没有命令被执行。',
+	'Error in query' => '查询出错',
+	'Unknown error.' => '未知错误。',
+	'Warnings' => '警告',
+	'ATTACH queries are not supported.' => '不支持ATTACH查询。',
+	'Execute' => '执行',
+	'Stop on error' => '出错时停止',
+	'Show only errors' => '仅显示错误',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f 秒',
+	'History' => '历史',
+	'Clear' => '清除',
+	'Edit all' => '编辑全部',
+
+	'File upload' => '文件上传',
+	'From server' => '来自服务器',
+	'Webserver file %s' => 'Web服务器文件 %s',
+	'Run file' => '运行文件',
+	'File does not exist.' => '文件不存在。',
+	'File uploads are disabled.' => '文件上传被禁用。',
+	'Unable to upload a file.' => '不能上传文件。',
+	'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.' => '您离线了。',
+
 	'Export' => '导出',
-	'Tables' => '表',
-	'Data' => '数据',
 	'Output' => '输出',
 	'open' => '打开',
 	'save' => '保存',
+	'Saving' => '保存中',
 	'Format' => '格式',
-	'Functions' => '函数',
-	'Aggregation' => '集合',
-	'Event has been dropped.' => '已删除事件。',
-	'Event has been altered.' => '已修改事件。',
-	'Event has been created.' => '已创建事件。',
-	'Alter event' => '修改事件',
-	'Create event' => '创建事件',
-	'Start' => '开始',
-	'End' => '结束',
-	'Every' => '每',
-	'Status' => '状态',
-	'On completion preserve' => '完成后保存',
-	'Events' => '事件',
-	'Schedule' => '调度',
-	'At given time' => '在指定时间',
-	'Tables have been truncated.' => '已清空表。',
-	'Tables have been moved.' => '已转移表。',
-	'Tables and views' => '表和视图',
+	'Data' => '数据',
+
+	'Database' => '数据库',
+	'database' => '数据库',
+	'DB' => '数据库',
+	'Use' => '使用',
+	'Select database' => '选择数据库',
+	'Invalid database.' => '无效数据库。',
+	'Database has been dropped.' => '已删除数据库。',
+	'Databases have been dropped.' => '已删除数据库。',
+	'Database has been created.' => '已创建数据库。',
+	'Database has been renamed.' => '已重命名数据库。',
+	'Database has been altered.' => '已修改数据库。',
+	'Alter database' => '修改数据库',
+	'Create database' => '创建数据库',
+	'Database schema' => '数据库概要',
+
+	// link to current database schema layout
+	'Permanent link' => '固定链接',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
 	'Engine' => '引擎',
 	'Collation' => '校对',
 	'Data Length' => '数据长度',
 	'Index Length' => '索引长度',
 	'Data Free' => '数据空闲',
 	'Rows' => '行数',
-	',' => ',',
-	'0123456789' => '0123456789',
+	'%d in total' => '共计 %d',
 	'Analyze' => '分析',
 	'Optimize' => '优化',
+	'Vacuum' => '整理（Vacuum）',
 	'Check' => '检查',
 	'Repair' => '修复',
 	'Truncate' => '清空',
+	'Tables have been truncated.' => '已清空表。',
 	'Move to other database' => '转移到其它数据库',
 	'Move' => '转移',
-	'Save and continue edit' => '保存并继续编辑',
-	'original' => '原始',
-	'%d item(s) have been affected.' => '%d 个项目受到影响。',
-	'whole result' => '所有结果',
+	'Tables have been moved.' => '已转移表。',
+	'Copy' => '复制',
+	'Tables have been copied.' => '已复制表。',
+	'overwrite' => '覆盖',
+
+	'Routines' => '子程序',
+	'Routine has been called, %d row(s) affected.' => '子程序被调用，%d 行被影响。',
+	'Call' => '调用',
+	'Parameter name' => '参数名',
+	'Create procedure' => '创建过程',
+	'Create function' => '创建函数',
+	'Routine has been dropped.' => '已删除子程序。',
+	'Routine has been altered.' => '已修改子程序。',
+	'Routine has been created.' => '已创建子程序。',
+	'Alter function' => '修改函数',
+	'Alter procedure' => '修改过程',
+	'Return type' => '返回类型',
+
+	'Events' => '事件',
+	'Event has been dropped.' => '已删除事件。',
+	'Event has been altered.' => '已修改事件。',
+	'Event has been created.' => '已创建事件。',
+	'Alter event' => '修改事件',
+	'Create event' => '创建事件',
+	'At given time' => '在指定时间',
+	'Every' => '每',
+	'Schedule' => '调度',
+	'Start' => '开始',
+	'End' => '结束',
+	'On completion preserve' => '完成后仍保留',
+
+	'Tables' => '表',
+	'Tables and views' => '表和视图',
+	'Table' => '表',
+	'No tables.' => '没有表。',
+	'Alter table' => '修改表',
+	'Create table' => '创建表',
+	'Table has been dropped.' => '已删除表。',
 	'Tables have been dropped.' => '已删除表。',
-	'Clone' => '复制',
+	'Tables have been optimized.' => '已优化表。',
+	'Table has been altered.' => '已修改表。',
+	'Table has been created.' => '已创建表。',
+	'Table name' => '表名',
+	'Show structure' => '显示结构',
+	'engine' => '引擎',
+	'collation' => '校对',
+	'Column name' => '字段名',
+	'Type' => '类型',
+	'Length' => '长度',
+	'Auto Increment' => '自动增量',
+	'Options' => '选项',
+	'Comment' => '注释',
+	'Default value' => '默认值',
+	'Default values' => '默认值',
+	'Drop' => '删除',
+	'Drop %s?' => '删除 %s?',
+	'Are you sure?' => '您确定吗？',
+	'Size' => '大小',
+	'Compute' => '计算',
+	'Move up' => '上移',
+	'Move down' => '下移',
+	'Remove' => '移除',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超过最多允许的字段数量。请增加 %s。',
+
 	'Partition by' => '分区类型',
 	'Partitions' => '分区',
 	'Partition name' => '分区名',
 	'Values' => '值',
-	'%d row(s) have been imported.' => '%d 行已导入。',
-	'anywhere' => '任意位置',
-	'Import' => '导入',
-	'Stop on error' => '出错时停止',
-	'%.3f s' => '%.3f 秒',
-	'$1-$3-$5' => '$1.$3.$5',
-	'[yyyy]-mm-dd' => '[yyyy].mm.dd',
-	'History' => '历史',
-	'Variables' => '变量',
+
+	'View' => '视图',
+	'Materialized view' => '物化视图',
+	'View has been dropped.' => '已删除视图。',
+	'View has been altered.' => '已修改视图。',
+	'View has been created.' => '已创建视图。',
+	'Alter view' => '修改视图',
+	'Create view' => '创建视图',
+
+	'Indexes' => '索引',
+	'Indexes have been altered.' => '已修改索引。',
+	'Alter indexes' => '修改索引',
+	'Add next' => '下一行插入',
+	'Index Type' => '索引类型',
+	'Column (length)' => '列（长度）',
+
+	'Foreign keys' => '外键',
+	'Foreign key' => '外键',
+	'Foreign key has been dropped.' => '已删除外键。',
+	'Foreign key has been altered.' => '已修改外键。',
+	'Foreign key has been created.' => '已创建外键。',
+	'Target table' => '目标表',
+	'Change' => '修改',
+	'Source' => '源',
+	'Target' => '目标',
+	'Add column' => '增加列',
+	'Alter' => '修改',
+	'Add foreign key' => '添加外键',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '源列和目标列必须具有相同的数据类型，在目标列上必须有一个索引并且引用的数据必须存在。',
-	'Relations' => '关联信息',
-	'Run file' => '运行文件',
-	'Clear' => '清除',
-	'Maximum allowed file size is %sB.' => '最多允许的文件大小为 %sB',
+
+	'Triggers' => '触发器',
+	'Add trigger' => '创建触发器',
+	'Trigger has been dropped.' => '已删除触发器。',
+	'Trigger has been altered.' => '已修改触发器。',
+	'Trigger has been created.' => '已创建触发器。',
+	'Alter trigger' => '修改触发器',
+	'Create trigger' => '创建触发器',
+	'Time' => '时间',
+	'Event' => '事件',
+	'Name' => '名称',
+
+	'select' => '选择',
+	'Select' => '选择',
+	'Select data' => '选择数据',
+	'Functions' => '函数',
+	'Aggregation' => '集合',
+	'Search' => '搜索',
+	'anywhere' => '任意位置',
+	'Search data in tables' => '在表中搜索数据',
+	'Sort' => '排序',
+	'descending' => '降序',
+	'Limit' => '范围',
+	'Limit rows' => '限制行数',
+	'Text length' => '文本显示限制',
+	'Action' => '动作',
+	'Full table scan' => '全表扫描',
+	'Unable to select the table' => '不能选择该表',
+	'No rows.' => '无数据。',
+	'%d / ' => '%d / ',
+	'%d row(s)' => '%d 行',
+	'Page' => '页面',
+	'last' => '最后',
+	'Load more data' => '加载更多数据',
+	'Loading' => '加载中',
+	'Whole result' => '所有结果',
+	'%d byte(s)' => '%d 字节',
+
+	'Import' => '导入',
+	'%d row(s) have been imported.' => '%d 行已导入。',
+	'File must be in UTF-8 encoding.' => '文件必须使用UTF-8编码。',
+
+	// in-place editing in select
+	'Modify' => '修改',
+	'Ctrl+click on a value to modify it.' => '按住Ctrl并单击某个值进行修改。',
+	'Use edit link to modify this value.' => '使用编辑链接修改该值。',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => '已插入项目%s。',
+	'Item has been deleted.' => '已删除项目。',
+	'Item has been updated.' => '已更新项目。',
+	'%d item(s) have been affected.' => '%d 个项目受到影响。',
+	'New item' => '新建数据',
+	'original' => '原始',
+	// label for value '' in enum data type
+	'empty' => '空',
+	'edit' => '编辑',
+	'Edit' => '编辑',
+	'Insert' => '插入',
+	'Save' => '保存',
+	'Save and continue edit' => '保存并继续编辑',
+	'Save and insert next' => '保存并插入下一个',
+	'Selected' => '已选中',
+	'Clone' => '复制',
+	'Delete' => '删除',
+	'You have no privileges to update this table.' => '您没有权限更新这个表。',
+
+	'E-mail' => '电子邮件',
+	'From' => '来自',
+	'Subject' => '主题',
+	'Attachments' => '附件',
+	'Send' => '发送',
+	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
+
+	// data type descriptions
 	'Numbers' => '数字',
 	'Date and time' => '日期时间',
 	'Strings' => '字符串',
 	'Binary' => '二进制',
 	'Lists' => '列表',
+	'Network' => '网络',
+	'Geometry' => '几何图形',
+	'Relations' => '关联信息',
+
 	'Editor' => '编辑器',
-	'E-mail' => '电子邮件',
-	'From' => '来自',
-	'Subject' => '主题',
-	'Send' => '发送',
-	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
-	'Webserver file %s' => 'Web服务器文件 %s',
-	'File does not exist.' => '文件不存在。',
-	'%d in total' => '共计 %d',
-	'Permanent login' => '保持登录',
-	'Databases have been dropped.' => '已删除数据库。',
-	'Search data in tables' => '在表中搜索数据',
-	'Schema' => '模式',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$1.$3.$5',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => '[yyyy].mm.dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => '现在',
+	'yes' => '是',
+	'no' => '否',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => '文件已存在。',
+	'Please use one of the extensions %s.' => '请使用其中一个扩展：%s。',
+
+	// PostgreSQL and MS SQL schema support
 	'Alter schema' => '修改模式',
 	'Create schema' => '创建模式',
 	'Schema has been dropped.' => '已删除模式。',
 	'Schema has been created.' => '已创建模式。',
 	'Schema has been altered.' => '已修改模式。',
+	'Schema' => '模式',
+	'Invalid schema.' => '非法模式。',
+
+	// PostgreSQL sequences support
 	'Sequences' => '序列',
 	'Create sequence' => '创建序列',
-	'Alter sequence' => '修改序列',
 	'Sequence has been dropped.' => '已删除序列。',
 	'Sequence has been created.' => '已创建序列。',
 	'Sequence has been altered.' => '已修改序列。',
+	'Alter sequence' => '修改序列',
+
+	// PostgreSQL user types support
 	'User types' => '用户类型',
 	'Create type' => '创建类型',
-	'Alter type' => '修改类型',
 	'Type has been dropped.' => '已删除类型。',
 	'Type has been created.' => '已创建类型。',
-	'Use edit link to modify this value.' => '使用编辑链接来修改该值。',
-	'last' => '最后',
-	'From server' => '来自服务器',
-	'System' => '系统',
-	'Select data' => '选择数据',
-	'Show structure' => '显示结构',
-	'empty' => '空',
-	'Network' => '网络',
-	'Geometry' => '几何图形',
-	'File exists.' => '文件已存在。',
-	'Attachments' => '附件',
-	'%d query(s) executed OK.' => '%d 条查询已成功执行。',
-	'Show only errors' => '仅显示错误',
-	'Refresh' => '刷新',
-	'Invalid schema.' => '非法模式。',
-	'Please use one of the extensions %s.' => '请使用这些扩展中的一个：%s。',
-	'now' => '现在',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => '表已复制。',
-	'Copy' => '复制',
-	'Permanent link' => '固定链接',
-	'Edit all' => '编辑全部',
-	'HH:MM:SS' => 'HH:MM:SS',
+	'Alter type' => '修改类型',
 );

adminer/plugin.php

@@ -8,6 +8,9 @@ function adminer_object() {
 		include_once $filename;
 	}
 	
+	// enable extra drivers just by including them
+	//~ include "../plugins/drivers/simpledb.php";
+	
 	$plugins = array(
 		// specify enabled plugins here
 		new AdminerDatabaseHide(array('information_schema')),

adminer/privileges.inc.php

@@ -15,7 +15,7 @@ hidden_fields_get();
 echo "<input type='hidden' name='db' value='" . h(DB) . "'>\n";
 echo ($grant ? "" : "<input type='hidden' name='grant' value=''>\n");
 echo "<table cellspacing='0'>\n";
-echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th>&nbsp;</thead>\n";
+echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th></thead>\n";
 
 while ($row = $result->fetch_assoc()) {
 	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";

adminer/procedure.inc.php

@@ -35,9 +35,10 @@ $routine_languages = routine_languages();
 ?>
 
 <form action="" method="post" id="form">
-<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64" autocapitalize="off">
+<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" data-maxlength="64" autocapitalize="off">
 <?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 cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
@@ -47,6 +48,8 @@ if (isset($_GET["function"])) {
 }
 ?>
 </table>
+<?php echo script("editFields();"); ?>
+</div>
 <p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">

adminer/processlist.inc.php

@@ -1,18 +1,21 @@
 <?php
-if (support("kill") && $_POST && !$error) {
-	$killed = 0;
-	foreach ((array) $_POST["kill"] as $val) {
-		if (kill_process($val)) {
-			$killed++;
+if (support("kill")) {
+	if ($_POST && !$error) {
+		$killed = 0;
+		foreach ((array) $_POST["kill"] as $val) {
+			if (kill_process($val)) {
+				$killed++;
+			}
 		}
+		queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 	}
-	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 }
 
 page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
+<div class="scrollable">
 <table cellspacing="0" class="nowrap checkable">
 <?php
 echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
@@ -21,12 +24,12 @@ $i = -1;
 foreach (process_list() as $i => $row) {
 
 	if (!$i) {
-		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>&nbsp;" : "");
+		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>" : "");
 		foreach ($row as $key => $val) {
 			echo "<th>$key" . doc_link(array(
 				'sql' => "show-processlist.html#processlist_" . strtolower($key),
 				'pgsql' => "monitoring-stats.html#PG-STAT-ACTIVITY-VIEW",
-				'oracle' => "../b14237/dynviews_2088.htm",
+				'oracle' => "REFRN30223",
 			));
 		}
 		echo "</thead>\n";
@@ -38,13 +41,14 @@ foreach (process_list() as $i => $row) {
 			($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>'
-			: nbsp($val)
+			: h($val)
 		);
 	}
 	echo "\n";
 }
 ?>
 </table>
+</div>
 <p>
 <?php
 if (support("kill")) {

adminer/script.inc.php

@@ -4,10 +4,10 @@ header("Content-Type: text/javascript; charset=utf-8");
 if ($_GET["script"] == "db") {
 	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
 	foreach (table_status() as $name => $table_status) {
-		json_row("Comment-$name", nbsp($table_status["Comment"]));
+		json_row("Comment-$name", h($table_status["Comment"]));
 		if (!is_view($table_status)) {
 			foreach (array("Engine", "Collation") as $key) {
-				json_row("$key-$name", nbsp($table_status[$key]));
+				json_row("$key-$name", h($table_status[$key]));
 			}
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
@@ -34,12 +34,6 @@ if ($_GET["script"] == "db") {
 } elseif ($_GET["script"] == "kill") {
 	$connection->query("KILL " . number($_POST["kill"]));
 
-} elseif ($_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"])));
-	}
-
 } else { // connect
 	foreach (count_tables($adminer->databases()) as $db => $val) {
 		json_row("tables-$db", $val);

adminer/select.inc.php

@@ -184,7 +184,7 @@ if ($_POST && !$error) {
 			cookie("adminer_import", "output=" . urlencode($adminer_import["output"]) . "&format=" . urlencode($_POST["separator"]));
 			$result = true;
 			$cols = array_keys($fields);
-			preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
+			preg_match_all('~(?>"[^"]*"|[^"\r\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
 			$driver->begin();
 			$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
@@ -309,6 +309,7 @@ if (!$columns && support("table")) {
 		} else {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 
+			echo "<div class='scrollable'>";
 			echo "<table id='table' cellspacing='0' class='nowrap checkable'>";
 			echo script("mixin(qs('#table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true), onkeydown: editingKeydown});");
 			echo "<thead><tr>" . (!$group && $select
@@ -330,7 +331,7 @@ if (!$columns && support("table")) {
 						$column = idf_escape($key);
 						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
 						$desc = "&desc%5B0%5D=1";
-						echo "<th>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
+						echo "<th id='th[" . h(bracket_escape($key)) . "]'>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
 						echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
 						echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
 						echo "<span class='column hidden'>";
@@ -369,7 +370,7 @@ if (!$columns && support("table")) {
 				if (!$unique_array) {
 					$unique_array = array();
 					foreach ($rows[$n] as $key => $val) {
-						if (!preg_match('~^(COUNT\\((\\*|(DISTINCT )?`(?:[^`]|``)+`)\\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\\(`(?:[^`]|``)+`\\))$~', $key)) { //! columns looking like functions
+						if (!preg_match('~^(COUNT\((\*|(DISTINCT )?`(?:[^`]|``)+`)\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\(`(?:[^`]|``)+`\))$~', $key)) { //! columns looking like functions
 							$unique_array[$key] = $val;
 						}
 					}
@@ -407,9 +408,9 @@ if (!$columns && support("table")) {
 									foreach ($foreign_key["source"] as $i => $source) {
 										$link .= where_link($i, $foreign_key["target"][$i], $rows[$n][$source]);
 									}
-									$link = ($foreign_key["db"] != "" ? preg_replace('~([?&]db=)[^&]+~', '\\1' . urlencode($foreign_key["db"]), ME) : ME) . 'select=' . urlencode($foreign_key["table"]) . $link; // InnoDB supports non-UNIQUE keys
+									$link = ($foreign_key["db"] != "" ? preg_replace('~([?&]db=)[^&]+~', '\1' . urlencode($foreign_key["db"]), ME) : ME) . 'select=' . urlencode($foreign_key["table"]) . $link; // InnoDB supports non-UNIQUE keys
 									if ($foreign_key["ns"]) {
-										$link = preg_replace('~([?&]ns=)[^&]+~', '\\1' . urlencode($foreign_key["ns"]), $link);
+										$link = preg_replace('~([?&]ns=)[^&]+~', '\1' . urlencode($foreign_key["ns"]), $link);
 									}
 									if (count($foreign_key["source"]) == 1) {
 										break;
@@ -435,12 +436,13 @@ if (!$columns && support("table")) {
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
 						$text = preg_match('~text|lob~', $field["type"]);
+						echo "<td id='$id'";
 						if (($_GET["modify"] && $editable) || $value !== null) {
 							$h_value = h($value !== null ? $value : $row[$key]);
-							echo "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>");
+							echo ">" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>");
 						} else {
-							$long = strpos($val, "<i>...</i>");
-							echo "<td id='$id' data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
+							$long = strpos($val, "<i>…</i>");
+							echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
 								. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
 								. ">$val</td>"
 							;
@@ -459,66 +461,77 @@ if (!$columns && support("table")) {
 				exit;
 			}
 			echo "</table>\n";
+			echo "</div>\n";
 		}
 
-		echo "<div class='footer'>\n";
-		if (($rows || $page) && !is_ajax()) {
-			echo "<p>\n";
-			$exact_count = true;
-			if ($_GET["page"] != "last") {
-				if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) {
-					$found_rows = ($page ? $page * $limit : 0) + count($rows);
-				} elseif ($jush != "sql" || !$is_group) {
-					$found_rows = ($is_group ? false : found_rows($table_status, $where));
-					if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
-						// slow with big tables
-						$found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group)));
-					} else {
-						$exact_count = false;
+		if (!is_ajax()) {
+			if ($rows || $page) {
+				$exact_count = true;
+				if ($_GET["page"] != "last") {
+					if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) {
+						$found_rows = ($page ? $page * $limit : 0) + count($rows);
+					} elseif ($jush != "sql" || !$is_group) {
+						$found_rows = ($is_group ? false : found_rows($table_status, $where));
+						if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
+							// slow with big tables
+							$found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group)));
+						} else {
+							$exact_count = false;
+						}
 					}
 				}
-			}
 
-			if ($limit != "" && ($found_rows === false || $found_rows > $limit || $page)) {
-				// display first, previous 4, next 4 and last page
-				$max_page = ($found_rows === false
-					? $page + (count($rows) >= $limit ? 2 : 1)
-					: floor(($found_rows - 1) / $limit)
-				);
-				if ($jush != "simpledb") {
-					echo '<a href="' . h(remove_from_uri("page")) . '">' . lang('Page') . "</a>:";
-					echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };");
-					echo pagination(0, $page) . ($page > 5 ? " ..." : "");
-					for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
-						echo pagination($i, $page);
-					}
-					if ($max_page > 0) {
-						echo ($page + 5 < $max_page ? " ..." : "");
-						echo ($exact_count && $found_rows !== false
-							? pagination($max_page, $page)
-							: " <a href='" . h(remove_from_uri("page") . "&page=last") . "' title='~$max_page'>" . lang('last') . "</a>"
-						);
-					}
+				$pagination = ($limit != "" && ($found_rows === false || $found_rows > $limit || $page));
+				if ($pagination) {
 					echo (($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit
-						? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" class="loadmore">' . lang('Load more data') . '</a>'
-							. script("qsl('a').onclick = partial(selectLoadMore, " . (+$limit) . ", '" . lang('Loading') . "...');", "")
+						? '<p><a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" class="loadmore">' . lang('Load more data') . '</a>'
+							. script("qsl('a').onclick = partial(selectLoadMore, " . (+$limit) . ", '" . lang('Loading') . "…');", "")
 						: ''
 					);
-				} else {
-					echo lang('Page') . ":";
-					echo pagination(0, $page) . ($page > 1 ? " ..." : "");
-					echo ($page ? pagination($page, $page) : "");
-					echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " ..." : "") : "");
+					echo "\n";
 				}
-				echo "\n";
 			}
+			
+			echo "<div class='footer'><div>\n";
+			if ($rows || $page) {
+				if ($pagination) {
+					// display first, previous 4, next 4 and last page
+					$max_page = ($found_rows === false
+						? $page + (count($rows) >= $limit ? 2 : 1)
+						: floor(($found_rows - 1) / $limit)
+					);
+					echo "<fieldset>";
+					if ($jush != "simpledb") {
+						echo "<legend><a href='" . h(remove_from_uri("page")) . "'>" . lang('Page') . "</a></legend>";
+						echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };");
+						echo pagination(0, $page) . ($page > 5 ? " …" : "");
+						for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
+							echo pagination($i, $page);
+						}
+						if ($max_page > 0) {
+							echo ($page + 5 < $max_page ? " …" : "");
+							echo ($exact_count && $found_rows !== false
+								? pagination($max_page, $page)
+								: " <a href='" . h(remove_from_uri("page") . "&page=last") . "' title='~$max_page'>" . lang('last') . "</a>"
+							);
+						}
+					} else {
+						echo "<legend>" . lang('Page') . "</legend>";
+						echo pagination(0, $page) . ($page > 1 ? " …" : "");
+						echo ($page ? pagination($page, $page) : "");
+						echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " …" : "") : "");
+					}
+					echo "</fieldset>\n";
+				}
+				
+				echo "<fieldset>";
+				echo "<legend>" . lang('Whole result') . "</legend>";
+				$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
+				echo checkbox("all", 1, 0, ($found_rows !== false ? ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) : ""), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
+				echo "</fieldset>\n";
 
-			echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : "");
-			$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
-			echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
-
-			if ($adminer->selectCommandPrint()) {
-				?>
+				if ($adminer->selectCommandPrint()) {
+					?>
 <fieldset<?php echo ($_GET["modify"] ? '' : ' class="jsonly"'); ?>><legend><?php echo lang('Modify'); ?></legend><div>
 <input type="submit" value="<?php echo lang('Save'); ?>"<?php echo ($_GET["modify"] ? '' : ' title="' . lang('Ctrl+click on a value to modify it.') . '"'); ?>>
 </div></fieldset>
@@ -528,40 +541,45 @@ if (!$columns && support("table")) {
 <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"><?php echo confirm(); ?>
 </div></fieldset>
 <?php
-			}
-
-			$format = $adminer->dumpFormat();
-			foreach ((array) $_GET["columns"] as $column) {
-				if ($column["fun"]) {
-					unset($format['sql']);
-					break;
 				}
-			}
-			if ($format) {
-				print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
-				$output = $adminer->dumpOutput();
-				echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
-				echo html_select("format", $format, $adminer_import["format"]);
-				echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
-				echo "</div></fieldset>\n";
+
+				$format = $adminer->dumpFormat();
+				foreach ((array) $_GET["columns"] as $column) {
+					if ($column["fun"]) {
+						unset($format['sql']);
+						break;
+					}
+				}
+				if ($format) {
+					print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
+					$output = $adminer->dumpOutput();
+					echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
+					echo html_select("format", $format, $adminer_import["format"]);
+					echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
+					echo "</div></fieldset>\n";
+				}
+
+				$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
 			}
 
+			echo "</div></div>\n";
+
+			if ($adminer->selectImportPrint()) {
+				echo "<div>";
+				echo "<a href='#import'>" . lang('Import') . "</a>";
+				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
+				echo "<span id='import' class='hidden'>: ";
+				echo "<input type='file' name='csv_file'> ";
+				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
+				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
+				echo "</span>";
+				echo "</div>";
+			}
+
+			echo "<input type='hidden' name='token' value='$token'>\n";
+			echo "</form>\n";
+			echo (!$group && $select ? "" : script("tableCheck();"));
 		}
-
-		if ($adminer->selectImportPrint()) {
-			print_fieldset("import", lang('Import'), !$rows);
-			echo "<input type='file' name='csv_file'> ";
-			echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
-			echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
-			echo "</div></fieldset>\n";
-		}
-
-		$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
-		echo "<input type='hidden' name='token' value='$token'>\n";
-		echo "</div>\n";
-
-		echo "</form>\n";
-		echo (!$group && $select ? "" : script("tableCheck();"));
 	}
 }
 

adminer/sql.inc.php

@@ -53,10 +53,13 @@ if (!$error && $_POST) {
 		$connection2 = connect(); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
 		if (is_object($connection2) && DB != "") {
 			$connection2->select_db(DB);
+			if ($_GET["ns"] != "") {
+				set_schema($_GET["ns"], $connection2);
+			}
 		}
 		$commands = 0;
 		$errors = array();
-		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\\*|-- |$' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : '');
+		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . ($jush == "pgsql" ? '|\$[^$]*\$' : '');
 		$total_start = microtime(true);
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		$dump_format = $adminer->dumpFormat();
@@ -78,7 +81,7 @@ if (!$error && $_POST) {
 					$offset = $pos + strlen($found);
 
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-						while (preg_match('(' . ($found == '/*' ? '\\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
+						while (preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
 							$s = $match[0][0];
 							if (!$s && $fp && !feof($fp)) {
 								$query .= fread($fp, 1e5);
@@ -219,26 +222,30 @@ if (!isset($_GET["import"])) {
 	}
 	echo "<p>";
 	textarea("query", $q, 20);
-	echo ($_POST ? "" : script("qs('textarea').focus();"));
+	echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . js_escape(remove_from_uri("sql|limit|error_stops|only_errors|history")) . "');");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
 	
 } else {
 	echo "<fieldset><legend>" . lang('File upload') . "</legend><div>";
+	$gz = (extension_loaded("zlib") ? "[.gz]" : "");
 	echo (ini_bool("file_uploads")
-		? "SQL (&lt; " . ini_get("upload_max_filesize") . "B): <input type='file' name='sql_file[]' multiple>\n$execute" // ignore post_max_size because it is for all form fields together and bytes computing would be necessary
+		? "SQL$gz (&lt; " . ini_get("upload_max_filesize") . "B): <input type='file' name='sql_file[]' multiple>\n$execute" // ignore post_max_size because it is for all form fields together and bytes computing would be necessary
 		: lang('File uploads are disabled.')
 	);
 	echo "</div></fieldset>\n";
-	echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
-	echo lang('Webserver file %s', "<code>" . h($adminer->importServerPath()) . (extension_loaded("zlib") ? "[.gz]" : "") . "</code>");
-	echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
-	echo "</div></fieldset>\n";
+	$importServerPath = $adminer->importServerPath();
+	if ($importServerPath) {
+		echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
+		echo lang('Webserver file %s', "<code>" . h($importServerPath) . "$gz</code>");
+		echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
+		echo "</div></fieldset>\n";
+	}
 	echo "<p>";
 }
 
-echo checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"])), lang('Stop on error')) . "\n";
-echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"])), lang('Show only errors')) . "\n";
+echo checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"]) || $_GET["error_stops"]), lang('Stop on error')) . "\n";
+echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"]) || $_GET["only_errors"]), lang('Show only errors')) . "\n";
 echo "<input type='hidden' name='token' value='$token'>\n";
 
 if (!isset($_GET["import"]) && $history) {

adminer/sqlite.php

@@ -1,8 +1,11 @@
 <?php
 function adminer_object() {
 	include_once "../plugins/plugin.php";
-	include_once "../plugins/login-sqlite.php";
-	return new AdminerPlugin(array(new AdminerLoginSqlite("admin", password_hash("", PASSWORD_DEFAULT))));
+	include_once "../plugins/login-password-less.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 "./index.php";

adminer/static/default.css

@@ -1,5 +1,5 @@
 /** @author Ondrej Valka, http://valka.info */
-body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
+body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; width: -moz-fit-content; width: fit-content; }
 a { color: blue; text-decoration: none; }
 a:visited { color: navy; }
 a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
@@ -23,7 +23,7 @@ code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
 pre { margin: 1em 0 0; }
 pre, textarea { font: 100%/1.25 monospace; }
-input[type=image] { vertical-align: middle; }
+input { vertical-align: middle; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
@@ -58,14 +58,16 @@ input.wayoff { left: -1000px; position: absolute; }
 .icon:hover { background-color: red; }
 .size { width: 6ex; }
 .help { cursor: help; }
-.footer { position: sticky; bottom: 0; background: #fff; padding: 1px 0 .5em; }
+.footer { position: sticky; bottom: 0; margin-right: -20px; border-top: 20px solid rgba(255, 255, 255, .7); border-image: linear-gradient(rgba(255, 255, 255, .2), #fff) 100% 0; }
+.footer > div { background: #fff; padding: 0 0 .5em; }
+.footer fieldset { margin-top: 0; }
 .links a { white-space: nowrap; margin-right: 20px; }
 .logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
 .loadmore { margin-left: 1ex; }
 /* .edit used in designs */
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
-#menu p, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
-#tables li{ list-style: none; }
+#menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
 #logins, #tables { white-space: nowrap; overflow: auto; }
 #logins a, #tables a, #tables span { background: #fff; }

adminer/static/editing.js

@@ -15,12 +15,16 @@ function bodyLoad(version, maria) {
 					key = 0;
 					if (maria) {
 						for (var i = 1; i < obj.length; i++) {
-							obj[i] = obj[i].replace(/\.html/, '/');
+							obj[i] = obj[i]
+								.replace(/\.html/, '/')
+								.replace(/-type-syntax/, '-data-types')
+								.replace(/numeric-(data-types)/, '$1-$&')
+								.replace(/#statvar_.*/, '#$$1')
+							;
 						}
 					}
 				}
-				obj[key] = obj[key]
-					.replace(/dev\.mysql\.com\/doc\/mysql\/en\//, (maria ? 'mariadb.com/kb/en/library/' : '$&')) // MariaDB
+				obj[key] = (maria ? obj[key].replace(/dev\.mysql\.com\/doc\/mysql\/en\//, 'mariadb.com/kb/en/library/') : obj[key]) // MariaDB
 					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
 					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
 				;
@@ -30,7 +34,7 @@ function bodyLoad(version, maria) {
 			jush.custom_links = jushLinks;
 		}
 		jush.highlight_tag('code', 0);
-		var tags = qsa('textarea', document);
+		var tags = qsa('textarea');
 		for (var i = 0; i < tags.length; i++) {
 			if (/(^|\s)jush-/.test(tags[i].className)) {
 				var pre = jush.textarea(tags[i]);
@@ -68,9 +72,10 @@ function typePassword(el, disable) {
 }
 
 /** Install toggle handler
+* @param [HTMLElement]
 */
-function messagesPrint() {
-	var els = qsa('.toggle', document);
+function messagesPrint(el) {
+	var els = qsa('.toggle', el);
 	for (var i = 0; i < els.length; i++) {
 		els[i].onclick = partial(toggle, els[i].getAttribute('href').substr(1));
 	}
@@ -78,6 +83,18 @@ function messagesPrint() {
 
 
 
+/** Hide or show some login rows for selected driver	
+* @param HTMLSelectElement	
+*/	
+function loginDriver(driver) {	
+	var trs = parentTag(driver, 'table').rows;	
+	var disabled = /sqlite/.test(selectValue(driver));	
+	alterClass(trs[1], 'hidden', disabled);	// 1 - row with server
+	trs[1].getElementsByTagName('input')[0].disabled = disabled;	
+}
+
+
+
 var dbCtrl;
 var dbPrevious = {};
 
@@ -188,6 +205,79 @@ function idfEscape(s) {
 	return s.replace(/`/, '``');
 }
 
+
+
+/** Set up event handlers for edit_fields().
+*/
+function editFields() {
+	var els = qsa('[name$="[field]"]');
+	for (var i = 0; i < els.length; i++) {
+		els[i].oninput = function () {
+			editingNameChange.call(this);
+			if (!this.defaultValue) {
+				editingAddRow.call(this);
+			}
+		}
+	}
+	els = qsa('[name$="[length]"]');
+	for (var i = 0; i < els.length; i++) {
+		mixin(els[i], {onfocus: editingLengthFocus, oninput: editingLengthChange});
+	}
+	els = qsa('[name$="[type]"]');
+	for (var i = 0; i < els.length; i++) {
+		mixin(els[i], {
+			onfocus: function () { lastType = selectValue(this); },
+			onchange: editingTypeChange,
+			onmouseover: function (event) { helpMouseover.call(this, event, getTarget(event).value, 1) },
+			onmouseout: helpMouseout
+		});
+	}
+}
+
+/** Handle clicks on fields editing
+* @param MouseEvent
+* @return boolean false to cancel action
+*/
+function editingClick(event) {
+	var el = getTarget(event);
+	if (!isTag(el, 'input')) {
+		el = parentTag(el, 'label');
+		el = el && qs('input', el);
+	}
+	if (el) {
+		var name = el.name;
+		if (/^add\[/.test(name)) {
+			editingAddRow.call(el, 1);
+		} else if (/^up\[/.test(name)) {
+			editingMoveRow.call(el, 1);
+		} else if (/^down\[/.test(name)) {
+			editingMoveRow.call(el);
+		} else if (/^drop_col\[/.test(name)) {
+			editingRemoveRow.call(el, 'fields\$1[field]');
+		} else {
+			if (name == 'auto_increment_col') {
+				var field = el.form['fields[' + el.value + '][field]'];
+				if (!field.value) {
+					field.value = 'id';
+					field.oninput();
+				}
+			}
+			return;
+		}
+		return false;
+	}
+}
+
+/** Handle input on fields editing
+* @param InputEvent
+*/
+function editingInput(event) {
+	var el = getTarget(event);
+	if (/\[default\]$/.test(el.name)) {
+		 el.previousSibling.checked = true;
+	}
+}
+
 /** Detect foreign key
 * @this HTMLInputElement
 */
@@ -226,7 +316,7 @@ function editingNameChange() {
 }
 
 /** Add table row for next field
-* @param boolean
+* @param [boolean]
 * @return boolean false
 * @this HTMLInputElement
 */
@@ -269,7 +359,7 @@ function editingAddRow(focus) {
 }
 
 /** Remove table row for field
-* @param string
+* @param string regular expression replacement
 * @return boolean false
 * @this HTMLInputElement
 */
@@ -281,16 +371,16 @@ function editingRemoveRow(name) {
 }
 
 /** Move table row for field
-* @param boolean direction to move row, true for up or false for down
+* @param [boolean]
 * @return boolean false for success
 * @this HTMLInputElement
 */
-function editingMoveRow(dir){
+function editingMoveRow(up){
 	var row = parentTag(this, 'tr');
 	if (!('nextElementSibling' in row)) {
 		return true;
 	}
-	row.parentNode.insertBefore(row, dir
+	row.parentNode.insertBefore(row, up
 		? row.previousElementSibling
 		: row.nextElementSibling ? row.nextElementSibling.nextElementSibling : row.parentNode.firstChild);
 	return false;
@@ -349,8 +439,7 @@ function editingLengthFocus() {
 	var td = this.parentNode;
 	if (/(enum|set)$/.test(selectValue(td.previousSibling.firstChild))) {
 		var edit = qs('#enum-edit');
-		var val = this.value;
-		edit.value = (/^'.+'$/.test(val) ? val.substr(1, val.length - 2).replace(/','/g, "\n").replace(/''/g, "'") : val); //! doesn't handle 'a'',''b' correctly
+		edit.value = enumValues(this.value);
 		td.appendChild(edit);
 		this.style.display = 'none';
 		edit.style.display = 'inline';
@@ -358,13 +447,32 @@ function editingLengthFocus() {
 	}
 }
 
+/** Get enum values
+* @param string
+* @return string values separated by newlines
+*/
+function enumValues(s) {
+	var re = /(^|,)\s*'(([^\\']|\\.|'')*)'\s*/g;
+	var result = [];
+	var offset = 0;
+	var match;
+	while (match = re.exec(s)) {
+		if (offset != match.index) {
+			break;
+		}
+		result.push(match[2].replace(/'(')|\\(.)/g, '$1$2'));
+		offset += match[0].length;
+	}
+	return (offset == s.length ? result.join('\n') : s);
+}
+
 /** Finish editing of enum or set
 * @this HTMLTextAreaElement
 */
 function editingLengthBlur() {
 	var field = this.parentNode.firstChild;
 	var val = this.value;
-	field.value = (/^'[^\n]+'$/.test(val) ? val : val && "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\n/g, "','") + "'");
+	field.value = (/^'[^\n]+'$/.test(val) ? val : val && "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\\/g, '\\\\').replace(/\n/g, "','") + "'");
 	field.style.display = 'inline';
 	this.style.display = 'none';
 }
@@ -380,15 +488,6 @@ function columnShow(checked, column) {
 	}
 }
 
-/** Hide column with default values in narrow window
-*/
-function editingHideDefaults() {
-	if (innerWidth < document.documentElement.scrollWidth) {
-		qs('#form')['defaults'].checked = false;
-		columnShow(false, 5);
-	}
-}
-
 /** Display partition options
 * @this HTMLSelectElement
 */
@@ -409,6 +508,19 @@ function partitionNameChange() {
 	this.oninput = function () {};
 }
 
+/** Show or hide comment fields
+* @param HTMLInputElement
+* @param [boolean] whether to focus Comment if checked
+*/
+function editingCommentsClick(el, focus) {
+	var comment = el.form['Comment'];
+	columnShow(el.checked, 6);
+	alterClass(comment, 'hidden', !el.checked);
+	if (focus && el.checked) {
+		comment.focus();
+	}
+}
+
 
 
 /** Uncheck 'all' checkbox
@@ -433,8 +545,8 @@ function dumpClick(event) {
 * @this HTMLSelectElement
 */
 function foreignAddRow() {
-	this.onchange = function () { };
 	var row = cloneNode(parentTag(this, 'tr'));
+	this.onchange = function () { };
 	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/\]/, '1$&');
@@ -449,8 +561,8 @@ function foreignAddRow() {
 * @this HTMLSelectElement
 */
 function indexesAddRow() {
-	this.onchange = function () { };
 	var row = cloneNode(parentTag(this, 'tr'));
+	this.onchange = function () { };
 	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
@@ -519,6 +631,23 @@ function indexesAddColumn(prefix) {
 
 
 
+/** Updates the form action
+* @param HTMLFormElement
+* @param string
+*/
+function sqlSubmit(form, root) {
+	if (encodeURIComponent(form['query'].value).length < 2e3) {
+		form.action = root
+			+ '&sql=' + encodeURIComponent(form['query'].value)
+			+ (form['limit'].value ? '&limit=' + +form['limit'].value : '')
+			+ (form['error_stops'].checked ? '&error_stops=1' : '')
+			+ (form['only_errors'].checked ? '&only_errors=1' : '')
+		;
+	}
+}
+
+
+
 /** Handle changing trigger time or event
 * @param RegExp
 * @param string
@@ -529,7 +658,7 @@ function triggerChange(tableRe, table, form) {
 	if (tableRe.test(form['Trigger'].value)) {
 		form['Trigger'].value = table + '_' + (selectValue(form['Timing']).charAt(0) + formEvent.charAt(0)).toLowerCase();
 	}
-	alterClass(form['Of'], 'hidden', formEvent != 'UPDATE OF');
+	alterClass(form['Of'], 'hidden', !/ OF/.test(formEvent));
 }
 
 

adminer/static/functions.js

@@ -14,17 +14,17 @@ function qs(selector, context) {
 * @return HTMLElement
 */
 function qsl(selector, context) {
-	var els = qsa(selector, context || document);
+	var els = qsa(selector, context);
 	return els[els.length - 1];
 }
 
 /** Get all elements by selector
 * @param string
-* @param HTMLElement
+* @param [HTMLElement] defaults to document
 * @return NodeList
 */
 function qsa(selector, context) {
-	return context.querySelectorAll(selector);
+	return (context || document).querySelectorAll(selector);
 }
 
 /** Return a function calling fn with the next arguments
@@ -143,7 +143,7 @@ function selectValue(select) {
 */
 function isTag(el, tag) {
 	var re = new RegExp('^(' + tag + ')$', 'i');
-	return re.test(el.tagName);
+	return el && re.test(el.tagName);
 }
 
 /** Get parent node with specified tag name
@@ -205,14 +205,9 @@ function formCheck(name) {
 /** Check all rows in <table class="checkable">
 */
 function tableCheck() {
-	var tables = qsa('table', document);
-	for (var i=0; i < tables.length; i++) {
-		if (/(^|\s)checkable(\s|$)/.test(tables[i].className)) {
-			var trs = qsa('tr', tables[i]);
-			for (var j=0; j < trs.length; j++) {
-				trCheck(trs[j].firstChild.firstChild);
-			}
-		}
+	var inputs = qsa('table.checkable td:first-child input');
+	for (var i=0; i < inputs.length; i++) {
+		trCheck(inputs[i]);
 	}
 }
 
@@ -319,13 +314,13 @@ function checkboxClick(event) {
 
 /** Set HTML code of an element
 * @param string
-* @param string undefined to set parentNode to &nbsp;
+* @param string undefined to set parentNode to empty string
 */
 function setHtml(id, html) {
-	var el = qs('#' + id);
+	var el = qs('[id="' + id.replace(/[\\"]/g, '\\$&') + '"]'); // database name is used as ID
 	if (el) {
 		if (html == null) {
-			el.parentNode.innerHTML = '&nbsp;';
+			el.parentNode.innerHTML = '';
 		} else {
 			el.innerHTML = html;
 		}
@@ -449,7 +444,8 @@ function selectSearch(name) {
 	var divs = qsa('div', el);
 	for (var i=0; i < divs.length; i++) {
 		var div = divs[i];
-		if (isTag(div.firstChild, 'select') && selectValue(div.firstChild) == name) {
+		var el = qs('[name$="[col]"]', div);
+		if (el && selectValue(el) == name) {
 			break;
 		}
 	}
@@ -496,6 +492,9 @@ function bodyKeydown(event, button) {
 		if (button) {
 			target.form[button].click();
 		} else {
+			if (target.form.onsubmit) {
+				target.form.onsubmit();
+			}
 			target.form.submit();
 		}
 		target.focus();
@@ -545,20 +544,22 @@ function editingKeydown(event) {
 */
 function functionChange() {
 	var input = this.form[this.name.replace(/^function/, 'fields')];
-	if (selectValue(this)) {
-		if (input.origType === undefined) {
-			input.origType = input.type;
-			input.origMaxLength = input.getAttribute('data-maxlength');
-		}
-		input.removeAttribute('data-maxlength');
-		input.type = 'text';
-	} else if (input.origType) {
-		input.type = input.origType;
-		if (input.origMaxLength >= 0) {
-			input.setAttribute('data-maxlength', input.origMaxLength);
+	if (input) { // undefined with the set data type
+		if (selectValue(this)) {
+			if (input.origType === undefined) {
+				input.origType = input.type;
+				input.origMaxLength = input.getAttribute('data-maxlength');
+			}
+			input.removeAttribute('data-maxlength');
+			input.type = 'text';
+		} else if (input.origType) {
+			input.type = input.origType;
+			if (input.origMaxLength >= 0) {
+				input.setAttribute('data-maxlength', input.origMaxLength);
+			}
 		}
+		oninput({target: input});
 	}
-	oninput({target: input});
 	helpClose();
 }
 
@@ -672,6 +673,7 @@ function ajaxForm(form, message, button) {
 		if (window.jush) {
 			jush.highlight_tag(qsa('code', qs('#ajaxstatus')), 0);
 		}
+		messagesPrint(qs('#ajaxstatus'));
 	}, data, message);
 }
 
@@ -707,7 +709,7 @@ function selectClick(event, text, warning) {
 		}
 	};
 	var pos = event.rangeOffset;
-	var value = td.firstChild.alt || td.textContent || td.innerText;
+	var value = (td.firstChild && td.firstChild.alt) || td.textContent || td.innerText;
 	input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
 	if (text) {
 		var rows = 1;
@@ -716,7 +718,7 @@ function selectClick(event, text, warning) {
 		});
 		input.rows = rows;
 	}
-	if (value == '\u00A0' || qsa('i', td).length) { // &nbsp; or i - NULL
+	if (qsa('i', td).length) { // <i> - NULL
 		value = '';
 	}
 	if (document.selection) {

adminer/table.inc.php

@@ -34,7 +34,7 @@ if (!is_view($table_status)) {
 		$foreign_keys = foreign_keys($TABLE);
 		if ($foreign_keys) {
 			echo "<table cellspacing='0'>\n";
-			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td>&nbsp;</thead>\n";
+			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td></thead>\n";
 			foreach ($foreign_keys as $name => $foreign_key) {
 				echo "<tr title='" . h($name) . "'>";
 				echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
@@ -43,8 +43,8 @@ if (!is_view($table_status)) {
 					. "</a>"
 				;
 				echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
-				echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
-				echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
+				echo "<td>" . h($foreign_key["on_delete"]) . "\n";
+				echo "<td>" . h($foreign_key["on_update"]) . "\n";
 				echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
 			}
 			echo "</table>\n";

adminer/trigger.inc.php

@@ -2,7 +2,7 @@
 $TABLE = $_GET["trigger"];
 $name = $_GET["name"];
 $trigger_options = trigger_options();
-$row = (array) trigger($name) + array("Trigger" => $TABLE . "_bi");
+$row = (array) trigger($name, $TABLE) + array("Trigger" => $TABLE . "_bi");
 
 if ($_POST) {
 	if (!$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_options["Event"]) && in_array($_POST["Type"], $trigger_options["Type"])) {
@@ -33,13 +33,13 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 ?>
 
 <form action="" method="post" id="form">
-<table cellspacing="0">
+<table cellspacing="0" class="layout">
 <tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "triggerChange(/^" . preg_quote($TABLE, "/") . "_[ba][iud]$/, '" . js_escape($TABLE) . "', this.form);"); ?>
 <tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_options["Event"], $row["Event"], "this.form['Timing'].onchange();"); ?>
 <?php echo (in_array("UPDATE OF", $trigger_options["Event"]) ? " <input name='Of' value='" . h($row["Of"]) . "' class='hidden'>": ""); ?>
 <tr><th><?php echo lang('Type'); ?><td><?php echo html_select("Type", $trigger_options["Type"], $row["Type"]); ?>
 </table>
-<p><?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64" autocapitalize="off">
+<p><?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" data-maxlength="64" autocapitalize="off">
 <?php echo script("qs('#form')['Timing'].onchange();"); ?>
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <p>

adminer/user.inc.php

@@ -29,7 +29,7 @@ $old_pass = "";
 
 if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q($USER) . "@" . q($_GET["host"])))) { //! use information_schema for MySQL 5 - column names in column privileges are not escaped
 	while ($row = $result->fetch_row()) {
-		if (preg_match('~GRANT (.*) ON (.*) TO ~', $row[0], $match) && preg_match_all('~ *([^(,]*[^ ,(])( *\\([^)]+\\))?~', $match[1], $matches, PREG_SET_ORDER)) { //! escape the part between ON and TO
+		if (preg_match('~GRANT (.*) ON (.*) TO ~', $row[0], $match) && preg_match_all('~ *([^(,]*[^ ,(])( *\([^)]+\))?~', $match[1], $matches, PREG_SET_ORDER)) { //! escape the part between ON and TO
 			foreach ($matches as $val) {
 				if ($val[1] != "USAGE") {
 					$grants["$match[2]$val[2]"][$val[1]] = true;
@@ -52,7 +52,7 @@ if ($_POST && !$error) {
 	} else {
 		$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
 		$pass = $_POST["pass"];
-		if ($pass != '' && !$_POST["hashed"]) {
+		if ($pass != '' && !$_POST["hashed"] && !min_version(8)) {
 			// compute hash in a separate query so that plain text password is not saved to history
 			$pass = $connection->result("SELECT PASSWORD(" . q($pass) . ")");
 			$error = !$pass;
@@ -61,7 +61,7 @@ if ($_POST && !$error) {
 		$created = false;
 		if (!$error) {
 			if ($old_user != $new_user) {
-				$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
+				$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY " . (min_version(8) ? "" : "PASSWORD ") . q($pass));
 				$error = !$created;
 			} elseif ($pass != $old_pass) {
 				queries("SET PASSWORD FOR $new_user = " . q($pass));
@@ -84,7 +84,7 @@ if ($_POST && !$error) {
 					$grant = array_diff($grant, $old_grant);
 					unset($grants[$object]);
 				}
-				if (preg_match('~^(.+)\\s*(\\(.*\\))?$~U', $object, $match) && (
+				if (preg_match('~^(.+)\s*(\(.*\))?$~U', $object, $match) && (
 					!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
 					|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user")
 				)) {
@@ -99,7 +99,7 @@ if ($_POST && !$error) {
 				queries("DROP USER $old_user");
 			} elseif (!isset($_GET["grant"])) {
 				foreach ($grants as $object => $revoke) {
-					if (preg_match('~^(.+)(\\(.*\\))?$~U', $object, $match)) {
+					if (preg_match('~^(.+)(\(.*\))?$~U', $object, $match)) {
 						grant("REVOKE", array_keys($revoke), $match[2], " ON $match[1] FROM $new_user");
 					}
 				}
@@ -131,12 +131,12 @@ if ($_POST) {
 
 ?>
 <form action="" method="post">
-<table cellspacing="0">
-<tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>" autocapitalize="off">
-<tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
+<table cellspacing="0" class="layout">
+<tr><th><?php echo lang('Server'); ?><td><input name="host" data-maxlength="60" value="<?php echo h($row["host"]); ?>" autocapitalize="off">
+<tr><th><?php echo lang('Username'); ?><td><input name="user" data-maxlength="80" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
 <tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>" autocomplete="new-password">
 <?php if (!$row["hashed"]) { echo script("typePassword(qs('#pass'));"); } ?>
-<?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);"); ?>
+<?php echo (min_version(8) ? "" : checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);")); ?>
 </table>
 
 <?php
@@ -165,7 +165,7 @@ foreach (array(
 			$name = "'grants[$i][" . h(strtoupper($privilege)) . "]'";
 			$value = $grant[strtoupper($privilege)];
 			if ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*")) {
-				echo "<td>&nbsp;";
+				echo "<td>";
 			} elseif (isset($_GET["grant"])) {
 				echo "<td><select name=$name><option><option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</select>";
 			} else {

adminer/variables.inc.php

@@ -10,7 +10,7 @@ if (!$variables) {
 	foreach ($variables as $key => $val) {
 		echo "<tr>";
 		echo "<th><code class='jush-" . $jush . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
-		echo "<td>" . nbsp($val);
+		echo "<td>" . h($val);
 	}
 	echo "</table>\n";
 }

adminer/view.inc.php

@@ -48,7 +48,7 @@ page_header(($TABLE != "" ? lang('Alter view') : lang('Create view')), $error, a
 ?>
 
 <form action="" method="post">
-<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64" autocapitalize="off">
+<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" data-maxlength="64" autocapitalize="off">
 <?php echo (support("materializedview") ? " " . checkbox("materialized", 1, $row["materialized"], lang('Materialized view')) : ""); ?>
 <p><?php textarea("select", $row["select"]); ?>
 <p>

changes.txt

@@ -1,3 +1,172 @@
+Adminer 4.8.1 (released 2021-05-14):
+Internet Explorer or PDO in Adminer 4.7.8-4.8.0: Fix XSS in doc_link (bug #797)
+Fix more PHP 8 warnings (bug #781)
+Avoid PHP warnings with PDO drivers (bug #786, regression from 4.7.8)
+MySQL: Allow moving views to other DB and renaming DB with views (bug #783)
+MariaDB: Do not treat sequences as views (PR #416)
+PostgreSQL: Support UPDATE OF triggers (bug #789)
+PostgreSQL: Support triggers with more events (OR)
+PostgreSQL: Fix parsing of foreign keys with non-ASCII column names
+PostgreSQL < 10 PDO: Avoid displaying GENERATED ALWAYS BY IDENTITY everywhere (bug #785, regression from 4.7.9)
+SQLite: Fix displayed types (bug #784, regression from 4.8.0)
+
+Adminer 4.8.0 (released 2021-02-10):
+Support function default values in insert (bug #713)
+Allow SQL pseudo-function in insert
+Skip date columns for non-date values in search anywhere
+Add DB version to comment in export
+Support PHP 8 in create table (regression from 4.7.9)
+MySQL 8: Fix EXPLAIN in SQL command
+PostgreSQL: Create PRIMARY KEY for auto increment columns
+PostgreSQL: Avoid exporting empty sequence last value (bug #768)
+PostgreSQL: Do not show triggers from other schemas (PR #412)
+PostgreSQL: Fix multi-parameter functions in default values (bug #736)
+PostgreSQL: Fix displaying NULL bytea fields
+PostgreSQL PDO: Do not select NULL function for false values in edit
+Oracle: Alter indexes
+Oracle: Count tables
+Oracle: Import from CSV
+Oracle: Fix column size with string type
+MongoDB: Handle errors
+SimpleDB, Firebird, ClickHouse: Move to plugin
+
+Adminer 4.7.9 (released 2021-02-07):
+Fix XSS in browsers which don't encode URL parameters (bug #775, regression from 4.7.0)
+Elasticsearch, ClickHouse: Do not print response if HTTP code is not 200
+Don't syntax highlight during IME composition (bug #747)
+Quote values with leading and trailing zeroes in CSV export (bug #777)
+Link URLs in SQL command (PR #411)
+Fix displayed foreign key columns from other DB (bug #766)
+Re-enable PHP warnings (regression from 4.7.8)
+MySQL: Do not export names in quotes with sql_mode='ANSI_QUOTES' (bug #749)
+MySQL: Avoid error in PHP 8 when connecting to socket (PR #409)
+MySQL: Don't quote default value of text fields (bug #779)
+PostgreSQL: Export all FKs after all CREATE TABLE (PR #351)
+PostgreSQL: Fix dollar-quoted syntax highlighting (bug #738)
+PostgreSQL: Do not show view definition from other schema (PR #392)
+PostgreSQL: Use bigserial for bigint auto increment (bug #765, regression from 3.0.0)
+PostgreSQL PDO: Support PgBouncer, unsupport PostgreSQL < 9.1 (bug #771)
+PostgreSQL 10: Support GENERATED ALWAYS BY IDENTITY (PR #386)
+PostgreSQL 10: Support partitioned tables (PR #396)
+PostgreSQL 11: Create PRIMARY KEY for auto increment columns
+SQLite: Set busy_timeout to 500
+MS SQL: Don't truncate comments to 30 chars (PR #376)
+Elasticsearch 6: Fix displaying type mapping (PR #402)
+MongoDB: Fix password-less check in the mongo extension (PR #405)
+Editor: Cast to string when searching (bug #325)
+Editor: Avoid trailing dot in export filename
+
+Adminer 4.7.8 (released 2020-12-06):
+Support PHP 8
+Disallow connecting to privileged ports (bug #769)
+
+Adminer 4.7.7 (released 2020-05-11):
+Fix open redirect if Adminer is accessible at //adminer.php%2F@
+
+Adminer 4.7.6 (released 2020-01-31):
+Speed up alter table form (regression from 4.4.0)
+Fix clicking on non-input fields in alter table (regression from 4.6.2)
+Display time of procedure execution
+Disallow connecting to ports > 65535 (bug #730)
+MySQL: Always set foreign_key_checks in export
+PostgreSQL: Support exporting views
+Editor: Fix focusing foreign key search in select
+
+Adminer 4.7.5 (released 2019-11-13):
+Add id="" to cells with failed inline edit (bug #708)
+PostgreSQL: Fix getting default value in PostgreSQL 12 (bug #719)
+PostgreSQL, Oracle: Set schema for EXPLAIN queries in SQL command (bug #706)
+ClickHouse: SQL command
+Swedish translation
+
+Adminer 4.7.4 (released 2019-10-22):
+Fix XSS if Adminer is accessible at URL /data:
+
+Adminer 4.7.3 (released 2019-08-27):
+Allow editing foreign keys pointing to tables in other database/schema (bug #694)
+Fix blocking of concurrent instances in PHP >7.2 (bug #703)
+MySQL: Speed up displaying tables in large databases (bug #700, regression from 4.7.2)
+MySQL: Allow editing rows identified by negative floats (bug #695)
+MySQL: Skip editing generated columns
+SQLite: Quote strings stored in integer columns in export (bug #696)
+SQLite: Handle error in altering table (bug #697)
+SQLite: Allow setting auto increment for empty tables
+SQLite: Preserve auto increment when recreating table
+MS SQL: Support foreign keys to other DB
+MongoDB: Allow setting authSource from environment variable 
+
+Adminer 4.7.2 (released 2019-07-18):
+Do not attempt logging in without password (bug #676)
+Stretch footer over the whole table width (bug #624)
+Allow overwriting tables when copying them
+Fix displaying SQL command after Save and continue edit
+Cache busting for adminer.css
+MySQL: Fix displaying multi-columns foreign keys (bug #675, regression from 4.7.0)
+MySQL: Fix creating users and changing password in MySQL 8 (bug #663)
+MySQL: Pass SRID to GeomFromText
+PostgreSQL: Fix setting column comments on new table
+PostgreSQL: Display definitions of materialized views (bug #682)
+PostgreSQL: Fix table status in PostgreSQL 12 (bug #683)
+MS SQL: Support comments
+Elasticsearch: Fix setting number of rows
+
+Adminer 4.7.1 (released 2019-01-24):
+Display the tables scrollbar (bug #647)
+Remember visible columns in Create Table form (bug #493)
+Add autocomplete attributes to login form
+PHP <5.4 compatibility even with ClickHouse enabled (regression from 4.7.0)
+SQLite: Hide server field in login form
+Editor: Allow disabling boolean fields in PostgreSQL (bug #640)
+
+Adminer 4.7.0 (released 2018-11-24):
+Simplify storing executed SQL queries to bookmarks
+Warn when using password with leading or trailing spaces
+Hide import from server if importServerPath() returns an empty string
+Fix inline editing of empty cells (regression from 4.6.3)
+Allow adding more than two indexes and forign key columns at a time (regression from 4.4.0)
+Avoid overwriting existing tables when copying tables (bug #642)
+Fix function change with set data type
+Increase username maxlength to 80 (bug #623)
+Make maxlength in all fields a soft limit
+Make tables horizontally scrollable
+MySQL: Support foreign keys created with ANSI quotes (bug #620)
+MySQL: Recognize ON UPDATE current_timestamp() (bug #632, bug #638)
+MySQL: Descending indexes in MySQL 8 (bug #643)
+PostgreSQL: Quote array values in export (bug #621)
+PostgreSQL: Export DESC indexes (bug #639)
+PostgreSQL: Support GENERATED BY DEFAULT AS IDENTITY in PostgreSQL 10
+MS SQL: Pass database when connecting
+ClickHouse: Connect, databases list, tables list, select, SQL command
+Georgian translation
+
+Adminer 4.6.3 (released 2018-06-28):
+Disallow using password-less databases
+Copy triggers when copying table
+Stop session before connecting
+Simplify running slow queries
+Decrease timeout for running slow queries from 5 seconds to 2 seconds
+Fix displaying info about non-alphabetical objects (bug #599)
+Use secure cookies on HTTP if session.cookie_secure is set
+PDO: Support binary fields download
+MySQL: Disallow LOAD DATA LOCAL INFILE
+MySQL: Use CONVERT() only when searching for non-ASCII (bug #603)
+MySQL: Order database names in MySQL 8 (bug #613)
+PostgreSQL: Fix editing data in views (bug #605, regression from 4.6.0)
+PostgreSQL: Do not cast date/time/number/uuid searches to text (bug #608)
+PostgreSQL: Export false as 0 in PDO (bug #619)
+MS SQL: Support port with sqlsrv
+Editor: Do not check boolean checkboxes with false in PostgreSQL (bug #607)
+
+Adminer 4.6.2 (released 2018-02-20):
+Semi-transparent border on table actions
+Shorten JSON values in select (bug #594)
+Speed up alter table form (regression from 4.4.0)
+Store current version without authentication and in Editor
+PostgreSQL: Fix exporting string default values
+PostgreSQL: Fix exporting sequences in PostgreSQL 10
+PostgreSQL: Add IF EXISTS to DROP SEQUENCE in export (bug #595)
+Editor: Fix displaying of true boolean values (regression from 4.5.0)
+
 Adminer 4.6.1 (released 2018-02-09):
 Sticky position of table actions
 Speed up rendering of long tables (regression from 4.4.0)
@@ -224,7 +393,7 @@ Adminer 3.7.1 (released 2013-06-29):
 Increase click target for checkboxes
 Use shadow for highlighting default button
 Don't use LIMIT 1 if inline updating unique row
-Don't check previous checkbox on added column in create table (bug #3614245)
+Don't check previous checkbox on added column in create table (bug #326)
 Order table list by name
 Verify UTF-8 encoding of CSV import
 Notify user about expired master password for permanent login
@@ -235,7 +404,7 @@ Display error on invalid alter table and view pages
 MySQL: Speed up updating rows without numeric or UTF-8 primary key
 Non-MySQL: Descending indexes
 PostgreSQL: Fix detecting oid column in PDO
-PostgreSQL: Handle timestamp types (bug #3614086)
+PostgreSQL: Handle timestamp types (bug #324)
 Add Korean translation
 
 Adminer 3.7.0 (released 2013-05-19):
@@ -248,9 +417,9 @@ Disable SQL export when applying functions in select
 Allow using lang() in plugins (customization)
 Remove bzip2 compression support
 Constraint memory used in TAR export
-Allow exporting views dependent on each other (bug #3459151)
-Fix resetting search (bug #3612507)
-Don't use LIMIT 1 if updating unique row (bug #3613109)
+Allow exporting views dependent on each other (bug #214)
+Fix resetting search (bug #318)
+Don't use LIMIT 1 if updating unique row (bug #320)
 Restrict editing rows without unique identifier to search results
 Display navigation bellow main content on mobile browsers
 Get number of rows on export page asynchronously
@@ -258,7 +427,7 @@ Respect 'whole result' even if some rows are checked (bug #339 since Adminer 3.7
 MySQL: Optimize create table page and Editor navigation
 MySQL: Display bit type as binary number
 MySQL: Improve export of binary data types
-MySQL: Fix handling of POINT data type (bug #3582578)
+MySQL: Fix handling of POINT data type (bug #282)
 MySQL: Don't export binary and geometry columns twice in select
 MySQL: Fix EXPLAIN in MySQL < 5.1, bug since Adminer 3.6.4
 SQLite: Export views
@@ -273,11 +442,11 @@ Recover original view, trigger, routine if creating fails
 Do not store plain text password to history in creating user
 Selectable ON UPDATE CURRENT_TIMESTAMP field in create table
 Open database to a new window after selecting it with Ctrl
-Clear column name after resetting search (bug #3601200)
-Explain partitions in SQL query (bug #3600150)
-Allow loading more data with inline edit (bug #3605531)
-Stay on the same page after deleting rows (bug #3605845)
-Respect checked tables in export filename (bug #3245464)
+Clear column name after resetting search (bug #296)
+Explain partitions in SQL query (bug #294)
+Allow loading more data with inline edit (bug #299)
+Stay on the same page after deleting rows (bug #301)
+Respect checked tables in export filename (bug #133)
 Respect PHP configuration max_input_vars
 Fix unsetting permanent login after logout
 Disable autocapitalize in identifiers on mobile browsers
@@ -362,11 +531,11 @@ Ukrainian translation
 Bengali translation
 
 Adminer 3.3.4 (released 2012-03-07):
-Foreign keys default actions (bug #3397606)
+Foreign keys default actions (bug #188)
 SET DEFAULT foreign key action
 Fix minor parser bug in SQL command with webserver file
 Ctrl+click on button opens form to a blank window
-Trim table and column names (bug #3405309)
+Trim table and column names (bug #195)
 Error message with no response from server in AJAX
 Esc to cancel AJAX request
 Move AJAX loading indicator to the right
@@ -378,9 +547,9 @@ Ability to disable export (customization)
 Extensible list of databases (customization)
 MySQL: set autocommit after connect
 SQLite, PostgreSQL: vacuum
-SQLite, PostgreSQL: don't use LIKE for numbers (bug #3420408)
+SQLite, PostgreSQL: don't use LIKE for numbers (bug #202)
 PostgreSQL: fix alter foreign key
-PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)
+PostgreSQL over PDO: connect if the eponymous database does not exist (bug #185)
 Boolean search (Editor)
 Persian translation
 
@@ -408,8 +577,8 @@ Adminer 3.3.0 (released 2011-07-19):
 Use Esc to disable in-place edit
 Shortcut for database privileges
 Editable index names
-Append new index with auto index selection (bug #3282127)
-Preserve original timestamp value in multiple update (bug #3312614)
+Append new index with auto index selection (bug #138)
+Preserve original timestamp value in multiple update (bug #158)
 Bit type default value
 Display foreign key name in tooltip
 Display default column value in table overview
@@ -423,7 +592,7 @@ Display foreign keys from other schemas (PostgreSQL)
 Pagination support (Oracle)
 Autocomplete for big foreign keys (Editor)
 Display name of the referenced record in PostgreSQL (Editor)
-Prefer NULL to empty string (Editor, bug #3323800)
+Prefer NULL to empty string (Editor, bug #162)
 Display searched columns (Editor)
 Customizable favicon (customization)
 Method name can return a link (customization)
@@ -435,8 +604,8 @@ Fix AJAX history after reload
 
 Adminer 3.2.1 (released 2011-03-23):
 Ability to save expression in edit
-Respect default database collation (bug #3191489)
-Don't export triggers without table (bug #3193489)
+Respect default database collation (bug #119)
+Don't export triggers without table (bug #123)
 Esc to focus next field in Tab textarea
 Send forms by Ctrl+Enter on <select>
 Enum editor and textarea Ctrl+Enter working in IE
@@ -459,8 +628,8 @@ Get long texts and slow information by AJAX
 Most links and forms by AJAX in browsers with support for history.pushState
 Copy tables
 Ability to search by expression in select
-Export SQL command result (bug #3116854)
-Focus first field with insert (bug #3126501)
+Export SQL command result (bug #99)
+Focus first field with insert (bug #106)
 Permanent link in schema
 Display total time in show only errors mode in SQL command
 History: edit all
@@ -473,7 +642,7 @@ Utilize oids in PostgreSQL
 Homepage customization
 Use IN for search in numeric fields (Editor)
 Use password input for _md5 and _sha1 fields (Editor)
-Work without session.use_cookies (bug #3138640)
+Work without session.use_cookies (bug #107)
 Fix saving schema to cookie in Opera
 Portuguese, Slovenian and Turkish translation
 
@@ -486,10 +655,10 @@ Recognize $$ strings in SQL command (PostgreSQL)
 Highlight and edit SQL command in processlist
 Always display all drivers
 Timestamp at the end of export
-Link to refresh database cache (bug #3102451)
+Link to refresh database cache (bug #96)
 Support for virtual foreign keys
 Disable XSS "protection" of IE8
-Immunity against zend.ze1_compatibility_mode (bug #3089645)
+Immunity against zend.ze1_compatibility_mode (bug #86)
 Fix last page with empty result set
 Arabic translation and RTL support
 Dual licensing: Apache or GPL
@@ -537,7 +706,7 @@ Add Drop button to Alter pages (regression from 2.0.0)
 Link COUNT(*) result to listing
 Newlines in select query edit
 Return to referrer after edit
-Respect session.auto_start (bug #2967284)
+Respect session.auto_start (bug #42)
 
 Adminer 2.3.0 (released 2010-02-26):
 Support for permanent login (customization required)
@@ -566,7 +735,7 @@ Link URLs in select
 Display number of manipulated rows in JS confirm
 Set required memory in SQL command
 Fix removed default in ALTER
-Display whitespace in texts (bug #2858042)
+Display whitespace in texts (bug #11)
 ClickJacking protection in modern browsers
 E-mail attachments (Editor)
 Optional year in date (Editor)
@@ -585,8 +754,8 @@ Use ON DUPLICATE KEY UPDATE for CSV import
 Print ALTER export instead of executing it
 Click on row selects it
 Fix Editor date format
-Fix long SQL query crash (bug #2839231)
-Speedup of simple alter table
+Fix long SQL query crash (bug #3)
+Speed up simple alter table
 Traditional Chinese translation
 
 Adminer 2.0.0 (released 2009-08-06):
@@ -641,7 +810,7 @@ Use \n in SQL commands
 
 phpMinAdmin 1.10.1 (released 2009-05-07):
 Highlight odd and hover rows
-Partition editing comfort (bug #2783446)
+Partition editing comfort (bug #12)
 Allow full length in limited int
 
 phpMinAdmin 1.10.0 (released 2009-04-28):
@@ -728,7 +897,7 @@ phpMinAdmin 1.4.0 (released 2007-08-15):
 Privileges
 New design
 Dutch translation
-Use NULL for auto_increment (bug #1768966)
+Use NULL for auto_increment (bug #1)
 Fix dropping procedure parameters
 
 phpMinAdmin 1.3.2 (released 2007-08-06):

compile.php

@@ -1,6 +1,11 @@
 #!/usr/bin/env php
 <?php
+function adminer_errors($errno, $errstr) {
+	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
+}
+
 error_reporting(6135); // errors and warnings
+set_error_handler('adminer_errors', E_WARNING);
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
 include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
 
@@ -36,11 +41,29 @@ function lang_ids($match) {
 }
 
 function put_file($match) {
-	global $project;
+	global $project, $VERSION, $driver;
 	if (basename($match[2]) == '$LANG.inc.php') {
 		return $match[0]; // processed later
 	}
 	$return = file_get_contents(dirname(__FILE__) . "/$project/$match[2]");
+	if (basename($match[2]) == "file.inc.php") {
+		$return = str_replace("\n// caching headers added in compile.php", (preg_match('~-dev$~', $VERSION) ? '' : '
+if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
+	header("HTTP/1.1 304 Not Modified");
+	exit;
+}
+
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: immutable");
+'), $return, $count);
+		if (!$count) {
+			echo "adminer/file.inc.php: Caching headers placeholder not found\n";
+		}
+	}
+	if ($driver && dirname($match[2]) == "../adminer/drivers") {
+		$return = preg_replace('~^if \(isset\(\$_GET\["' . $driver . '"]\)\) \{(.*)^}~ms', '\1', $return);
+	}
 	if (basename($match[2]) != "lang.inc.php" || !$_SESSION["lang"]) {
 		if (basename($match[2]) == "lang.inc.php") {
 			$return = str_replace('function lang($idf, $number = null) {', 'function lang($idf, $number = null) {
@@ -57,7 +80,7 @@ function put_file($match) {
 		}
 		$tokens = token_get_all($return); // to find out the last token
 		return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? "<?php" : "");
-	} elseif (preg_match('~\\s*(\\$pos = (.+\n).+;)~sU', $return, $match2)) {
+	} elseif (preg_match('~\s*(\$pos = (.+\n).+;)~sU', $return, $match2)) {
 		// single language lang() is used for plural
 		return "function get_lang() {
 	return '$_SESSION[lang]';
@@ -85,7 +108,7 @@ function lzw_compress($string) {
 	$word = "";
 	$codes = array();
 	for ($i=0; $i <= strlen($string); $i++) {
-		$x = $string[$i];
+		$x = @$string[$i];
 		if (strlen($x) && isset($dictionary[$word . $x])) {
 			$word .= $x;
 		} elseif ($i) {
@@ -218,7 +241,7 @@ function php_shrink($input) {
 		$short_variables[$key] = short_identifier($number, $chars); // could use also numbers and \x7f-\xff
 	}
 	
-	$set = array_flip(preg_split('//', '!"#$%&\'()*+,-./:;<=>?@[\]^`{|}'));
+	$set = array_flip(preg_split('//', '!"#$%&\'()*+,-./:;<=>?@[]^`{|}'));
 	$space = '';
 	$output = '';
 	$in_echo = false;
@@ -275,7 +298,7 @@ function php_shrink($input) {
 }
 
 function minify_css($file) {
-	return lzw_compress(preg_replace('~\\s*([:;{},])\\s*~', '\\1', preg_replace('~/\\*.*\\*/~sU', '', $file)));
+	return lzw_compress(preg_replace('~\s*([:;{},])\s*~', '\1', preg_replace('~/\*.*\*/~sU', '', $file)));
 }
 
 function minify_js($file) {
@@ -300,6 +323,14 @@ function compile_file($match) {
 	return '"' . add_quo_slashes($file) . '"';
 }
 
+if (!function_exists("each")) {
+	function each(&$arr) {
+		$key = key($arr);
+		next($arr);
+		return $key === null ? false : array($key, $arr[$key]);
+	}
+}
+
 function min_version() {
 	return true;
 }
@@ -337,7 +368,7 @@ if ($_SERVER["argv"][1]) {
 // check function definition in drivers
 $file = file_get_contents(dirname(__FILE__) . "/adminer/drivers/mysql.inc.php");
 $file = preg_replace('~class Min_Driver.*\n\t}~sU', '', $file);
-preg_match_all('~\\bfunction ([^(]+)~', $file, $matches); //! respect context (extension, class)
+preg_match_all('~\bfunction ([^(]+)~', $file, $matches); //! respect context (extension, class)
 $functions = array_combine($matches[1], $matches[0]);
 //! do not warn about functions without declared support()
 unset($functions["__construct"], $functions["__destruct"], $functions["set_charset"]);
@@ -372,12 +403,12 @@ if ($driver) {
 		$file = str_replace("if (isset(\$_GET[\"callf\"])) {\n\t\$_GET[\"call\"] = \$_GET[\"callf\"];\n}\nif (isset(\$_GET[\"function\"])) {\n\t\$_GET[\"procedure\"] = \$_GET[\"function\"];\n}\n", "", $file);
 	}
 }
-$file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file);
+$file = preg_replace_callback('~\b(include|require) "([^"]*)";~', 'put_file', $file);
 $file = str_replace('include "../adminer/include/coverage.inc.php";', '', $file);
 if ($driver) {
-	$file = preg_replace('(include "../adminer/drivers/(?!' . preg_quote($driver) . '\.).*\\s*)', '', $file);
+	$file = preg_replace('(include "../adminer/drivers/(?!' . preg_quote($driver) . '\.).*\s*)', '', $file);
 }
-$file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file); // bootstrap.inc.php
+$file = preg_replace_callback('~\b(include|require) "([^"]*)";~', 'put_file', $file); // bootstrap.inc.php
 if ($driver) {
 	foreach ($features as $feature) {
 		if (!support($feature)) {
@@ -388,13 +419,19 @@ if ($driver) {
 		$file = str_replace('<?php echo html_select("auth[driver]", $drivers, DRIVER) . "\n"; ?>', "<input type='hidden' name='auth[driver]' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
 	}
 	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace_callback('~doc_link\(array\((.*)\)\)~sU', function ($match) use ($driver) {
+		list(, $links) = $match;
+		$links = preg_replace("~'(?!(" . ($driver == "mysql" ? "sql|mariadb" : $driver) . ")')[^']*' => [^,]*,?~", '', $links);
+		return (trim($links) ? "doc_link(array($links))" : "''");
+	}, $file);
+	//! strip doc_link() definition
 }
 if ($project == "editor") {
-	$file = preg_replace('~;../externals/jush/jush.css~', '', $file);
-	$file = preg_replace('~;?../externals/jush/modules/jush[^.]*.js~', '', $file);
+	$file = preg_replace('~;.\.\/externals/jush/jush\.css~', '', $file);
+	$file = preg_replace('~compile_file\(\'\.\./(externals/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
 }
 $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
-$file = preg_replace_callback('~\\b(include|require) "([^"]*\\$LANG.inc.php)";~', 'put_file_lang', $file);
+$file = preg_replace_callback('~\b(include|require) "([^"]*\$LANG.inc.php)";~', 'put_file_lang', $file);
 $file = str_replace("\r", "", $file);
 if ($_SESSION["lang"]) {
 	// single language version
@@ -403,14 +440,14 @@ if ($_SESSION["lang"]) {
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('<?php echo script_src("static/editing.js"); ?>' . "\n", "", $file);
-$file = preg_replace('~\\s+echo script_src\\("\\.\\./externals/jush/modules/jush-(textarea|txt|js|\\$jush)\\.js"\\);~', '', $file);
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
 $file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
-$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\\1&version=' . $VERSION . ($driver ? '&driver=' . $driver : '') . '"';
-$file = preg_replace('~\\.\\./adminer/static/(default\\.css|favicon\\.ico)~', '<?php echo h(' . $replace . '); ?>', $file);
-$file = preg_replace('~"\\.\\./adminer/static/(functions\\.js)"~', $replace, $file);
-$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . h(' . $replace . ') . "', $file);
-$file = preg_replace('~"\\.\\./externals/jush/modules/(jush\\.js)"~', $replace, $file);
+$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';
+$file = preg_replace('~\.\./adminer/static/(default\.css|favicon\.ico)~', '<?php echo h(' . $replace . '); ?>', $file);
+$file = preg_replace('~"\.\./adminer/static/(functions\.js)"~', $replace, $file);
+$file = preg_replace('~\.\./adminer/static/([^\'"]*)~', '" . h(' . $replace . ') . "', $file);
+$file = preg_replace('~"\.\./externals/jush/modules/(jush\.js)"~', $replace, $file);
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 

designs/brade/adminer.css

@@ -46,8 +46,8 @@ border:5px solid #ccc;margin:0}
 #menu a:hover{background:#333;color:#fff;border-color:#333}
 #menu a.h1,#menu a.h1:hover{display:block;height:0;width:175px;padding:40px 0 0 0;overflow:hidden;float:left;border:0;margin:0;
 outline:0;background:url(//www.bradezone.com/random/adminer_logo.gif) no-repeat;line-height:32px}
-#menu p,#tables{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 0}
-#breadcrumb{background:#333;color:#fff;position:fixed;top:0;left:320px;width:100%;line-height:40px;padding:0;z-index:1;margin:0}
+#menu p,#logins,#tables{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 0}
+#breadcrumb{background:#333;color:#fff;position:fixed;top:0;left:320px;line-height:40px;padding:0;z-index:1;margin:0}
 #breadcrumb a{color:#ff9}
 #breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9}
 #schema .table{padding:4px 8px;background:#f3f3f3}

designs/bueltge/adminer.css

@@ -339,7 +339,7 @@ border: 1px solid #E3E3E3;
 #menu form { 
 margin: 0;
 }
-#menu p, #tables {
+#menu p, #logins, #tables {
 padding-left: 8px;
 border-bottom: none;
 }

designs/cvicebni-ubor/adminer.css

@@ -173,7 +173,7 @@ h3{
  margin:0;}
 #menu form{
  margin:0;}
-#menu p,#tables{
+#menu p,#logins,#tables{
  padding-left:8px;
  border-bottom:none;}
 #menu form p{

designs/dracula/adminer.css

@@ -0,0 +1,729 @@
+/* 
+ * Theme by Douglas Damasio [http://github.com/douglasdamasio]
+ * Based on Pepa Linha
+ * Color syntax inspired by Dracula Theme [https://draculatheme.com/]
+ * @version 1.0 (June 2020)
+ */
+ @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600&family=Ubuntu:wght@500;700&display=swap');
+
+ :root {
+  --color-darkBackground: #282a36;
+  --color-darkCurrentLine: #44475a;
+  --color-darkForeground: #f8f8f2;
+  --color-darkComment: #6272a4;
+  --color-darkCyan: #8be9fd;
+  --color-darkGreen: #50fa7b;
+  --color-darkOrange: #ffb86c;
+  --color-darkPink: #ff79c6;
+  --color-darkPurple: #bd93f9;
+  --color-darkRed: #ff5555;
+  --color-darkYellow: #f1fa8c;
+
+  --color-darkTitleSite: #bcc2cd;
+  --color-darkDraculaSite: #383a59;
+  --color-darkDraculaVSCode: #22222c;
+}
+ html,
+ body {
+   height: 100%;
+   background: var(--color-darkBackground);
+ }
+ 
+ body {
+  font-family: 'Source Sans Pro', sans-serif;
+ }
+
+ div {
+   color: var(--color-darkForeground);
+ }
+ 
+ h1 {
+   margin: 0;
+   padding: 0;
+   background: none;
+   border: 0;
+ }
+ 
+ h2 {
+   margin: 0;
+   padding: 0;
+   background: none;
+   border: 0;
+   font-family: 'Ubuntu', sans-serif;
+   font-size: 32px;
+   font-weight: 700;
+   color: var(--color-darkPink);
+   border-bottom: 1px solid var(--color-darkComment);
+   padding-bottom: 6px;
+   margin-bottom: 40px;
+ }
+ 
+ .rtl h2 {
+   margin: 0;
+   margin-bottom: 40px;
+ }
+ 
+ h3 {
+   font-size: 22px;
+   margin: 0 0 10px;
+   border-bottom: 1px solid var(--color-darkComment);
+   padding: 0;
+   padding-bottom: 6px;
+   color: var(--color-darkGreen);
+
+ }
+ 
+ p {
+   margin: 0;
+   margin-bottom: 15px;
+   align-items: center;
+   color: var(--color-darkForeground);
+ }
+ 
+ a {
+   color:var(--color-darkPink);
+   text-decoration:none;
+ }
+ 
+ a:visited {
+   color: var(--color-darkPurple);
+ }
+ 
+ a:link:hover,
+ a:visited:hover {
+   color: var(--color-darkPink);
+   text-decoration:underline; 
+ }
+ 
+ 
+ a[href*=charsets] {
+   display: none;
+ }
+ 
+ table {
+   border: 0;
+   margin: 0;
+   margin-top: 15px;
+ }
+ 
+ th, td {
+   border: 0;
+   padding: 6px;
+   color: var(--color-darkOrange);
+ }
+ 
+ th {
+   background: none;
+   color: var(--color-darkCyan);
+   font-weight: normal;
+ }
+ 
+ tbody tr:hover td,
+ tbody tr:hover th {
+   background: var(--color-darkCurrentLine);
+ }
+ 
+ table:not(.checkable) th {
+   min-width: 120px;
+ }
+ 
+ thead td,
+ thead th {
+   background: var(--color-darkComment);
+ }
+ 
+ thead td,
+ thead td a,
+ thead td a:link:hover,
+ thead td a:visited,
+ thead td a:visited:hover,
+ thead th,
+ thead th a,
+ thead th a:link:hover,
+ thead th a:visited,
+ thead th a:visited:hover {
+   color: var(--color-darkForeground);
+ }
+ 
+ table.checkable,
+ p.links + table,
+ pre + table,
+ #edit-fields,
+ p + table,
+ h3 + table {
+   border: 1px solid var(--color-darkCurrentLine);
+   margin-bottom: 15px;
+ }
+ 
+ table.checkable tbody tr:hover td,
+ table.checkable tbody tr:hover th {
+   background: var(--color-darkCurrentLine);
+ }
+ 
+ .js .checkable .checked td,
+ .js .checkable .checked th {
+   background: var(--color-darkDraculaSite);
+ }
+ 
+ .js .checkable thead .checked td,
+ .js .checkable thead .checked th {
+   background: var(--color-darkPurple);
+ }
+ 
+ .odd th,
+ .odd td {
+   background: var(--color-darkDraculaVSCode);
+ }
+ 
+ fieldset {
+   display: inline-block;
+   padding: 15px;
+   padding-top: 5px;
+   margin: 0 0 15px;
+   border: 0;
+   background: var(--color-darkBackground);
+ }
+ 
+ fieldset select {
+   margin-right: 5px;
+ }
+ 
+ fieldset input[type=button],
+ fieldset input[type=submit],
+ fieldset p {
+   margin-bottom: 0;
+ }
+ 
+ fieldset div p {
+   margin-top: 10px;
+ }
+ 
+ legend {
+   display: inline-block;
+   padding: 6px 15px;
+   margin: 0 0 0 -15px;
+   background: var(--color-darkDraculaSite);
+   font-family: 'Source Sans Pro', sans-serif;
+   color: var(--color-darkOrange);
+ }
+ 
+ legend a,
+ legend a:link:hover {
+   color: var(--color-darkOrange);
+   text-decoration: underline;
+ }
+ 
+ code {
+   background: none;
+ }
+ 
+ p code,
+ pre code,
+ pre[contenteditable=true] {
+   padding: 10px 15px;
+   display: block;
+   font-size: 17px;
+   margin-bottom: 15px;
+ }
+ 
+ p code + a,
+ p code + a:link:hover,
+ p code + a:visited:hover {
+   margin-left: 15px;
+   position: relative;
+   top: -20px;
+   color: var(--color-darkOrange);
+   font-size: 12px;
+   text-decoration: underline;
+   text-transform: lowercase;
+ }
+ 
+ #content {
+   margin: 0;
+   margin-left: 400px;
+   margin-right: 54px;
+   padding: 0;
+   padding-top: 50px;
+ }
+ 
+ #content > p {
+   margin-bottom: 15px;
+   color: var(--color-darkForeground);
+ }
+ 
+ .rtl #content {
+   margin: 0;
+   margin-left: 54px;
+   margin-right: 400px;
+   padding: 0;
+   padding-top: 50px;
+ }
+ 
+ #menu {
+   width: 347px;
+   border-right: 1px solid var(--color-darkBackground);
+   box-shadow: inset -1px 0 0 #000000b4;
+   margin: 0;
+   padding: 0;
+   top: 0;
+   background: var(--color-darkDraculaVSCode);
+   bottom: 0;
+   position: fixed;
+   padding: 0 15px;
+   box-sizing: border-box;
+ }
+ 
+ #menu h1 {
+   background: none left top no-repeat;
+   /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAAyCAIAAABgVkRrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA0RDI5NkM5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA0RDI5NkQ5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MDREMjk2QTlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1MDREMjk2QjlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnG4emkAAASXSURBVHja7Fk9aNtAFL6EDKKUoqGDySRKB1FC8dDBdCgeOmQoIUMG0yGE0EFT8dDBUwidPJQQQgcNpYROGjKI0sFDB9GhaMhgSgcPpWgqHjqYYsINJfQ7PfV0tmX9JI4Sgx+HI8f26bt3733fe6elIf/LbqwdHbJWS1wYBrMstrXJVg36ZJnNhQWBWMB9k+215gq3tDeHBH3pRseJtC8ee2ezEzd62+ncDH/DhS+ttC88qbMPDntaj952uyvXD3q7ETvyyE77pq5HFz9614r7V8C2GnBezBgp9tGNl3ffzIjvwZ9B//dA7Mz3YPLTyl29UhE+MI0KW9YKh2yjwQZichEAjsNu6WlUqNqkvwHUO+0BJeD2gn4hJFXTwAIw6jUzYxlwHkCTvWqy1+0Ct7FtsPh/3Ofc9brOJ5+8ezHr9gKMcGpWf2SK8bhKk48sA1kIOiODmzc2c8U0DLrzwhI5ypjA3fsZtNrOgPP4y5pmGJXamqHd1kQMTIkENYpwEfQHEW7GsGkYZse393ewb+Y9IwE0PJcOejQ2pFgK3Li3BI14hZM269XKaiXPVPodHUOs6l48o/+t5wO038OcQGztHzd31uPfUEgQdCQi3JkfumLLHa9LoK2tunPQtJ6v5wQ9zWoPzebupms34QKxmZNJAugIDzJE+V4rbTrDSMYtr3AD+H5WFIfZ0lIFPu50otiF7zfW2dlgquKccTFWRxYQ8wlFJOVTdc2gAChq/V99vxdgD7O5CIBO/Yi/P3vsUY2dOOxBdSrzIBm2dxJwq+hlaiId9dua5OlEv/IhH0vKvAYXfvUjvUTFB2STeinJu91Oxo3Eh58onwRXcB7zWkGj/Maa9203+9soPIyWEKBEkQdc8veo+sS4wQkYzV1Bi+A1Ee5DnhO33BxsSw1/wszGPHkXmqI7yIQzPvnvhPqEFjAWtSq7j7n2YplwSctVV8F/FXazbN76nQXu68btfe3Odmqwahl5Ca6tel0UVdnVc6pRBX/JkrgYn0RCY0cdAMhYvGYxHbEklbJ++FoqD8LTUiwTlZLEha55WKOmSybWTCXD1eJG8dnc4XAYqmdgmoRFyp/ZqqHbgMiD8qGXZeAOs1RD9YyhBgBVTgL3cMTHwKd2xyUL50qmTI5p/oK/F7jnEjeycLZTFz02SrKlaSPGbe0fOx+9mbTGcMHhe/fwuFMGn4Dy7BMPA3oBGkZrbIDgcp9JgK37YYtZjmSuqApH9yPRcTp+TM939THOpkaYroMguRuSE14tbuegif11vS58poYm7i1vn6fdxF6hMoNk4leIvTJ0B1FhPQ/PxM45eZ2HGjkY8jHXqptghGJJqqmKVHn1oCr4k93xgr8XuOcZ9zmf7dQym68Et6QFcFaBk7EsQ5fdfuteHW7xPM3asyVh05EkxFJITMHuGDUCukxwvOz3YI31mtWoX7TRXkrDjQhBLeFOHBtQQ6n/f8TDlAd/6mNBP7xO7Ecbz2qNjfrl6qoU3Mr5Qa4j9yyLHqZd7jwjL241QQFdPiJTdT7RsBuapslzi5mqVSHcKXYetcZlSelU3P8EGADW25uhkIE0mQAAAABJRU5ErkJggg==); */
+   background-image: url();
+   line-height: 50px;
+   padding-left: 50px;
+   padding-top: 9px;
+   /* text-transform: lowercase; */
+   margin: 25px 0 10px 16px;
+ }
+ 
+ 
+ #menu h1 a {
+   font-style: normal;
+ }
+ 
+ #menu h1 .version {
+   color: var(--color-darkPurple);
+ }
+ 
+ #menu a {
+   color: var(--color-darkForeground);
+ }
+ 
+ #menu p, #tables {
+   border: 0;
+   padding: 0;
+ }
+ 
+ #menu #dbs {
+   background: var(--color-darkDraculaVSCode);
+   padding: 0 15px 15px;
+   border: 1px solid var(--color-darkForeground);
+   border-bottom: 0;
+   box-sizing: border-box;
+   color: var(--color-darkCyan);
+ }
+ 
+ #menu #dbs select {
+   outline: 0;
+   border-color: var(--color-darkComment);
+   width: 100%;
+ }
+ 
+ #menu p.links {
+   margin: 0 0 15px;
+   border: 1px solid var(--color-darkForeground);
+   border-top: 0;
+   text-align: center;
+   display: table;
+   width: 100%;
+   box-sizing: border-box;
+ }
+ 
+ #menu p.links a {
+   padding: 8px;
+   margin: 0;
+   display: table-cell;
+   font-size: 12px;
+ }
+ 
+ #menu p.links a:hover {
+   color: var(--color-darkPink);
+ }
+ 
+ #menu p.links a.active {
+   font-weight: normal;
+   background: var(--color-darkCurrentLine);
+   color: var(--color-darkYellow);
+ }
+ 
+ #content p.links {
+   margin: -10px 0 15px;
+ }
+ 
+ #content p.links a {
+   padding: 8px;
+   margin: 0;
+   display: table-cell;
+   border: 1px solid var(--color-darkBackground);
+ }
+ 
+ #content p.links a,
+ #content p.links a:visited,
+ #content p.links a:hover {
+   color: var(--color-darkCyan);
+ }
+ 
+ #content p.links a.active {
+   font-weight: normal;
+   border: 1px solid var(--color-darkTitleSite);
+   background: var(--color-darkCurrentLine);
+ }
+ 
+ #tables {
+   max-height: 100%;
+   margin: 32px -15px !important;
+   position: absolute;
+   left: 15px;
+   right: 15px;
+   bottom: 0;
+   top: 220px;
+   overflow: hidden !important;
+   overflow-y: auto !important;
+ }
+ 
+ .rtl #tables {
+   overflow: hidden !important;
+   overflow-y: auto !important;
+ }
+ 
+ #tables a {
+   float: right;
+   padding: 6px 15px;
+ }
+ 
+ .rtl #tables a {
+   float: none;
+ }
+ 
+ #tables .structure, #tables .view {
+   float: none;
+   display: block;
+ }
+ 
+ .rtl #tables a:first-child,
+ .rtl #tables br + a {
+   float: left;
+   display: block;
+   margin-left: 15px;
+ }
+ 
+ #tables a:hover,
+ #tables a:hover + a,
+ #tables a.active,
+ #tables a.active + a {
+   background: var(--color-darkBackground);
+   color: var(--color-darkPink);
+ }
+
+ #tables br {
+   display: none;
+ }
+ 
+ .js .column {
+   background: var(--color-darkDraculaVSCode);
+ }
+ 
+ .js .checked .column {
+   background: var(--color-darkDraculaVSCode);
+ }
+ 
+ .pages {
+   left: 400px;
+   background: var(--color-darkCyan);
+   color: var(--color-darkBackground);
+   font-weight: bold;
+   border: 0;
+   display: inline-block;
+   position: static;
+ }
+ 
+ .pages a,
+ .pages a:link,
+ .pages a:link:hover,
+ .pages a:visited,
+ .pages a:visited:hover {
+   color: var(--color-darkBackground);
+   font-weight: normal;
+ }
+ 
+ #breadcrumb {
+   margin: 0;
+   left: 400px;
+   background: none;
+   padding: 0;
+   padding-top: 25px;
+   font-size: 12px;
+ }
+ 
+ #breadcrumb a {
+   color: var(--color-darkForeground);
+   text-decoration: underline;
+ }
+ 
+ #breadcrumb,
+ #breadcrumb a:hover {
+   color: var(--color-darkTitleSite);
+ }
+ 
+ .rtl #breadcrumb {
+   margin: 0;
+   padding: 0;
+   padding-top: 25px;
+   right: 400px;
+ }
+ 
+ .logout,
+ .rtl .logout {
+   top: 30px;
+   right: 54px;
+   margin: 0;
+ }
+ 
+ .rtl .logout {
+   right: auto;
+   left: 54px;
+ }
+ 
+ input:not([type]),
+ input[type="color"],
+ input[type="email"],
+ input[type="number"],
+ input[type="password"],
+ input[type="tel"],
+ input[type="url"],
+ input[type="text"],
+ input[type="search"] {
+   border: 1px solid var(--color-darkCurrentLine);
+   background-color: var(--color-darkBackground);
+   padding: 6px;
+   margin: 0;
+   box-sizing: border-box;
+   color: var(--color-darkForeground);
+ }
+ 
+ table:not(#table) input:not([type]),
+ table:not(#table) input[type="color"],
+ table:not(#table) input[type="email"],
+ table:not(#table) input[type="number"],
+ table:not(#table) input[type="password"],
+ table:not(#table) input[type="tel"],
+ table:not(#table) input[type="url"],
+ table:not(#table) input[type="text"],
+ table:not(#table) input[type="search"] {
+   min-width: 280px;
+ }
+ 
+ input[type=submit],
+ input[type=button] {
+   border: 0;
+   padding: 7px 12px;
+   cursor: pointer;
+   outline: 0;
+   box-shadow: none;
+   background: var(--color-darkGreen);
+   color: var(--color-darkBackground);
+   font-weight: bold;
+   margin-bottom: 5px;
+   transition: background .4s ease;
+   border-radius: 5px;
+   margin-top: 20px;
+ }
+ 
+ input[type=submit][disabled],
+ input[type=button][disabled] {
+   background: var(--color-darkTitleSite) !important;
+   color: var(--color-darkBackground);
+   cursor: not-allowed;
+ }
+ 
+ input[type=submit]:hover,
+ input[type=button]:hover,
+ input[type=submit]:focus,
+ input[type=button]:focus {
+   background: var(--color-darkGreen);
+   opacity: 0.8;
+ }
+ 
+ .logout input[type=submit] {
+   background: var(--color-darkRed);
+   color: var(--color-darkForeground);
+ }
+ 
+ .logout input[type=submit]:hover {
+   background: var(--color-darkRed);
+   opacity: 0.8;
+ }
+ 
+ input.default,
+ input.default {
+   box-shadow: none;
+   background: var(--color-darkGreen);
+   color: var(--color-darkDraculaVSCode);
+   font-weight: bold;
+ }
+ 
+ select {
+   box-sizing: border-box;
+   margin: 0;
+   padding: 6px 0;
+   border: 1px solid var(--color-darkCurrentLine);
+   background-color: var(--color-darkBackground);
+   color: var(--color-darkForeground);
+ }
+ 
+ label {
+   cursor: pointer;
+   margin: 18px;
+   color: var(--color-darkOrange);
+ }
+ 
+ .error,
+ .message {
+   margin: 0;
+   margin-bottom: 15px;
+   background: var(--color-darkCurrentLine);
+   color: var(--color-darkRed);
+ }
+ 
+ #logins a,
+ #tables a,
+ #tables span {
+   background: none;
+ }
+ 
+ #form > p {
+   margin-bottom: 15px;
+   color: var(--color-darkForeground);
+ }
+ 
+
+ #schema .table {
+   padding: 6px;
+ }
+ 
+ #schema .table a {
+   display: block;
+   margin: -6px;
+   margin-bottom: 6px;
+   padding: 6px;
+   color: var(--color-darkBackground);
+   background: var(--color-darkPurple);
+ }
+ 
+ #schema .table br {
+   display: none;
+ }
+ 
+ #schema .table span {
+   display: block;
+   margin-bottom: 1px solid var(--color-darkDraculaVSCode);
+ }
+ 
+ #lang {
+   position: fixed;
+   top: 55px;
+   right: 100%;
+   z-index: 10;
+   margin-right: -340px;
+   line-height: normal;
+   padding: 0;
+   left: auto;
+   font-size: 0;
+ }
+ 
+ #lang select {
+   font-size: 12px;
+   padding: 0;
+   text-align: right;
+   border: 0;
+   background: none;
+   -webkit-appearance: none;
+   -moz-appearance: none;
+   appearance: none;
+   cursor: pointer;
+   outline: 0;
+ }
+ 
+ #lang select option {
+   text-align: right;
+ }
+ 
+ .rtl #lang {
+   margin-right: 0;
+   left: 100%;
+   margin-left: -261px;
+   right: auto;
+ }
+ 
+ .jush {
+   color: var(--color-darkForeground);
+ }
+ 
+ .jush a {
+   color: var(--color-darkPurple);
+ }
+ 
+ .jush-sql a,
+ .jush-sql_code a,
+ .jush-sqlite a,
+ .jush-pgsql a,
+ .jush-mssql a,
+ .jush-oracle a,
+ .jush-simpledb a {
+   font-weight: normal;
+ }
+ 
+ .jush-bac,
+ .jush-php_bac,
+ .jush-bra,
+ .jush-mssql_bra,
+ .jush-sqlite_quo {
+   color: var(--color-darkYellow);
+ }
+ 
+ .jush-php_quo,
+ .jush-quo,
+ .jush-quo_one,
+ .jush-php_eot,
+ .jush-apo,
+ .jush-sql_apo,
+ .jush-sqlite_apo,
+ .jush-sql_quo,
+ .jush-sql_eot {
+   color: var(--color-darkOrange);
+ }
+ 
+ .jush-num,
+ .jush-clr {
+   color: var(--color-darkPurple);
+ }
+ 
+ @media print {
+   .logout {
+     display: none;
+   }
+   
+   #breadcrumb {
+     position: static;
+   }
+   
+   #content {
+     margin: 0;
+   }
+ }
+
+ .footer {
+  position: sticky;
+  bottom: 0;
+  margin-right: -20px;
+  border-top: 20px solid var(--color-darkBackground);
+  border-image: var(--color-darkBackground) 100% 0;
+  border-image-source: var(--color-darkBackground);
+  border-image-slice: 100% 0;
+  border-image-width: 1;
+  border-image-outset: 0;
+  border-image-repeat: stretch;
+}
+
+ .footer > div {
+  background: var(--color-darkBackground);
+  padding: 0 0 .5em;
+}

designs/galkaev/adminer.css

@@ -733,7 +733,7 @@ legend{
 }
 
 /* tables */
-#tables{
+#logins, #tables{
 	border-bottom: none;
 	line-height: 20px;
 	padding: 18px 0;
@@ -752,19 +752,27 @@ legend{
 	font-size: 13px;
 }
 
-#tables a[title] {
+#tables .structure, #tables .view {
 	float: none;
 	display: block;
 	color: inherit;
 	font-size: 14px;
 }
 
+#logins a {
+	display: block;
+	padding: 5px 18px 9px;
+	color: inherit;
+	font-size: 14px;
+}
+
 #tables a.select.active,
 #tables a.select:hover
 {
 	color: #fba;
 }
 
+#logins a:hover,
 #tables a[title]:hover,
 #tables a.active,
 #tables a.select:hover + a,
@@ -979,4 +987,4 @@ code.jush-sql ~ a:first-of-type::before{
 
 body > form{
 	position: absolute;
-}
+}