Release 5.2.1

Signed-off-by: Takashi SHIRAI <shirai@nintendo.co.jp>

.github/FUNDING.yml

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

CHANGELOG.md

@@ -1,3 +1,24 @@
+## Adminer 5.2.1 (released 2025-04-11)
+- Fix search anywhere (bug #1004, regression from 5.1.1)
+- Fix import without primary key (bug #1017, regression from 5.1.1)
+- PostgreSQL PDO: Fix bytea without primary key (bug #1021)
+- non-MySQL: Parse '--' without trailing space as comment in SQL command (bug #1025, regression from 5.2.0)
+
+## Adminer 5.2.0 (released 2025-04-08)
+- Autocomplete SQL commands
+- Do not edit NULL values by Modify (bug #967)
+- Fix foreign key actions (regression from 5.1.1)
+- MySQL: Display number of found rows in group queries (regression from 5.1.1)
+- PostgreSQL: Support COPY FROM stdin in SQL query (bug #942)
+- non-MySQL: Parse '--' without trailing space as comment in SQL command (bug SF-842)
+- MS SQL: Limit one INSERT in export to 1000 rows (bug #983)
+- CSS: Add logo
+- Editor: Move mass sending e-mails to a plugin
+- Plugins: Support translations by extending Adminer\Plugin
+- New plugin: Configure options by end-users and store them to a cookie
+- New plugin: Configure menu table links
+- New plugin: Set up driver, server and database in Adminer Editor
+
 ## Adminer 5.1.1 (released 2025-04-02)
 - Export: Fix tar (regression from 5.0.3)
 - Select: Allow ordering by COUNT(*) (bug #966, regression from 5.0.2)

README.md

@@ -18,9 +18,6 @@ If downloaded from Git then run: `git submodule update --init`
 - `adminer/index.php` - Run development version of Adminer
 - `editor/index.php` - Run development version of Adminer Editor
 - `editor/example.php` - Example customization
-- `adminer/sqlite.php` - Development version of Adminer with SQLite allowed
-- `editor/sqlite.php` - Development version of Editor with SQLite allowed
-- `adminer/designs.php` - Development version of Adminer with `adminer.css` switcher
 - `compile.php` - Create a single file version
 - `lang.php` - Update translations
 - `tests/*.html` - Katalon Recorder test suites

adminer/call.inc.php

@@ -41,7 +41,7 @@ if (!$error && $_POST) {
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		$connection2 = connect(adminer()->credentials());
+		$connection2 = connect();
 		if ($connection2) {
 			$connection2->select_db(DB);
 		}

adminer/create.inc.php

@@ -189,7 +189,7 @@ if (support("columns") || $TABLE == "") {
 	echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . on_help("event.target.value", 1) . script("qsl('select').onchange = helpClose;") . "\n" : "");
 	if ($collations) {
 		echo "<datalist id='collations'>" . optionlist($collations) . "</datalist>\n";
-		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>");
+		echo (preg_match("~sqlite|mssql~", JUSH) ? "" : "<input list='collations' name='Collation' value='" . h($row["Collation"]) . "' placeholder='(" . lang('collation') . ")'>\n");
 	}
 	echo "<input type='submit' value='" . lang('Save') . "'>\n";
 }

adminer/db.inc.php

@@ -149,9 +149,9 @@ if (adminer()->homepage()) {
 				$databases = (support("scheme") ? adminer()->schemas() : adminer()->databases());
 				if (count($databases) != 1 && JUSH != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
-					echo "<p>" . lang('Move to other database') . ": ";
+					echo "<p><label>" . lang('Move to other database') . ": ";
 					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
-					echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
+					echo "</label> <input type='submit' name='move' value='" . lang('Move') . "'>";
 					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'> " . checkbox("overwrite", 1, $_POST["overwrite"], lang('overwrite')) : "");
 					echo "\n";
 				}

adminer/drivers/mssql.inc.php

@@ -11,9 +11,10 @@ add_driver("mssql", "MS SQL");
 
 if (isset($_GET["mssql"])) {
 	define('Adminer\DRIVER', "mssql");
+
 	if (extension_loaded("sqlsrv") && $_GET["ext"] != "pdo") {
 		class Db extends SqlDb {
-			public string $extension = "sqlsrv";
+			public $extension = "sqlsrv";
 			private $link, $result;
 
 			private function get_error() {
@@ -178,7 +179,7 @@ if (isset($_GET["mssql"])) {
 
 		if (extension_loaded("pdo_sqlsrv")) {
 			class Db extends MssqlDb {
-				public string $extension = "PDO_SQLSRV";
+				public $extension = "PDO_SQLSRV";
 
 				function attach(?string $server, string $username, string $password): string {
 					return $this->dsn("sqlsrv:Server=" . str_replace(":", ",", $server), $username, $password);
@@ -187,7 +188,7 @@ if (isset($_GET["mssql"])) {
 
 		} elseif (extension_loaded("pdo_dblib")) {
 			class Db extends MssqlDb {
-				public string $extension = "PDO_DBLIB";
+				public $extension = "PDO_DBLIB";
 
 				function attach(?string $server, string $username, string $password): string {
 					return $this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)), $username, $password);
@@ -198,20 +199,20 @@ if (isset($_GET["mssql"])) {
 
 
 	class Driver extends SqlDriver {
-		static array $extensions = array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB");
-		static string $jush = "mssql";
+		static $extensions = array("SQLSRV", "PDO_SQLSRV", "PDO_DBLIB");
+		static $jush = "mssql";
 
-		public array $insertFunctions = array("date|time" => "getdate");
-		public array $editFunctions = array(
+		public $insertFunctions = array("date|time" => "getdate");
+		public $editFunctions = array(
 			"int|decimal|real|float|money|datetime" => "+/-",
 			"char|text" => "+",
 		);
 
-		public array $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
-		public array $functions = array("len", "lower", "round", "upper");
-		public array $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-		public array $generated = array("PERSISTED", "VIRTUAL");
-		public string $onActions = "NO ACTION|CASCADE|SET NULL|SET DEFAULT";
+		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
+		public $functions = array("len", "lower", "round", "upper");
+		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+		public $generated = array("PERSISTED", "VIRTUAL");
+		public $onActions = "NO ACTION|CASCADE|SET NULL|SET DEFAULT";
 
 		static function connect(?string $server, string $username, string $password) {
 			if ($server == "") {

adminer/drivers/mysql.inc.php

@@ -5,11 +5,12 @@ SqlDriver::$drivers = array("server" => "MySQL / MariaDB") + SqlDriver::$drivers
 
 if (!defined('Adminer\DRIVER')) {
 	define('Adminer\DRIVER', "server"); // server - backwards compatibility
+
 	// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
 	if (extension_loaded("mysqli") && $_GET["ext"] != "pdo") {
 		class Db extends \MySQLi {
 			/** @var Db */ static $instance;
-			public string $extension = "MySQLi", $flavor = '';
+			public $extension = "MySQLi", $flavor = '';
 
 			function __construct() {
 				parent::init();
@@ -113,7 +114,7 @@ if (!defined('Adminer\DRIVER')) {
 		}
 
 		class Result {
-			public int $num_rows; // number of rows in the result
+			public $num_rows; // number of rows in the result
 			/** @var resource */ private $result;
 			private int $offset = 0;
 
@@ -155,7 +156,7 @@ if (!defined('Adminer\DRIVER')) {
 
 	} elseif (extension_loaded("pdo_mysql")) {
 		class Db extends PdoDb {
-			public string $extension = "PDO_MySQL";
+			public $extension = "PDO_MySQL";
 
 			function attach(?string $server, string $username, string $password): string {
 				$options = array(\PDO::MYSQL_ATTR_LOCAL_INFILE => false);
@@ -202,13 +203,13 @@ if (!defined('Adminer\DRIVER')) {
 
 
 	class Driver extends SqlDriver {
-		/** @var list<string> */ static array $extensions = array("MySQLi", "MySQL", "PDO_MySQL");
-		static string $jush = "sql"; // JUSH identifier
+		static $extensions = array("MySQLi", "MySQL", "PDO_MySQL");
+		static $jush = "sql"; // JUSH identifier
 
-		/** @var list<string> */ public array $unsigned = array("unsigned", "zerofill", "unsigned zerofill");
-		/** @var list<string> */ public array $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
-		/** @var list<string> */ public array $functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper");
-		/** @var list<string> */ public array $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
+		public $unsigned = array("unsigned", "zerofill", "unsigned zerofill");
+		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
+		public $functions = array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper");
+		public $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
 
 		static function connect(?string $server, string $username, string $password) {
 			$connection = parent::connect($server, $username, $password);
@@ -556,7 +557,7 @@ if (!defined('Adminer\DRIVER')) {
 		$create_table = get_val("SHOW CREATE TABLE " . table($table), 1);
 		if ($create_table) {
 			preg_match_all(
-				"~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE (driver()->onActions))?(?: ON UPDATE (driver()->onActions))?~",
+				"~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE (" . driver()->onActions . "))?(?: ON UPDATE (" . driver()->onActions . "))?~",
 				$create_table,
 				$matches,
 				PREG_SET_ORDER

adminer/drivers/oracle.inc.php

@@ -5,9 +5,10 @@ add_driver("oracle", "Oracle (beta)");
 
 if (isset($_GET["oracle"])) {
 	define('Adminer\DRIVER', "oracle");
+
 	if (extension_loaded("oci8") && $_GET["ext"] != "pdo") {
 		class Db extends SqlDb {
-			public string $extension = "oci8";
+			public $extension = "oci8";
 			public $_current_db;
 			private $link;
 
@@ -102,7 +103,7 @@ if (isset($_GET["oracle"])) {
 
 	} elseif (extension_loaded("pdo_oci")) {
 		class Db extends PdoDb {
-			public string $extension = "PDO_OCI";
+			public $extension = "PDO_OCI";
 			public $_current_db;
 
 			function attach(?string $server, string $username, string $password): string {
@@ -120,22 +121,22 @@ if (isset($_GET["oracle"])) {
 
 
 	class Driver extends SqlDriver {
-		static array $extensions = array("OCI8", "PDO_OCI");
-		static string $jush = "oracle";
+		static $extensions = array("OCI8", "PDO_OCI");
+		static $jush = "oracle";
 
-	public array $insertFunctions = array( //! no parentheses
+		public $insertFunctions = array( //! no parentheses
 			"date" => "current_date",
 			"timestamp" => "current_timestamp",
 		);
-		public array $editFunctions = array(
+		public $editFunctions = array(
 			"number|float|double" => "+/-",
 			"date|timestamp" => "+ interval/- interval",
 			"char|clob" => "||",
 		);
 
-		public array $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
-		public array $functions = array("length", "lower", "round", "upper");
-		public array $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL");
+		public $functions = array("length", "lower", "round", "upper");
+		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
 
 		function __construct(Db $connection) {
 			parent::__construct($connection);

adminer/drivers/pgsql.inc.php

@@ -5,10 +5,11 @@ add_driver("pgsql", "PostgreSQL");
 
 if (isset($_GET["pgsql"])) {
 	define('Adminer\DRIVER', "pgsql");
+
 	if (extension_loaded("pgsql") && $_GET["ext"] != "pdo") {
-		class Db extends SqlDb {
-			public string $extension = "PgSQL";
-			public int $timeout = 0;
+		class PgsqlDb extends SqlDb {
+			public $extension = "PgSQL";
+			public $timeout = 0;
 			private $link, $string, $database = true;
 
 			function _error($errno, $error) {
@@ -88,6 +89,20 @@ if (isset($_GET["pgsql"])) {
 			function warnings() {
 				return h(pg_last_notice($this->link)); // second parameter is available since PHP 7.1.0
 			}
+
+			/** Copy from array into a table
+			* @param list<string> $rows
+			*/
+			function copyFrom(string $table, array $rows): bool {
+				$this->error = '';
+				set_error_handler(function (int $errno, string $error): bool {
+					$this->error = (ini_bool('html_errors') ? html_entity_decode($error) : $error);
+					return true;
+				});
+				$return = pg_copy_from($this->link, $table, $rows);
+				restore_error_handler();
+				return $return;
+			}
 		}
 
 		class Result {
@@ -123,9 +138,9 @@ if (isset($_GET["pgsql"])) {
 		}
 
 	} elseif (extension_loaded("pdo_pgsql")) {
-		class Db extends PdoDb {
-			public string $extension = "PDO_PgSQL";
-			public int $timeout = 0;
+		class PgsqlDb extends PdoDb {
+			public $extension = "PDO_PgSQL";
+			public $timeout = 0;
 
 			function attach(?string $server, string $username, string $password): string {
 				$db = adminer()->database();
@@ -155,6 +170,12 @@ if (isset($_GET["pgsql"])) {
 				// not implemented in PDO_PgSQL as of PHP 7.2.1
 			}
 
+			function copyFrom(string $table, array $rows): bool {
+				$return = $this->pdo->pgsqlCopyFromArray($table, $rows);
+				$this->error = idx($this->pdo->errorInfo(), 2) ?: '';
+				return $return;
+			}
+
 			function close() {
 			}
 		}
@@ -163,13 +184,28 @@ if (isset($_GET["pgsql"])) {
 
 
 
-	class Driver extends SqlDriver {
-		static array $extensions = array("PgSQL", "PDO_PgSQL");
-		static string $jush = "pgsql";
+	if (class_exists('Adminer\PgsqlDb')) {
+		class Db extends PgsqlDb {
+			function multi_query(string $query) {
+				if (preg_match('~\bCOPY\s+(.+?)\s+FROM\s+stdin;\n?(.*)\n\\\\\.$~is', str_replace("\r\n", "\n", $query), $match)) { // no ^ to allow leading comments
+					$rows = explode("\n", $match[2]);
+					$this->affected_rows = count($rows);
+					return $this->copyFrom($match[1], $rows);
+				}
+				return parent::multi_query($query);
+			}
+		}
+	}
 
-		public array $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
-		public array $functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
-		public array $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
+
+
+	class Driver extends SqlDriver {
+		static $extensions = array("PgSQL", "PDO_PgSQL");
+		static $jush = "pgsql";
+
+		public $operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid CSRF
+		public $functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
+		public $grouping = array("avg", "count", "count distinct", "max", "min", "sum");
 
 		static function connect(?string $server, string $username, string $password) {
 			$connection = parent::connect($server, $username, $password);
@@ -493,8 +529,8 @@ ORDER BY conkey, conname") as $row
 					$row['table'] = idf_unescape($match2[4]);
 				}
 				$row['target'] = array_map('Adminer\idf_unescape', array_map('trim', explode(',', $match[3])));
-				$row['on_delete'] = (preg_match("~ON DELETE (driver()->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
-				$row['on_update'] = (preg_match("~ON UPDATE (driver()->onActions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_delete'] = (preg_match("~ON DELETE (" . driver()->onActions . ")~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
+				$row['on_update'] = (preg_match("~ON UPDATE (" . driver()->onActions . ")~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$return[$row['conname']] = $row;
 			}
 		}

adminer/drivers/sqlite.inc.php

@@ -5,10 +5,10 @@ add_driver("sqlite", "SQLite");
 
 if (isset($_GET["sqlite"])) {
 	define('Adminer\DRIVER', "sqlite");
-	if (class_exists("SQLite3") && $_GET["ext"] != "pdo") {
 
+	if (class_exists("SQLite3") && $_GET["ext"] != "pdo") {
 		abstract class SqliteDb extends SqlDb {
-			public string $extension = "SQLite3";
+			public $extension = "SQLite3";
 			private $link;
 
 			function attach(?string $filename, string $username, string $password): string {
@@ -73,7 +73,7 @@ if (isset($_GET["sqlite"])) {
 
 	} elseif (extension_loaded("pdo_sqlite")) {
 		abstract class SqliteDb extends PdoDb {
-			public string $extension = "PDO_SQLite";
+			public $extension = "PDO_SQLite";
 
 			function attach(?string $filename, string $username, string $password): string {
 				$this->dsn(DRIVER . ":$filename", "", "");
@@ -106,21 +106,21 @@ if (isset($_GET["sqlite"])) {
 
 
 	class Driver extends SqlDriver {
-		static array $extensions = array("SQLite3", "PDO_SQLite");
-		static string $jush = "sqlite";
+		static $extensions = array("SQLite3", "PDO_SQLite");
+		static $jush = "sqlite";
 
-		protected array $types = array(array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0));
+		protected $types = array(array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0));
 
-		public array $insertFunctions = array(); // "text" => "date('now')/time('now')/datetime('now')",
-		public array $editFunctions = array(
+		public $insertFunctions = array(); // "text" => "date('now')/time('now')/datetime('now')",
+		public $editFunctions = array(
 			"integer|real|numeric" => "+/-",
 			// "text" => "date/time/datetime",
 			"text" => "||",
 		);
 
-		public array $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
-		public array $functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
-		public array $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
+		public $operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
+		public $functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
+		public $grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
 
 		static function connect(?string $server, string $username, string $password) {
 			if ($password != "") {
@@ -704,7 +704,7 @@ if (isset($_GET["sqlite"])) {
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {
-			$return[] = explode("=", $option, 2);
+			$return[] = explode("=", $option, 2) + array('', '');
 		}
 		return $return;
 	}

adminer/file.inc.php

@@ -11,10 +11,9 @@ if (substr(VERSION, -4) != '-dev') {
 	header("Cache-Control: immutable");
 }
 
-if ($_GET["file"] == "favicon.ico") {
-	header("Content-Type: image/x-icon");
-	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
-} elseif ($_GET["file"] == "default.css") {
+@ini_set("zlib.output_compression", '1'); // @ - may be disabled
+
+if ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "dark.css") {
@@ -26,6 +25,7 @@ if ($_GET["file"] == "favicon.ico") {
 } 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-autocomplete-sql.js;
 ../externals/jush/modules/jush-textarea.js;
 ../externals/jush/modules/jush-txt.js;
 ../externals/jush/modules/jush-js.js;
@@ -35,5 +35,8 @@ if ($_GET["file"] == "favicon.ico") {
 ../externals/jush/modules/jush-mssql.js;
 ../externals/jush/modules/jush-oracle.js;
 ../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+} elseif ($_GET["file"] == "logo.png") {
+	header("Content-Type: image/png");
+	echo compile_file('../adminer/static/logo.png');
 }
 exit;

adminer/foreign.inc.php

@@ -31,7 +31,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
 		$result
 	);
 	if (!$row["drop"]) {
-		$error = "$error<br>" . lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.'); //! no partitioning
+		$error = lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.'); //! no partitioning
 	}
 }
 
@@ -67,12 +67,12 @@ if ($row["ns"] != "") {
 $referencable = array_keys(array_filter(table_status('', true), 'Adminer\fk_support'));
 $target = array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable)));
 $onchange = "this.form['change-js'].value = '1'; this.form.submit();";
-echo "<p>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "\n";
+echo "<p><label>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "</label>\n";
 if (support("scheme")) {
 	$schemas = array_filter(adminer()->schemas(), function ($schema) {
 		return !preg_match('~^information_schema$~i', $schema);
 	});
-	echo lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
+	echo "<label>" . lang('Schema') . ": " . html_select("ns", $schemas, $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange) . "</label>";
 	if ($row["ns"] != "") {
 		set_schema($orig_schema);
 	}
@@ -83,7 +83,7 @@ if (support("scheme")) {
 			$dbs[] = $db;
 		}
 	}
-	echo lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange);
+	echo "<label>" . lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange) . "</label>";
 }
 echo input_hidden("change-js");
 ?>
@@ -101,8 +101,8 @@ foreach ($row["source"] as $key => $val) {
 ?>
 </table>
 <p>
-<?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", driver()->onActions), $row["on_delete"]); ?>
- <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", driver()->onActions), $row["on_update"]); ?>
+<label><?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", driver()->onActions), $row["on_delete"]); ?></label>
+<label><?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", driver()->onActions), $row["on_update"]); ?></label>
 <?php echo doc_link(array(
 	'sql' => "innodb-foreign-key-constraints.html",
 	'mariadb' => "foreign-keys/",

adminer/include/adminer.inc.php

@@ -12,7 +12,7 @@ class Adminer {
 	* @return string HTML code
 	*/
 	function name(): string {
-		return "<a href='https://www.adminer.org/'" . target_blank() . " id='h1'>Adminer</a>";
+		return "<a href='https://www.adminer.org/'" . target_blank() . " id='h1'><img src='../adminer/static/logo.png' width='24' height='24' alt='' id='logo'>Adminer</a>";
 	}
 
 	/** Connection parameters
@@ -60,6 +60,10 @@ class Adminer {
 		return get_databases($flush);
 	}
 
+	/** Print links after list of plugins */
+	function pluginsLinks(): void {
+	}
+
 	/** Operators used in select
 	* @return list<string> operators
 	*/
@@ -300,6 +304,13 @@ class Adminer {
 		return $val;
 	}
 
+	/** Get configuration options for AdminerConfig
+	* @return string[] key is config description, value is HTML
+	*/
+	function config(): array {
+		return array();
+	}
+
 	/** Print table structure in tabular format
 	* @param Field[] $fields
 	* @param TableStatus $tableStatus
@@ -527,41 +538,39 @@ class Adminer {
 			}
 		}
 		foreach ((array) $_GET["where"] as $key => $val) {
-			if ("$val[col]$val[val]" != "" && in_array($val["op"], adminer()->operators())) {
-				$prefix = "";
-				$cond = " $val[op]";
-				if (preg_match('~IN$~', $val["op"])) {
-					$in = process_length($val["val"]);
-					$cond .= " " . ($in != "" ? $in : "(NULL)");
-				} elseif ($val["op"] == "SQL") {
-					$cond = " $val[val]"; // SQL injection
-				} elseif ($val["op"] == "LIKE %%") {
-					$cond = " LIKE " . adminer()->processInput($fields[$val["col"]], "%$val[val]%");
-				} elseif ($val["op"] == "ILIKE %%") {
-					$cond = " ILIKE " . adminer()->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 .= " " . adminer()->processInput($fields[$val["col"]], $val["val"]);
-				}
-				if ($val["col"] != "") {
-					$return[] = $prefix . driver()->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
-				} else {
-					// find anywhere
-					$cols = array();
-					foreach ($fields as $name => $field) {
-						if (
-							isset($field["privileges"]["where"])
-							&& (preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
-						) {
-							$cols[] = $prefix . driver()->convertSearch(idf_escape($name), $val, $field) . $cond;
-						}
+			$col = $val["col"];
+			if ("$col$val[val]" != "" && in_array($val["op"], adminer()->operators())) {
+				$conds = array();
+				foreach (($col != "" ? array($col => $fields[$col]) : $fields) as $name => $field) {
+					$prefix = "";
+					$cond = " $val[op]";
+					if (preg_match('~IN$~', $val["op"])) {
+						$in = process_length($val["val"]);
+						$cond .= " " . ($in != "" ? $in : "(NULL)");
+					} elseif ($val["op"] == "SQL") {
+						$cond = " $val[val]"; // SQL injection
+					} elseif (preg_match('~^(I?LIKE) %%$~', $val["op"], $match)) {
+						$cond = " $match[1] " . adminer()->processInput($field, "%$val[val]%");
+					} elseif ($val["op"] == "FIND_IN_SET") {
+						$prefix = "$val[op](" . q($val["val"]) . ", ";
+						$cond = ")";
+					} elseif (!preg_match('~NULL$~', $val["op"])) {
+						$cond .= " " . adminer()->processInput($field, $val["val"]);
+					}
+					if ($col != "" || ( // find anywhere
+						isset($field["privileges"]["where"])
+						&& (preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+						&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
+						&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
+					)) {
+						$conds[] = $prefix . driver()->convertSearch(idf_escape($name), $val, $field) . $cond;
 					}
-					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
+				$return[] =
+					(count($conds) == 1 ? $conds[0] :
+					($conds ? "(" . implode(" OR ", $conds) . ")" :
+					"1 = 0"
+				));
 			}
 		}
 		return $return;
@@ -816,6 +825,7 @@ class Adminer {
 				$generated = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
+				$count = 0;
 				while ($row = $result->$fetch_function()) {
 					if (!$keys) {
 						$values = array();
@@ -855,13 +865,17 @@ class Adminer {
 						$s = ($max_packet ? "\n" : " ") . "(" . implode(",\t", $row) . ")";
 						if (!$buffer) {
 							$buffer = $insert . $s;
-						} elseif (strlen($buffer) + 4 + strlen($s) + strlen($suffix) < $max_packet) { // 4 - length specification
+						} elseif (JUSH == 'mssql'
+							? $count % 1000 != 0 // https://learn.microsoft.com/en-us/sql/t-sql/queries/table-value-constructor-transact-sql#limitations-and-restrictions
+							: strlen($buffer) + 4 + strlen($s) + strlen($suffix) < $max_packet // 4 - length specification
+						) {
 							$buffer .= ",$s";
 						} else {
 							echo $buffer . $suffix;
 							$buffer = $insert . $s;
 						}
 					}
+					$count++;
 				}
 				if ($buffer) {
 					echo $buffer . $suffix;
@@ -993,12 +1007,13 @@ class Adminer {
 	*/
 	function syntaxHighlighting(array $tables): void {
 		// this is matched by compile.php
-		echo script_src("../externals/jush/modules/jush.js");
-		echo script_src("../externals/jush/modules/jush-textarea.js");
-		echo script_src("../externals/jush/modules/jush-txt.js");
-		echo script_src("../externals/jush/modules/jush-js.js");
+		echo script_src("../externals/jush/modules/jush.js", true);
+		echo script_src("../externals/jush/modules/jush-autocomplete-sql.js", true);
+		echo script_src("../externals/jush/modules/jush-textarea.js", true);
+		echo script_src("../externals/jush/modules/jush-txt.js", true);
+		echo script_src("../externals/jush/modules/jush-js.js", true);
 		if (support("sql")) {
-			echo script_src("../externals/jush/modules/jush-" . JUSH . ".js");
+			echo script_src("../externals/jush/modules/jush-" . JUSH . ".js", true);
 			echo "<script" . nonce() . ">\n";
 			if ($tables) {
 				$links = array();
@@ -1009,12 +1024,19 @@ class Adminer {
 				foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
 					echo "jushLinks.$val = jushLinks." . JUSH . ";\n";
 				}
+				if (isset($_GET["sql"]) || isset($_GET["trigger"]) || isset($_GET["check"])) {
+					$tablesColumns = array_fill_keys(array_keys($tables), array());
+					foreach (driver()->allFields() as $table => $fields) {
+						foreach ($fields as $field) {
+							$tablesColumns[$table][] = $field["field"];
+						}
+					}
+					echo "addEventListener('DOMContentLoaded', () => { autocompleter = jush.autocompleteSql('" . idf_escape("") . "', " . json_encode($tablesColumns) . "); });\n";
+				}
 			}
 			echo "</script>\n";
 		}
-		echo script("syntaxHighlighting('" . preg_replace('~^(\d\.?\d).*~s', '\1', connection()->server_info) . "'"
-			. (connection()->flavor == 'maria' ? ", 'maria'" : (connection()->flavor == 'cockroach' ? ", 'cockroach'" : "")) . ");"
-		);
+		echo script("syntaxHighlighting('" . preg_replace('~^(\d\.?\d).*~s', '\1', connection()->server_info) . "', '" . connection()->flavor . "');");
 	}
 
 	/** Print databases list in menu */
@@ -1026,14 +1048,14 @@ class Adminer {
 		echo "<form action=''>\n<p id='dbs'>\n";
 		hidden_fields_get();
 		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
-		echo "<span title='" . lang('Database') . "'>" . lang('DB') . ":</span> " . ($databases
+		echo "<label title='" . lang('Database') . "'>" . lang('DB') . ": " . ($databases
 			? html_select("db", array("" => "") + $databases, DB) . $db_events
 			: "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
-		);
+		) . "</label>";
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
 		if (support("scheme")) {
 			if ($missing != "db" && DB != "" && connection()->select_db(DB)) {
-				echo "<br><span>" . lang('Schema') . ":</span> " . html_select("ns", array("" => "") + adminer()->schemas(), $_GET["ns"]) . $db_events;
+				echo "<br><label>" . lang('Schema') . ": " . html_select("ns", array("" => "") + adminer()->schemas(), $_GET["ns"]) . "$db_events</label>";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
@@ -1054,6 +1076,7 @@ class Adminer {
 	function tablesPrint(array $tables): void {
 		echo "<ul id='tables'>" . script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
 		foreach ($tables as $table => $status) {
+			$table = "$table"; // do not highlight "0" as active everywhere
 			$name = adminer()->tableName($status);
 			if ($name != "") {
 				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"'
@@ -1062,7 +1085,7 @@ class Adminer {
 				;
 				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"))
+						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"], $_GET["check"], $_GET["view"])), (is_view($status) ? "view" : "structure"))
 						. " title='" . lang('Show structure') . "'>$name</a>"
 					: "<span>$name</span>"
 				) . "\n";

adminer/include/bootstrap.inc.php

@@ -79,14 +79,13 @@ include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
 include "./include/adminer.inc.php";
 include "../adminer/include/plugins.inc.php";
+include "../adminer/include/plugin.inc.php";
 
-if (function_exists('adminer_object')) {
-	Adminer::$instance = adminer_object();
-} elseif (is_dir("adminer-plugins") || file_exists("adminer-plugins.php")) {
-	Adminer::$instance = new Plugins(null);
-} else {
-	Adminer::$instance = new Adminer;
-}
+Adminer::$instance =
+	(function_exists('adminer_object') ? adminer_object() :
+	(is_dir("adminer-plugins") || file_exists("adminer-plugins.php") ? new Plugins(null) :
+	new Adminer
+));
 
 // this is matched by compile.php
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver

adminer/include/connect.inc.php

@@ -44,14 +44,7 @@ if (
 		}
 		echo "<p>" . lang('%s version: %s through PHP extension %s', get_driver(DRIVER), "<b>" . h(connection()->server_info) . "</b>", "<b>" . connection()->extension . "</b>") . "\n";
 		echo "<p>" . lang('Logged as: %s', "<b>" . h(logged_user()) . "</b>") . "\n";
-		if (isset(adminer()->plugins) && is_array(adminer()->plugins)) {
-			echo "<p>" . lang('Loaded plugins') . ":\n<ul>\n";
-			foreach (adminer()->plugins as $plugin) {
-				$reflection = new \ReflectionObject($plugin);
-				echo "<li><b>" . get_class($plugin) . "</b>" . h(preg_match('~^/[\s*]+(.+)~', $reflection->getDocComment(), $match) ? ": $match[1]" : "") . "\n";
-			}
-			echo "</ul>\n";
-		}
+
 		$databases = adminer()->databases();
 		if ($databases) {
 			$scheme = support("scheme");
@@ -69,7 +62,6 @@ if (
 			;
 
 			$databases = ($_GET["dbsize"] ? count_tables($databases) : array_flip($databases));
-
 			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
 				$id = h("Db-" . $db);
@@ -96,6 +88,29 @@ if (
 			echo "</form>\n";
 			echo script("tableCheck();");
 		}
+
+		if (!empty(adminer()->plugins)) {
+			echo "<div class='plugins'>\n";
+			echo "<h3>" . lang('Loaded plugins') . "</h3>\n<ul>\n";
+			foreach (adminer()->plugins as $plugin) {
+				$description = (method_exists($plugin, 'description') ? $plugin->description() : "");
+				if (!$description) {
+					$reflection = new \ReflectionObject($plugin);
+					if (preg_match('~^/[\s*]+(.+)~', $reflection->getDocComment(), $match)) {
+						$description = $match[1];
+					}
+				}
+				$screenshot = (method_exists($plugin, 'screenshot') ? $plugin->screenshot() : "");
+				echo "<li><b>" . get_class($plugin) . "</b>"
+					. h($description ? ": $description" : "")
+					. ($screenshot ? " (<a href='" . h($screenshot) . "'" . target_blank() . ">" . lang('screenshot') . "</a>)" : "")
+					. "\n"
+				;
+			}
+			echo "</ul>\n";
+			adminer()->pluginsLinks();
+			echo "</div>\n";
+		}
 	}
 
 	page_footer("db");

adminer/include/db.inc.php

@@ -6,13 +6,13 @@ namespace Adminer;
 abstract class SqlDb {
 	/** @var Db */ static $instance;
 
-	public string $extension; // extension name
-	public string $flavor = ''; // different vendor with the same API, e.g. MariaDB; usually stays empty
-	public string $server_info; // server version
-	public int $affected_rows = 0; // number of affected rows
-	public string $info = ''; // see https://php.net/mysql_info
-	public int $errno = 0; // last error code
-	public string $error = ''; // last error message
+	/** @var string */ public $extension; // extension name
+	/** @var string */ public $flavor = ''; // different vendor with the same API, e.g. MariaDB; usually stays empty
+	/** @var string */ public $server_info; // server version
+	/** @var int */ public $affected_rows = 0; // number of affected rows
+	/** @var string */ public $info = ''; // see https://php.net/mysql_info
+	/** @var int */ public $errno = 0; // last error code
+	/** @var string */ public $error = ''; // last error message
 	/** @var Result|bool */ protected $multi; // used for multiquery
 
 	/** Connect to server

adminer/include/design.inc.php

@@ -13,7 +13,7 @@ function page_header(string $title, string $error = "", $breadcrumb = array(), s
 		exit;
 	}
 	if (!ob_get_level()) {
-		ob_start(null, 4096);
+		ob_start('ob_gzhandler', 4096);
 	}
 	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . adminer()->name());
@@ -51,11 +51,11 @@ function page_header(string $title, string $error = "", $breadcrumb = array(), s
 	echo script_src("../adminer/static/functions.js");
 	echo script_src("static/editing.js");
 	if (adminer()->head($dark)) {
-		echo "<link rel='shortcut icon' type='image/x-icon' href='../adminer/static/favicon.ico'>\n";
-		echo "<link rel='apple-touch-icon' href='../adminer/static/favicon.ico'>\n";
+		echo "<link rel='icon' href='data:image/gif;base64,R0lGODlhEAAQAJEAAAQCBPz+/PwCBAROZCH5BAEAAAAALAAAAAAQABAAAAI2hI+pGO1rmghihiUdvUBnZ3XBQA7f05mOak1RWXrNq5nQWHMKvuoJ37BhVEEfYxQzHjWQ5qIAADs='>\n";
+		echo "<link rel='apple-touch-icon' href='../adminer/static/logo.png'>\n";
 	}
 	foreach ($css as $val) {
-		echo "<link rel='stylesheet'" . (preg_match('~-dark~', $val) && !$dark ? $media : "") . " href='" . h($val) . "'>\n";
+		echo "<link rel='stylesheet'" . (preg_match('~-dark\.~', $val) && !$dark ? $media : "") . " href='" . h($val) . "'>\n";
 	}
 	echo "\n<body class='" . lang('ltr') . " nojs'>\n";
 	$filename = get_temp_dir() . "/adminer.version";

adminer/include/driver.inc.php

@@ -12,23 +12,23 @@ function get_driver(string $id): string {
 }
 
 abstract class SqlDriver {
-	static Driver $instance;
-	/** @var string[] */ static array $drivers = array(); // all available drivers
-	/** @var list<string> */ static array $extensions = array(); // possible extensions in the current driver
-	static string $jush; // JUSH identifier
+	/** @var Driver */ static $instance;
+	/** @var string[] */ static $drivers = array(); // all available drivers
+	/** @var list<string> */ static $extensions = array(); // possible extensions in the current driver
+	/** @var string */ static $jush; // JUSH identifier
 
-	protected Db $conn;
-	/** @var int[][] */ protected array $types = array(); // [$group => [$type => $maximum_unsigned_length, ...], ...]
-	/** @var string[] */ public array $insertFunctions = array(); // ["$type|$type2" => "$function/$function2"] functions used in edit and insert
-	/** @var string[] */ public array $editFunctions = array(); // ["$type|$type2" => "$function/$function2"] functions used in edit only
-	/** @var list<string> */ public array $unsigned = array(); // number variants
-	/** @var list<string> */ public array $operators = array(); // operators used in select
-	/** @var list<string> */ public array $functions = array(); // functions used in select
-	/** @var list<string> */ public array $grouping = array(); // grouping functions used in select
-	public string $onActions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; // used in foreign_keys()
-	public string $inout = "IN|OUT|INOUT"; // used in routines
-	public string $enumLength = "'(?:''|[^'\\\\]|\\\\.)*'"; // regular expression for parsing enum lengths
-	/** @var list<string> */ public array $generated = array(); // allowed types of generated columns
+	/** @var Db */ protected $conn;
+	/** @var int[][] */ protected $types = array(); // [$group => [$type => $maximum_unsigned_length, ...], ...]
+	/** @var string[] */ public $insertFunctions = array(); // ["$type|$type2" => "$function/$function2"] functions used in edit and insert
+	/** @var string[] */ public $editFunctions = array(); // ["$type|$type2" => "$function/$function2"] functions used in edit only
+	/** @var list<string> */ public $unsigned = array(); // number variants
+	/** @var list<string> */ public $operators = array(); // operators used in select
+	/** @var list<string> */ public $functions = array(); // functions used in select
+	/** @var list<string> */ public $grouping = array(); // grouping functions used in select
+	/** @var string */ public $onActions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; // used in foreign_keys()
+	/** @var string */ public $inout = "IN|OUT|INOUT"; // used in routines
+	/** @var string */ public $enumLength = "'(?:''|[^'\\\\]|\\\\.)*'"; // regular expression for parsing enum lengths
+	/** @var list<string> */ public $generated = array(); // allowed types of generated columns
 
 	/** Connect to the database
 	* @return Db|string string for error
@@ -197,10 +197,7 @@ abstract class SqlDriver {
 	* @param Field $field
 	*/
 	function value(?string $val, array $field): ?string {
-		return (method_exists($this->conn, 'value')
-			? $this->conn->value($val, $field)
-			: (is_resource($val) ? stream_get_contents($val) : $val)
-		);
+		return (method_exists($this->conn, 'value') ? $this->conn->value($val, $field) : $val);
 	}
 
 	/** Quote binary string */
@@ -257,10 +254,12 @@ AND CHECK_CLAUSE NOT LIKE '% IS NOT NULL'", $this->conn); // ignore default IS N
 	*/
 	function allFields(): array {
 		$return = array();
-		foreach (get_rows("SELECT TABLE_NAME AS tab, COLUMN_NAME AS field, IS_NULLABLE AS nullable, DATA_TYPE AS type, CHARACTER_MAXIMUM_LENGTH AS length" . (JUSH == 'sql' ? ", COLUMN_KEY = 'PRI' AS `primary`" : "") . "
+		foreach (
+			get_rows("SELECT TABLE_NAME AS tab, COLUMN_NAME AS field, IS_NULLABLE AS nullable, DATA_TYPE AS type, CHARACTER_MAXIMUM_LENGTH AS length" . (JUSH == 'sql' ? ", COLUMN_KEY = 'PRI' AS `primary`" : "") . "
 FROM INFORMATION_SCHEMA.COLUMNS
 WHERE TABLE_SCHEMA = " . q($_GET["ns"] != "" ? $_GET["ns"] : DB) . "
-ORDER BY TABLE_NAME, ORDINAL_POSITION", $this->conn) as $row) {
+ORDER BY TABLE_NAME, ORDINAL_POSITION", $this->conn) as $row
+		) {
 			$row["null"] = ($row["nullable"] == "YES");
 			$return[$row["tab"]][] = $row;
 		}

adminer/include/editing.inc.php

@@ -470,7 +470,7 @@ function create_routine($routine, array $row): string {
 	ksort($fields); // enforce fields order
 	foreach ($fields as $field) {
 		if ($field["field"] != "") {
-			$set[] = (preg_match("~^(driver()->inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
+			$set[] = (preg_match("~^(" . driver()->inout . ")\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
 	$definition = rtrim($row["definition"], ";");
@@ -499,8 +499,8 @@ function format_foreign_key(array $foreign_key): string {
 		. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
 		. idf_escape($foreign_key["table"])
 		. " (" . implode(", ", array_map('Adminer\idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
-		. (preg_match("~^(driver()->onActions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
-		. (preg_match("~^(driver()->onActions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
+		. (preg_match("~^(" . driver()->onActions . ")\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
+		. (preg_match("~^(" . driver()->onActions . ")\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
 	;
 }
 

adminer/include/functions.inc.php

@@ -24,10 +24,9 @@ function driver(): Driver {
 	return Driver::$instance;
 }
 
-/** Connect to the database
-* @param array{?string, string, string} $credentials [$server, $username, $password]
-*/
-function connect(array $credentials): ?Db {
+/** Connect to the database */
+function connect(): ?Db {
+	$credentials = adminer()->credentials();
 	$return = Driver::connect($credentials[0], $credentials[1], $credentials[2]);
 	return (is_object($return) ? $return : null);
 }
@@ -349,7 +348,9 @@ function get_setting(string $key, string $cookie = "adminer_settings") {
 * @param mixed[] $settings
 */
 function save_settings(array $settings, string $cookie = "adminer_settings"): void {
-	cookie($cookie, http_build_query($settings + get_settings($cookie)));
+	$value = http_build_query($settings + get_settings($cookie));
+	cookie($cookie, $value);
+	$_COOKIE[$cookie] = $value;
 }
 
 /** Restart stopped session */
@@ -594,10 +595,10 @@ function column_foreign_keys(string $table): array {
 	return $return;
 }
 
-/** Compute fields() from $_POST edit data
+/** Compute fields() from $_POST edit data; used by Mongo and SimpleDB
 * @return Field[] same as fields()
 */
-function fields_from_edit(): array { // used by Mongo and SimpleDB
+function fields_from_edit(): array {
 	$return = array();
 	foreach ((array) $_POST["field_keys"] as $key => $val) {
 		if ($val != "") {
@@ -831,7 +832,7 @@ function slow_query(string $query): array {
 	$slow_query = driver()->slowQuery($query, $timeout);
 	$connection2 = null;
 	if (!$slow_query && support("kill")) {
-		$connection2 = connect(adminer()->credentials());
+		$connection2 = connect();
 		if ($connection2 && ($db == "" || $connection2->select_db($db))) {
 			$kill = get_val(connection_id(), 0, $connection2); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 			echo script("const timeout = setTimeout(() => { ajax('" . js_escape(ME) . "script=kill', function () {}, 'kill=$kill&token=" . get_token() . "'); }, 1000 * $timeout);");

adminer/include/html.inc.php

@@ -7,8 +7,8 @@ function script(string $source, string $trailing = "\n"): string {
 }
 
 /** Return <script src> element */
-function script_src(string $url): string {
-	return "<script src='" . h($url) . "'" . nonce() . "></script>\n";
+function script_src(string $url, bool $defer = false): string {
+	return "<script src='" . h($url) . "'" . nonce() . ($defer ? " defer" : "") . "></script>\n";
 }
 
 /** Get a nonce="" attribute with CSP nonce */
@@ -90,9 +90,17 @@ function optionlist($options, $selected = null, bool $use_keys = false): string
 * @param string[] $options
 */
 function html_select(string $name, array $options, ?string $value = "", string $onchange = "", string $labelled_by = ""): string {
+	static $label = 0;
+	$label_option = "";
+	if (!$labelled_by && substr($options[""], 0, 1) == "(") {
+		$label++;
+		$labelled_by = "label-$label";
+		$label_option = "<option value='' id='$labelled_by'>" . h($options[""]);
+		unset($options[""]);
+	}
 	return "<select name='" . h($name) . "'"
 		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
-		. ">" . optionlist($options, $value) . "</select>"
+		. ">" . $label_option . optionlist($options, $value) . "</select>"
 		. ($onchange ? script("qsl('select').onchange = function () { $onchange };", "") : "")
 	;
 }
@@ -100,10 +108,10 @@ function html_select(string $name, array $options, ?string $value = "", string $
 /** Generate HTML radio list
 * @param string[] $options
 */
-function html_radios(string $name, array $options, string $value = ""): string {
+function html_radios(string $name, array $options, ?string $value = "", string $separator = ""): string {
 	$return = "";
 	foreach ($options as $key => $val) {
-		$return .= "<label><input type='radio' name='" . h($name) . "' value='" . h($key) . "'" . ($key == $value ? " checked" : "") . ">" . h($val) . "</label>";
+		$return .= "<label><input type='radio' name='" . h($name) . "' value='" . h($key) . "'" . ($key == $value ? " checked" : "") . ">" . h($val) . "</label>$separator";
 	}
 	return $return;
 }

adminer/include/lang.inc.php

@@ -1,7 +1,48 @@
 <?php
 namespace Adminer;
 
-// not used in a single language version
+/** Translate string
+* @param literal-string $idf
+* @param float|string $number
+*/
+function lang(string $idf, $number = null): string {
+	$args = func_get_args();
+	// this is matched by compile.php
+	$args[0] = Lang::$translations[$idf] ?: $idf;
+	return call_user_func_array('Adminer\lang_format', $args);
+}
+
+/** Format translation, usable also by plugins
+* @param string|list<string> $translation
+* @param float|string $number
+*/
+function lang_format($translation, $number = null): string {
+	if (is_array($translation)) {
+		// this is matched by compile.php
+		$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 except 12-14, other
+			: (LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
+			: (LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
+			: (LANG == 'lv' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number ? 1 : 2)) // different forms for 1 except 11, other, 0
+			: (in_array(LANG, array('bs', 'ru', 'sr', '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];
+	}
+	$translation = str_replace("'", '’', $translation); // translations can contain HTML or be used in optionlist (we couldn't escape them here) but they can also be used e.g. in title='' //! escape plaintext translations
+	$args = func_get_args();
+	array_shift($args);
+	$format = str_replace("%d", "%s", $translation);
+	if ($format != $translation) {
+		$args[0] = format_number($number);
+	}
+	return vsprintf($format, $args);
+}
+
+// this is matched by compile.php
+// not used in a single language version from here
 
 /** Get available languages
 * @return string[]
@@ -56,40 +97,9 @@ function langs(): array {
 	);
 }
 
-/** Translate string
-* @param literal-string $idf
-* @param float|string $number
-*/
-function lang(string $idf, $number = null): string {
-	// this is matched by compile.php
-	$translation = (Lang::$translations[$idf] ?: $idf);
-	if (is_array($translation)) {
-		// this is matched by compile.php
-		$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 except 12-14, other
-			: (LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
-			: (LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: (LANG == 'lv' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number ? 1 : 2)) // different forms for 1 except 11, other, 0
-			: (in_array(LANG, array('bs', 'ru', 'sr', '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];
-	}
-	$translation = str_replace("'", '’', $translation); // translations can contain HTML or be used in optionlist (we couldn't escape them here) but they can also be used e.g. in title='' //! escape plaintext translations
-	$args = func_get_args();
-	array_shift($args);
-	$format = str_replace("%d", "%s", $translation);
-	if ($format != $translation) {
-		$args[0] = format_number($number);
-	}
-	return vsprintf($format, $args);
-}
-
 function switch_lang(): void {
 	echo "<form action='' method='post'>\n<div id='lang'>";
-	echo lang('Language') . ": " . html_select("lang", langs(), LANG, "this.form.submit();");
+	echo "<label>" . lang('Language') . ": " . html_select("lang", langs(), LANG, "this.form.submit();") . "</label>";
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
 	echo input_token();
 	echo "</div>\n</form>\n";

adminer/include/pdo.inc.php

@@ -71,11 +71,20 @@ if (extension_loaded('pdo')) {
 		public $_offset = 0, $num_rows;
 
 		function fetch_assoc() {
-			return $this->fetch(\PDO::FETCH_ASSOC);
+			return $this->fetch_array(\PDO::FETCH_ASSOC);
 		}
 
 		function fetch_row() {
-			return $this->fetch(\PDO::FETCH_NUM);
+			return $this->fetch_array(\PDO::FETCH_NUM);
+		}
+
+		private function fetch_array(int $mode) {
+			$return = $this->fetch($mode);
+			return ($return ? array_map(array($this, 'unresource'), $return) : $return);
+		}
+
+		private function unresource($val) {
+			return (is_resource($val) ? stream_get_contents($val) : $val);
 		}
 
 		function fetch_field(): \stdClass {

adminer/include/plugin.inc.php

@@ -0,0 +1,31 @@
+<?php
+namespace Adminer;
+
+// the overridable methods don't use return type declarations so that plugins can be compatible with PHP 5
+abstract class Plugin {
+	/** @var array<literal-string, string|list<string>>[] */ protected $translations = array(); // key is language code
+
+	/** Get plain text plugin description; empty string means to use the first line of class doc-comment
+	* @return string
+	*/
+	function description() {
+		return $this->lang('');
+	}
+
+	/** Get URL of plugin screenshot
+	* @return string
+	*/
+	function screenshot() {
+		return "";
+	}
+
+	/** Translate a string from $this->translations; Adminer\lang() doesn't work for single language versions
+	* @param literal-string $idf
+	* @param float|string $number
+	*/
+	protected function lang(string $idf, $number = null): string {
+		$args = func_get_args();
+		$args[0] = idx($this->translations[LANG], $idf) ?: $idf;
+		return call_user_func_array('Adminer\lang_format', $args);
+	}
+}

adminer/include/plugins.inc.php

@@ -2,7 +2,7 @@
 namespace Adminer;
 
 class Plugins {
-	/** @var true[] */ private static array $append = array('dumpFormat' => true, 'dumpOutput' => true, 'editRowPrint' => true, 'editFunctions' => true); // these hooks expect the value to be appended to the result
+	/** @var true[] */ private static array $append = array('dumpFormat' => true, 'dumpOutput' => true, 'editRowPrint' => true, 'editFunctions' => true, 'config' => true); // these hooks expect the value to be appended to the result
 
 	/** @var list<object> @visibility protected(set) */ public array $plugins;
 	/** @visibility protected(set) */ public string $error = ''; // HTML

adminer/include/version.inc.php

@@ -1,4 +1,4 @@
 <?php
 namespace Adminer;
 
-const VERSION = "5.1.1";
+const VERSION = "5.2.1";

adminer/indexes.inc.php

@@ -106,7 +106,7 @@ $show_options = ($_POST ? $_POST["options"] : get_setting("index_options"));
 <thead><tr>
 <th id="label-type"><?php echo lang('Index Type'); ?>
 <th><input type="submit" class="wayoff"><?php
-echo lang('Column') . ($lengths ? "<span class='idxopts" . ($show_options ? "" : " hidden") . "'> (" . lang('length') . ")</span>" : "");
+echo lang('Columns') . ($lengths ? "<span class='idxopts" . ($show_options ? "" : " hidden") . "'> (" . lang('length') . ")</span>" : "");
 if ($lengths || support("descidx")) {
 	echo checkbox("options", 1, $show_options, lang('Options'), "indexOptionsShow(this.checked)", "jsonly") . "\n";
 }

adminer/lang/ar.inc.php

@@ -212,11 +212,6 @@ Lang::$translations = array(
 	'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 في المجموع',
@@ -251,7 +246,6 @@ Lang::$translations = array(
 	'Network' => 'شبكة',
 	'Geometry' => 'هندسة',
 	'File exists.' => 'الملف موجود.',
-	'Attachments' => 'ملفات مرفقة',
 	'Item%s has been inserted.' => '%sتم إدراج العنصر.',
 	'now' => 'الآن',
 	'%d query(s) executed OK.' => array('تم تنفيذ الاستعلام %d بنجاح.', 'تم تنفيذ الاستعلامات %d بنجاح.'),

adminer/lang/bg.inc.php

@@ -279,13 +279,6 @@ Lang::$translations = array(
 	'Delete' => 'Изтриване',
 	'You have no privileges to update this table.' => 'Нямате праве за обновяване на таблицата.',
 
-	'E-mail' => 'E-mail',
-	'From' => 'От',
-	'Subject' => 'Тема',
-	'Attachments' => 'Прикачени',
-	'Send' => 'Изпращане',
-	'%d e-mail(s) have been sent.' => array('%d писмо беше изпратено.', '%d писма бяха изпратени.'),
-
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата и час',

adminer/lang/bn.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'বাইনারি',
 	'Lists' => 'তালিকা',
 	'Editor' => 'সম্পাদক',
-	'E-mail' => '​​ই-মেইল',
-	'From' => 'থেকে',
-	'Subject' => 'বিষয়',
-	'Send' => 'পাঠান',
-	'%d e-mail(s) have been sent.' => array('%d ইমেইল(গুলি) পাঠানো হয়েছে।', '%d ইমেইল(গুলি) পাঠানো হয়েছে।'),
 	'Webserver file %s' => 'ওয়েবসার্ভার ফাইল %s',
 	'File does not exist.' => 'ফাইলটির কোন অস্তিত্ব নেই।',
 	'%d in total' => 'সর্বমোটঃ %d টি',
@@ -252,7 +247,6 @@ Lang::$translations = array(
 	'Network' => 'নেটওয়ার্ক',
 	'Geometry' => 'জ্যামিতি',
 	'File exists.' => 'ফাইল রয়েছে।',
-	'Attachments' => 'সংযুক্তিগুলো',
 	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে।', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে।'),
 	'Show only errors' => 'শুধুমাত্র ত্রুটিগুলো দেখান',
 	'Refresh' => 'রিফ্রেশ',

adminer/lang/bs.inc.php

@@ -264,13 +264,6 @@ Lang::$translations = array(
 	'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',

adminer/lang/ca.inc.php

@@ -206,11 +206,6 @@ Lang::$translations = array(
 	'History' => 'Història',
 	'Variables' => 'Variables',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes d\'origen i de destinació han de ser del mateix tipus, la columna de destinació ha d\'estar indexada i les dades referenciades han d\'existir.',
-	'E-mail' => 'Correu electrònic',
-	'From' => 'De',
-	'Subject' => 'Assumpte',
-	'Send' => 'Envia',
-	'%d e-mail(s) have been sent.' => array('S\'ha enviat %d correu electrònic.', 'S\'han enviat %d correus electrònics.'),
 	'Run file' => 'Executa el fitxer',
 	'Numbers' => 'Nombres',
 	'Date and time' => 'Data i hora',
@@ -225,7 +220,6 @@ Lang::$translations = array(
 	'File does not exist.' => 'El fitxer no existeix.',
 	'Permanent login' => 'Sessió permanent',
 	'%d in total' => '%d en total',
-	'Attachments' => 'Adjuncions',
 	'System' => 'Sistema',
 	'last' => 'darrera',
 	'Network' => 'Xarxa',

adminer/lang/cs.inc.php

@@ -13,9 +13,6 @@ Lang::$translations = array(
 	'Logged as: %s' => 'Přihlášen jako: %s',
 	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Díky za použití Admineru, <a href="https://www.adminer.org/cs/donation/">přispějte</a> na vývoj.',
-	'Loaded plugins' => 'Nahrané pluginy',
-	'%s must <a%s>return an array</a>.' => '%s musí <a%s>vracet pole</a>.',
-	'<a%s>Configure</a> %s in %s.' => '<a%s>Nakonfigurujte</a> %s v %s.',
 	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
 	'There is a space in the input password which might be the cause.' => 'Problém může být, že je v zadaném hesle mezera.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje přístup k databázi bez hesla, <a href="https://www.adminer.org/cs/password/"%s>více informací</a>.',
@@ -45,6 +42,7 @@ Lang::$translations = array(
 	'User has been created.' => 'Uživatel byl vytvořen.',
 	'Hashed' => 'Zahašované',
 	'Column' => 'Sloupec',
+	'Columns' => 'Sloupce',
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
@@ -295,13 +293,6 @@ Lang::$translations = array(
 	'Delete' => 'Smazat',
 	'You have no privileges to update this table.' => 'Nemáte oprávnění editovat tuto tabulku.',
 
-	'E-mail' => 'E-mail',
-	'From' => 'Odesílatel',
-	'Subject' => 'Předmět',
-	'Attachments' => 'Přílohy',
-	'Send' => 'Odeslat',
-	'%d e-mail(s) have been sent.' => array('Byl odeslán %d e-mail.', 'Byly odeslány %d e-maily.', 'Bylo odesláno %d e-mailů.'),
-
 	// data type descriptions
 	'Numbers' => 'Čísla',
 	'Date and time' => 'Datum a čas',
@@ -358,6 +349,11 @@ Lang::$translations = array(
 	'Check has been created.' => 'Kontrola byla vytvořena.',
 	'Check has been altered.' => 'Kontrola byla změněna.',
 	'Check has been dropped.' => 'Kontrola byla odstraněna.',
+
+	'Loaded plugins' => 'Nahrané pluginy',
+	'%s must <a%s>return an array</a>.' => '%s musí <a%s>vracet pole</a>.',
+	'<a%s>Configure</a> %s in %s.' => '<a%s>Nakonfigurujte</a> %s v %s.',
+	'screenshot' => 'obrázek',
 );
 
 // run `php ../../lang.php cs` to update this file

adminer/lang/da.inc.php

@@ -238,12 +238,6 @@ Lang::$translations = array(
 	'Clone' => 'Klon',
 	'Delete' => 'Slet',
 	'You have no privileges to update this table.' => 'Du mangler rettigheder til at ændre denne tabellen.',
-	'E-mail' => 'E-mail',
-	'From' => 'Fra',
-	'Subject' => 'Titel',
-	'Attachments' => 'Vedhæft',
-	'Send' => 'Send',
-	'%d e-mail(s) have been sent.' => array('%d email sendt.', '%d emails sendt.'),
 	'Numbers' => 'Nummer',
 	'Date and time' => 'Dato og tid',
 	'Strings' => 'Strenge',

adminer/lang/de.inc.php

@@ -137,6 +137,7 @@ Lang::$translations = array(
 	'User has been created.' => 'Benutzer wurde erstellt.',
 	'Hashed' => 'Hashed',
 	'Column' => 'Spalte',
+	'Columns' => 'Spalten',
 	'Routine' => 'Routine',
 	'Grant' => 'Erlauben',
 	'Revoke' => 'Widerrufen',
@@ -215,11 +216,6 @@ Lang::$translations = array(
 	'Binary' => 'Binär',
 	'Lists' => 'Listen',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-Mail',
-	'From' => 'Von',
-	'Subject' => 'Betreff',
-	'Send' => 'Abschicken',
-	'%d e-mail(s) have been sent.' => array('%d E-Mail abgeschickt.', '%d E-Mails abgeschickt.'),
 	'Webserver file %s' => 'Webserver Datei %s',
 	'File does not exist.' => 'Datei existiert nicht.',
 	'%d in total' => '%d insgesamt',
@@ -254,7 +250,6 @@ Lang::$translations = array(
 	'Network' => 'Netzwerk',
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Datei existiert schon.',
-	'Attachments' => 'Anhänge',
 	'%d query(s) executed OK.' => array('SQL-Abfrage erfolgreich ausgeführt.', '%d SQL-Abfragen erfolgreich ausgeführt.'),
 	'Show only errors' => 'Nur Fehler anzeigen',
 	'Refresh' => 'Aktualisieren',
@@ -308,6 +303,10 @@ Lang::$translations = array(
 	'Alter check' => 'Check ändern',
 	'Create check' => 'Check erstellen',
 	'Checks' => 'Checks',
+	'Loaded plugins' => 'Geladene Plugins',
+	'%s must <a%s>return an array</a>.' => '%s muss <a%s>ein Array zurückgeben</a>.',
+	'<a%s>Configure</a> %s in %s.' => '<a%s>Konfigure</a> %s mit %s.',
+	'screenshot' => 'Screenshot',
 );
 
 // run `php ../../lang.php de` to update this file

adminer/lang/el.inc.php

@@ -279,13 +279,6 @@ Lang::$translations = array(
 	'Delete' => 'Διαγραφή',
 	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
 
-	'E-mail' => 'E-mail',
-	'From' => 'Από',
-	'Subject' => 'Θέμα',
-	'Attachments' => 'Συνημμένα',
-	'Send' => 'Αποστολή',
-	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
-
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',
 	'Date and time' => 'Ημερομηνία και ώρα',

adminer/lang/en.inc.php

@@ -11,7 +11,6 @@ Lang::$translations = array(
 	'%d row(s)' => array('%d row', '%d rows'),
 	'%d item(s) have been affected.' => array('%d item has been affected.', '%d items have been affected.'),
 	'%d row(s) have been imported.' => array('%d row has been imported.', '%d rows have been imported.'),
-	'%d e-mail(s) have been sent.' => array('%d e-mail has been sent.', '%d e-mails have been sent.'),
 	'%d in total' => '%d in total',
 	'%d query(s) executed OK.' => array('%d query executed OK.', '%d queries executed OK.'),
 );

adminer/lang/es.inc.php

@@ -222,11 +222,6 @@ Lang::$translations = array(
 	'Binary' => 'Binario',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
-	'E-mail' => 'Email',
-	'From' => 'De',
-	'Subject' => 'Asunto',
-	'Send' => 'Enviar',
-	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
 	'Webserver file %s' => 'Archivo de servidor web %s',
 	'File does not exist.' => 'Ese archivo no existe.',
 	'%d in total' => '%d en total',
@@ -261,7 +256,6 @@ Lang::$translations = array(
 	'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.'),
 	'Show only errors' => 'Mostrar solamente errores',
 	'Refresh' => 'Actualizar',
@@ -276,8 +270,8 @@ Lang::$translations = array(
 	'HH:MM:SS' => 'HH:MM:SS',
 
 	'Loaded plugins' => 'Plugins cargados',
-	// '<b>%s</b> must return an array.' => '<b>%s</b> tiene que retornar un arreglo.',
-	// 'Configure <b>%s</b> in <b>%s</b>.' => 'Configurar <b>%s</b> en <b>%s</b>.',
+	'%s must <a%s>return an array</a>.' => '%s tiene que <a%s>retornar un arreglo</a>.',
+	'<a%s>Configure</a> %s in %s.' => '<a%s>Configurar</a> %s en %s.',
 	'There is a space in the input password which might be the cause.' => 'Hay un espacio en el password, lo cual puede ser la causa.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer no soporta accesar una base de datos sin clave, <a href="https://www.adminer.org/en/password/"%s>Ver detalles</a>.',
 	'Database does not support password.' => 'La base de datos no soporta password.',

adminer/lang/et.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binaar',
 	'Lists' => 'Listid',
 	'Editor' => 'Redaktor',
-	'E-mail' => 'E-post',
-	'From' => 'Kellelt',
-	'Subject' => 'Pealkiri',
-	'Send' => 'Saada',
-	'%d e-mail(s) have been sent.' => 'Saadetud kirju: %d.',
 	'Webserver file %s' => 'Fail serveris: %s',
 	'File does not exist.' => 'Faili ei leitud.',
 	'%d in total' => 'Kokku: %d',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Võrk (network)',
 	'Geometry' => 'Geomeetria',
 	'File exists.' => 'Fail juba eksisteerib.',
-	'Attachments' => 'Manused',
 	'%d query(s) executed OK.' => array('%d päring edukalt käivitatud.', '%d päringut edukalt käivitatud.'),
 	'Show only errors' => 'Kuva vaid veateateid',
 	'Refresh' => 'Uuenda',

adminer/lang/fa.inc.php

@@ -277,13 +277,6 @@ Lang::$translations = array(
 	'Delete' => 'حذف',
 	'You have no privileges to update this table.' => 'شما اختیار ویرایش این جدول را ندارید.',
 
-	'E-mail' => 'پست الکترونیک',
-	'From' => 'فرستنده',
-	'Subject' => 'موضوع',
-	'Attachments' => 'پیوست ها',
-	'Send' => 'ارسال',
-	'%d e-mail(s) have been sent.' => array('%d ایمیل ارسال شد.', '%d ایمیل ارسال شد.'),
-
 	// data type descriptions
 	'Numbers' => 'اعداد',
 	'Date and time' => 'تاریخ و زمان',

adminer/lang/fi.inc.php

@@ -279,13 +279,6 @@ Lang::$translations = array(
 	'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',

adminer/lang/fr.inc.php

@@ -212,11 +212,6 @@ Lang::$translations = array(
 	'Binary' => 'Binaires',
 	'Lists' => 'Listes',
 	'Editor' => 'Éditeur',
-	'E-mail' => 'Courriel',
-	'From' => 'De',
-	'Subject' => 'Sujet',
-	'Send' => 'Envoyer',
-	'%d e-mail(s) have been sent.' => array('%d message a été envoyé.', '%d messages ont été envoyés.'),
 	'Webserver file %s' => 'Fichier %s du serveur Web',
 	'File does not exist.' => 'Le fichier est introuvable.',
 	'%d in total' => '%d au total',
@@ -252,7 +247,6 @@ Lang::$translations = array(
 	'Network' => 'Réseau',
 	'Geometry' => 'Géométrie',
 	'File exists.' => 'Le fichier existe.',
-	'Attachments' => 'Pièces jointes',
 	'Item%s has been inserted.' => 'L\'élément%s a été inséré.',
 	'now' => 'maintenant',
 	'%d query(s) executed OK.' => array('%d requête exécutée avec succès.', '%d requêtes exécutées avec succès.'),

adminer/lang/gl.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binario',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
-	'E-mail' => 'Email',
-	'From' => 'De',
-	'Subject' => 'Asunto',
-	'Send' => 'Enviar',
-	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
 	'Webserver file %s' => 'Ficheiro de servidor web %s',
 	'File does not exist.' => 'O ficheiro non existe.',
 	'%d in total' => '%d en total',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Rede',
 	'Geometry' => 'Xeometría',
 	'File exists.' => 'O ficheiro xa existe.',
-	'Attachments' => 'Adxuntos',
 	'%d query(s) executed OK.' => array('%d consulta executada correctamente.', '%d consultas executadas correctamente.'),
 	'Show only errors' => 'Amosar só erros',
 	'Refresh' => 'Refrescar',

adminer/lang/he.inc.php

@@ -212,11 +212,6 @@ Lang::$translations = array(
 	'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 בסך הכל',
@@ -251,7 +246,6 @@ Lang::$translations = array(
 	'Network' => 'רשת',
 	'Geometry' => 'גיאומטריה',
 	'File exists.' => 'קובץ קיים',
-	'Attachments' => 'קבצים מצורפים',
 	'Item%s has been inserted.' => 'הפריט %s הוזן בהצלחה',
 	'now' => 'כעת',
 	'%d query(s) executed OK.' => '%d שאילתות בוצעו בהצלחה',

adminer/lang/hu.inc.php

@@ -206,11 +206,6 @@ Lang::$translations = array(
 	'History' => 'Történet',
 	'Variables' => 'Változók',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'A forrás és cél oszlopoknak azonos típusúak legyenek, a cél oszlopok indexeltek legyenek, és a hivatkozott adatnak léteznie kell.',
-	'E-mail' => 'E-mail',
-	'From' => 'Feladó',
-	'Subject' => 'Tárgy',
-	'Send' => 'Küldés',
-	'%d e-mail(s) have been sent.' => array('%d e-mail elküldve.', '%d e-mail elküldve.', '%d e-mail elküldve.'),
 	'Run file' => 'Fájl futtatása',
 	'Numbers' => 'Szám',
 	'Date and time' => 'Dátum és idő',
@@ -225,7 +220,6 @@ Lang::$translations = array(
 	'File does not exist.' => 'A fájl nem létezik.',
 	'Permanent login' => 'Emlékezz rám',
 	'%d in total' => 'összesen %d',
-	'Attachments' => 'Csatolmány',
 	'System' => 'Adatbázis',
 	'last' => 'utolsó',
 	'Network' => 'Hálózat',

adminer/lang/id.inc.php

@@ -259,13 +259,6 @@ Lang::$translations = array(
 	'Clone' => 'Gandakan',
 	'Delete' => 'Hapus',
 
-	'E-mail' => 'Surel',
-	'From' => 'Dari',
-	'Subject' => 'Judul',
-	'Attachments' => 'Lampiran',
-	'Send' => 'Kirim',
-	'%d e-mail(s) have been sent.' => '%d surel berhasil dikirim.',
-
 	// data type descriptions
 	'Numbers' => 'Angka',
 	'Date and time' => 'Tanggal dan waktu',

adminer/lang/it.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binari',
 	'Lists' => 'Liste',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-mail',
-	'From' => 'Da',
-	'Subject' => 'Oggetto',
-	'Send' => 'Invia',
-	'%d e-mail(s) have been sent.' => array('%d e-mail inviata.', '%d e-mail inviate.'),
 	'Webserver file %s' => 'Webserver file %s',
 	'File does not exist.' => 'Il file non esiste.',
 	'%d in total' => '%d in totale',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Rete',
 	'Geometry' => 'Geometria',
 	'File exists.' => 'Il file esiste già.',
-	'Attachments' => 'Allegati',
 	'%d query(s) executed OK.' => array('%d query eseguita con successo.', '%d query eseguite con successo.'),
 	'Show only errors' => 'Mostra solo gli errori',
 	'Refresh' => 'Aggiorna',

adminer/lang/ja.inc.php

@@ -11,7 +11,7 @@ Lang::$translations = array(
 	'Loaded plugins' => '読込済プラグイン',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Adminerのご利用ありがとうございました。(寄付は<a href="https://www.adminer.org/en/donation/">こちら</a>)',
 	'%s must <a%s>return an array</a>.' => '%s は<a%s>配列を返す</a>必要があります。',
-	'<a%s>Configure</a> %s in %s.' => '%2$s の %1$s <a%s>を設定してください</a>。',
+	'<a%s>Configure</a> %s in %s.' => '%2$s の %1$s を<a%s>設定</a>してください。',
 	'There is a space in the input password which might be the cause.' => '入力されたパスワードに空白が含まれているので、それが原因かもしれません。',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer はパスワードのないデータベースへの接続には対応していません。(<a href="https://www.adminer.org/en/password/"%s>詳細</a>)',
 	'Database does not support password.' => 'データベースがパスワードに対応していません。',
@@ -107,8 +107,8 @@ Lang::$translations = array(
 	'Foreign key has been dropped.' => '外部キーを削除しました。',
 	'Foreign key has been altered.' => '外部キーを変更しました。',
 	'Foreign key has been created.' => '外部キーを作成しました。',
-	'Foreign key' => '外キー',
-	'Target table' => 'テーブル',
+	'Foreign key' => '外部キー',
+	'Target table' => '対象テーブル',
 	'Change' => '変更',
 	'Source' => 'ソース',
 	'Target' => 'ターゲット',
@@ -158,6 +158,7 @@ Lang::$translations = array(
 	'User has been created.' => 'ユーザを作成しました。',
 	'Hashed' => 'Hashed',
 	'Column' => '列',
+	'Columns' => '列',
 	'Routine' => 'ルーチン',
 	'Grant' => '権限の付与',
 	'Revoke' => '権限の取消し',
@@ -243,11 +244,6 @@ Lang::$translations = array(
 	'Binary' => 'バイナリ',
 	'Lists' => 'リスト',
 	'Editor' => 'エディタ',
-	'E-mail' => 'メール',
-	'From' => '差出人',
-	'Subject' => '題名',
-	'Send' => '送信',
-	'%d e-mail(s) have been sent.' => '%d メールを送信しました。',
 	'Webserver file %s' => 'Webサーバファイル %s',
 	'File does not exist.' => 'ファイルは存在しません。',
 	'%d in total' => '合計 %d',
@@ -280,7 +276,6 @@ Lang::$translations = array(
 	'Network' => 'ネットワーク型',
 	'Geometry' => 'ジオメトリ型',
 	'File exists.' => 'ファイルが既に存在します。',
-	'Attachments' => '添付ファイル',
 	'Item%s has been inserted.' => '%s項目を挿入しました。',
 	'now' => '現在の日時',
 	'%d query(s) executed OK.' => '%d クエリーを実行しました。',
@@ -313,6 +308,8 @@ Lang::$translations = array(
 	'Check has been created.' => 'チェックを作成しました。',
 	'Check has been altered.' => 'チェックを変更しました。',
 	'Check has been dropped.' => 'チェックを削除しました。',
+
+	'screenshot' => 'スクリーンショット',
 );
 
 // run `php ../../lang.php ja` to update this file

adminer/lang/ka.inc.php

@@ -210,11 +210,6 @@ Lang::$translations = array(
 	'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',
@@ -249,7 +244,6 @@ Lang::$translations = array(
 	'Network' => 'ქსელი',
 	'Geometry' => 'გეომეტრია',
 	'File exists.' => 'ფაილი უკვე არსებობს.',
-	'Attachments' => 'მიმაგრებული ფაილები',
 	'%d query(s) executed OK.' => '%d მოთხოვნა შესრულდა.',
 	'Show only errors' => 'მხოლოდ შეცდომები',
 	'Refresh' => 'განახლება',

adminer/lang/ko.inc.php

@@ -5,7 +5,6 @@ Lang::$translations = array(
 	'$1-$3-$5' => '$1-$3-$5',
 	'%.3f s' => '%.3f 초',
 	'%d byte(s)' => '%d 바이트',
-	'%d e-mail(s) have been sent.' => '%d개 메일을 보냈습니다.',
 	'%d in total' => '총 %d개',
 	'%d item(s) have been affected.' => '%d개 항목을 갱신했습니다.',
 	'%d process(es) have been killed.' => '%d개 프로세스를 강제 종료하였습니다.',
@@ -38,7 +37,6 @@ Lang::$translations = array(
 	'anywhere' => '모든',
 	'Are you sure?' => '실행 하시겠습니까?',
 	'At given time' => '지정 시간',
-	'Attachments' => '첨부 파일',
 	'Auto Increment' => '자동 증가',
 	'Binary' => '이진',
 	'Call' => '호출',
@@ -80,7 +78,6 @@ Lang::$translations = array(
 	'Delete' => '삭제',
 	'descending' => '역순',
 	'Drop' => '삭제',
-	'E-mail' => '메일',
 	'Edit all' => '모두 편집',
 	'Edit' => '편집',
 	'edit' => '편집',
@@ -109,7 +106,6 @@ Lang::$translations = array(
 	'Foreign keys' => '외부 키',
 	'Format' => '형식',
 	'From server' => '서버에서 실행',
-	'From' => '보낸 사람',
 	'Functions' => '함수',
 	'Geometry' => '기하 형',
 	'Grant' => '권한 부여',
@@ -211,7 +207,6 @@ Lang::$translations = array(
 	'Select' => '선택',
 	'select' => '선택',
 	'Selected' => '선택됨',
-	'Send' => '보내기',
 	'Sequence has been altered.' => '시퀀스를 변경했습니다.',
 	'Sequence has been created.' => '시퀀스를 추가했습니다.',
 	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
@@ -230,7 +225,6 @@ Lang::$translations = array(
 	'Status' => '상태',
 	'Stop on error' => '오류의 경우 중지',
 	'Strings' => '문자열',
-	'Subject' => '제목',
 	'System' => '데이터베이스 형식',
 	'Table has been altered.' => '테이블을 변경했습니다.',
 	'Table has been created.' => '테이블을 만들었습니다.',

adminer/lang/lt.inc.php

@@ -257,13 +257,6 @@ Lang::$translations = array(
 	'Clone' => 'Klonuoti',
 	'Delete' => 'Trinti',
 
-	'E-mail' => 'El. paštas',
-	'From' => 'Nuo',
-	'Subject' => 'Antraštė',
-	'Attachments' => 'Priedai',
-	'Send' => 'Siųsti',
-	'%d e-mail(s) have been sent.' => array('Išsiųstas %d laiškas.', 'Išsiųsti %d laiškai.', 'Išsiųsta %d laiškų.'),
-
 	// data type descriptions
 	'Numbers' => 'Skaičiai',
 	'Date and time' => 'Data ir laikas',

adminer/lang/lv.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binārie',
 	'Lists' => 'Saraksti',
 	'Editor' => 'Redaktors',
-	'E-mail' => 'Epasts',
-	'From' => 'No',
-	'Subject' => 'Tēma',
-	'Send' => 'Sūtīt',
-	'%d e-mail(s) have been sent.' => array('Nosūtīts %d epasts.', 'Nosūtīti %d epasti.', 'Nosūtīti %d epasti.'),
 	'Webserver file %s' => 'Fails %s uz servera',
 	'File does not exist.' => 'Fails neeksistē.',
 	'%d in total' => 'Kopā %d',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Tīkls',
 	'Geometry' => 'Ģeometrija',
 	'File exists.' => 'Fails eksistē.',
-	'Attachments' => 'Pielikumi',
 	'%d query(s) executed OK.' => array('%d pieprasījums veiksmīgs.', '%d pieprasījumi veiksmīgi.', '%d pieprasījumi veiksmīgi.'),
 	'Show only errors' => 'Rādīt tikai kļūdas',
 	'Refresh' => 'Atjaunot',

adminer/lang/ms.inc.php

@@ -283,13 +283,6 @@ Lang::$translations = array(
 	'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',

adminer/lang/nl.inc.php

@@ -215,11 +215,6 @@ Lang::$translations = array(
 	'Binary' => 'Binaire gegevens',
 	'Lists' => 'Lijsten',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-mail',
-	'From' => 'Van',
-	'Subject' => 'Onderwerp',
-	'Send' => 'Verzenden',
-	'%d e-mail(s) have been sent.' => array('%d e-mail verzonden.', '%d e-mails verzonden.'),
 	'Webserver file %s' => 'Webserver bestand %s',
 	'File does not exist.' => 'Bestand niet gevonden.',
 	'%d in total' => '%d in totaal',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Netwerk',
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Bestand bestaat reeds.',
-	'Attachments' => 'Bijlagen',
 	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd.'),
 	'Show only errors' => 'Enkel fouten tonen',
 	'Refresh' => 'Vernieuwen',

adminer/lang/no.inc.php

@@ -238,12 +238,6 @@ Lang::$translations = array(
 	'Clone' => 'Klon',
 	'Delete' => 'Slett',
 	'You have no privileges to update this table.' => 'Du mangler rettighetene som trengs for å endre denne tabellen.',
-	'E-mail' => 'E-post',
-	'From' => 'Fra',
-	'Subject' => 'Tittel',
-	'Attachments' => 'Vedlegg',
-	'Send' => 'Send',
-	'%d e-mail(s) have been sent.' => array('%d epost sendt.', '%d eposter sendt.'),
 	'Numbers' => 'Nummer',
 	'Date and time' => 'Dato og tid',
 	'Strings' => 'Strenger',

adminer/lang/pl.inc.php

@@ -45,6 +45,7 @@ Lang::$translations = array(
 	'User has been created.' => 'Użytkownik został dodany.',
 	'Hashed' => 'Zahashowane',
 	'Column' => 'Kolumna',
+	'Columns' => 'Kolumny',
 	'Routine' => 'Procedura',
 	'Grant' => 'Uprawnienia',
 	'Revoke' => 'Usuń uprawnienia',
@@ -295,13 +296,6 @@ Lang::$translations = array(
 	'Delete' => 'Usuń',
 	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli.',
 
-	'E-mail' => 'E-mail',
-	'From' => 'Nadawca',
-	'Subject' => 'Temat',
-	'Attachments' => 'Załączniki',
-	'Send' => 'Wyślij',
-	'%d e-mail(s) have been sent.' => array('Wysłano %d e-mail.', 'Wysłano %d e-maile.', 'Wysłano %d e-maili.'),
-
 	// data type descriptions
 	'Numbers' => 'Numeryczne',
 	'Date and time' => 'Data i czas',

adminer/lang/pt-br.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-mail',
-	'From' => 'De',
-	'Subject' => 'Assunto',
-	'Send' => 'Enviar',
-	'%d e-mail(s) have been sent.' => array('%d email foi enviado.', '%d emails foram enviados.'),
 	'Webserver file %s' => 'Arquivo do servidor web %s',
 	'File does not exist.' => 'Arquivo não existe.',
 	'%d in total' => '%d no total',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Rede',
 	'Geometry' => 'Geometria',
 	'File exists.' => 'Arquivo já existe.',
-	'Attachments' => 'Anexos',
 	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consultas sql executadas corretamente.'),
 	'Show only errors' => 'Mostrar somente erros',
 	'Refresh' => 'Atualizar',

adminer/lang/pt.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-mail',
-	'From' => 'De',
-	'Subject' => 'Assunto',
-	'Send' => 'Enviar',
-	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
 	'Webserver file %s' => 'Ficheiro do servidor web %s',
 	'File does not exist.' => 'Ficheiro não existe.',
 	'%d in total' => '%d no total',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Rede',
 	'Geometry' => 'Geometria',
 	'File exists.' => 'Ficheiro já existe.',
-	'Attachments' => 'Anexos',
 	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consultas sql executadas corretamente.'),
 	'Show only errors' => 'Mostrar somente erros',
 	'Refresh' => 'Atualizar',

adminer/lang/ro.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Tip binar',
 	'Lists' => 'Liste',
 	'Editor' => 'Editor',
-	'E-mail' => 'Poșta electronică',
-	'From' => 'De la',
-	'Subject' => 'Pentru',
-	'Send' => 'Trimite',
-	'%d e-mail(s) have been sent.' => array('A fost trimis %d mail.', 'Au fost trimise %d mail-uri.'),
 	'Webserver file %s' => 'Fișierul %s pe server',
 	'File does not exist.' => 'Acest fișier nu există.',
 	'%d in total' => 'În total %d',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Rețea',
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Fișierul există deja.',
-	'Attachments' => 'Fișiere atașate',
 	'%d query(s) executed OK.' => array('%d query executat.', '%d query-uri executate cu succes.'),
 	'Show only errors' => 'Arată doar greșeli',
 	'Refresh' => 'Împrospătează',

adminer/lang/ru.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'Двоичный тип',
 	'Lists' => 'Списки',
 	'Editor' => 'Редактор',
-	'E-mail' => 'Эл. почта',
-	'From' => 'От',
-	'Subject' => 'Тема',
-	'Send' => 'Послать',
-	'%d e-mail(s) have been sent.' => array('Было отправлено %d письмо.', 'Было отправлено %d письма.', 'Было отправлено %d писем.'),
 	'Webserver file %s' => 'Файл %s на вебсервере',
 	'File does not exist.' => 'Такого файла не существует.',
 	'%d in total' => 'Всего %d',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Сеть',
 	'Geometry' => 'Геометрия',
 	'File exists.' => 'Файл уже существует.',
-	'Attachments' => 'Прикреплённые файлы',
 	'%d query(s) executed OK.' => array('%d запрос выполнен успешно.', '%d запроса выполнено успешно.', '%d запросов выполнено успешно.'),
 	'Show only errors' => 'Только ошибки',
 	'Refresh' => 'Обновить',

adminer/lang/sk.inc.php

@@ -205,11 +205,6 @@ Lang::$translations = array(
 	'History' => 'História',
 	'Variables' => 'Premenné',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Zdrojové a cieľové stĺpce musia mať rovnaký datový typ, nad cieľovými stĺpcami musí byť definovaný index a odkazované dáta musia existovať.',
-	'E-mail' => 'E-mail',
-	'From' => 'Odosielateľ',
-	'Subject' => 'Predmet',
-	'Send' => 'Odoslať',
-	'%d e-mail(s) have been sent.' => array('Bol odoslaný %d e-mail.', 'Boli odoslané %d e-maily.', 'Bolo odoslaných %d e-mailov.'),
 	'Run file' => 'Spustiť súbor',
 	'Numbers' => 'Čísla',
 	'Date and time' => 'Dátum a čas',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'Sieť',
 	'Geometry' => 'Geometria',
 	'File exists.' => 'Súbor existuje.',
-	'Attachments' => 'Prílohy',
 	'%d query(s) executed OK.' => array('Bol vykonaný %d dotaz.', 'Boli vykonané %d dotazy.', 'Bolo vykonaných %d dotazov.'),
 	'Show only errors' => 'Zobraziť iba chyby',
 	'Refresh' => 'Obnoviť',

adminer/lang/sl.inc.php

@@ -254,13 +254,6 @@ Lang::$translations = array(
 	'Clone' => 'Kloniraj',
 	'Delete' => 'Izbriši',
 
-	'E-mail' => 'E-mail',
-	'From' => 'Od',
-	'Subject' => 'Zadeva',
-	'Attachments' => 'Priponke',
-	'Send' => 'Pošlji',
-	'%d e-mail(s) have been sent.' => array('Poslan je %d e-mail.', 'Poslana sta %d e-maila.', 'Poslani so %d e-maili.', 'Poslanih je %d e-mailov.'),
-
 	// data type descriptions
 	'Numbers' => 'Števila',
 	'Date and time' => 'Datum in čas',

adminer/lang/sr.inc.php

@@ -262,13 +262,6 @@ Lang::$translations = array(
 	'Clone' => 'Дуплирај',
 	'Delete' => 'Избриши',
 
-	'E-mail' => 'Ел. пошта',
-	'From' => 'Од',
-	'Subject' => 'Наслов',
-	'Attachments' => 'Прилози',
-	'Send' => 'Пошаљи',
-	'%d e-mail(s) have been sent.' => array('%d порука ел. поште је послата.', '%d поруке ел. поште су послате.', '%d порука ел. поште је послато.'),
-
 	// data type descriptions
 	'Numbers' => 'Број',
 	'Date and time' => 'Датум и време',

adminer/lang/sv.inc.php

@@ -292,13 +292,6 @@ Lang::$translations = array(
 	'Delete' => 'Ta bort',
 	'You have no privileges to update this table.' => 'Du har inga privilegier för att uppdatera den här tabellen.',
 
-	'E-mail' => 'Email',
-	'From' => 'Från',
-	'Subject' => 'Ämne',
-	'Attachments' => 'Bilagor',
-	'Send' => 'Skicka',
-	'%d e-mail(s) have been sent.' => array('%d email har blivit skickat.', '%d email har blivit skickade.'),
-
 	// data type descriptions
 	'Numbers' => 'Nummer',
 	'Date and time' => 'Datum och tid',

adminer/lang/ta.inc.php

@@ -212,11 +212,6 @@ Lang::$translations = array(
 	'Binary' => 'பைன‌ரி',
 	'Lists' => 'ப‌ட்டிய‌ல்',
 	'Editor' => 'தொகுப்பாளர்',
-	'E-mail' => 'மின்ன‌ஞ்ச‌ல்',
-	'From' => 'அனுப்புனர்',
-	'Subject' => 'பொருள்',
-	'Send' => 'அனுப்பு',
-	'%d e-mail(s) have been sent.' => array('%d மின்ன‌ஞ்ச‌ல் அனுப்ப‌ப‌ட்ட‌து.', '%d மின்ன‌ஞ்ச‌ல்க‌ள் அனுப்ப‌ப்ப‌ட்ட‌ன‌.'),
 	'Webserver file %s' => 'வெப் ச‌ர்வ‌ர் கோப்பு %s',
 	'File does not exist.' => 'கோப்பு இல்லை.',
 	'%d in total' => 'மொத்தம் %d ',
@@ -252,7 +247,6 @@ Lang::$translations = array(
 	'Network' => 'நெட்வொர்க்',
 	'Geometry' => 'வ‌டிவ‌விய‌ல் (Geometry)',
 	'File exists.' => 'கோப்பு உள்ள‌து.',
-	'Attachments' => 'இணைப்புக‌ள்',
 	'now' => 'இப்பொழுது',
 	'%d query(s) executed OK.' => array('%d வின‌வ‌ல் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌து.', '%d வின‌வ‌ல்க‌ள் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌ன‌.'),
 	'Show only errors' => 'பிழைக‌ளை ம‌ட்டும் காண்பிக்க‌வும்',

adminer/lang/th.inc.php

@@ -214,11 +214,6 @@ Lang::$translations = array(
 	'Binary' => 'เลขฐานสอง',
 	'Lists' => 'รายการ',
 	'Editor' => 'ผู้แก้ไข',
-	'E-mail' => 'อีเมล์',
-	'From' => 'จาก',
-	'Subject' => 'หัวข้อ',
-	'Send' => 'ส่ง',
-	'%d e-mail(s) have been sent.' => 'มี %d อีเมล์ ถูกส่งออกแล้ว.',
 	'Webserver file %s' => 'Webserver file %s',
 	'File does not exist.' => 'ไม่มีไฟล์.',
 	'%d in total' => '%d ของทั้งหมด',
@@ -253,7 +248,6 @@ Lang::$translations = array(
 	'Network' => 'เครื่องข่าย',
 	'Geometry' => 'เรขาคณิต',
 	'File exists.' => 'มีไฟล์นี้อยู่แล้ว.',
-	'Attachments' => 'ไฟล์แนบ',
 	'%d query(s) executed OK.' => '%d คำสั่งถูกดำเนินการแล้ว.',
 	'Show only errors' => 'แสดงเฉพาะเออเรอ',
 	'Refresh' => 'โหลดใหม่',

adminer/lang/tr.inc.php

@@ -286,13 +286,6 @@ Lang::$translations = array(
 	'Delete' => 'Sil',
 	'You have no privileges to update this table.' => 'Bu tabloyu güncellemek için yetkiniz yok.',
 
-	'E-mail' => 'E-posta',
-	'From' => 'Gönderen',
-	'Subject' => 'Konu',
-	'Attachments' => 'Ekler',
-	'Send' => 'Gönder',
-	'%d e-mail(s) have been sent.' => array('%d e-posta gönderildi.', '%d adet e-posta gönderildi.'),
-
 	// data type descriptions
 	'Numbers' => 'Sayılar',
 	'Date and time' => 'Tarih ve zaman',

adminer/lang/uk.inc.php

@@ -259,13 +259,6 @@ Lang::$translations = array(
 	'Clone' => 'Клонувати',
 	'Delete' => 'Видалити',
 
-	'E-mail' => 'E-mail',
-	'From' => 'Від',
-	'Subject' => 'Заголовок',
-	'Attachments' => 'Додатки',
-	'Send' => 'Надіслати',
-	'%d e-mail(s) have been sent.' => array('Було надіслано %d повідомлення.', 'Було надіслано %d повідомлення.', 'Було надіслано %d повідомлень.'),
-
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата і час',

adminer/lang/uz.inc.php

@@ -297,13 +297,6 @@ Lang::$translations = array(
 	'Delete' => 'O\'chirish',
 	'You have no privileges to update this table.' => 'Bu jadvalni yangilash uchun sizda huquqlar yo\'q.',
 
-	'E-mail' => 'E-pochta',
-	'From' => 'Kimdan',
-	'Subject' => 'Mavzu',
-	'Attachments' => 'Ilovalar',
-	'Send' => 'Yuborish',
-	'%d e-mail(s) have been sent.' => array('%d e-pochta yuborildi.', '%d e-pochtalar yuborildi.'),
-
 	// data type descriptions
 	'Numbers' => 'Raqamlar',
 	'Date and time' => 'Sana va vaqt',

adminer/lang/vi.inc.php

@@ -271,13 +271,6 @@ Lang::$translations = array(
 	'Delete' => 'Xoá',
 	'You have no privileges to update this table.' => 'Bạn không có quyền sửa bảng này.',
 
-	'E-mail' => 'Địa chỉ email',
-	'From' => 'Người gửi',
-	'Subject' => 'Chủ đề',
-	'Attachments' => 'Đính kèm',
-	'Send' => 'Gửi',
-	'%d e-mail(s) have been sent.' => '%d thư đã gửi.',
-
 	// data type descriptions
 	'Numbers' => 'Số',
 	'Date and time' => 'Ngày giờ',

adminer/lang/xx.inc.php

@@ -13,9 +13,6 @@ Lang::$translations = array(
 	'Logged as: %s' => 'Xx: %s',
 	'Logout successful.' => 'Xx.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Xx <a href="https://www.adminer.org/en/donation/">xx</a>.',
-	'Loaded plugins' => 'Xx',
-	'%s must <a%s>return an array</a>.' => '%s xx <a%s>xx</a>.',
-	'<a%s>Configure</a> %s in %s.' => '<a%s>Xx</a> %s xx %s.',
 	'Invalid credentials.' => 'Xx.',
 	'There is a space in the input password which might be the cause.' => 'Xx.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Xx, <a href="https://www.adminer.org/en/password/"%s>xx</a>.',
@@ -46,6 +43,7 @@ Lang::$translations = array(
 	'User has been created.' => 'Xx.',
 	'Hashed' => 'Xx',
 	'Column' => 'Xx',
+	'Columns' => 'Xx',
 	'Routine' => 'Xx',
 	'Grant' => 'Xx',
 	'Revoke' => 'Xx',
@@ -297,13 +295,6 @@ Lang::$translations = array(
 	'Delete' => 'Xx',
 	'You have no privileges to update this table.' => 'Xx.',
 
-	'E-mail' => 'Xx',
-	'From' => 'Xx',
-	'Subject' => 'Xx',
-	'Attachments' => 'Xx',
-	'Send' => 'Xx',
-	'%d e-mail(s) have been sent.' => array('%d xx.', '%d xx.'),
-
 	// data type descriptions
 	'Numbers' => 'Xx',
 	'Date and time' => 'Xx',
@@ -360,6 +351,11 @@ Lang::$translations = array(
 	'Check has been created.' => 'Xx.',
 	'Check has been altered.' => 'Xx.',
 	'Check has been dropped.' => 'Xx.',
+
+	'Loaded plugins' => 'Xx',
+	'%s must <a%s>return an array</a>.' => '%s xx <a%s>xx</a>.',
+	'<a%s>Configure</a> %s in %s.' => '<a%s>Xx</a> %s xx %s.',
+	'screenshot' => 'xx',
 );
 
 // run `php ../../lang.php xx` to update this file

adminer/lang/zh-tw.inc.php

@@ -292,13 +292,6 @@ Lang::$translations = array(
 	'Delete' => '刪除',
 	'You have no privileges to update this table.' => '您沒有許可權更新這個資料表。',
 
-	'E-mail' => '電子郵件',
-	'From' => '來自',
-	'Subject' => '主旨',
-	'Attachments' => '附件',
-	'Send' => '寄出',
-	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-
 	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',

adminer/lang/zh.inc.php

@@ -208,7 +208,6 @@ Lang::$translations = array(
 	'Alter indexes' => '修改索引',
 	'Add next' => '下一行插入',
 	'Index Type' => '索引类型',
-	// 'Column (length)' => '列（长度）',
 
 	'Foreign keys' => '外键',
 	'Foreign key' => '外键',
@@ -292,13 +291,6 @@ Lang::$translations = array(
 	'Delete' => '删除',
 	'You have no privileges to update this table.' => '您没有权限更新这个表。',
 
-	'E-mail' => '电子邮件',
-	'From' => '来自',
-	'Subject' => '主题',
-	'Attachments' => '附件',
-	'Send' => '发送',
-	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
-
 	// data type descriptions
 	'Numbers' => '数字',
 	'Date and time' => '日期时间',

adminer/procedure.inc.php

@@ -48,7 +48,7 @@ echo ($collations ? "<datalist id='collations'>" . optionlist($collations) . "</
 
 <form action="" method="post" id="form">
 <p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" data-maxlength="64" autocapitalize="off">
-<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
+<?php echo ($routine_languages ? "<label>" . lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "</label>\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <div class="scrollable">
 <table class="nowrap">

adminer/select.inc.php

@@ -54,7 +54,7 @@ if ($_GET["val"] && is_ajax()) {
 	exit;
 }
 
-$primary = $unselected = null;
+$primary = $unselected = array();
 foreach ($indexes as $index) {
 	if ($index["type"] == "PRIMARY") {
 		$primary = array_flip($index["columns"]);
@@ -271,6 +271,7 @@ if (!$columns && support("table")) {
 	echo "</form>\n";
 
 	$page = $_GET["page"];
+	$found_rows = null;
 	if ($page == "last") {
 		$found_rows = get_val(count_rows($TABLE, $where, $is_group, $group));
 		$page = floor(max(0, intval($found_rows) - 1) / $limit);
@@ -451,20 +452,20 @@ if (!$columns && support("table")) {
 							}
 						}
 
-						$val = select_value($val, $link, $field, $text_length);
+						$html = select_value($val, $link, $field, $text_length);
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
-						$value = idx(idx($_POST["val"], $unique_idf), bracket_escape($key));
-						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key] && !$field["generated"];
+						$posted = idx(idx($_POST["val"], $unique_idf), bracket_escape($key));
+						$editable = !is_array($row[$key]) && is_utf8($html) && $rows[$n][$key] == $row[$key] && !$functions[$key] && !$field["generated"];
 						$text = preg_match('~text|json|lob~', $field["type"]);
-						echo "<td id='$id'" . (preg_match(number_type(), $field["type"]) && ($val == '<i>NULL</i>' || is_numeric(strip_tags($val))) ? " class='number'" : "");
-						if (($_GET["modify"] && $editable) || $value !== null) {
-							$h_value = h($value !== null ? $value : $row[$key]);
+						echo "<td id='$id'" . (preg_match(number_type(), $field["type"]) && ($val === null || is_numeric(strip_tags($html))) ? " class='number'" : "");
+						if (($_GET["modify"] && $editable && $val !== null) || $posted !== null) {
+							$h_value = h($posted !== null ? $posted : $row[$key]);
 							echo ">" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>");
 						} else {
-							$long = strpos($val, "<i>…</i>");
+							$long = strpos($html, "<i>…</i>");
 							echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
 								. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
-								. ">$val"
+								. ">$html"
 							;
 						}
 					}
@@ -487,7 +488,6 @@ if (!$columns && support("table")) {
 		if (!is_ajax()) {
 			if ($rows || $page) {
 				$exact_count = true;
-				$found_rows = null;
 				if ($_GET["page"] != "last") {
 					if (!$limit || (count($rows) < $limit && ($rows || !$page))) {
 						$found_rows = ($page ? $page * $limit : 0) + count($rows);
@@ -584,7 +584,7 @@ if (!$columns && support("table")) {
 			}
 
 			if (adminer()->selectImportPrint()) {
-				echo "<div>";
+				echo "<p>";
 				echo "<a href='#import'>" . lang('Import') . "</a>";
 				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
 				echo "<span id='import'" . ($_POST["import"] ? "" : " class='hidden'") . ">: ";
@@ -592,7 +592,6 @@ if (!$columns && support("table")) {
 				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"]);
 				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
 				echo "</span>";
-				echo "</div>";
 			}
 
 			echo input_token();

adminer/sql.inc.php

@@ -20,6 +20,7 @@ if (!$error && $_POST["clear"]) {
 stop_session();
 
 page_header((isset($_GET["import"]) ? lang('Import') : lang('SQL command')), $error);
+$line_comment = '--' . (JUSH == 'sql' ? ' ' : '');
 
 if (!$error && $_POST) {
 	$fp = false;
@@ -51,11 +52,11 @@ if (!$error && $_POST) {
 			}
 		}
 
-		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
+		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|$line_comment)[^\n]*\n?|--\r?\n)";
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
-		$connection2 = connect(adminer()->credentials()); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
+		$connection2 = connect(); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
 		if ($connection2 && DB != "") {
 			$connection2->select_db(DB);
 			if ($_GET["ns"] != "") {
@@ -64,7 +65,7 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
-		$parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
+		$parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|' . $line_comment . '|$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
 		$total_start = microtime(true);
 		$adminer_export = get_settings("adminer_import"); // this doesn't offer SQL export so we match the import/export style at select
 		$dump_format = adminer()->dumpFormat();
@@ -72,10 +73,13 @@ if (!$error && $_POST) {
 
 		while ($query != "") {
 			if (!$offset && preg_match("~^$space*+DELIMITER\\s+(\\S+)~i", $query, $match)) {
-				$delimiter = $match[1];
+				$delimiter = preg_quote($match[1]);
 				$query = substr($query, strlen($match[0]));
+			} elseif (!$offset && JUSH == 'pgsql' && preg_match("~^($space*+COPY\\s+)[^;]+\\s+FROM\\s+stdin;~i", $query, $match)) {
+				$delimiter = "\n\\\\\\.\r?\n";
+				$offset = strlen($match[0]);
 			} else {
-				preg_match('(' . preg_quote($delimiter) . "\\s*|$parse)", $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match
+				preg_match("($delimiter\\s*|$parse)", $query, $match, PREG_OFFSET_CAPTURE, $offset); // always matches
 				list($found, $pos) = $match[0];
 				if (!$found && $fp && !feof($fp)) {
 					$query .= fread($fp, 1e5);
@@ -85,14 +89,15 @@ if (!$error && $_POST) {
 					}
 					$offset = $pos + strlen($found);
 
-					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
+					if ($found && !preg_match("(^$delimiter)", $found)) { // find matching quote or comment end
 						$c_style_escapes = driver()->hasCStyleEscapes() || (JUSH == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
 
-						$pattern = ($found == '/*' ? '\*/'
-							: ($found == '[' ? ']'
-							: (preg_match('~^-- |^#~', $found) ? "\n"
-							: preg_quote($found) . ($c_style_escapes ? "|\\\\." : "")))
-						);
+						$pattern =
+							($found == '/*' ? '\*/' :
+							($found == '[' ? ']' :
+							(preg_match("~^$line_comment|^#~", $found) ? "\n" :
+							preg_quote($found) . ($c_style_escapes ? '|\\\\.' : ''))))
+						;
 
 						while (preg_match("($pattern|\$)s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
 							$s = $match[0][0];
@@ -108,7 +113,7 @@ if (!$error && $_POST) {
 
 					} else { // end of a query
 						$empty = false;
-						$q = substr($query, 0, $pos);
+						$q = substr($query, 0, $pos + ($delimiter[0] == "\n" ? 3 : 0)); // 3 - pass "\n\\." to PostgreSQL COPY
 						$commands++;
 						$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)) {
@@ -271,7 +276,7 @@ if (!isset($_GET["import"]) && $history) {
 		list($q, $time, $elapsed) = $val;
 		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a>"
 			. " <span class='time' title='" . @date('Y-m-d', $time) . "'>" . @date("H:i:s", $time) . "</span>" // @ - time zone may be not set
-			. " <code class='jush-" . JUSH . "'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
+			. " <code class='jush-" . JUSH . "'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace("~^(#|$line_comment).*~m", '', $q)))), 80, "</code>")
 			. ($elapsed ? " <span class='time'>($elapsed)</span>" : "")
 			. "<br>\n"
 		;

adminer/static/dark.css

@@ -3,12 +3,13 @@
 html {
 	--bg: #002240;
 	--fg: #829bb0;
+	--dim: #154269;
 }
 
-a { color: #517fa8; }
-a:visited { color: #517fa8; }
+a { color: #618CB3; }
+a:visited { color: #618CB3; }
 a:link:hover, a:visited:hover { color: #9bc0e1; }
-h1 { border-color: #5e94c1; color: #ffddbf; background: #154269; }
+h1 { border-color: #5e94c1; color: #ffddbf; }
 h2 { border-color: #a3bdd3; color: #000; background: #3c678d; }
 table, td, th { border-color: #0e416d; }
 th { background: #11385a; }
@@ -37,7 +38,6 @@ input.required, input.maxlength { box-shadow: 1px 1px 1px red; }
 .icon:hover { background-color: #d1394e; }
 #menu { border-color: #a3bdd3; }
 #menu p, #logins, #tables { border-color: #326b9c; }
-#breadcrumb { background: #154269; }
 #h1 { color: #ffddbf; }
 #version { color: #d2b397; }
 #schema .table { border-color: #093459; }

adminer/static/default.css

@@ -3,6 +3,7 @@
 html {
 	--bg: #fff;
 	--fg: #000;
+	--dim: #eee;
 }
 
 body { color: var(--fg); background: var(--bg); font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; min-width: fit-content; }
@@ -11,7 +12,7 @@ a:visited { color: navy; }
 a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
 a.text:hover { text-decoration: none; }
 a.jush-help:hover { color: inherit; }
-h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
+h1 { font-size: 150%; margin: 0; padding: .8em .667em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: var(--dim); }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid var(--fg); font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: 1em 0 0; }
 form { margin: 0; }
@@ -19,16 +20,16 @@ td table { width: 100%; margin: 0; }
 table { margin: 1em 20px 0 0; font-size: 90%; border-spacing: 0; border-width: 1px 0 0 1px; }
 table, td, th { border-color: #999; border-style: solid; }
 td, th { border-width: 0 1px 1px 0; padding: .2em .3em; margin: 0; }
-th { background: #eee; text-align: left; }
+th { background: var(--dim); text-align: left; }
 thead { position: sticky; top: 0; }
 thead th { text-align: center; padding: .2em .5em; }
 thead td, thead th { background: #ddf; }
-fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8em .5em 0 0; border: 1px solid #999; }
+fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8em .5em 0 0; border: 1px solid #999; border-radius: 5px; }
 p { margin: .8em 20px 0 0; }
 img { vertical-align: middle; border: 0; }
 td img { max-width: 200px; max-height: 200px; }
-tbody tr:hover td, tbody tr:hover th { background: #eee; }
-code { font-size: 110%; padding: 1px 2px; background: #eee; }
+tbody tr:hover td, tbody tr:hover th { background: var(--dim); }
+code { font-size: 110%; padding: 1px 2px; background: var(--dim); }
 pre { margin: 1em 0 0; }
 td pre { margin: 0; }
 pre, textarea { font: 110%/1.25 monospace; }
@@ -66,16 +67,16 @@ input.wayoff { left: -1000px; position: absolute; }
 .sqlarea { width: 98%; }
 .sql-footer { margin-bottom: 2.5em; }
 .explain table { white-space: pre; }
-.icon { width: 18px; height: 18px; background-color: navy; border: 0; vertical-align: middle; }
+.icon { width: 18px; height: 18px; background: navy center no-repeat; border: 0; vertical-align: middle; }
 .icon span { display: none; }
 .icon:hover { background-color: red; }
 .size { width: 7ex; }
 .help { cursor: help; }
-.footer { position: sticky; bottom: 0; margin-right: -20px; border-top: 20px solid rgb(from var(--bg) r g b / .7); border-image: linear-gradient(rgb(from var(--bg) r g b / .2), var(--bg)) 100% 0; }
+.footer { position: sticky; bottom: 0; margin: 23px -20px .5em 0; box-shadow: 0 -5px 10px 10px var(--bg); }
 .footer > div { background: var(--bg); padding: 0 0 .5em; }
 .footer fieldset { margin-top: 0; }
 .links a { white-space: nowrap; margin-right: 20px; }
-.logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
+.logout { margin-top: .5em; position: absolute; top: 0; right: 0; background-color: var(--bg); box-shadow: 0 0 5px 5px var(--bg); }
 .loadmore { margin-left: 1ex; }
 /* .edit used in designs */
 #menu { position: absolute; margin: 10px 0 0; top: 2em; left: 0; width: 19em; }
@@ -87,13 +88,14 @@ input.wayoff { left: -1000px; position: absolute; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: -2.6em; left: 0; padding: .3em 1em; }
 #menuopen { display: none; }
-#breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
+#breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: var(--dim); height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
+#logo { vertical-align: baseline; margin-bottom: -3px; }
 #h1 { color: #777; text-decoration: none; font-style: italic; }
 #version { color: red; }
 #schema { margin-left: 60px; position: relative; user-select: none; -webkit-user-select: none; }
 #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }
-#help { position: absolute; border: 1px solid #999; background: #eee; padding: 5px; font-family: monospace; z-index: 1; }
+#help { position: absolute; border: 1px solid #999; background: var(--dim); padding: 5px; font-family: monospace; z-index: 1; }
 
 /* inlined here and not in compile.php because otherwise the development version flickers a little bit when loading the images */
 .icon-up { background-image: url(data:image/gif;base64,R0lGODlhEgASAIEAMe7u7gAAgJmZmQAAACH5BAEAAAEALAAAAAASABIAAQIghI+py+0PTQhRTgrvfRP0nmEVOIoReZphxbauAMfyHBcAOw==); }
@@ -113,16 +115,17 @@ input.wayoff { left: -1000px; position: absolute; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 .rtl pre, .rtl code { direction: ltr; }
 
-@media all and (max-width: 880px) {
+@media all and (max-width: 800px) {
 	.pages { left: auto; }
-	.logout { padding: 1em; top: 3em; }
-	#menu { width: auto; background: var(--bg); border: 1px solid var(--fg); }
-	#content { margin-left: 10px; }
+	.js .logout { top: 1.667em; background-color: var(--dim); box-shadow: 0 0 5px 5px var(--dim); }
+	#menu { position: static; width: auto; min-width: 23em; background: var(--bg); border: 1px solid var(--fg); margin-top: 9px; box-shadow: 0 0 20px -3px var(--fg); }
+	#content { margin-left: 10px !important; }
 	#lang { position: static; }
-	#breadcrumb { left: 48px; }
+	#breadcrumb { left: 48px !important; }
+	.js #foot { position: absolute; top: 2em; left: 0; }
 	.js .foot { display: none; }
 	.js #menuopen { display: block; position: absolute; top: 3px; left: 6px; }
-	.nojs .logout, .nojs #menu { position: static; }
+	.nojs #menu { position: static; }
 	.rtl .pages { right: auto; }
 	.rtl #content { margin-right: 10px; }
 	.rtl #breadcrumb { right: auto; }

adminer/static/editing.js

@@ -1,60 +1,64 @@
 'use strict'; // Adminer specific functions
 
+let autocompleter; // set in adminer.inc.php
+
 /** Load syntax highlighting
 * @param string first three characters of database system version
 * @param [string]
 */
 function syntaxHighlighting(version, vendor) {
-	if (window.jush) {
-		jush.create_links = 'target="_blank" rel="noreferrer noopener"';
-		if (version) {
-			for (let key in jush.urls) {
-				let obj = jush.urls;
-				if (typeof obj[key] != 'string') {
-					obj = obj[key];
-					key = 0;
-					if (vendor == 'maria') {
-						for (let i = 1; i < obj.length; i++) {
-							obj[i] = obj[i]
-								.replace('.html', '/')
-								.replace('-type-syntax', '-data-types')
-								.replace(/numeric-(data-types)/, '$1-$&')
-								.replace(/replication-options-(master|binary-log)\//, 'replication-and-binary-log-system-variables/')
-								.replace('server-options/', 'server-system-variables/')
-								.replace('innodb-parameters/', 'innodb-system-variables/')
-								.replace(/#(statvar|sysvar|option_mysqld)_(.*)/, '#$2')
-								.replace(/#sysvar_(.*)/, '#$1')
-							;
+	addEventListener('DOMContentLoaded', () => {
+		if (window.jush) {
+			jush.create_links = 'target="_blank" rel="noreferrer noopener"';
+			if (version) {
+				for (let key in jush.urls) {
+					let obj = jush.urls;
+					if (typeof obj[key] != 'string') {
+						obj = obj[key];
+						key = 0;
+						if (vendor == 'maria') {
+							for (let i = 1; i < obj.length; i++) {
+								obj[i] = obj[i]
+									.replace('.html', '/')
+									.replace('-type-syntax', '-data-types')
+									.replace(/numeric-(data-types)/, '$1-$&')
+									.replace(/replication-options-(master|binary-log)\//, 'replication-and-binary-log-system-variables/')
+									.replace('server-options/', 'server-system-variables/')
+									.replace('innodb-parameters/', 'innodb-system-variables/')
+									.replace(/#(statvar|sysvar|option_mysqld)_(.*)/, '#$2')
+									.replace(/#sysvar_(.*)/, '#$1')
+								;
+							}
 						}
 					}
-				}
 
-				obj[key] = (vendor == 'maria' ? obj[key].replace('dev.mysql.com/doc/mysql', 'mariadb.com/kb') : obj[key]) // MariaDB
-					.replace('/doc/mysql', '/doc/refman/' + version) // MySQL
-				;
-				if (vendor != 'cockroach') {
-					obj[key] = obj[key].replace('/docs/current', '/docs/' + version); // PostgreSQL
+					obj[key] = (vendor == 'maria' ? obj[key].replace('dev.mysql.com/doc/mysql', 'mariadb.com/kb') : obj[key]) // MariaDB
+						.replace('/doc/mysql', '/doc/refman/' + version) // MySQL
+					;
+					if (vendor != 'cockroach') {
+						obj[key] = obj[key].replace('/docs/current', '/docs/' + version); // PostgreSQL
+					}
+				}
+			}
+			if (window.jushLinks) {
+				jush.custom_links = jushLinks;
+			}
+			jush.highlight_tag('code', 0);
+			adminerHighlighter = els => jush.highlight_tag(els, 0);
+			for (const tag of qsa('textarea')) {
+				if (/(^|\s)jush-/.test(tag.className)) {
+					const pre = jush.textarea(tag, autocompleter);
+					if (pre) {
+						setupSubmitHighlightInput(pre);
+						tag.onchange = () => {
+							pre.textContent = tag.value;
+							pre.oninput();
+						};
+					}
 				}
 			}
 		}
-		if (window.jushLinks) {
-			jush.custom_links = jushLinks;
-		}
-		jush.highlight_tag('code', 0);
-		adminerHighlighter = els => jush.highlight_tag(els, 0);
-		for (const tag of qsa('textarea')) {
-			if (/(^|\s)jush-/.test(tag.className)) {
-				const pre = jush.textarea(tag);
-				if (pre) {
-					setupSubmitHighlightInput(pre);
-					tag.onchange = () => {
-						pre.textContent = tag.value;
-						pre.oninput();
-					};
-				}
-			}
-		}
-	}
+	});
 }
 
 /** Get value of dynamically created form field

compile.php

@@ -21,7 +21,7 @@ function remove_lang($match) {
 	$idf = strtr($match[2], array("\\'" => "'", "\\\\" => "\\"));
 	$s = (Adminer\Lang::$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_format(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]");
 }
@@ -84,8 +84,8 @@ function put_file($match) {
 			}
 		}
 	}
-	if (basename($match[2]) != "lang.inc.php" || !$_SESSION["lang"]) {
-		if (basename($match[2]) == "lang.inc.php") {
+	if (basename($match[2]) == "lang.inc.php") {
+		if (!$_SESSION["lang"]) {
 			$return = str_replace('function lang(string $idf, $number = null): string {', 'function lang($idf, $number = null) {
 	if (is_string($idf)) { // compiled version uses numbers, string comes from a plugin
 		// English translation is closest to the original identifiers //! pluralized translations are not found
@@ -97,29 +97,17 @@ function put_file($match) {
 			if (!$count) {
 				echo "lang() not found\n";
 			}
+		} else {
+			$return = preg_replace('~// not used in a single language version from here\n.*~s', '', $return);
+			$return = preg_replace_callback('~(\$pos = (.+\n).+;)~sU', function ($match) {
+				return "\$pos = $match[2]\t\t\t: " . (preg_match("~'$_SESSION[lang]'.* \\? (.+)\n~U", $match[1], $match2) ? $match2[1] : "1") . "\n\t\t);";
+			}, $return);
+			$return = str_replace('Lang::$translations[$idf] ?: $idf', '$idf', $return); // lang() is used only by old plugins
+			$return .= "define('Adminer\\LANG', '$_SESSION[lang]');\n";
 		}
-		$tokens = token_get_all($return); // to find out the last token
-		return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? "<?php" : "");
-	} elseif (preg_match('~\s*(\$pos = (.+\n).+;)~sU', $return, $match2)) {
-		// single language lang() is used for plural
-		return "function get_lang() {
-	return '$_SESSION[lang]';
-}
-
-function lang(\$translation, \$number = null) {
-	if (is_array(\$translation)) {
-		\$pos = $match2[2]\t\t\t: " . (preg_match("~'$_SESSION[lang]'.* \\? (.+)\n~U", $match2[1], $match3) ? $match3[1] : "1") . '
-		);
-		$translation = $translation[$pos];
-	}
-	$translation = str_replace("%d", "%s", $translation);
-	$number = format_number($number);
-	return sprintf($translation, $number);
-}
-';
-	} else {
-		echo "lang() \$pos not found\n";
 	}
+	$tokens = token_get_all($return); // to find out the last token
+	return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? "<?php" : "");
 }
 
 function lzw_compress($string) {
@@ -202,16 +190,19 @@ function get_translations($lang) {
 function minify_css($file) {
 	global $project;
 	if ($project == "editor") {
-		$file = preg_replace('~.*\.url\(.*~', '', $file);
+		$file = preg_replace('~\.icon-(up|down|plus|cross).*~', '', $file);
 	}
+	$file = preg_replace_callback('~url\((\w+\.(gif|png|jpg))\)~', function ($match) {
+		return "url(data:image/$match[2];base64," . base64_encode(file_get_contents(__DIR__ . "/adminer/static/$match[1]")) . ")"; // we don't have ME in *.css so we can only inline images
+	}, $file);
 	return lzw_compress(preg_replace('~\s*([:;{},])\s*~', '\1', preg_replace('~/\*.*?\*/\s*~s', '', $file)));
 }
 
 function minify_js($file) {
-	$file = preg_replace_callback("~'use strict';~", function ($match) { // keep only the first one
+	$file = preg_replace_callback("~'use strict';~", function ($match) {
 		static $count = 0;
 		$count++;
-		return ($count == 1 ? $match[0] : '');
+		return ($count == 1 ? $match[0] : ''); // keep only the first one
 	}, $file);
 	if (function_exists('jsShrink')) {
 		$file = jsShrink($file);
@@ -219,7 +210,8 @@ function minify_js($file) {
 	return lzw_compress($file);
 }
 
-function compile_file($match, $callback = '') { // $callback only to match signature
+// $callback only to match signature
+function compile_file($match, $callback = '') {
 	global $project;
 	$file = "";
 	list(, $filenames, $callback) = $match;
@@ -312,7 +304,12 @@ if ($vendor) {
 		}
 	}
 	if ($project != "editor" && count(Adminer\SqlDriver::$drivers) == 1) {
-		$file = str_replace('html_select("auth[driver]", SqlDriver::$drivers, DRIVER, "loginDriver(this);")', 'input_hidden("auth[driver]", "' . ($vendor == "mysql" ? "server" : $vendor) . '") . "' . reset(Adminer\SqlDriver::$drivers) . '"', $file, $count);
+		$file = str_replace(
+			'html_select("auth[driver]", SqlDriver::$drivers, DRIVER, "loginDriver(this);")',
+			'input_hidden("auth[driver]", "' . ($vendor == "mysql" ? "server" : $vendor) . '") . "' . reset(Adminer\SqlDriver::$drivers) . '"',
+			$file,
+			$count
+		);
 		if (!$count) {
 			echo "auth[driver] form field not found\n";
 		}
@@ -321,7 +318,7 @@ if ($vendor) {
 			$file = str_replace(");\n\t\techo \$this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name=\"auth[server]", ' . \'<input type="hidden" name="auth[server]"', $file);
 		}
 	}
-	$file = preg_replace('(;\s*../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($vendor == "mysql" ? "sql" : $vendor) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;\s*../externals/jush/modules/jush-(?!autocomplete-sql\.|textarea\.|txt\.|js\.|' . preg_quote($vendor == "mysql" ? "sql" : $vendor) . '\.)[^.]+.js)', '', $file);
 	$file = preg_replace_callback('~doc_link\(array\((.*)\)\)~sU', function ($match) use ($vendor) {
 		list(, $links) = $match;
 		$links = preg_replace("~'(?!(" . ($vendor == "mysql" ? "sql|mariadb" : $vendor) . ")')[^']*' => [^,]*,?~", '', $links);
@@ -333,17 +330,17 @@ if ($project == "editor") {
 	$file = preg_replace('~;.\.\/externals/jush/jush(-dark)?\.css~', '', $file);
 	$file = preg_replace('~compile_file\(\'\.\./(externals/jush/modules/jush\.js)[^)]+\)~', "''", $file);
 }
-$file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
+$file = preg_replace_callback("~(?<!>)lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 $file = preg_replace_callback('~\b(include|require) "([^"]*" . LANG . ".inc.php)";~', 'put_file_lang', $file);
 $file = str_replace("\r", "", $file);
 if ($_SESSION["lang"]) {
 	// single language version
-	$file = preg_replace_callback("~(<\\?php\\s*echo )?lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])(;\\s*\\?>)?~s", 'remove_lang', $file);
+	$file = preg_replace_callback("~(<\\?php\\s*echo )?(?<!>)lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])(;\\s*\\?>)?~s", 'remove_lang', $file);
 	$file = str_replace("switch_lang();", "", $file);
 	$file = str_replace('<?php echo LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('echo script_src("static/editing.js");' . "\n", "", $file); // merged into functions.js
-$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file); // merged into jush.js
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(autocomplete-sql|textarea|txt|js|" \. JUSH \. ")\.js", true\);~', '', $file); // merged into jush.js
 $file = preg_replace('~echo .*/jush(-dark)?.css\'>.*~', '', $file); // merged into default.css or dark.css
 if (function_exists('stripTypes')) {
 	$file = stripTypes($file);

designs/adminer-dark/README.md

@@ -0,0 +1,2 @@
+## Screenshot
+![screenshot](https://www.adminer.org/static/screenshots/dark.png)

designs/adminer-dark/adminer-dark.css

@@ -0,0 +1 @@
+/* Empty file named adminer-dark.css causes Adminer to switch to default dark mode. */

designs/brade/adminer.css

@@ -64,7 +64,7 @@ outline:0;background:url(//www.bradezone.com/random/adminer_logo.gif) no-repeat;
 * html #lang{padding-top:10px;height:30px}
 * html form#form{height:100%}
 #logins a,#tables a{background: none}
-.logout{color:#fff}
+.logout{color:#fff;background-color:#333;box-shadow:0 0 5px 5px #333;z-index:1}
 #logout{color:#333;text-decoration:none;border-bottom:1px dotted}
 #logout:hover{border-color:#333;background:#333;color:#fff}
 .js .column{background:#ddd}

designs/bueltge/adminer.css

@@ -317,6 +317,7 @@ font-size:10px;
 height: 23px;
 width: 255px;
 display: block;
+margin-top: -28px;
 padding: 1px 0;
 position: absolute;
 top: 0;

designs/esterka/adminer.css

@@ -240,6 +240,8 @@ th {
 
 .logout {
 	z-index: 2;
+	background-color: #f2eee1;
+	box-shadow: 0 0 5px 5px #f2eee1;
 }
 
 .js .column {

designs/galkaev/adminer-dark.css

@@ -692,6 +692,7 @@ legend{
 	padding: 0;
 	top: 0;
 	overflow-y: overlay;
+	z-index: 1;
 }
 
 #menu p {

designs/haeckel/adminer.css

@@ -42,7 +42,7 @@ html>/**/body .message, html>/**/body #menu p.message {
 
 /* Adminer logo */
 html>/**/body h1 {
-	background: #eee url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAMFBMVEXAwMD/////AAAATmEAAAAA%0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5w%2BL8AAAAAXRSTlMAQObYZgAAAAlwSFlz%0AAAALEgAACxIB0t1%2B/AAAAEVJREFUCJljYEAGjIKCAmCGoKKSIFhASFBQEcgFkoJCggyMwsaGQiA1%0AjIaCwoKKQkCGsbGxIEwErJcoBtAcqEWCgiguAADa1AZzThzIfQAAAABJRU5ErkJggg%3D%3D%0A") no-repeat 14px 7px;
+	background: #eee;
 	box-shadow: 0px 0px 3px rgba(0,0,0,0.30) !important;
 	font-size: 1em;
 	padding: 7px 6px 5px 35px;

designs/hever/adminer.css

@@ -6,8 +6,6 @@ Used Silk icon set 1.3 by Mark James - http://www.famfamfam.com/lab/icons/silk
 .error {background:#FFEEEE url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIsSURBVDjLpVNLSJQBEP7+h6uu62vLVAJDW1KQTMrINQ1vPQzq1GOpa9EppGOHLh0kCEKL7JBEhVCHihAsESyJiE4FWShGRmauu7KYiv6Pma+DGoFrBQ7MzGFmPr5vmDFIYj1mr1WYfrHPovA9VVOqbC7e/1rS9ZlrAVDYHig5WB0oPtBI0TNrUiC5yhP9jeF4X8NPcWfopoY48XT39PjjXeF0vWkZqOjd7LJYrmGasHPCCJbHwhS9/F8M4s8baid764Xi0Ilfp5voorpJfn2wwx/r3l77TwZUvR+qajXVn8PnvocYfXYH6k2ioOaCpaIdf11ivDcayyiMVudsOYqFb60gARJYHG9DbqQFmSVNjaO3K2NpAeK90ZCqtgcrjkP9aUCXp0moetDFEeRXnYCKXhm+uTW0CkBFu4JlxzZkFlbASz4CQGQVBFeEwZm8geyiMuRVntzsL3oXV+YMkvjRsydC1U+lhwZsWXgHb+oWVAEzIwvzyVlk5igsi7DymmHlHsFQR50rjl+981Jy1Fw6Gu0ObTtnU+cgs28AKgDiy+Awpj5OACBAhZ/qh2HOo6i+NeA73jUAML4/qWux8mt6NjW1w599CS9xb0mSEqQBEDAtwqALUmBaG5FV3oYPnTHMjAwetlWksyByaukxQg2wQ9FlccaK/OXA3/uAEUDp3rNIDQ1ctSk6kHh1/jRFoaL4M4snEMeD73gQx4M4PsT1IZ5AfYH68tZY7zv/ApRMY9mnuVMvAAAAAElFTkSuQmCC") no-repeat scroll 0.8em center; padding-left:38px;}
 .message, #menu p.message {background:#EEFFEE url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKfSURBVDjLpZPrS1NhHMf9O3bOdmwDCWREIYKEUHsVJBI7mg3FvCxL09290jZj2EyLMnJexkgpLbPUanNOberU5taUMnHZUULMvelCtWF0sW/n7MVMEiN64AsPD8/n83uucQDi/id/DBT4Dolypw/qsz0pTMbj/WHpiDgsdSUyUmeiPt2+V7SrIM+bSss8ySGdR4abQQv6lrui6VxsRonrGCS9VEjSQ9E7CtiqdOZ4UuTqnBHO1X7YXl6Daa4yGq7vWO1D40wVDtj4kWQbn94myPGkCDPdSesczE2sCZShwl8CzcwZ6NiUs6n2nYX99T1cnKqA2EKui6+TwphA5k4yqMayopU5mANV3lNQTBdCMVUA9VQh3GuDMHiVcLCS3J4jSLhCGmKCjBEx0xlshjXYhApfMZRP5CyYD+UkG08+xt+4wLVQZA1tzxthm2tEfD3JxARH7QkbD1ZuozaggdZbxK5kAIsf5qGaKMTY2lAU/rH5HW3PLsEwUYy+YCcERmIjJpDcpzb6l7th9KtQ69fi09ePUej9l7cx2DJbD7UrG3r3afQHOyCo+V3QQzE35pvQvnAZukk5zL5qRL59jsKbPzdheXoBZc4saFhBS6AO7V4zqCpiawuptwQG+UAa7Ct3UT0hh9p9EnXT5Vh6t4C22QaUDh6HwnECOmcO7K+6kW49DKqS2DrEZCtfuI+9GrNHg4fMHVSO5kE7nAPVkAxKBxcOzsajpS4Yh4ohUPPWKTUh3PaQEptIOr6BiJjcZXCwktaAGfrRIpwblqOV3YKdhfXOIvBLeREWpnd8ynsaSJoyESFphwTtfjN6X1jRO2+FxWtCWksqBApeiFIR9K6fiTpPiigDoadqCEag5YUFKl6Yrciw0VOlhOivv/Ff8wtn0KzlebrUYwAAAABJRU5ErkJggg==") no-repeat scroll 0.8em center; padding-left:38px;}
 
-h1 {background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gIECCYmDoJEqQAAA3lJREFUSMfVlm9olVUcxz/nPH/uvftzd29XWI21Su4spDk3gmU0vGC9sBdLhFlkpdELadibiMQ206CEoUYECWuLXgT9E00FC7FyYVGIxMgMg2c2rrfRNtu93P2793nOc04vTCGR6Op60Q8Ohx98OV++3+/h/I7gEyz+w5KLfeDxIaJnt0bqrvRisRVMPsk6I3jNkmJ0BvniTSsY6E86U5vFYwP9SQfg05bksdItzhoCLlT7+s2bIjjf4ybXn8u/J3zWrZrKxwC2bMsHXtQtGkFW2qb6hgl+3Ww1Jwr+x0aI0YOtiadX7KUIsHPXcqs1N3fCWOZhJXnJBqgfqrcmRlc2E0ktR6lGtIxj4WLwMWIaJ8gS2D/x+kdjVwhi0iyTkiVIMbLngZSCPACv7vo53LqJsfkaXrjzbSaFdVd3exhxe1GBh+2MIEUOFRRx8QlVFGklxIK+3dhOB8g41aU+th/MAeSetVrcUjigpThy5N7EG1u25YNvdlC17ILYPl1lBu8ZJGuHdvR5zMIh2n47RPd3fmZ/Rlxrx3DPsInt7j5cmnN7zKzbBewHaHw3PDvyHOsbZ+hd5edjQLDkj0gEUW6Nl6wUhFnB3Rvfx8hLhGEDjimi5TiWKSCERmkbQwLLakKbKIbfMWaM3R+89W+zstHCxpFDmYaLvwyfjyVJ1TYQ6Dh+KIk4CjssMBsZTz96esb7smM1vl5ZyWWwL2+z5Fpy0ONNA9PXRZ5KC8qBxnZlZU+FMArfymS/bkv8E9A7ed9tCJHBaFWZAiElUsb9ebGP3sddhCyCKWBCH9woopwgtGvQuogkizSyMgJtJCZyNL322z2e12xxsZwgTMapUZIFoQhVgcyBYjqSNt7xjtWosNIMQhB5DcAznyvg0l/r7xbhwWftN5CBlEqIxCbvi9aW2lfWRK4Hiu58pJYdXfcjrCeQlWaglTS2OEcY3TBDqom+DRItFJgSllWFRpZM6ONEPVTpNMJNVGiRIwkWfkivPfOh1+mZ9Km0mDhxh6vLs3KuTYR0f+9fRfdtzOCrCjMwWiNK+qrXnZ6h0ysv1gCyMaWjUPey91X7YY61/sjS1CRLmeehd3T9YL01MdoSQ9Y1Iu12lOqSVXqfroDg8sjc+1QTU8GDSLUCy74VjIsxGmFLLHyUGUcGZyK+OFnuP5CnYoL/06/i2voTrxlsuqTozDgAAAAASUVORK5CYII="); background-repeat:no-repeat; background-position:1em .82em; padding-left:2.3em;}
-
 #dbs span, th a[href*="&db="]:not([href*="&select="]):not([href*="&table="]) {background:transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC") no-repeat scroll left bottom; padding-left:22px;}
 
 .links a {margin-right:8px;}

designs/lucas-sandery/adminer.css

@@ -364,7 +364,7 @@ tbody tr:nth-child(n):hover th {
 }
 .icon {
 	width: 1.2em;
-	background: #4c3957 center no-repeat;
+	background-color: #4c3957;
 	background-size: 66%;
 }
 .icon-plus {
@@ -411,8 +411,10 @@ tbody tr:nth-child(n):hover th {
 	width: 2em;
 	height: 2em;
 	position: fixed;
+	box-shadow: none;
 }
 #lang {
+	top: 0;
 	left: 18em;
 }
 .rtl #lang {
@@ -497,7 +499,7 @@ button,
 	display: inline-block;
 	font-size: 85%;
 	text-align: center;
-	background: #4c3957;
+	background-color: #4c3957;
 	color: #fff;
 	padding: 0.5em 0.8em 0.6em;
 	margin: 0;
@@ -517,7 +519,7 @@ button:focus,
 .links a:link:focus,
 .links a:visited:focus {
 	color: #fff;
-	background: #ec5f12;
+	background-color: #ec5f12;
 	text-decoration: none;
 }
 input[type="submit"]:disabled,
@@ -691,10 +693,13 @@ input[type="file"]:disabled::file-selector-button {
 	margin-left: 0;
 }
 
-@media all and (max-width: 880px) {
+@media all and (max-width: 800px) {
 	body {
 		padding-bottom: 2em;
 	}
+	.js #menuopen {
+		left: 14px;
+	}
 	body,
 	#content,
 	#content > form:last-of-type,
@@ -710,7 +715,7 @@ input[type="file"]:disabled::file-selector-button {
 		width: auto;
 	}
 	#breadcrumb {
-		padding: 0 0 0 10px;
+		padding: 0 28px;
 		height: 2em;
 		line-height: 2em;
 		margin: 0 -10px;

designs/mancave/adminer-dark.css

@@ -726,6 +726,10 @@ legend{
 /* menu
    ----------------------------------------------------------------------- */
 
+#foot{
+	height: 100%;
+}
+
 #menu{
 	height: 100%;
 	width: 300px;
@@ -739,6 +743,7 @@ legend{
 	top: 0;
 	overflow-y: overlay;
     overflow-y: auto; /* needed for firefox 2017-03-05 */
+	z-index: 10;
 }
 
 #menu p {
@@ -1072,6 +1077,10 @@ body > form{
 	/*position: relative;*/
 }
 
+.logout{
+	z-index: 5000;
+}
+
 #lang {
     z-index: 5000;
     position: absolute;

designs/mvt/adminer.css

@@ -413,6 +413,8 @@ thead td abbr, thead td sup, thead th acronym, thead th sup {
 
 .logout {
 	top: 28px;
+	background-color: #31587d;
+	box-shadow: 0 0 3px 3px #31587d;
 }
 
 .js .column {

designs/nette/adminer.css

@@ -558,6 +558,8 @@ input[name="delete"]:hover, input[name="drop"]:hover {
 
 .logout {
 	color: #fff;
+	background-color: #333;
+	box-shadow: 0 0 4px 4px #333;
 	margin-top: 0.7em;
 }
 

designs/ng9/adminer.css

@@ -238,6 +238,8 @@ th {
 
 .logout {
 	z-index: 5;
+	background-color: #f2eee1;
+	box-shadow: 0 0 4px 4px #f2eee1;
 }
 
 .js .column {

designs/nicu/adminer.css

@@ -28,7 +28,7 @@ h1 {
     font-size: 150%;
     font-weight: normal;
     margin: 0;
-    padding: .8em .7em;
+    padding: 1.6em .7em 0;
     color: #f44;
     border-bottom: 0 solid #999;
     background: transparent;
@@ -368,7 +368,7 @@ td.nowrap {
     right: 0;
     left: auto;
 }
-@media all and (max-width: 880px) {
+@media all and (max-width: 800px) {
     .pages {
         left: auto;
     }

designs/pappu687/adminer.css

@@ -318,6 +318,8 @@ input[name=logout]:hover {
 .logout {
 	position: fixed;
 	z-index:3;
+	background-color: #48A5BF;
+	box-shadow: 0 0 4px 4px #48A5BF;
 }
 
 .logout form {

designs/pepa-linha/adminer.css

@@ -237,10 +237,7 @@ p code + a:visited:hover {
 }
 
 #menu h1 {
-	background: none left top no-repeat;
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAAyCAIAAABgVkRrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA0RDI5NkM5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA0RDI5NkQ5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MDREMjk2QTlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1MDREMjk2QjlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnG4emkAAASXSURBVHja7Fk9aNtAFL6EDKKUoqGDySRKB1FC8dDBdCgeOmQoIUMG0yGE0EFT8dDBUwidPJQQQgcNpYROGjKI0sFDB9GhaMhgSgcPpWgqHjqYYsINJfQ7PfV0tmX9JI4Sgx+HI8f26bt3733fe6elIf/LbqwdHbJWS1wYBrMstrXJVg36ZJnNhQWBWMB9k+215gq3tDeHBH3pRseJtC8ee2ezEzd62+ncDH/DhS+ttC88qbMPDntaj952uyvXD3q7ETvyyE77pq5HFz9614r7V8C2GnBezBgp9tGNl3ffzIjvwZ9B//dA7Mz3YPLTyl29UhE+MI0KW9YKh2yjwQZichEAjsNu6WlUqNqkvwHUO+0BJeD2gn4hJFXTwAIw6jUzYxlwHkCTvWqy1+0Ct7FtsPh/3Ofc9brOJ5+8ezHr9gKMcGpWf2SK8bhKk48sA1kIOiODmzc2c8U0DLrzwhI5ypjA3fsZtNrOgPP4y5pmGJXamqHd1kQMTIkENYpwEfQHEW7GsGkYZse393ewb+Y9IwE0PJcOejQ2pFgK3Li3BI14hZM269XKaiXPVPodHUOs6l48o/+t5wO038OcQGztHzd31uPfUEgQdCQi3JkfumLLHa9LoK2tunPQtJ6v5wQ9zWoPzebupms34QKxmZNJAugIDzJE+V4rbTrDSMYtr3AD+H5WFIfZ0lIFPu50otiF7zfW2dlgquKccTFWRxYQ8wlFJOVTdc2gAChq/V99vxdgD7O5CIBO/Yi/P3vsUY2dOOxBdSrzIBm2dxJwq+hlaiId9dua5OlEv/IhH0vKvAYXfvUjvUTFB2STeinJu91Oxo3Eh58onwRXcB7zWkGj/Maa9203+9soPIyWEKBEkQdc8veo+sS4wQkYzV1Bi+A1Ee5DnhO33BxsSw1/wszGPHkXmqI7yIQzPvnvhPqEFjAWtSq7j7n2YplwSctVV8F/FXazbN76nQXu68btfe3Odmqwahl5Ca6tel0UVdnVc6pRBX/JkrgYn0RCY0cdAMhYvGYxHbEklbJ++FoqD8LTUiwTlZLEha55WKOmSybWTCXD1eJG8dnc4XAYqmdgmoRFyp/ZqqHbgMiD8qGXZeAOs1RD9YyhBgBVTgL3cMTHwKd2xyUL50qmTI5p/oK/F7jnEjeycLZTFz02SrKlaSPGbe0fOx+9mbTGcMHhe/fwuFMGn4Dy7BMPA3oBGkZrbIDgcp9JgK37YYtZjmSuqApH9yPRcTp+TM939THOpkaYroMguRuSE14tbuegif11vS58poYm7i1vn6fdxF6hMoNk4leIvTJ0B1FhPQ/PxM45eZ2HGjkY8jHXqptghGJJqqmKVHn1oCr4k93xgr8XuOcZ9zmf7dQym68Et6QFcFaBk7EsQ5fdfuteHW7xPM3asyVh05EkxFJITMHuGDUCukxwvOz3YI31mtWoX7TRXkrDjQhBLeFOHBtQQ6n/f8TDlAd/6mNBP7xO7Ecbz2qNjfrl6qoU3Mr5Qa4j9yyLHqZd7jwjL241QQFdPiJTdT7RsBuapslzi5mqVSHcKXYetcZlSelU3P8EGADW25uhkIE0mQAAAABJRU5ErkJggg==);
 	line-height: 50px;
-	padding-left: 50px;
 	padding-top: 9px;
 	text-transform: lowercase;
 	margin: 25px 0 10px 16px;

designs/pokorny/adminer.css

@@ -36,10 +36,9 @@ html>/**/body #dump {
 }
 /* Modified adminer logo */
 html>/**/body h1 {
-    background: #eee url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpFMEMzMjFEREIzNENFMTExOTE4QkYwQjc5MjcxNEMzNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOUM1RjA3QTRENkIxMUUxODFCNkVBNEZGMDk2NUJEMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOUM1RjA3OTRENkIxMUUxODFCNkVBNEZGMDk2NUJEMSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpFM0MzMjFEREIzNENFMTExOTE4QkYwQjc5MjcxNEMzNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpFMEMzMjFEREIzNENFMTExOTE4QkYwQjc5MjcxNEMzNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ph6vyIoAAAJsSURBVHjalFNNaxNRFD3z0Uxm2iRtGhVdBOxOcFkESQ2GNoXgwk1X/Q9uxB+QRf6CP6HQbQs1UFqisREhG4MYJVlEiyR2IM4kZjL5mJnnfZOMpAsFH5y5dz7OefeeuU8AECIs5XK5p6Io3nFdV2aMiRyHh4fPMF+CIPDA+GV/f/95sVg8onTK78OEWDabfaHrOmu1WqxerzPbHrHBYMjY5iZF248c06nHDMP4wTkEVaQLh+R5nuQ4Dnq9HpLJJBxniuXHaRin5+DPB6Uy7HIF8sMHoOqEVCrFNxY4mdcm8ZIXSsVKJgPz7NzPi6cXflTTKUzfvffzSqXiLQoIXNVvkvlt0o4lrO5s+23ndrf8aJdnQnt7ey8DnhiYRKV/yufzpWq1ioODA4zHY+gnJ1jb3cFkYtO9TRVsod83h9TS54AnB0ksFrtfKBQylmXBtm202x1sbGzgV+k1VGqL/hBGFxVEJUmTZfkeUd5cE+ArMLHb7VLu4sPHL7DpmaIqiK+tIrG+jhuJxCIFIv61BAbXc6h7F55AYLP8PwTIOsGbgYvMsbikYBLj8bjSaDRuUX6Xt9But/H921eYug7LMGH9NDGg+Oro+G2z2TzudDqXfBL/eBCJRK6ZyD3QidSzLciKiOUVFdFoBOkn249qtdoZUS4WTWTD4dC7bqKDK8NAb2JB0UJYZVGIMoOmKXwDNzgX4jxhRPyLH2zBhxlM0xQCnjw/THESCNH/5fOAUCjktyApKrRRH6Ii+C1omgpJFrnAEucQulzpNiEZDoczNMY36ThL8zENxtw/HzRIjKJHcOm7q9FoVKJXl78FGAAi7FBT6eTVegAAAABJRU5ErkJggg==") no-repeat 14px center;
     box-shadow: 0px 0px 3px rgba(0,0,0,0.30) !important;
     font-size: 1em;
-    padding: 6px 6px 5px 35px;
+    padding: 6px 6px 5px 1em;
 }
 /* Logout */
 html>/**/body input[name="logout"], #logout {