Release 4.6.1

Table with 1000 rows rendered in 1.8 instead of 7.5 seconds.

.travis.yml

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

adminer/call.inc.php

@@ -1,8 +1,8 @@
 <?php
-$PROCEDURE = $_GET["call"];
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
 
-$routine = routine($PROCEDURE, (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
+$routine = routine($_GET["call"], (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
 $in = array();
 $out = array();
 foreach ($routine["fields"] as $i => $field) {
@@ -29,10 +29,13 @@ if (!$error && $_POST) {
 		$call[] = (isset($out[$key]) ? "@" . idf_escape($field["field"]) : $val);
 	}
 	
-	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . idf_escape($PROCEDURE) . "(" . implode(", ", $call) . ")";
-	echo "<p><code class='jush-$jush'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
+	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
+	$start = microtime(true);
+	$result = $connection->multi_query($query);
+	$affected = $connection->affected_rows; // getting warnigns overwrites this
+	echo $adminer->selectQuery($query, $start, !$result);
 	
-	if (!$connection->multi_query($query)) {
+	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
 		$connection2 = connect();
@@ -45,7 +48,7 @@ if (!$error && $_POST) {
 			if (is_object($result)) {
 				select($result, $connection2);
 			} else {
-				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $connection->affected_rows) . "\n";
+				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $affected) . "\n";
 			}
 		} while ($connection->next_result());
 		

adminer/create.inc.php

@@ -35,7 +35,6 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		$all_fields = array();
 		$use_all_fields = false;
 		$foreign = array();
-		ksort($row["fields"]);
 		$orig_field = reset($orig_fields);
 		$after = " FIRST";
 
@@ -121,7 +120,7 @@ page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error,
 if (!$_POST) {
 	$row = array(
 		"Engine" => $_COOKIE["adminer_engine"],
-		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")))),
+		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")), "on_update" => "")),
 		"partition_names" => array(""),
 	);
 
@@ -164,8 +163,8 @@ foreach ($engines as $engine) {
 <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 if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>focus(document.getElementById('form')['name']);</script><?php } ?>
-<?php echo ($engines ? "<select name='Engine' onchange='helpClose();'" . on_help("getTarget(event).value", 1) . ">" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" : ""); ?>
+<?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"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
@@ -188,24 +187,25 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 <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"]) { ?><script type="text/javascript">editingHideDefaults()</script><?php } ?>
+<?php if (!$_POST["defaults"]) { echo script("editingHideDefaults();"); } ?>
 <?php echo (support("comment")
-	? "<label><input type='checkbox' name='comments' value='1' class='jsonly' onclick=\"columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus();\"" . ($comments ? " checked" : "") . ">" . lang('Comment') . "</label>"
-		. ' <input name="Comment" id="Comment" value="' . h($row["Comment"]) . '" maxlength="' . ($connection->server_info >= 5.5 ? 2048 : 60) . '"' . ($comments ? '' : ' class="hidden"') . '>'
+	? "<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"') . '>'
 	: '')
 ; ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
-<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = preg_match('~RANGE|LIST~', $row["partition_by"]);
 	print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
 	?>
 <p>
-<?php echo "<select name='partition_by' onchange='partitionByChange(this);'" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . ">" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>"; ?>
+<?php echo "<select name='partition_by'>" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
 <table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
@@ -213,7 +213,8 @@ if (support("partitioning")) {
 <?php
 foreach ($row["partition_names"] as $key => $val) {
 	echo '<tr>';
-	echo '<td><input name="partition_names[]" value="' . h($val) . '"' . ($key == count($row["partition_names"]) - 1 ? ' onchange="partitionNameChange(this);"' : '') . ' autocapitalize="off">';
+	echo '<td><input name="partition_names[]" value="' . h($val) . '" autocapitalize="off">';
+	echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
 	echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
 }
 ?>

adminer/database.inc.php

@@ -63,14 +63,15 @@ echo ($_POST["add_x"] || strpos($name, "\n")
 	: '<input name="name" id="name" value="' . h($name) . '" maxlength="64" autocapitalize="off">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
 	'sql' => "charset-charsets.html",
+	'mariadb' => "supported-character-sets-and-collations/",
 	'mssql' => "ms187963.aspx",
 )) : "");
+echo script("focus(qs('#name'));");
 ?>
-<script type='text/javascript'>focus(document.getElementById('name'));</script>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (DB != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', DB)) . "\n";
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' class='icon' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }

adminer/db.inc.php

@@ -4,7 +4,7 @@ $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);
 if ($tables_views && !$error && !$_POST["search"]) {
 	$result = true;
 	$message = "";
-	if ($jush == "sql" && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
+	if ($jush == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
 		queries("SET foreign_key_checks = 0"); // allows to truncate or drop several tables at once
 	}
 
@@ -56,23 +56,27 @@ if ($adminer->homepage()) {
 			echo "<form action='' method='post'>\n";
 			if (support("table")) {
 				echo "<fieldset><legend>" . lang('Search data in tables') . " <span id='selected2'></span></legend><div>";
-				echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
+				echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'>";
+				echo script("qsl('input').onkeydown = partialArg(bodyKeydown, 'search');", "");
+				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
+					$_GET["where"][0]["op"] = "LIKE %%";
 					search_tables();
 				}
 			}
-			echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
-
-			echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^(tables|views)\[/);">';
 			$doc_link = doc_link(array('sql' => 'show-table-status.html'));
+			echo "<table cellspacing='0' class='nowrap checkable'>\n";
+			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
+			echo '<thead><tr class="wrap">';
+			echo '<td><input id="check-all" type="checkbox" class="jsonly">' . script("qs('#check-all').onclick = partial(formCheck, /^(tables|views)\[/);", "");
 			echo '<th>' . lang('Table');
 			echo '<td>' . lang('Engine') . doc_link(array('sql' => 'storage-engines.html'));
-			echo '<td>' . lang('Collation') . doc_link(array('sql' => 'charset-mysql.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('Auto Increment') . doc_link(array('sql' => 'example-auto-increment.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 "</thead>\n";
@@ -80,10 +84,11 @@ if ($adminer->homepage()) {
 			$tables = 0;
 			foreach ($tables_list as $name => $type) {
 				$view = ($type !== null && !preg_match('~table~i', $type));
-				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
-				echo '<th>' . (support("table") || support("indexes") ? '<a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>' : h($name));
+				$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));
 				if ($view) {
-					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized View') : lang('View')) . '</a>';
+					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View')) . '</a>';
 					echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
 				} else {
 					foreach (array(
@@ -115,17 +120,18 @@ if ($adminer->homepage()) {
 
 			echo "</table>\n";
 			if (!information_schema(DB)) {
-				$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 "<div class='footer'>\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>"
 				. ($jush == "sqlite" ? $vacuum
 				: ($jush == "pgsql" ? $vacuum . $optimize
-				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'" . on_help("'ANALYZE TABLE'") . "> " . $optimize
-					. "<input type='submit' name='check' value='" . lang('Check') . "'" . on_help("'CHECK TABLE'") . "> "
-					. "<input type='submit' name='repair' value='" . lang('Repair') . "'" . on_help("'REPAIR TABLE'") . "> "
+				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'") . $optimize
+					. "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'CHECK TABLE'")
+					. "<input type='submit' name='repair' value='" . lang('Repair') . "'> " . on_help("'REPAIR TABLE'")
 				: "")))
-				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> "
-				. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . on_help("'DROP TABLE'") . ">\n";
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . confirm()
+				. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . on_help("'DROP TABLE'") . confirm() . "\n";
 				$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
 				if (count($databases) != 1 && $jush != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
@@ -135,17 +141,18 @@ if ($adminer->homepage()) {
 					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
 					echo "\n";
 				}
-				echo "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked(this, /^tables\[/) || $tables);" : "") . "\">\n"; // used by trCheck()
+				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 "</form>\n";
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
+			echo script("tableCheck();");
 		}
 
 		echo '<p class="links"><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
 		echo (support("view") ? '<a href="' . h(ME) . 'view=">' . lang('Create view') . "</a>\n" : "");
-		echo (support("materializedview") ? '<a href="' . h(ME) . 'view=&amp;materialized=1">' . lang('Create materialized view') . "</a>\n" : "");
 
 		if (support("routine")) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
@@ -155,11 +162,12 @@ if ($adminer->homepage()) {
 				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td>&nbsp;</thead>\n";
 				odd('');
 				foreach ($routines as $row) {
+					$name = ($row["SPECIFIC_NAME"] == $row["ROUTINE_NAME"] ? "" : "&name=" . urlencode($row["ROUTINE_NAME"])); // not computed on the pages to be able to print the header first
 					echo '<tr' . odd() . '>';
-					echo '<th><a href="' . h(ME) . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["ROUTINE_NAME"]) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
+					echo '<th><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
 					echo '<td>' . h($row["ROUTINE_TYPE"]);
 					echo '<td>' . h($row["DTD_IDENTIFIER"]);
-					echo '<td><a href="' . h(ME) . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["ROUTINE_NAME"]) . '">' . lang('Alter') . "</a>";
+					echo '<td><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . lang('Alter') . "</a>";
 				}
 				echo "</table>\n";
 			}
@@ -222,7 +230,7 @@ if ($adminer->homepage()) {
 		}
 
 		if ($tables_list) {
-			echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+			echo script("ajaxSetHtml('" . js_escape(ME) . "script=db');");
 		}
 	}
 }

adminer/designs.php

@@ -0,0 +1,14 @@
+<?php
+function adminer_object() {
+	include_once "../plugins/plugin.php";
+	include_once "../plugins/designs.php";
+	$designs = array();
+	foreach (glob("../designs/*", GLOB_ONLYDIR) as $filename) {
+		$designs["$filename/adminer.css"] = basename($filename);
+	}
+	return new AdminerPlugin(array(
+		new AdminerDesigns($designs),
+	));
+}
+
+include "./index.php";

adminer/download.inc.php

@@ -6,5 +6,5 @@ header("Content-Disposition: attachment; filename=" . friendly_url("$TABLE-" . i
 $select = array(idf_escape($_GET["field"]));
 $result = $driver->select($TABLE, $select, array(where($_GET, $fields)), $select);
 $row = ($result ? $result->fetch_row() : array());
-echo $row[0];
+echo $driver->value($row[0], $fields[$_GET["field"]]);
 exit; // don't output footer

adminer/drivers/elastic.inc.php

@@ -17,9 +17,10 @@ if (isset($_GET["elastic"])) {
 			 */
 			function rootQuery($path, $content = array(), $method = 'GET') {
 				@ini_set('track_errors', 1); // @ - may be disabled
-				$file = @file_get_contents($this->_url  . '/' . ltrim($path, '/'), false, stream_context_create(array('http' => array(
+				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
 					'method' => $method,
-					'content' => json_encode($content),
+					'content' => $content === null ? $content : json_encode($content),
+					'header' => 'Content-Type: application/json',
 					'ignore_errors' => 1, // available since PHP 5.2.10
 				))));
 				if (!$file) {
@@ -59,7 +60,8 @@ if (isset($_GET["elastic"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->_url = "http://$username:$password@$server/";
+				preg_match('~^(https?://)?(.*)~', $server, $match);
+				$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
 				$return = $this->query('');
 				if ($return) {
 					$this->server_info = $return['version']['number'];
@@ -146,7 +148,7 @@ if (isset($_GET["elastic"])) {
 			$start = microtime(true);
 			$search = $this->_conn->query($query, $data);
 			if ($print) {
-				echo $adminer->selectQuery("$query: " . print_r($data, true), format_time($start));
+				echo $adminer->selectQuery("$query: " . print_r($data, true), $start, !$search);
 			}
 			if (!$search) {
 				return false;
@@ -155,7 +157,7 @@ if (isset($_GET["elastic"])) {
 			foreach ($search['hits']['hits'] as $hit) {
 				$row = array();
 				if ($select == array("*")) {
-				  $row["_id"] = $hit["_id"];
+					$row["_id"] = $hit["_id"];
 				}
 				$fields = $hit['_source'];
 				if ($select != array("*")) {
@@ -175,6 +177,47 @@ if (isset($_GET["elastic"])) {
 			return new Min_Result($return);
 		}
 
+		function update($type, $record, $queryWhere) {
+			$parts = preg_split('~ *= *~', $queryWhere);
+			if (count($parts) == 2) {
+				$id = trim($parts[1]);
+				$query = "$type/$id";
+				return $this->_conn->query($query, $record, 'POST');
+			}
+			return false;
+		}
+
+		function insert($type, $record) {
+			$id = ""; //! user should be able to inform _id
+			$query = "$type/$id";
+			$response = $this->_conn->query($query, $record, 'POST');
+			$this->_conn->last_id = $response['_id'];
+			return $response['created'];
+		}
+
+		function delete($type, $queryWhere) {
+			$ids = array();
+			if (is_array($_GET["where"]) && $_GET["where"]["_id"]) {
+				$ids[] = $_GET["where"]["_id"];
+			}
+			if (is_array($_POST['check'])) {
+				foreach ($_POST['check'] as $check) {
+					$parts = preg_split('~ *= *~', $check);
+					if (count($parts) == 2) {
+						$ids[] = trim($parts[1]);
+					}
+				}
+			}
+			$this->_conn->affected_rows = 0;
+			foreach ($ids as $id) {
+				$query = "{$type}/{$id}";
+				$response = $this->_conn->query($query, '{}', 'DELETE');
+				if (is_array($response) && $response['found'] == true) {
+					$this->_conn->affected_rows++;
+				}
+			}
+			return $this->_conn->affected_rows;
+		}
 	}
 
 
@@ -222,9 +265,14 @@ if (isset($_GET["elastic"])) {
 
 	function count_tables($databases) {
 		global $connection;
-		$return = $connection->query('_mapping');
-		if ($return) {
-			$return = array_map('count', $return);
+		$return = array();
+		$result = $connection->query('_stats');
+		if ($result && $result['indices']) {
+			$indices = $result['indices'];
+			foreach ($indices as $indice => $stats) {
+				$indexing = $stats['total']['indexing'];
+				$return[$indice] = $indexing['index_total'];
+			}
 		}
 		return $return;
 	}
@@ -240,26 +288,28 @@ if (isset($_GET["elastic"])) {
 
 	function table_status($name = "", $fast = false) {
 		global $connection;
-		$search = $connection->query("_search?search_type=count", array(
-			"facets" => array(
+		$search = $connection->query("_search", array(
+			"size" => 0,
+			"aggregations" => array(
 				"count_by_type" => array(
 					"terms" => array(
-						"field" => "_type",
+						"field" => "_type"
 					)
 				)
 			)
 		), "POST");
 		$return = array();
 		if ($search) {
-			foreach ($search["facets"]["count_by_type"]["terms"] as $table) {
-				$return[$table["term"]] = array(
-					"Name" => $table["term"],
+			$tables = $search["aggregations"]["count_by_type"]["buckets"];
+			foreach ($tables as $table) {
+				$return[$table["key"]] = array(
+					"Name" => $table["key"],
 					"Engine" => "table",
-					"Rows" => $table["count"],
+					"Rows" => $table["doc_count"],
 				);
-			}
-			if ($name != "" && $name == $table["term"]) {
-				return $return[$name];
+				if ($name != "" && $name == $table["key"]) {
+					return $return[$name];
+				}
 			}
 		}
 		return $return;
@@ -335,16 +385,16 @@ if (isset($_GET["elastic"])) {
 		return null;
 	}
 
-	/** Create database
+	/** Create index
 	* @param string
 	* @return mixed
 	*/
 	function create_database($db) {
 		global $connection;
-		return $connection->rootQuery(urlencode($db), array(), 'PUT');
+		return $connection->rootQuery(urlencode($db), null, 'PUT');
 	}
 
-	/** Drop databases
+	/** Remove index
 	* @param array
 	* @return mixed
 	*/
@@ -353,7 +403,27 @@ if (isset($_GET["elastic"])) {
 		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
 	}
 
-	/** Drop tables
+	/** Alter type
+	* @param array
+	* @return mixed
+	*/
+	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
+		$properties = array();
+		foreach ($fields as $f) {
+			$field_name = trim($f[1][0]);
+			$field_type = trim($f[1][1] ? $f[1][1] : "text");
+			$properties[$field_name] = array(
+				'type' => $field_type
+			);
+		}
+		if (!empty($properties)) {
+			$properties = array('properties' => $properties);
+		}
+		return $connection->query("_mapping/{$name}", $properties, 'PUT');
+	}
+
+	/** Drop types
 	* @param array
 	* @return bool
 	*/
@@ -366,9 +436,25 @@ if (isset($_GET["elastic"])) {
 		return $return;
 	}
 
+	function last_id() {
+		global $connection;
+		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);
+	}
 }

adminer/drivers/firebird.inc.php

@@ -147,8 +147,8 @@ if (isset($_GET["firebird"])) {
 		return $return;
 	}
 
-	function limit1($query, $where) {
-		return limit($query, $where, 1);
+	function limit1($table, $query, $where, $separator = "\n") {
+		return limit($query, $where, 1, 0, $separator);
 	}
 
 	function db_collation($db, $collations) {

adminer/drivers/mongo.inc.php

@@ -2,7 +2,7 @@
 $drivers["mongo"] = "MongoDB (beta)";
 
 if (isset($_GET["mongo"])) {
-	$possible_drivers = array("mongo");
+	$possible_drivers = array("mongo", "mongodb");
 	define("DRIVER", "mongo");
 
 	if (class_exists('MongoDB')) {
@@ -109,97 +109,502 @@ if (isset($_GET["mongo"])) {
 			}
 
 		}
-	}
 
 
 
-	class Min_Driver extends Min_SQL {
-		public $primary = "_id";
-		
-		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			$select = ($select == array("*")
-				? array()
-				: array_fill_keys($select, true)
-			);
-			$sort = array();
-			foreach ($order as $val) {
-				$val = preg_replace('~ DESC$~', '', $val, 1, $count);
-				$sort[$val] = ($count ? -1 : 1);
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
+			
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, true)
+				);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				return new Min_Result($this->_conn->_db->selectCollection($table)
+					->find(array(), $select)
+					->sort($sort)
+					->limit($limit != "" ? +$limit : 0)
+					->skip($page * $limit)
+				);
+			}
+			
+			function insert($table, $set) {
+				try {
+					$return = $this->_conn->_db->selectCollection($table)->insert($set);
+					$this->_conn->errno = $return['code'];
+					$this->_conn->error = $return['err'];
+					$this->_conn->last_id = $set['_id'];
+					return !$return['err'];
+				} catch (Exception $ex) {
+					$this->_conn->error = $ex->getMessage();
+					return false;
+				}
 			}
-			return new Min_Result($this->_conn->_db->selectCollection($table)
-				->find(array(), $select)
-				->sort($sort)
-				->limit(+$limit)
-				->skip($page * $limit)
-			);
 		}
-		
-		function insert($table, $set) {
-			try {
-				$return = $this->_conn->_db->selectCollection($table)->insert($set);
-				$this->_conn->errno = $return['code'];
-				$this->_conn->error = $return['err'];
-				$this->_conn->last_id = $set['_id'];
-				return !$return['err'];
-			} catch (Exception $ex) {
-				$this->_conn->error = $ex->getMessage();
+
+		function get_databases($flush) {
+			global $connection;
+			$return = array();
+			$dbs = $connection->_link->listDBs();
+			foreach ($dbs['databases'] as $db) {
+				$return[] = $db['name'];
+			}
+			return $return;
+		}
+
+		function count_tables($databases) {
+			global $connection;
+			$return = array();
+			foreach ($databases as $db) {
+				$return[$db] = count($connection->_link->selectDB($db)->getCollectionNames(true));
+			}
+			return $return;
+		}
+
+		function tables_list() {
+			global $connection;
+			return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+		}
+
+		function drop_databases($databases) {
+			global $connection;
+			foreach ($databases as $db) {
+				$response = $connection->_link->selectDB($db)->drop();
+				if (!$response['ok']) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		function indexes($table, $connection2 = null) {
+			global $connection;
+			$return = array();
+			foreach ($connection->_db->selectCollection($table)->getIndexInfo() as $index) {
+				$descs = array();
+				foreach ($index["key"] as $column => $type) {
+					$descs[] = ($type == -1 ? '1' : null);
+				}
+				$return[$index["name"]] = array(
+					"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
+					"columns" => array_keys($index["key"]),
+					"lengths" => array(),
+					"descs" => $descs,
+				);
+			}
+			return $return;
+		}
+
+		function fields($table) {
+			return fields_from_edit();
+		}
+
+		function found_rows($table_status, $where) {
+			global $connection;
+			//! don't call count_rows()
+			return $connection->_db->selectCollection($_GET["select"])->count($where);
+		}
+
+		$operators = array("=");
+
+	} elseif (class_exists('MongoDB\Driver\Manager')) {
+		class Min_DB {
+			var $extension = "MongoDB", $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;
+				}
+				try {
+					$class = 'MongoDB\Driver\Manager';
+					$this->_link = new $class("mongodb://$server", $options);
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+
+			function query($query) {
 				return false;
 			}
+
+			function select_db($database) {
+				try {
+					$this->_db_name = $database;
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+
+			function quote($string) {
+				return $string;
+			}
+
 		}
-	}
 
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
 
+			function __construct($result) {
+				foreach ($result as $item) {
+					$row = array();
+					foreach ($item as $key => $val) {
+						if (is_a($val, 'MongoDB\BSON\Binary')) {
+							$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
+											)))));
+					}
+					$this->_rows[] = $row;
+					foreach ($row as $key => $val) {
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
+						}
+					}
+				}
+				$this->num_rows = $result->count;
+			}
+
+			function fetch_assoc() {
+				$row = current($this->_rows);
+				if (!$row) {
+					return $row;
+				}
+				$return = array();
+				foreach ($this->_rows[0] as $key => $val) {
+					$return[$key] = $row[$key];
+				}
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				$return = $this->fetch_assoc();
+				if (!$return) {
+					return $return;
+				}
+				return array_values($return);
+			}
+
+			function fetch_field() {
+				$keys = array_keys($this->_rows[0]);
+				$name = $keys[$this->_offset++];
+				return (object) array(
+					'name' => $name,
+					'charsetnr' => $this->_charset[$name],
+				);
+			}
 
-	function connect() {
-		global $adminer;
-		$connection = new Min_DB;
-		$credentials = $adminer->credentials();
-		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
-			return $connection;
 		}
-		return $connection->error;
-	}
 
-	function error() {
-		global $connection;
-		return h($connection->error);
-	}
 
-	function logged_user() {
-		global $adminer;
-		$credentials = $adminer->credentials();
-		return $credentials[1];
-	}
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
 
-	function get_databases($flush) {
-		global $connection;
-		$return = array();
-		$dbs = $connection->_link->listDBs();
-		foreach ($dbs['databases'] as $db) {
-			$return[] = $db['name'];
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				global $connection;
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, 1)
+				);
+				if (count($select) && !isset($select['_id'])) {
+					$select['_id'] = 0;
+				}
+				$where = where_to_query($where);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
+					$limit = $_GET['limit'];
+				}
+				$limit = min(200, max(1, (int) $limit));
+				$skip = $page * $limit;
+				$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);
+			}
+
+			function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if (isset($set['_id'])) {
+					unset($set['_id']);
+				}
+				$removeFields = array();
+				foreach ($set as $key => $value) {
+					if ($value == 'NULL') {
+						$removeFields[$key] = 1;
+						unset($set[$key]);
+					}
+				}
+				$update = array('$set' => $set);
+				if (count($removeFields)) {
+					$update['$unset'] = $removeFields;
+				}
+				$bulk->update($where, $update, array('upsert' => false));
+				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
+				$connection->affected_rows = $results->getModifiedCount();
+				return true;
+			}
+
+			function delete($table, $queryWhere, $limit = 0) {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$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;
+			}
+
+			function insert($table, $set) {
+				global $connection;
+				$db = $connection->_db_name;
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if (isset($set['_id']) && empty($set['_id'])) {
+					unset($set['_id']);
+				}
+				$bulk->insert($set);
+				$results = $connection->_link->executeBulkWrite("$db.$table", $bulk);
+				$connection->affected_rows = $results->getInsertedCount();
+				return true;
+			}
 		}
-		return $return;
-	}
 
-	function collations() {
-		return array();
-	}
-
-	function db_collation($db, $collations) {
-	}
-
-	function count_tables($databases) {
-		global $connection;
-		$return = array();
-		foreach ($databases as $db) {
-			$return[$db] = count($connection->_link->selectDB($db)->getCollectionNames(true));
+		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 ($dbs->databases as $db) {
+					$return[] = $db->name;
+				}
+			}
+			return $return;
 		}
-		return $return;
+
+		function count_tables($databases) {
+			$return = array();
+			return $return;
+		}
+
+		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) {
+				$collections[$result->name] = 'table';
+			}
+			return $collections;
+		}
+
+		function drop_databases($databases) {
+			return false;
+		}
+
+		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) {
+				$descs = array();
+				$columns = array();
+				foreach (get_object_vars($index->key) as $column => $type) {
+					$descs[] = ($type == -1 ? '1' : null);
+					$columns[] = $column;
+				}
+				$return[$index->name] = array(
+					"type" => ($index->name == "_id_" ? "PRIMARY" : (isset($index->unique) ? "UNIQUE" : "INDEX")),
+					"columns" => $columns,
+					"lengths" => array(),
+					"descs" => $descs,
+				);
+			}
+			return $return;
+		}
+
+		function fields($table) {
+			$fields = fields_from_edit();
+			if (!count($fields)) {
+				global $driver;
+				$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,
+							),
+						);
+					}
+				}
+			}
+			return $fields;
+		}
+
+		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();
+			return $toArray[0]->n;
+		}
+
+		function sql_query_where_parser($queryWhere) {
+			$queryWhere = trim(preg_replace('/WHERE[\s]?[(]?\(?/', '', $queryWhere));
+			$queryWhere = preg_replace('/\)\)\)$/', ')', $queryWhere);
+			$wheres = explode(' AND ', $queryWhere);
+			$wheresOr = explode(') OR (', $queryWhere);
+			$where = array();
+			foreach ($wheres as $whereStr) {
+				$where[] = trim($whereStr);
+			}
+			if (count($wheresOr) == 1) {
+				$wheresOr = array();
+			} elseif (count($wheresOr) > 1) {
+				$where = array();
+			}
+			return where_to_query($where, $wheresOr);
+		}
+
+		function where_to_query($whereAnd = array(), $whereOr = array()) {
+			global $operators;
+			$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';
+							$val = new $class($val);
+						}
+						if (!in_array($op, $operators)) {
+							continue;
+						}
+						if (preg_match('~^\(f\)(.+)~', $op, $match)) {
+							$val = (float) $val;
+							$op = $match[1];
+						} elseif (preg_match('~^\(date\)(.+)~', $op, $match)) {
+							$dateTime = new DateTime($val);
+							$class = 'MongoDB\BSON\UTCDatetime';
+							$val = new $class($dateTime->getTimestamp() * 1000);
+							$op = $match[1];
+						}
+						switch ($op) {
+							case '=':
+								$op = '$eq';
+								break;
+							case '!=':
+								$op = '$ne';
+								break;
+							case '>':
+								$op = '$gt';
+								break;
+							case '<':
+								$op = '$lt';
+								break;
+							case '>=':
+								$op = '$gte';
+								break;
+							case '<=':
+								$op = '$lte';
+								break;
+							case 'regex':
+								$op = '$regex';
+								break;
+							default:
+								continue;
+						}
+						if ($type == 'and') {
+							$data['$and'][] = array($col => array($op => $val));
+						} elseif ($type == 'or') {
+							$data['$or'][] = array($col => array($op => $val));
+						}
+					}
+				}
+			}
+			return $data;
+		}
+
+		$operators = array(
+			"=",
+			"!=",
+			">",
+			"<",
+			">=",
+			"<=",
+			"regex",
+			"(f)=",
+			"(f)!=",
+			"(f)>",
+			"(f)<",
+			"(f)>=",
+			"(f)<=",
+			"(date)=",
+			"(date)!=",
+			"(date)>",
+			"(date)<",
+			"(date)>=",
+			"(date)<=",
+		);
 	}
 
-	function tables_list() {
-		global $connection;
-		return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
 	}
 
 	function table_status($name = "", $fast = false) {
@@ -213,43 +618,73 @@ if (isset($_GET["mongo"])) {
 		return $return;
 	}
 
-	function information_schema() {
-	}
-
-	function is_view($table_status) {
-	}
-
-	function drop_databases($databases) {
+	function last_id() {
 		global $connection;
-		foreach ($databases as $db) {
-			$response = $connection->_link->selectDB($db)->drop();
-			if (!$response['ok']) {
+		return $connection->last_id;
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
+		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
+			return $connection;
+		}
+		return $connection->error;
+	}
+
+	function alter_indexes($table, $alter) {
+		global $connection;
+		foreach ($alter as $val) {
+			list($type, $name, $set) = $val;
+			if ($set == "DROP") {
+				$return = $connection->_db->command(array("deleteIndexes" => $table, "index" => $name));
+			} else {
+				$columns = array();
+				foreach ($set as $column) {
+					$column = preg_replace('~ DESC$~', '', $column, 1, $count);
+					$columns[$column] = ($count ? -1 : 1);
+				}
+				$return = $connection->_db->selectCollection($table)->ensureIndex($columns, array(
+					"unique" => ($type == "UNIQUE"),
+					"name" => $name,
+					//! "sparse"
+				));
+			}
+			if ($return['errmsg']) {
+				$connection->error = $return['errmsg'];
 				return false;
 			}
 		}
 		return true;
 	}
 
-	function indexes($table, $connection2 = null) {
-		global $connection;
-		$return = array();
-		foreach ($connection->_db->selectCollection($table)->getIndexInfo() as $index) {
-			$descs = array();
-			foreach ($index["key"] as $column => $type) {
-				$descs[] = ($type == -1 ? '1' : null);
-			}
-			$return[$index["name"]] = array(
-				"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
-				"columns" => array_keys($index["key"]),
-				"lengths" => array(),
-				"descs" => $descs,
-			);
-		}
-		return $return;
+	function support($feature) {
+		return preg_match("~database|indexes~", $feature);
 	}
 
-	function fields($table) {
-		return fields_from_edit();
+	function db_collation($db, $collations) {
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
 	}
 
 	function convert_field($field) {
@@ -270,12 +705,6 @@ if (isset($_GET["mongo"])) {
 		return array();
 	}
 
-	function found_rows($table_status, $where) {
-		global $connection;
-		//! don't call count_rows()
-		return $connection->_db->selectCollection($_GET["select"])->count($where);
-	}
-
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		global $connection;
 		if ($table == "") {
@@ -306,51 +735,7 @@ if (isset($_GET["mongo"])) {
 		return true;
 	}
 
-	function alter_indexes($table, $alter) {
-		global $connection;
-		foreach ($alter as $val) {
-			list($type, $name, $set) = $val;
-			if ($set == "DROP") {
-				$return = $connection->_db->command(array("deleteIndexes" => $table, "index" => $name));
-			} else {
-				$columns = array();
-				foreach ($set as $column) {
-					$column = preg_replace('~ DESC$~', '', $column, 1, $count);
-					$columns[$column] = ($count ? -1 : 1);
-				}
-				$return = $connection->_db->selectCollection($table)->ensureIndex($columns, array(
-					"unique" => ($type == "UNIQUE"),
-					"name" => $name,
-					//! "sparse"
-				));
-			}
-			if ($return['errmsg']) {
-				$connection->error = $return['errmsg'];
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	function last_id() {
-		global $connection;
-		return $connection->last_id;
-	}
-
-	function table($idf) {
-		return $idf;
-	}
-
-	function idf_escape($idf) {
-		return $idf;
-	}
-
-	function support($feature) {
-		return preg_match("~database|indexes~", $feature);
-	}
-
 	$jush = "mongo";
-	$operators = array("=");
 	$functions = array();
 	$grouping = array();
 	$edit_functions = array(array("json"));

adminer/drivers/mssql.inc.php

@@ -8,7 +8,7 @@
 $drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
-	$possible_drivers = array("SQLSRV", "MSSQL");
+	$possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
 	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
 		class Min_DB {
@@ -109,11 +109,11 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function fetch_assoc() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
 			}
 
 			function fetch_row() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
 			}
 
 			function fetch_field() {
@@ -164,7 +164,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = mssql_query($query, $this->_link); //! $unbuffered
+				$result = @mssql_query($query, $this->_link); //! $unbuffered
 				$this->error = "";
 				if (!$result) {
 					$this->error = mssql_get_last_message();
@@ -186,7 +186,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function next_result() {
-				return mssql_next_result($this->_result);
+				return mssql_next_result($this->_result->_result);
 			}
 
 			function result($query, $field = 0) {
@@ -234,8 +234,21 @@ if (isset($_GET["mssql"])) {
 			}
 		}
 
-	}
+	} elseif (extension_loaded("pdo_dblib")) {
+		class Min_DB extends Min_PDO {
+			var $extension = "PDO_DBLIB";
 
+			function connect($server, $username, $password) {
+				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+				return true;
+			}
+
+			function select_db($database) {
+				// database selection is separated from the connection so dbname in DSN can't be used
+				return $this->query("USE " . idf_escape($database));
+			}
+		}
+	}
 
 
 	class Min_Driver extends Min_SQL {
@@ -288,20 +301,20 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("EXEC sp_databases");
+		return get_vals("SELECT name FROM sys.databases WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb')");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
 		return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
 	}
 
-	function limit1($query, $where) {
-		return limit($query, $where, 1);
+	function limit1($table, $query, $where, $separator = "\n") {
+		return limit($query, $where, 1, 0, $separator);
 	}
 
 	function db_collation($db, $collations) {
 		global $connection;
-		return $connection->result("SELECT collation_name FROM sys.databases WHERE name =  " . q($db));
+		return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
 	}
 
 	function engines() {
@@ -348,7 +361,7 @@ if (isset($_GET["mssql"])) {
 
 	function fields($table) {
 		$return = array();
-		foreach (get_rows("SELECT c.*, t.name type, d.definition [default]
+		foreach (get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default]
 FROM sys.all_columns c
 JOIN sys.all_objects o ON c.object_id = o.object_id
 JOIN sys.types t ON c.user_type_id = t.user_type_id

adminer/drivers/mysql.inc.php

@@ -13,16 +13,22 @@ if (!defined("DRIVER")) {
 				parent::init();
 			}
 
-			function connect($server, $username, $password) {
+			function connect($server = "", $username = "", $password = "", $database = null, $port = null, $socket = null) {
+				global $adminer;
 				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
+				$ssl = $adminer->connectSsl();
+				if ($ssl) {
+					$this->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca'], '', '');
+				}
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
 					($server . $username . $password != "" ? $password : ini_get("mysqli.default_pw")),
-					null,
+					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
-					(!is_numeric($port) ? $port : null)
+					(!is_numeric($port) ? $port : $socket),
+					($ssl ? 64 : 0) // 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
 				return $return;
 			}
@@ -223,7 +229,22 @@ if (!defined("DRIVER")) {
 			var $extension = "PDO_MySQL";
 
 			function connect($server, $username, $password) {
-				$this->dsn("mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+				global $adminer;
+				$options = array();
+				$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'],
+					);
+				}
+				$this->dsn(
+					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)),
+					$username,
+					$password,
+					$options
+				);
 				return true;
 			}
 
@@ -276,6 +297,32 @@ if (!defined("DRIVER")) {
 			}
 			return queries($prefix . implode(",\n", $values) . $suffix);
 		}
+		
+		function convertSearch($idf, $val, $field) {
+			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"])
+				? "CONVERT($idf USING " . charset($this->_conn) . ")"
+				: $idf
+			);
+		}
+		
+		function warnings() {
+			$result = $this->_conn->query("SHOW WARNINGS");
+			if ($result && $result->num_rows) {
+				ob_start();
+				select($result); // select() usually needs to print a big table progressively
+				return ob_get_clean();
+			}
+		}
+
+		function tableHelp($name) {
+			$maria = preg_match('~MariaDB~', $this->_conn->server_info);
+			if (information_schema(DB)) {
+				return strtolower(($maria ? "information-schema-$name-table/" : str_replace("_", "-", $name) . "-table.html"));
+			}
+			if (DB == "mysql") {
+				return ($maria ? "mysql$name-table/" : "system-database.html"); //! more precise link
+			}
+		}
 
 	}
 
@@ -301,12 +348,16 @@ if (!defined("DRIVER")) {
 	* @return mixed Min_DB or string for error
 	*/
 	function connect() {
-		global $adminer;
+		global $adminer, $types, $structured_types;
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
 			$connection->query("SET sql_quote_show_create = 1, autocommit = 1");
+			if (min_version('5.7.8', 10.2, $connection)) {
+				$structured_types[lang('Strings')][] = "json";
+				$types["json"] = 4294967295;
+			}
 			return $connection;
 		}
 		$return = $connection->error;
@@ -321,11 +372,10 @@ if (!defined("DRIVER")) {
 	* @return array
 	*/
 	function get_databases($flush) {
-		global $connection;
 		// SHOW DATABASES can take a very long time so it is cached
 		$return = get_session("dbs");
 		if ($return === null) {
-			$query = ($connection->server_info >= 5
+			$query = (min_version(5)
 				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA"
 				: "SHOW DATABASES"
 			); // SHOW DATABASES can be disabled by skip_show_database
@@ -350,12 +400,14 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Formulate SQL modification query with limit 1
+	* @param string
 	* @param string everything after UPDATE or DELETE
 	* @param string
+	* @param string
 	* @return string
 	*/
-	function limit1($query, $where) {
-		return limit($query, $where, 1);
+	function limit1($table, $query, $where, $separator = "\n") {
+		return limit($query, $where, 1, 0, $separator);
 	}
 
 	/** Get database collation
@@ -401,8 +453,7 @@ if (!defined("DRIVER")) {
 	* @return array array($name => $type)
 	*/
 	function tables_list() {
-		global $connection;
-		return get_key_vals($connection->server_info >= 5
+		return get_key_vals(min_version(5)
 			? "SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME"
 			: "SHOW TABLES"
 		);
@@ -426,10 +477,9 @@ if (!defined("DRIVER")) {
 	* @return array array($name => array("Name" => , "Engine" => , "Comment" => , "Oid" => , "Rows" => , "Collation" => , "Auto_increment" => , "Data_length" => , "Index_length" => , "Data_free" => )) or only inner array with $name
 	*/
 	function table_status($name = "", $fast = false) {
-		global $connection;
 		$return = array();
-		foreach (get_rows($fast && $connection->server_info >= 5
-			? "SELECT TABLE_NAME AS Name, Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
+		foreach (get_rows($fast && min_version(5)
+			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
 			: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
 		) as $row) {
 			if ($row["Engine"] == "InnoDB") {
@@ -460,9 +510,8 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function fk_support($table_status) {
-		global $connection;
 		return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"])
-			|| (preg_match('~NDB~i', $table_status["Engine"]) && version_compare($connection->server_info, '5.6') >= 0);
+			|| (preg_match('~NDB~i', $table_status["Engine"]) && min_version(5.6));
 	}
 
 	/** Get information about fields
@@ -500,10 +549,11 @@ if (!defined("DRIVER")) {
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
-			$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
-			$return[$row["Key_name"]]["columns"][] = $row["Column_name"];
-			$return[$row["Key_name"]]["lengths"][] = $row["Sub_part"];
-			$return[$row["Key_name"]]["descs"][] = null;
+			$name = $row["Key_name"];
+			$return[$name]["type"] = ($name == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? ($row["Index_type"] == "SPATIAL" ? "SPATIAL" : "INDEX") : "UNIQUE")));
+			$return[$name]["columns"][] = $row["Column_name"];
+			$return[$name]["lengths"][] = ($row["Index_type"] == "SPATIAL" ? null : $row["Sub_part"]);
+			$return[$name]["descs"][] = null;
 		}
 		return $return;
 	}
@@ -568,9 +618,8 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function information_schema($db) {
-		global $connection;
-		return ($connection->server_info >= 5 && $db == "information_schema")
-			|| ($connection->server_info >= 5.5 && $db == "performance_schema");
+		return (min_version(5) && $db == "information_schema")
+			|| (min_version(5.5) && $db == "performance_schema");
 	}
 
 	/** Get escaped error message
@@ -581,16 +630,6 @@ if (!defined("DRIVER")) {
 		return h(preg_replace('~^You have an error.*syntax to use~U', "Syntax error", $connection->error));
 	}
 
-	/** Get line of error
-	* @return int 0 for first line
-	*/
-	function error_line() {
-		global $connection;
-		if (preg_match('~ at line ([0-9]+)$~', $connection->error, $regs)) {
-			return $regs[1] - 1;
-		}
-	}
-
 	/** Create database
 	* @param string
 	* @param string
@@ -818,8 +857,9 @@ if (!defined("DRIVER")) {
 	function routine($name, $type) {
 		global $connection, $enum_length, $inout, $types;
 		$aliases = array("bool", "boolean", "integer", "double precision", "real", "dec", "numeric", "fixed", "national char", "national varchar");
+		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
 		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$enum_length)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?";
-		$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
+		$pattern = "$space*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
 		$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
 		preg_match("~\\(((?:$pattern\\s*,?)*)\\)\\s*" . ($type == "FUNCTION" ? "RETURNS\\s+$type_pattern\\s+" : "") . "(.*)~is", $create, $match);
 		$fields = array();
@@ -849,10 +889,10 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get list of routines
-	* @return array ("ROUTINE_TYPE" => , "ROUTINE_NAME" => , "DTD_IDENTIFIER" => )
+	* @return array ("SPECIFIC_NAME" => , "ROUTINE_NAME" => , "ROUTINE_TYPE" => , "DTD_IDENTIFIER" => )
 	*/
 	function routines() {
-		return get_rows("SELECT ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
+		return get_rows("SELECT ROUTINE_NAME AS SPECIFIC_NAME, ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
 	}
 
 	/** Get list of available routine languages
@@ -862,6 +902,15 @@ if (!defined("DRIVER")) {
 		return array(); // "SQL" not required
 	}
 
+	/** Get routine signature
+	* @param string
+	* @param array result of routine()
+	* @return string
+	*/
+	function routine_id($name, $row) {
+		return idf_escape($name);
+	}
+
 	/** Get last auto increment ID
 	* @return string
 	*/
@@ -876,7 +925,7 @@ if (!defined("DRIVER")) {
 	* @return Min_Result
 	*/
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN " . ($connection->server_info >= 5.1 ? "PARTITIONS " : "") . $query);
+		return $connection->query("EXPLAIN " . (min_version(5.1) ? "PARTITIONS " : "") . $query);
 	}
 
 	/** Get approximate number of rows
@@ -920,9 +969,10 @@ if (!defined("DRIVER")) {
 	/** Get SQL command to create table
 	* @param string
 	* @param bool
+	* @param string
 	* @return string
 	*/
-	function create_sql($table, $auto_increment) {
+	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if (!$auto_increment) {
@@ -949,14 +999,12 @@ if (!defined("DRIVER")) {
 
 	/** Get SQL commands to create triggers
 	* @param string
-	* @param string
 	* @return string
 	*/
-	function trigger_sql($table, $style) {
+	function trigger_sql($table) {
 		$return = "";
 		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
-			$return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
-			. "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+			$return .= "\nCREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
 		}
 		return $return;
 	}
@@ -994,7 +1042,7 @@ if (!defined("DRIVER")) {
 			return "BIN(" . idf_escape($field["field"]) . " + 0)"; // + 0 is required outside MySQLnd
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-			return "AsWKT(" . idf_escape($field["field"]) . ")";
+			return (min_version(8) ? "ST_" : "") . "AsWKT(" . idf_escape($field["field"]) . ")";
 		}
 	}
 
@@ -1011,7 +1059,7 @@ if (!defined("DRIVER")) {
 			$return = "CONV($return, 2, 10) + 0";
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-			$return = "GeomFromText($return)";
+			$return = (min_version(8) ? "ST_" : "") . "GeomFromText($return)";
 		}
 		return $return;
 	}
@@ -1021,8 +1069,20 @@ if (!defined("DRIVER")) {
 	* @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);
+	}
+
+	function kill_process($val) {
+		return queries("KILL " . number($val));
+	}
+
+	function connection_id(){
+		return "SELECT CONNECTION_ID()";
+	}
+
+	function max_connections() {
 		global $connection;
-		return !preg_match("~scheme|sequence|type|view_trigger" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|routine|trigger|view" : "") : "") . "~", $feature);
+		return $connection->result("SELECT @@max_connections");
 	}
 
 	$jush = "sql"; ///< @var string JUSH identifier
@@ -1040,8 +1100,8 @@ if (!defined("DRIVER")) {
 		$structured_types[$key] = array_keys($val);
 	}
 	$unsigned = array("unsigned", "zerofill", "unsigned zerofill"); ///< @var array number variants
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "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", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
+	$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(
@@ -1049,7 +1109,7 @@ if (!defined("DRIVER")) {
 			"binary" => "md5/sha1",
 			"date|time" => "now",
 		), array(
-			"(^|[^o])int|float|double|decimal" => "+/-", // not point
+			number_type() => "+/-",
 			"date" => "+ interval/- interval",
 			"time" => "addtime/subtime",
 			"char|text" => "concat",

adminer/drivers/oracle.inc.php

@@ -175,8 +175,8 @@ if (isset($_GET["oracle"])) {
 		));
 	}
 
-	function limit1($query, $where) {
-		return " $query$where";
+	function limit1($table, $query, $where, $separator = "\n") {
+		return " $query$where"; //! limit
 	}
 
 	function db_collation($db, $collations) {

adminer/drivers/pgsql.inc.php

@@ -37,7 +37,15 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function quote($string) {
-				return "'" . pg_escape_string($this->_link, $string) . "'"; //! bytea
+				return "'" . pg_escape_string($this->_link, $string) . "'";
+			}
+
+			function value($val, $field) {
+				return ($field["type"] == "bytea" ? pg_unescape_bytea($val) : $val);
+			}
+
+			function quoteBinary($string) {
+				return "'" . pg_escape_bytea($this->_link, $string) . "'";
 			}
 
 			function select_db($database) {
@@ -89,6 +97,10 @@ if (isset($_GET["pgsql"])) {
 				}
 				return pg_fetch_result($result->_result, 0, $field);
 			}
+
+			function warnings() {
+				return h(pg_last_notice($this->_link)); // second parameter is available since PHP 7.1.0
+			}
 		}
 
 		class Min_Result {
@@ -143,6 +155,18 @@ if (isset($_GET["pgsql"])) {
 				return ($adminer->database() == $database);
 			}
 
+			function value($val, $field) {
+				return $val;
+			}
+
+			function quoteBinary($s) {
+				return q($s);
+			}
+
+			function warnings() {
+				return ''; // not implemented in PDO_PgSQL as of PHP 7.2.1
+			}
+
 			function close() {
 			}
 		}
@@ -173,6 +197,36 @@ if (isset($_GET["pgsql"])) {
 			return true;
 		}
 
+		function convertSearch($idf, $val, $field) {
+			return (preg_match('~char|text' . (is_numeric($val["val"]) && !preg_match('~LIKE~', $val["op"]) ? '|' . 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);
+		}
+
+		function warnings() {
+			return $this->_conn->warnings();
+		}
+
+		function tableHelp($name) {
+			$links = array(
+				"information_schema" => "infoschema",
+				"pg_catalog" => "catalog",
+			);
+			$link = $links[$_GET["ns"]];
+			if ($link) {
+				return "$link-" . str_replace("_", "-", $name) . ".html";
+			}
+		}
+
 	}
 
 
@@ -186,12 +240,20 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function connect() {
-		global $adminer;
+		global $adminer, $types, $structured_types;
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
-			if ($connection->server_info >= 9) {
+			if (min_version(9, 0, $connection)) {
 				$connection->query("SET application_name = 'Adminer'");
+				if (min_version(9.2, 0, $connection)) {
+					$structured_types[lang('Strings')][] = "json";
+					$types["json"] = 4294967295;
+					if (min_version(9.4, 0, $connection)) {
+						$structured_types[lang('Strings')][] = "jsonb";
+						$types["jsonb"] = 4294967295;
+					}
+				}
 			}
 			return $connection;
 		}
@@ -199,15 +261,18 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database ORDER BY datname");
+		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
 		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
-	function limit1($query, $where) {
-		return " $query$where";
+	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)"
+		);
 	}
 
 	function db_collation($db, $collations) {
@@ -244,10 +309,10 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN 'table' WHEN 'mv' THEN 'materialized view' WHEN 'f' THEN 'foreign table' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids::int AS \"Oid\", reltuples as \"Rows\"
-FROM pg_class
-WHERE relkind IN ('r','v','mv','f')
-AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
+		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
+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')
 " . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
 		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
@@ -296,7 +361,7 @@ ORDER BY a.attnum"
 			$row["auto_increment"] = 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][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2];
+				$row["default"] = ($match[1] == "NULL" ? null : (($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2]));
 			}
 			$return[$row["field"]] = $row;
 		}
@@ -311,9 +376,9 @@ 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 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["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX"));
+			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
 			$return[$relname]["columns"] = array();
 			foreach (explode(" ", $row["indkey"]) as $indkey) {
 				$return[$relname]["columns"][] = $columns[$indkey];
@@ -330,7 +395,7 @@ ORDER BY a.attnum"
 	function foreign_keys($table) {
 		global $on_actions;
 		$return = array();
-		foreach (get_rows("SELECT conname, pg_get_constraintdef(oid) AS definition
+		foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
 FROM pg_constraint
 WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema())
 AND contype = 'f'::char
@@ -352,7 +417,9 @@ ORDER BY conkey, conname") as $row) {
 
 	function view($name) {
 		global $connection;
-		return array("select" => $connection->result("SELECT pg_get_viewdef(" . q($name) . ")"));
+		return array("select" => trim($connection->result("SELECT view_definition
+FROM information_schema.views
+WHERE table_schema = current_schema() AND table_name = " . q($name))));
 	}
 
 	function collations() {
@@ -488,7 +555,7 @@ ORDER BY conkey, conname") as $row) {
 
 	function drop_tables($tables) {
 		foreach ($tables as $table) {
-		    $status = table_status($table);
+				$status = table_status($table);
 				if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
 					return false;
 				}
@@ -506,18 +573,21 @@ ORDER BY conkey, conname") as $row) {
 		return true;
 	}
 
-	function trigger($name) {
+	function trigger($name, $table = null) {
 		if ($name == "") {
 			return array("Statement" => "EXECUTE PROCEDURE ()");
 		}
-		$rows = get_rows('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . q($_GET["trigger"]) . ' AND trigger_name = ' . q($name));
+		if ($table === null) {
+			$table = $_GET['trigger'];
+		}
+		$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);
 	}
 
 	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["condition_timing"], $row["event_manipulation"]);
+			$return[$row["trigger_name"]] = array($row["action_timing"], $row["event_manipulation"]);
 		}
 		return $return;
 	}
@@ -530,30 +600,36 @@ ORDER BY conkey, conname") as $row) {
 		);
 	}
 
-	/*
 	function routine($name, $type) {
-		//! there can be more functions with the same name differing only in parameters, it must be also passed to DROP FUNCTION
-		//! no procedures, only functions
-		//! different syntax of CREATE FUNCTION
-		$rows = get_rows('SELECT pg_catalog.format_type(p.prorettype, NULL) AS "returns", p.prosrc AS "definition"
-FROM pg_catalog.pg_namespace n
-JOIN pg_catalog.pg_proc p ON p.pronamespace = n.oid
-WHERE n.nspname = current_schema() AND p.proname = ' . q($name));
-		$rows[0]["fields"] = array(); //!
-		return $rows[0];
+		$rows = get_rows('SELECT routine_definition AS definition, LOWER(external_language) AS language, *
+FROM information_schema.routines
+WHERE routine_schema = current_schema() AND specific_name = ' . q($name));
+		$return = $rows[0];
+		$return["returns"] = array("type" => $return["type_udt_name"]);
+		$return["fields"] = get_rows('SELECT parameter_name AS field, data_type AS type, character_maximum_length AS length, parameter_mode AS inout
+FROM information_schema.parameters
+WHERE specific_schema = current_schema() AND specific_name = ' . q($name) . '
+ORDER BY ordinal_position');
+		return $return;
 	}
-	*/
 
 	function routines() {
-		return get_rows('SELECT p.proname AS "ROUTINE_NAME", p.proargtypes AS "ROUTINE_TYPE", pg_catalog.format_type(p.prorettype, NULL) AS "DTD_IDENTIFIER"
-FROM pg_catalog.pg_namespace n
-JOIN pg_catalog.pg_proc p ON p.pronamespace = n.oid
-WHERE n.nspname = current_schema()
-ORDER BY p.proname');
+		return get_rows('SELECT specific_name AS "SPECIFIC_NAME", routine_type AS "ROUTINE_TYPE", routine_name AS "ROUTINE_NAME", type_udt_name AS "DTD_IDENTIFIER"
+FROM information_schema.routines
+WHERE routine_schema = current_schema()
+ORDER BY SPECIFIC_NAME');
 	}
 
 	function routine_languages() {
-		return get_vals("SELECT langname FROM pg_catalog.pg_language");
+		return get_vals("SELECT LOWER(lanname) FROM pg_catalog.pg_language");
+	}
+
+	function routine_id($name, $row) {
+		$return = array();
+		foreach ($row["fields"] as $field) {
+			$return[] = $field["type"];
+		}
+		return idf_escape($name) . "(" . implode(", ", $return) . ")";
 	}
 
 	function last_id() {
@@ -606,6 +682,97 @@ AND typelem = 0"
 		return $return;
 	}
 
+	function create_sql($table, $auto_increment, $style) {
+		global $connection;
+		$return = '';
+		$return_parts = array();
+		$sequences = array();
+
+		$status = table_status($table);
+		$fields = fields($table);
+		$indexes = indexes($table);
+		ksort($indexes);
+		$fkeys = foreign_keys($table);
+		ksort($fkeys);
+
+		if (!$status || empty($fields)) {
+			return false;
+		}
+
+		$return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n    ";
+
+		// fields' definitions
+		foreach ($fields as $field_name => $field) {
+			$part = idf_escape($field['field']) . ' ' . $field['full_type']
+				. (is_null($field['default']) ? "" : " DEFAULT $field[default]")
+				. ($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];";
+			}
+		}
+
+		// adding sequences before table definition
+		if (!empty($sequences)) {
+			$return = implode("\n\n", $sequences) . "\n\n$return";
+		}
+
+		// primary + unique keys
+		foreach ($indexes as $index_name => $index) {
+			switch($index['type']) {
+				case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+				case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+			}
+		}
+
+		// foreign keys
+		foreach ($fkeys as $fkey_name => $fkey) {
+			$return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+		}
+
+		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
+
+		// "basic" indexes after table definition
+		foreach ($indexes as $index_name => $index) {
+			if ($index['type'] == 'INDEX') {
+				$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'])) . ");";
+			}
+		}
+
+		// coments for table & fields
+		if ($status['Comment']) {
+			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
+		}
+
+		foreach ($fields as $field_name => $field) {
+			if ($field['comment']) {
+				$return .= "\n\nCOMMENT ON COLUMN " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . "." . idf_escape($field_name) . " IS " . q($field['comment']) . ";";
+			}
+		}
+
+		return rtrim($return, ';');
+	}
+
+	function truncate_sql($table) {
+		return "TRUNCATE " . table($table);
+	}
+
+	function trigger_sql($table) {
+		$status = table_status($table);
+		$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 $return;
+	}
+
+
 	function use_sql($database) {
 		return "\connect " . idf_escape($database);
 	}
@@ -615,8 +782,7 @@ AND typelem = 0"
 	}
 
 	function process_list() {
-		global $connection;
-		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . ($connection->server_info < 9.2 ? "procpid" : "pid"));
+		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
 
 	function show_status() {
@@ -630,8 +796,20 @@ 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);
+	}
+
+	function kill_process($val) {
+		return queries("SELECT pg_terminate_backend(" . number($val) . ")");
+	}
+
+	function connection_id(){
+		return "SELECT pg_backend_pid()";
+	}
+
+	function max_connections() {
 		global $connection;
-		return preg_match('~^(database|table|columns|sql|indexes|comment|view|' . ($connection->server_info >= 9.3 ? 'materializedview|' : '') . 'scheme|processlist|sequence|trigger|type|variables|drop_col)$~', $feature); //! routine|
+		return $connection->result("SHOW max_connections");
 	}
 
 	$jush = "pgsql";
@@ -657,7 +835,7 @@ AND typelem = 0"
 			"char" => "md5",
 			"date|time" => "now",
 		), array(
-			"int|numeric|real|money" => "+/-",
+			number_type() => "+/-",
 			"date|time" => "+ interval/- interval", //! escape
 			"char|text" => "||",
 		)

adminer/drivers/simpledb.inc.php

@@ -2,10 +2,10 @@
 $drivers["simpledb"] = "SimpleDB";
 
 if (isset($_GET["simpledb"])) {
-	$possible_drivers = array("SimpleXML");
+	$possible_drivers = array("SimpleXML + allow_url_fopen");
 	define("DRIVER", "simpledb");
 
-	if (class_exists('SimpleXMLElement')) {
+	if (class_exists('SimpleXMLElement') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
 			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_result;
 

adminer/drivers/sqlite.inc.php

@@ -184,11 +184,13 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 			function __construct() {
 				parent::__construct(":memory:");
+				$this->query("PRAGMA foreign_keys = 1");
 			}
 
 			function select_db($filename) {
 				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");
 					return true;
 				}
 				return false;
@@ -216,6 +218,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
 		}
 
+		function tableHelp($name) {
+			if ($name == "sqlite_sequence") {
+				return "fileformat2.html#seqtab";
+			}
+			if ($name == "sqlite_master") {
+				return "fileformat2.html#$name";
+			}
+		}
+
 	}
 
 
@@ -240,9 +251,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
-	function limit1($query, $where) {
+	function limit1($table, $query, $where, $separator = "\n") {
 		global $connection;
-		return ($connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')") ? limit($query, $where, 1) : " $query$where");
+		return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
+			? limit($query, $where, 1, 0, $separator)
+			: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" //! use primary key in tables with WITHOUT rowid
+		);
 	}
 
 	function db_collation($db, $collations) {
@@ -269,9 +283,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function table_status($name = "") {
 		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
-			$row["Oid"] = 1;
-			$row["Auto_increment"] = "";
+		foreach (get_rows("SELECT name AS Name, type AS Engine, 'rowid' AS Oid, '' AS Auto_increment FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
 			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
 		}
@@ -334,9 +346,9 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		$return = array();
 		$sql = $connection2->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
-		if (preg_match('~\bPRIMARY\s+KEY\s*\((([^)"]+|"[^"]*")++)~i', $sql, $match)) {
+		if (preg_match('~\bPRIMARY\s+KEY\s*\((([^)"]+|"[^"]*"|`[^`]*`)++)~i', $sql, $match)) {
 			$return[""] = array("type" => "PRIMARY", "columns" => array(), "lengths" => array(), "descs" => array());
-			preg_match_all('~((("[^"]*+")+)|(\S+))(\s+(ASC|DESC))?(,\s*|$)~i', $match[1], $matches, PREG_SET_ORDER);
+			preg_match_all('~((("[^"]*+")+|(?:`[^`]*+`)+)|(\S+))(\s+(ASC|DESC))?(,\s*|$)~i', $match[1], $matches, PREG_SET_ORDER);
 			foreach ($matches as $match) {
 				$return[""]["columns"][] = idf_unescape($match[2]) . $match[4];
 				$return[""]["descs"][] = (preg_match('~DESC~i', $match[5]) ? '1' : null);
@@ -504,6 +516,9 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
+					if ($indexes) {
+						$field["auto_increment"] = 0;
+					}
 					$fields[] = process_field($field, $field);
 					$originals[$key] = idf_escape($key);
 				}
@@ -669,18 +684,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		);
 	}
 
-	function routine($name, $type) {
-		// not supported by SQLite
-	}
-
-	function routines() {
-		// not supported by SQLite
-	}
-
-	function routine_languages() {
-		// not supported by SQLite
-	}
-
 	function begin() {
 		return queries("BEGIN");
 	}
@@ -713,7 +716,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return true;
 	}
 
-	function create_sql($table, $auto_increment) {
+	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
 		foreach (indexes($table) as $name => $index) {
@@ -732,7 +735,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function use_sql($database) {
 	}
 
-	function trigger_sql($table, $style) {
+	function trigger_sql($table) {
 		return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)));
 	}
 

adminer/dump.inc.php

@@ -92,7 +92,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 							$fields = fields($name);
 							$adminer->dumpData($name, $_POST["data_style"], "SELECT *" . convert_fields($fields, $fields) . " FROM " . table($name));
 						}
-						if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name, $_POST["table_style"]))) {
+						if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name))) {
 							echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
 						}
 
@@ -165,12 +165,13 @@ echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style,
 
 <table cellspacing="0">
 <?php
+echo script("qsl('table').onclick = dumpClick;");
 $prefixes = array();
 if (DB != "") {
 	$checked = ($TABLE != "" ? "" : " checked");
 	echo "<thead><tr>";
-	echo "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked onclick='formCheck(this, /^tables\\[/);'>" . lang('Tables') . "</label>";
-	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked onclick='formCheck(this, /^data\\[/);'></label>";
+	echo "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked>" . lang('Tables') . "</label>" . script("qs('#check-tables').onclick = partial(formCheck, /^tables\\[/);", "");
+	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked></label>" . script("qs('#check-data').onclick = partial(formCheck, /^data\\[/);", "");
 	echo "</thead>\n";
 
 	$views = "";
@@ -178,28 +179,31 @@ if (DB != "") {
 	foreach ($tables_list as $name => $type) {
 		$prefix = preg_replace('~_.*~', '', $name);
 		$checked = ($TABLE == "" || $TABLE == (substr($TABLE, -1) == "%" ? "$prefix%" : $name)); //! % may be part of table name
-		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "checkboxClick(event, this); formUncheck('check-tables');", "block");
+		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "", "block");
 		if ($type !== null && !preg_match('~table~i', $type)) {
 			$views .= "$print\n";
 		} else {
-			echo "$print<td align='right'><label class='block'><span id='Rows-" . h($name) . "'></span>" . checkbox("data[]", $name, $checked, "", "checkboxClick(event, this); formUncheck('check-data');") . "</label>\n";
+			echo "$print<td align='right'><label class='block'><span id='Rows-" . h($name) . "'></span>" . checkbox("data[]", $name, $checked) . "</label>\n";
 		}
 		$prefixes[$prefix]++;
 	}
 	echo $views;
 
 	if ($tables_list) {
-		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+		echo script("ajaxSetHtml('" . js_escape(ME) . "script=db');");
 	}
 
 } else {
-	echo "<thead><tr><th style='text-align: left;'><label class='block'><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . " onclick='formCheck(this, /^databases\\[/);'>" . lang('Database') . "</label></thead>\n";
+	echo "<thead><tr><th style='text-align: left;'>";
+	echo "<label class='block'><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . ">" . lang('Database') . "</label>";
+	echo script("qs('#check-databases').onclick = partial(formCheck, /^databases\\[/);", "");
+	echo "</thead>\n";
 	$databases = $adminer->databases();
 	if ($databases) {
 		foreach ($databases as $db) {
 			if (!information_schema($db)) {
 				$prefix = preg_replace('~_.*~', '', $db);
-				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "formUncheck('check-databases');", "block") . "\n";
+				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "", "block") . "\n";
 				$prefixes[$prefix]++;
 			}
 		}

adminer/edit.inc.php

@@ -1,7 +1,7 @@
 <?php
 $TABLE = $_GET["edit"];
 $fields = fields($TABLE);
-$where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
+$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) == "") {
@@ -82,9 +82,13 @@ if ($_POST["save"]) {
 	}
 	if ($select) {
 		$result = $driver->select($TABLE, $select, array($where), $select, array(), (isset($_GET["select"]) ? 2 : 1));
-		$row = $result->fetch_assoc();
-		if (!$row) { // MySQLi returns null
-			$row = false;
+		if (!$result) {
+			$error = error();
+		} else {
+			$row = $result->fetch_assoc();
+			if (!$row) { // MySQLi returns null
+				$row = false;
+			}
 		}
 		if (isset($_GET["select"]) && (!$row || $result->fetch_assoc())) { // $result->num_rows != 1 isn't available in all drivers
 			$row = null;

adminer/event.inc.php

@@ -47,6 +47,6 @@ if (!$row && $EVENT != "") {
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/file.inc.php

@@ -6,6 +6,7 @@ if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
 
 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");
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
@@ -18,7 +19,7 @@ if ($_GET["file"] == "favicon.ico") {
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {

adminer/foreign.inc.php

@@ -7,13 +7,15 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 	$message = ($_POST["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
 	$location = ME . "table=" . urlencode($TABLE);
 	
-	$row["source"] = array_filter($row["source"], 'strlen');
-	ksort($row["source"]); // enforce input order
-	$target = array();
-	foreach ($row["source"] as $key => $val) {
-		$target[$key] = $row["target"][$key];
+	if (!$_POST["drop"]) {
+		$row["source"] = array_filter($row["source"], 'strlen');
+		ksort($row["source"]); // enforce input order
+		$target = array();
+		foreach ($row["source"] as $key => $val) {
+			$target[$key] = $row["target"][$key];
+		}
+		$row["target"] = $target;
 	}
-	$row["target"] = $target;
 	
 	if ($jush == "sqlite") {
 		queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
@@ -60,13 +62,13 @@ $referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
-<thead><tr><th><?php echo lang('Source'); ?><th><?php echo lang('Target'); ?></thead>
+<thead><tr><th id="label-source"><?php echo lang('Source'); ?><th id="label-target"><?php echo lang('Target'); ?></thead>
 <?php
 $j = 0;
 foreach ($row["source"] as $key => $val) {
 	echo "<tr>";
-	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1));
-	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key]);
+	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : 1), "label-source");
+	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
 	$j++;
 }
 ?>
@@ -76,6 +78,7 @@ foreach ($row["source"] as $key => $val) {
  <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $on_actions), $row["on_update"]); ?>
 <?php echo doc_link(array(
 	'sql' => "innodb-foreign-key-constraints.html",
+	'mariadb' => "foreign-keys/",
 	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
 	'mssql' => "ms174979.aspx",
 	'oracle' => "clauses002.htm#sthref2903",
@@ -84,6 +87,6 @@ foreach ($row["source"] as $key => $val) {
 <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(); ?>><?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

@@ -9,7 +9,7 @@ class Adminer {
 	* @return string HTML code
 	*/
 	function name() {
-		return "<a href='https://www.adminer.org/' target='_blank' id='h1'>Adminer</a>";
+		return "<a href='https://www.adminer.org/'" . target_blank() . " id='h1'>Adminer</a>";
 	}
 
 	/** Connection parameters
@@ -19,6 +19,12 @@ class Adminer {
 		return array(SERVER, $_GET["username"], get_password());
 	}
 
+	/** Get SSL connection options
+	* @return array array("key" => filename, "cert" => filename, "ca" => filename) or null
+	*/
+	function connectSsl() {
+	}
+
 	/** Get key used for permanent login
 	* @param bool
 	* @return string cryptic string which gets combined with password or false in case of an error
@@ -33,6 +39,14 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
+	
+	/** Get server name displayed in breadcrumbs
+	* @param string
+	* @return string HTML code or null
+	*/
+	function serverName($server) {
+		return h($server);
+	}
 
 	/** Identifier of selected database
 	* @return string
@@ -65,14 +79,20 @@ class Adminer {
 	}
 
 	/** Headers to send before HTML output
-	* @return bool true to send security headers
+	* @return null
 	*/
 	function headers() {
-		return true;
+	}
+
+	/** Get Content Security Policy headers
+	* @return array of arrays with directive name in key, allowed sources in value
+	*/
+	function csp() {
+		return csp();
 	}
 
 	/** Print HTML code inside <head>
-	* @return bool true to link adminer.css if exists
+	* @return bool true to link favicon.ico and adminer.css if exists
 	*/
 	function head() {
 		?>
@@ -81,6 +101,18 @@ class Adminer {
 		return true;
 	}
 
+	/** Get URLs of the CSS files
+	* @return array of strings
+	*/
+	function css() {
+		$return = array();
+		$filename = "adminer.css";
+		if (file_exists($filename)) {
+			$return[] = $filename;
+		}
+		return $return;
+	}
+
 	/** Print login form
 	* @return null
 	*/
@@ -88,18 +120,14 @@ class Adminer {
 		global $drivers;
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('System'); ?><td><?php echo html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"); ?>
+<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>
-<script type="text/javascript">
-var username = document.getElementById('username');
-focus(username);
-username.form['auth[driver]'].onchange();
-</script>
 <?php
+		echo script("focus(qs('#username'));"); 
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
@@ -107,9 +135,13 @@ username.form['auth[driver]'].onchange();
 	/** Authorize the user
 	* @param string
 	* @param string
-	* @return bool
+	* @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>');
+		}
 		return true;
 	}
 
@@ -136,6 +168,7 @@ username.form['auth[driver]'].onchange();
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
+		global $jush, $driver;
 		echo '<p class="links">';
 		$links = array("select" => lang('Select data'));
 		if (support("table") || support("indexes")) {
@@ -151,9 +184,11 @@ username.form['auth[driver]'].onchange();
 		if ($set !== null) {
 			$links["edit"] = lang('New item');
 		}
+		$name = $tableStatus["Name"];
 		foreach ($links as $key => $val) {
-			echo " <a href='" . h(ME) . "$key=" . urlencode($tableStatus["Name"]) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
+			echo " <a href='" . h(ME) . "$key=" . urlencode($name) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
 		}
+		echo doc_link(array($jush => $driver->tableHelp($name)), "?");
 		echo "\n";
 	}
 
@@ -184,17 +219,34 @@ username.form['auth[driver]'].onchange();
 
 	/** Query printed in select before execution
 	* @param string query to be executed
-	* @param string elapsed time
+	* @param float start time of the query
+	* @param bool
 	* @return string
 	*/
-	function selectQuery($query, $time) {
-		global $jush;
-		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
+	function selectQuery($query, $start, $failed = false) {
+		global $jush, $driver;
+		$return = "</p>\n"; // required for IE9 inline edit
+		if (!$failed && ($warnings = $driver->warnings())) {
+			$id = "warnings";
+			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
+			;
+		}
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
 			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
-			. "</p>" // </p> - required for IE9 inline edit
+			. $return
 		;
 	}
 
+	/** Query printed in SQL command before execution
+	* @param string query to be executed
+	* @return string escaped query to be printed
+	*/
+	function sqlCommandQuery($query)
+	{
+		return shorten_utf8(trim($query), 1000);
+	}
+
 	/** Description of a row in a table
 	* @param string
 	* @return string SQL expression, empty string for no description
@@ -228,11 +280,14 @@ username.form['auth[driver]'].onchange();
 	* @return string
 	*/
 	function selectVal($val, $link, $field, $original) {
-		$return = ($val === null ? "<i>NULL</i>" : (preg_match("~char|binary~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "<code>$val</code>" : $val));
+		$return = ($val === null ? "<i>NULL</i>" : (preg_match("~char|binary|boolean~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "<code>$val</code>" : $val));
 		if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
-			$return = lang('%d byte(s)', strlen($original));
+			$return = "<i>" . lang('%d byte(s)', strlen($original)) . "</i>";
 		}
-		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? " rel='noreferrer'" : "") . ">$return</a>" : $return);
+		if (preg_match('~json~', $field["type"])) {
+			$return = "<code class='jush-js'>$return</code>";
+		}
+		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -244,6 +299,45 @@ username.form['auth[driver]'].onchange();
 		return $val;
 	}
 
+	/** Print table structure in tabular format
+	* @param array data about individual fields
+	* @return null
+	*/
+	function tableStructurePrint($fields) {
+		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) {
+			echo "<tr" . odd() . "><th>" . h($field["field"]);
+			echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
+			echo ($field["null"] ? " <i>NULL</i>" : "");
+			echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
+			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
+			echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
+			echo "\n";
+		}
+		echo "</table>\n";
+	}
+
+	/** Print list of indexes on table in tabular format
+	* @param array data about all indexes on a table
+	* @return null
+	*/
+	function tableIndexesPrint($indexes) {
+		echo "<table cellspacing='0'>\n";
+		foreach ($indexes as $name => $index) {
+			ksort($index["columns"]); // enforce correct columns order
+			$print = array();
+			foreach ($index["columns"] as $key => $val) {
+				$print[] = "<i>" . h($val) . "</i>"
+					. ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
+					. ($index["descs"][$key] ? " DESC" : "")
+				;
+			}
+			echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
+		}
+		echo "</table>\n";
+	}
+
 	/** Print columns box in select
 	* @param array result of selectColumnsProcess()[0]
 	* @param array selectable columns
@@ -256,9 +350,16 @@ username.form['auth[driver]'].onchange();
 		$select[""] = array();
 		foreach ($select as $key => $val) {
 			$val = $_GET["columns"][$key];
-			$column = select_input(" name='columns[$i][col]' onchange='" . ($key !== ""  ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";'", $columns, $val["col"]);
-			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]' onchange='helpClose();" . ($key !== "" ? "" : " this.nextSibling.nextSibling.onchange();") . "'"
-				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1) . ">" . optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
+			$column = select_input(
+				" name='columns[$i][col]'",
+				$columns,
+				$val["col"],
+				($key !== "" ? "selectFieldChange" : "selectAddRow")
+			);
+			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
+				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
+				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
+				. script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
 				. "($column)" : $column) . "</div>\n";
 			$i++;
 		}
@@ -275,21 +376,27 @@ username.form['auth[driver]'].onchange();
 		print_fieldset("search", lang('Search'), $where);
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
-				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
-				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "' onchange='selectFieldChange(this.form);'>";
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
+				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
+				echo script("qsl('input').oninput = selectFieldChange;", "");
 				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
-				echo "<br>\n";
+				echo "</div>\n";
 			}
 		}
-		$_GET["where"] = (array) $_GET["where"];
-		reset($_GET["where"]);
-		$change_next = "this.nextSibling.onchange();";
-		for ($i = 0; $i <= count($_GET["where"]); $i++) {
-			list(, $val) = each($_GET["where"]);
+		$change_next = "this.parentNode.firstChild.onchange();";
+		foreach (array_merge((array) $_GET["where"], array(array())) as $i => $val) {
 			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
-				echo "<div>" . select_input(" name='where[$i][col]' onchange='$change_next'", $columns, $val["col"], "(" . lang('anywhere') . ")");
+				echo "<div>" . select_input(
+					" name='where[$i][col]'",
+					$columns,
+					$val["col"],
+					($val ? "selectFieldChange" : "selectAddRow"),
+					"(" . lang('anywhere') . ")"
+				);
 				echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
-				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onkeydown='selectSearchKeydown(this, event);' onsearch='selectSearchSearch(this);'></div>\n";
+				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>";
+				echo script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", "");
+				echo "</div>\n";
 			}
 		}
 		echo "</div></fieldset>\n";
@@ -306,12 +413,12 @@ username.form['auth[driver]'].onchange();
 		$i = 0;
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if ($val != "") {
-				echo "<div>" . select_input(" name='order[$i]' onchange='selectFieldChange(this.form);'", $columns, $val);
+				echo "<div>" . select_input(" name='order[$i]'", $columns, $val, "selectFieldChange");
 				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
 				$i++;
 			}
 		}
-		echo "<div>" . select_input(" name='order[$i]' onchange='selectAddRow(this);'", $columns);
+		echo "<div>" . select_input(" name='order[$i]'", $columns, "", "selectAddRow");
 		echo checkbox("desc[$i]", 1, false, lang('descending')) . "</div>\n";
 		echo "</div></fieldset>\n";
 	}
@@ -322,7 +429,8 @@ username.form['auth[driver]'].onchange();
 	*/
 	function selectLimitPrint($limit) {
 		echo "<fieldset><legend>" . lang('Limit') . "</legend><div>"; // <div> for easy styling
-		echo "<input type='number' name='limit' class='size' value='" . h($limit) . "' onchange='selectFieldChange(this.form);'>";
+		echo "<input type='number' name='limit' class='size' value='" . h($limit) . "'>";
+		echo script("qsl('input').oninput = selectFieldChange;", "");
 		echo "</div></fieldset>\n";
 	}
 
@@ -346,12 +454,13 @@ username.form['auth[driver]'].onchange();
 		echo "<fieldset><legend>" . lang('Action') . "</legend><div>";
 		echo "<input type='submit' value='" . lang('Select') . "'>";
 		echo " <span id='noindex' title='" . lang('Full table scan') . "'></span>";
-		echo "<script type='text/javascript'>\n";
+		echo "<script" . nonce() . ">\n";
 		echo "var indexColumns = ";
 		$columns = array();
 		foreach ($indexes as $index) {
-			if ($index["type"] != "FULLTEXT") {
-				$columns[reset($index["columns"])] = 1;
+			$current_key = reset($index["columns"]);
+			if ($index["type"] != "FULLTEXT" && $current_key) {
+				$columns[$current_key] = 1;
 			}
 		}
 		$columns[""] = 1;
@@ -359,7 +468,7 @@ username.form['auth[driver]'].onchange();
 			json_row($key);
 		}
 		echo ";\n";
-		echo "selectFieldChange(document.getElementById('form'));\n";
+		echo "selectFieldChange.call(qs('#form')['select']);\n";
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
@@ -412,15 +521,16 @@ username.form['auth[driver]'].onchange();
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $connection, $jush;
+		global $connection, $driver;
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
 				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-		foreach ((array) $_GET["where"] as $val) {
+		foreach ((array) $_GET["where"] as $key => $val) {
 			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
+				$prefix = "";
 				$cond = " $val[op]";
 				if (preg_match('~IN$~', $val["op"])) {
 					$in = process_length($val["val"]);
@@ -431,24 +541,25 @@ username.form['auth[driver]'].onchange();
 					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
 				} elseif ($val["op"] == "ILIKE %%") {
 					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+				} elseif ($val["op"] == "FIND_IN_SET") {
+					$prefix = "$val[op](" . q($val["val"]) . ", ";
+					$cond = ")";
 				} elseif (!preg_match('~NULL$~', $val["op"])) {
 					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
 				}
 				if ($val["col"] != "") {
-					$return[] = idf_escape($val["col"]) . $cond;
+					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						$is_text = preg_match('~char|text|enum|set~', $field["type"]);
-						if ((is_numeric($val["val"]) || !preg_match('~(^|[^o])int|float|double|decimal|bit~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || $is_text)
+						if ((is_numeric($val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
 						) {
-							$name = idf_escape($name);
-							$cols[] = ($jush == "sql" && $is_text && !preg_match("~^utf8_~", $field["collation"]) ? "CONVERT($name USING " . charset($connection) . ")" : $name);
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
 					}
-					$return[] = ($cols ? "(" . implode("$cond OR ", $cols) . "$cond)" : "0");
+					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
@@ -511,19 +622,28 @@ username.form['auth[driver]'].onchange();
 	/** Query printed after execution in the message
 	* @param string executed query
 	* @param string elapsed time
+	* @param bool
 	* @return string
 	*/
-	function messageQuery($query, $time) {
-		global $jush;
+	function messageQuery($query, $time, $failed = false) {
+		global $jush, $driver;
 		restart_session();
 		$history = &get_session("queries");
-		$id = "sql-" . count($history[$_GET["db"]]);
+		if (!$history[$_GET["db"]]) {
+			$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
 		}
 		$history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
-		return " <span class='time'>" . @date("H:i:s") . "</span> <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a>" // @ - time zone may be not set
-			. "<div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre>'
+		$sql_id = "sql-" . count($history[$_GET["db"]]);
+		$return = "<a href='#$sql_id' class='toggle'>" . lang('SQL command') . "</a>\n";
+		if (!$failed && ($warnings = $driver->warnings())) {
+			$id = "warnings-" . count($history[$_GET["db"]]);
+			$return = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
+		}
+		return " <span class='time'>" . @date("H:i:s") . "</span>" // @ - time zone may be not set
+			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . "</code></pre>"
 			. ($time ? " <span class='time'>($time)</span>" : '')
 			. (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
 			. '</div>'
@@ -572,6 +692,16 @@ username.form['auth[driver]'].onchange();
 		return "";
 	}
 
+	/** Get hint for edit field
+	* @param string table name
+	* @param array single field from fields()
+	* @param string
+	* @return string
+	*/
+	function editHint($table, $field, $value) {
+		return "";
+	}
+
 	/** Process sent input
 	* @param array single field from fields()
 	* @param string
@@ -591,7 +721,7 @@ username.form['auth[driver]'].onchange();
 		} 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);
+			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+\$~i", $value) ? $value : $return);
 		} elseif (preg_match('~^(addtime|subtime|concat)$~', $function)) {
 			$return = "$function(" . idf_escape($name) . ", $return)";
 		} elseif (preg_match('~^(md5|sha1|password|encrypt)$~', $function)) {
@@ -645,7 +775,7 @@ username.form['auth[driver]'].onchange();
 				}
 				$create = "CREATE TABLE " . table($table) . " (" . implode(", ", $fields) . ")";
 			} else {
-				$create = create_sql($table, $_POST["auto_increment"]);
+				$create = create_sql($table, $_POST["auto_increment"], $style);
 			}
 			set_utf8mb4($create);
 			if ($style && $create) {
@@ -707,7 +837,7 @@ username.form['auth[driver]'].onchange();
 						foreach ($row as $key => $val) {
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
-								? unconvert_field($field, preg_match('~(^|[^o])int|float|double|decimal~', $field["type"]) && $val != '' ? $val : q($val))
+								? unconvert_field($field, preg_match(number_type(), $field["type"]) && $val != '' ? $val : q($val))
 								: "NULL"
 							);
 						}
@@ -758,6 +888,13 @@ username.form['auth[driver]'].onchange();
 		return $ext;
 	}
 
+	/** Set the path of the file for webserver load
+	* @return string path of the sql dump file
+	*/
+	function importServerPath() {
+		return "adminer.sql";
+	}
+
 	/** Print homepage
 	* @return bool whether to print default homepage
 	*/
@@ -778,7 +915,7 @@ username.form['auth[driver]'].onchange();
 		?>
 <h1>
 <?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
-<a href="https://www.adminer.org/#download" target="_blank" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+<a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php
 		if ($missing == "auth") {
@@ -788,12 +925,12 @@ username.form['auth[driver]'].onchange();
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
 							if ($first) {
-								echo "<p id='logins' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
+								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 != "" ? "@$server" : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
+								echo "<a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
 							}
 						}
 					}
@@ -804,13 +941,14 @@ username.form['auth[driver]'].onchange();
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
+			echo script_src("../externals/jush/modules/jush.js");
+			echo script_src("../externals/jush/modules/jush-textarea.js");
+			echo script_src("../externals/jush/modules/jush-txt.js");
+			echo script_src("../externals/jush/modules/jush-js.js");
 			if (support("sql")) {
+				echo script_src("../externals/jush/modules/jush-$jush.js");
 				?>
-<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
-<script type="text/javascript">
+<script<?php echo nonce(); ?>>
 <?php
 				if ($tables) {
 					$links = array();
@@ -822,8 +960,9 @@ username.form['auth[driver]'].onchange();
 						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
 				}
+				$server_info = $connection->server_info;
 				?>
-bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');
+bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\\d\\.?\\d).*~s', '\\1', $server_info) : ""); ?>'<?php echo (preg_match('~MariaDB~', $server_info) ? ", true" : ""); ?>);
 </script>
 <?php
 			}
@@ -857,15 +996,15 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 <p id="dbs">
 <?php
 		hidden_fields_get();
-		$db_events = " onmousedown='dbMouseDown(event, this);' onchange='dbChange(this);'";
-		echo "<span title='" . lang('database') . "'>DB</span>: " . ($databases
-			? "<select name='db'$db_events>" . optionlist(array("" => "") + $databases, DB) . "</select>"
-			: '<input name="db" value="' . h(DB) . '" autocapitalize="off">'
+		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+		echo "<span title='" . lang('database') . "'>" . lang('DB') . "</span>: " . ($databases
+			? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
+			: "<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")) {
-				echo "<br>" . lang('Schema') . ": <select name='ns'$db_events>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>";
+				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
@@ -884,17 +1023,20 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 	* @return null
 	*/
 	function tablesPrint($tables) {
-		echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
+		echo "<ul id='tables'>" . script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
 		foreach ($tables as $table => $status) {
-			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
 			$name = $this->tableName($status);
-			echo (support("table") || support("indexes")
-				? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
-					. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : ""), "structure")
-					. " title='" . lang('Show structure') . "'>$name</a>"
-				: "<span>$name</span>"
-			) . "<br>\n";
+			if ($name != "") {
+				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
+				echo (support("table") || support("indexes")
+					? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
+						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
+						. " title='" . lang('Show structure') . "'>$name</a>"
+					: "<span>$name</span>"
+				) . "\n";
+			}
 		}
+		echo "</ul>\n";
 	}
 
 }

adminer/include/auth.inc.php

@@ -17,15 +17,10 @@ if ($_COOKIE["adminer_permanent"]) {
 
 function add_invalid_login() {
 	global $adminer;
-	$filename = get_temp_dir() . "/adminer.invalid";
-	$fp = @fopen($filename, "r+"); // @ - may not exist
-	if (!$fp) { // c+ is available since PHP 5.2.6
-		$fp = @fopen($filename, "w"); // @ - may not be writable
-		if (!$fp) {
-			return;
-		}
+	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
+	if (!$fp) {
+		return;
 	}
-	flock($fp, LOCK_EX);
 	$invalids = unserialize(stream_get_contents($fp));
 	$time = time();
 	if ($invalids) {
@@ -40,22 +35,21 @@ function add_invalid_login() {
 		$invalid = array($time + 30*60, 0); // active for 30 minutes
 	}
 	$invalid[1]++;
-	$serialized = serialize($invalids);
-	rewind($fp);
-	fwrite($fp, $serialized);
-	ftruncate($fp, strlen($serialized));
-	flock($fp, LOCK_UN);
-	fclose($fp);
+	file_write_unlock($fp, serialize($invalids));
+}
+
+function check_invalid_login() {
+	global $adminer;
+	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
+	$invalid = $invalids[$adminer->bruteForceKey()];
+	$next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
+	if ($next_attempt > 0) { //! do the same with permanent login
+		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
+	}
 }
 
 $auth = $_POST["auth"];
 if ($auth) {
-	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
-	$invalid = $invalids[$adminer->bruteForceKey()];
-	$next_attempt = ($invalid[1] > 30 ? $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)));
-	}
 	session_regenerate_id(); // defense against session fixation
 	$vendor = $auth["driver"];
 	$server = $auth["server"];
@@ -89,7 +83,7 @@ if ($auth) {
 			set_session($key, null);
 		}
 		unset_permanent();
-		redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
+		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 ($permanent && !$_SESSION["pwds"]) {
@@ -120,7 +114,6 @@ function unset_permanent() {
 */
 function auth_error($error) {
 	global $adminer, $has_token;
-	$error = h($error);
 	$session_name = session_name();
 	if (isset($_GET["username"])) {
 		header("HTTP/1.1 403 Forbidden"); // 401 requires sending WWW-Authenticate header
@@ -131,7 +124,7 @@ function auth_error($error) {
 			$password = get_password();
 			if ($password !== null) {
 				if ($password === false) {
-					$error .= '<br>' . lang('Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.', '<code>permanentLogin()</code>');
+					$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);
 			}
@@ -145,10 +138,12 @@ function auth_error($error) {
 	cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
 	echo "<form action='' method='post'>\n";
-	$adminer->loginForm();
 	echo "<div>";
-	hidden_fields($_POST, array("auth")); // expired session
+	if (hidden_fields($_POST, array("auth"))) { // expired session
+		echo "<p class='message'>" . lang('The action will be performed after successful login with the same credentials.') . "\n";
+	}
 	echo "</div>\n";
+	$adminer->loginForm();
 	echo "</form>\n";
 	page_footer("auth");
 	exit;
@@ -162,13 +157,18 @@ if (isset($_GET["username"])) {
 		page_footer("auth");
 		exit;
 	}
+	list($host, $port) = explode(":", SERVER, 2);
+	if (is_numeric($port) && $port < 1024) {
+		auth_error(lang('Connecting to privileged ports is not allowed.'));
+	}
+	check_invalid_login();
 	$connection = connect();
+	$driver = new Min_Driver($connection);
 }
 
-$driver = new Min_Driver($connection);
-
-if (!is_object($connection) || !$adminer->login($_GET["username"], get_password())) {
-	auth_error((is_string($connection) ? $connection : lang('Invalid credentials.')));
+$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.'))));
 }
 
 if ($auth && $_POST["token"]) {

adminer/include/bootstrap.inc.php

@@ -33,11 +33,14 @@ if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { // IIS 7 compatibility
 	$_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");
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
-session_cache_limiter(""); // to allow restarting session and to not send Cache-Control: no-store
 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);
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
@@ -54,7 +57,7 @@ if (get_magic_quotes_runtime()) {
 }
 @set_time_limit(0); // @ - can be disabled
 @ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
-@ini_set("precision", 20); // @ - can be disabled
+@ini_set("precision", 15); // @ - can be disabled, 15 - internal PHP precision
 
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";

adminer/include/connect.inc.php

@@ -12,7 +12,7 @@ function connect_error() {
 		page_header(lang('Select database'), $error, false);
 		echo "<p class='links'>\n";
 		foreach (array(
-			'database' => lang('Create new database'),
+			'database' => lang('Create database'),
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
@@ -29,13 +29,14 @@ function connect_error() {
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
+			echo "<table cellspacing='0' class='checkable'>\n";
+			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
 				. (support("database") ? "<td>&nbsp;" : "")
 				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
 				. "<td>" . lang('Collation')
 				. "<td>" . lang('Tables')
-				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1' onclick=\"return !ajaxSetHtml('" . h(js_escape(ME)) . "script=connect');\">" . lang('Compute') . "</a>"
+				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1'>" . lang('Compute') . "</a>" . script("qsl('a').onclick = partial(ajaxSetHtml, '" . js_escape(ME) . "script=connect');", "")
 				. "</thead>\n"
 			;
 			
@@ -43,8 +44,9 @@ function connect_error() {
 			
 			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
-				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"])) : "");
-				echo "<th><a href='$root'>" . h($db) . "</a>";
+				$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 "<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>";
@@ -54,15 +56,17 @@ function connect_error() {
 			
 			echo "</table>\n";
 			echo (support("database")
-				? "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>\n"
-					. "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^db/));\">\n" // used by trCheck()
-					. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n"
+				? "<div class='footer'>\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"
 				: ""
 			);
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
 			echo "<input type='hidden' name='token' value='$token'>\n";
 			echo "</form>\n";
+			echo script("tableCheck();");
 		}
 	}
 	

adminer/include/design.inc.php

@@ -19,28 +19,50 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <!DOCTYPE html>
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
-<meta name="referrer" content="origin-when-crossorigin">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
-<script type="text/javascript" src="../adminer/static/functions.js"></script>
-<script type="text/javascript" src="static/editing.js"></script>
+<?php echo script_src("../adminer/static/functions.js"); ?>
+<?php echo script_src("static/editing.js"); ?>
 <?php if ($adminer->head()) { ?>
 <link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
 <link rel="apple-touch-icon" href="../adminer/static/favicon.ico">
-<?php if (file_exists("adminer.css")) { ?>
-<link rel="stylesheet" type="text/css" href="adminer.css">
+<?php foreach ($adminer->css() as $css) { ?>
+<link rel="stylesheet" type="text/css" href="<?php echo h($css); ?>">
 <?php } ?>
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
-<script type="text/javascript">
+<body class="<?php echo lang('ltr'); ?> nojs">
+<?php
+	$filename = get_temp_dir() . "/adminer.version";
+	if (!$_COOKIE["adminer_version"] && function_exists('openssl_verify') && file_exists($filename) && filemtime($filename) + 86400 > time()) { // 86400 - 1 day in seconds
+		$version = unserialize(file_get_contents($filename));
+		$public = "-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwqWOVuF5uw7/+Z70djoK
+RlHIZFZPO0uYRezq90+7Amk+FDNd7KkL5eDve+vHRJBLAszF/7XKXe11xwliIsFs
+DFWQlsABVZB3oisKCBEuI71J4kPH8dKGEWR9jDHFw3cWmoH3PmqImX6FISWbG3B8
+h7FIx3jEaw5ckVPVTeo5JRm/1DZzJxjyDenXvBQ/6o9DgZKeNDgxwKzH+sw9/YCO
+jHnq1cFpOIISzARlrHMa/43YfeNRAm/tsBXjSxembBPo7aQZLAWHmaj5+K19H10B
+nCpz9Y++cipkVEiKRGih4ZEvjoFysEOdRLj6WiD/uUNky4xGeA6LaJqh5XpkFkcQ
+fQIDAQAB
+-----END PUBLIC KEY-----
+";
+		if (openssl_verify($version["version"], base64_decode($version["signature"]), $public) == 1) {
+			$_COOKIE["adminer_version"] = $version["version"]; // doesn't need to send to the browser
+		}
+	}
+	?>
+<script<?php echo nonce(); ?>>
+mixin(document.body, {onkeydown: bodyKeydown, onclick: bodyClick<?php
+	echo (isset($_COOKIE["adminer_version"]) ? "" : ", onload: partial(verifyVersion, '$VERSION', '" . js_escape(ME) . "', '" . get_token() . "')"); // $token may be empty in auth.inc.php
+	?>});
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
+var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
-<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden" onmouseover="helpOpen = 1;" onmouseout="helpMouseout(this, event);"></div>
+<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
+<?php echo script("mixin(qs('#help'), {onmouseover: function () { helpOpen = 1; }, onmouseout: helpMouseout});"); ?>
 
 <div id="content">
 <?php
@@ -48,7 +70,8 @@ var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 		$link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1);
 		echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
 		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
-		$server = (SERVER != "" ? h(SERVER) : lang('Server'));
+		$server = $adminer->serverName(SERVER);
+		$server = ($server != "" ? $server : lang('Server'));
 		if ($breadcrumb === false) {
 			echo "$server\n";
 		} else {
@@ -89,10 +112,45 @@ function page_headers() {
 	global $adminer;
 	header("Content-Type: text/html; charset=utf-8");
 	header("Cache-Control: no-cache");
-	if ($adminer->headers()) {
-		header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
-		header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
+	header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
+	header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
+	header("X-Content-Type-Options: nosniff");
+	header("Referrer-Policy: origin-when-cross-origin");
+	foreach ($adminer->csp() as $csp) {
+		$header = array();
+		foreach ($csp as $key => $val) {
+			$header[] = "$key $val";
+		}
+		header("Content-Security-Policy: " . implode("; ", $header));
 	}
+	$adminer->headers();
+}
+
+/** Get Content Security Policy headers
+* @return array of arrays with directive name in key, allowed sources in value
+*/
+function csp() {
+	return array(
+		array(
+			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'", // 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
+			"connect-src" => "'self'",
+			"frame-src" => "https://www.adminer.org",
+			"object-src" => "'none'",
+			"base-uri" => "'none'",
+			"form-action" => "'self'",
+		),
+	);
+}
+
+/** Get a CSP nonce
+* @return string Base64 value
+*/
+function get_nonce() {
+	static $nonce;
+	if (!$nonce) {
+		$nonce = base64_encode(rand_string());
+	}
+	return $nonce;
 }
 
 /** Print flash and error messages
@@ -103,7 +161,7 @@ function page_messages($error) {
 	$uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]);
 	$messages = $_SESSION["messages"][$uri];
 	if ($messages) {
-		echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>\n";
+		echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>" . script("messagesPrint();");
 		unset($_SESSION["messages"][$uri]);
 	}
 	if ($error) {
@@ -132,6 +190,6 @@ function page_footer($missing = "") {
 <div id="menu">
 <?php $adminer->navigation($missing); ?>
 </div>
-<script type="text/javascript">setupSubmitHighlight(document);</script>
 <?php
+	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -27,7 +27,7 @@
 		$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
 		if (!$query) {
 			$query = "SELECT" . limit(
-				($_GET["page"] != "last" && +$limit && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
+				($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
 				($where ? "\nWHERE " . implode(" AND ", $where) : "") . ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""),
 				($limit != "" ? +$limit : null),
 				($page ? $limit * $page : 0),
@@ -37,7 +37,7 @@
 		$start = microtime(true);
 		$return = $this->_conn->query($query);
 		if ($print) {
-			echo $adminer->selectQuery($query, format_time($start));
+			echo $adminer->selectQuery($query, $start, !$return);
 		}
 		return $return;
 	}
@@ -50,7 +50,7 @@
 	*/
 	function delete($table, $queryWhere, $limit = 0) {
 		$query = "FROM " . table($table);
-		return queries("DELETE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+		return queries("DELETE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
 	}
 	
 	/** Update data in table
@@ -67,7 +67,7 @@
 			$values[] = "$key = $val";
 		}
 		$query = table($table) . " SET$separator" . implode(",$separator", $values);
-		return queries("UPDATE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+		return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
 	}
 	
 	/** Insert data into table
@@ -99,12 +99,59 @@
 		return queries("BEGIN");
 	}
 	
+	/** Commit transaction
+	* @return bool
+	*/
 	function commit() {
 		return queries("COMMIT");
 	}
 	
+	/** Rollback transaction
+	* @return bool
+	*/
 	function rollback() {
 		return queries("ROLLBACK");
 	}
 	
+	/** Convert column to be searchable
+	* @param string escaped column name
+	* @param array array("op" => , "val" => )
+	* @param array
+	* @return string
+	*/
+	function convertSearch($idf, $val, $field) {
+		return $idf;
+	}
+
+	/** Convert value returned by database to actual value
+	* @param string
+	* @param array
+	* @return string
+	*/
+	function value($val, $field) {
+		return $val;
+	}
+
+	/** Quote binary string
+	* @param string
+	* @return string
+	*/
+	function quoteBinary($s) {
+		return q($s);
+	}
+	
+	/** Get warnings about the last command
+	* @return string HTML
+	*/
+	function warnings() {
+		return '';
+	}
+	
+	/** Get help link for table
+	* @param string
+	* @return string relative URL or null
+	*/
+	function tableHelp($name) {
+	}
+	
 }

adminer/include/editing.inc.php

@@ -50,7 +50,10 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 				}
 				$types[$j] = $field->type;
 				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
-					. ($orgtables ? doc_link(array('sql' => "explain-output.html#explain_" . strtolower($name))) : "")
+					. ($orgtables ? doc_link(array(
+						'sql' => "explain-output.html#explain_" . strtolower($name),
+						'mariadb' => "explain/#the-columns-in-explain-select",
+					)) : "")
 				;
 			}
 			echo "</thead>\n";
@@ -135,24 +138,27 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 * @param array
 * @param array
 * @param array returned by referencable_primary()
+* @param array extra types to prepend
 * @return null
 */
-function edit_type($key, $field, $collations, $foreign_keys = array()) {
+function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
 	$type = $field["type"];
 	?>
-<td><select name="<?php echo h($key); ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"<?php echo on_help("getTarget(event).value", 1); ?>><?php
-if ($type && !isset($types[$type]) && !isset($foreign_keys[$type])) {
-	array_unshift($structured_types, $type);
+<td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
+	$extra_types[] = $type;
 }
 if ($foreign_keys) {
 	$structured_types[lang('Foreign keys')] = $foreign_keys;
 }
-echo optionlist($structured_types, $type);
+echo optionlist(array_merge($extra_types, $structured_types), $type);
 ?></select>
-<td><input name="<?php echo h($key); ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); ?> onchange="editingLengthChange(this);" onkeyup="this.onchange();"><td class="options"><?php //! type="number" with enabled JavaScript
+<?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
 	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('~((^|[^o])int|float|double|decimal)$~', $type) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</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 ($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
 }
@@ -178,7 +184,7 @@ function process_type($field, $collate = "COLLATE") {
 	global $unsigned;
 	return " $field[type]"
 		. process_length($field["length"])
-		. (preg_match('~(^|[^o])int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
 		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
 	;
 }
@@ -195,12 +201,7 @@ function process_field($field, $type_field) {
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
-		(isset($default) ? " DEFAULT " . (
-			(preg_match('~time~', $field["type"]) && preg_match('~^CURRENT_TIMESTAMP$~i', $default))
-			|| ($jush == "sqlite" && preg_match('~^CURRENT_(TIME|TIMESTAMP|DATE)$~i', $default))
-			|| ($field["type"] == "bit" && preg_match("~^([0-9]+|b'[0-1]+')\$~", $default))
-			|| ($jush == "pgsql" && preg_match("~^[a-z]+\\(('[^']*')+\\)\$~", $default))
-			? $default : q($default)) : ""),
+		(isset($default) ? " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default) : ""),
 		(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),
@@ -233,30 +234,32 @@ function type_class($type) {
 * @return null
 */
 function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array(), $comments = false) {
-	global $connection, $inout;
+	global $inout;
 	$fields = array_values($fields);
 	?>
-<thead><tr class="wrap">
+<thead><tr>
 <?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
-<th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
-<td><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;" onblur="editingLengthBlur(this);"></textarea>
-<td><?php echo lang('Length'); ?>
-<td><?php echo lang('Options'); ?>
+<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
+<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?>
+<td id="label-length"><?php echo lang('Length'); ?>
+<td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
 <?php if ($type == "TABLE") { ?>
-<td>NULL
-<td><input type="radio" name="auto_increment_col" value=""><acronym title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
+<td id="label-null">NULL
+<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
 	'sql' => "example-auto-increment.html",
+	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
 	'pgsql' => "datatype.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
-<td><?php echo lang('Default value'); ?>
-<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
+<td id="label-default"><?php echo lang('Default value'); ?>
+<?php echo (support("comment") ? "<td id='label-comment'" . ($comments ? "" : " class='hidden'") . ">" . 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 type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
+<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 onkeydown="return editingKeydown(event);">
+<tbody>
 <?php
+	echo script("qsl('tbody').onkeydown = editingKeydown;");
 	foreach ($fields as $i => $field) {
 		$i++;
 		$orig = $field[($_POST ? "orig" : "field")];
@@ -264,24 +267,23 @@ 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"]); ?>" onchange="editingNameChange(this);<?php echo ($field["field"] != "" || count($fields) > 1 ? '' : ' editingAddRow(this);" onkeyup="if (this.value) editingAddRow(this);'); ?>" maxlength="64" autocapitalize="off"><?php } ?>
+<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); ?>
 <?php if ($type == "TABLE") { ?>
-<td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block"); ?>
-<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> onclick="var field = this.form['fields[' + this.value + '][field]']; if (!field.value) { field.value = 'id'; field.onchange(); }"></label><td><?php
-echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onkeyup="keyupChange.call(this);" onchange="this.previousSibling.checked = true;">
-<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . "><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' maxlength='" . ($connection->server_info >= 5.5 ? 1024 : 255) . "'>" : ""); ?>
+<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
 		echo "<td>";
 		echo (support("move_col") ?
-			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, 1);'>&nbsp;"
-			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;"
-			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;"
+			"<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);", "")
 		: "");
-		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick=\"return !editingRemoveRow(this, 'fields\$1[field]');\">" : "");
-		echo "\n";
+		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]');") : "");
 	}
 }
 
@@ -290,7 +292,6 @@ echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input nam
 * @return bool
 */
 function process_fields(&$fields) {
-	ksort($fields);
 	$offset = 0;
 	if ($_POST["up"]) {
 		$last = 0;
@@ -412,7 +413,7 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-	global $inout;
+	global $inout, $jush;
 	$set = array();
 	$fields = (array) $row["fields"];
 	ksort($fields); // enforce fields order
@@ -421,20 +422,20 @@ function create_routine($routine, $row) {
 			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
+	$definition = rtrim("\n$row[definition]", ";");
 	return "CREATE $routine "
 		. idf_escape(trim($row["name"]))
 		. " (" . implode(", ", $set) . ")"
 		. (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
 		. ($row["language"] ? " LANGUAGE $row[language]" : "")
-		. rtrim("\n$row[definition]", ";")
-		. ";"
+		. ($jush == "pgsql" ? " AS " . q($definition) : "$definition;")
 	;
 }
 
 /** Remove current user definer from SQL command
- * @param string
- * @return string
- */
+* @param string
+* @return string
+*/
 function remove_definer($query) {
 	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $query); //! proper escaping of user
 }
@@ -486,18 +487,25 @@ function ini_bytes($ini) {
 
 /** Create link to database documentation
 * @param array $jush => $path
+* @param string HTML code
 * @return string HTML code
 */
-function doc_link($paths) {
+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
 	$urls = array(
-		'sql' => "http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/",
-		'sqlite' => "http://www.sqlite.org/",
-		'pgsql' => "http://www.postgresql.org/docs/" . substr($connection->server_info, 0, 3) . "/static/",
-		'mssql' => "http://msdn.microsoft.com/library/",
-		'oracle' => "http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/",
+		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
+		'sqlite' => "https://www.sqlite.org/",
+		'pgsql' => "https://www.postgresql.org/docs/$version/static/",
+		'mssql' => "https://msdn.microsoft.com/library/",
+		'oracle' => "https://download.oracle.com/docs/cd/B19306_01/server.102/b14200/",
 	);
-	return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]' target='_blank' rel='noreferrer'><sup>?</sup></a>" : "");
+	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>" : "");
 }
 
 /** Wrap gzencode() for usage in ob_start()
@@ -530,7 +538,7 @@ function db_size($db) {
 * @return null
 */
 function set_utf8mb4($create) {
-  global $connection;
+	global $connection;
 	static $set = false;
 	if (!$set && preg_match('~\butf8mb4~i', $create)) { // possible false positive
 		$set = true;

adminer/include/functions.inc.php

@@ -16,6 +16,14 @@ function adminer() {
 	return $adminer;
 }
 
+/** Get Adminer version
+* @return string
+*/
+function version() {
+	global $VERSION;
+	return $VERSION;
+}
+
 /** Unescape database identifier
 * @param string text inside ``
 * @return string
@@ -38,7 +46,14 @@ function escape_string($val) {
 * @return string
 */
 function number($val) {
-  return preg_replace('~[^0-9]+~', '', $val);
+	return preg_replace('~[^0-9]+~', '', $val);
+}
+
+/** Get regular expression to match numeric types
+* @return string
+*/
+function number_type() {
+	return '((?<!o)int(?!er)|numeric|real|float|double|decimal|money)'; // not point, not interval
 }
 
 /** Disable magic_quotes_gpc
@@ -69,16 +84,66 @@ function remove_slashes($process, $filter = false) {
 */
 function bracket_escape($idf, $back = false) {
 	// escape brackets inside name="x[]"
-	static $trans = array(':' => ':1', ']' => ':2', '[' => ':3');
+	static $trans = array(':' => ':1', ']' => ':2', '[' => ':3', '"' => ':4');
 	return strtr($idf, ($back ? array_flip($trans) : $trans));
 }
 
+/** Check if connection has at least the given version
+* @param string required version
+* @param string required MariaDB version
+* @param Min_DB defaults to $connection
+* @return bool
+*/
+function min_version($version, $maria_db = "", $connection2 = null) {
+	global $connection;
+	if (!$connection2) {
+		$connection2 = $connection;
+	}
+	$server_info = $connection2->server_info;
+	if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
+		$server_info = $match[1];
+		$version = $maria_db;
+	}
+	return (version_compare($server_info, $version) >= 0);
+}
+
 /** Get connection charset
 * @param Min_DB
 * @return string
 */
 function charset($connection) {
-	return (version_compare($connection->server_info, "5.5.3") >= 0 ? "utf8mb4" : "utf8"); // SHOW CHARSET would require an extra query
+	return (min_version("5.5.3", 0, $connection) ? "utf8mb4" : "utf8"); // SHOW CHARSET would require an extra query
+}
+
+/** Return <script> element
+* @param string
+* @param string
+* @return string
+*/
+function script($source, $trailing = "\n") {
+	return "<script" . nonce() . ">$source</script>$trailing";
+}
+
+/** Return <script src> element
+* @param string
+* @return string
+*/
+function script_src($url) {
+	return "<script src='" . h($url) . "'" . nonce() . "></script>\n";
+}
+
+/** Get a nonce="" attribute with CSP nonce
+* @return string
+*/
+function nonce() {
+	return ' nonce="' . get_nonce() . '"';
+}
+
+/** Get a target="_blank" attribute
+* @return string
+*/
+function target_blank() {
+	return ' target="_blank" rel="noreferrer noopener"';
 }
 
 /** Escape for HTML
@@ -112,13 +177,15 @@ function nl_br($string) {
 * @param string
 * @param string
 * @param string
+* @param string
 * @return string
 */
-function checkbox($name, $value, $checked, $label = "", $onclick = "", $class = "") {
+function checkbox($name, $value, $checked, $label = "", $onclick = "", $class = "", $labelled_by = "") {
 	$return = "<input type='checkbox' name='$name' value='" . h($value) . "'"
 		. ($checked ? " checked" : "")
-		. ($onclick ? ' onclick="' . h($onclick) . '"' : '')
+		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
 		. ">"
+		. ($onclick ? script("qsl('input').onclick = function () { $onclick };", "") : "")
 	;
 	return ($label != "" || $class ? "<label" . ($class ? " class='$class'" : "") . ">$return" . h($label) . "</label>" : $return);
 }
@@ -152,11 +219,16 @@ function optionlist($options, $selected = null, $use_keys = false) {
 * @param array
 * @param string
 * @param string true for no onchange, false for radio
+* @param string
 * @return string
 */
-function html_select($name, $options, $value = "", $onchange = true) {
+function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
 	if ($onchange) {
-		return "<select name='" . h($name) . "'" . (is_string($onchange) ? ' onchange="' . h($onchange) . '"' : "") . ">" . optionlist($options, $value) . "</select>";
+		return "<select name='" . h($name) . "'"
+			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
+			. ">" . optionlist($options, $value) . "</select>"
+			. (is_string($onchange) ? script("qsl('select').onchange = function () { $onchange };", "") : "")
+		;
 	}
 	$return = "";
 	foreach ($options as $key => $val) {
@@ -166,35 +238,42 @@ function html_select($name, $options, $value = "", $onchange = true) {
 }
 
 /** Generate HTML <select> or <input> if $options are empty
- * @param string
- * @param array
- * @param string
- * @param string
- * @return string
- */
-function select_input($attrs, $options, $value = "", $placeholder = "") {
-	return ($options
-		? "<select$attrs><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
-		: "<input$attrs size='10' value='" . h($value) . "' placeholder='$placeholder'>"
-	);
+* @param string
+* @param array
+* @param string
+* @param string
+* @param string
+* @return string
+*/
+function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
+	$tag = ($options ? "select" : "input");
+	return "<$tag$attrs" . ($options
+		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
 }
 
 /** Get onclick confirmation
+* @param string
+* @param string
 * @return string
 */
-function confirm() {
-	return " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
+function confirm($message = "", $selector = "qsl('input')") {
+	return script("$selector.onclick = function () { return confirm('" . ($message ? js_escape($message) : lang('Are you sure?')) . "'); };", "");
 }
 
 /** Print header for hidden fieldset (close by </div></fieldset>)
 * @param string
 * @param string
 * @param bool
-* @param string
 * @return null
 */
-function print_fieldset($id, $legend, $visible = false, $onclick = "") {
-	echo "<fieldset><legend><a href='#fieldset-$id' onclick=\"" . h($onclick) . "return !toggle('fieldset-$id');\">$legend</a></legend><div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
+function print_fieldset($id, $legend, $visible = false) {
+	echo "<fieldset><legend>";
+	echo "<a href='#fieldset-$id'>$legend</a>";
+	echo script("qsl('a').onclick = partial(toggle, 'fieldset-$id');", "");
+	echo "</legend>";
+	echo "<div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
 }
 
 /** Return class='active' if $bold is true
@@ -237,7 +316,7 @@ function json_row($key, $val = null) {
 		echo "{";
 	}
 	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'undefined');
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
 		$first = false;
 	} else {
 		echo "\n}\n";
@@ -323,9 +402,10 @@ function get_vals($query, $column = 0) {
 * @param string
 * @param Min_DB
 * @param float
+* @param bool
 * @return array
 */
-function get_key_vals($query, $connection2 = null, $timeout = 0) {
+function get_key_vals($query, $connection2 = null, $timeout = 0, $set_keys = true) {
 	global $connection;
 	if (!is_object($connection2)) {
 		$connection2 = $connection;
@@ -336,7 +416,11 @@ function get_key_vals($query, $connection2 = null, $timeout = 0) {
 	$connection2->timeout = 0;
 	if (is_object($result)) {
 		while ($row = $result->fetch_row()) {
-			$return[$row[0]] = $row[1];
+			if ($set_keys) {
+				$return[$row[0]] = $row[1];
+			} else {
+				$return[] = $row[0];
+			}
 		}
 	}
 	return $return;
@@ -346,7 +430,7 @@ function get_key_vals($query, $connection2 = null, $timeout = 0) {
 * @param string
 * @param Min_DB
 * @param string
-* @return array associative
+* @return array of associative arrays
 */
 function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 	global $connection;
@@ -406,10 +490,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)) || $jush == "mssql"
-				? " LIKE " . q(addcslashes($val, "%_\\"))
+			. ($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val) ? " LIKE " . q(addcslashes($val, "%_\\"))
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val))
 				: " = " . unconvert_field($fields[$key], q($val))
-			) // LIKE because of floats but slow with ints, in MS SQL because of text
+			)) // 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";
@@ -471,18 +555,12 @@ function convert_fields($columns, $fields, $select = array()) {
 */
 function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
 	global $HTTPS;
-	$params = array(
-		$name,
-		(preg_match("~\n~", $value) ? "" : $value), // HTTP Response Splitting protection in PHP < 5.1.2
-		($lifetime ? time() + $lifetime : 0),
-		preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]),
-		"",
-		$HTTPS
-	);
-	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-		$params[] = true; // HttpOnly
-	}
-	return call_user_func_array('setcookie', $params);
+	return header("Set-Cookie: $name=" . urlencode($value)
+		. ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
+		. "; path=" . preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"])
+		. ($HTTPS ? "; secure" : "")
+		. "; HttpOnly; SameSite=lax",
+		false);
 }
 
 /** Restart stopped session
@@ -584,10 +662,10 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	}
 	$sql = "";
 	if ($query) {
-		$sql = $adminer->messageQuery($query, $time);
+		$sql = $adminer->messageQuery($query, $time, $failed);
 	}
 	if ($failed) {
-		$error = error() . $sql;
+		$error = error() . $sql . script("messagesPrint();");
 		return false;
 	}
 	if ($redirect) {
@@ -744,7 +822,7 @@ function is_utf8($val) {
 * @return string escaped string with appended ...
 */
 function shorten_utf8($string, $length = 80, $suffix = "") {
-	if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
+	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>");
@@ -755,7 +833,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 * @return string
 */
 function format_number($val) {
-  return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
+	return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
 }
 
 /** Generate friendly URL
@@ -770,9 +848,10 @@ function friendly_url($val) {
 /** Print hidden fields
 * @param array
 * @param array
-* @return null
+* @return bool
 */
 function hidden_fields($process, $ignore = array()) {
+	$return = false;
 	while (list($key, $val) = each($process)) {
 		if (!in_array($key, $ignore)) {
 			if (is_array($val)) {
@@ -780,10 +859,12 @@ function hidden_fields($process, $ignore = array()) {
 					$process[$key . "[$k]"] = $v;
 				}
 			} else {
+				$return = true;
 				echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
 			}
 		}
 	}
+	return $return;
 }
 
 /** Print hidden fields for GET forms
@@ -847,7 +928,7 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $connection, $types, $adminer, $jush;
+	global $types, $adminer, $jush;
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
 	if (is_array($value) && !$function) {
@@ -867,32 +948,28 @@ function input($field, $value, $function) {
 	if ($field["type"] == "enum") {
 		echo nbsp($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
-		$first = 0;
-		foreach ($functions as $key => $val) {
-			if ($key === "" || !$val) {
-				break;
-			}
-			$first++;
-		}
-		$onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\" onkeyup='keyupChange.call(this);'" : "");
-		$attrs .= $onchange;
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
-			? "<select name='function[$name]' onchange='functionChange(this);'" . on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1) . ">" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+			? "<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))
 		) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
+		} elseif (preg_match('~bool~', $field["type"])) {
+			echo "<input type='hidden'$attrs value='0'>" .
+				"<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
 		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
 				$val = stripcslashes(str_replace("''", "'", $val));
 				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
-				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . "$onchange>" . h($adminer->editVal($val, $field)) . '</label>';
+				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
 			}
 		} elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
-			echo "<input type='file' name='fields-$name'$onchange>";
+			echo "<input type='file' name='fields-$name'>";
 		} elseif (($text = preg_match('~text|lob~', $field["type"])) || preg_match("~\n~", $value)) {
 			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
@@ -901,22 +978,34 @@ function input($field, $value, $function) {
 				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
 			}
 			echo "<textarea$attrs>" . h($value) . '</textarea>';
-		} elseif ($function == "json") {
+		} elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
 			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
 			$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' && $connection->server_info >= 5.6 && preg_match('~time~', $field["type"])) {
+			if ($jush == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
 				$maxlength += 7; // microtime
 			}
 			// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
 			echo "<input"
-				. ((!$has_function || $function === "") && preg_match('~(?<!o)int~', $field["type"]) ? " type='number'" : "")
-				. " value='" . h($value) . "'" . ($maxlength ? " maxlength='$maxlength'" : "")
+				. ((!$has_function || $function === "") && preg_match('~(?<!o)int(?!er)~', $field["type"]) && !preg_match('~\[\]~', $field["full_type"]) ? " type='number'" : "")
+				. " value='" . h($value) . "'" . ($maxlength ? " data-maxlength='$maxlength'" : "")
 				. (preg_match('~char|binary~', $field["type"]) && $maxlength > 20 ? " size='40'" : "")
 				. "$attrs>"
 			;
 		}
+		echo $adminer->editHint($_GET["edit"], $field, $value);
+		// skip 'original'
+		$first = 0;
+		foreach ($functions as $key => $val) {
+			if ($key === "" || !$val) {
+				break;
+			}
+			$first++;
+		}
+		if ($first) {
+			echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
+		}
 	}
 }
 
@@ -925,7 +1014,7 @@ function input($field, $value, $function) {
 * @return string or false to leave the original value
 */
 function process_input($field) {
-	global $adminer;
+	global $adminer, $driver;
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
@@ -963,7 +1052,7 @@ function process_input($field) {
 		if (!is_string($file)) {
 			return false; //! report errors
 		}
-		return q($file);
+		return $driver->quoteBinary($file);
 	}
 	return $adminer->processInput($field, $value, $function);
 }
@@ -1000,25 +1089,20 @@ function fields_from_edit() {
 */
 function search_tables() {
 	global $adminer, $connection;
-	$_GET["where"][0]["op"] = "LIKE %%";
 	$_GET["where"][0]["val"] = $_POST["query"];
-	$found = false;
+	$sep = "<ul>\n";
 	foreach (table_status('', true) as $table => $table_status) {
 		$name = $adminer->tableName($table_status);
 		if (isset($table_status["Engine"]) && $name != "" && (!$_POST["tables"] || in_array($table, $_POST["tables"]))) {
 			$result = $connection->query("SELECT" . limit("1 FROM " . table($table), " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())), 1));
 			if (!$result || $result->fetch_row()) {
-				if (!$found) {
-					echo "<ul>\n";
-					$found = true;
-				}
-				echo "<li>" . ($result
-					? "<a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>\n"
-					: "$name: <span class='error'>" . error() . "</span>\n");
+				$print = "<a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>";
+				echo "$sep<li>" . ($result ? $print : "<p class='error'>$print: " . error()) . "\n";
+				$sep = "";
 			}
 		}
 	}
-	echo ($found ? "</ul>" : "<p class='message'>" . lang('No tables.')) . "\n";
+	echo ($sep ? "<p class='message'>" . lang('No tables.') : "</ul>") . "\n";
 }
 
 /** Send headers for export
@@ -1081,6 +1165,35 @@ function get_temp_dir() {
 	return $return;
 }
 
+/** Open and exclusively lock a file
+* @param string
+* @return resource or null for error
+*/
+function file_open_lock($filename) {
+	$fp = @fopen($filename, "r+"); // @ - may not exist
+	if (!$fp) { // c+ is available since PHP 5.2.6
+		$fp = @fopen($filename, "w"); // @ - may not be writable
+		if (!$fp) {
+			return;
+		}
+		chmod($filename, 0660);
+	}
+	flock($fp, LOCK_EX);
+	return $fp;
+}
+
+/** Write and unlock a file
+* @param resource
+* @param string
+*/
+function file_write_unlock($fp, $data) {
+	rewind($fp);
+	fwrite($fp, $data);
+	ftruncate($fp, strlen($data));
+	flock($fp, LOCK_UN);
+	fclose($fp);
+}
+
 /** Read password from file adminer.key in temporary directory or create one
 * @param bool
 * @return string or false if the file can not be created
@@ -1116,7 +1229,7 @@ function rand_string() {
 * @return string HTML
 */
 function select_value($val, $link, $field, $text_length) {
-	global $adminer, $HTTPS;
+	global $adminer;
 	if (is_array($val)) {
 		$return = "";
 		foreach ($val as $k => $v) {
@@ -1134,11 +1247,8 @@ function select_value($val, $link, $field, $text_length) {
 		if (is_mail($val)) {
 			$link = "mailto:$val";
 		}
-		if ($protocol = is_url($val)) {
-			$link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009
-				? $val // HTTP links from HTTPS pages don't receive Referer automatically
-				: "https://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer
-			);
+		if (is_url($val)) {
+			$link = $val; // IE 11 and all modern browsers hide referrer
 		}
 	}
 	$return = $adminer->editVal($val, $field);
@@ -1169,11 +1279,11 @@ function is_mail($email) {
 
 /** Check whether the string is URL address
 * @param string
-* @return string "http", "https" or ""
+* @return bool
 */
 function is_url($string) {
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
-	return (preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string, $match) ? strtolower($match[1]) : ""); //! restrict path, query and fragment characters
+	return preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
 }
 
 /** Check if field should be shortened
@@ -1181,7 +1291,7 @@ function is_url($string) {
 * @return bool
 */
 function is_shortable($field) {
-	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string~', $field["type"]);
+	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
 }
 
 /** Get query to compute number of found rows
@@ -1196,7 +1306,7 @@ function count_rows($table, $where, $is_group, $group) {
 	$query = " FROM " . table($table) . ($where ? " WHERE " . implode(" AND ", $where) : "");
 	return ($is_group && ($jush == "sql" || count($group) == 1)
 		? "SELECT COUNT(DISTINCT " . implode(", ", $group) . ")$query"
-		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query$group_by) x" : $query)
+		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query GROUP BY " . implode(", ", $group) . ") x" : $query)
 	);
 }
 
@@ -1209,12 +1319,12 @@ function slow_query($query) {
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
 	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
-		$kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
+		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
-<script type="text/javascript">
+<script<?php echo nonce(); ?>>
 var timeout = setTimeout(function () {
 	ajax('<?php echo js_escape(ME); ?>script=kill', function () {
-	}, 'token=<?php echo $token; ?>&kill=<?php echo $kill; ?>');
+	}, 'kill=<?php echo $kill; ?>&token=<?php echo $token; ?>');
 }, <?php echo 1000 * $timeout; ?>);
 </script>
 <?php
@@ -1223,13 +1333,13 @@ var timeout = setTimeout(function () {
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals($query, $connection2, $timeout); // @ - may be killed
+	$return = @get_key_vals($query, $connection2, $timeout, false); // @ - may be killed
 	if ($connection2) {
-		echo "<script type='text/javascript'>clearTimeout(timeout);</script>\n";
+		echo script("clearTimeout(timeout);");
 		ob_flush();
 		flush();
 	}
-	return array_keys($return);
+	return $return;
 }
 
 /** Generate BREACH resistant CSRF token
@@ -1292,7 +1402,7 @@ function lzw_decompress($binary) {
 * @return string
 */
 function on_help($command, $side = 0) {
-	return " onmouseover='helpMouseover(this, event, " . h($command) . ", $side);' onmouseout='helpMouseout(this, event);'";
+	return script("mixin(qsl('select, input'), {onmouseover: function (event) { helpMouseover.call(this, event, $command, $side) }, onmouseout: helpMouseout});", "");
 }
 
 /** Print edit data form
@@ -1320,7 +1430,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' onkeydown='return editingKeydown(event);'>\n";
+		echo "<table cellspacing='0'>" . script("qsl('table').onkeydown = editingKeydown;");
 
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
@@ -1360,7 +1470,8 @@ function edit_form($TABLE, $fields, $row, $update) {
 		}
 		if (!support("table")) {
 			echo "<tr>"
-				. "<th><input name='field_keys[]' onkeyup='keyupChange.call(this);' onchange='fieldChange(this);' value=''>" // needs empty value for keyupChange()
+				. "<th><input name='field_keys[]'>"
+				. script("qsl('input').oninput = fieldChange;")
 				. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array("null" => isset($_GET["select"]))))
 				. "<td><input name='field_vals[]'>"
 				. "\n"
@@ -1373,13 +1484,14 @@ function edit_form($TABLE, $fields, $row, $update) {
 		echo "<input type='submit' value='" . lang('Save') . "'>\n";
 		if (!isset($_GET["select"])) {
 			echo "<input type='submit' name='insert' value='" . ($update
-				? lang('Save and continue edit') . "' onclick='return !ajaxForm(this.form, \"" . lang('Saving') . '...", this)'
+				? 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 ? "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n"
-		: ($_POST || !$fields ? "" : "<script type='text/javascript'>focus(document.getElementById('form').getElementsByTagName('td')[1].firstChild);</script>\n")
+	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'>" . confirm() . "\n"
+		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[1].firstChild);"))
 	);
 	if (isset($_GET["select"])) {
 		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));

adminer/include/lang.inc.php

@@ -2,38 +2,42 @@
 // not used in a single language version
 
 $langs = array(
-	'en' => 'English', // Jakub Vrána - http://www.vrana.cz
+	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
 	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
+	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
-	'cs' => 'Čeština', // Jakub Vrána - http://www.vrana.cz
+	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
 	'da' => 'Dansk', // Jarne W. Beutnagel - jarne@beutnagel.dk
 	'de' => 'Deutsch', // Klemens Häckel - http://clickdimension.wordpress.com
 	'el' => 'Ελληνικά', // Dimitrios T. Tanis - jtanis@tanisfood.gr
 	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
 	'et' => 'Eesti', // Priit Kallas
 	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com, Nima Amini - http://nimlog.com
+	'fi' => 'Suomi', // Finnish - Kari Eveli - http://www.lexitec.fi/
 	'fr' => 'Français', // Francis Gagné, Aurélien Royer
 	'gl' => 'Galego', // Eduardo Penabad Ramos
+	'he' => 'עברית', // Binyamin Yawitz - https://stuff-group.com/
 	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
 	'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/
 	'ko' => '한국어', // dalli - skcha67@gmail.com
 	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
+	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
 	'pl' => 'Polski', // Radosław Kowalewski - http://srsbiz.pl/
 	'pt' => 'Português', // André Dias
 	'pt-br' => 'Português (Brazil)', // Gian Live - gian@live.com, Davi Alexandre davi@davialexandre.com.br, RobertoPC - http://www.robertopc.com.br
 	'ro' => 'Limba Română', // .nick .messing - dot.nick.dot.messing@gmail.com
-	'ru' => 'Русский язык', // Maksim Izmaylov
+	'ru' => 'Русский', // Maksim Izmaylov; Andre Polykanine - https://github.com/Oire/
 	'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
 	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
-	'th' => 'ภาษาไทย', // Panya  Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
+	'th' => 'ภาษาไทย', // Panya Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
 	'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
 	'uk' => 'Українська', // Valerii Kryzhov
 	'vi' => 'Tiếng Việt', // Giang Manh @ manhgd google mail
@@ -61,10 +65,10 @@ function lang($idf, $number = null) {
 		$pos = ($number == 1 ? 0
 			: ($LANG == 'cs' || $LANG == 'sk' ? ($number && $number < 5 ? 1 : 2) // different forms for 1, 2-4, other
 			: ($LANG == 'fr' ? (!$number ? 0 : 1) // different forms for 0-1, other
-			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4, other
+			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4 except 12-14, other
 			: ($LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
 			: ($LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: ($LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 2-4, other
+			: ($LANG == 'bs' || $LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1 except 11, 2-4 except 12-14, other
 			: 1 // different forms for 1, other
 		))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
 		$translation = $translation[$pos];

adminer/include/pdo.inc.php

@@ -12,14 +12,14 @@ if (extension_loaded('pdo')) {
 			}
 		}
 		
-		function dsn($dsn, $username, $password) {
+		function dsn($dsn, $username, $password, $options = array()) {
 			try {
-				parent::__construct($dsn, $username, $password);
+				parent::__construct($dsn, $username, $password, $options);
 			} catch (Exception $ex) {
-				auth_error($ex->getMessage());
+				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->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
 		}
 		
 		/*abstract function select_db($database);*/

adminer/include/version.inc.php

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

adminer/index.php

@@ -1,10 +1,10 @@
 <?php
 /** Adminer - Compact database management
 * @link https://www.adminer.org/
-* @author Jakub Vrana, http://www.vrana.cz/
+* @author Jakub Vrana, https://www.vrana.cz/
 * @copyright 2007 Jakub Vrana
-* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
 include "./include/bootstrap.inc.php";

adminer/indexes.inc.php

@@ -2,9 +2,12 @@
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
-if (preg_match('~MyISAM|M?aria' . ($connection->server_info >= 5.6 ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
+if (preg_match('~MyISAM|M?aria' . (min_version(5.6, '10.0.5') ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
 	$index_types[] = "FULLTEXT";
 }
+if (preg_match('~MyISAM|M?aria' . (min_version(5.7, '10.2.2') ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
+	$index_types[] = "SPATIAL";
+}
 $indexes = indexes($TABLE);
 $primary = array();
 if ($jush == "mongo") { // doesn't support primary key
@@ -93,9 +96,9 @@ if (!$row) {
 <form action="" method="post">
 <table cellspacing="0" class="nowrap">
 <thead><tr>
-<th><?php echo lang('Index Type'); ?>
-<th><input type="submit" style="left: -1000px; position: absolute;"><?php echo lang('Column (length)'); ?>
-<th><?php echo lang('Name'); ?>
+<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;
 </thead>
 <?php
@@ -110,25 +113,26 @@ if ($primary) {
 $j = 1;
 foreach ($row["indexes"] as $index) {
 	if (!$_POST["drop_col"] || $j != key($_POST["drop_col"])) {
-		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow(this);" : 1));
+		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(this);" : 1), "label-type");
 
 		echo "<td>";
 		ksort($index["columns"]);
 		$i = 1;
 		foreach ($index["columns"] as $key => $column) {
 			echo "<span>" . select_input(
-				" name='indexes[$j][columns][$i]' onchange=\"" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . "(this, '" . h(js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_")) . "');\"",
+				" name='indexes[$j][columns][$i]' title='" . lang('Column') . "'",
 				($fields ? array_combine($fields, $fields) : $fields),
-				$column
+				$column,
+				"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]) . "'>" : "");
+			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 " </span>";
 			$i++;
 		}
 
-		echo "<td><input name='indexes[$j][name]' value='" . h($index["name"]) . "' autocapitalize='off'>\n";
-		echo "<td><input type='image' class='icon' name='drop_col[$j]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick=\"return !editingRemoveRow(this, 'indexes\$1[type]');\">\n";
+		echo "<td><input name='indexes[$j][name]' value='" . h($index["name"]) . "' autocapitalize='off' aria-labelledby='label-name'>\n";
+		echo "<td><input type='image' class='icon' name='drop_col[$j]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" . script("qsl('input').onclick = partial(editingRemoveRow, 'indexes\$1[type]');");
 	}
 	$j++;
 }

adminer/lang/ar.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'كلمة المرور',
 	'Select database' => 'اختر قاعدة البيانات',
 	'Invalid database.' => 'قاعدة البيانات غير صالحة.',
-	'Create new database' => 'أنشئ فاعدة بيانات جديدة',
 	'Table has been dropped.' => 'تم حذف الجدول.',
 	'Table has been altered.' => 'تم تعديل الجدول.',
 	'Table has been created.' => 'تم إنشاء الجدول.',

adminer/lang/bg.inc.php

@@ -12,7 +12,7 @@ $translations = array(
 	'Logout successful.' => 'Излизането е успешно.',
 	'Invalid credentials.' => 'Невалидни потребителски данни.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Прекалено много неуспешни опити за вход, опитайте пак след %d минута.', 'Прекалено много неуспешни опити за вход, опитайте пак след %d минути.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Главната парола вече е невалидна. <a href="https://www.adminer.org/en/extension/" target="_blank">Изберете</a> %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.' => 'Невалиден шифроващ ключ. Попълнете и изпратете формуляра отново.',
 	'If you did not send this request from Adminer then close this page.' => 'Ако не сте изпратили тази заявка през Adminer, затворете тази страница.',
@@ -82,7 +82,6 @@ $translations = array(
 	'Use' => 'Избор',
 	'Select database' => 'Избор на база данни',
 	'Invalid database.' => 'Невалидна база данни.',
-	'Create new database' => 'Нова база данни',
 	'Database has been dropped.' => 'Базата данни беше премахната.',
 	'Databases have been dropped.' => 'Базите данни бяха премехнати.',
 	'Database has been created.' => 'Базата данни беше създадена.',
@@ -182,13 +181,12 @@ $translations = array(
 	'Values' => 'Стойности',
 	
 	'View' => 'Изглед',
-	'Materialized View' => 'Запаметен изглед',
+	'Materialized view' => 'Запаметен изглед',
 	'View has been dropped.' => 'Изгледа беше премахнат.',
 	'View has been altered.' => 'Изгледа беше променен.',
 	'View has been created.' => 'Изгледа беше създаден.',
 	'Alter view' => 'Промяна на изглед',
 	'Create view' => 'Създаване на изглед',
-	'Create materialized view' => 'Създаване на запаметен изглед',
 	
 	'Indexes' => 'Индекси',
 	'Indexes have been altered.' => 'Индексите бяха променени.',

adminer/lang/bn.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'পাসওয়ার্ড',
 	'Select database' => 'ডাটাবেজ নির্বাচন করো',
 	'Invalid database.' => 'ভুল ডাটাবেজ।',
-	'Create new database' => 'নতুন ডাটাবেজ তৈরী করো',
 	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
 	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
 	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',

adminer/lang/bs.inc.php

@@ -0,0 +1,321 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Sistem',
+	'Server' => 'Server',
+	'Username' => 'Korisničko ime',
+	'Password' => 'Lozinka',
+	'Permanent login' => 'Trajna prijava',
+	'Login' => 'Prijava',
+	'Logout' => 'Odjava',
+	'Logged as: %s' => 'Prijavi se kao: %s',
+	'Logout successful.' => 'Uspešna odjava.',
+	'Invalid credentials.' => 'Nevažeće dozvole.',
+	'Language' => 'Jezik',
+	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
+	'No extension' => 'Bez dodataka',
+	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka nije dostupan.',
+	'Session support must be enabled.' => 'Morate omogućiti podršku za sesije.',
+	'Session expired, please login again.' => 'Vaša sesija je istekla, prijavite se ponovo.',
+	'%s version: %s through PHP extension %s' => '%s verzija: %s pomoću PHP dodatka je %s',
+	'Refresh' => 'Osveži',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Dozvole',
+	'Create user' => 'Novi korisnik',
+	'User has been dropped.' => 'Korisnik je izbrisan.',
+	'User has been altered.' => 'Korisnik je izmijenjen.',
+	'User has been created.' => 'korisnik je spašen.',
+	'Hashed' => 'Heširano',
+	'Column' => 'kolumna',
+	'Routine' => 'Rutina',
+	'Grant' => 'Dozvoli',
+	'Revoke' => 'Opozovi',
+
+	'Process list' => 'Spisak procesa',
+	'%d process(es) have been killed.' => array('%d proces je ukinut.', '%d procesa su ukinuta.', '%d procesa je ukinuto.'),
+	'Kill' => 'Ubij',
+
+	'Variables' => 'Promijenljive',
+	'Status' => 'Status',
+
+	'SQL command' => 'SQL komanda',
+	'%d query(s) executed OK.' => array('%d upit je uspiješno izvršen.', '%d upita su uspiješno izvršena.', '%d upita je uspiješno izvršeno.'),
+	'Query executed OK, %d row(s) affected.' => array('Upit je uspiješno izvršen, %d red je ažuriran.', 'Upit je uspiješno izvršen, %d reda su ažurirana.', 'Upit je uspiješno izvršen, %d redova je ažurirano.'),
+	'No commands to execute.' => 'Bez komandi za izvršavanje.',
+	'Error in query' => 'Greška u upitu',
+	'Execute' => 'Izvrši',
+	'Stop on error' => 'Zaustavi prilikom greške',
+	'Show only errors' => 'Prikazuj samo greške',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historijat',
+	'Clear' => 'Očisti',
+	'Edit all' => 'Izmijeni sve',
+
+	'File upload' => 'Slanje datoteka',
+	'From server' => 'Sa servera',
+	'Webserver file %s' => 'Datoteka %s sa veb servera',
+	'Run file' => 'Pokreni datoteku',
+	'File does not exist.' => 'Datoteka ne postoji.',
+	'File uploads are disabled.' => 'Onemogućeno je slanje datoteka.',
+	'Unable to upload a file.' => 'Slanje datoteke nije uspelo.',
+	'Maximum allowed file size is %sB.' => 'Najveća dozvoljena veličina datoteke je %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Preveliki POST podatak. Morate da smanjite podatak ili povećajte vrijednost konfiguracione direktive %s.',
+
+	'Export' => 'Izvoz',
+	'Output' => 'Ispis',
+	'open' => 'otvori',
+	'save' => 'spasi',
+	'Format' => 'Format',
+	'Data' => 'Podaci',
+
+	'Database' => 'Baza podataka',
+	'database' => 'baza podataka',
+	'Use' => 'Koristi',
+	'Select database' => 'Izaberite bazu',
+	'Invalid database.' => 'Neispravna baza podataka.',
+	'Database has been dropped.' => 'Baza podataka je izbrisana.',
+	'Databases have been dropped.' => 'Baze podataka su izbrisane.',
+	'Database has been created.' => 'Baza podataka je spašena.',
+	'Database has been renamed.' => 'Baza podataka je preimenovana.',
+	'Database has been altered.' => 'Baza podataka je izmijenjena.',
+	'Alter database' => 'Ažuriraj bazu podataka',
+	'Create database' => 'Formiraj bazu podataka',
+	'Database schema' => 'Šema baze podataka',
+
+	// link to current database schema layout
+	'Permanent link' => 'Trajna veza',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Stroj',
+	'Collation' => 'Sravnjivanje',
+	'Data Length' => 'Dužina podataka',
+	'Index Length' => 'Dužina indeksa',
+	'Data Free' => 'Slobodno podataka',
+	'Rows' => 'Redova',
+	'%d in total' => 'ukupno %d',
+	'Analyze' => 'Analiziraj',
+	'Optimize' => 'Optimizuj',
+	'Check' => 'Provjeri',
+	'Repair' => 'Popravi',
+	'Truncate' => 'Isprazni',
+	'Tables have been truncated.' => 'Tabele su ispražnjene.',
+	'Move to other database' => 'Premijesti u drugu bazu podataka',
+	'Move' => 'Premijesti',
+	'Tables have been moved.' => 'Tabele su premješćene.',
+	'Copy' => 'Umnoži',
+	'Tables have been copied.' => 'Tabele su umnožene.',
+
+	'Routines' => 'Rutine',
+	'Routine has been called, %d row(s) affected.' => array('Pozvana je rutina, %d red je ažuriran.', 'Pozvana je rutina, %d reda su ažurirani.', 'Pozvana je rutina, %d redova je ažurirano.'),
+	'Call' => 'Pozovi',
+	'Parameter name' => 'Naziv parametra',
+	'Create procedure' => 'Formiraj proceduru',
+	'Create function' => 'Formiraj funkciju',
+	'Routine has been dropped.' => 'Rutina je izbrisana.',
+	'Routine has been altered.' => 'Rutina je izmijenjena.',
+	'Routine has been created.' => 'Rutina je spašena.',
+	'Alter function' => 'Ažuriraj funkciju',
+	'Alter procedure' => 'Ažuriraj proceduru',
+	'Return type' => 'Povratni tip',
+
+	'Events' => 'Događaji',
+	'Event has been dropped.' => 'Događaj je izbrisan.',
+	'Event has been altered.' => 'Događaj je izmijenjen.',
+	'Event has been created.' => 'Događaj je spašen.',
+	'Alter event' => 'Ažuriraj događaj',
+	'Create event' => 'Napravi događaj',
+	'At given time' => 'U zadato vrijeme',
+	'Every' => 'Svaki',
+	'Schedule' => 'Raspored',
+	'Start' => 'Početak',
+	'End' => 'Kraj',
+	'On completion preserve' => 'Zadrži po završetku',
+
+	'Tables' => 'Tabele',
+	'Tables and views' => 'Tabele i pogledi',
+	'Table' => 'Tabela',
+	'No tables.' => 'Bez tabela.',
+	'Alter table' => 'Ažuriraj tabelu',
+	'Create table' => 'Napravi tabelu',
+	'Table has been dropped.' => 'Tabela je izbrisana.',
+	'Tables have been dropped.' => 'Tabele su izbrisane.',
+	'Tables have been optimized.' => 'Tabele su optimizovane.',
+	'Table has been altered.' => 'Tabela je izmijenjena.',
+	'Table has been created.' => 'Tabela je spašena.',
+	'Table name' => 'Naziv tabele',
+	'Show structure' => 'Prikaži strukturu',
+	'engine' => 'stroj',
+	'collation' => 'Sravnjivanje',
+	'Column name' => 'Naziv kolumne',
+	'Type' => 'Tip',
+	'Length' => 'Dužina',
+	'Auto Increment' => 'Auto-priraštaj',
+	'Options' => 'Opcije',
+	'Comment' => 'Komentar',
+	'Default values' => 'Podrazumijevane vrijednosti',
+	'Drop' => 'Izbriši',
+	'Are you sure?' => 'Da li ste sigurni?',
+	'Move up' => 'Pomijeri na gore',
+	'Move down' => 'Pomijeri na dole',
+	'Remove' => 'Ukloni',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Premašen je maksimalni broj dozvoljenih polja. Molim uvećajte %s.',
+
+	'Partition by' => 'Podijeli po',
+	'Partitions' => 'Podijele',
+	'Partition name' => 'Ime podijele',
+	'Values' => 'Vrijednosti',
+
+	'View' => 'Pogled',
+	'View has been dropped.' => 'Pogled je izbrisan.',
+	'View has been altered.' => 'Pogled je izmijenjen.',
+	'View has been created.' => 'Pogled je spašen.',
+	'Alter view' => 'Ažuriraj pogled',
+	'Create view' => 'Napravi pogled',
+
+	'Indexes' => 'Indeksi',
+	'Indexes have been altered.' => 'Indeksi su izmijenjeni.',
+	'Alter indexes' => 'Ažuriraj indekse',
+	'Add next' => 'Dodaj slijedeći',
+	'Index Type' => 'Tip indeksa',
+	'Column (length)' => 'kolumna (dužina)',
+
+	'Foreign keys' => 'Strani ključevi',
+	'Foreign key' => 'Strani ključ',
+	'Foreign key has been dropped.' => 'Strani ključ je izbrisan.',
+	'Foreign key has been altered.' => 'Strani ključ je izmijenjen.',
+	'Foreign key has been created.' => 'Strani ključ je spašen.',
+	'Target table' => 'Ciljna tabela',
+	'Change' => 'izmijeni',
+	'Source' => 'Izvor',
+	'Target' => 'Cilj',
+	'Add column' => 'Dodaj kolumnu',
+	'Alter' => 'Ažuriraj',
+	'Add foreign key' => 'Dodaj strani ključ',
+	'ON DELETE' => 'ON DELETE (prilikom brisanja)',
+	'ON UPDATE' => 'ON UPDATE (prilikom osvežavanja)',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Izvorne i ciljne kolumne moraju biti istog tipa, ciljna kolumna mora biti indeksirana i izvorna tabela mora sadržati podatke iz ciljne.',
+
+	'Triggers' => 'Okidači',
+	'Add trigger' => 'Dodaj okidač',
+	'Trigger has been dropped.' => 'Okidač je izbrisan.',
+	'Trigger has been altered.' => 'Okidač je izmijenjen.',
+	'Trigger has been created.' => 'Okidač je spašen.',
+	'Alter trigger' => 'Ažuriraj okidač',
+	'Create trigger' => 'Formiraj okidač',
+	'Time' => 'Vrijeme',
+	'Event' => 'Događaj',
+	'Name' => 'Ime',
+
+	'select' => 'izaberi',
+	'Select' => 'Izaberi',
+	'Selected' => 'Izabrano',
+	'Select data' => 'Izaberi podatke',
+	'Functions' => 'Funkcije',
+	'Aggregation' => 'Sakupljanje',
+	'Search' => 'Pretraga',
+	'anywhere' => 'bilo gdje',
+	'Search data in tables' => 'Pretraži podatke u tabelama',
+	'Sort' => 'Poređaj',
+	'descending' => 'opadajuće',
+	'Limit' => 'Granica',
+	'Text length' => 'Dužina teksta',
+	'Action' => 'Akcija',
+	'Full table scan' => 'Skreniranje kompletne tabele',
+	'Unable to select the table' => 'Ne mogu da izaberem tabelu',
+	'No rows.' => 'Bez redova.',
+	'%d row(s)' => array('%d red', '%d reda', '%d redova'),
+	'Page' => 'Strana',
+	'last' => 'poslijednja',
+	'Loading' => 'Učitavam',
+	'Load more data' => 'Učitavam još podataka',
+	'whole result' => 'ceo rezultat',
+	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajtova'),
+
+	'Import' => 'Uvoz',
+	'%d row(s) have been imported.' => array('%d red je uvežen.', '%d reda su uvežena.', '%d redova je uveženo.'),
+
+	// in-place editing in select
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrijednost za izmijenu.',
+	'Use edit link to modify this value.' => 'Koristi vezu za izmijenu ove vrijednosti.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Stavka %s je spašena.',
+	'Item has been deleted.' => 'Stavka je izbrisana.',
+	'Item has been updated.' => 'Stavka je izmijenjena.',
+	'%d item(s) have been affected.' => array('%d stavka je ažurirana.', '%d stavke su ažurirane.', '%d stavki je ažurirano.'),
+	'New item' => 'Nova stavka',
+	'original' => 'original',
+	// label for value '' in enum data type
+	'empty' => 'prazno',
+	'edit' => 'izmijeni',
+	'Edit' => 'Izmijeni',
+	'Insert' => 'Umetni',
+	'Save' => 'Sačuvaj',
+	'Save and continue edit' => 'Sačuvaj i nastavi uređenje',
+	'Save and insert next' => 'Sačuvaj i umijetni slijedeće',
+	'Clone' => 'Dupliraj',
+	'Delete' => 'Izbriši',
+	'Modify' => 'Izmjene',
+
+	'E-mail' => 'El. pošta',
+	'From' => 'Od',
+	'Subject' => 'Naslov',
+	'Attachments' => 'Prilozi',
+	'Send' => 'Pošalji',
+	'%d e-mail(s) have been sent.' => array('%d poruka el. pošte je poslata.', '%d poruke el. pošte su poslate.', '%d poruka el. pošte je poslato.'),
+
+	// data type descriptions
+	'Numbers' => 'Broj',
+	'Date and time' => 'Datum i vrijeme',
+	'Strings' => 'Tekst',
+	'Binary' => 'Binarno',
+	'Lists' => 'Liste',
+	'Network' => 'Mreža',
+	'Geometry' => 'Geometrija',
+	'Relations' => 'Odnosi',
+
+	'Editor' => 'Uređivač',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1.',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'dd.mm.[yyyy].',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'sad',
+	'yes' => 'da',
+	'no' => 'ne',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Datoteka već postoji.',
+	'Please use one of the extensions %s.' => 'Molim koristite jedan od nastavaka %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Ažuriraj šemu',
+	'Create schema' => 'Formiraj šemu',
+	'Schema has been dropped.' => 'Šema je izbrisana.',
+	'Schema has been created.' => 'Šema je spašena.',
+	'Schema has been altered.' => 'Šema je izmijenjena.',
+	'Schema' => 'Šema',
+	'Invalid schema.' => 'Šema nije ispravna.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Nizovi',
+	'Create sequence' => 'Napravi niz',
+	'Sequence has been dropped.' => 'Niz je izbrisan.',
+	'Sequence has been created.' => 'Niz je formiran.',
+	'Sequence has been altered.' => 'Niz je izmijenjen.',
+	'Alter sequence' => 'Ažuriraj niz',
+
+	// PostgreSQL user types support
+	'User types' => 'Korisnički tipovi',
+	'Create type' => 'Definiši tip',
+	'Type has been dropped.' => 'Tip je izbrisan.',
+	'Type has been created.' => 'tip je spašen.',
+	'Alter type' => 'Ažuriraj tip',
+);

adminer/lang/ca.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Contrasenya',
 	'Select database' => 'Selecciona base de dades',
 	'Invalid database.' => 'Base de dades invàlida.',
-	'Create new database' => 'Crea una nova base de dades',
 	'Table has been dropped.' => 'S\'ha suprimit la taula.',
 	'Table has been altered.' => 'S\'ha modificat la taula.',
 	'Table has been created.' => 'S\'ha creat la taula.',

adminer/lang/cs.inc.php

@@ -10,16 +10,20 @@ $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>.',
 	'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.',
 	'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/" target="_blank">Implement</a> %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. <a href="https://www.adminer.org/cs/extension/" target="_blank">Implementujte</a> metodu %s, aby platilo stále.',
+	'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',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
 	'If you did not send this request from Adminer then close this page.' => 'Pokud jste tento požadavek neposlali z Adminera, tak tuto stránku zavřete.',
 	'No 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.',
 	'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.',
 	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
 	'Refresh' => 'Obnovit',
 	
@@ -49,6 +53,8 @@ $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',
+	'Warnings' => 'Varování',
+	'ATTACH queries are not supported.' => 'Dotazy ATTACH nejsou podporované.',
 	'Execute' => 'Provést',
 	'Stop on error' => 'Zastavit při chybě',
 	'Show only errors' => 'Zobrazit pouze chyby',
@@ -79,10 +85,10 @@ $translations = array(
 	
 	'Database' => 'Databáze',
 	'database' => 'databáze',
+	'DB' => 'DB',
 	'Use' => 'Vybrat',
 	'Select database' => 'Vybrat databázi',
 	'Invalid database.' => 'Nesprávná databáze.',
-	'Create new database' => 'Vytvořit novou databázi',
 	'Database has been dropped.' => 'Databáze byla odstraněna.',
 	'Databases have been dropped.' => 'Databáze byly odstraněny.',
 	'Database has been created.' => 'Databáze byla vytvořena.',
@@ -168,6 +174,7 @@ $translations = array(
 	'Default value' => 'Výchozí hodnota',
 	'Default values' => 'Výchozí hodnoty',
 	'Drop' => 'Odstranit',
+	'Drop %s?' => 'Odstranit %s?',
 	'Are you sure?' => 'Opravdu?',
 	'Size' => 'Velikost',
 	'Compute' => 'Spočítat',
@@ -182,13 +189,12 @@ $translations = array(
 	'Values' => 'Hodnoty',
 	
 	'View' => 'Pohled',
-	'Materialized View' => 'Materializovaný pohled',
+	'Materialized view' => 'Materializovaný pohled',
 	'View has been dropped.' => 'Pohled byl odstraněn.',
 	'View has been altered.' => 'Pohled byl změněn.',
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
-	'Create materialized view' => 'Vytvořit materializovaný pohled',
 	
 	'Indexes' => 'Indexy',
 	'Indexes have been altered.' => 'Indexy byly změněny.',

adminer/lang/da.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logged as: %s' => 'Logget ind som: %s',
 	'Logout successful.' => 'Log af vellykket.',
 	'Invalid credentials.' => 'Ugyldige log ind oplysninger.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://www.adminer.org/en/extension/" target="_blank">Implementer</a> en metode for %s for at gøre det permanent.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for at gøre det permanent.',
 	'Language' => 'Sprog',
 	'Invalid CSRF token. Send the form again.' => 'Ugyldigt CSRF-token - Genindsend formen.',
 	'No extension' => 'Ingen udvidelse',
@@ -68,7 +68,6 @@ $translations = array(
 	'Use' => 'Brug',
 	'Select database' => 'Vælg database',
 	'Invalid database.' => 'Ugyldig database.',
-	'Create new database' => 'Opret ny database',
 	'Database has been dropped.' => 'Databasen er blevet slettet.',
 	'Databases have been dropped.' => 'Databasene er blevet slettet.',
 	'Database has been created.' => 'Databasen er oprettet.',

adminer/lang/de.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Passwort',
 	'Select database' => 'Datenbank auswählen',
 	'Invalid database.' => 'Datenbank ungültig.',
-	'Create new database' => 'Datenbank erstellen',
 	'Table has been dropped.' => 'Tabelle wurde entfernt.',
 	'Table has been altered.' => 'Tabelle wurde geändert.',
 	'Table has been created.' => 'Tabelle wurde erstellt.',
@@ -284,6 +283,6 @@ $translations = array(
 	'Saving' => 'Speichere',
 	'yes' => 'ja',
 	'no' => 'nein',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen.  <a href="https://www.adminer.org/de/extension/" target="_blank">Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
 );

adminer/lang/el.inc.php

@@ -12,7 +12,7 @@ $translations = array(
 	'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/" target="_blank">Implement</a> %s method to make it permanent.' => 'Έλειξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/" target="_blank">Ενεργοποιήστε</a> τη μέθοδο %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, τότε κλείστε αυτή τη σελίδα.',
@@ -83,7 +83,6 @@ $translations = array(
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
 	'Invalid database.' => 'Άκυρη Β.Δ.',
-	'Create new database' => 'Δημιουργία νέας Β.Δ.',
 	'Database has been dropped.' => 'Η Β.Δ. διαγράφηκε.',
 	'Databases have been dropped.' => 'Οι Β.Δ. διαγράφηκαν.',
 	'Database has been created.' => 'Η Β.Δ. δημιουργήθηκε.',
@@ -150,7 +149,7 @@ $translations = array(
 	'Table' => 'Πίνακας',
 	'No tables.' => 'Χωρίς πίνακες.',
 	'Alter table' => 'Τροποποίηση πίνακα',
-	'Create table' => 'Δημιουργία  πίνακα',
+	'Create table' => 'Δημιουργία πίνακα',
 	'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
 	'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
 	'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
@@ -183,13 +182,12 @@ $translations = array(
 	'Values' => 'Τιμές',
 	
 	'View' => 'Προβολή',
-	'Materialized View' => 'Υλοποιημένη Προβολή',
+	'Materialized view' => 'Υλοποιημένη προβολή',
 	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
 	'View has been altered.' => 'Η προβολή τροποποιήθηκε.',
 	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
 	'Alter view' => 'Τροποποίηση προβολής',
 	'Create view' => 'Δημιουργία προβολής',
-	'Create materialized view' => 'Δημιουργία Υλοποιημένης προβολής',
 	
 	'Indexes' => 'Δείκτες',
 	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',

adminer/lang/es.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Contraseña',
 	'Select database' => 'Seleccionar Base de datos',
 	'Invalid database.' => 'Base de datos incorrecta.',
-	'Create new database' => 'Crear nueva base de datos',
 	'Table has been dropped.' => 'Tabla eliminada.',
 	'Table has been altered.' => 'Tabla modificada.',
 	'Table has been created.' => 'Tabla creada.',
@@ -45,9 +44,9 @@ $translations = array(
 	'Delete' => 'Eliminar',
 	'Database' => 'Base de datos',
 	'Routines' => 'Procedimientos',
-	'Indexes have been altered.' => 'Indices actualizados.',
-	'Indexes' => 'Indices',
-	'Alter indexes' => 'Modificar indices',
+	'Indexes have been altered.' => 'Índices actualizados.',
+	'Indexes' => 'Índices',
+	'Alter indexes' => 'Modificar índices',
 	'Add next' => 'Agregar',
 	'Language' => 'Idioma',
 	'Select' => 'Mostrar',
@@ -78,7 +77,7 @@ $translations = array(
 	'File uploads are disabled.' => 'Importación de archivos deshablilitada.',
 	'Routine has been called, %d row(s) affected.' => array('Consulta ejecutada, %d registro afectado.', 'Consulta ejecutada, %d registros afectados.'),
 	'Call' => 'Llamar',
-	'No extension' => 'No hay extension',
+	'No extension' => 'No hay extensión',
 	'None of the supported PHP extensions (%s) are available.' => 'Ninguna de las extensiones PHP soportadas (%s) está disponible.',
 	'Session support must be enabled.' => 'Deben estar habilitadas las sesiones.',
 	'Session expired, please login again.' => 'Sesión caducada, por favor escriba su clave de nuevo.',
@@ -114,7 +113,7 @@ $translations = array(
 	'Routine has been dropped.' => 'Procedimiento eliminado.',
 	'Routine has been altered.' => 'Procedimiento modificado.',
 	'Routine has been created.' => 'Procedimiento creado.',
-	'Alter function' => 'Modificar Función',
+	'Alter function' => 'Modificar función',
 	'Alter procedure' => 'Modificar procedimiento',
 	'Return type' => 'Tipo de valor de vuelta',
 	'Add trigger' => 'Agregar disparador',
@@ -128,7 +127,7 @@ $translations = array(
 	'%s version: %s through PHP extension %s' => 'Versión %s: %s a través de la extensión de PHP %s',
 	'%d row(s)' => array('%d registro', '%d registros'),
 	'Remove' => 'Eliminar',
-	'Are you sure?' => 'Está seguro?',
+	'Are you sure?' => '¿Está seguro?',
 	'Privileges' => 'Privilegios',
 	'Create user' => 'Crear Usuario',
 	'User has been dropped.' => 'Usuario eliminado.',
@@ -140,7 +139,7 @@ $translations = array(
 	'Grant' => 'Conceder',
 	'Revoke' => 'Impedir',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data demasiado grande. Reduzca el tamaño o aumente la directiva de configuración %s.',
-	'Logged as: %s' => 'Logeado como: %s',
+	'Logged as: %s' => 'Logueado como: %s',
 	'Move up' => 'Mover arriba',
 	'Move down' => 'Mover abajo',
 	'Functions' => 'Funciones',
@@ -192,7 +191,7 @@ $translations = array(
 	'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',
 	'Partitions' => 'Particiones',
-	'Partition name' => 'Nombre de Partición',
+	'Partition name' => 'Nombre de partición',
 	'Values' => 'Valores',
 	'%d row(s) have been imported.' => array('%d registro importado.', '%d registros importados.'),
 	'anywhere' => 'donde sea',
@@ -249,16 +248,16 @@ $translations = array(
 	'System' => 'Motor de base de datos',
 	'Select data' => 'Visualizar contenido',
 	'Show structure' => 'Mostrar estructura',
-	'empty' => 'ningúno',
+	'empty' => 'ninguno',
 	'Network' => 'Red',
 	'Geometry' => 'Geometría',
 	'File exists.' => 'Ese archivo ya existe.',
 	'Attachments' => 'Adjuntos',
-	'%d query(s) executed OK.' => array('%d sentencia sql ejecutada correctamente.', '%d sentencias sql ejecutadas correctamente.'),
+	'%d query(s) executed OK.' => array('%d sentencia SQL ejecutada correctamente.', '%d sentencias SQL ejecutadas correctamente.'),
 	'Show only errors' => 'Mostrar solamente errores',
 	'Refresh' => 'Refrescar',
 	'Invalid schema.' => 'Esquema inválido.',
-	'Please use one of the extensions %s.' => 'Por favor use una de las extensiones %s.',
+	'Please use one of the extensions %s.' => 'Por favor, use una de las extensiones %s.',
 	'now' => 'ahora',
 	'ltr' => 'ltr',
 	'Tables have been copied.' => 'Tablas copiadas.',

adminer/lang/et.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Parool',
 	'Select database' => 'Vali andmebaas',
 	'Invalid database.' => 'Tundmatu andmebaas.',
-	'Create new database' => 'Loo uus andmebaas',
 	'Table has been dropped.' => 'Tabel on edukalt kustutatud.',
 	'Table has been altered.' => 'Tabeli andmed on edukalt muudetud.',
 	'Table has been created.' => 'Tabel on edukalt loodud.',

adminer/lang/fa.inc.php

@@ -12,7 +12,7 @@ $translations = array(
 	'Logout successful.' => 'با موفقیت خارج شدید.',
 	'Invalid credentials.' => 'اعتبار سنجی نامعتبر.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.', 'ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://www.adminer.org/en/extension/" target="_blank">پیاده سازی</a> کرده تا آن را دائمی سازید.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://www.adminer.org/en/extension/"%s>پیاده سازی</a> کرده تا آن را دائمی سازید.',
 	'Language' => 'زبان',
 	'Invalid CSRF token. Send the form again.' => 'CSRF token نامعتبر است. دوباره سعی کنید.',
 	'No extension' => 'پسوند نامعتبر',
@@ -81,7 +81,6 @@ $translations = array(
 	'Use' => 'استفاده',
 	'Select database' => 'انتخاب پایگاه داده',
 	'Invalid database.' => 'پایگاه داده نامعتبر.',
-	'Create new database' => 'ایجاد پایگاه داده جدید',
 	'Database has been dropped.' => 'پایگاه داده حذف شد.',
 	'Databases have been dropped.' => 'پایگاه های داده حذف شدند.',
 	'Database has been created.' => 'پایگاه داده ایجاد شد.',
@@ -181,13 +180,12 @@ $translations = array(
 	'Values' => 'مقادیر',
 	
 	'View' => 'نمایش',
-	'Materialized View' => 'نمایه مادی',
+	'Materialized view' => 'نمایه مادی',
 	'View has been dropped.' => 'نمایش حذف شد.',
 	'View has been altered.' => 'نمایش ویرایش شد.',
 	'View has been created.' => 'نمایش ایجاد شد.',
 	'Alter view' => 'حذف نمایش',
 	'Create view' => 'ایجاد نمایش',
-	'Create materialized view' => 'ایجاد نمایه مادی',
 	
 	'Indexes' => 'ایندکسها',
 	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',

adminer/lang/fi.inc.php

@@ -0,0 +1,336 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Järjestelmä',
+	'Server' => 'Palvelin',
+	'Username' => 'Käyttäjänimi',
+	'Password' => 'Salasana',
+	'Permanent login' => 'Haluan pysyä kirjautuneena',
+	'Login' => 'Kirjaudu',
+	'Logout' => 'Kirjaudu ulos',
+	'Logged as: %s' => 'Olet kirjautunut käyttäjänä: %s',
+	'Logout successful.' => 'Uloskirjautuminen onnistui.',
+	'Invalid credentials.' => 'Virheelliset kirjautumistiedot.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.', 'Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-salasana ei ole enää voimassa. <a href="https://www.adminer.org/en/extension/"%s>Toteuta</a> %s-metodi sen tekemiseksi pysyväksi.',
+	'Language' => 'Kieli',
+	'Invalid CSRF token. Send the form again.' => 'Virheellinen CSRF-vastamerkki. Lähetä lomake uudelleen.',
+	'If you did not send this request from Adminer then close this page.' => 'Jollet lähettänyt tämä pyyntö Adminerista, sulje tämä sivu.',
+	'No extension' => 'Ei laajennusta',
+	'None of the supported PHP extensions (%s) are available.' => 'Mitään tuetuista PHP-laajennuksista (%s) ei ole käytettävissä.',
+	'Session support must be enabled.' => 'Istuntotuki on oltava päällä.',
+	'Session expired, please login again.' => 'Istunto vanhentunut, kirjaudu uudelleen.',
+	'%s version: %s through PHP extension %s' => '%s versio: %s PHP-laajennuksella %s',
+	'Refresh' => 'Virkistä',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => 'Oikeudet',
+	'Create user' => 'Luo käyttäjä',
+	'User has been dropped.' => 'Käyttäjä poistettiin.',
+	'User has been altered.' => 'Käyttäjää muutettiin.',
+	'User has been created.' => 'Käyttäjä luotiin.',
+	'Hashed' => 'Hashed',
+	'Column' => 'Sarake',
+	'Routine' => 'Rutiini',
+	'Grant' => 'Myönnä',
+	'Revoke' => 'Kiellä',
+	
+	'Process list' => 'Prosessilista',
+	'%d process(es) have been killed.' => array('%d prosessi lopetettu.', '%d prosessia lopetettu..'),
+	'Kill' => 'Lopeta',
+	
+	'Variables' => 'Muuttujat',
+	'Status' => 'Tila',
+	
+	'SQL command' => 'SQL-komento',
+	'%d query(s) executed OK.' => array('%d kysely onnistui.', '%d kyselyä onnistui.'),
+	'Query executed OK, %d row(s) affected.' => array('Kysely onnistui, kohdistui %d riviin.', 'Kysely onnistui, kohdistui %d riviin.'),
+	'No commands to execute.' => 'Ei komentoja suoritettavana.',
+	'Error in query' => 'Virhe kyselyssä',
+	'Execute' => 'Suorita',
+	'Stop on error' => 'Pysähdy virheeseen',
+	'Show only errors' => 'Näytä vain virheet',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historia',
+	'Clear' => 'Tyhjennä',
+	'Edit all' => 'Muokkaa kaikkia',
+	
+	'File upload' => 'Tiedoston lataus palvelimelle',
+	'From server' => 'Verkkopalvelimella Adminer-kansiossa oleva tiedosto',
+	'Webserver file %s' => 'Verkkopalvelintiedosto %s',
+	'Run file' => 'Suorita tämä',
+	'File does not exist.' => 'Tiedostoa ei ole.',
+	'File uploads are disabled.' => 'Tiedostojen lataaminen palvelimelle on estetty.',
+	'Unable to upload a file.' => 'Tiedostoa ei voida ladata palvelimelle.',
+	'Maximum allowed file size is %sB.' => 'Suurin sallittu tiedostokoko on %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Liian suuri POST-datamäärä. Pienennä dataa tai kasvata arvoa %s konfigurointitiedostossa.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Voit ladata suuren SQL-tiedoston FTP:n kautta ja tuoda sen sitten palvelimelta.',
+	'You are offline.' => 'Olet offline-tilassa.',
+	
+	'Export' => 'Vienti',
+	'Output' => 'Tulos',
+	'open' => 'avaa',
+	'save' => 'tallenna',
+	'Saving' => 'Tallennetaan',
+	'Format' => 'Muoto',
+	'Data' => 'Data',
+	
+	'Database' => 'Tietokanta',
+	'database' => 'tietokanta',
+	'Use' => 'Käytä',
+	'Select database' => 'Valitse tietokanta',
+	'Invalid database.' => 'Tietokanta ei kelpaa.',
+	'Database has been dropped.' => 'Tietokanta on poistettu.',
+	'Databases have been dropped.' => 'Tietokannat on poistettu.',
+	'Database has been created.' => 'Tietokanta on luotu.',
+	'Database has been renamed.' => 'Tietokanta on nimetty uudelleen.',
+	'Database has been altered.' => 'Tietokantaa on muutettu.',
+	'Alter database' => 'Muuta tietokantaa',
+	'Create database' => 'Luo tietokanta',
+	'Database schema' => 'Tietokantakaava',
+	
+	// link to current database schema layout
+	'Permanent link' => 'Pysyvä linkki',
+	
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Moottori',
+	'Collation' => 'Kollaatio',
+	'Data Length' => 'Datan pituus',
+	'Index Length' => 'Indeksin pituus',
+	'Data Free' => 'Vapaa tila',
+	'Rows' => 'Riviä',
+	'%d in total' => '%d kaikkiaan',
+	'Analyze' => 'Analysoi',
+	'Optimize' => 'Optimoi',
+	'Vacuum' => 'Siivoa',
+	'Check' => 'Tarkista',
+	'Repair' => 'Korjaa',
+	'Truncate' => 'Tyhjennä',
+	'Tables have been truncated.' => 'Taulujen sisältö on tyhjennetty.',
+	'Move to other database' => 'Siirrä toiseen tietokantaan',
+	'Move' => 'Siirrä',
+	'Tables have been moved.' => 'Taulut on siirretty.',
+	'Copy' => 'Kopioi',
+	'Tables have been copied.' => 'Taulut on kopioitu.',
+	
+	'Routines' => 'Rutiinit',
+	'Routine has been called, %d row(s) affected.' => array('Rutiini kutsuttu, kohdistui %d riviin.', 'Rutiini kutsuttu, kohdistui %d riviin.'),
+	'Call' => 'Kutsua',
+	'Parameter name' => 'Parametrin nimi',
+	'Create procedure' => 'Luo proseduuri',
+	'Create function' => 'Luo funktio',
+	'Routine has been dropped.' => 'Rutiini on poistettu.',
+	'Routine has been altered.' => 'Rutiinia on muutettu.',
+	'Routine has been created.' => 'Rutiini on luotu.',
+	'Alter function' => 'Muuta funktiota',
+	'Alter procedure' => 'Muuta proseduuria',
+	'Return type' => 'Palautustyyppi',
+	
+	'Events' => 'Tapahtumat',
+	'Event has been dropped.' => 'Tapahtuma on poistettu.',
+	'Event has been altered.' => 'Tapahtumaa on muutettu.',
+	'Event has been created.' => 'Tapahtuma on luotu.',
+	'Alter event' => 'Muuta tapahtumaa',
+	'Create event' => 'Luo tapahtuma',
+	'At given time' => 'Tiettynä aikana',
+	'Every' => 'Joka',
+	'Schedule' => 'Aikataulu',
+	'Start' => 'Aloitus',
+	'End' => 'Lopetus',
+	'On completion preserve' => 'Säilytä, kun valmis',
+	
+	'Tables' => 'Taulut',
+	'Tables and views' => 'Taulut ja näkymät',
+	'Table' => 'Taulu',
+	'No tables.' => 'Ei tauluja.',
+	'Alter table' => 'Muuta taulua',
+	'Create table' => 'Luo taulu',
+	'Table has been dropped.' => 'Taulu on poistettu.',
+	'Tables have been dropped.' => 'Tauluja on poistettu.',
+	'Tables have been optimized.' => 'Taulut on optimoitu.',
+	'Table has been altered.' => 'Taulua on muutettu.',
+	'Table has been created.' => 'Taulu on luotu.',
+	'Table name' => 'Taulun nimi',
+	'Show structure' => 'Näytä rakenne',
+	'engine' => 'moottori',
+	'collation' => 'kollaatio',
+	'Column name' => 'Sarakkeen nimi',
+	'Type' => 'Tyyppi',
+	'Length' => 'Pituus',
+	'Auto Increment' => 'Automaattinen lisäys',
+	'Options' => 'Asetukset',
+	'Comment' => 'Kommentit',
+	'Default value' => 'Oletusarvo',
+	'Default values' => 'Oletusarvot',
+	'Drop' => 'Poista',
+	'Are you sure?' => 'Oletko varma?',
+	'Size' => 'Koko',
+	'Compute' => 'Laske',
+	'Move up' => 'Siirrä ylös',
+	'Move down' => 'Siirrä alas',
+	'Remove' => 'Poista',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
+	
+	'Partition by' => 'Osioi arvolla',
+	'Partitions' => 'Osiot',
+	'Partition name' => 'Osion nimi',
+	'Values' => 'Arvot',
+	
+	'View' => 'Näkymä',
+	'Materialized view' => 'Materialisoitunut näkymä',
+	'View has been dropped.' => 'Näkymä on poistettu.',
+	'View has been altered.' => 'Näkymää on muutettu.',
+	'View has been created.' => 'Näkymä on luotu.',
+	'Alter view' => 'Muuta näkymää',
+	'Create view' => 'Luo näkymä',
+	
+	'Indexes' => 'Indeksit',
+	'Indexes have been altered.' => 'Indeksejä on muutettu.',
+	'Alter indexes' => 'Muuta indeksejä',
+	'Add next' => 'Lisää seuraava',
+	'Index Type' => 'Indeksityyppi',
+	'Column (length)' => 'Sarake (pituus)',
+	
+	'Foreign keys' => 'Vieraat avaimet',
+	'Foreign key' => 'Vieras avain',
+	'Foreign key has been dropped.' => 'Vieras avain on poistettu.',
+	'Foreign key has been altered.' => 'Vierasta avainta on muutettu.',
+	'Foreign key has been created.' => 'Vieras avain on luotu.',
+	'Target table' => 'Kohdetaulu',
+	'Change' => 'Muuta',
+	'Source' => 'Lähde',
+	'Target' => 'Kohde',
+	'Add column' => 'Lisää sarake',
+	'Alter' => 'Muuta',
+	'Add foreign key' => 'Lisää vieras avain',
+	'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.' => 'Lähde- ja kohdesarakkeiden tulee olla samaa tietotyyppiä, kohdesarakkeisiin tulee olla indeksi ja dataa, johon viitataan, täytyy olla.',
+	
+	'Triggers' => 'Liipaisimet',
+	'Add trigger' => 'Lisää liipaisin',
+	'Trigger has been dropped.' => 'Liipaisin on poistettu.',
+	'Trigger has been altered.' => 'Liipaisinta on muutettu.',
+	'Trigger has been created.' => 'Liipaisin on luotu.',
+	'Alter trigger' => 'Muuta liipaisinta',
+	'Create trigger' => 'Luo liipaisin',
+	'Time' => 'Aika',
+	'Event' => 'Tapahtuma',
+	'Name' => 'Nimi',
+	
+	'select' => 'valitse',
+	'Select' => 'Valitse',
+	'Select data' => 'Valitse data',
+	'Functions' => 'Funktiot',
+	'Aggregation' => 'Aggregaatiot',
+	'Search' => 'Hae',
+	'anywhere' => 'kaikkialta',
+	'Search data in tables' => 'Hae dataa tauluista',
+	'Sort' => 'Lajittele',
+	'descending' => 'alenevasti',
+	'Limit' => 'Raja',
+	'Limit rows' => 'Rajoita rivimäärää',
+	'Text length' => 'Tekstin pituus',
+	'Action' => 'Toimenpide',
+	'Full table scan' => 'Koko taulun läpikäynti',
+	'Unable to select the table' => 'Taulua ei voitu valita',
+	'No rows.' => 'Ei rivejä.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d rivi', '%d riviä'),
+	'Page' => 'Sivu',
+	'last' => 'viimeinen',
+	'Load more data' => 'Lataa lisää dataa',
+	'Loading' => 'Ladataan',
+	'whole result' => 'koko tulos',
+	'%d byte(s)' => array('%d tavu', '%d tavua'),
+	
+	'Import' => 'Tuonti',
+	'%d row(s) have been imported.' => array('%d rivi tuotiin.', '%d riviä tuotiin.'),
+	'File must be in UTF-8 encoding.' => 'Tiedoston täytyy olla UTF-8-muodossa.',
+	
+	// in-place editing in select
+	'Modify' => 'Muuta',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+napsauta arvoa muuttaaksesi.',
+	'Use edit link to modify this value.' => 'Käytä muokkaa-linkkiä muuttaaksesi tätä arvoa.',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Tietue%s lisättiin.',
+	'Item has been deleted.' => 'Tietue poistettiin.',
+	'Item has been updated.' => 'Tietue päivitettiin.',
+	'%d item(s) have been affected.' => array('Kohdistui %d tietueeseen.', 'Kohdistui %d tietueeseen.'),
+	'New item' => 'Uusi tietue',
+	'original' => 'alkuperäinen',
+	// label for value '' in enum data type
+	'empty' => 'tyhjä',
+	'edit' => 'muokkaa',
+	'Edit' => 'Muokkaa',
+	'Insert' => 'Lisää',
+	'Save' => 'Tallenna',
+	'Save and continue edit' => 'Tallenna ja jatka muokkaamista',
+	'Save and insert next' => 'Tallenna ja lisää seuraava',
+	'Selected' => 'Valitut',
+	'Clone' => 'Kloonaa',
+	'Delete' => 'Poista',
+	'You have no privileges to update this table.' => 'Sinulla ei ole oikeutta päivittää tätä taulua.',
+	
+	'E-mail' => 'S-posti',
+	'From' => 'Lähettäjä',
+	'Subject' => 'Aihe',
+	'Attachments' => 'Liitteet',
+	'Send' => 'Lähetä',
+	'%d e-mail(s) have been sent.' => array('% sähköpostiviestiä lähetetty.', '% sähköpostiviestiä lähetetty.'),
+	
+	// data type descriptions
+	'Numbers' => 'Numerot',
+	'Date and time' => 'Päiväys ja aika',
+	'Strings' => 'Merkkijonot',
+	'Binary' => 'Binäärinen',
+	'Lists' => 'Luettelot',
+	'Network' => 'Verkko',
+	'Geometry' => 'Geometria',
+	'Relations' => 'Suhteet',
+	
+	'Editor' => 'Editori',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'pp.kk.[vvvv]',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nyt',
+	'yes' => 'kyllä',
+	'no' => 'ei',
+	
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Tiedosto on olemassa.',
+	'Please use one of the extensions %s.' => 'Käytä jotain %s-laajennuksista.',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Muuta kaavaa',
+	'Create schema' => 'Luo kaava',
+	'Schema has been dropped.' => 'Kaava poistettiin.',
+	'Schema has been created.' => 'Kaava luotiin.',
+	'Schema has been altered.' => 'Kaavaa muutettiin.',
+	'Schema' => 'Kaava',
+	'Invalid schema.' => 'Kaava ei kelpaa.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Sekvenssit',
+	'Create sequence' => 'Luo sekvenssi',
+	'Sequence has been dropped.' => 'Sekvenssi on poistettu.',
+	'Sequence has been created.' => 'Sekvenssi on luotu.',
+	'Sequence has been altered.' => 'Sekvenssiä on muutettu.',
+	'Alter sequence' => 'Muuta sekvenssiä',
+	
+	// PostgreSQL user types support
+	'User types' => 'Käyttäjän tyypit',
+	'Create type' => 'Luo tyyppi',
+	'Type has been dropped.' => 'Tyyppi poistettiin.',
+	'Type has been created.' => 'Tyyppi luotiin.',
+	'Alter type' => 'Muuta tyyppiä',
+);

adminer/lang/fr.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Mot de passe',
 	'Select database' => 'Sélectionner la base de données',
 	'Invalid database.' => 'Base de données invalide.',
-	'Create new database' => 'Créer une base de données',
 	'Table has been dropped.' => 'La table a été effacée.',
 	'Table has been altered.' => 'La table a été modifiée.',
 	'Table has been created.' => 'La table a été créée.',
@@ -275,7 +274,7 @@ $translations = array(
 	'File must be in UTF-8 encoding.' => 'Les fichiers doivent être encodés en UTF-8.',
 	'Full table scan' => 'Scan de toute la table',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Trop de connexions échouées, essayez à nouveau dans %d minute.', 'Trop de connexions échouées, essayez à nouveau dans %d minutes.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Le mot de passe a expiré. <a href="https://www.adminer.org/en/extension/" target="_blank">Implémentez</a> la méthode %s afin de le rendre permanent.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Le mot de passe a expiré. <a href="https://www.adminer.org/en/extension/"%s>Implémentez</a> la méthode %s afin de le rendre permanent.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Vous pouvez uploader un gros fichier SQL par FTP et ensuite l\'importer depuis le serveur.',
 	'Size' => 'Taille',
 	'Compute' => 'Calcul',
@@ -283,8 +282,7 @@ $translations = array(
 	'Saving' => 'Enregistrement',
 	'yes' => 'oui',
 	'no' => 'non',
-	'Materialized View' => 'Vue matérialisée',
-	'Create materialized view' => 'Créer une vue matérialisée',
+	'Materialized view' => 'Vue matérialisée',
 	'%d / ' => '%d / ',
 	'Limit rows' => 'Limiter les lignes',
 	'Default value' => 'Valeur par défaut',

adminer/lang/gl.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Contrasinal',
 	'Select database' => 'Seleccionar Base de datos',
 	'Invalid database.' => 'Base de datos incorrecta.',
-	'Create new database' => 'Crear nova base de datos',
 	'Table has been dropped.' => 'Eliminouse a táboa.',
 	'Table has been altered.' => 'Modificouse a táboa.',
 	'Table has been created.' => 'Creouse a táboa.',
@@ -267,10 +266,9 @@ $translations = array(
 	'Edit all' => 'Editar todo',
 	'HH:MM:SS' => 'HH:MM:SS',
 	'Tables have been optimized.' => 'Optimizáronse as táboas',
-	'Materialized View' => 'Vista materializada',
+	'Materialized view' => 'Vista materializada',
 	'Vacuum' => 'Baleirar',
 	'Selected' => 'Selección',
-	'Create materialized view' => 'Crear vista materializada',
 	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8',
 	'Modify' => 'Modificar',
 	'Loading' => 'Cargando',
@@ -280,7 +278,7 @@ $translations = array(
 	'Default value' => 'Valor por defecto',
 	'Full table scan' => 'Escaneo completo da táboa',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto', 'Demasiados intentos de conexión, intentao de novo en %d minutos'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'O contrasinal principal caducou. <a href="https://www.adminer.org/en/extension/" target="_blank">Implementa</a> o método %s para facelo permanente.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'O contrasinal principal caducou. <a href="https://www.adminer.org/en/extension/"%s>Implementa</a> o método %s para facelo permanente.',
 	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor',
 	'Size' => 'Tamaño',

adminer/lang/he.inc.php

@@ -0,0 +1,294 @@
+<?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 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.' => 'כשל באבטחת נתונים, שלח טופס שוב',
+	'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.' => 'שום תוסף 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 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 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' => 'שלול',
+	'%s version: %s through PHP extension %s' => '%s גרסה: %s דרך תוסף PHP %s',
+	'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' => 'לפי זמן נתון',
+	'Save and continue edit' => 'שמור והמשך לערוך',
+	'original' => 'מקורי',
+	'Tables have been truncated.' => 'הטבלה קוצרה',
+	'Tables have been moved.' => 'הטבלה הועברה',
+	'Tables have been dropped.' => 'הטבלה הושלכה',
+	'Tables and views' => 'טבלאות ותצוגות',
+	'Engine' => 'מנוע',
+	'Collation' => 'קולקציה',
+	'Data Length' => 'אורך נתונים',
+	'Index Length' => 'אורך אינדקס',
+	'Data Free' => 'נתונים משוחררים',
+	'Rows' => 'שורות',
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Analyze' => 'נתח',
+	'Optimize' => 'יעל',
+	'Check' => 'בדוק',
+	'Repair' => 'תקן',
+	'Truncate' => 'קצר',
+	'Move to other database' => 'העבר למסד נתונים אחר',
+	'Move' => 'העבר',
+	'%d item(s) have been affected.' => '%d פריטים הושפעו',
+	'whole result' => 'כל התוצאות',
+	'Clone' => 'שכפל',
+	'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 s',
+	'$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' => 'קובץ השרת %s',
+	'File does not exist.' => 'הקובץ אינו קיים',
+	'%d in total' => '%d בסך הכל',
+	'Permanent login' => 'התחבר לצמיתות',
+	'Databases have been dropped.' => 'מסד הנתונים הושלך',
+	'Database has 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.' => 'הסוג נוצר',
+	'Use edit link to modify this value.' => 'השתמש בקישור העריכה בשביל לשנות את הערך',
+	'last' => 'אחרון',
+	'From server' => 'משרת',
+	'System' => 'מערכת',
+	'Select data' => 'בחר נתונים',
+	'Show structure' => 'הראה מבנה',
+	'empty' => 'ריק',
+	'Network' => 'רשת',
+	'Geometry' => 'גיאומטריה',
+	'File exists.' => 'קובץ קיים',
+	'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' => 'rtl',
+	'Tables have been copied.' => 'הטבלה הועתקה',
+	'Copy' => 'העתק',
+	'Permanent link' => 'קישור סופי',
+	'Edit all' => 'ערוך הכל',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'Tables have been optimized.' => 'הטבלאות עברו אופטימיזציה',
+	'Materialized view' => 'תצוגת מימוש ',
+	'Vacuum' => 'וואקום',
+	'Selected' => 'נבחרים',
+	'Ctrl+click on a value to modify it.' => 'לחץ ctrl + לחיצת עכבר לערוך ערך זה',
+	'File must be in UTF-8 encoding.' => 'על הקובץ להיות בקידוד utf-8',
+	'Modify' => 'ערוך',
+	'Loading' => 'טוען',
+	'Load more data' => 'טען נתונים נוספים',
+	'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>.',
+	'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 ואז למשוך אותם מהשרת',
+	'Size' => 'גודל',
+	'Compute' => 'חישוב',
+	'You are offline.' => 'הינך לא מקוון',
+	'You have no privileges to update this table.' => 'אין לך ההרשאות המתאימות לעדכן טבלה זו',
+	'Saving' => 'שומר',
+	'yes' => 'כן',
+	'no' => 'לא',
+);

adminer/lang/hu.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Jelszó',
 	'Select database' => 'Adatbázis kiválasztása',
 	'Invalid database.' => 'Érvénytelen adatbázis.',
-	'Create new database' => 'Új adatbázis',
 	'Table has been dropped.' => 'A tábla eldobva.',
 	'Table has been altered.' => 'A tábla módosult.',
 	'Table has been created.' => 'A tábla létrejött.',

adminer/lang/id.inc.php

@@ -10,11 +10,11 @@ $translations = array(
 	'Logout' => 'Keluar',
 	'Logged as: %s' => 'Masuk sebagai: %s',
 	'Logout successful.' => 'Berhasil keluar.',
-	'Invalid credentials.' => 'Akses invalid.',
+	'Invalid credentials.' => 'Akses tidak sah.',
 	'Language' => 'Bahasa',
-	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalid. Kirim ulang formulir.',
-	'No extension' => 'Ekstensi tidak tersedia',
-	'None of the supported PHP extensions (%s) are available.' => 'Ekstensi PHP yang didukung (%s) tidak tersedia.',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Kirim ulang formulir.',
+	'No extension' => 'Ekstensi tidak ada',
+	'None of the supported PHP extensions (%s) are available.' => 'Ekstensi PHP yang didukung (%s) tidak ada.',
 	'Session support must be enabled.' => 'Dukungan sesi harus aktif.',
 	'Session expired, please login again.' => 'Sesi habis, silakan masuk lagi.',
 	'%s version: %s through PHP extension %s' => 'Versi %s: %s dengan ekstensi PHP %s',
@@ -44,26 +44,26 @@ $translations = array(
 	'SQL command' => 'Perintah SQL',
 	'%d query(s) executed OK.' => '%d kueri berhasil dijalankan.',
 	'Query executed OK, %d row(s) affected.' => 'Kueri berhasil, %d baris terpengaruh.',
-	'No commands to execute.' => 'Tiada perintah untuk dijalankan.',
-	'Error in query' => 'Kesalahan dalam kueri',
+	'No commands to execute.' => 'Tidak ada perintah untuk dijalankan.',
+	'Error in query' => 'Galat dalam kueri',
 	'Execute' => 'Jalankan',
-	'Stop on error' => 'Hentikan pada kesalahan',
-	'Show only errors' => 'Hanya tampilkan kesalahan',
+	'Stop on error' => 'Hentikan jika galat',
+	'Show only errors' => 'Hanya tampilkan galat',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
 	'History' => 'Riwayat',
 	'Clear' => 'Bersihkan',
-	'Edit all' => 'Edit semua',
 
+	'Edit all' => 'Sunting semua',
 	'File upload' => 'Unggah berkas',
 	'From server' => 'Dari server',
 	'Webserver file %s' => 'Berkas server web %s',
 	'Run file' => 'Jalankan berkas',
-	'File does not exist.' => 'Berkas tidak ditemukan.',
+	'File does not exist.' => 'Berkas tidak ada.',
 	'File uploads are disabled.' => 'Pengunggahan berkas dimatikan.',
 	'Unable to upload a file.' => 'Tidak dapat mengunggah berkas.',
-	'Maximum allowed file size is %sB.' => 'Besar berkas yang diizinkan adalah %s bita.',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar pengarah konfigurasi %s.',
+	'Maximum allowed file size is %sB.' => 'Besar berkas yang diizinkan adalah %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar direktif konfigurasi %s.',
 
 	'Export' => 'Ekspor',
 	'Output' => 'Hasil',
@@ -76,19 +76,18 @@ $translations = array(
 	'database' => 'basis data',
 	'Use' => 'Gunakan',
 	'Select database' => 'Pilih basis data',
-	'Invalid database.' => 'Basis data invalid.',
-	'Create new database' => 'Buat basis data baru',
+	'Invalid database.' => 'Basis data tidak sah.',
 	'Database has been dropped.' => 'Basis data berhasil dihapus.',
 	'Databases have been dropped.' => 'Basis data berhasil dihapus.',
 	'Database has been created.' => 'Basis data berhasil dibuat.',
-	'Database has been renamed.' => 'Basis data berhasil diganti nama.',
+	'Database has been renamed.' => 'Basis data berhasil diganti namanya.',
 	'Database has been altered.' => 'Basis data berhasil diubah.',
 	'Alter database' => 'Ubah basis data',
 	'Create database' => 'Buat basis data',
 	'Database schema' => 'Skema basis data',
 
 	// link to current database schema layout
-	'Permanent link' => 'Tautan permanen',
+	'Permanent link' => 'Pranala permanen',
 
 	// thousands separator - must contain single byte
 	',' => '.',
@@ -113,9 +112,9 @@ $translations = array(
 	'Tables have been copied.' => 'Tabel berhasil disalin.',
 
 	'Routines' => 'Rutin',
-	'Routine has been called, %d row(s) affected.' => array('Rutin telah dipanggil, %d baris terpengaruh.', 'Rutin telah dipanggil, %d baris terpengaruh'),
+	'Routine has been called, %d row(s) affected.' => 'Rutin telah dipanggil, %d baris terpengaruh.',
 	'Call' => 'Panggilan',
-	'Parameter name' => 'Nama paramater',
+	'Parameter name' => 'Nama parameter',
 	'Create procedure' => 'Buat prosedur',
 	'Create function' => 'Buat fungsi',
 	'Routine has been dropped.' => 'Rutin berhasil dihapus.',
@@ -123,14 +122,14 @@ $translations = array(
 	'Routine has been created.' => 'Rutin berhasil dibuat.',
 	'Alter function' => 'Ubah fungsi',
 	'Alter procedure' => 'Ubah prosedur',
-	'Return type' => 'Jenis balikan',
+	'Return type' => 'Jenis pengembalian',
 
-	'Events' => 'Peristiwa',
-	'Event has been dropped.' => 'Peristiwa berhasil dihapus.',
-	'Event has been altered.' => 'Peristiwa berhasil diubah.',
-	'Event has been created.' => 'Peristiwa berhasil dibuat.',
-	'Alter event' => 'Ubah peristiwa',
-	'Create event' => 'Buat peristiwa',
+	'Events' => 'Even',
+	'Event has been dropped.' => 'Even berhasil dihapus.',
+	'Event has been altered.' => 'Even berhasil diubah.',
+	'Event has been created.' => 'Even berhasil dibuat.',
+	'Alter event' => 'Ubah even',
+	'Create event' => 'Buat even',
 	'At given time' => 'Pada waktu tertentu',
 	'Every' => 'Setiap',
 	'Schedule' => 'Jadwal',
@@ -141,7 +140,7 @@ $translations = array(
 	'Tables' => 'Tabel',
 	'Tables and views' => 'Tabel dan tampilan',
 	'Table' => 'Tabel',
-	'No tables.' => 'Tiada tabel.',
+	'No tables.' => 'Tidak ada tabel.',
 	'Alter table' => 'Ubah tabel',
 	'Create table' => 'Buat tabel',
 	'Table has been dropped.' => 'Tabel berhasil dihapus.',
@@ -156,16 +155,16 @@ $translations = array(
 	'Column name' => 'Nama kolom',
 	'Type' => 'Jenis',
 	'Length' => 'Panjang',
-	'Auto Increment' => 'Kenaikan Otomatis',
+	'Auto Increment' => 'Inkrementasi Otomatis',
 	'Options' => 'Opsi',
 	'Comment' => 'Komentar',
 	'Default values' => 'Nilai bawaan',
 	'Drop' => 'Hapus',
-	'Are you sure?' => 'Anda yakin',
+	'Are you sure?' => 'Anda yakin?',
 	'Move up' => 'Naik',
 	'Move down' => 'Turun',
 	'Remove' => 'Hapus',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Jumlah ruas maksimum yang diizinkan dilewati. Harap naikkan %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sudah lebih dumlah ruas maksimum yang diizinkan. Harap naikkan %s.',
 
 	'Partition by' => 'Partisi menurut',
 	'Partitions' => 'Partisi',
@@ -202,15 +201,15 @@ $translations = array(
 	'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.' => 'Kolom sumber dan sasaran harus memiliki jenis data yang sama. Kolom sasaran harus memiliki indeks dan data rujukan harus ada.',
 
-	'Triggers' => 'Picu',
-	'Add trigger' => 'Tambah picu',
-	'Trigger has been dropped.' => 'Picu berhasil dihapus.',
-	'Trigger has been altered.' => 'Picu berhasil diubah.',
-	'Trigger has been created.' => 'Picu berhasil dibuat.',
-	'Alter trigger' => 'Ubah picu',
-	'Create trigger' => 'Buat picu',
+	'Triggers' => 'Pemicu',
+	'Add trigger' => 'Tambah pemicu',
+	'Trigger has been dropped.' => 'Pemicu berhasil dihapus.',
+	'Trigger has been altered.' => 'Pemicu berhasil diubah.',
+	'Trigger has been created.' => 'Pemicu berhasil dibuat.',
+	'Alter trigger' => 'Ubah pemicu',
+	'Create trigger' => 'Buat pemicu',
 	'Time' => 'Waktu',
-	'Event' => 'Peristiwa',
+	'Event' => 'Even',
 	'Name' => 'Nama',
 
 	'select' => 'pilih',
@@ -221,14 +220,14 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana pun',
 	'Search data in tables' => 'Cari data dalam tabel',
-	'Sort' => 'Urutan',
+	'Sort' => 'Urutkan',
 	'descending' => 'menurun',
-	'Limit' => 'Limit',
+	'Limit' => 'Batas',
 	'Text length' => 'Panjang teks',
 	'Action' => 'Tindakan',
 	'Full table scan' => 'Pindai tabel lengkap',
 	'Unable to select the table' => 'Gagal memilih tabel',
-	'No rows.' => 'Tiada baris.',
+	'No rows.' => 'Tidak ada baris.',
 	'%d row(s)' => '%d baris',
 	'Page' => 'Halaman',
 	'last' => 'terakhir',
@@ -239,7 +238,7 @@ $translations = array(
 	'%d row(s) have been imported.' => '%d baris berhasil diimpor.',
 
 	// in-place editing in select
-	'Use edit link to modify this value.' => 'Gunakan tautan edit untuk mengubah nilai ini.',
+	'Use edit link to modify this value.' => 'Gunakan pranala suntingan untuk mengubah nilai ini.',
 
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Entri%s berhasil disisipkan.',
@@ -247,30 +246,30 @@ $translations = array(
 	'Item has been updated.' => 'Entri berhasil diperbarui.',
 	'%d item(s) have been affected.' => '%d entri terpengaruh.',
 	'New item' => 'Entri baru',
-	'original' => 'orisinal',
+	'original' => 'asli',
 	// label for value '' in enum data type
 	'empty' => 'kosong',
-	'edit' => 'edit',
-	'Edit' => 'Edit',
+	'edit' => 'sunting',
+	'Edit' => 'Sunting',
 	'Insert' => 'Sisipkan',
 	'Save' => 'Simpan',
-	'Save and continue edit' => 'Simpan dan terus mengedit',
-	'Save and insert next' => 'Simpan dan sisipkan yang lain',
+	'Save and continue edit' => 'Simpan dan lanjut menyunting',
+	'Save and insert next' => 'Simpan dan sisipkan berikutnya',
 	'Clone' => 'Gandakan',
 	'Delete' => 'Hapus',
 
 	'E-mail' => 'Surel',
 	'From' => 'Dari',
-	'Subject' => 'Subjek',
+	'Subject' => 'Judul',
 	'Attachments' => 'Lampiran',
 	'Send' => 'Kirim',
-	'%d e-mail(s) have been sent.' => array('%d surel berhasil dikirim.', '%d surel berhasil dikirim'),
+	'%d e-mail(s) have been sent.' => '%d surel berhasil dikirim.',
 
 	// data type descriptions
 	'Numbers' => 'Angka',
 	'Date and time' => 'Tanggal dan waktu',
 	'Strings' => 'String',
-	'Binary' => 'Biner',
+	'Binary' => 'Binari',
 	'Lists' => 'Daftar',
 	'Network' => 'Jaringan',
 	'Geometry' => 'Geometri',
@@ -298,7 +297,7 @@ $translations = array(
 	'Schema has been created.' => 'Skema berhasil dibuat.',
 	'Schema has been altered.' => 'Skema berhasil diubah.',
 	'Schema' => 'Skema',
-	'Invalid schema.' => 'Skema invalid.',
+	'Invalid schema.' => 'Skema tidak sah.',
 
 	// PostgreSQL sequences support
 	'Sequences' => 'Deret',

adminer/lang/it.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Password',
 	'Select database' => 'Seleziona database',
 	'Invalid database.' => 'Database non valido.',
-	'Create new database' => 'Crea nuovo database',
 	'Table has been dropped.' => 'Tabella eliminata.',
 	'Table has been altered.' => 'Tabella modificata.',
 	'Table has been created.' => 'Tabella creata.',

adminer/lang/ja.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'パスワード',
 	'Select database' => 'データベースを選択してください',
 	'Invalid database.' => '不正なデータベース',
-	'Create new database' => '新規にデータベースを作成',
 	'Table has been dropped.' => 'テーブルを削除しました',
 	'Table has been altered.' => 'テーブルを変更しました',
 	'Table has been created.' => 'テーブルを作成しました',

adminer/lang/ko.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => '비밀번호',
 	'Select database' => '데이터베이스를 선택하십시오.',
 	'Invalid database.' => '잘못된 데이터베이스입니다.',
-	'Create new database' => '새 데이터베이스 만들기',
 	'Table has been dropped.' => '테이블을 삭제했습니다.',
 	'Table has been altered.' => '테이블을 변경했습니다.',
 	'Table has been created.' => '테이블을 만들었습니다.',

adminer/lang/lt.inc.php

@@ -77,7 +77,6 @@ $translations = array(
 	'Use' => 'Naudoti',
 	'Select database' => 'Pasirinkti duomenų bazę',
 	'Invalid database.' => 'Neteisinga duomenų bazė.',
-	'Create new database' => 'Sukurti naują duomenų bazę',
 	'Database has been dropped.' => 'Duomenų bazė panaikinta.',
 	'Databases have been dropped.' => 'Duomenų bazės panaikintos.',
 	'Database has been created.' => 'Duomenų bazė sukurta.',

adminer/lang/ms.inc.php

@@ -0,0 +1,341 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Sistem',
+	'Server' => 'Pelayan',
+	'Username' => 'Nama pengguna',
+	'Password' => 'Kata laluan',
+	'Permanent login' => 'Log masuk kekal',
+	'Login' => 'Log masuk',
+	'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>.',
+	'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',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Sila hantar borang sekali lagi.',
+	'If you did not send this request from Adminer then close this page.' => 'Jika anda tidak menghantar permintaan ini dari Adminer sila tutup halaman ini.',
+	'No extension' => 'Tiada sambungan',
+	'None of the supported PHP extensions (%s) are available.' => 'Sambungan PHP yang (%s) disokong tidak wujud.',
+	'Connecting to privileged ports is not allowed.' => 'Penyambungan ke port yang istimewa tidak dibenarkan.',
+	'Session support must be enabled.' => 'Sokongan sesi perlu diaktifkan.',
+	'Session expired, please login again.' => 'Sesi telah luput, sila log masuk kembali.',
+	'%s version: %s through PHP extension %s' => 'Versi %s: %s melalui sambungan PHP %s',
+	'Refresh' => 'Segar kembali',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Keistimewaan',
+	'Create user' => 'Bina pengguna',
+	'User has been dropped.' => 'Pengguna telah dijatuhkan.',
+	'User has been altered.' => 'Pengguna telah diubah.',
+	'User has been created.' => 'Pengguna telah dibuat.',
+	'Hashed' => 'Hashed',
+	'Column' => 'Kolum',
+	'Routine' => 'Rutin',
+	'Grant' => 'Beri',
+	'Revoke' => 'Batal',
+
+	'Process list' => 'Senarai proses',
+	'%d process(es) have been killed.' => '%d proses telah dihentikan.',
+	'Kill' => 'Henti',
+
+	'Variables' => 'Pembolehubah',
+	'Status' => 'Status',
+
+	'SQL command' => 'Arahan SQL',
+	'%d query(s) executed OK.' => '%d query berjaya dilaksanakan.',
+	'Query executed OK, %d row(s) affected.' => 'Query berjaya dilaksanakan, %d baris terjejas.',
+	'No commands to execute.' => 'Tiada arahan untuk dilaksanakan.',
+	'Error in query' => 'Ralat pada query',
+	'ATTACH queries are not supported.' => 'Query berikut tidak disokong.',
+	'Execute' => 'Laksana',
+	'Stop on error' => 'Berhenti jika ralat',
+	'Show only errors' => 'Paparkan jika ralat',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Sejarah',
+	'Clear' => 'Bersih',
+	'Edit all' => 'Ubah semua',
+
+	'File upload' => 'Muat naik fail',
+	'From server' => 'Dari pelayan',
+	'Webserver file %s' => 'Fail pelayan sesawang %s',
+	'Run file' => 'Jalankan fail',
+	'File does not exist.' => 'Fail tidak wujud.',
+	'File uploads are disabled.' => 'Muat naik fail dihalang.',
+	'Unable to upload a file.' => 'Muat naik fail gagal.',
+	'Maximum allowed file size is %sB.' => 'Saiz fail maksimum yang dibenarkan adalah %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kecilkan data atau tingkatkan tetapan %s.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Anda boleh muat naik fail SQL yang besar melalui FTP dan import melalui pelayan.',
+	'You are offline.' => 'Anda sedang offline.',
+
+	'Export' => 'Eksport',
+	'Output' => 'Pengeluaran',
+	'open' => 'buka',
+	'save' => 'simpan',
+	'Saving' => 'Menyimpan',
+	'Format' => 'Format',
+	'Data' => 'Data',
+
+	'Database' => 'Pangkalan data',
+	'database' => 'pangkalan data',
+	'Use' => 'Guna',
+	'Select database' => 'Pilih pangkalan data',
+	'Invalid database.' => 'Pangkalan data tidak sah.',
+	'Database has been dropped.' => 'Pangkalan data telah dijatuhkan.',
+	'Databases have been dropped.' => 'Pangkalan data telah dijatuhkan.',
+	'Database has been created.' => 'Pangkalan data telah dibuat.',
+	'Database has been renamed.' => 'Pangkalan data telah ditukar nama.',
+	'Database has been altered.' => 'Pangkalan data telah diubah.',
+	'Alter database' => 'Ubah pangkalan data',
+	'Create database' => 'Bina pangkalan data',
+	'Database schema' => 'Skema pangkalan data',
+
+	// link to current database schema layout
+	'Permanent link' => 'Pautan kekal',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Enjin',
+	'Collation' => 'Collation',
+	'Data Length' => 'Panjang Data',
+	'Index Length' => 'Panjang Indeks',
+	'Data Free' => 'Data Free',
+	'Rows' => 'Baris',
+	'%d in total' => '%d secara keseluruhan',
+	'Analyze' => 'Menganalisis',
+	'Optimize' => 'Mengoptimum',
+	'Vacuum' => 'Vacuum',
+	'Check' => 'Periksa',
+	'Repair' => 'Baiki',
+	'Truncate' => 'Memangkas',
+	'Tables have been truncated.' => 'Jadual telah dimangkaskan.',
+	'Move to other database' => 'Pindahkan ke pangkalan data yang lain',
+	'Move' => 'Pindah',
+	'Tables have been moved.' => 'Jadual telah dipindahkan.',
+	'Copy' => 'Salin',
+	'Tables have been copied.' => 'Jadual telah disalin.',
+
+	'Routines' => 'Rutin',
+	'Routine has been called, %d row(s) affected.' => 'Rutin telah dipanggil, %d baris terjejas.',
+	'Call' => 'Panggil',
+	'Parameter name' => 'Nama pembolehubah',
+	'Create procedure' => 'Bina prosedur',
+	'Create function' => 'Bina fungsi',
+	'Routine has been dropped.' => 'Rutin telah dijatuhkan.',
+	'Routine has been altered.' => 'Rutin telah diubah.',
+	'Routine has been created.' => 'Rutin telah dibuat.',
+	'Alter function' => 'Ubah fungsi',
+	'Alter procedure' => 'Ubah prosedur',
+	'Return type' => 'Jenis Return',
+
+	'Events' => 'Peristiwa',
+	'Event has been dropped.' => 'Peristiwa telah dijatuhkan.',
+	'Event has been altered.' => 'Peristiwa telah diubah.',
+	'Event has been created.' => 'Peristiwa telah dibuat.',
+	'Alter event' => 'Ubah peristiwa',
+	'Create event' => 'Bina peristiwa',
+	'At given time' => 'Pada masa tersebut',
+	'Every' => 'Setiap',
+	'Schedule' => 'Jadual',
+	'Start' => 'Mula',
+	'End' => 'Habis',
+	'On completion preserve' => 'Dalam melestarikan penyelesaian',
+
+	'Tables' => 'Jadual',
+	'Tables and views' => 'Jadual dan pandangan',
+	'Table' => 'Jadual',
+	'No tables.' => 'Tiada jadual.',
+	'Alter table' => 'Ubah jadual',
+	'Create table' => 'Bina jadual',
+	'Table has been dropped.' => 'Jadual telah dijatuhkan.',
+	'Tables have been dropped.' => 'Jadual telah dijatuhkan.',
+	'Tables have been optimized.' => 'Jadual telah dioptimumkan.',
+	'Table has been altered.' => 'Jadual telah diubah.',
+	'Table has been created.' => 'Jadual telah dibuat.',
+	'Table name' => 'Nama jadual',
+	'Show structure' => 'Paparkan struktur',
+	'engine' => 'enjin',
+	'collation' => 'collation',
+	'Column name' => 'Nama kolum',
+	'Type' => 'Jenis',
+	'Length' => 'Kepanjangan',
+	'Auto Increment' => 'Kenaikan Auto',
+	'Options' => 'Pilihan',
+	'Comment' => 'Komen',
+	'Default value' => 'Nilai lalai',
+	'Default values' => 'Nilai lalai',
+	'Drop' => 'Jatuh',
+	'Drop %s?' => 'Jatuhkan %s?',
+	'Are you sure?' => 'Anda pasti?',
+	'Size' => 'Saiz',
+	'Compute' => 'Kira',
+	'Move up' => 'Gerak ke atas',
+	'Move down' => 'Gerak ke bawah',
+	'Remove' => 'Buang',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bilangan medan telah melebihi had yang dibenarkan. Sila tingkatkan %s.',
+
+	'Partition by' => 'Partition mengikut',
+	'Partitions' => 'Partition',
+	'Partition name' => 'Nama partition',
+	'Values' => 'Nilai',
+
+	'View' => 'Papar',
+	'Materialized view' => 'Paparan yang menjadi kenyataan',
+	'View has been dropped.' => 'Paparan telah dijatuhkan.',
+	'View has been altered.' => 'Paparan telah diubah.',
+	'View has been created.' => 'Paparan telah dibuat.',
+	'Alter view' => 'Ubah paparan',
+	'Create view' => 'Bina paparan',
+
+	'Indexes' => 'Indeks',
+	'Indexes have been altered.' => 'Indeks telah diubah.',
+	'Alter indexes' => 'Ubah indeks',
+	'Add next' => 'Tambah yang seterusnya',
+	'Index Type' => 'Jenis Indeks',
+	'Column (length)' => 'Kolum (kepanjangan)',
+
+	'Foreign keys' => 'Kunci asing',
+	'Foreign key' => 'Kunci asing',
+	'Foreign key has been dropped.' => 'Kunci asing telah dijatuhkan.',
+	'Foreign key has been altered.' => 'Kunci asing telah diubah.',
+	'Foreign key has been created.' => 'Kunci asing telah dibuat.',
+	'Target table' => 'Jadual sasaran',
+	'Change' => 'Tukar',
+	'Source' => 'Sumber',
+	'Target' => 'Sasaran',
+	'Add column' => 'Tambah kolum',
+	'Alter' => 'Ubah',
+	'Add foreign key' => 'Tambah kunci asing',
+	'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.' => 'Kolum sumber dan sasaran perlu mempunyai jenis data yang sama, indeks diperlukan pada kolum sasaran dan data yang dirujuk wujud.',
+
+	'Triggers' => ' Pencetus',
+	'Add trigger' => 'Tambah pencetus',
+	'Trigger has been dropped.' => 'Pencetus telah dijatuhkan.',
+	'Trigger has been altered.' => 'Pencetus telah diubah.',
+	'Trigger has been created.' => 'Pencetus telah dibuat.',
+	'Alter trigger' => 'Ubah pencetus',
+	'Create trigger' => 'Buat pencetus',
+	'Time' => 'Masa',
+	'Event' => 'Peristiwa',
+	'Name' => 'Nama',
+
+	'select' => 'pilih',
+	'Select' => 'Pilih',
+	'Select data' => 'Pilih data',
+	'Functions' => 'Fungsi',
+	'Aggregation' => 'Pengagregatan',
+	'Search' => 'Cari',
+	'anywhere' => 'di mana-mana',
+	'Search data in tables' => 'Cari data dalam jadual',
+	'Sort' => 'Susun',
+	'descending' => 'menurun',
+	'Limit' => 'Had',
+	'Limit rows' => 'Had baris',
+	'Text length' => 'Kepanjangan teks',
+	'Action' => 'Aksi',
+	'Full table scan' => 'Imbasan penuh jadual',
+	'Unable to select the table' => 'Pemilihan jadual tidak berjaya',
+	'No rows.' => 'Tiada baris.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => '%d baris',
+	'Page' => 'Halaman',
+	'last' => 'akhir',
+	'Load more data' => 'Load lebih data',
+	'Loading' => 'Loading',
+	'whole result' => 'keputusan keseluruhan',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+
+	'Import' => 'Import',
+	'%d row(s) have been imported.' => '%d baris telah diimport.',
+	'File must be in UTF-8 encoding.' => 'Fail mesti dalam pengekodan UTF-8.',
+
+	// in-place editing in select
+	'Modify' => 'Pinda',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+click pada nilai untuk meminda.',
+	'Use edit link to modify this value.' => 'Guna pautan ubah untuk meminda nilai ini.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Item%s telah dimasukkan.',
+	'Item has been deleted.' => 'Item telah dipadamkan.',
+	'Item has been updated.' => 'Item telah dikemaskini.',
+	'%d item(s) have been affected.' => '%d item telah terjejas.',
+	'New item' => 'Item baru',
+	'original' => 'asli',
+	// label for value '' in enum data type
+	'empty' => 'kosong',
+	'edit' => 'ubah',
+	'Edit' => 'Ubah',
+	'Insert' => 'Masukkan',
+	'Save' => 'Simpan',
+	'Save and continue edit' => 'Simpan dan sambung ubah',
+	'Save and insert next' => 'Simpan dan masukkan seterusnya',
+	'Selected' => 'Terpilih',
+	'Clone' => 'Klon',
+	'Delete' => 'Padam',
+	'You have no privileges to update this table.' => 'Anda tidak mempunyai keistimewaan untuk mengemaskini jadual ini.',
+
+	'E-mail' => 'Emel',
+	'From' => 'Dari',
+	'Subject' => 'Subjek',
+	'Attachments' => 'Lampiran',
+	'Send' => 'Hantar',
+	'%d e-mail(s) have been sent.' => '%d emel telah dihantar.',
+
+	// data type descriptions
+	'Numbers' => 'Nombor',
+	'Date and time' => 'Tarikh dan masa',
+	'Strings' => 'String',
+	'Binary' => 'Binari',
+	'Lists' => 'Senarai',
+	'Network' => 'Rangkaian',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Hubungan',
+
+	'Editor' => 'Editor',
+	// 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' => 'sekarang',
+	'yes' => 'ya',
+	'no' => 'tidak',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Fail wujud.',
+	'Please use one of the extensions %s.' => 'Sila guna salah satu sambungan %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Ubah skema',
+	'Create schema' => 'Buat skema',
+	'Schema has been dropped.' => 'Skema telah dijatuhkan.',
+	'Schema has been created.' => 'Skema telah dibuat.',
+	'Schema has been altered.' => 'Skema telah diubah.',
+	'Schema' => 'Skema',
+	'Invalid schema.' => 'Skema tidak sah.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Turutan',
+	'Create sequence' => 'Buat turutan',
+	'Sequence has been dropped.' => 'Turutan telah dijatuhkan.',
+	'Sequence has been created.' => 'Turutan telah dibuat.',
+	'Sequence has been altered.' => 'Turutan telah diubah.',
+	'Alter sequence' => 'Ubah turutan',
+
+	// PostgreSQL user types support
+	'User types' => 'Jenis pengguna',
+	'Create type' => 'Buat jenis',
+	'Type has been dropped.' => 'Jenis telah dijatuhkan.',
+	'Type has been created.' => 'Jenis telah dibuat.',
+	'Alter type' => 'Ubah jenis',
+);

adminer/lang/nl.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Wachtwoord',
 	'Select database' => 'Database selecteren',
 	'Invalid database.' => 'Ongeldige database.',
-	'Create new database' => 'Nieuwe database',
 	'Table has been dropped.' => 'Tabel verwijderd.',
 	'Table has been altered.' => 'Tabel aangepast.',
 	'Table has been created.' => 'Tabel aangemaakt.',
@@ -61,7 +60,7 @@ $translations = array(
 	'Action' => 'Acties',
 	'edit' => 'bewerk',
 	'Page' => 'Pagina',
-	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen geraakt.'),
+	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen beïnvloed.'),
 	'Error in query' => 'Fout in query',
 	'Execute' => 'Uitvoeren',
 	'Table' => 'Tabel',

adminer/lang/no.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logged as: %s' => 'Logget inn som: %s',
 	'Logout successful.' => 'Utlogging vellykket.',
 	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/" target="_blank">Implementer</a> en metode for %s for å gjøre det permanent.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for å gjøre det permanent.',
 	'Language' => 'Språk',
 	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
 	'No extension' => 'Ingen utvidelse',
@@ -68,7 +68,6 @@ $translations = array(
 	'Use' => 'Bruk',
 	'Select database' => 'Velg database',
 	'Invalid database.' => 'Ugyldig database.',
-	'Create new database' => 'Lag ny database',
 	'Database has been dropped.' => 'Databasen har blitt slettet.',
 	'Databases have been dropped.' => 'Databasene har blitt slettet.',
 	'Database has been created.' => 'Databasen er opprettet.',

adminer/lang/pl.inc.php

@@ -10,14 +10,17 @@ $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>.',
 	'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/" target="_blank">Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="https://www.adminer.org/pl/extension/" target="_blank">Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
+	'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',
 	'Invalid CSRF token. Send the form again.' => 'Nieprawidłowy token CSRF. Spróbuj wysłać formularz ponownie.',
 	'If you did not send this request from Adminer then close this page.' => 'Jeżeli nie wywołałeś tej strony z Adminera, zamknij to okno.',
 	'No extension' => 'Brak rozszerzenia',
 	'None of the supported PHP extensions (%s) are available.' => 'Żadne z rozszerzeń PHP umożliwiających połączenie się z bazą danych (%s) nie jest dostępne.',
+	'Connecting to privileged ports is not allowed.' => 'Łączenie do portów uprzywilejowanych jest niedozwolone.',
 	'Session support must be enabled.' => 'Wymagana jest obsługa sesji w PHP.',
 	'Session expired, please login again.' => 'Sesja wygasła, zaloguj się ponownie.',
 	'%s version: %s through PHP extension %s' => 'Wersja %s: %s za pomocą %s',
@@ -49,6 +52,7 @@ $translations = array(
 	'Query executed OK, %d row(s) affected.' => array('Zapytanie wykonane pomyślnie, zmieniono %d rekord.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordy.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordów.'),
 	'No commands to execute.' => 'Nic do wykonania.',
 	'Error in query' => 'Błąd w zapytaniu',
+	'ATTACH queries are not supported.' => 'Zapytania ATTACH są niewspierane.',
 	'Execute' => 'Wykonaj',
 	'Stop on error' => 'Zatrzymaj w przypadku błędu',
 	'Show only errors' => 'Pokaż tylko błędy',
@@ -82,7 +86,6 @@ $translations = array(
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
 	'Invalid database.' => 'Nie znaleziono bazy danych.',
-	'Create new database' => 'Utwórz nową bazę danych',
 	'Database has been dropped.' => 'Baza danych została usunięta.',
 	'Databases have been dropped.' => 'Bazy danych zostały usunięte.',
 	'Database has been created.' => 'Baza danych została utworzona.',
@@ -168,6 +171,7 @@ $translations = array(
 	'Default value' => 'Wartość domyślna',
 	'Default values' => 'Wartości domyślne',
 	'Drop' => 'Usuń',
+	'Drop %s?' => 'Usunąć %s?',
 	'Are you sure?' => 'Czy jesteś pewien?',
 	'Size' => 'Wielkość',
 	'Compute' => 'Oblicz',
@@ -182,13 +186,12 @@ $translations = array(
 	'Values' => 'Wartości',
 	
 	'View' => 'Perspektywa',
-	'Materialized View' => 'Zmaterializowana perspektywa',
+	'Materialized view' => 'Zmaterializowana perspektywa',
 	'View has been dropped.' => 'Perspektywa została usunięta.',
 	'View has been altered.' => 'Perspektywa została zmieniona.',
 	'View has been created.' => 'Perspektywa została utworzona.',
 	'Alter view' => 'Zmień perspektywę',
 	'Create view' => 'Utwórz perspektywę',
-	'Create materialized view' => 'Utwórz zmaterializowaną perspektywę',
 	
 	'Indexes' => 'Indeksy',
 	'Indexes have been altered.' => 'Indeksy zostały zmienione.',
@@ -235,11 +238,13 @@ $translations = array(
 	'Sort' => 'Sortuj',
 	'descending' => 'malejąco',
 	'Limit' => 'Limit',
+	'Limit rows' => 'Limit rekordów',
 	'Text length' => 'Długość tekstu',
 	'Action' => 'Czynność',
 	'Full table scan' => 'Wymaga pełnego przeskanowania tabeli',
 	'Unable to select the table' => 'Nie udało się pobrać danych z tabeli',
 	'No rows.' => 'Brak rekordów.',
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d rekord', '%d rekordy', '%d rekordów'),
 	'Page' => 'Strona',
 	'last' => 'ostatni',

adminer/lang/pt-br.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Senha',
 	'Select database' => 'Selecionar Base de dados',
 	'Invalid database.' => 'Base de dados inválida.',
-	'Create new database' => 'Criar nova base de dados',
 	'Table has been dropped.' => 'A Tabela foi eliminada.',
 	'Table has been altered.' => 'A Tabela foi alterada.',
 	'Table has been created.' => 'A Tabela foi criada.',

adminer/lang/pt.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Senha',
 	'Select database' => 'Selecionar Base de dados',
 	'Invalid database.' => 'Base de dados inválida.',
-	'Create new database' => 'Criar nova base de dados',
 	'Table has been dropped.' => 'Tabela eliminada.',
 	'Table has been altered.' => 'Tabela modificada.',
 	'Table has been created.' => 'Tabela criada.',

adminer/lang/ro.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Parola',
 	'Select database' => 'Alege baza de date',
 	'Invalid database.' => 'Bază de deate invalidă.',
-	'Create new database' => 'Crează o bază de date nouă',
 	'Table has been dropped.' => 'Tabelul a fost șters.',
 	'Table has been altered.' => 'Tabelul a fost modificat.',
 	'Table has been created.' => 'Tabelul a fost creat.',

adminer/lang/ru.inc.php

@@ -7,15 +7,14 @@ $translations = array(
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
 	'Select database' => 'Выбрать базу данных',
-	'Invalid database.' => 'Плохая база данных.',
-	'Create new database' => 'Создать новую базу данных',
+	'Invalid database.' => 'Неверная база данных.',
 	'Table has been dropped.' => 'Таблица была удалена.',
 	'Table has been altered.' => 'Таблица была изменена.',
 	'Table has been created.' => 'Таблица была создана.',
 	'Alter table' => 'Изменить таблицу',
 	'Create table' => 'Создать таблицу',
 	'Table name' => 'Название таблицы',
-	'engine' => 'тип',
+	'engine' => 'Тип таблицы',
 	'collation' => 'режим сопоставления',
 	'Column name' => 'Название поля',
 	'Type' => 'Тип',
@@ -30,7 +29,7 @@ $translations = array(
 	'Database has been altered.' => 'База данных была изменена.',
 	'Alter database' => 'Изменить базу данных',
 	'Create database' => 'Создать базу данных',
-	'SQL command' => 'SQL запрос',
+	'SQL command' => 'SQL-запрос',
 	'Logout' => 'Выйти',
 	'database' => 'база данных',
 	'Use' => 'Выбрать',
@@ -68,7 +67,7 @@ $translations = array(
 	'Triggers' => 'Триггеры',
 	'View' => 'Представление',
 	'Unable to select the table' => 'Не удалось получить данные из таблицы',
-	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF токен. Отправите форму ещё раз.',
+	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF-токен. Отправите форму ещё раз.',
 	'Comment' => 'Комментарий',
 	'Default values' => 'Значения по умолчанию',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтов'),
@@ -91,13 +90,13 @@ $translations = array(
 	'Change' => 'Изменить',
 	'Source' => 'Источник',
 	'Target' => 'Цель',
-	'Add column' => 'Добавить колонку',
+	'Add column' => 'Добавить поле',
 	'Alter' => 'Изменить',
 	'Add foreign key' => 'Добавить внешний ключ',
 	'ON DELETE' => 'При стирании',
 	'ON UPDATE' => 'При обновлении',
 	'Index Type' => 'Тип индекса',
-	'Column (length)' => 'Колонка (длина)',
+	'Column (length)' => 'Поле (длина)',
 	'View has been dropped.' => 'Представление было удалено.',
 	'View has been altered.' => 'Представление было изменено.',
 	'View has been created.' => 'Представление было создано.',
@@ -135,11 +134,11 @@ $translations = array(
 	'User has been altered.' => 'Пользователь был изменён.',
 	'User has been created.' => 'Пользователь был создан.',
 	'Hashed' => 'Хешировано',
-	'Column' => 'Колонка',
+	'Column' => 'поле',
 	'Routine' => 'Процедура',
 	'Grant' => 'Позволить',
 	'Revoke' => 'Запретить',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объем данных или увеличьте параметр конфигурационной директивы %s.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объём данных или увеличьте параметр конфигурационной директивы %s.',
 	'Logged as: %s' => 'Вы вошли как: %s',
 	'Move up' => 'Переместить вверх',
 	'Move down' => 'Переместить вниз',
@@ -182,7 +181,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблицы были перемещены.',
 	'Move to other database' => 'Переместить в другую базу данных',
 	'Move' => 'Переместить',
-	'Engine' => 'Тип',
+	'Engine' => 'Тип таблиц',
 	'Save and continue edit' => 'Сохранить и продолжить редактирование',
 	'original' => 'исходный',
 	'%d item(s) have been affected.' => array('Была изменена %d запись.', 'Были изменены %d записи.', 'Было изменено %d записей.'),
@@ -203,20 +202,20 @@ $translations = array(
 	'[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' => 'Реляции',
+	'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' => 'Число',
+	'Maximum allowed file size is %sB.' => 'Максимальный разрешённый размер файла — %sB.',
+	'Numbers' => 'Числа',
 	'Date and time' => 'Дата и время',
 	'Strings' => 'Строки',
 	'Binary' => 'Двоичный тип',
 	'Lists' => 'Списки',
 	'Editor' => 'Редактор',
-	'E-mail' => 'Электропочта',
+	'E-mail' => 'Эл. почта',
 	'From' => 'От',
-	'Subject' => 'Кому',
+	'Subject' => 'Тема',
 	'Send' => 'Послать',
 	'%d e-mail(s) have been sent.' => array('Было отправлено %d письмо.', 'Было отправлено %d письма.', 'Было отправлено %d писем.'),
 	'Webserver file %s' => 'Файл %s на вебсервере',
@@ -242,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Изменить тип',
 	'Type has been dropped.' => 'Тип удален.',
 	'Type has been created.' => 'Создан новый тип.',
-	'Ctrl+click on a value to modify it.' => 'Ctrl+кликни по значению, чтобы его изменить.',
+	'Ctrl+click on a value to modify it.' => 'Выполните Ctrl+Щелчок мышью по значению, чтобы его изменить.',
 	'Use edit link to modify this value.' => 'Изменить это значение можно с помощью ссылки «изменить».',
 	'last' => 'последняя',
 	'From server' => 'С сервера',
@@ -266,4 +265,29 @@ $translations = array(
 	'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' => 'Лимит строк',
+	'<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 минут.'),
+	'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.' => 'Вы можете закачать большой SQL-файл по FTP и затем импортировать его с сервера.',
+	'Size' => 'Размер',
+	'Compute' => 'Вычислить',
+	'You are offline.' => 'Вы не выполнили вход.',
+	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
+	'Saving' => 'Сохранение',
+	'yes' => 'Да',
+	'no' => 'Нет',
 );

adminer/lang/sk.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Heslo',
 	'Select database' => 'Vybrať databázu',
 	'Invalid database.' => 'Nesprávna databáza.',
-	'Create new database' => 'Vytvoriť novú databázu',
 	'Table has been dropped.' => 'Tabuľka bola odstránená.',
 	'Table has been altered.' => 'Tabuľka bola zmenená.',
 	'Table has been created.' => 'Tabuľka bola vytvorená.',

adminer/lang/sl.inc.php

@@ -76,7 +76,6 @@ $translations = array(
 	'Use' => 'Uporabi',
 	'Select database' => 'Izberi bazo',
 	'Invalid database.' => 'Neveljavna baza.',
-	'Create new database' => 'Ustvari novo bazo',
 	'Database has been dropped.' => 'Baza je zavržena.',
 	'Databases have been dropped.' => 'Baze so zavržene.',
 	'Database has been created.' => 'Baza je ustvarjena.',

adminer/lang/sr.inc.php

@@ -77,7 +77,6 @@ $translations = array(
 	'Use' => 'Користи',
 	'Select database' => 'Изаберите базу',
 	'Invalid database.' => 'Неисправна база података.',
-	'Create new database' => 'Направи нову базу података',
 	'Database has been dropped.' => 'База података је избрисана.',
 	'Databases have been dropped.' => 'Базњ података су избрисане.',
 	'Database has been created.' => 'База података је креирана.',
@@ -232,8 +231,8 @@ $translations = array(
 	'%d row(s)' => array('%d ред', '%d реда', '%d редова'),
 	'Page' => 'Страна',
 	'last' => 'последња',
-	'Loading'  => 'Учитавам',
-	'Load more data'  => 'Учитавам још података',
+	'Loading' => 'Учитавам',
+	'Load more data' => 'Учитавам још података',
 	'whole result' => 'цео резултат',
 	'%d byte(s)' => array('%d бајт', '%d бајта', '%d бајтова'),
 

adminer/lang/ta.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'க‌ட‌வுச்சொல்',
 	'Select database' => 'த‌க‌வ‌ல்த‌ள‌த்தை தேர்வு செய்',
 	'Invalid database.' => 'த‌க‌வ‌ல்த‌ள‌ம் ச‌ரியானதல்ல‌.',
-	'Create new database' => 'புதிய‌ த‌க‌வ‌ல்த‌ள‌த்தை உருவாக்கு',
 	'Table has been dropped.' => 'அட்ட‌வ‌ணை நீக்க‌ப்ப‌ட்ட‌து.',
 	'Table has been altered.' => 'அட்ட‌வணை மாற்ற‌ப்ப‌ட்ட‌து.',
 	'Table has been created.' => 'அட்ட‌வ‌ணை உருவாக்க‌ப்ப‌ட்ட‌து.',

adminer/lang/th.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'รหัสผ่าน',
 	'Select database' => 'เลือกฐานข้อมูล',
 	'Invalid database.' => 'ฐานข้อมูลไม่ถูกต้อง.',
-	'Create new database' => 'สร้างฐานข้อมูลใหม่',
 	'Table has been dropped.' => 'ลบตารางแล้ว.',
 	'Table has been altered.' => 'แก้ไขตารางแล้ว.',
 	'Table has been created.' => 'สร้างตารางใหม่แล้ว.',

adminer/lang/tr.inc.php

@@ -77,7 +77,6 @@ $translations = array(
 	'Use' => 'Kullan',
 	'Select database' => 'Veri tabanı seç',
 	'Invalid database.' => 'Geçersiz veri tabanı.',
-	'Create new database' => 'Yeni veri tabanı oluştur',
 	'Database has been dropped.' => 'Veri tabanı silindi.',
 	'Databases have been dropped.' => 'Veritabanları silindi.',
 	'Database has been created.' => 'Veri tabanı oluşturuldu.',

adminer/lang/uk.inc.php

@@ -77,7 +77,6 @@ $translations = array(
 	'Use' => 'Обрати',
 	'Select database' => 'Обрати базу даних',
 	'Invalid database.' => 'Погана база даних.',
-	'Create new database' => 'Створити нову базу даних',
 	'Database has been dropped.' => 'Базу даних було видалено.',
 	'Databases have been dropped.' => 'Бази даних були видалені.',
 	'Database has been created.' => 'Базу даних було створено.',

adminer/lang/vi.inc.php

@@ -12,7 +12,7 @@ $translations = array(
 	'Logout successful.' => 'Đã thoát xong.',
 	'Invalid credentials.' => 'Tài khoản sai.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Bạn gõ sai tài khoản quá nhiều lần, hãy thử lại sau %d phút nữa.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="https://www.adminer.org/en/extension/" target="_blank">Thử cách làm</a> để giữ cố định.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="https://www.adminer.org/en/extension/"%s>Thử cách làm</a> để giữ cố định.',
 	'Language' => 'Ngôn ngữ',
 	'Invalid CSRF token. Send the form again.' => 'Mã kiểm tra CSRF sai, hãy nhập lại biểu mẫu.',
 	'No extension' => 'Không có phần mở rộng',
@@ -80,7 +80,6 @@ $translations = array(
 	'Use' => 'Sử dụng',
 	'Select database' => 'Chọn CSDL',
 	'Invalid database.' => 'CSDL sai.',
-	'Create new database' => 'Tạo CSDL',
 	'Database has been dropped.' => 'CSDL đã bị xoá.',
 	'Databases have been dropped.' => 'Các CSDL đã bị xoá.',
 	'Database has been created.' => 'Đã tạo CSDL.',

adminer/lang/xx.inc.php

@@ -8,19 +8,23 @@ $translations = array(
 	'Permanent login' => 'Xx',
 	'Login' => 'Xx',
 	'Logout' => 'Xx',
-	'Logged as: %s' => '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>.',
 	'Invalid credentials.' => 'Xx.',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx.', 'Xx.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => '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.',
+	'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',
 	'Invalid CSRF token. Send the form again.' => 'Xx.',
 	'If you did not send this request from Adminer then close this page.' => 'Xx.',
 	'No extension' => 'Xx',
-	'None of the supported PHP extensions (%s) are available.' => 'Xx.',
+	'None of the supported PHP extensions (%s) are available.' => 'Xx (%s).',
+	'Connecting to privileged ports is not allowed.' => 'Xx.',
 	'Session support must be enabled.' => 'Xx.',
 	'Session expired, please login again.' => 'Xx.',
-	'%s version: %s through PHP extension %s' => 'Xx',
+	'The action will be performed after successful login with the same credentials.' => 'Xx.',
+	'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
 	'Refresh' => 'Xx',
 	
 	// text direction - 'ltr' or 'rtl'
@@ -38,35 +42,37 @@ $translations = array(
 	'Revoke' => 'Xx',
 	
 	'Process list' => 'Xx',
-	'%d process(es) have been killed.' => array('Xx.', 'Xx.'),
+	'%d process(es) have been killed.' => array('%d xx.', '%d xx.'),
 	'Kill' => 'Xx',
 	
 	'Variables' => 'Xx',
 	'Status' => 'Xx',
 	
 	'SQL command' => 'Xx',
-	'%d query(s) executed OK.' => array('Xx.', 'Xx.'),
-	'Query executed OK, %d row(s) affected.' => array('Xx.', 'Xx.'),
+	'%d query(s) executed OK.' => array('%d xx.', '%d xx.'),
+	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'No commands to execute.' => 'Xx.',
 	'Error in query' => 'Xx',
+	'Warnings' => 'Xx',
+	'ATTACH queries are not supported.' => 'Xx.',
 	'Execute' => 'Xx',
 	'Stop on error' => 'Xx',
 	'Show only errors' => 'Xx',
 	// sprintf() format for time of the command
-	'%.3f s' => 'xx',
+	'%.3f s' => '%.3f xx',
 	'History' => 'Xx',
 	'Clear' => 'Xx',
 	'Edit all' => 'Xx',
 	
 	'File upload' => 'Xx',
 	'From server' => 'Xx',
-	'Webserver file %s' => 'Xx',
+	'Webserver file %s' => 'Xx %s',
 	'Run file' => 'Xx',
 	'File does not exist.' => 'Xx.',
 	'File uploads are disabled.' => 'Xx.',
 	'Unable to upload a file.' => 'Xx.',
-	'Maximum allowed file size is %sB.' => 'Xx.',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx.',
+	'Maximum allowed file size is %sB.' => 'Xx %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Xx.',
 	'You are offline.' => 'Xx.',
 	
@@ -80,10 +86,10 @@ $translations = array(
 	
 	'Database' => 'Xx',
 	'database' => 'xx',
+	'DB' => 'XX',
 	'Use' => 'Xx',
 	'Select database' => 'Xx',
 	'Invalid database.' => 'Xx.',
-	'Create new database' => 'Xx',
 	'Database has been dropped.' => 'Xx.',
 	'Databases have been dropped.' => 'Xx.',
 	'Database has been created.' => 'Xx.',
@@ -105,7 +111,7 @@ $translations = array(
 	'Index Length' => 'Xx',
 	'Data Free' => 'Xx',
 	'Rows' => 'Xx',
-	'%d in total' => 'xx',
+	'%d in total' => '%d xx',
 	'Analyze' => 'Xx',
 	'Optimize' => 'Xx',
 	'Vacuum' => 'Xx',
@@ -120,7 +126,7 @@ $translations = array(
 	'Tables have been copied.' => 'Xx.',
 	
 	'Routines' => 'Xx',
-	'Routine has been called, %d row(s) affected.' => array('Xx.', 'Xx.'),
+	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'Call' => 'Xx',
 	'Parameter name' => 'Xx',
 	'Create procedure' => 'Xx',
@@ -169,13 +175,14 @@ $translations = array(
 	'Default value' => 'Xx',
 	'Default values' => 'Xx',
 	'Drop' => 'Xx',
-	'Are you sure?' => 'Xx',
+	'Drop %s?' => 'Xx %s?',
+	'Are you sure?' => 'Xx?',
 	'Size' => 'Xx',
 	'Compute' => 'Xx',
 	'Move up' => 'Xx',
 	'Move down' => 'Xx',
 	'Remove' => 'Xx',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
 	
 	'Partition by' => 'Xx',
 	'Partitions' => 'Xx',
@@ -183,13 +190,12 @@ $translations = array(
 	'Values' => 'Xx',
 	
 	'View' => 'Xx',
-	'Materialized View' => 'Xx',
+	'Materialized view' => 'Xx',
 	'View has been dropped.' => 'Xx.',
 	'View has been altered.' => 'Xx.',
 	'View has been created.' => 'Xx.',
 	'Alter view' => 'Xx',
 	'Create view' => 'Xx',
-	'Create materialized view' => 'Xx',
 	
 	'Indexes' => 'Xx',
 	'Indexes have been altered.' => 'Xx.',
@@ -242,17 +248,17 @@ $translations = array(
 	'Full table scan' => 'Xx',
 	'Unable to select the table' => 'Xx',
 	'No rows.' => 'Xx.',
-	'%d / ' => 'xx',
-	'%d row(s)' => array('xx', 'xx'),
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d xx', '%d xx'),
 	'Page' => 'Xx',
 	'last' => 'xx',
 	'Load more data' => 'Xx',
 	'Loading' => 'Xx',
 	'whole result' => 'xx',
-	'%d byte(s)' => array('xx', 'xx'),
+	'%d byte(s)' => array('%d xx', '%d xx'),
 	
 	'Import' => 'Xx',
-	'%d row(s) have been imported.' => array('Xx.', 'Xx.'),
+	'%d row(s) have been imported.' => array('%d xx.', '%d xx.'),
 	'File must be in UTF-8 encoding.' => 'Xx.',
 	
 	// in-place editing in select
@@ -261,10 +267,10 @@ $translations = array(
 	'Use edit link to modify this value.' => 'Xx.',
 	
 	// %s can contain auto-increment value
-	'Item%s has been inserted.' => 'Xx.',
+	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
 	'Item has been updated.' => 'Xx.',
-	'%d item(s) have been affected.' => array('Xx.', 'Xx.'),
+	'%d item(s) have been affected.' => array('%d xx.', '%d xx.'),
 	'New item' => 'Xx',
 	'original' => 'xx',
 	// label for value '' in enum data type
@@ -285,7 +291,7 @@ $translations = array(
 	'Subject' => 'Xx',
 	'Attachments' => 'Xx',
 	'Send' => 'Xx',
-	'%d e-mail(s) have been sent.' => array('Xx.', 'Xx.'),
+	'%d e-mail(s) have been sent.' => array('%d xx.', '%d xx.'),
 	
 	// data type descriptions
 	'Numbers' => 'Xx',
@@ -310,7 +316,7 @@ $translations = array(
 	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Xx.',
-	'Please use one of the extensions %s.' => 'Xx.',
+	'Please use one of the extensions %s.' => 'Xx %s.',
 	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Xx',

adminer/lang/zh-tw.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => '密碼',
 	'Select database' => '選擇資料庫',
 	'Invalid database.' => '無效的資料庫。',
-	'Create new database' => '建立新資料庫',
 	'Table has been altered.' => '資料表已修改。',
 	'Table has been created.' => '資料表已修改。',
 	'Alter table' => '修改資料表',

adminer/lang/zh.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => '密码',
 	'Select database' => '选择数据库',
 	'Invalid database.' => '无效数据库。',
-	'Create new database' => '创建新数据库',
 	'Table has been dropped.' => '已删除表。',
 	'Table has been altered.' => '已修改表。',
 	'Table has been created.' => '已创建表。',

adminer/plugin.php

@@ -17,7 +17,7 @@ function adminer_object() {
 		new AdminerDumpXml,
 		new AdminerDumpAlter,
 		//~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
-		//~ new AdminerEditCalendar("<script type='text/javascript' src='../externals/jquery-ui/jquery-1.4.4.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.core.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.widget.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.datepicker.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.mouse.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.slider.js'></script>\n<script type='text/javascript' src='../externals/jquery-timepicker/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style type='text/css'>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
+		//~ new AdminerEditCalendar(script_src("../externals/jquery-ui/jquery-1.4.4.js") . script_src("../externals/jquery-ui/ui/jquery.ui.core.js") . script_src("../externals/jquery-ui/ui/jquery.ui.widget.js") . script_src("../externals/jquery-ui/ui/jquery.ui.datepicker.js") . script_src("../externals/jquery-ui/ui/jquery.ui.mouse.js") . script_src("../externals/jquery-ui/ui/jquery.ui.slider.js") . script_src("../externals/jquery-timepicker/jquery-ui-timepicker-addon.js") . "<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
 		//~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
 		//~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
 		new AdminerFileUpload(""),

adminer/privileges.inc.php

@@ -1,6 +1,8 @@
 <?php
 page_header(lang('Privileges'));
 
+echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
+
 $result = $connection->query("SELECT User, Host FROM mysql." . (DB == "" ? "user" : "db WHERE " . q(DB) . " LIKE Db") . " ORDER BY Host, User");
 $grant = $result;
 if (!$result) {
@@ -25,5 +27,3 @@ if (!$grant || DB != "") {
 
 echo "</table>\n";
 echo "</form>\n";
-
-echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";

adminer/procedure.inc.php

@@ -1,17 +1,18 @@
 <?php
-$PROCEDURE = $_GET["procedure"];
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
 $row["fields"] = (array) $row["fields"];
 
 if ($_POST && !process_fields($row["fields"]) && !$error) {
+	$orig = routine($_GET["procedure"], $routine);
 	$temp_name = "$row[name]_adminer_" . uniqid();
 	drop_create(
-		"DROP $routine " . idf_escape($PROCEDURE),
+		"DROP $routine " . routine_id($PROCEDURE, $orig),
 		create_routine($routine, $row),
-		"DROP $routine " . idf_escape($row["name"]),
+		"DROP $routine " . routine_id($row["name"], $row),
 		create_routine($routine, array("name" => $temp_name) + $row),
-		"DROP $routine " . idf_escape($temp_name),
+		"DROP $routine " . routine_id($temp_name, $row),
 		substr(ME, 0, -1),
 		lang('Routine has been dropped.'),
 		lang('Routine has been altered.'),
@@ -24,7 +25,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 page_header(($PROCEDURE != "" ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . h($PROCEDURE) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 
 if (!$_POST && $PROCEDURE != "") {
-	$row = routine($PROCEDURE, $routine);
+	$row = routine($_GET["procedure"], $routine);
 	$row["name"] = $PROCEDURE;
 }
 
@@ -35,20 +36,20 @@ $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">
-<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) : ""); ?>
+<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
 	echo "<tr><td>" . lang('Return type');
-	edit_type("returns", $row["returns"], $collations);
+	edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
 }
 ?>
 </table>
 <p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/processlist.inc.php

@@ -2,7 +2,7 @@
 if (support("kill") && $_POST && !$error) {
 	$killed = 0;
 	foreach ((array) $_POST["kill"] as $val) {
-		if (queries("KILL " . number($val))) {
+		if (kill_process($val)) {
 			$killed++;
 		}
 	}
@@ -13,8 +13,9 @@ page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" onclick="tableClick(event);" ondblclick="tableClick(event, true);" class="nowrap checkable">
+<table cellspacing="0" class="nowrap checkable">
 <?php
+echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 // HTML valid because there is always at least one process
 $i = -1;
 foreach (process_list() as $i => $row) {
@@ -30,8 +31,7 @@ foreach (process_list() as $i => $row) {
 		}
 		echo "</thead>\n";
 	}
-
-	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row["Id"], 0) : "");
+	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
 	foreach ($row as $key => $val) {
 		echo "<td>" . (
 			($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
@@ -45,13 +45,13 @@ foreach (process_list() as $i => $row) {
 }
 ?>
 </table>
-<script type='text/javascript'>tableCheck();</script>
 <p>
 <?php
 if (support("kill")) {
-	echo ($i + 1) . "/" . lang('%d in total', $connection->result("SELECT @@max_connections"));
+	echo ($i + 1) . "/" . lang('%d in total', max_connections());
 	echo "<p><input type='submit' value='" . lang('Kill') . "'>\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>
+<?php echo script("tableCheck();"); ?>

adminer/schema.inc.php

@@ -48,19 +48,19 @@ foreach (table_status('', true) as $table => $table_status) {
 }
 
 ?>
-<div id="schema" style="height: <?php echo $top; ?>em;" onselectstart="return false;">
-<script type="text/javascript">
+<div id="schema" style="height: <?php echo $top; ?>em;">
+<script<?php echo nonce(); ?>>
+qs('#schema').onselectstart = function () { return false; };
 var tablePos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
-var em = document.getElementById('schema').offsetHeight / <?php echo $top; ?>;
+var em = qs('#schema').offsetHeight / <?php echo $top; ?>;
 document.onmousemove = schemaMousemove;
-document.onmouseup = function (ev) {
-	schemaMouseup(ev, '<?php echo js_escape(DB); ?>');
-};
+document.onmouseup = partialArg(schemaMouseup, '<?php echo js_escape(DB); ?>');
 </script>
 <?php
 foreach ($schema as $name => $table) {
-	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schemaMousedown(this, event);'>";
+	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;'>";
 	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a>";
+	echo script("qsl('div').onmousedown = schemaMousedown;");
 	
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';

adminer/scheme.inc.php

@@ -27,11 +27,11 @@ if (!$row) {
 
 <form action="" method="post">
 <p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<script type='text/javascript'>focus(document.getElementById('name'));</script>
+<?php echo script("focus(qs('#name'));"); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $_GET["ns"])) . "\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/script.inc.php

@@ -34,6 +34,12 @@ 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

@@ -4,11 +4,7 @@ $table_status = table_status1($TABLE);
 $indexes = indexes($TABLE);
 $fields = fields($TABLE);
 $foreign_keys = column_foreign_keys($TABLE);
-$oid = "";
-if ($table_status["Oid"]) {
-	$oid = ($jush == "sqlite" ? "rowid" : "oid");
-	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
-}
+$oid = $table_status["Oid"];
 parse_str($_COOKIE["adminer_import"], $adminer_import);
 
 $rights = array(); // privilege => 0
@@ -30,10 +26,6 @@ $is_group = count($group) < count($select);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
-$from = ($select ? implode(", ", $select) : "*" . ($oid ? ", $oid" : ""))
-	. convert_fields($columns, $fields, $select)
-	. "\nFROM " . table($TABLE);
-$group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
 if ($_GET["val"] && is_ajax()) {
 	header("Content-Type: text/plain; charset=utf-8");
@@ -49,6 +41,24 @@ if ($_GET["val"] && is_ajax()) {
 	exit;
 }
 
+$primary = $unselected = null;
+foreach ($indexes as $index) {
+	if ($index["type"] == "PRIMARY") {
+		$primary = array_flip($index["columns"]);
+		$unselected = ($select ? $primary : array());
+		foreach ($unselected as $key => $val) {
+			if (in_array(idf_escape($key), $select)) {
+				unset($unselected[$key]);
+			}
+		}
+		break;
+	}
+}
+if ($oid && !$primary) {
+	$primary = $unselected = array($oid => 0);
+	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
+}
+
 if ($_POST && !$error) {
 	$where_check = $where;
 	if (!$_POST["all"] && is_array($_POST["check"])) {
@@ -59,25 +69,15 @@ if ($_POST && !$error) {
 		$where_check[] = "((" . implode(") OR (", $checks) . "))";
 	}
 	$where_check = ($where_check ? "\nWHERE " . implode(" AND ", $where_check) : "");
-	$primary = $unselected = null;
-	foreach ($indexes as $index) {
-		if ($index["type"] == "PRIMARY") {
-			$primary = array_flip($index["columns"]);
-			$unselected = ($select ? $primary : array());
-			break;
-		}
-	}
-	foreach ((array) $unselected as $key => $val) {
-		if (in_array(idf_escape($key), $select)) {
-			unset($unselected[$key]);
-		}
-	}
-
 	if ($_POST["export"]) {
 		cookie("adminer_import", "output=" . urlencode($_POST["output"]) . "&format=" . urlencode($_POST["format"]));
 		dump_headers($TABLE);
 		$adminer->dumpTable($TABLE, "");
-		if (!is_array($_POST["check"]) || $unselected === array()) {
+		$from = ($select ? implode(", ", $select) : "*")
+			. convert_fields($columns, $fields, $select)
+			. "\nFROM " . table($TABLE);
+		$group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
+		if (!is_array($_POST["check"]) || $primary) {
 			$query = "SELECT $from$where_check$group_by";
 		} else {
 			$union = array();
@@ -108,7 +108,7 @@ if ($_POST && !$error) {
 				if ($_POST["clone"]) {
 					$query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE);
 				}
-				if ($_POST["all"] || ($unselected === array() && is_array($_POST["check"])) || $is_group) {
+				if ($_POST["all"] || ($primary && is_array($_POST["check"])) || $is_group) {
 					$result = ($_POST["delete"]
 						? $driver->delete($TABLE, $where_check)
 						: ($_POST["clone"]
@@ -124,8 +124,8 @@ if ($_POST && !$error) {
 						$result = ($_POST["delete"]
 							? $driver->delete($TABLE, $where2, 1)
 							: ($_POST["clone"]
-								? queries("INSERT" . limit1($query, $where2))
-								: $driver->update($TABLE, $set, $where2)
+								? queries("INSERT" . limit1($TABLE, $query, $where2))
+								: $driver->update($TABLE, $set, $where2, 1)
 							)
 						);
 						if (!$result) {
@@ -165,7 +165,7 @@ if ($_POST && !$error) {
 						$TABLE,
 						$set,
 						" WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
-						!($is_group || $unselected === array()),
+						!$is_group && !$primary,
 						" "
 					);
 					if (!$result) {
@@ -205,7 +205,7 @@ if ($_POST && !$error) {
 			}
 			$result = (!$rows || $driver->insertUpdate($TABLE, $rows, $primary));
 			if ($result) {
-				$driver->commit();
+				$result = $driver->commit();
 			}
 			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
 			$driver->rollback(); // after queries_redirect() to not overwrite error
@@ -226,7 +226,7 @@ $set = null;
 if (isset($rights["insert"]) || !support("table")) {
 	$set = "";
 	foreach ((array) $_GET["where"] as $val) {
-		if (count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
+		if ($foreign_keys[$val["col"]] && count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
 			|| (!$val["op"] && !preg_match('~[_%]~', $val["val"])) // LIKE in Editor
 		)) {
 			$set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]);
@@ -259,17 +259,29 @@ if (!$columns && support("table")) {
 	}
 
 	$select2 = $select;
+	$group2 = $group;
 	if (!$select2) {
 		$select2[] = "*";
-		if ($oid) {
-			$select2[] = $oid;
+		$convert_fields = convert_fields($columns, $fields, $select);
+		if ($convert_fields) {
+			$select2[] = substr($convert_fields, 2);
 		}
 	}
-	$convert_fields = convert_fields($columns, $fields, $select);
-	if ($convert_fields) {
-		$select2[] = substr($convert_fields, 2);
+	foreach ($select as $key => $val) {
+		$field = $fields[idf_unescape($val)];
+		if ($field && ($as = convert_field($field))) {
+			$select2[$key] = "$as AS $val";
+		}
 	}
-	$result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true);
+	if (!$is_group && $unselected) {
+		foreach ($unselected as $key => $val) {
+			$select2[] = idf_escape($key);
+			if ($group2) {
+				$group2[] = idf_escape($key);
+			}
+		}
+	}
+	$result = $driver->select($TABLE, $select2, $where, $group2, $order, $limit, $page, true);
 
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
@@ -288,7 +300,7 @@ if (!$columns && support("table")) {
 		}
 
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-		if ($_GET["page"] != "last" && +$limit && $group && $is_group && $jush == "sql") {
+		if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql") {
 			$found_rows = $connection->result(" SELECT FOUND_ROWS()"); // space to allow mysql.trace_mode
 		}
 
@@ -297,14 +309,18 @@ if (!$columns && support("table")) {
 		} else {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 
-			echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);' onkeydown='return editingKeydown(event);'>\n";
-			echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('Modify') . "</a>");
+			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
+				? ""
+				: "<td><input type='checkbox' id='all-page' class='jsonly'>" . script("qs('#all-page').onclick = partial(formCheck, /check/);", "")
+					. " <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('Modify') . "</a>");
 			$names = array();
 			$functions = array();
 			reset($select);
 			$rank = 1;
 			foreach ($rows[0] as $key => $val) {
-				if ($key != $oid) {
+				if (!isset($unselected[$key])) {
 					$val = $_GET["columns"][key($select)];
 					$field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
 					$name = ($field ? $adminer->fieldName($field, $rank) : ($val["fun"] ? "*" : $key));
@@ -314,13 +330,14 @@ 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 onmouseover="columnMouse(this);" onmouseout="columnMouse(this, \' hidden\');">';
+						echo "<th>" . 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'>";
 						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
 						if (!$val["fun"]) {
-							echo '<a href="#fieldset-search" onclick="selectSearch(\'' . h(js_escape($key)) . '\'); return false;" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+							echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+							echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");
 						}
 						echo "</span>";
 					}
@@ -359,18 +376,22 @@ if (!$columns && support("table")) {
 				}
 				$unique_idf = "";
 				foreach ($unique_array as $key => $val) {
-					if (($jush == "sql" || $jush == "pgsql") && strlen($val) > 64) {
+					if (($jush == "sql" || $jush == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
 						$key = (strpos($key, '(') ? $key : idf_escape($key)); //! columns looking like functions
-						$key = "MD5(" . ($jush == 'sql' && preg_match("~^utf8_~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
+						$key = "MD5(" . ($jush != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
 						$val = md5($val);
 					}
 					$unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
 				}
-				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>"));
+				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>"
+					. checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]))
+					. ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "' class='edit'>" . lang('edit') . "</a>")
+				);
 
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						$field = $fields[$key];
+						$val = $driver->value($val, $field);
 						if ($val != "" && (!isset($email_fields[$key]) || $email_fields[$key] != "")) {
 							$email_fields[$key] = (is_mail($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
 						}
@@ -387,6 +408,9 @@ if (!$columns && support("table")) {
 										$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
+									if ($foreign_key["ns"]) {
+										$link = preg_replace('~([?&]ns=)[^&]+~', '\\1' . urlencode($foreign_key["ns"]), $link);
+									}
 									if (count($foreign_key["source"]) == 1) {
 										break;
 									}
@@ -416,7 +440,10 @@ if (!$columns && support("table")) {
 							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]'>");
 						} else {
 							$long = strpos($val, "<i>...</i>");
-							echo "<td id='$id' onclick=\"selectClick(this, event, " . ($long ? 2 : ($text ? 1 : 0)) . ($editable ? "" : ", '" . h(lang('Use edit link to modify this value.')) . "'") . ");\">$val";
+							echo "<td id='$id' data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
+								. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
+								. ">$val</td>"
+							;
 						}
 					}
 				}
@@ -434,11 +461,13 @@ if (!$columns && support("table")) {
 			echo "</table>\n";
 		}
 
+		echo "<div class='footer'>\n";
 		if (($rows || $page) && !is_ajax()) {
+			echo "<p>\n";
 			$exact_count = true;
 			if ($_GET["page"] != "last") {
-				if (!+$limit) {
-					$found_rows = count($rows);
+				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)) {
@@ -450,15 +479,15 @@ if (!$columns && support("table")) {
 				}
 			}
 
-			if (+$limit && ($found_rows === false || $found_rows > $limit || $page)) {
-				echo "<p class='pages'>";
+			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")) . "\" onclick=\"pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "'), event); return false;\">" . lang('Page') . "</a>:";
+					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);
@@ -471,7 +500,8 @@ if (!$columns && support("table")) {
 						);
 					}
 					echo (($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit
-						? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '...\');" class="loadmore">' . lang('Load more data') . '</a>'
+						? ' <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 {
@@ -480,9 +510,9 @@ if (!$columns && support("table")) {
 					echo ($page ? pagination($page, $page) : "");
 					echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " ..." : "") : "");
 				}
+				echo "\n";
 			}
 
-			echo "<p class='count'>\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";
@@ -495,7 +525,7 @@ if (!$columns && support("table")) {
 <fieldset><legend><?php echo lang('Selected'); ?> <span id="selected"></span></legend><div>
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
-<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"<?php echo confirm(); ?>>
+<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"><?php echo confirm(); ?>
 </div></fieldset>
 <?php
 			}
@@ -516,7 +546,6 @@ if (!$columns && support("table")) {
 				echo "</div></fieldset>\n";
 			}
 
-			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
 		}
 
 		if ($adminer->selectImportPrint()) {
@@ -528,9 +557,11 @@ if (!$columns && support("table")) {
 		}
 
 		$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
+		echo "<input type='hidden' name='token' value='$token'>\n";
+		echo "</div>\n";
 
-		echo "<p><input type='hidden' name='token' value='$token'></p>\n";
 		echo "</form>\n";
+		echo (!$group && $select ? "" : script("tableCheck();"));
 	}
 }
 

adminer/sequence.inc.php

@@ -28,7 +28,7 @@ if (!$row) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($SEQUENCE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $SEQUENCE)) . "\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/sql.inc.php

@@ -21,9 +21,10 @@ if (!$error && $_POST) {
 	if (!isset($_GET["import"])) {
 		$query = $_POST["query"];
 	} elseif ($_POST["webfile"]) {
-		$fp = @fopen((file_exists("adminer.sql")
-			? "adminer.sql"
-			: "compress.zlib://adminer.sql.gz"
+		$sql_file_path = $adminer->importServerPath();
+		$fp = @fopen((file_exists($sql_file_path)
+			? $sql_file_path
+			: "compress.zlib://$sql_file_path.gz"
 		), "rb");
 		$query = ($fp ? fread($fp, 1e6) : false);
 	} else {
@@ -45,7 +46,7 @@ if (!$error && $_POST) {
 			}
 		}
 
-		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\r?\n)";
+		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
@@ -55,7 +56,6 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
-		$line = 0;
 		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\\*|-- |$' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : '');
 		$total_start = microtime(true);
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
@@ -63,7 +63,7 @@ if (!$error && $_POST) {
 		unset($dump_format["sql"]);
 
 		while ($query != "") {
-			if (!$offset && preg_match("~^$space*DELIMITER\\s+(\\S+)~i", $query, $match)) {
+			if (!$offset && preg_match("~^$space*+DELIMITER\\s+(\\S+)~i", $query, $match)) {
 				$delimiter = $match[1];
 				$query = substr($query, strlen($match[0]));
 			} else {
@@ -94,74 +94,93 @@ if (!$error && $_POST) {
 						$empty = false;
 						$q = substr($query, 0, $pos);
 						$commands++;
-						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . shorten_utf8(trim($q), 1000) . "</code></pre>\n";
-						if (!$_POST["only_errors"]) {
+						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
+						if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
+							// PHP doesn't support setting SQLITE_LIMIT_ATTACHED
 							echo $print;
-							ob_flush();
-							flush(); // can take a long time - show the running query
-						}
-						$start = microtime(true);
-						//! don't allow changing of character_set_results, convert encoding of displayed query
-						if ($connection->multi_query($q) && is_object($connection2) && preg_match("~^$space*USE\\b~isU", $q)) {
-							$connection2->query($q);
-						}
-
-						do {
-							$result = $connection->store_result();
-							$time = " <span class='time'>(" . format_time($start) . ")</span>"
-								. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
-							;
-
-							if ($connection->error) {
-								echo ($_POST["only_errors"] ? $print : "");
-								echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
-								$errors[] = " <a href='#sql-$commands'>$commands</a>";
-								if ($_POST["error_stops"]) {
-									break 2;
-								}
-
-							} elseif (is_object($result)) {
-								$limit = $_POST["limit"];
-								$orgtables = select($result, $connection2, array(), $limit);
-								if (!$_POST["only_errors"]) {
-									echo "<form action='' method='post'>\n";
-									$num_rows = $result->num_rows;
-									echo "<p>" . ($num_rows ? ($limit && $num_rows > $limit ? lang('%d / ', $limit) : "") . lang('%d row(s)', $num_rows) : "");
-									echo $time;
-									$id = "export-$commands";
-									$export = ", <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('Export') . "</a><span id='$id' class='hidden'>: "
-										. html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
-										. html_select("format", $dump_format, $adminer_export["format"])
-										. "<input type='hidden' name='query' value='" . h($q) . "'>"
-										. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
-									;
-									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q) && ($explain = explain($connection2, $q))) {
-										$id = "explain-$commands";
-										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>$export";
-										echo "<div id='$id' class='hidden'>\n";
-										select($explain, $connection2, $orgtables);
-										echo "</div>\n";
-									} else {
-										echo $export;
-									}
-									echo "</form>\n";
-								}
-
-							} else {
-								if (preg_match("~^$space*(CREATE|DROP|ALTER)$space+(DATABASE|SCHEMA)\\b~isU", $q)) {
-									restart_session();
-									set_session("dbs", null); // clear cache
-									stop_session();
-								}
-								if (!$_POST["only_errors"]) {
-									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
-								}
+							echo "<p class='error'>" . lang('ATTACH queries are not supported.') . "\n";
+							$errors[] = " <a href='#sql-$commands'>$commands</a>";
+							if ($_POST["error_stops"]) {
+								break;
+							}
+						} else {
+							if (!$_POST["only_errors"]) {
+								echo $print;
+								ob_flush();
+								flush(); // can take a long time - show the running query
+							}
+							$start = microtime(true);
+							//! don't allow changing of character_set_results, convert encoding of displayed query
+							if ($connection->multi_query($q) && is_object($connection2) && preg_match("~^$space*+USE\\b~i", $q)) {
+								$connection2->query($q);
 							}
 
-							$start = microtime(true);
-						} while ($connection->next_result());
+							do {
+								$result = $connection->store_result();
+
+								if ($connection->error) {
+									echo ($_POST["only_errors"] ? $print : "");
+									echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
+									$errors[] = " <a href='#sql-$commands'>$commands</a>";
+									if ($_POST["error_stops"]) {
+										break 2;
+									}
+
+								} else {
+									$time = " <span class='time'>(" . format_time($start) . ")</span>"
+										. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
+									;
+									$affected = $connection->affected_rows; // getting warnigns overwrites this
+									$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
+									$warnings_id = "warnings-$commands";
+									if ($warnings) {
+										$time .= ", <a href='#$warnings_id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$warnings_id');", "");
+									}
+									$explain = null;
+									$explain_id = "explain-$commands";
+									if (is_object($result)) {
+										$limit = $_POST["limit"];
+										$orgtables = select($result, $connection2, array(), $limit);
+										if (!$_POST["only_errors"]) {
+											echo "<form action='' method='post'>\n";
+											$num_rows = $result->num_rows;
+											echo "<p>" . ($num_rows ? ($limit && $num_rows > $limit ? lang('%d / ', $limit) : "") . lang('%d row(s)', $num_rows) : "");
+											echo $time;
+											if ($connection2 && preg_match("~^($space|\\()*+SELECT\\b~i", $q) && ($explain = explain($connection2, $q))) {
+												echo ", <a href='#$explain_id'>Explain</a>" . script("qsl('a').onclick = partial(toggle, '$explain_id');", "");
+											}
+											$id = "export-$commands";
+											echo ", <a href='#$id'>" . lang('Export') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "") . "<span id='$id' class='hidden'>: "
+												. html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
+												. html_select("format", $dump_format, $adminer_export["format"])
+												. "<input type='hidden' name='query' value='" . h($q) . "'>"
+												. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
+												. "</form>\n"
+											;
+										}
+
+									} else {
+										if (preg_match("~^$space*+(CREATE|DROP|ALTER)$space++(DATABASE|SCHEMA)\\b~i", $q)) {
+											restart_session();
+											set_session("dbs", null); // clear cache
+											stop_session();
+										}
+										if (!$_POST["only_errors"]) {
+											echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
+										}
+									}
+									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
+									if ($explain) {
+										echo "<div id='$explain_id' class='hidden'>\n";
+										select($explain, $connection2, $orgtables);
+										echo "</div>\n";
+									}
+								}
+
+								$start = microtime(true);
+							} while ($connection->next_result());
+						}
 
-						$line += substr_count($q.$found, "\n");
 						$query = substr($query, $offset);
 						$offset = 0;
 					}
@@ -200,7 +219,7 @@ if (!isset($_GET["import"])) {
 	}
 	echo "<p>";
 	textarea("query", $q, 20);
-	echo ($_POST ? "" : "<script type='text/javascript'>focus(document.getElementsByTagName('textarea')[0]);</script>\n");
+	echo ($_POST ? "" : script("qs('textarea').focus();"));
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
 	
@@ -212,7 +231,7 @@ if (!isset($_GET["import"])) {
 	);
 	echo "</div></fieldset>\n";
 	echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
-	echo lang('Webserver file %s', "<code>adminer.sql" . (extension_loaded("zlib") ? "[.gz]" : "") . "</code>");
+	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";
 	echo "<p>";

adminer/sqlite.php

@@ -0,0 +1,8 @@
+<?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 "./index.php";

adminer/static/default.css

@@ -10,11 +10,11 @@ h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom:
 h3 { font-weight: normal; font-size: 130%; margin: 1em 0 0; }
 form { margin: 0; }
 td table { width: 100%; margin: 0; }
-table { margin: 1em 20px 0 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
-td, th { border: 0; border-right: 1px solid #999; border-bottom: 1px solid #999; padding: .2em .3em; }
+table { margin: 1em 20px 0 0; border-collapse: collapse; font-size: 90%; }
+td, th { border: 1px solid #999; padding: .2em .3em; }
 th { background: #eee; text-align: left; }
 thead th { text-align: center; padding: .2em .5em; }
-thead td, thead th { background: #ddf; }
+thead td, thead th { background: #ddf; } /* position: sticky; causes Firefox to lose borders */
 fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8em .5em 0 0; border: 1px solid #999; }
 p { margin: .8em 20px 0 0; }
 img { vertical-align: middle; border: 0; }
@@ -26,15 +26,18 @@ pre, textarea { font: 100%/1.25 monospace; }
 input[type=image] { 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; }
+input.wayoff { left: -1000px; position: absolute; }
 .block { display: block; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
 .js .column { position: absolute; background: #ddf; padding: .27em 1ex .3em 0; margin-top: -.27em; }
-.nowrap td, .nowrap th, td.nowrap { white-space: pre; }
+.nowrap td, .nowrap th, td.nowrap, p.nowrap { white-space: pre; }
 .wrap td { white-space: normal; }
 .error { color: red; background: #fee; }
 .error b { background: #fff; font-weight: normal; }
 .message { color: green; background: #efe; }
+.message table { color: #000; background: #fff; }
 .error, .message { padding: .5em .8em; margin: 1em 20px 0 0; }
 .char { color: #007F00; }
 .date { color: #7F007F; }
@@ -55,12 +58,14 @@ input.required { box-shadow: 1px 1px 1px red; }
 .icon:hover { background-color: red; }
 .size { width: 6ex; }
 .help { cursor: help; }
-.pages { position: fixed; bottom: 0; left: 21em; padding: 5px; background: #ddf; border: 1px solid #999; }
+.footer { position: sticky; bottom: 0; background: #fff; padding: 1px 0 .5em; }
 .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 { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#menu p, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#tables li{ list-style: none; }
 #dbs { overflow: hidden; }
 #logins, #tables { white-space: nowrap; overflow: auto; }
 #logins a, #tables a, #tables span { background: #fff; }
@@ -79,6 +84,8 @@ input.required { box-shadow: 1px 1px 1px red; }
 .rtl .logout { left: 0; right: auto; }
 .rtl #content { margin: 2em 21em 0 0; padding: 10px 0 20px 20px; }
 .rtl #breadcrumb { left: auto; right: 21em; margin: 0 -18px 0 0; }
+.rtl .pages { left: auto; right: 21em; }
+.rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 
 @media all and (max-device-width: 880px) {
@@ -87,6 +94,7 @@ input.required { box-shadow: 1px 1px 1px red; }
 	#content { margin-left: 10px; }
 	#lang { position: static; border-top: 1px solid #999; }
 	#breadcrumb { left: auto; }
+	.rtl .pages { right: auto; }
 	.rtl #content { margin-right: 10px; }
 	.rtl #breadcrumb { right: auto; }
 }

adminer/static/editing.js

@@ -2,18 +2,25 @@
 
 /** Load syntax highlighting
 * @param string first three characters of database system version
+* @param [boolean]
 */
-function bodyLoad(version) {
+function bodyLoad(version, maria) {
 	if (window.jush) {
-		jush.create_links = ' target="_blank" rel="noreferrer"';
+		jush.create_links = ' target="_blank" rel="noreferrer noopener"';
 		if (version) {
 			for (var key in jush.urls) {
 				var obj = jush.urls;
 				if (typeof obj[key] != 'string') {
 					obj = obj[key];
 					key = 0;
+					if (maria) {
+						for (var i = 1; i < obj.length; i++) {
+							obj[i] = obj[i].replace(/\.html/, '/');
+						}
+					}
 				}
 				obj[key] = obj[key]
+					.replace(/dev\.mysql\.com\/doc\/mysql\/en\//, (maria ? 'mariadb.com/kb/en/library/' : '$&')) // MariaDB
 					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
 					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
 				;
@@ -23,7 +30,7 @@ function bodyLoad(version) {
 			jush.custom_links = jushLinks;
 		}
 		jush.highlight_tag('code', 0);
-		var tags = document.getElementsByTagName('textarea');
+		var tags = qsa('textarea', document);
 		for (var i = 0; i < tags.length; i++) {
 			if (/(^|\s)jush-/.test(tags[i].className)) {
 				var pre = jush.textarea(tags[i]);
@@ -60,15 +67,12 @@ function typePassword(el, disable) {
 	}
 }
 
-/** Hide or show some login rows for selected driver
-* @param HTMLSelectElement
+/** Install toggle handler
 */
-function loginDriver(driver) {
-	var trs = parentTag(driver, 'table').rows;
-	for (var i=1; i < trs.length - 1; i++) {
-		var disabled = /sqlite/.test(driver.value);
-		alterClass(trs[i], 'hidden', disabled);
-		trs[i].getElementsByTagName('input')[0].disabled = disabled;
+function messagesPrint() {
+	var els = qsa('.toggle', document);
+	for (var i = 0; i < els.length; i++) {
+		els[i].onclick = partial(toggle, els[i].getAttribute('href').substr(1));
 	}
 }
 
@@ -79,45 +83,46 @@ var dbPrevious = {};
 
 /** Check if database should be opened to a new window
 * @param MouseEvent
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function dbMouseDown(event, el) {
+function dbMouseDown(event) {
 	dbCtrl = isCtrl(event);
-	if (dbPrevious[el.name] == undefined) {
-		dbPrevious[el.name] = el.value;
+	if (dbPrevious[this.name] == undefined) {
+		dbPrevious[this.name] = this.value;
 	}
 }
 
 /** Load database after selecting it
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function dbChange(el) {
+function dbChange() {
 	if (dbCtrl) {
-		el.form.target = '_blank';
+		this.form.target = '_blank';
 	}
-	el.form.submit();
-	el.form.target = '';
-	if (dbCtrl && dbPrevious[el.name] != undefined) {
-		el.value = dbPrevious[el.name];
-		dbPrevious[el.name] = undefined;
+	this.form.submit();
+	this.form.target = '';
+	if (dbCtrl && dbPrevious[this.name] != undefined) {
+		this.value = dbPrevious[this.name];
+		dbPrevious[this.name] = undefined;
 	}
 }
 
 
 
 /** Check whether the query will be executed with index
-* @param HTMLFormElement
+* @this HTMLElement
 */
-function selectFieldChange(form) {
+function selectFieldChange() {
+	var form = this.form;
 	var ok = (function () {
-		var inputs = form.getElementsByTagName('input');
+		var inputs = qsa('input', form);
 		for (var i=0; i < inputs.length; i++) {
 			if (inputs[i].value && /^fulltext/.test(inputs[i].name)) {
 				return true;
 			}
 		}
 		var ok = form.limit.value;
-		var selects = form.getElementsByTagName('select');
+		var selects = qsa('select', form);
 		var group = false;
 		var columns = {};
 		for (var i=0; i < selects.length; i++) {
@@ -184,14 +189,14 @@ function idfEscape(s) {
 }
 
 /** Detect foreign key
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function editingNameChange(field) {
-	var name = field.name.substr(0, field.name.length - 7);
-	var type = formField(field.form, name + '[type]');
+function editingNameChange() {
+	var name = this.name.substr(0, this.name.length - 7);
+	var type = formField(this.form, name + '[type]');
 	var opts = type.options;
 	var candidate; // don't select anything with ambiguous match (like column `id`)
-	var val = field.value;
+	var val = this.value;
 	for (var i = opts.length; i--; ) {
 		var match = /(.+)`(.+)/.exec(opts[i].value);
 		if (!match) { // common type
@@ -221,23 +226,23 @@ function editingNameChange(field) {
 }
 
 /** Add table row for next field
-* @param HTMLInputElement
 * @param boolean
-* @return boolean
+* @return boolean false
+* @this HTMLInputElement
 */
-function editingAddRow(button, focus) {
-	var match = /(\d+)(\.\d+)?/.exec(button.name);
+function editingAddRow(focus) {
+	var match = /(\d+)(\.\d+)?/.exec(this.name);
 	var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
-	var row = parentTag(button, 'tr');
+	var row = parentTag(this, 'tr');
 	var row2 = cloneNode(row);
-	var tags = row.getElementsByTagName('select');
-	var tags2 = row2.getElementsByTagName('select');
+	var tags = qsa('select', row);
+	var tags2 = qsa('select', row2);
 	for (var i=0; i < tags.length; i++) {
 		tags2[i].name = tags[i].name.replace(/[0-9.]+/, x);
 		tags2[i].selectedIndex = tags[i].selectedIndex;
 	}
-	tags = row.getElementsByTagName('input');
-	tags2 = row2.getElementsByTagName('input');
+	tags = qsa('input', row);
+	tags2 = qsa('input', row2);
 	var input = tags2[0]; // IE loose tags2 after insertBefore()
 	for (var i=0; i < tags.length; i++) {
 		if (tags[i].name == 'auto_increment_col') {
@@ -252,43 +257,52 @@ function editingAddRow(button, focus) {
 			tags2[i].checked = false;
 		}
 	}
-	tags[0].onchange = function () {
-		editingNameChange(tags[0]);
-	};
-	tags[0].onkeyup = function () {
-	};
+	tags[0].oninput = editingNameChange;
 	row.parentNode.insertBefore(row2, row.nextSibling);
 	if (focus) {
-		input.onchange = function () {
-			editingNameChange(input);
-		};
-		input.onkeyup = function () {
-		};
+		input.oninput = editingNameChange;
 		input.focus();
 	}
 	added += '0';
 	rowCount++;
-	return true;
+	return false;
 }
 
 /** Remove table row for field
-* @param HTMLInputElement
 * @param string
-* @return boolean
+* @return boolean false
+* @this HTMLInputElement
 */
-function editingRemoveRow(button, name) {
-	var field = formField(button.form, button.name.replace(/[^\[]+(.+)/, name));
+function editingRemoveRow(name) {
+	var field = formField(this.form, this.name.replace(/[^\[]+(.+)/, name));
 	field.parentNode.removeChild(field);
-	parentTag(button, 'tr').style.display = 'none';
-	return true;
+	parentTag(this, 'tr').style.display = 'none';
+	return false;
+}
+
+/** Move table row for field
+* @param boolean direction to move row, true for up or false for down
+* @return boolean false for success
+* @this HTMLInputElement
+*/
+function editingMoveRow(dir){
+	var row = parentTag(this, 'tr');
+	if (!('nextElementSibling' in row)) {
+		return true;
+	}
+	row.parentNode.insertBefore(row, dir
+		? row.previousElementSibling
+		: row.nextElementSibling ? row.nextElementSibling.nextElementSibling : row.parentNode.firstChild);
+	return false;
 }
 
 var lastType = '';
 
 /** Clear length and hide collation or unsigned
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function editingTypeChange(type) {
+function editingTypeChange() {
+	var type = this;
 	var name = type.name.substr(0, type.name.length - 6);
 	var text = selectValue(type);
 	for (var i=0; i < type.form.elements.length; i++) {
@@ -300,7 +314,7 @@ function editingTypeChange(type) {
 			)) {
 				el.value = '';
 			}
-			el.onchange.apply(el);
+			el.oninput.apply(el);
 		}
 		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
@@ -309,7 +323,7 @@ function editingTypeChange(type) {
 			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
 		}
 		if (el.name == name + '[unsigned]') {
-			alterClass(el, 'hidden', !/((^|[^o])int|float|double|decimal)$/.test(text));
+			alterClass(el, 'hidden', !/(^|[^o])int(?!er)|numeric|real|float|double|decimal|money/.test(text));
 		}
 		if (el.name == name + '[on_update]') {
 			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
@@ -322,37 +336,37 @@ function editingTypeChange(type) {
 }
 
 /** Mark length as required
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function editingLengthChange(el) {
-	alterClass(el, 'required', !el.value.length && /var(char|binary)$/.test(selectValue(el.parentNode.previousSibling.firstChild)));
+function editingLengthChange() {
+	alterClass(this, 'required', !this.value.length && /var(char|binary)$/.test(selectValue(this.parentNode.previousSibling.firstChild)));
 }
 
 /** Edit enum or set
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function editingLengthFocus(field) {
-	var td = field.parentNode;
+function editingLengthFocus() {
+	var td = this.parentNode;
 	if (/(enum|set)$/.test(selectValue(td.previousSibling.firstChild))) {
-		var edit = document.getElementById('enum-edit');
-		var val = field.value;
+		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
 		td.appendChild(edit);
-		field.style.display = 'none';
+		this.style.display = 'none';
 		edit.style.display = 'inline';
 		edit.focus();
 	}
 }
 
 /** Finish editing of enum or set
-* @param HTMLTextAreaElement
+* @this HTMLTextAreaElement
 */
-function editingLengthBlur(edit) {
-	var field = edit.parentNode.firstChild;
-	var val = edit.value;
-	field.value = (/^'[^\n]+'$/.test(val) ? val : "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\n/g, "','") + "'");
+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.style.display = 'inline';
-	edit.style.display = 'none';
+	this.style.display = 'none';
 }
 
 /** Show or hide selected table column
@@ -360,9 +374,9 @@ function editingLengthBlur(edit) {
 * @param number
 */
 function columnShow(checked, column) {
-	var trs = document.getElementById('edit-fields').getElementsByTagName('tr');
+	var trs = qsa('tr', qs('#edit-fields'));
 	for (var i=0; i < trs.length; i++) {
-		alterClass(trs[i].getElementsByTagName('td')[column], 'hidden', !checked);
+		alterClass(qsa('td', trs[i])[column], 'hidden', !checked);
 	}
 }
 
@@ -370,76 +384,94 @@ function columnShow(checked, column) {
 */
 function editingHideDefaults() {
 	if (innerWidth < document.documentElement.scrollWidth) {
-		document.getElementById('form')['defaults'].checked = false;
+		qs('#form')['defaults'].checked = false;
 		columnShow(false, 5);
 	}
 }
 
 /** Display partition options
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function partitionByChange(el) {
-	var partitionTable = /RANGE|LIST/.test(selectValue(el));
-	alterClass(el.form['partitions'], 'hidden', partitionTable || !el.selectedIndex);
-	alterClass(document.getElementById('partition-table'), 'hidden', !partitionTable);
+function partitionByChange() {
+	var partitionTable = /RANGE|LIST/.test(selectValue(this));
+	alterClass(this.form['partitions'], 'hidden', partitionTable || !this.selectedIndex);
+	alterClass(qs('#partition-table'), 'hidden', !partitionTable);
 	helpClose();
 }
 
 /** Add next partition row
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function partitionNameChange(el) {
-	var row = cloneNode(parentTag(el, 'tr'));
+function partitionNameChange() {
+	var row = cloneNode(parentTag(this, 'tr'));
 	row.firstChild.firstChild.value = '';
-	parentTag(el, 'table').appendChild(row);
-	el.onchange = function () {};
+	parentTag(this, 'table').appendChild(row);
+	this.oninput = function () {};
+}
+
+
+
+/** Uncheck 'all' checkbox
+* @param MouseEvent
+* @this HTMLTableElement
+*/
+function dumpClick(event) {
+	var el = parentTag(getTarget(event), 'label');
+	if (el) {
+		el = qs('input', el);
+		var match = /(.+)\[\]$/.exec(el.name);
+		if (match) {
+			checkboxClick.call(el, event);
+			formUncheck('check-' + match[1]);
+		}
+	}
 }
 
 
 
 /** Add row for foreign key
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function foreignAddRow(field) {
-	field.onchange = function () { };
-	var row = cloneNode(parentTag(field, 'tr'));
-	var selects = row.getElementsByTagName('select');
+function foreignAddRow() {
+	this.onchange = function () { };
+	var row = cloneNode(parentTag(this, 'tr'));
+	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/\]/, '1$&');
 		selects[i].selectedIndex = 0;
 	}
-	parentTag(field, 'table').appendChild(row);
+	parentTag(this, 'table').appendChild(row);
 }
 
 
 
 /** Add row for indexes
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function indexesAddRow(field) {
-	field.onchange = function () { };
-	var row = cloneNode(parentTag(field, 'tr'));
-	var selects = row.getElementsByTagName('select');
+function indexesAddRow() {
+	this.onchange = function () { };
+	var row = cloneNode(parentTag(this, 'tr'));
+	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
-	var inputs = row.getElementsByTagName('input');
+	var inputs = qsa('input', row);
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/indexes\[\d+/, '$&1');
 		inputs[i].value = '';
 	}
-	parentTag(field, 'table').appendChild(row);
+	parentTag(this, 'table').appendChild(row);
 }
 
 /** Change column in index
-* @param HTMLSelectElement
 * @param string name prefix
+* @this HTMLSelectElement
 */
-function indexesChangeColumn(field, prefix) {
+function indexesChangeColumn(prefix) {
 	var names = [];
 	for (var tag in { 'select': 1, 'input': 1 }) {
-		var columns = parentTag(field, 'td').getElementsByTagName(tag);
+		var columns = qsa(tag, parentTag(this, 'td'));
 		for (var i=0; i < columns.length; i++) {
 			if (/\[columns\]/.test(columns[i].name)) {
 				var value = selectValue(columns[i]);
@@ -449,17 +481,15 @@ function indexesChangeColumn(field, prefix) {
 			}
 		}
 	}
-	field.form[field.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
+	this.form[this.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
 }
 
 /** Add column for index
-* @param HTMLSelectElement
 * @param string name prefix
+* @this HTMLSelectElement
 */
-function indexesAddColumn(field, prefix) {
-	field.onchange = function () {
-		indexesChangeColumn(field, prefix);
-	};
+function indexesAddColumn(prefix) {
+	var field = this;
 	var select = field.form[field.name.replace(/\].*/, '][type]')];
 	if (!select.selectedIndex) {
 		while (selectValue(select) != "INDEX" && select.selectedIndex < select.options.length) {
@@ -468,13 +498,14 @@ function indexesAddColumn(field, prefix) {
 		select.onchange();
 	}
 	var column = cloneNode(field.parentNode);
-	var selects = column.getElementsByTagName('select');
+	var selects = qsa('select', column);
 	for (var i = 0; i < selects.length; i++) {
 		select = selects[i];
 		select.name = select.name.replace(/\]\[\d+/, '$&1');
 		select.selectedIndex = 0;
 	}
-	var inputs = column.getElementsByTagName('input');
+	field.onchange = partial(indexesChangeColumn, prefix);
+	var inputs = qsa('input', column);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
 		input.name = input.name.replace(/\]\[\d+/, '$&1');
@@ -506,48 +537,47 @@ function triggerChange(tableRe, table, form) {
 var that, x, y; // em and tablePos defined in schema.inc.php
 
 /** Get mouse position
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function schemaMousedown(el, event) {
+function schemaMousedown(event) {
 	if ((event.which ? event.which : event.button) == 1) {
-		that = el;
-		x = event.clientX - el.offsetLeft;
-		y = event.clientY - el.offsetTop;
+		that = this;
+		x = event.clientX - this.offsetLeft;
+		y = event.clientY - this.offsetTop;
 	}
 }
 
 /** Move object
 * @param MouseEvent
 */
-function schemaMousemove(ev) {
+function schemaMousemove(event) {
 	if (that !== undefined) {
-		ev = ev || event;
-		var left = (ev.clientX - x) / em;
-		var top = (ev.clientY - y) / em;
-		var divs = that.getElementsByTagName('div');
+		var left = (event.clientX - x) / em;
+		var top = (event.clientY - y) / em;
+		var divs = qsa('div', that);
 		var lineSet = { };
 		for (var i=0; i < divs.length; i++) {
 			if (divs[i].className == 'references') {
-				var div2 = document.getElementById((/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4));
+				var div2 = qs('[id="' + (/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4) + '"]');
 				var ref = (tablePos[divs[i].title] ? tablePos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
 				var left1 = -1;
 				var id = divs[i].id.replace(/^ref.(.+)-.+/, '$1');
 				if (divs[i].parentNode != div2.parentNode) {
 					left1 = Math.min(0, ref[1] - left) - 1;
 					divs[i].style.left = left1 + 'em';
-					divs[i].getElementsByTagName('div')[0].style.width = -left1 + 'em';
+					divs[i].querySelector('div').style.width = -left1 + 'em';
 					var left2 = Math.min(0, left - ref[1]) - 1;
 					div2.style.left = left2 + 'em';
-					div2.getElementsByTagName('div')[0].style.width = -left2 + 'em';
+					div2.querySelector('div').style.width = -left2 + 'em';
 				}
 				if (!lineSet[id]) {
-					var line = document.getElementById(divs[i].id.replace(/^....(.+)-.+$/, 'refl$1'));
+					var line = qs('[id="' + divs[i].id.replace(/^....(.+)-.+$/, 'refl$1') + '"]');
 					var top1 = top + divs[i].offsetTop / em;
 					var top2 = top + div2.offsetTop / em;
 					if (divs[i].parentNode != div2.parentNode) {
 						top2 += ref[0] - top;
-						line.getElementsByTagName('div')[0].style.height = Math.abs(top1 - top2) + 'em';
+						line.querySelector('div').style.height = Math.abs(top1 - top2) + 'em';
 					}
 					line.style.left = (left + left1) + 'em';
 					line.style.top = Math.min(top1, top2) + 'em';
@@ -564,17 +594,16 @@ function schemaMousemove(ev) {
 * @param MouseEvent
 * @param string
 */
-function schemaMouseup(ev, db) {
+function schemaMouseup(event, db) {
 	if (that !== undefined) {
-		ev = ev || event;
-		tablePos[that.firstChild.firstChild.firstChild.data] = [ (ev.clientY - y) / em, (ev.clientX - x) / em ];
+		tablePos[that.firstChild.firstChild.firstChild.data] = [ (event.clientY - y) / em, (event.clientX - x) / em ];
 		that = undefined;
 		var s = '';
 		for (var key in tablePos) {
 			s += '_' + key + ':' + Math.round(tablePos[key][0] * 10000) / 10000 + 'x' + Math.round(tablePos[key][1] * 10000) / 10000;
 		}
 		s = encodeURIComponent(s.substr(1));
-		var link = document.getElementById('schema-link');
+		var link = qs('#schema-link');
 		link.href = link.href.replace(/[^=]+$/, '') + s;
 		cookie('adminer_schema-' + db + '=' + s, 30); //! special chars in db
 	}
@@ -585,18 +614,18 @@ function schemaMouseup(ev, db) {
 var helpOpen, helpIgnore; // when mouse outs <option> then it mouse overs border of <select> - ignore it
 
 /** Display help
-* @param HTMLElement
 * @param MouseEvent
 * @param string
 * @param bool display on left side (otherwise on top)
+* @this HTMLElement
 */
-function helpMouseover(el, event, text, side) {
+function helpMouseover(event, text, side) {
 	var target = getTarget(event);
 	if (!text) {
 		helpClose();
-	} else if (window.jush && (!helpIgnore || el != target)) {
+	} else if (window.jush && (!helpIgnore || this != target)) {
 		helpOpen = 1;
-		var help = document.getElementById('help');
+		var help = qs('#help');
 		help.innerHTML = text;
 		jush.highlight_tag([ help ]);
 		alterClass(help, 'hidden');
@@ -608,12 +637,12 @@ function helpMouseover(el, event, text, side) {
 }
 
 /** Close help after timeout
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function helpMouseout(el, event) {
+function helpMouseout(event) {
 	helpOpen = 0;
-	helpIgnore = (el != getTarget(event));
+	helpIgnore = (this != getTarget(event));
 	setTimeout(function () {
 		if (!helpOpen) {
 			helpClose();
@@ -624,5 +653,5 @@ function helpMouseout(el, event) {
 /** Close help
 */
 function helpClose() {
-	alterClass(document.getElementById('help'), 'hidden', true);
+	alterClass(qs('#help'), 'hidden', true);
 }

adminer/static/functions.js

@@ -1,4 +1,67 @@
 
+/** Get first element by selector
+* @param string
+* @param [HTMLElement] defaults to document
+* @return HTMLElement
+*/
+function qs(selector, context) {
+	return (context || document).querySelector(selector);
+}
+
+/** Get last element by selector
+* @param string
+* @param [HTMLElement] defaults to document
+* @return HTMLElement
+*/
+function qsl(selector, context) {
+	var els = qsa(selector, context || document);
+	return els[els.length - 1];
+}
+
+/** Get all elements by selector
+* @param string
+* @param HTMLElement
+* @return NodeList
+*/
+function qsa(selector, context) {
+	return context.querySelectorAll(selector);
+}
+
+/** Return a function calling fn with the next arguments
+* @param function
+* @param ...
+* @return function with preserved this
+*/
+function partial(fn) {
+	var args = Array.apply(null, arguments).slice(1);
+	return function () {
+		return fn.apply(this, args);
+	};
+}
+
+/** Return a function calling fn with the first parameter and then the next arguments
+* @param function
+* @param ...
+* @return function with preserved this
+*/
+function partialArg(fn) {
+	var args = Array.apply(null, arguments);
+	return function (arg) {
+		args[0] = arg;
+		return fn.apply(this, args);
+	};
+}
+
+/** Assign values from source to target
+* @param Object
+* @param Object
+*/
+function mixin(target, source) {
+	for (var key in source) {
+		target[key] = source[key];
+	}
+}
+
 /** Add or remove CSS class
 * @param HTMLElement
 * @param string
@@ -12,12 +75,12 @@ function alterClass(el, className, enable) {
 
 /** Toggle visibility
 * @param string
-* @return boolean
+* @return boolean false
 */
 function toggle(id) {
-	var el = document.getElementById(id);
+	var el = qs('#' + id);
 	el.className = (el.className == 'hidden' ? '' : 'hidden');
-	return true;
+	return false;
 }
 
 /** Set permanent cookie
@@ -33,8 +96,10 @@ function cookie(assign, days) {
 
 /** Verify current Adminer version
 * @param string
+* @param string own URL base
+* @param string
 */
-function verifyVersion(current) {
+function verifyVersion(current, url, token) {
 	cookie('adminer_version=0', 1);
 	var iframe = document.createElement('iframe');
 	iframe.src = 'https://www.adminer.org/version/?current=' + current;
@@ -50,11 +115,13 @@ function verifyVersion(current) {
 				var match = /version=(.+)/.exec(event.data);
 				if (match) {
 					cookie('adminer_version=' + match[1], 1);
+					ajax(url + 'script=version', function () {
+					}, event.data + '&token=' + token);
 				}
 			}
 		}, false);
 	}
-	document.getElementById('version').appendChild(iframe);
+	qs('#version').appendChild(iframe);
 }
 
 /** Get value of select
@@ -70,20 +137,20 @@ function selectValue(select) {
 }
 
 /** Verify if element has a specified tag name
- * @param HTMLElement
- * @param string regular expression
- * @return bool
- */
+* @param HTMLElement
+* @param string regular expression
+* @return bool
+*/
 function isTag(el, tag) {
 	var re = new RegExp('^(' + tag + ')$', 'i');
 	return re.test(el.tagName);
 }
 
 /** Get parent node with specified tag name
- * @param HTMLElement
- * @param string regular expression
- * @return HTMLElement
- */
+* @param HTMLElement
+* @param string regular expression
+* @return HTMLElement
+*/
 function parentTag(el, tag) {
 	while (el && !isTag(el, tag)) {
 		el = el.parentNode;
@@ -105,27 +172,31 @@ function trCheck(el) {
 /** Fill number of selected items
 * @param string
 * @param string
+* @uses thousandsSeparator
 */
 function selectCount(id, count) {
-	setHtml(id, (count === '' ? '' : '(' + (count + '').replace(/\B(?=(\d{3})+$)/g, ' ') + ')'));
-	var inputs = document.getElementById(id).parentNode.parentNode.getElementsByTagName('input');
-	for (var i = 0; i < inputs.length; i++) {
-		var input = inputs[i];
-		if (input.type == 'submit') {
-			input.disabled = (count == '0');
+	setHtml(id, (count === '' ? '' : '(' + (count + '').replace(/\B(?=(\d{3})+$)/g, thousandsSeparator) + ')'));
+	var el = qs('#' + id);
+	if (el) {
+		var inputs = qsa('input', el.parentNode.parentNode);
+		for (var i = 0; i < inputs.length; i++) {
+			var input = inputs[i];
+			if (input.type == 'submit') {
+				input.disabled = (count == '0');
+			}
 		}
 	}
 }
 
 /** Check all elements matching given name
-* @param HTMLInputElement
 * @param RegExp
+* @this HTMLInputElement
 */
-function formCheck(el, name) {
-	var elems = el.form.elements;
+function formCheck(name) {
+	var elems = this.form.elements;
 	for (var i=0; i < elems.length; i++) {
 		if (name.test(elems[i].name)) {
-			elems[i].checked = el.checked;
+			elems[i].checked = this.checked;
 			trCheck(elems[i]);
 		}
 	}
@@ -134,10 +205,10 @@ function formCheck(el, name) {
 /** Check all rows in <table class="checkable">
 */
 function tableCheck() {
-	var tables = document.getElementsByTagName('table');
+	var tables = qsa('table', document);
 	for (var i=0; i < tables.length; i++) {
 		if (/(^|\s)checkable(\s|$)/.test(tables[i].className)) {
-			var trs = tables[i].getElementsByTagName('tr');
+			var trs = qsa('tr', tables[i]);
 			for (var j=0; j < trs.length; j++) {
 				trCheck(trs[j].firstChild.firstChild);
 			}
@@ -149,7 +220,7 @@ function tableCheck() {
 * @param string
 */
 function formUncheck(id) {
-	var el = document.getElementById(id);
+	var el = qs('#' + id);
 	el.checked = false;
 	trCheck(el);
 }
@@ -175,6 +246,13 @@ function formChecked(el, name) {
 * @param [boolean] force click
 */
 function tableClick(event, click) {
+	var td = parentTag(getTarget(event), 'td');
+	var text;
+	if (td && (text = td.getAttribute('data-text'))) {
+		if (selectClick.call(td, event, +text, td.getAttribute('data-warning'))) {
+			return;
+		}
+	}
 	click = (click || !window.getSelection || getSelection().isCollapsed);
 	var el = getTarget(event);
 	while (!isTag(el, 'tr')) {
@@ -182,7 +260,7 @@ function tableClick(event, click) {
 			if (el.type != 'checkbox') {
 				return;
 			}
-			checkboxClick(event, el);
+			checkboxClick.call(el, event);
 			click = false;
 		}
 		el = el.parentNode;
@@ -195,31 +273,38 @@ function tableClick(event, click) {
 		el.checked = !el.checked;
 		el.onclick && el.onclick();
 	}
+	if (el.name == 'check[]') {
+		el.form['all'].checked = false;
+		formUncheck('all-page');
+	}
+	if (/^(tables|views)\[\]$/.test(el.name)) {
+		formUncheck('check-all');
+	}
 	trCheck(el);
 }
 
 var lastChecked;
 
 /** Shift-click on checkbox for multiple selection.
- * @param MouseEvent
- * @param HTMLInputElement
- */
-function checkboxClick(event, el) {
-	if (!el.name) {
+* @param MouseEvent
+* @this HTMLInputElement
+*/
+function checkboxClick(event) {
+	if (!this.name) {
 		return;
 	}
-	if (event.shiftKey && (!lastChecked || lastChecked.name == el.name)) {
+	if (event.shiftKey && (!lastChecked || lastChecked.name == this.name)) {
 		var checked = (lastChecked ? lastChecked.checked : true);
-		var inputs = parentTag(el, 'table').getElementsByTagName('input');
+		var inputs = qsa('input', parentTag(this, 'table'));
 		var checking = !lastChecked;
 		for (var i=0; i < inputs.length; i++) {
 			var input = inputs[i];
-			if (input.name === el.name) {
+			if (input.name === this.name) {
 				if (checking) {
 					input.checked = checked;
 					trCheck(input);
 				}
-				if (input === el || input === lastChecked) {
+				if (input === this || input === lastChecked) {
 					if (checking) {
 						break;
 					}
@@ -228,7 +313,7 @@ function checkboxClick(event, el) {
 			}
 		}
 	} else {
-		lastChecked = el;
+		lastChecked = this;
 	}
 }
 
@@ -237,9 +322,9 @@ function checkboxClick(event, el) {
 * @param string undefined to set parentNode to &nbsp;
 */
 function setHtml(id, html) {
-	var el = document.getElementById(id);
+	var el = qs('#' + id);
 	if (el) {
-		if (html == undefined) {
+		if (html == null) {
 			el.parentNode.innerHTML = '&nbsp;';
 		} else {
 			el.innerHTML = html;
@@ -262,88 +347,89 @@ function nodePosition(el) {
 /** Go to the specified page
 * @param string
 * @param string
-* @param [MouseEvent]
 */
-function pageClick(href, page, event) {
+function pageClick(href, page) {
 	if (!isNaN(page) && page) {
-		href += (page != 1 ? '&page=' + (page - 1) : '');
-		location.href = href;
+		location.href = href + (page != 1 ? '&page=' + (page - 1) : '');
 	}
 }
 
 
 
 /** Display items in menu
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function menuOver(el, event) {
+function menuOver(event) {
 	var a = getTarget(event);
 	if (isTag(a, 'a|span') && a.offsetLeft + a.offsetWidth > a.parentNode.offsetWidth - 15) { // 15 - ellipsis
-		el.style.overflow = 'visible';
+		this.style.overflow = 'visible';
 	}
 }
 
 /** Hide items in menu
-* @param HTMLElement
+* @this HTMLElement
 */
-function menuOut(el) {
-	el.style.overflow = 'auto';
+function menuOut() {
+	this.style.overflow = 'auto';
 }
 
 
 
 /** Add row in select fieldset
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function selectAddRow(field) {
-	field.onchange = function () {
-		selectFieldChange(field.form);
-	};
-	field.onchange();
+function selectAddRow() {
+	var field = this;
 	var row = cloneNode(field.parentNode);
-	var selects = row.getElementsByTagName('select');
+	field.onchange = selectFieldChange;
+	field.onchange();
+	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/[a-z]\[\d+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
-	var inputs = row.getElementsByTagName('input');
+	var inputs = qsa('input', row);
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
-		inputs[i].value = '';
 		inputs[i].className = '';
+		if (inputs[i].type == 'checkbox') {
+			inputs[i].checked = false;
+		} else {
+			inputs[i].value = '';
+		}
 	}
 	field.parentNode.parentNode.appendChild(row);
 }
 
 /** Prevent onsearch handler on Enter
-* @param HTMLInputElement
 * @param KeyboardEvent
+* @this HTMLInputElement
 */
-function selectSearchKeydown(el, event) {
+function selectSearchKeydown(event) {
 	if (event.keyCode == 13 || event.keyCode == 10) {
-		el.onsearch = function () {
+		this.onsearch = function () {
 		};
 	}
 }
 
 /** Clear column name after resetting search
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function selectSearchSearch(el) {
-	if (!el.value) {
-		el.parentNode.firstChild.selectedIndex = 0;
+function selectSearchSearch() {
+	if (!this.value) {
+		this.parentNode.firstChild.selectedIndex = 0;
 	}
 }
 
 
 
 /** Toggles column context menu
- * @param HTMLElement
- * @param [string] extra class name
- */
-function columnMouse(el, className) {
-	var spans = el.getElementsByTagName('span');
+* @param [string] extra class name
+* @this HTMLElement
+*/
+function columnMouse(className) {
+	var spans = qsa('span', this);
 	for (var i=0; i < spans.length; i++) {
 		if (/column/.test(spans[i].className)) {
 			spans[i].className = 'column' + (className || '');
@@ -354,12 +440,13 @@ function columnMouse(el, className) {
 
 
 /** Fill column in search field
- * @param string
- */
+* @param string
+* @return boolean false
+*/
 function selectSearch(name) {
-	var el = document.getElementById('fieldset-search');
+	var el = qs('#fieldset-search');
 	el.className = '';
-	var divs = el.getElementsByTagName('div');
+	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) {
@@ -370,7 +457,8 @@ function selectSearch(name) {
 		div.firstChild.value = name;
 		div.firstChild.onchange();
 	}
-	div.lastChild.focus();
+	qs('[name$="[val]"]', div).focus();
+	return false;
 }
 
 
@@ -398,6 +486,7 @@ function getTarget(event) {
 * @return boolean
 */
 function bodyKeydown(event, button) {
+	eventStop(event);
 	var target = getTarget(event);
 	if (target.jushTextarea) {
 		target = target.jushTextarea;
@@ -446,55 +535,56 @@ function editingKeydown(event) {
 		return false;
 	}
 	if (event.shiftKey && !bodyKeydown(event, 'insert')) {
-		eventStop(event);
 		return false;
 	}
 	return true;
 }
 
 /** Disable maxlength for functions
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function functionChange(select) {
-	var input = select.form[select.name.replace(/^function/, 'fields')];
-	if (selectValue(select)) {
+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.maxLength;
+			input.origMaxLength = input.getAttribute('data-maxlength');
 		}
-		input.removeAttribute('maxlength');
+		input.removeAttribute('data-maxlength');
 		input.type = 'text';
 	} else if (input.origType) {
 		input.type = input.origType;
 		if (input.origMaxLength >= 0) {
-			input.maxLength = input.origMaxLength;
+			input.setAttribute('data-maxlength', input.origMaxLength);
 		}
 	}
+	oninput({target: input});
 	helpClose();
 }
 
-/** Call this.onchange() if value changes
-* @this HTMLInputElement
+/** Skip 'original' when typing
+* @param number
+* @this HTMLTableCellElement
 */
-function keyupChange() {
-	if (this.value != this.getAttribute('value')) {
-		this.onchange();
-		this.setAttribute('value', this.value);
+function skipOriginal(first) {
+	var fnSelect = this.previousSibling.firstChild;
+	if (fnSelect.selectedIndex < first) {
+		fnSelect.selectedIndex = first;
 	}
 }
 
 /** Add new field in schema-less edit
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function fieldChange(field) {
-	var row = cloneNode(parentTag(field, 'tr'));
-	var inputs = row.getElementsByTagName('input');
+function fieldChange() {
+	var row = cloneNode(parentTag(this, 'tr'));
+	var inputs = qsa('input', row);
 	for (var i = 0; i < inputs.length; i++) {
 		inputs[i].value = '';
 	}
 	// keep value in <select> (function)
-	parentTag(field, 'table').appendChild(row);
-	field.onchange = function () { };
+	parentTag(this, 'table').appendChild(row);
+	this.oninput = function () { };
 }
 
 
@@ -505,11 +595,12 @@ function fieldChange(field) {
 * @param [string]
 * @param [string]
 * @return XMLHttpRequest or false in case of an error
+* @uses offlineMessage
 */
 function ajax(url, callback, data, message) {
 	var request = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false));
 	if (request) {
-		var ajaxStatus = document.getElementById('ajaxstatus');
+		var ajaxStatus = qs('#ajaxstatus');
 		if (message) {
 			ajaxStatus.innerHTML = '<div class="message">' + message + '</div>';
 			ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
@@ -538,11 +629,11 @@ function ajax(url, callback, data, message) {
 
 /** Use setHtml(key, value) for JSON response
 * @param string
-* @return XMLHttpRequest or false in case of an error
+* @return boolean false for success
 */
 function ajaxSetHtml(url) {
-	return ajax(url, function (request) {
-		var data = eval('(' + request.responseText + ')');
+	return !ajax(url, function (request) {
+		var data = window.JSON ? JSON.parse(request.responseText) : eval('(' + request.responseText + ')');
 		for (var key in data) {
 			setHtml(key, data[key]);
 		}
@@ -579,7 +670,7 @@ function ajaxForm(form, message, button) {
 	return ajax(url, function (request) {
 		setHtml('ajaxstatus', request.responseText);
 		if (window.jush) {
-			jush.highlight_tag(document.getElementById('ajaxstatus').getElementsByTagName('code'), 0);
+			jush.highlight_tag(qsa('code', qs('#ajaxstatus')), 0);
 		}
 	}, data, message);
 }
@@ -587,18 +678,21 @@ function ajaxForm(form, message, button) {
 
 
 /** Display edit field
-* @param HTMLElement
 * @param MouseEvent
 * @param number display textarea instead of input, 2 - load long text
-* @param string warning to display
+* @param [string] warning to display
+* @return boolean
+* @this HTMLElement
 */
-function selectClick(td, event, text, warning) {
+function selectClick(event, text, warning) {
+	var td = this;
 	var target = getTarget(event);
 	if (!isCtrl(event) || isTag(td.firstChild, 'input|textarea') || isTag(target, 'a')) {
 		return;
 	}
 	if (warning) {
-		return alert(warning);
+		alert(warning);
+		return true;
 	}
 	var original = td.innerHTML;
 	text = text || /\n/.test(original);
@@ -622,7 +716,7 @@ function selectClick(td, event, text, warning) {
 		});
 		input.rows = rows;
 	}
-	if (value == '\u00A0' || td.getElementsByTagName('i').length) { // &nbsp; or i - NULL
+	if (value == '\u00A0' || qsa('i', td).length) { // &nbsp; or i - NULL
 		value = '';
 	}
 	if (document.selection) {
@@ -654,26 +748,28 @@ function selectClick(td, event, text, warning) {
 		range.moveEnd('character', -input.value.length + pos);
 		range.select();
 	}
+	return true;
 }
 
 
 
 /** Load and display next page in select
-* @param HTMLLinkElement
 * @param number
 * @param string
-* @return boolean
+* @return boolean false for success
+* @this HTMLLinkElement
 */
-function selectLoadMore(a, limit, loading) {
+function selectLoadMore(limit, loading) {
+	var a = this;
 	var title = a.innerHTML;
 	var href = a.href;
 	a.innerHTML = loading;
 	if (href) {
 		a.removeAttribute('href');
-		return ajax(href, function (request) {
+		return !ajax(href, function (request) {
 			var tbody = document.createElement('tbody');
 			tbody.innerHTML = request.responseText;
-			document.getElementById('table').appendChild(tbody);
+			qs('#table').appendChild(tbody);
 			if (tbody.children.length < limit) {
 				a.parentNode.removeChild(a);
 			} else {
@@ -706,7 +802,7 @@ function eventStop(event) {
 */
 function setupSubmitHighlight(parent) {
 	for (var key in { input: 1, select: 1, textarea: 1 }) {
-		var inputs = parent.getElementsByTagName(key);
+		var inputs = qsa(key, parent);
 		for (var i = 0; i < inputs.length; i++) {
 			setupSubmitHighlightInput(inputs[i])
 		}
@@ -751,7 +847,10 @@ function findDefaultSubmit(el) {
 	if (el.jushTextarea) {
 		el = el.jushTextarea;
 	}
-	var inputs = el.form.getElementsByTagName('input');
+	if (!el.form) {
+		return null;
+	}
+	var inputs = qsa('input', el.form);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
 		if (input.type == 'submit' && !input.style.zIndex) {
@@ -790,6 +889,23 @@ function focus(el) {
 */
 function cloneNode(el) {
 	var el2 = el.cloneNode(true);
+	var selector = 'input, select';
+	var origEls = qsa(selector, el);
+	var cloneEls = qsa(selector, el2);
+	for (var i=0; i < origEls.length; i++) {
+		var origEl = origEls[i];
+		for (var key in origEl) {
+			if (/^on/.test(key) && origEl[key]) {
+				cloneEls[i][key] = origEl[key];
+			}
+		}
+	}
 	setupSubmitHighlight(el2);
 	return el2;
 }
+
+oninput = function (event) {
+	var target = event.target;
+	var maxLength = target.getAttribute('data-maxlength');
+	alterClass(target, 'maxlength', target.value && maxLength != null && target.value.length > maxLength); // maxLength could be 0
+};

adminer/table.inc.php

@@ -5,28 +5,18 @@ if (!$fields) {
 	$error = error();
 }
 $table_status = table_status1($TABLE, true);
+$name = $adminer->tableName($table_status);
 
-page_header(($fields && is_view($table_status) ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
+page_header(($fields && is_view($table_status) ? $table_status['Engine'] == 'materialized view' ? lang('Materialized view') : lang('View') : lang('Table')) . ": " . ($name != "" ? $name : h($TABLE)), $error);
 
 $adminer->selectLinks($table_status);
 $comment = $table_status["Comment"];
 if ($comment != "") {
-	echo "<p>" . lang('Comment') . ": " . h($comment) . "\n";
+	echo "<p class='nowrap'>" . lang('Comment') . ": " . h($comment) . "\n";
 }
 
 if ($fields) {
-	echo "<table cellspacing='0'>\n";
-	echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
-	foreach ($fields as $field) {
-		echo "<tr" . odd() . "><th>" . h($field["field"]);
-		echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
-		echo ($field["null"] ? " <i>NULL</i>" : "");
-		echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
-		echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
-		echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
-		echo "\n";
-	}
-	echo "</table>\n";
+	$adminer->tableStructurePrint($fields);
 }
 
 if (!is_view($table_status)) {
@@ -34,19 +24,7 @@ if (!is_view($table_status)) {
 		echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
 		$indexes = indexes($TABLE);
 		if ($indexes) {
-			echo "<table cellspacing='0'>\n";
-			foreach ($indexes as $name => $index) {
-				ksort($index["columns"]); // enforce correct columns order
-				$print = array();
-				foreach ($index["columns"] as $key => $val) {
-					$print[] = "<i>" . h($val) . "</i>"
-						. ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
-						. ($index["descs"][$key] ? " DESC" : "")
-					;
-				}
-				echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
-			}
-			echo "</table>\n";
+			$adminer->tableIndexesPrint($indexes);
 		}
 		echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
 	}

adminer/trigger.inc.php

@@ -40,10 +40,10 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 <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">
-<script type="text/javascript">document.getElementById('form')['Timing'].onchange();</script>
+<?php echo script("qs('#form')['Timing'].onchange();"); ?>
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($name != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?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/type.inc.php

@@ -22,7 +22,7 @@ if (!$row) {
 <p>
 <?php
 if ($TYPE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $TYPE)) . "\n";
 } else {
 	echo "<input name='name' value='" . h($row['name']) . "' autocapitalize='off'>\n";
 	textarea("as", $row["as"]);

adminer/user.inc.php

@@ -61,7 +61,7 @@ if ($_POST && !$error) {
 		$created = false;
 		if (!$error) {
 			if ($old_user != $new_user) {
-				$created = queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
+				$created = queries((min_version(5) ? "CREATE USER" : "GRANT USAGE ON *.* TO") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
 				$error = !$created;
 			} elseif ($pass != $old_pass) {
 				queries("SET PASSWORD FOR $new_user = " . q($pass));
@@ -134,8 +134,8 @@ if ($_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">
-<tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>">
-<?php if (!$row["hashed"]) { ?><script type="text/javascript">typePassword(document.getElementById('pass'));</script><?php } ?>
+<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);"); ?>
 </table>
 
@@ -169,7 +169,11 @@ foreach (array(
 			} 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 {
-				echo "<td align='center'><label class='block'><input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges" ? " id='grants-$i-all'" : ($privilege == "Grant option" ? "" : " onclick=\"if (this.checked) formUncheck('grants-$i-all');\"")) . "></label>"; //! uncheck all except grant if all is checked
+				echo "<td align='center'><label class='block'>";
+				echo "<input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges"
+					? " id='grants-$i-all'>" //! uncheck all except grant if all is checked
+					: ">" . ($privilege == "Grant option" ? "" : script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };")));
+				echo "</label>";
 			}
 			$i++;
 		}
@@ -180,6 +184,6 @@ echo "</table>\n";
 ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', "$USER@$_GET[host]")); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/view.inc.php

@@ -1,6 +1,11 @@
 <?php
 $TABLE = $_GET["view"];
 $row = $_POST;
+$orig_type = "VIEW";
+if ($jush == "pgsql" && $TABLE != "") {
+	$status = table_status($TABLE);
+	$orig_type = strtoupper($status["Engine"]);
+}
 
 if ($_POST && !$error) {
 	$name = trim($row["name"]);
@@ -8,22 +13,14 @@ if ($_POST && !$error) {
 	$location = ME . "table=" . urlencode($name);
 	$message = lang('View has been altered.');
 
-	if ($_GET["materialized"]) {
-		$type = "MATERIALIZED VIEW";
-	} else {
-		$type = "VIEW";
-		if ($jush == "pgsql") {
-			$status = table_status($name);
-			$type = ($status ? strtoupper($status["Engine"]) : $type);
-		}
-	}
+	$type = ($_POST["materialized"] ? "MATERIALIZED VIEW" : "VIEW");
 
-	if (!$_POST["drop"] && $TABLE == $name && $jush != "sqlite" && $type != "MATERIALIZED VIEW") {
+	if (!$_POST["drop"] && $TABLE == $name && $jush != "sqlite" && $type == "VIEW" && $orig_type == "VIEW") {
 		query_redirect(($jush == "mssql" ? "ALTER" : "CREATE OR REPLACE") . " VIEW " . table($name) . $as, $location, $message);
 	} else {
 		$temp_name = $name . "_adminer_" . uniqid();
 		drop_create(
-			"DROP $type " . table($TABLE),
+			"DROP $orig_type " . table($TABLE),
 			"CREATE $type " . table($name) . $as,
 			"DROP $type " . table($name),
 			"CREATE $type " . table($temp_name) . $as,
@@ -41,6 +38,7 @@ if ($_POST && !$error) {
 if (!$_POST && $TABLE != "") {
 	$row = view($TABLE);
 	$row["name"] = $TABLE;
+	$row["materialized"] = ($orig_type != "VIEW");
 	if (!$error) {
 		$error = error();
 	}
@@ -51,9 +49,10 @@ 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">
+<?php echo (support("materializedview") ? " " . checkbox("materialized", 1, $row["materialized"], lang('Materialized view')) : ""); ?>
 <p><?php textarea("select", $row["select"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($_GET["view"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

changes.txt

@@ -1,3 +1,112 @@
+Adminer 4.6.1 (released 2018-02-09):
+Sticky position of table actions
+Speed up rendering of long tables (regression from 4.4.0)
+Display notification about performing action after relogin
+Add system tables help links
+MySQL: Support non-utf8 charset in search in column
+MySQL: Support geometry in MySQL 8 (bug #574)
+MariaDB: Links to documentation
+SQLite: Allow deleting PRIMARY KEY from tables with auto increment
+PostgreSQL: Support binary files in bytea fields
+PostgreSQL: Don't treat interval type as number (bug #474)
+PostgreSQL: Cast to string when searching using LIKE (bug #325)
+PostgreSQL: Fix condition for selecting no rows
+PostgreSQL: Support TRUNCATE+INSERT export
+Customization: Support connecting to MySQL via SSL
+Customization: Allow specifying server name displayed in breadcrumbs
+
+Adminer 4.6.0 (released 2018-02-05):
+Fix counting selected rows after going back to select page
+PHP <5.3 compatibility even with Elasticsearch enabled
+Fully support functions in default values
+Stop redirecting links via adminer.org
+Support X-Forwarded-Prefix
+Display options for timestamp columns when creating a new table
+Disable autocompleting password on create user page
+Use primary key to edit rows even if not selected
+MySQL, PostgreSQL: Display warnings
+MySQL: Add floor and ceil select functions
+MySQL: Add FIND_IN_SET search operator
+MariaDB: Support JSON since MariaDB 10.2
+SQLite, PostgreSQL: Limit rows in data manipulation without unique key
+PostgreSQL: Support routines
+PostgreSQL: Allow editing views with uppercase letters (bug #467)
+PostgreSQL: Allow now() as default value (bug #525)
+SimpleDB: Document that allow_url_fopen is required
+Malay translation
+
+Adminer 4.5.0 (released 2018-01-24):
+Display name of the object in confirmation when dropping it
+Display newlines in column comments (bug #573)
+Support current_timestamp() as default of time fields (bug #572)
+Hide window.opener from pages opened in a new window (bug #561)
+Display error when getting row to edit
+Store current Adminer version server-side to avoid excessive requests
+Adminer: Fix Search data in tables (regression from 4.4.0)
+CSP: Allow any styles, images, media and fonts, disallow base-uri
+MySQL: Support geometry in MySQL 8 (bug #574)
+MySQL: Support routines with comments in parameters (bug #460)
+MariaDB: Support fulltext and spatial indexes in InnoDB (bug #583)
+SQLite: Enable foreign key checks
+PostgreSQL: Respect NULL default value
+PostgreSQL: Display foreign tables (bug #576)
+PostgreSQL: Do not export triggers if not requested
+PostgreSQL: Export DROP SEQUENCE if dropping table
+PostgreSQL: Display boolean values as code (bug #562)
+MS SQL: Support freetds
+non-MySQL: Avoid CONVERT() (bug #509)
+Elasticsearch: Insert, update, delete
+MongoDB: Support mongodb PHP extension
+Editor: Fix displaying of false values in PostgreSQL (bug #568)
+
+Adminer 4.4.0 (released 2018-01-17):
+Add Content Security Policy
+Disallow scripts without nonce
+Rate limit password-less login attempts from the same IP address
+Disallow connecting to privileged ports
+Add nosniff header
+PHP 7.1: Prevent warning when using empty limit
+PHP 7.2: Prevent warning when searching in select
+MySQL: Remove dedicated view for replication status (added in 4.3.0)
+PostgreSQL: Sort table names (regression from 4.3.1)
+Editor: Don't set time zone from PHP, fixes DST
+Editor: Display field comment's text inside [] only in edit form
+Editor: Fix doubleclick on database page
+Editor: Fix Search data in tables
+Customization: Always send security headers
+Hebrew translation
+
+Adminer 4.3.1 (released 2017-04-14):
+Fix permanent login after logout (bug #539)
+Fix SQL command autofocus (regression from 4.0.0)
+PostgreSQL: Support JSON and JSONB data types
+PostgreSQL: Fix index size computation in PostgreSQL < 9.0 (regression from 4.3.0)
+PostgreSQL: Fix nullable fields in export
+
+Adminer 4.3.0 (released 2017-03-15):
+Make maxlength in edit fields a soft limit
+Add accessibility labels
+Add Cache-Control: immutable to static files
+MySQL: Support MySQL 8
+MySQL: Support JSON data type
+MySQL: Add dedicated view for replication status
+MySQL: Support spatial indexes
+PostgreSQL: Export
+PostgreSQL: Don't treat partial indexes as unique
+MS SQL: Support pdo_dblib
+Elasticsearch: Support HTTPS by inputting https://server
+
+Adminer 4.2.5 (released 2016-06-01):
+Fix remote execution in SQLite query
+SQLite: Require credentials to use
+PostgreSQL: Support KILL
+
+Adminer 4.2.4 (released 2016-02-06):
+Fix remote execution in SQLite query
+MySQL: Support PHP 7
+Bosnian translation
+Finnish translation
+
 Adminer 4.2.3 (released 2015-11-15):
 Fix XSS in indexes (non-MySQL only)
 Support PHP 7

compile.php

@@ -21,7 +21,7 @@ function remove_lang($match) {
 	$idf = strtr($match[2], array("\\'" => "'", "\\\\" => "\\"));
 	$s = ($translations[$idf] ? $translations[$idf] : $idf);
 	if ($match[3] == ",") { // lang() has parameters
-		return "$match[1]" . (is_array($s) ? "lang(array('" . implode("', '", array_map('add_apo_slashes', $s)) . "')," : "sprintf('" . add_apo_slashes($s) . "',");
+		return $match[1] . (is_array($s) ? "lang(array('" . implode("', '", array_map('add_apo_slashes', $s)) . "')," : "sprintf('" . add_apo_slashes($s) . "',");
 	}
 	return ($match[1] && $match[4] ? $s : "$match[1]'" . add_apo_slashes($s) . "'$match[4]");
 }
@@ -134,7 +134,7 @@ function put_file_lang($match) {
 		case "' . $lang . '": $compressed = "' . add_quo_slashes(lzw_compress(implode("\n", $translation_ids))) . '"; break;';
 	}
 	$translations_version = crc32($return);
-	return '$translations = &$_SESSION["translations"];
+	return '$translations = $_SESSION["translations"];
 if ($_SESSION["translations_version"] != ' . $translations_version . ') {
 	$translations = array();
 	$_SESSION["translations_version"] = ' . $translations_version . ';
@@ -152,6 +152,7 @@ function get_translations($lang) {
 
 if (!$translations) {
 	$translations = get_translations($LANG);
+	$_SESSION["translations"] = $translations;
 }
 ';
 }
@@ -299,6 +300,14 @@ function compile_file($match) {
 	return '"' . add_quo_slashes($file) . '"';
 }
 
+function min_version() {
+	return true;
+}
+
+function number_type() {
+	return '';
+}
+
 $project = "adminer";
 if ($_SERVER["argv"][1] == "editor") {
 	$project = "editor";
@@ -326,10 +335,12 @@ if ($_SERVER["argv"][1]) {
 }
 
 // check function definition in drivers
-$filename = dirname(__FILE__) . "/adminer/drivers/mysql.inc.php";
-preg_match_all('~\\bfunction ([^(]+)~', file_get_contents($filename), $matches); //! respect context (extension, class)
+$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)
 $functions = array_combine($matches[1], $matches[0]);
-unset($functions["__destruct"], $functions["Min_DB"], $functions["Min_Result"], $functions["Min_Driver"]);
+//! do not warn about functions without declared support()
+unset($functions["__construct"], $functions["__destruct"], $functions["set_charset"]);
 foreach (glob(dirname(__FILE__) . "/adminer/drivers/" . ($driver ? $driver : "*") . ".inc.php") as $filename) {
 	if ($filename != "mysql.inc.php") {
 		$file = file_get_contents($filename);
@@ -347,7 +358,6 @@ $features = array("call" => "routine", "dump", "event", "privileges", "procedure
 $lang_ids = array(); // global variable simplifies usage in a callback function
 $file = file_get_contents(dirname(__FILE__) . "/$project/index.php");
 if ($driver) {
-	$connection = (object) array("server_info" => 5.1); // MySQL support is version specific
 	$_GET[$driver] = true; // to load the driver
 	include_once dirname(__FILE__) . "/adminer/drivers/$driver.inc.php";
 	foreach ($features as $key => $feature) {
@@ -375,9 +385,9 @@ if ($driver) {
 		}
 	}
 	if (count($drivers) == 1) {
-		$file = str_replace('<?php echo html_select("driver", $drivers, DRIVER); ?>', "<input type='hidden' name='driver' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
+		$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\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 }
 if ($project == "editor") {
 	$file = preg_replace('~;../externals/jush/jush.css~', '', $file);
@@ -392,16 +402,15 @@ if ($_SESSION["lang"]) {
 	$file = str_replace("<?php switch_lang(); ?>\n", "", $file);
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
-$file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>' . "\n", "", $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 = 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 = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION . ($driver ? '&amp;driver=' . $driver : '');
-$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
-$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);
-$file = preg_replace('~\\.\\./externals/jush/modules/(jush\\.js)~', '<?php echo ' . $replace . '"; ?>', $file);
+$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);
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 

composer.json

@@ -13,7 +13,7 @@
     "authors": [
         {
             "name": "Jakub Vrána",
-            "homepage": "http://www.vrana.cz/"
+            "homepage": "https://www.vrana.cz/"
         }
     ],
     "autoload": {
@@ -23,7 +23,7 @@
     },
     "license": [
         "Apache-2.0",
-        "GPL-2.0"
+        "GPL-2.0-only"
     ],
     "scripts": {
         "compile": "php compile.php"

designs/brade/adminer.css

@@ -45,8 +45,8 @@ border:5px solid #ccc;margin:0}
 #menu a{color:#333;margin-right:4px}
 #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(http://www.bradezone.com/random/adminer_logo.gif) no-repeat;line-height:32px}
-#menu p{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 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}
 #breadcrumb a{color:#ff9}
 #breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9}

designs/bueltge/adminer.css

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

designs/cvicebni-ubor/adminer.css

@@ -173,13 +173,14 @@ h3{
  margin:0;}
 #menu form{
  margin:0;}
-#menu p{
+#menu p,#tables{
  padding-left:8px;
  border-bottom:none;}
 #menu form p{
  padding-left:0;
  text-align:center;}
-#tables a,#tables a b{
+#logins a,#tables a,#tables a b{
+ background: transparent none repeat scroll 0 0;
  color:#c00;
  padding:0 0.3ex;}
 /*#tables a b{background-color:#ff7400;color:black;}*/