Release 4.16.0

https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-string-syntax#use-trustservercertificate

.editorconfig

@@ -5,7 +5,6 @@ root = true
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-trim_trailing_whitespace = true
 
 [*.{php,css,js}]
 indent_style = tab

.gitattributes

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

.gitignore

@@ -2,5 +2,3 @@
 /adminer*.php
 /editor*.php
 /vendor/
-/composer.lock
-/temp

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "designs/hydra"]
+[submodule "jush"]
-	path = designs/hydra
+	path = externals/jush
-	url = https://github.com/Niyko/Hydra-Dark-Theme-for-Adminer
+	url = https://github.com/vrana/jush
-[submodule "designs/pepa-linha-dark"]
+[submodule "JsShrink"]
-	path = designs/pepa-linha-dark
+	path = externals/JsShrink
-	url = https://github.com/pepa-linha/Adminer-Design-Dark/
+	url = https://github.com/vrana/JsShrink

.travis.yml

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

LICENSE

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

README.md

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

SECURITY.md

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

adminer/call.inc.php

@@ -32,7 +32,7 @@ if (!$error && $_POST) {
 	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
 	$start = microtime(true);
 	$result = $connection->multi_query($query);
-	$affected = $connection->affected_rows; // getting warnigns overwrites this
+	$affected = $connection->affected_rows; // getting warnings overwrites this
 	echo $adminer->selectQuery($query, $start, !$result);
 	
 	if (!$result) {

adminer/create.inc.php

@@ -49,12 +49,9 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 				if (!$field["has_default"]) {
 					$field["default"] = null;
 				}
-				if ($key == $row["auto_increment_col"]) {
-					$field["auto_increment"] = true;
-				}
 				$process_field = process_field($field, $type_field);
 				$all_fields[] = array($field["orig"], $process_field, $after);
-				if (!$orig_field || $process_field != process_field($orig_field, $orig_field)) {
+				if (!$orig_field || $process_field !== process_field($orig_field, $orig_field)) {
 					$fields[] = array($field["orig"], $process_field, $after);
 					if ($field["orig"] != "" || $after) {
 						$use_all_fields = true;
@@ -89,14 +86,14 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 				}, ARRAY_FILTER_USE_KEY);
 
 				foreach ($params["partition_names"] as $key => $name) {
-					if ($name === "") {
+					if ($name == "") {
 						unset($params["partition_names"][$key]);
 						unset($params["partition_values"][$key]);
 					}
 				}
 
 				if ($params != get_partitions_info($TABLE)) {
-					$partitions = [];
+					$partitions = array();
 					if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
 						foreach ($params["partition_names"] as $key => $name) {
 							$value = $params["partition_values"][$key];
@@ -105,11 +102,11 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 					}
 
 					// $params["partition"] can be expression, not only column
-					$partitioning .= "\nPARTITION BY {$params["partition_by"]}({$params["partition"]})";
+					$partitioning .= "\nPARTITION BY $params[partition_by]($params[partition])";
 					if ($partitions) {
 						$partitioning .= " (" . implode(",", $partitions) . "\n)";
 					} elseif ($params["partitions"]) {
-						$partitioning .= " PARTITIONS " . (int)$params["partitions"];
+						$partitioning .= " PARTITIONS " . (+$params["partitions"]);
 					}
 				}
 			} elseif (preg_match("~partitioned~", $table_status["Create_options"])) {
@@ -181,8 +178,7 @@ foreach ($engines as $engine) {
 <form action="" method="post" id="form">
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
-<?php echo lang('Table name'); ?>: <input name="name" data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php echo lang('Table name'); ?>: <input name="name"<?php echo ($TABLE == "" && !$_POST ? " autofocus" : ""); ?> data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php if ($TABLE == "" && !$_POST) { echo script("focus(qs('#form')['name']);"); } ?>
 <?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
  <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
@@ -199,6 +195,7 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
 </div>
 <p>
 <?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
+<?php echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : adminer_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
 <?php
 $comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
 echo (support("comment")

adminer/database.inc.php

@@ -59,14 +59,13 @@ if ($_POST) {
 <p>
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
-	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
+	? '<textarea autofocus name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input name="name" id="name" value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
+	: '<input name="name" autofocus value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
 	'sql' => "charset-charsets.html",
 	'mariadb' => "supported-character-sets-and-collations/",
 	'mssql' => "ms187963.aspx",
 )) : "");
-echo script("focus(qs('#name'));");
 ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php

adminer/db.inc.php

@@ -59,13 +59,9 @@ if ($adminer->homepage()) {
 				echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'>";
 				echo script("qsl('input').onkeydown = partialArg(bodyKeydown, 'search');", "");
 				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
-				if ($adminer->operator_regexp !== null) {
-					echo "<p><label><input type='checkbox' name='regexp' value='1'" . (empty($_POST['regexp']) ? '' : ' checked') . '>' . lang('as a regular expression') . '</label>';
-					echo doc_link(['sql' => 'regexp.html', 'pgsql' => 'functions-matching.html#FUNCTIONS-POSIX-REGEXP', 'elastic' => "regexp-syntax.html"]) . "</p>\n";
-				}
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
-					$_GET["where"][0]["op"] = $adminer->operator_regexp !== null && !empty($_POST['regexp']) ? $adminer->operator_regexp : $adminer->operator_like;
+					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
 					search_tables();
 				}
 			}
@@ -163,7 +159,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
 			$routines = routines();
 			if ($routines) {
-				echo "<table>\n";
+				echo "<table cellspacing='0'>\n";
 				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td></thead>\n";
 				odd('');
 				foreach ($routines as $row) {
@@ -186,7 +182,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='sequences'>" . lang('Sequences') . "</h3>\n";
 			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema() ORDER BY sequence_name");
 			if ($sequences) {
-				echo "<table>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
 				odd('');
 				foreach ($sequences as $val) {
@@ -201,7 +197,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='user-types'>" . lang('User types') . "</h3>\n";
 			$user_types = types();
 			if ($user_types) {
-				echo "<table>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
 				odd('');
 				foreach ($user_types as $val) {
@@ -216,7 +212,7 @@ if ($adminer->homepage()) {
 			echo "<h3 id='events'>" . lang('Events') . "</h3>\n";
 			$rows = get_rows("SHOW EVENTS");
 			if ($rows) {
-				echo "<table>\n";
+				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "<td>" . lang('Schedule') . "<td>" . lang('Start') . "<td>" . lang('End') . "<td></thead>\n";
 				foreach ($rows as $row) {
 					echo "<tr>";

adminer/drivers/mongo.inc.php

@@ -24,7 +24,7 @@ if (isset($_GET["mongo"])) {
 					$this->error = $e->getMessage();
 				}
 			}
-
+			
 			function query($query) {
 				return false;
 			}
@@ -109,7 +109,7 @@ if (isset($_GET["mongo"])) {
 
 		class Min_Driver extends Min_SQL {
 			public $primary = "_id";
-
+			
 			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 				$select = ($select == array("*")
 					? array()
@@ -127,7 +127,7 @@ if (isset($_GET["mongo"])) {
 					->skip($page * $limit)
 				);
 			}
-
+			
 			function insert($table, $set) {
 				try {
 					$return = $this->_conn->_db->selectCollection($table)->insert($set);
@@ -206,7 +206,6 @@ if (isset($_GET["mongo"])) {
 		}
 
 		$operators = array("=");
-		$operator_regexp = null;
 
 	} elseif (class_exists('MongoDB\Driver\Manager')) {
 		class Min_DB {
@@ -218,9 +217,9 @@ if (isset($_GET["mongo"])) {
 			function connect($uri, $options) {
 				$class = 'MongoDB\Driver\Manager';
 				$this->_link = new $class($uri, $options);
-				$this->executeCommand('admin', array('ping' => 1));
+				$this->executeCommand($options["db"], array('ping' => 1));
 			}
-
+			
 			function executeCommand($db, $command) {
 				$class = 'MongoDB\Driver\Command';
 				try {
@@ -230,7 +229,7 @@ if (isset($_GET["mongo"])) {
 					return array();
 				}
 			}
-
+			
 			function executeBulkWrite($namespace, $bulk, $counter) {
 				try {
 					$results = $this->_link->executeBulkWrite($namespace, $bulk);
@@ -400,7 +399,7 @@ if (isset($_GET["mongo"])) {
 		function get_databases($flush) {
 			global $connection;
 			$return = array();
-			foreach ($connection->executeCommand('admin', array('listDatabases' => 1)) as $dbs) {
+			foreach ($connection->executeCommand($connection->_db_name, array('listDatabases' => 1)) as $dbs) {
 				foreach ($dbs->databases as $db) {
 					$return[] = $db->name;
 				}
@@ -464,8 +463,6 @@ if (isset($_GET["mongo"])) {
 									"insert" => 1,
 									"select" => 1,
 									"update" => 1,
-									"where" => 1,
-									"order" => 1,
 								),
 							);
 						}
@@ -483,7 +480,11 @@ if (isset($_GET["mongo"])) {
 		}
 
 		function sql_query_where_parser($queryWhere) {
-			$queryWhere = preg_replace('~^\sWHERE \(?\(?(.+?)\)?\)?$~', '\1', $queryWhere);
+			$queryWhere = preg_replace('~^\s*WHERE\s*~', "", $queryWhere);
+			while ($queryWhere[0] == "(") {
+				$queryWhere = preg_replace('~^\((.*)\)$~', "$1", $queryWhere);
+			}
+
 			$wheres = explode(' AND ', $queryWhere);
 			$wheresOr = explode(') OR (', $queryWhere);
 			$where = array();
@@ -578,8 +579,7 @@ if (isset($_GET["mongo"])) {
 			"(date)>=",
 			"(date)<=",
 		);
-
+	
-		$operator_regexp = 'regex';
 	}
 
 	function table($idf) {
@@ -629,6 +629,11 @@ if (isset($_GET["mongo"])) {
 		global $adminer;
 		$connection = new Min_DB;
 		list($server, $username, $password) = $adminer->credentials();
+
+		if ($server == "") {
+			$server = "localhost:27017";
+		}
+
 		$options = array();
 		if ($username . $password != "") {
 			$options["username"] = $username;
@@ -736,13 +741,11 @@ if (isset($_GET["mongo"])) {
 	}
 
 	function driver_config() {
-		global $operators, $operator_regexp;
+		global $operators;
 		return array(
 			'possible_drivers' => array("mongo", "mongodb"),
 			'jush' => "mongo",
 			'operators' => $operators,
-			'operator_like' => "LIKE %%", // TODO: LIKE operator is not listed in operators.
-			'operator_regexp' => $operator_regexp,
 			'functions' => array(),
 			'grouping' => array(),
 			'edit_functions' => array(array("json")),

adminer/drivers/mssql.inc.php

@@ -24,8 +24,15 @@ if (isset($_GET["mssql"])) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-				$db = $adminer->database();
 				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
+				$ssl = $adminer->connectSsl();
+				if (isset($ssl["Encrypt"])) {
+					$connection_info["Encrypt"] = $ssl["Encrypt"];
+				}
+				if (isset($ssl["TrustServerCertificate"])) {
+					$connection_info["TrustServerCertificate"] = $ssl["TrustServerCertificate"];
+				}
+				$db = $adminer->database();
 				if ($db != "") {
 					$connection_info["Database"] = $db;
 				}
@@ -40,7 +47,8 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function quote($string) {
-				return "'" . str_replace("'", "''", $string) . "'";
+				$unicode = strlen($string) != strlen(utf8_decode($string));
+				return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
 			}
 
 			function select_db($database) {
@@ -163,7 +171,8 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function quote($string) {
-				return "'" . str_replace("'", "''", $string) . "'";
+				$unicode = strlen($string) != strlen(utf8_decode($string));
+				return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
 			}
 
 			function select_db($database) {
@@ -301,6 +310,11 @@ if (isset($_GET["mssql"])) {
 		global $adminer;
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
+
+		if ($credentials[0] == "") {
+			$credentials[0] = "localhost:1433";
+		}
+
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			return $connection;
 		}
@@ -387,7 +401,7 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 				"null" => $row["is_nullable"],
 				"auto_increment" => $row["is_identity"],
 				"collation" => $row["collation_name"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				"primary" => $row["is_identity"], //! or indexes.is_primary_key
 				"comment" => $comments[$row["name"]],
 			);
@@ -432,7 +446,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function error() {
 		global $connection;
-		return nl2br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
+		return nl_br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
 	}
 
 	function create_database($db, $collation) {
@@ -539,7 +553,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function foreign_keys($table) {
 		$return = array();
-		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
+		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table) . ", @fktable_owner = " . q(get_schema())) as $row) {
 			$foreign_key = &$return[$row["FK_NAME"]];
 			$foreign_key["db"] = $row["PKTABLE_QUALIFIER"];
 			$foreign_key["table"] = $row["PKTABLE_NAME"];
@@ -630,13 +644,6 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 		return array();
 	}
 
-	/**
-	 * @return bool
-	 */
-	function is_strict_mode() {
-		return false;
-	}
-
 	function is_c_style_escapes() {
 		return true;
 	}
@@ -675,7 +682,6 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 			'structured_types' => $structured_types,
 			'unsigned' => array(),
 			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"),
-			'operator_like' => "LIKE %%",
 			'functions' => array("len", "lower", "round", "upper"),
 			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
 			'edit_functions' => array(

adminer/drivers/mysql.inc.php

@@ -14,19 +14,12 @@ if (!defined("DRIVER")) {
 
 			function connect($server = "", $username = "", $password = "", $database = null, $port = null, $socket = null) {
 				global $adminer;
-				mysqli_report(MYSQLI_REPORT_OFF);
+				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
-
 				$ssl = $adminer->connectSsl();
-				if (isset($ssl['key']) || isset($ssl['cert']) || isset($ssl['ca'])) {
+				if ($ssl) {
-					$this->ssl_set(
+					$this->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca'], '', '');
-						isset($ssl['key']) ? $ssl['key'] : null,
-						isset($ssl['cert']) ? $ssl['cert'] : null,
-						isset($ssl['ca']) ? $ssl['ca'] : null,
-						null, null
-					);
 				}
-
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
@@ -34,7 +27,7 @@ if (!defined("DRIVER")) {
 					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
 					(!is_numeric($port) ? $port : $socket),
-					($ssl ? MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT : 0)
+					($ssl ? (empty($ssl['cert']) ? 2048 : 64) : 0) // 2048 - MYSQLI_CLIENT_SSL, 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
 				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
@@ -241,28 +234,33 @@ if (!defined("DRIVER")) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-
+				$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
-				$dsn = "mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server));
-
-				$options = [PDO::MYSQL_ATTR_LOCAL_INFILE => false];
 				$ssl = $adminer->connectSsl();
-				if (isset($ssl['key'])) {
+				if ($ssl) {
-					$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+					if (!empty($ssl['key'])) {
+						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+					}
+					if (!empty($ssl['cert'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+					}
+					if (!empty($ssl['ca'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
+					}
+					if (!empty($ssl['verify'])) {
+						$options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $ssl['verify'];
+					}
 				}
-				if (isset($ssl['cert'])) {
+				$this->dsn(
-					$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)),
-				}
+					$username,
-				if (isset($ssl['ca'])) {
+					$password,
-					$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
+					$options
-				}
+				);
-
-				$this->dsn($dsn, $username, $password, $options);
-
 				return true;
 			}
 
 			function set_charset($charset) {
-				$this->query("SET NAMES $charset");
+				$this->query("SET NAMES $charset"); // charset in DSN is ignored before PHP 5.3.6
 			}
 
 			function select_db($database) {
@@ -321,8 +319,8 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-		function convertSearch($idf, array $where, array $field) {
+		function convertSearch($idf, $val, $field) {
-			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $where['val'])
+			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val'])
 				? "CONVERT($idf USING " . charset($this->_conn) . ")"
 				: $idf
 			);
@@ -371,16 +369,21 @@ if (!defined("DRIVER")) {
 	* @return mixed Min_DB or string for error
 	*/
 	function connect() {
-		global $adminer, $types, $structured_types;
+		global $adminer, $types, $structured_types, $edit_functions;
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
-			$connection->set_charset(charset($connection));
+			$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
 			$connection->query("SET sql_quote_show_create = 1, autocommit = 1");
 			if (min_version('5.7.8', 10.2, $connection)) {
 				$structured_types[lang('Strings')][] = "json";
 				$types["json"] = 4294967295;
 			}
+			if (min_version('', 10.7, $connection)) {
+				$structured_types[lang('Strings')][] = "uuid";
+				$types["uuid"] = 128;
+				$edit_functions[0]['uuid'] = 'uuid';
+			}
 			return $connection;
 		}
 		$return = $connection->error;
@@ -502,7 +505,7 @@ if (!defined("DRIVER")) {
 	function table_status($name = "", $fast = false) {
 		$return = array();
 		foreach (get_rows($fast && min_version(5)
-			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, CREATE_OPTIONS AS Create_options, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
+			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
 			: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
 		) as $row) {
 			if ($row["Engine"] == "InnoDB") {
@@ -513,6 +516,8 @@ if (!defined("DRIVER")) {
 				$row["Comment"] = "";
 			}
 			if ($name != "") {
+				// MariaDB: Table name is returned as lowercase on macOS, so we fix it here.
+				$row["Name"] = $name;
 				return $row;
 			}
 			$return[$row["Name"]] = $row;
@@ -556,7 +561,7 @@ if (!defined("DRIVER")) {
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
 				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
 				"collation" => $row["Collation"],
-				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])) + ["where" => 1, "order" => 1],
+				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
 				"comment" => $row["Comment"],
 				"primary" => ($row["Key"] == "PRI"),
 				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
@@ -1061,26 +1066,15 @@ if (!defined("DRIVER")) {
 		return get_key_vals("SHOW VARIABLES");
 	}
 
-	/**
+	/** Checks if C-style escapes are supported
-	 * @return bool
+	* @return bool
-	 */
+	*/
-	function is_strict_mode() {
-		static $strictMode = null;
-
-		if ($strictMode === null) {
-			$strictMode = (bool)preg_match('~STRICT_(TRANS|ALL)_TABLES~', get_key_vals("SHOW VARIABLES LIKE 'sql_mode'")["sql_mode"]);
-		}
-
-		return $strictMode;
-	}
-
 	function is_c_style_escapes() {
 		static $c_style = null;
-
 		if ($c_style === null) {
-			$c_style = strpos(get_key_vals("SHOW VARIABLES LIKE 'sql_mode'")["sql_mode"], 'NO_BACKSLASH_ESCAPES') === false;
+			$variables = get_key_vals("SHOW VARIABLES LIKE 'sql_mode'");
+			$c_style = strpos($variables["sql_mode"], 'NO_BACKSLASH_ESCAPES') === false;
 		}
-
 		return $c_style;
 	}
 
@@ -1124,7 +1118,7 @@ if (!defined("DRIVER")) {
 			$return = "UNHEX($return)";
 		}
 		if ($field["type"] == "bit") {
-			$return = "CONV($return, 2, 10) + 0";
+			$return = "CONVERT(b$return, UNSIGNED)";
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
 			$prefix = (min_version(8) ? "ST_" : "");
@@ -1188,9 +1182,7 @@ if (!defined("DRIVER")) {
 			'structured_types' => $structured_types,
 			'unsigned' => array("unsigned", "zerofill", "unsigned zerofill"), ///< @var array number variants
 			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"), ///< @var array operators used in select
-			'operator_like' => "LIKE %%",
+			'functions' => array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
-			'operator_regexp' => 'REGEXP',
-			'functions' => array("char_length", "date", "from_unixtime", "unix_timestamp", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
 			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"), ///< @var array grouping functions used in select
 			'edit_functions' => array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
 				array(

adminer/drivers/oracle.inc.php

@@ -167,14 +167,7 @@ if (isset($_GET["oracle"])) {
 		}
 	}
 
-	/**
+
-	 * @param string $hostPath
-	 * @return bool
-	 */
-	function is_server_host_valid($hostPath) {
-		// EasyConnect host+path format: host[/[service_name][:server_type][/instance_name]]
-		return (bool)preg_match('~^[^/]+(/([^/:]+)?(:[^/:]+)?(/[^/:]+)?)?$~', $hostPath);
-	}
 
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
@@ -195,7 +188,12 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT tablespace_name FROM user_tablespaces ORDER BY 1");
+		return get_vals("SELECT DISTINCT tablespace_name FROM (
+SELECT tablespace_name FROM user_tablespaces
+UNION SELECT tablespace_name FROM all_tables WHERE tablespace_name IS NOT NULL
+)
+ORDER BY 1"
+		);
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -304,7 +302,7 @@ ORDER BY 1"
 				"null" => ($row["NULLABLE"] == "Y"),
 				//! "auto_increment" => false,
 				//! "collation" => $row["CHARACTER_SET_NAME"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				//! "comment" => $row["Comment"],
 				//! "primary" => ($row["Key"] == "PRI"),
 			);
@@ -486,13 +484,6 @@ AND c_src.TABLE_NAME = " . q($table);
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
 
-	/**
-	 * @return bool
-	 */
-	function is_strict_mode() {
-		return false;
-	}
-
 	function is_c_style_escapes() {
 		return true;
 	}
@@ -540,8 +531,7 @@ ORDER BY PROCESS
 			'types' => $types,
 			'structured_types' => $structured_types,
 			'unsigned' => array(),
-			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"),
-			'operator_like' => "LIKE %%",
 			'functions' => array("length", "lower", "round", "upper"),
 			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
 			'edit_functions' => array(

adminer/drivers/pgsql.inc.php

@@ -19,14 +19,11 @@ if (isset($_GET["pgsql"])) {
 				global $adminer;
 				$db = $adminer->database();
 				set_error_handler(array($this, '_error'));
-
 				$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
-
 				$ssl = $adminer->connectSsl();
 				if (isset($ssl["mode"])) {
 					$this->_string .= " sslmode='" . $ssl["mode"] . "'";
 				}
-
 				$this->_link = @pg_connect("$this->_string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
 				if (!$this->_link && $db != "") {
 					// try to connect directly with database for performance
@@ -155,19 +152,14 @@ if (isset($_GET["pgsql"])) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-
 				$db = $adminer->database();
-
 				//! client_encoding is supported since 9.1, but we can't yet use min_version here
 				$dsn = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'";
-
 				$ssl = $adminer->connectSsl();
 				if (isset($ssl["mode"])) {
 					$dsn .= " sslmode='" . $ssl["mode"] . "'";
 				}
-
 				$this->dsn($dsn, $username, $password);
-
 				return true;
 			}
 
@@ -229,9 +221,9 @@ if (isset($_GET["pgsql"])) {
 			return $query;
 		}
 
-		function convertSearch($idf, array $where, array $field) {
+		function convertSearch($idf, $val, $field) {
 			$textTypes = "char|text";
-			if (strpos($where["op"], "LIKE") === false) {
+			if (strpos($val["op"], "LIKE") === false) {
 				$textTypes .= "|date|time(stamp)?|boolean|uuid|inet|cidr|macaddr|" . number_type();
 			}
 
@@ -292,8 +284,8 @@ if (isset($_GET["pgsql"])) {
 
 	function get_databases() {
 		return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid
-                 WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
+WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
-                 ORDER BY d.datname");
+ORDER BY d.datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -366,7 +358,6 @@ WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 			'timestamp without time zone' => 'timestamp',
 			'timestamp with time zone' => 'timestamptz',
 		);
-
 		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment" . (min_version(10) ? ", a.attidentity" : "") . "
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
@@ -395,7 +386,7 @@ ORDER BY a.attnum"
 			}
 			$row["null"] = !$row["attnotnull"];
 			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
-			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1);
+			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
 			if (preg_match('~(.+)::[^,)]+(.*)~', $row["default"], $match)) {
 				$row["default"] = ($match[1] == "NULL" ? null : idf_unescape($match[1]) . $match[2]);
 			}
@@ -488,7 +479,7 @@ ORDER BY connamespace, conname") as $row) {
 		if (preg_match('~^(.*\n)?([^\n]*)\n( *)\^(\n.*)?$~s', $return, $match)) {
 			$return = $match[1] . preg_replace('~((?:[^&]|&[^;]*;){' . strlen($match[3]) . '})(.*)~', '\1<b>\2</b>', $match[2]) . $match[4];
 		}
-		return nl2br($return);
+		return nl_br($return);
 	}
 
 	function create_database($db, $collation) {
@@ -502,7 +493,8 @@ ORDER BY connamespace, conname") as $row) {
 	}
 
 	function rename_database($name, $collation) {
-		//! current database cannot be renamed
+		global $connection;
+		$connection->close();
 		return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name));
 	}
 
@@ -516,6 +508,7 @@ ORDER BY connamespace, conname") as $row) {
 		if ($table != "" && $table != $name) {
 			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
 		}
+		$sequence = "";
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -537,10 +530,15 @@ ORDER BY connamespace, conname") as $row) {
 						$queries[] = "ALTER TABLE " . table($name) . " RENAME $column TO $val[0]";
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
-					if (!$val[6]) {
+					$sequence_name = $table . "_" . idf_unescape($val[0]) . "_seq";
-						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT");
+					$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]"
-						$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
+						: (isset($val[6]) ? "SET DEFAULT nextval(" . q($sequence_name) . ")"
+						: "DROP DEFAULT"
+					));
+					if (isset($val[6])) {
+						$sequence = "CREATE SEQUENCE IF NOT EXISTS " . idf_escape($sequence_name) . " OWNED BY " . idf_escape($table) . ".$val[0]";
 					}
+					$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 				}
 				if ($field[0] != "" || $val5 != "") {
 					$queries[] = "COMMENT ON COLUMN " . table($name) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
@@ -553,6 +551,9 @@ ORDER BY connamespace, conname") as $row) {
 		} elseif ($alter) {
 			array_unshift($queries, "ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
 		}
+		if ($sequence) {
+			array_unshift($queries, $sequence);
+		}
 		if ($comment !== null) {
 			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
 		}
@@ -770,8 +771,6 @@ AND typelem = 0"
 	}
 
 	function create_sql($table, $auto_increment, $style) {
-		global $connection;
-		$return = '';
 		$return_parts = array();
 		$sequences = array();
 
@@ -801,13 +800,15 @@ AND typelem = 0"
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$rows = get_rows(min_version(10)
+				$sq = reset(get_rows(min_version(10)
 					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
 					: "SELECT * FROM $sequence_name"
-				);
+				));
-				$sq = reset($rows);
 				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "")
-					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]" . ($auto_increment && $sq['last_value'] ? " START $sq[last_value]" : "") . " CACHE $sq[cache_value];";
+					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]"
+					. ($auto_increment && $sq['last_value'] ? " START " . ($sq["last_value"] + 1) : "")
+					. " CACHE $sq[cache_value];"
+				;
 			}
 		}
 
@@ -841,7 +842,7 @@ AND typelem = 0"
 			}
 		}
 
-		// coments for table & fields
+		// comments for table & fields
 		if ($status['Comment']) {
 			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
 		}
@@ -878,20 +879,12 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 
-	/**
-	 * @return bool
-	 */
-	function is_strict_mode() {
-		return false;
-	}
-
 	function is_c_style_escapes() {
 		static $c_style = null;
-
 		if ($c_style === null) {
-			$c_style = get_vals("SHOW standard_conforming_strings")[0] == "off";
+			$vals = get_vals("SHOW standard_conforming_strings");
+			$c_style = $vals[0] == "off";
 		}
-
 		return $c_style;
 	}
 
@@ -946,9 +939,7 @@ AND typelem = 0"
 			'types' => $types,
 			'structured_types' => $structured_types,
 			'unsigned' => array(),
-			'operators' => array("=", "<", ">", "<=", ">=", "!=", "~", "~*", "!~", "!~*", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"), // no "SQL" to avoid CSRF
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"), // no "SQL" to avoid CSRF
-			'operator_like' => "LIKE %%",
-			'operator_regexp' => '~*',
 			'functions' => array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper"),
 			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
 			'edit_functions' => array(
@@ -961,7 +952,6 @@ AND typelem = 0"
 					"char|text" => "||",
 				)
 			),
-			'c_style_escapes' => true,
 		);
 	}
 }

adminer/drivers/sqlite.inc.php

@@ -47,7 +47,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 						return false;
 					}
 					$row = $result->_result->fetchArray();
-					return $row[$field];
+					return $row ? $row[$field] : false;
 				}
 			}
 
@@ -319,9 +319,9 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				"field" => $name,
 				"type" => (preg_match('~int~i', $type) ? "integer" : (preg_match('~char|clob|text~i', $type) ? "text" : (preg_match('~blob~i', $type) ? "blob" : (preg_match('~real|floa|doub~i', $type) ? "real" : "numeric")))),
 				"full_type" => $type,
-				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
+				"default" => (preg_match("~^'(.*)'$~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
-				"privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
 				"primary" => $row["pk"],
 			);
 			if ($row["pk"]) {
@@ -523,7 +523,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return true;
 	}
 
-	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment, $indexes = array()) {
+	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment = 0, $indexes = array()) {
 		global $connection;
 		if ($table != "") {
 			if (!$fields) {
@@ -764,13 +764,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return $return;
 	}
 
-	/**
-	 * @return bool
-	 */
-	function is_strict_mode() {
-		return false;
-	}
-
 	function is_c_style_escapes() {
 		return true;
 	}
@@ -804,7 +797,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			'structured_types' => array_keys($types),
 			'unsigned' => array(),
 			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"), // REGEXP can be user defined function
-			'operator_like' => "LIKE %%",
 			'functions' => array("hex", "length", "lower", "round", "unixepoch", "upper"),
 			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"),
 			'edit_functions' => array(

adminer/dump.inc.php

@@ -147,14 +147,16 @@ if ($jush == "sql") { //! use insertUpdate() in all drivers
 }
 parse_str($_COOKIE["adminer_export"], $row);
 if (!$row) {
-	$row = array("output" => "file", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
+	$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
 }
 if (!isset($row["events"])) { // backwards compatibility
 	$row["routines"] = $row["events"] = ($_GET["dump"] == "");
 	$row["triggers"] = $row["table_style"];
 }
 
-echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], false) . "\n"; // false = radio
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
+
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
 
 echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
 	. (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "")
@@ -167,9 +169,6 @@ echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_st
 ;
 
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
-
-echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], false) . "\n"; // false = radio
-
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">

adminer/elastic.php

@@ -4,10 +4,10 @@ function adminer_object() {
 	include_once "../plugins/login-password-less.php";
 	include_once "../plugins/drivers/elastic.php";
 	include_once "../plugins/drivers/elastic5.php";
-	return new AdminerPlugin([
+	return new AdminerPlugin(array(
 		// TODO: inline the result of password_hash() so that the password is not visible in source codes
 		new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
-	]);
+	));
 }
 
 include "./index.php";

adminer/file.inc.php

@@ -6,13 +6,13 @@ if ($_GET["file"] == "favicon.ico") {
 	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	echo lzw_decompress(compile_file('../adminer/static/default.css;../vendor/vrana/jush/jush.css', 'minify_css'));
+	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../vendor/vrana/jush/modules/jush.js;../vendor/vrana/jush/modules/jush-textarea.js;../vendor/vrana/jush/modules/jush-txt.js;../vendor/vrana/jush/modules/jush-js.js;../vendor/vrana/jush/modules/jush-sql.js;../vendor/vrana/jush/modules/jush-pgsql.js;../vendor/vrana/jush/modules/jush-sqlite.js;../vendor/vrana/jush/modules/jush-mssql.js;../vendor/vrana/jush/modules/jush-oracle.js;../vendor/vrana/jush/modules/jush-simpledb.js', 'minify_js'));
+	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {

adminer/include/adminer.inc.php

@@ -3,11 +3,7 @@
 
 class Adminer {
 	/** @var array operators used in select, null for all operators */
-	var $operators = null;
+	var $operators;
-	/** @var string operator for LIKE condition */
-	var $operator_like = null;
-	/** @var string operator for regular expression condition */
-	var $operator_regexp = null;
 
 	/** Name in title and navigation
 	* @return string HTML code
@@ -29,16 +25,12 @@ class Adminer {
 	function connectSsl() {
 	}
 
-	/**
+	/** Get key used for permanent login
-	 * Gets a private key used for permanent login.
+	* @param bool
-	 *
+	* @return string cryptic string which gets combined with password or false in case of an error
-	 * @param bool $create
+	*/
-	 *
-	 * @return string|false Cryptic string which gets combined with password or false in case of an error.
-	 * @throws \Random\RandomException
-	 */
 	function permanentLogin($create = false) {
-		return get_private_key($create);
+		return password_file($create);
 	}
 
 	/** Return key used to group brute force attacks; behind a reverse proxy, you want to return the last part of X-Forwarded-For
@@ -47,7 +39,7 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
-
+	
 	/** Get server name displayed in breadcrumbs
 	* @param string
 	* @return string HTML code or null
@@ -104,7 +96,7 @@ class Adminer {
 	*/
 	function head() {
 		?>
-<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">
+<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
 <?php
 		return true;
 	}
@@ -129,14 +121,14 @@ class Adminer {
 		echo "<table cellspacing='0' class='layout'>\n";
 		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n");
 		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
-		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();"));
+		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" autofocus value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("qs('#username').form['auth[driver]'].onchange();"));
 		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">' . "\n");
 		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">' . "\n");
 		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
-
+	
 	/** Get login form field
 	* @param string
 	* @param string HTML
@@ -239,33 +231,24 @@ class Adminer {
 	*/
 	function selectQuery($query, $start, $failed = false) {
 		global $jush, $driver;
-
+		$return = "</p>\n"; // required for IE9 inline edit
-        $supportSql = support("sql");
-
-		$result = "<p>"
-            . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> "
-            . "<span class='time'>(" . format_time($start) . ")</span>"
-			. ($supportSql ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "");
-
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
-			$result .= ($supportSql ? "," : "")
+			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
-                . " <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
-                . "</p>\n"
+			;
-                . "<div id='$id' class='hidden'>\n$warnings</div>\n";
-		} else {
-			$result .= "</p>\n";
 		}
-
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
-        return $result;
+			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
+			. $return
+		;
 	}
 
 	/** Query printed in SQL command before execution
 	* @param string query to be executed
 	* @return string escaped query to be printed
 	*/
-	function sqlCommandQuery($query)
+	function sqlCommandQuery($query) {
-	{
 		return shorten_utf8(trim($query), 1000);
 	}
 
@@ -309,7 +292,7 @@ class Adminer {
 		if (preg_match('~json~', $field["type"])) {
 			$return = "<code class='jush-js'>$return</code>";
 		}
-		return ($link ? "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>" : $return);
+		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -318,11 +301,6 @@ class Adminer {
 	* @return string
 	*/
 	function editVal($val, $field) {
-		// Format Elasticsearch boolean value, but do not touch PostgreSQL boolean that use string value 't' or 'f'.
-		if ($field["type"] == "boolean" && is_bool($val)) {
-			return $val ? "true" : "false";
-		}
-
 		return $val;
 	}
 
@@ -347,40 +325,15 @@ class Adminer {
 		echo "</div>\n";
 	}
 
-	function tablePartitionsPrint($partition_info) {
-		$showList = $partition_info["partition_by"] == "RANGE" || $partition_info["partition_by"] == "LIST";
-
-		echo "<p>";
-		echo "<code>{$partition_info["partition_by"]} ({$partition_info["partition"]})</code>";
-		if (!$showList) {
-			echo " " . lang('Partitions') . ": " . h($partition_info["partitions"]);
-		}
-		echo "</p>";
-
-		if ($showList) {
-			echo "<table>\n";
-			echo "<thead><tr><th>" . lang('Partition') . "</th><td>" . lang('Values') . "</td></tr></thead>\n";
-
-			foreach ($partition_info["partition_names"] as $key => $name) {
-				echo "<tr><th>" . h($name) . "</th><td>" . h($partition_info["partition_values"][$key]) . "\n";
-			}
-
-			echo "</table>\n";
-		}
-	}
-
 	/** Print list of indexes on table in tabular format
 	* @param array data about all indexes on a table
 	* @return null
 	*/
 	function tableIndexesPrint($indexes) {
-		echo "<table>\n";
+		echo "<table cellspacing='0'>\n";
-		echo "<thead><tr><th>" . lang('Type') . "</th><td>" . lang('Column (length)') . "</td></tr></thead>\n";
-
 		foreach ($indexes as $name => $index) {
 			ksort($index["columns"]); // enforce correct columns order
-			$print = [];
+			$print = array();
-
 			foreach ($index["columns"] as $key => $val) {
 				$print[] = "<i>" . h($val) . "</i>"
 					. ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
@@ -389,127 +342,92 @@ class Adminer {
 			}
 			echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
 		}
-
 		echo "</table>\n";
 	}
 
-	/**
+	/** Print columns box in select
-	 * Prints columns box in select filter.
+	* @param array result of selectColumnsProcess()[0]
-	 *
+	* @param array selectable columns
-	 * @param array $select result of selectColumnsProcess()[0]
+	* @return null
-	 * @param array $columns selectable columns
+	*/
-	 */
 	function selectColumnsPrint($select, $columns) {
 		global $functions, $grouping;
-
+		print_fieldset("select", lang('Select'), $select);
-		print_fieldset("select", lang('Select'), $select, true);
-
-		$_GET["columns"][""] = [];
 		$i = 0;
-
+		$select[""] = array();
-		foreach ($_GET["columns"] as $key => $val) {
+		foreach ($select as $key => $val) {
-			if ($key != "" && $val["col"] == "") continue;
+			$val = $_GET["columns"][$key];
-
 			$column = select_input(
-				"name='columns[$i][col]'",
+				" name='columns[$i][col]'",
 				$columns,
 				$val["col"],
-				$key !== "" ? "selectFieldChange" : "selectAddRow"
+				($key !== "" ? "selectFieldChange" : "selectAddRow")
 			);
-
+			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
-			echo "<div ", ($key != "" ? "" : "class='no-sort'"), ">",
+				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
-				"<span class='jsonly handle'></span>";
+				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
-
+				. script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
-			if ($functions || $grouping) {
+				. "($column)" : $column) . "</div>\n";
-				echo "<select name='columns[$i][fun]'>",
-					optionlist([-1 => ""] + array_filter([lang('Functions') => $functions, lang('Aggregation') => $grouping]), $val["fun"]),
-					"</select>",
-					on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1),
-					script("qsl('select').onchange = (event) => { helpClose();" . ($key !== "" ? "" : " qsl('select, input:not(.remove)', event.target.parentNode).onchange();") . " };", ""),
-					"($column)";
-			} else {
-				echo $column;
-			}
-
-			echo " <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
-				script("qsl('#fieldset-select .remove').onclick = selectRemoveRow;", ""),
-				"</div>\n";
-
 			$i++;
 		}
-
-		echo "</div>", script("initSortable('#fieldset-select');"), "</fieldset>\n";
-	}
-
-	/**
-	 * Prints search box in select.
-	 *
-	 * @param array $where result of selectSearchProcess()
-	 * @param array $columns selectable columns
-	 */
-	function selectSearchPrint($where, $columns, $indexes) {
-		print_fieldset("search", lang('Search'), $where);
-
-		foreach ($indexes as $i => $index) {
-			if ($index["type"] == "FULLTEXT") {
-				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST",
-					" <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>",
-					script("qsl('input').oninput = selectFieldChange;", ""),
-					checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL"),
-					"</div>\n";
-			}
-		}
-
-		$change_next = "this.parentNode.firstChild.onchange();";
-		foreach (array_merge((array) $_GET["where"], array(array())) as $i => $val) {
-			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
-				echo "<div>",
-					select_input(
-						" name='where[$i][col]'",
-						$columns,
-						$val["col"],
-						($val ? "selectFieldChange" : "selectAddRow"),
-						"(" . lang('anywhere') . ")"
-					),
-					html_select("where[$i][op]", $this->operators, $val["op"], $change_next),
-					"<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>",
-					script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", ""),
-					" <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
-					script('qsl("#fieldset-search .remove").onclick = selectRemoveRow;', ""),
-					"</div>\n";
-			}
-		}
-
 		echo "</div></fieldset>\n";
 	}
 
-	/**
+	/** Print search box in select
-	 * Prints order box in select filter.
+	* @param array result of selectSearchProcess()
-	 *
+	* @param array selectable columns
-	 * @param array $order result of selectOrderProcess()
+	* @param array
-	 * @param array $columns selectable columns
+	* @return null
-	 */
+	*/
-	function selectOrderPrint($order, $columns, $indexes) {
+	function selectSearchPrint($where, $columns, $indexes) {
-		print_fieldset("sort", lang('Sort'), $order, true);
+		print_fieldset("search", lang('Search'), $where);
-
+		foreach ($indexes as $i => $index) {
-		$_GET["order"][""] = "";
+			if ($index["type"] == "FULLTEXT") {
-		$i = 0;
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
-
+				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
-		foreach ((array) $_GET["order"] as $key => $val) {
+				echo script("qsl('input').oninput = selectFieldChange;", "");
-			if ($key != "" && $val == "") continue;
+				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
-
+				echo "</div>\n";
-			echo "<div ", ($key != "" ? "" : "class='no-sort'"), ">",
+			}
-				"<span class='jsonly handle'></span>",
-				select_input("name='order[$i]'", $columns, $val, $key !== "" ? "selectFieldChange" : "selectAddRow"),
-				checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')),
-				" <input type='image' src='../adminer/static/cross.gif' class='jsonly icon remove' title='" . h(lang('Remove')) . "' alt='x'>",
-				script('qsl("#fieldset-sort .remove").onclick = selectRemoveRow;', ""),
-				"</div>\n";
-
-			$i++;
 		}
+		$change_next = "this.parentNode.firstChild.onchange();";
+		foreach (array_merge((array) $_GET["where"], array(array())) as $i => $val) {
+			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
+				echo "<div>" . select_input(
+					" name='where[$i][col]'",
+					$columns,
+					$val["col"],
+					($val ? "selectFieldChange" : "selectAddRow"),
+					"(" . lang('anywhere') . ")"
+				);
+				echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
+				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>";
+				echo script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", "");
+				echo "</div>\n";
+			}
+		}
+		echo "</div></fieldset>\n";
+	}
 
-		echo "</div>", script("initSortable('#fieldset-sort');"), "</fieldset>\n";
+	/** Print order box in select
+	* @param array result of selectOrderProcess()
+	* @param array selectable columns
+	* @param array
+	* @return null
+	*/
+	function selectOrderPrint($order, $columns, $indexes) {
+		print_fieldset("sort", lang('Sort'), $order);
+		$i = 0;
+		foreach ((array) $_GET["order"] as $key => $val) {
+			if ($val != "") {
+				echo "<div>" . select_input(" name='order[$i]'", $columns, $val, "selectFieldChange");
+				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
+				$i++;
+			}
+		}
+		echo "<div>" . select_input(" name='order[$i]'", $columns, "", "selectAddRow");
+		echo checkbox("desc[$i]", 1, false, lang('descending')) . "</div>\n";
+		echo "</div></fieldset>\n";
 	}
 
 	/** Print limit box in select
@@ -561,7 +479,7 @@ class Adminer {
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
-
+	
 	/** Print command box in select
 	* @return bool whether to print default commands
 	*/
@@ -610,62 +528,49 @@ class Adminer {
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $driver;
+		global $connection, $driver;
-
+		$return = array();
-		$return = [];
-
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
 				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-
+		foreach ((array) $_GET["where"] as $key => $val) {
-		foreach ((array) $_GET["where"] as $where) {
+			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
-			$col = $where["col"];
-			$op = $where["op"];
-			$val = $where["val"];
-
-			if ("$col$val" != "" && in_array($op, $this->operators)) {
 				$prefix = "";
-				$cond = " $op";
+				$cond = " $val[op]";
-
+				if (preg_match('~IN$~', $val["op"])) {
-				if (preg_match('~IN$~', $op)) {
+					$in = process_length($val["val"]);
-					$in = process_length($val);
 					$cond .= " " . ($in != "" ? $in : "(NULL)");
-				} elseif ($op == "SQL") {
+				} elseif ($val["op"] == "SQL") {
-					$cond = " $val"; // SQL injection
+					$cond = " $val[val]"; // SQL injection
-				} elseif ($op == "LIKE %%") {
+				} elseif ($val["op"] == "LIKE %%") {
-					$cond = " LIKE " . $this->processInput($fields[$col], "%$val%");
+					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
-				} elseif ($op == "ILIKE %%") {
+				} elseif ($val["op"] == "ILIKE %%") {
-					$cond = " ILIKE " . $this->processInput($fields[$col], "%$val%");
+					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
-				} elseif ($op == "FIND_IN_SET") {
+				} elseif ($val["op"] == "FIND_IN_SET") {
-					$prefix = "$op(" . q($val) . ", ";
+					$prefix = "$val[op](" . q($val["val"]) . ", ";
 					$cond = ")";
-				} elseif (!preg_match('~NULL$~', $op)) {
+				} elseif (!preg_match('~NULL$~', $val["op"])) {
-					$cond .= " " . $this->processInput($fields[$col], $val);
+					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
 				}
-
+				if ($val["col"] != "") {
-				if ($col != "") {
+					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
-					$return[] = $prefix . $driver->convertSearch(idf_escape($col), $where, $fields[$col]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if (isset($field["privileges"]["where"])
+						if ((preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-                            && (preg_match('~^[-\d.' . (preg_match('~IN$~', $op) ? ',' : '') . ']+$~', $val) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val) || preg_match('~char|text|enum|set~', $field["type"]))
+							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val))
-							&& (!preg_match('~^elastic~', DRIVER) || $field["type"] != "boolean" || preg_match('~true|false~', $val)) // Elasticsearch needs boolean value properly formatted.
-							&& (!preg_match('~^elastic~', DRIVER) || strpos($op, "regexp") === false || preg_match('~text|keyword~', $field["type"])) // Elasticsearch can use regexp only on text and keyword fields.
 						) {
-							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $where, $field) . $cond;
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
 					}
 					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
-
 		return $return;
 	}
 
@@ -796,7 +701,7 @@ class Adminer {
 	* @param string
 	* @return string custom input field or empty string for default
 	*/
-	function editInput($table, $field, $attrs, $value, $function) {
+	function editInput($table, $field, $attrs, $value) {
 		if ($field["type"] == "enum") {
 			return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
 				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
@@ -848,11 +753,10 @@ class Adminer {
 	* @return array
 	*/
 	function dumpOutput() {
-		$return = array('file' => lang('save'), 'text' => lang('open'));
+		$return = array('text' => lang('open'), 'file' => lang('save'));
 		if (function_exists('gzencode')) {
 			$return['gz'] = 'gzip';
 		}
-
 		return $return;
 	}
 
@@ -926,7 +830,7 @@ class Adminer {
 				$insert = "";
 				$buffer = "";
 				$keys = array();
-				$generatedKeys = array();
+				$generated = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -934,10 +838,10 @@ class Adminer {
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
-							if (!empty($fields[$field->name]['generated'])) {
+							if ($fields[$field->name]['generated']) {
-								$generatedKeys[$field->name] = true;
+								$generated[$field->name] = true;
 								continue;
-                            }
+							}
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -955,10 +859,10 @@ class Adminer {
 							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
-							if (isset($generatedKeys[$key])) {
+							if ($generated[$key]) {
 								unset($row[$key]);
 								continue;
-                            }
+							}
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
 								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
@@ -1012,11 +916,9 @@ class Adminer {
 		return $ext;
 	}
 
-	/**
+	/** Set the path of the file for webserver load
-	 * Gets the path of the file for webserver load.
+	* @return string path of the sql dump file
-	 *
+	*/
-	 * @return string Path of the sql import file.
-	 */
 	function importServerPath() {
 		return "adminer.sql";
 	}
@@ -1040,15 +942,11 @@ class Adminer {
 		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
-    <?php echo $this->name(); ?>
+<?php echo $this->name(); ?>
-    <?php if ($missing != "auth"): ?>
+<span class="version">
-	<span class="version">
+<?php echo $VERSION; ?>
-		<?php echo $VERSION; ?>
+ <a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-		<a href="https://github.com/pematon/adminer/releases"<?php echo target_blank(); ?> id="version">
+</span>
-			<?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?>
-		</a>
-	</span>
-    <?php endif; ?>
 </h1>
 <?php
 		if ($missing == "auth") {
@@ -1059,14 +957,7 @@ class Adminer {
 						if ($password !== null) {
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>"
+								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
-									. h($drivers[$vendor])
-									. ($username != "" || $server != "" ? " - " : "")
-									. h($username)
-									. ($username != "" && $server != "" ? "@" : "")
-									. ($server != "" ? h($this->serverName($server)) : "")
-									. ($db != "" ? h(" - $db") : "")
-									. "</a></li>\n";
 							}
 						}
 					}
@@ -1081,12 +972,12 @@ class Adminer {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
-			echo script_src("../vendor/vrana/jush/modules/jush.js");
+			echo script_src("../externals/jush/modules/jush.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-textarea.js");
+			echo script_src("../externals/jush/modules/jush-textarea.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-txt.js");
+			echo script_src("../externals/jush/modules/jush-txt.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-js.js");
+			echo script_src("../externals/jush/modules/jush-js.js");
 			if (support("sql")) {
-				echo script_src("../vendor/vrana/jush/modules/jush-$jush.js");
+				echo script_src("../externals/jush/modules/jush-$jush.js");
 				?>
 <script<?php echo nonce(); ?>>
 <?php
@@ -1106,10 +997,8 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 </script>
 <?php
 			}
-
 			$this->databasesPrint($missing);
-
+			$actions = array();
-			$actions = [];
 			if (DB == "" || !$missing) {
 				if (support("sql")) {
 					$actions[] = "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>";
@@ -1119,16 +1008,13 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 					$actions[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
 				}
 			}
-			if ($_GET["ns"] !== "" && !$missing && DB != "") {
+			$in_db = $_GET["ns"] !== "" && !$missing && DB != "";
-				$actions[] = '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
+			if ($in_db) {
+				$actions[] = '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>";
 			}
-			if ($actions) {
+			echo ($actions ? "<p class='links'>\n" . implode("\n", $actions) . "\n" : "");
-				echo "<p class='links'>" . implode("\n", $actions) . "</p>";
+			if ($in_db) {
-			}
-
-			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				if ($tables) {
-					$this->printTablesFilter();
 					$this->tablesPrint($tables);
 				} else {
 					echo "<p class='message'>" . lang('No tables.') . "</p>\n";
@@ -1137,97 +1023,66 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 		}
 	}
 
-	/**
+	/** Prints databases list in menu
-	 * Prints databases select in menu.
+	* @param string
-	 *
+	* @return null
-	 * @param $missing string
+	*/
-	 * @return null
-	 */
 	function databasesPrint($missing) {
 		global $adminer, $connection;
-
 		$databases = $this->databases();
 		if (DB && $databases && !in_array(DB, $databases)) {
 			array_unshift($databases, DB);
 		}
-
+		?>
-		echo "<form action=''><p id='dbs'>";
+<form action="">
+<p id="dbs">
+<?php
 		hidden_fields_get();
-
+		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
-		if ($databases) {
+		echo "<span title='" . lang('Database') . "'>" . lang('DB') . "</span>: " . ($databases
-			echo "<select id='database-select' name='db'>" . optionlist(["" => lang('Database')] + $databases, DB) . "</select>"
+			? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
-				. script("mixin(qs('#database-select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
-		} else {
+		);
-			echo "<input id='database-select' name='db' value='" . h(DB) . "' autocapitalize='off'>\n";
-		}
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-
+		if (support("scheme")) {
-		if (support("scheme") && $missing != "db" && DB != "" && $connection->select_db(DB)) {
+			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-			echo "<br><select id='scheme-select' name='ns'>" . optionlist(["" => lang('Schema')] + $adminer->schemas(), $_GET["ns"]) . "</select>"
+				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
-				. script("mixin(qs('#scheme-select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+				if ($_GET["ns"] != "") {
-
+					set_schema($_GET["ns"]);
-			if ($_GET["ns"] != "") {
+				}
-				set_schema($_GET["ns"]);
 			}
 		}
-
+		foreach (array("import", "sql", "schema", "dump", "privileges") as $val) {
-		foreach (["import", "sql", "schema", "dump", "privileges"] as $val) {
 			if (isset($_GET[$val])) {
 				echo "<input type='hidden' name='$val' value=''>";
 				break;
 			}
 		}
-
 		echo "</p></form>\n";
-
-		return null;
 	}
 
-	function printTablesFilter()
+	/** Prints table list in menu
-	{
+	* @param array result of table_status('', true)
-		global $adminer;
+	* @return null
-
+	*/
-		echo "<div class='tables-filter jsonly'>"
-			. "<input id='tables-filter' autocomplete='off' placeholder='" . lang('Table') . "'>"
-			. script("initTablesFilter(" . json_encode($adminer->database()) . ");")
-			. "</div>\n";
-	}
-
-	/**
-	 * Prints table list in menu.
-	 *
-	 * @param array $tables Result of table_status('', true)
-	 * @return null
-	 */
 	function tablesPrint($tables) {
 		echo "<ul id='tables'>" . script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
-
 		foreach ($tables as $table => $status) {
 			$name = $this->tableName($status);
 			if ($name != "") {
-				$active = $table == $_GET["select"] || $table == $_GET["edit"];
-
 				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"'
-					. bold($active, "select")
+					. bold($_GET["select"] == $table || $_GET["edit"] == $table, "select")
-					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> ";
+					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> "
-
+				;
-				if (support("table") || support("indexes")) {
+				echo (support("table") || support("indexes")
-					$active = in_array($table, [$_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"]]);
+					? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
-					$class = is_view($status) ? "view" : "structure";
+						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
-
+						. " title='" . lang('Show structure') . "'>$name</a>"
-					echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold($active, $class)
+					: "<span>$name</span>"
-						. " title='" . lang('Show structure') . "' data-main='true'>$name</a>";
+				) . "\n";
-				} else {
-					echo "<span data-main='true'>$name</span>";
-				}
-
-				echo "</li>\n";
 			}
 		}
-
 		echo "</ul>\n";
-
-		return null;
 	}
 
 }

adminer/include/auth.inc.php

@@ -1,5 +1,4 @@
 <?php
-
 $connection = '';
 
 $has_token = $_SESSION["token"];
@@ -16,78 +15,13 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
-function validate_server_input() {
-	if (SERVER == "") {
-		return;
-	}
-
-	$parts = parse_url(SERVER);
-	if (!$parts) {
-		auth_error(lang('Invalid server or credentials.'));
-	}
-
-	// Check proper URL parts.
-	if (isset($parts['user']) || isset($parts['pass']) || isset($parts['query']) || isset($parts['fragment'])) {
-		auth_error(lang('Invalid server or credentials.'));
-	}
-
-	// Allow only HTTP/S scheme.
-	if (isset($parts['scheme']) && !preg_match('~^(https?)$~i', $parts['scheme'])) {
-		auth_error(lang('Invalid server or credentials.'));
-	}
-
-	// Note that "localhost" and IP address without a scheme is parsed as a path.
-	$hostPath = (isset($parts['host']) ? $parts['host'] : '') . (isset($parts['path']) ? $parts['path'] : '');
-
-	// Validate host.
-	if (!is_server_host_valid($hostPath)) {
-		auth_error(lang('Invalid server or credentials.'));
-	}
-
-	// Check privileged ports.
-	if (isset($parts['port']) && ($parts['port'] < 1024 || $parts['port'] > 65535)) {
-		auth_error(lang('Connecting to privileged ports is not allowed.'));
-	}
-}
-
-if (!function_exists('is_server_host_valid')) {
-	/**
-	 * @param string $hostPath
-	 * @return bool
-	 */
-	function is_server_host_valid($hostPath)
-	{
-		return strpos($hostPath, '/') === false;
-	}
-}
-
-/**
- * @param string $server
- * @param string $username
- * @param string $password
- * @param string $defaultServer
- * @param int|null $defaultPort
- * @return string
- */
-function build_http_url($server, $username, $password, $defaultServer, $defaultPort = null) {
-	if (!preg_match('~^(https?://)?([^:]*)(:\d+)?$~', rtrim($server, '/'), $matches)) {
-		$this->error = lang('Invalid server or credentials.');
-		return false;
-	}
-
-	return ($matches[1] ?: "http://") .
-		($username !== "" || $password !== "" ? "$username:$password@" : "") .
-		($matches[2] !== "" ? $matches[2] : $defaultServer) .
-		(isset($matches[3]) ? $matches[3] : ($defaultPort ? ":$defaultPort" : ""));
-}
-
 function add_invalid_login() {
 	global $adminer;
-	$file = open_file_with_lock(get_temp_dir() . "/adminer.invalid");
+	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
-	if (!$file) {
+	if (!$fp) {
 		return;
 	}
-	$invalids = unserialize(stream_get_contents($file));
+	$invalids = unserialize(stream_get_contents($fp));
 	$time = time();
 	if ($invalids) {
 		foreach ($invalids as $ip => $val) {
@@ -101,16 +35,13 @@ function add_invalid_login() {
 		$invalid = array($time + 30*60, 0); // active for 30 minutes
 	}
 	$invalid[1]++;
-	write_and_unlock_file($file, serialize($invalids));
+	file_write_unlock($fp, serialize($invalids));
 }
 
 function check_invalid_login() {
 	global $adminer;
-
+	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
-	$filename = get_temp_dir() . "/adminer.invalid";
+	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
-	$invalids = file_exists($filename) ? unserialize(file_get_contents($filename)) : [];
-	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : []);
-
 	$next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
 	if ($next_attempt > 0) { //! do the same with permanent login
 		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
@@ -121,7 +52,7 @@ $auth = $_POST["auth"];
 if ($auth) {
 	session_regenerate_id(); // defense against session fixation
 	$vendor = $auth["driver"];
-	$server = trim($auth["server"]);
+	$server = $auth["server"];
 	$username = $auth["username"];
 	$password = (string) $auth["password"];
 	$db = $auth["db"];
@@ -141,14 +72,14 @@ if ($auth) {
 	) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
-
+	
 } elseif ($_POST["logout"] && (!$has_token || verify_token())) {
 	foreach (array("pwds", "db", "dbs", "queries") as $key) {
 		set_session($key, null);
 	}
 	unset_permanent();
 	redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.') . ' ' . lang('Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.'));
-
+	
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
 	$private = $adminer->permanentLogin();
@@ -172,10 +103,9 @@ function unset_permanent() {
 }
 
 /** Renders an error message and a login form
- * @param string plain text
+* @param string plain text
- * @return null exits
+* @return null exits
- * @throws \Random\RandomException
+*/
- */
 function auth_error($error) {
 	global $adminer, $has_token;
 	$session_name = session_name();
@@ -200,7 +130,7 @@ function auth_error($error) {
 		$error = lang('Session support must be enabled.');
 	}
 	$params = session_get_cookie_params();
-	cookie("adminer_key", ($_COOKIE["adminer_key"] ?: get_random_string()), $params["lifetime"]);
+	cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
 	echo "<form action='' method='post'>\n";
 	echo "<div>";
@@ -225,16 +155,18 @@ if (isset($_GET["username"]) && !class_exists("Min_DB")) {
 stop_session(true);
 
 if (isset($_GET["username"]) && is_string(get_password())) {
-	validate_server_input();
+	list($host, $port) = explode(":", SERVER, 2);
+	if (preg_match('~^\s*([-+]?\d+)~', $port, $match) && ($match[1] < 1024 || $match[1] > 65535)) { // is_numeric('80#') would still connect to port 80
+		auth_error(lang('Connecting to privileged ports is not allowed.'));
+	}
 	check_invalid_login();
-
 	$connection = connect();
 	$driver = new Min_Driver($connection);
 }
 
 $login = null;
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid server or credentials.')));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.')));
 	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
 }
 
@@ -267,7 +199,7 @@ if ($_POST) {
 			: lang('Invalid CSRF token. Send the form again.') . ' ' . lang('If you did not send this request from Adminer then close this page.')
 		);
 	}
-
+	
 } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
 	// posted form with no data means that post_max_size exceeded because Adminer always sends token at least
 	$error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");

adminer/include/bootstrap.inc.php

@@ -1,12 +1,6 @@
 <?php
-function adminer_errors($errno, $errstr) {
+include "../adminer/include/version.inc.php";
-	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
+include "../adminer/include/errors.inc.php";
-}
-
-error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
-
-include "../adminer/include/debug.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -32,9 +26,9 @@ if (isset($_GET["file"])) {
 }
 
 if ($_GET["script"] == "version") {
-	$file = open_file_with_lock(get_temp_dir() . "/adminer.version");
+	$fp = file_open_lock(get_temp_dir() . "/adminer.version");
-	if ($file) {
+	if ($fp) {
-		write_and_unlock_file($file, serialize(["version" => $_POST["version"]]));
+		file_write_unlock($fp, serialize(array("signature" => $_POST["signature"], "version" => $_POST["version"])));
 	}
 	exit;
 }
@@ -93,16 +87,11 @@ $types = $config['types'];
 $structured_types = $config['structured_types'];
 $unsigned = $config['unsigned'];
 $operators = $config['operators'];
-$operator_like = $config['operator_like'];
-$operator_regexp = $config['operator_regexp'];
 $functions = $config['functions'];
 $grouping = $config['grouping'];
 $edit_functions = $config['edit_functions'];
-
 if ($adminer->operators === null) {
 	$adminer->operators = $operators;
-	$adminer->operator_like = $operator_like;
-	$adminer->operator_regexp = $operator_regexp;
 }
 
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
@@ -114,7 +103,6 @@ define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
 	. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')
 );
 
-include "../adminer/include/version.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";

adminer/include/debug.inc.php

@@ -1,14 +0,0 @@
-<?php
-
-function dump($value)
-{
-	echo "<pre>";
-	var_export($value);
-	echo "</pre>\n";
-}
-
-function dumpe($value)
-{
-	dump($value);
-	exit;
-}

adminer/include/design.inc.php

@@ -6,7 +6,7 @@
 * @param string used after colon in title and heading, should be HTML escaped
 * @return null
 */
-function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
+function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	global $LANG, $VERSION, $adminer, $drivers, $jush;
 	page_headers();
 	if (is_ajax() && $error) {
@@ -15,14 +15,6 @@ function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
 	}
 	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
-
-	// Load Adminer version from file if cookie is missing.
-	$filename = get_temp_dir() . "/adminer.version";
-	if (!$_COOKIE["adminer_version"] && file_exists($filename) && filemtime($filename) + 86400 > time()) { // 86400 - 1 day in seconds
-		$data = unserialize(file_get_contents($filename));
-		$_COOKIE["adminer_version"] = $data["version"];
-		cookie("adminer_version", $data["version"], 24 * 3600);
-	}
 	?>
 <!DOCTYPE html>
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
@@ -41,16 +33,32 @@ function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
 <?php } ?>
 
 <body class="<?php echo lang('ltr'); ?> nojs">
+<?php
+	$filename = get_temp_dir() . "/adminer.version";
+	if (!$_COOKIE["adminer_version"] && function_exists('openssl_verify') && file_exists($filename) && filemtime($filename) + 86400 > time()) { // 86400 - 1 day in seconds
+		$version = unserialize(file_get_contents($filename));
+		$public = "-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwqWOVuF5uw7/+Z70djoK
+RlHIZFZPO0uYRezq90+7Amk+FDNd7KkL5eDve+vHRJBLAszF/7XKXe11xwliIsFs
+DFWQlsABVZB3oisKCBEuI71J4kPH8dKGEWR9jDHFw3cWmoH3PmqImX6FISWbG3B8
+h7FIx3jEaw5ckVPVTeo5JRm/1DZzJxjyDenXvBQ/6o9DgZKeNDgxwKzH+sw9/YCO
+jHnq1cFpOIISzARlrHMa/43YfeNRAm/tsBXjSxembBPo7aQZLAWHmaj5+K19H10B
+nCpz9Y++cipkVEiKRGih4ZEvjoFysEOdRLj6WiD/uUNky4xGeA6LaJqh5XpkFkcQ
+fQIDAQAB
+-----END PUBLIC KEY-----
+";
+		if (openssl_verify($version["version"], base64_decode($version["signature"]), $public) == 1) {
+			$_COOKIE["adminer_version"] = $version["version"]; // doesn't need to send to the browser
+		}
+	}
+	?>
 <script<?php echo nonce(); ?>>
-	document.body.onkeydown = bodyKeydown;
+mixin(document.body, {onkeydown: bodyKeydown, onclick: bodyClick<?php
-	document.body.onclick = bodyClick;
+	echo (isset($_COOKIE["adminer_version"]) ? "" : ", onload: partial(verifyVersion, '$VERSION', '" . js_escape(ME) . "', '" . get_token() . "')"); // $token may be empty in auth.inc.php
-	<?php if (!isset($_COOKIE["adminer_version"])): ?>
+	?>});
-	document.body.onload = function () { verifyVersion('<?php echo $VERSION; ?>', '<?php echo js_escape(ME); ?>', '<?php echo get_token(); ?>') };
+document.body.className = document.body.className.replace(/ nojs/, ' js');
-	<?php endif; ?>
+var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
-	document.body.className = document.body.className.replace(/ nojs/, ' js');
+var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
-
-	var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
-	var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
 <div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
@@ -59,34 +67,22 @@ function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
 <div id="content">
 <?php
 	if ($breadcrumb !== null) {
-		echo '<p id="breadcrumb">';
-
 		$link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1);
-		echo '<a href="' . h($link ?: ".") . '">' . lang('Home') . '</a> » ';
+		echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> » ';
-
+		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
-		$server = "";
+		$server = $adminer->serverName(SERVER);
+		$server = ($server != "" ? $server : lang('Server'));
 		if ($breadcrumb === false) {
-			$server .= h($drivers[DRIVER]) . ": ";
+			echo "$server\n";
-		}
-
-		$server_name = $adminer->serverName(SERVER);
-		$server .= $server_name != "" ? h($server_name) : lang('Server');
-
-		if ($breadcrumb === false) {
-			echo h($server), "\n";
 		} else {
-			$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
 			echo "<a href='" . h($link) . "' accesskey='1' title='Alt+Shift+1'>$server</a> » ";
-
 			if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
 				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> » ';
 			}
-
 			if (is_array($breadcrumb)) {
 				if ($_GET["ns"] != "") {
 					echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> » ';
 				}
-
 				foreach ($breadcrumb as $key => $val) {
 					$desc = (is_array($val) ? $val[1] : h($val));
 					if ($desc != "") {
@@ -94,11 +90,9 @@ function page_header($title, $error = "", $breadcrumb = [], $title2 = "") {
 					}
 				}
 			}
-
 			echo "$title\n";
 		}
 	}
-
 	echo "<h2>$title_all</h2>\n";
 	echo "<div id='ajaxstatus' class='jsonly hidden'></div>\n";
 	restart_session();
@@ -132,40 +126,30 @@ function page_headers() {
 	$adminer->headers();
 }
 
-/**
+/** Get Content Security Policy headers
- * Gets Content Security Policy headers.
+* @return array of arrays with directive name in key, allowed sources in value
- *
+*/
- * @return array of arrays with directive name in key, allowed sources in value
- * @throws \Random\RandomException
- */
 function csp() {
-	return [
+	return array(
-		[
+		array(
-			// 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
+			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'", // 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
-			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'",
+			"connect-src" => "'self'",
-			"connect-src" => "'self' https://api.github.com/repos/pematon/adminer/releases/latest",
+			"frame-src" => "https://www.adminer.org",
-			"frame-src" => "'self'",
 			"object-src" => "'none'",
 			"base-uri" => "'none'",
 			"form-action" => "'self'",
-		],
+		),
-	];
+	);
 }
 
-/**
+/** Get a CSP nonce
- * Gets a CSP nonce.
+* @return string Base64 value
- *
+*/
- * @return string Base64 value.
+function get_nonce() {
- * @throws \Random\RandomException
- */
-function get_nonce()
-{
 	static $nonce;
-
 	if (!$nonce) {
-		$nonce = base64_encode(get_random_string(true));
+		$nonce = base64_encode(rand_string());
 	}
-
 	return $nonce;
 }
 
@@ -185,38 +169,28 @@ function page_messages($error) {
 	}
 }
 
-/**
+/** Print HTML footer
- * Prints HTML footer.
+* @param string "auth", "db", "ns"
- *
+* @return null
- * @param $missing string "auth", "db", "ns"
+*/
- */
+function page_footer($missing = "") {
-function page_footer($missing = "")
-{
 	global $adminer, $token;
-
-	echo "</div>"; // #content
-
-	echo "<div id='footer'>\n";
-	switch_lang();
-
-	if ($missing != "auth") {
 	?>
+</div>
 
-	<div class="logout">
+<?php switch_lang(); ?>
-		<form action="" method="post">
+<?php if ($missing != "auth") { ?>
-			<?php echo h($_GET["username"]); ?>
+<form action="" method="post">
-			<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
+<p class="logout">
-			<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo h($_GET["username"]) . "\n"; ?>
-		</form>
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
-	</div>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
-
+</p>
+</form>
+<?php } ?>
+<div id="menu">
+<?php $adminer->navigation($missing); ?>
+</div>
 <?php
-	}
-	echo "</div>\n";
-
-	echo "<div id='menu'>\n";
-	$adminer->navigation($missing);
-	echo "</div>\n";
-
 	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -22,14 +22,14 @@ function get_driver($id) {
 
 /*abstract*/ class Min_SQL {
 	var $_conn;
-
+	
 	/** Create object for performing database operations
 	* @param Min_DB
 	*/
 	function __construct($connection) {
 		$this->_conn = $connection;
 	}
-
+	
 	/** Select data from table
 	* @param string
 	* @param array result of $adminer->selectColumnsProcess()[0]
@@ -61,7 +61,7 @@ function get_driver($id) {
 		}
 		return $return;
 	}
-
+	
 	/** Delete data from table
 	* @param string
 	* @param string " WHERE ..."
@@ -72,7 +72,7 @@ function get_driver($id) {
 		$query = "FROM " . table($table);
 		return queries("DELETE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
 	}
-
+	
 	/** Update data in table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -89,7 +89,7 @@ function get_driver($id) {
 		$query = table($table) . " SET$separator" . implode(",$separator", $values);
 		return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
 	}
-
+	
 	/** Insert data into table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -101,7 +101,7 @@ function get_driver($id) {
 			: " DEFAULT VALUES"
 		));
 	}
-
+	
 	/** Insert or update data in table
 	* @param string
 	* @param array
@@ -111,28 +111,28 @@ function get_driver($id) {
 	/*abstract*/ function insertUpdate($table, $rows, $primary) {
 		return false;
 	}
-
+	
 	/** Begin transaction
 	* @return bool
 	*/
 	function begin() {
 		return queries("BEGIN");
 	}
-
+	
 	/** Commit transaction
 	* @return bool
 	*/
 	function commit() {
 		return queries("COMMIT");
 	}
-
+	
 	/** Rollback transaction
 	* @return bool
 	*/
 	function rollback() {
 		return queries("ROLLBACK");
 	}
-
+	
 	/** Return query with a timeout
 	* @param string
 	* @param int seconds
@@ -140,17 +140,25 @@ function get_driver($id) {
 	*/
 	function slowQuery($query, $timeout) {
 	}
-
+	
 	/** Convert column to be searchable
 	* @param string escaped column name
 	* @param array array("op" => , "val" => )
 	* @param array
 	* @return string
 	*/
-	function convertSearch($idf, array $where, array $field) {
+	function convertSearch($idf, $val, $field) {
 		return $idf;
 	}
 
+	/** Convert operator so it can be used in search
+	* @param string $operator
+	* @return string
+	*/
+	function convertOperator($operator) {
+		return $operator;
+	}
+
 	/** Convert value returned by database to actual value
 	* @param string
 	* @param array
@@ -170,19 +178,19 @@ function get_driver($id) {
 	function quoteBinary($s) {
 		return q($s);
 	}
-
+	
 	/** Get warnings about the last command
 	* @return string HTML
 	*/
 	function warnings() {
 		return '';
 	}
-
+	
 	/** Get help link for table
 	* @param string
 	* @return string relative URL or null
 	*/
 	function tableHelp($name) {
 	}
-
+	
 }

adminer/include/editing.inc.php

@@ -1,4 +1,6 @@
 <?php
+// This file is not used in Adminer Editor.
+
 /** Print select result
 * @param Min_Result
 * @param Min_DB connection to examine indexes
@@ -21,11 +23,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
-				$field = (array)$result->fetch_field();
+				$field = $result->fetch_field();
-				$name = $field["name"];
+				$name = $field->name;
-				$orgtable = $field["orgtable"];
+				$orgtable = $field->orgtable;
-				$orgname = $field["orgname"];
+				$orgname = $field->orgname;
-				$return[$field["table"]] = $orgtable;
+				$return[$field->table] = $orgtable;
 				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
@@ -46,11 +48,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$links[$j] = $orgtable;
 					}
 				}
-				if ($field["charsetnr"] == 63) { // 63 - binary
+				if ($field->charsetnr == 63) { // 63 - binary
 					$blobs[$j] = true;
 				}
-				$types[$j] = $field["type"];
+				$types[$j] = $field->type;
-				echo "<th" . ($orgtable != "" || $field["name"] != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
 					. ($orgtables ? doc_link(array(
 						'sql' => "explain-output.html#explain_" . strtolower($name),
 						'mariadb' => "explain/#the-columns-in-explain-select",
@@ -72,7 +74,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
 					}
 				}
-			} elseif (is_web_url($val)) {
+			} elseif (is_url($val)) {
 				$link = $val;
 			}
 			if ($val === null) {
@@ -86,7 +88,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 				}
 			}
 			if ($link) {
-				$val = "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : '') . ">$val</a>";
+				$val = "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : '') . ">$val</a>";
 			}
 			echo "<td>$val";
 		}
@@ -162,6 +164,41 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "</textarea>";
 }
 
+/** Generate HTML <select> or <input> if $options are empty
+* @param string
+* @param array
+* @param string
+* @param string
+* @param string
+* @return string
+*/
+function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
+	$tag = ($options ? "select" : "input");
+	return "<$tag$attrs" . ($options
+		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
+}
+
+/** Print one row in JSON object
+* @param string or "" to close the object
+* @param string
+* @return null
+*/
+function json_row($key, $val = null) {
+	static $first = true;
+	if ($first) {
+		echo "{";
+	}
+	if ($key != "") {
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
+		$first = false;
+	} else {
+		echo "\n}\n";
+		$first = true;
+	}
+}
+
 /** Print table columns for type edit
 * @param string
 * @param array
@@ -189,6 +226,22 @@ echo optionlist(array_merge($extra_types, $structured_types), $type);
 	echo ($foreign_keys ? "<select name='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
 }
 
+/** Get partition info
+* @param string
+* @return array
+*/
+function get_partitions_info($table) {
+	global $connection;
+	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
+	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+	$return = array();
+	list($return["partition_by"], $return["partition"],  $return["partitions"]) = $result->fetch_row();
+	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+	$return["partition_names"] = array_keys($partitions);
+	$return["partition_values"] = array_values($partitions);
+	return $return;
+}
+
 /** Filter length value including enums
 * @param string
 * @return string
@@ -225,13 +278,12 @@ function process_field($field, $type_field) {
 	if ($field["on_update"]) {
 		$field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
 	}
-
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
 		default_value($field),
-		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE " . $field["on_update"] : ""),
+		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
 		(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
 		($field["auto_increment"] ? auto_increment() : null),
 	);
@@ -242,19 +294,12 @@ function process_field($field, $type_field) {
 * @return string
 */
 function default_value($field) {
+	global $jush;
 	$default = $field["default"];
-	if ($default === null) return "";
+	return ($default === null ? "" : " DEFAULT " .
-
+		(!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-	if (stripos($default, "GENERATED ") === 0) {
+		? q($default) : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", ($jush == "sqlite" ? "($default)" : $default)))
-		return " $default";
+	);
-	}
-
-	// MariaDB exports CURRENT_TIMESTAMP as a function.
-	$default = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $default);
-
-	$quote = preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default);
-
-	return " DEFAULT " . ($quote ? q($default) : $default);
 }
 
 /** Get type class to use in CSS
@@ -274,106 +319,65 @@ function type_class($type) {
 	}
 }
 
-/**
+/** Print table interior for fields editing
- * Prints table interior for fields editing.
+* @param array
- *
+* @param array
- * @param string $type TABLE, FUNCTION or PROCEDURE
+* @param string TABLE or PROCEDURE
- * @param array $foreign_keys returned by referencable_primary()
+* @param array returned by referencable_primary()
- */
+* @return null
-function edit_fields(array $fields, array $collations, $type = "TABLE", $foreign_keys = []) {
+*/
+function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
 	global $inout;
-
 	$fields = array_values($fields);
-	$comment_class = ($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : "class='hidden'";
+	$default_class = (($_POST ? $_POST["defaults"] : adminer_setting("defaults")) ? "" : " class='hidden'");
+	$comment_class = (($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : " class='hidden'");
 	?>
-
 <thead><tr>
-	<?php
+<?php if ($type == "PROCEDURE") { ?><td><?php } ?>
-		if (support("move_col")) {
+<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
-			echo "<td class='jsonly'></td>";
+<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?>
-		}
+<td id="label-length"><?php echo lang('Length'); ?>
-		if ($type == "PROCEDURE") {
+<td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
-			echo "<td></td>";
+<?php if ($type == "TABLE") { ?>
-		}
+<td id="label-null">NULL
-	?>
+<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
-	<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?></th>
+	'sql' => "example-auto-increment.html",
-	<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?></td>
+	'mariadb' => "auto_increment/",
-	<td id="label-length"><?php echo lang('Length'); ?></td>
+	'sqlite' => "autoinc.html",
-	<td><?php echo lang('Options'); /* no label required, options have their own label */ ?></td>
+	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
-	<?php if ($type == "TABLE") { ?>
+	'mssql' => "ms186775.aspx",
-		<td id="label-null">NULL</td>
+)); ?>
-		<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link([
+<td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
-			'sql' => "example-auto-increment.html",
+<?php echo (support("comment") ? "<td id='label-comment'$comment_class>" . lang('Comment') : ""); ?>
-			'mariadb' => "auto_increment/",
+<?php } ?>
-			'sqlite' => "autoinc.html",
+<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>" . script("row_count = " . count($fields) . ";"); ?>
-			'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
+</thead>
-			'mssql' => "ms186775.aspx",
+<tbody>
-		]); ?>
-		</td>
-		<td id="label-default"><?php echo lang('Default value'); ?></td>
-		<?php echo (support("comment") ? "<td id='label-comment' $comment_class>" . lang('Comment') . "</td>" : ""); ?>
-	<?php } ?>
-	<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>" . script("row_count = " . count($fields) . ";"); ?></td>
-</tr></thead>
 <?php
-	echo "<tbody>\n";
+	echo script("mixin(qsl('tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput});");
-
 	foreach ($fields as $i => $field) {
 		$i++;
 		$orig = $field[($_POST ? "orig" : "field")];
 		$display = (isset($_POST["add"][$i-1]) || (isset($field["field"]) && !$_POST["drop_col"][$i])) && (support("drop_col") || $orig == "");
-
+		?>
-		$style = $display ? "" : "style='display: none;'";
+<tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
-		echo "<tr $style>\n";
+<?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-
+<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" data-maxlength="64" autocapitalize="off" aria-labelledby="label-name"><?php } ?>
-		if (support("move_col")) {
+<input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>"><?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
-			echo "<th class='handle jsonly'></th>";
+<?php if ($type == "TABLE") { ?>
+<td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"); ?>
+<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
+			echo checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" aria-labelledby="label-default"><?php
+			echo (support("comment") ? "<td$comment_class><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' data-maxlength='" . (min_version(5.5) ? 1024 : 255) . "' aria-labelledby='label-comment'>" : "");
 		}
-		if ($type == "PROCEDURE") {
-			echo "<td>", html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]), "</td>\n";
-		}
-
-		echo "<th>";
-		if ($display) {
-			echo "<input name='fields[$i][field]' value='", h($field["field"]), "' data-maxlength='64' autocapitalize='off' aria-labelledby='label-name'>";
-		}
-		echo "<input type='hidden' name='fields[$i][orig]' value='",  h($orig), "'>";
-		edit_type("fields[$i]", $field, $collations, $foreign_keys);
-		echo "</th>\n";
-
-		if ($type == "TABLE") {
-			echo "<td>", checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"), "</td>\n";
-
-			$checked = $field["auto_increment"] ? "checked" : "";
-			echo "<td><label class='block'><input type='radio' name='auto_increment_col' value='$i' $checked aria-labelledby='label-ai'></label></td>\n";
-
-			echo "<td>",
-				checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"),
-				"<input name='fields[$i][default]' value='", h($field["default"]), "' aria-labelledby='label-default'>",
-				"</td>\n";
-
-			if (support("comment")) {
-				$max_length = min_version(5.5) ? 1024 : 255;
-				echo "<td $comment_class>",
-					"<input name='fields[$i][comment]' value='", h($field["comment"]), "' data-maxlength='$max_length' aria-labelledby='label-comment'>",
-					"</td>\n";
-			}
-		}
-
 		echo "<td>";
-		if (support("move_col")) {
+		echo (support("move_col") ?
-			echo "<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'> ",
+			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'> "
-				"<input type='image' class='icon hidden' name='up[$i]' src='../adminer/static/up.gif' alt='↑' title='" . lang('Move up') . "'> ",
+			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='↑' title='" . lang('Move up') . "'> "
-				"<input type='image' class='icon hidden' name='down[$i]' src='../adminer/static/down.gif' alt='↓' title='" . lang('Move down') . "'> ";
+			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='↓' title='" . lang('Move down') . "'> "
-		}
+		: "");
-		if ($orig == "" || support("drop_col")) {
+		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" : "");
-			echo "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>";
-		}
-		echo "</td>\n</tr>\n";
 	}
-
-	echo "</tbody>";
-	echo script("mixin(qs('#edit-fields tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput}); initSortable('#edit-fields tbody');");
 }
 
 /** Move fields up and down or add field
@@ -425,43 +429,25 @@ function normalize_enum($match) {
 	return "'" . str_replace("'", "''", addcslashes(stripcslashes(str_replace($match[0][0] . $match[0][0], $match[0][0], substr($match[0], 1, -1))), '\\')) . "'";
 }
 
-/**
+/** Issue grant or revoke commands
- * Issue grant or revoke commands.
+* @param string GRANT or REVOKE
- *
+* @param array
- * @param bool $grant
+* @param string
- * @param array $privileges
+* @param string
- * @param string $columns
+* @return bool
- * @param string $on
+*/
- * @param string $user
+function grant($grant, $privileges, $columns, $on) {
- *
+	if (!$privileges) {
- * @return bool
+		return true;
- */
-function grant($grant, array $privileges, $columns, $on, $user) {
-	if (!$privileges) return true;
-
-	if ($privileges == ["ALL PRIVILEGES", "GRANT OPTION"]) {
-		if ($grant) {
-			return (bool) queries("GRANT ALL PRIVILEGES ON $on TO $user WITH GRANT OPTION");
-		} else {
-			return queries("REVOKE ALL PRIVILEGES ON $on FROM $user") &&
-				queries("REVOKE GRANT OPTION ON $on FROM $user");
-		}
 	}
-
+	if ($privileges == array("ALL PRIVILEGES", "GRANT OPTION")) {
-	if ($privileges == ["GRANT OPTION", "PROXY"]) {
+		// can't be granted or revoked together
-		if ($grant) {
+		return ($grant == "GRANT"
-			return (bool) queries("GRANT PROXY ON $on TO $user WITH GRANT OPTION");
+			? queries("$grant ALL PRIVILEGES$on WITH GRANT OPTION")
-		} else {
+			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
-			return (bool) queries("REVOKE PROXY ON $on FROM $user");
+		);
-		}
 	}
-
+	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
-	return (bool) queries(
-		($grant ? "GRANT " : "REVOKE ") .
-		preg_replace('~(GRANT OPTION)\([^)]*\)~', '$1', implode("$columns, ", $privileges) . $columns) .
-		" ON $on " .
-		($grant ? "TO " : "FROM ") . $user
-	);
 }
 
 /** Drop old object and create a new one
@@ -597,39 +583,27 @@ function ini_bytes($ini) {
 	return $val;
 }
 
-/**
+/** Create link to database documentation
- * Creates link to database documentation.
+* @param array $jush => $path
- *
+* @param string HTML code
- * @param array $paths $jush => $path
+* @return string HTML code
- * @param string $text HTML code
+*/
- *
+function doc_link($paths, $text = "<sup>?</sup>") {
- * @return string HTML code
- */
-function doc_link(array $paths, $text = "<sup>?</sup>") {
 	global $jush, $connection;
-
 	$server_info = $connection->server_info;
 	$version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
-
+	$urls = array(
-	$urls = [
 		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
 		'sqlite' => "https://www.sqlite.org/",
 		'pgsql' => "https://www.postgresql.org/docs/$version/",
 		'mssql' => "https://msdn.microsoft.com/library/",
 		'oracle' => "https://www.oracle.com/pls/topic/lookup?ctx=db" . preg_replace('~^.* (\d+)\.(\d+)\.\d+\.\d+\.\d+.*~s', '\1\2', $server_info) . "&id=",
-		'elastic' => "https://www.elastic.co/guide/en/elasticsearch/reference/$version/",
+	);
-	];
-
 	if (preg_match('~MariaDB~', $server_info)) {
-		$urls['sql'] = "https://mariadb.com/kb/en/library/";
+		$urls['sql'] = "https://mariadb.com/kb/en/";
 		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
 	}
-
+	return ($paths[$jush] ? "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>" : "");
-	if (!isset($paths[$jush]) || !$paths[$jush] ) {
-		return "";
-	}
-
-	return "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>";
 }
 
 /** Wrap gzencode() for usage in ob_start()
@@ -637,7 +611,7 @@ function doc_link(array $paths, $text = "<sup>?</sup>") {
 * @return string
 */
 function ob_gzencode($string) {
-	// ob_start() callback recieves an optional parameter $phase but gzencode() accepts optional parameter $level
+	// ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
 	return gzencode($string);
 }
 

adminer/include/errors.inc.php

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

adminer/include/functions.inc.php

@@ -1,4 +1,5 @@
 <?php
+// This file is used both in Adminer and Adminer Editor.
 
 /** Get database connection
 * @return Min_DB
@@ -108,7 +109,7 @@ function min_version($version, $maria_db = "", $connection2 = null) {
 		$server_info = $match[1];
 		$version = $maria_db;
 	}
-	return (version_compare($server_info, $version) >= 0);
+	return $version && version_compare($server_info, $version) >= 0;
 }
 
 /** Get connection charset
@@ -158,6 +159,14 @@ function h($string) {
 	return str_replace("\0", "&#0;", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
+/** Convert \n to <br>
+* @param string
+* @return string
+*/
+function nl_br($string) {
+	return str_replace("\n", "<br>", $string); // nl2br() uses XHTML before PHP 5.3
+}
+
 /** Generate HTML checkbox
 * @param string
 * @param string
@@ -206,7 +215,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 * @param string
 * @param array
 * @param string
-* @param string|bool true for no onchange, false for radio
+* @param string true for no onchange, false for radio
 * @param string
 * @return string
 */
@@ -225,22 +234,6 @@ function html_select($name, $options, $value = "", $onchange = true, $labelled_b
 	return $return;
 }
 
-/** Generate HTML <select> or <input> if $options are empty
-* @param string
-* @param array
-* @param string
-* @param string
-* @param string
-* @return string
-*/
-function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
-	$tag = ($options ? "select" : "input");
-	return "<$tag $attrs" . ($options
-		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
-		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
-	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
-}
-
 /** Get onclick confirmation
 * @param string
 * @param string
@@ -250,17 +243,18 @@ function confirm($message = "", $selector = "qsl('input')") {
 	return script("$selector.onclick = function () { return confirm('" . ($message ? js_escape($message) : lang('Are you sure?')) . "'); };", "");
 }
 
-/**
+/** Print header for hidden fieldset (close by </div></fieldset>)
- * Prints header for hidden fieldset (close by </div></fieldset>)
+* @param string
- * @param $id string
+* @param string
- * @param $legend string
+* @param bool
- */
+* @return null
-function print_fieldset($id, $legend, $visible = false, $sortable = false) {
+*/
+function print_fieldset($id, $legend, $visible = false) {
 	echo "<fieldset><legend>";
 	echo "<a href='#fieldset-$id'>$legend</a>";
 	echo script("qsl('a').onclick = partial(toggle, 'fieldset-$id');", "");
 	echo "</legend>";
-	echo "<div id='fieldset-$id' class='" . ($visible ? "" : "hidden") . ($sortable ? " sortable" : "") . "'>\n";
+	echo "<div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
 }
 
 /** Return class='active' if $bold is true
@@ -292,25 +286,6 @@ function js_escape($string) {
 	return addcslashes($string, "\r\n'\\/"); // slash for <script>
 }
 
-/** Print one row in JSON object
-* @param string or "" to close the object
-* @param string
-* @return null
-*/
-function json_row($key, $val = null) {
-	static $first = true;
-	if ($first) {
-		echo "{";
-	}
-	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
-		$first = false;
-	} else {
-		echo "\n}\n";
-		$first = true;
-	}
-}
-
 /** Get INI boolean value
 * @param string
 * @return bool
@@ -320,7 +295,7 @@ function ini_bool($ini) {
 	return (preg_match('~^(on|true|yes)$~i', $val) || (int) $val); // boolean values set by php_value are strings
 }
 
-/** Check if SID is neccessary
+/** Check if SID is necessary
 * @return bool
 */
 function sid() {
@@ -469,36 +444,25 @@ function escape_key($key) {
 */
 function where($where, $fields = array()) {
 	global $connection, $jush;
-
+	$return = array();
-	$conditions = [];
-
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
-
+		$return[] = $column
-		if ($jush == "sql" && $fields[$key]["type"] == "json") {
+			. ($jush == "sql" && $fields[$key]["type"] == "json" ? " = CAST(" . q($val) . " AS JSON)"
-			$conditions[] = "$column = CAST(" . q($val) . " AS JSON)";
+				: ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
-		} elseif ($jush == "sql" && is_numeric($val) && strpos($val, ".") !== false) {
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
-			// LIKE because of floats but slow with ints.
+				: " = " . unconvert_field($fields[$key], q($val))
-			$conditions[] = "$column LIKE " . q($val);
+			)))
-		} elseif ($jush == "mssql") {
+		; //! enum and set
-			// LIKE because of text.
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
-			$conditions[] = "$column LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val));
+			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
-		} else {
-			$conditions[] = "$column = " . unconvert_field($fields[$key], q($val));
-		}
-
-		// Not just [a-z] to catch non-ASCII characters.
-		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) {
-			$conditions[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
-
 	foreach ((array) $where["null"] as $key) {
-		$conditions[] = escape_key($key) . " IS NULL";
+		$return[] = escape_key($key) . " IS NULL";
 	}
-
+	return implode(" AND ", $return);
-	return implode(" AND ", $conditions);
 }
 
 /** Create SQL condition from query string
@@ -890,7 +854,7 @@ function hidden_fields_get() {
 */
 function table_status1($table, $fast = false) {
 	$return = table_status($table, $fast);
-	return ($return ?: array("Name" => $table));
+	return ($return ? $return : array("Name" => $table));
 }
 
 /** Find out foreign keys for each column
@@ -918,16 +882,13 @@ function column_foreign_keys($table) {
 */
 function enum_input($type, $attrs, $field, $value, $empty = null) {
 	global $adminer;
-
-	$return = ($empty !== null && !is_strict_mode() ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
-
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
+	$return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $val));
 		$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
 		$return .= " <label><input type='$type'$attrs value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
 	}
-
 	return $return;
 }
 
@@ -939,15 +900,14 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 */
 function input($field, $value, $function) {
 	global $types, $adminer, $jush;
-
 	$name = h(bracket_escape($field["field"]));
-
+	echo "<td class='function'>";
 	if (is_array($value) && !$function) {
 		$args = array($value);
 		if (version_compare(PHP_VERSION, 5.4) >= 0) {
 			$args[] = JSON_PRETTY_PRINT;
 		}
-		$value = call_user_func_array('json_encode', $args);
+		$value = call_user_func_array('json_encode', $args); //! requires PHP 5.2
 		$function = "json";
 	}
 	$reset = ($jush == "mssql" && $field["auto_increment"]);
@@ -955,28 +915,24 @@ function input($field, $value, $function) {
 		$function = null;
 	}
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
-
 	$disabled = stripos($field["default"], "GENERATED ALWAYS AS ") === 0 ? " disabled=''" : "";
-	$attrs = " name='fields[$name]' $disabled";
+	$attrs = " name='fields[$name]'$disabled";
-
-	echo "<td class='function'>";
-
 	if ($field["type"] == "enum") {
-		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value, $function);
+		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
-			? "<select name='function[$name]' $disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+			? "<select name='function[$name]'$disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
 				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
 				. script("qsl('select').onchange = functionChange;", "")
 			: h(reset($functions))
 		) . '<td>';
-		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value, $function); // usage in call is without a table
+		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
 		} elseif (preg_match('~bool~', $field["type"])) {
-			echo "<input type='hidden'$attrs value='0'>" .
+			echo "<input type='hidden'$attrs value='0'>"
-				"<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
+				. "<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
 		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
@@ -991,7 +947,7 @@ function input($field, $value, $function) {
 				$attrs .= " cols='50' rows='12'";
 			} else {
 				$rows = min(12, substr_count($value, "\n") + 1);
-				$attrs .= " cols='30' rows='$rows'";
+				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
 			}
 			echo "<textarea$attrs>" . h($value) . '</textarea>';
 		} elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
@@ -1005,8 +961,7 @@ function input($field, $value, $function) {
 			// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
 			echo "<input"
 				. ((!$has_function || $function === "") && preg_match('~(?<!o)int(?!er)~', $field["type"]) && !preg_match('~\[\]~', $field["full_type"]) ? " type='number'" : "")
-				. ($function != "now" ? " value='" . h($value) . "'" : " data-last-value='" . h($value) . "'")
+				. " value='" . h($value) . "'" . ($maxlength ? " data-maxlength='$maxlength'" : "")
-				. ($maxlength ? " data-maxlength='$maxlength'" : "")
 				. (preg_match('~char|binary~', $field["type"]) && $maxlength > 20 ? " size='40'" : "")
 				. "$attrs>"
 			;
@@ -1020,7 +975,9 @@ function input($field, $value, $function) {
 			}
 			$first++;
 		}
-		echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
+		if ($first) {
+			echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
+		}
 	}
 }
 
@@ -1094,7 +1051,7 @@ function fields_from_edit() {
 		$name = bracket_escape($key, 1); // 1 - back
 		$return[$name] = array(
 			"field" => $name,
-			"privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
+			"privileges" => array("insert" => 1, "update" => 1),
 			"null" => 1,
 			"auto_increment" => ($key == $driver->primary),
 		);
@@ -1125,27 +1082,6 @@ function search_tables() {
 	echo ($sep ? "<p class='message'>" . lang('No tables.') : "</ul>") . "\n";
 }
 
-/**
- * @param string $table
- * @return array
- */
-function get_partitions_info($table) {
-	global $connection;
-
-	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
-
-	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
-
-	$info = [];
-	list($info["partition_by"], $info["partition"],  $info["partitions"]) = $result->fetch_row();
-
-	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
-	$info["partition_names"] = array_keys($partitions);
-	$info["partition_values"] = array_values($partitions);
-
-	return $info;
-}
-
 /** Send headers for export
 * @param string
 * @param bool
@@ -1206,98 +1142,60 @@ function get_temp_dir() {
 	return $return;
 }
 
-/**
+/** Open and exclusively lock a file
- * Opens and exclusively lock a file.
+* @param string
- *
+* @return resource or null for error
- * @param string $filename
+*/
- * @return resource|null
+function file_open_lock($filename) {
- */
+	$fp = @fopen($filename, "r+"); // @ - may not exist
-function open_file_with_lock($filename)
+	if (!$fp) { // c+ is available since PHP 5.2.6
-{
+		$fp = @fopen($filename, "w"); // @ - may not be writable
-	$file = fopen($filename, "c+");
+		if (!$fp) {
-	if (!$file) {
+			return;
-		return null;
+		}
+		chmod($filename, 0660);
 	}
-
+	flock($fp, LOCK_EX);
-	chmod($filename, 0660);
+	return $fp;
-
-	if (!flock($file, LOCK_EX)) {
-		fclose($file);
-		return null;
-	}
-
-	return $file;
 }
 
-/**
+/** Write and unlock a file
- * Writes and unlocks a file.
+* @param resource
- *
+* @param string
- * @param resource $file
+*/
- * @param string $data
+function file_write_unlock($fp, $data) {
- */
+	rewind($fp);
-function write_and_unlock_file($file, $data)
+	fwrite($fp, $data);
-{
+	ftruncate($fp, strlen($data));
-	rewind($file);
+	flock($fp, LOCK_UN);
-	fwrite($file, $data);
+	fclose($fp);
-	ftruncate($file, strlen($data));
-
-	unlock_file($file);
 }
 
-/**
+/** Read password from file adminer.key in temporary directory or create one
- * Unlocks and closes the file.
+* @param bool
- *
+* @return string or false if the file can not be created
- * @param resource $file
+*/
- */
+function password_file($create) {
-function unlock_file($file)
-{
-	flock($file, LOCK_UN);
-	fclose($file);
-}
-
-/**
- * Reads password from file adminer.key in temporary directory or create one.
- *
- * @param $create bool
- * @return string|false Returns false if the file can not be created.
- * @throws \Random\RandomException
- */
-function get_private_key($create)
-{
 	$filename = get_temp_dir() . "/adminer.key";
-
+	$return = @file_get_contents($filename); // @ - may not exist
-	if (!$create && !file_exists($filename)) {
+	if ($return || !$create) {
-		return false;
+		return $return;
 	}
-
+	$fp = @fopen($filename, "w"); // @ - can have insufficient rights //! is not atomic
-	$file = open_file_with_lock($filename);
+	if ($fp) {
-	if (!$file) {
+		chmod($filename, 0660);
-		return false;
+		$return = rand_string();
+		fwrite($fp, $return);
+		fclose($fp);
 	}
-
+	return $return;
-	$key = stream_get_contents($file);
-	if (!$key) {
-		$key = get_random_string();
-		write_and_unlock_file($file, $key);
-	} else {
-		unlock_file($file);
-	}
-
-	return $key;
 }
 
-/**
+/** Get a random string
- * Returns a random 32 characters long string.
+* @return string 32 hexadecimal characters
- *
+*/
- * @param $binary bool
+function rand_string() {
- * @return string
+	return md5(uniqid(mt_rand(), true));
- * @throws \Random\RandomException
- */
-function get_random_string($binary = false)
-{
-	$bytes = function_exists('random_bytes') ? random_bytes(32) : uniqid(mt_rand(), true);
-
-	return $binary ? $bytes : md5($bytes);
 }
 
 /** Format value to use in select
@@ -1317,7 +1215,7 @@ function select_value($val, $link, $field, $text_length) {
 				. "<td>" . select_value($v, $link, $field, $text_length)
 			;
 		}
-		return "<table>$return</table>";
+		return "<table cellspacing='0'>$return</table>";
 	}
 	if (!$link) {
 		$link = $adminer->selectLink($val, $field);
@@ -1326,7 +1224,7 @@ function select_value($val, $link, $field, $text_length) {
 		if (is_mail($val)) {
 			$link = "mailto:$val";
 		}
-		if (is_web_url($val)) {
+		if (is_url($val)) {
 			$link = $val; // IE 11 and all modern browsers hide referrer
 		}
 	}
@@ -1347,32 +1245,20 @@ function select_value($val, $link, $field, $text_length) {
 * @param string
 * @return bool
 */
-function is_mail($value) {
+function is_mail($email) {
-	return is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL);
+	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
+	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
+	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
+	return is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
 }
 
-/** Check whether the string is web URL address
+/** Check whether the string is URL address
 * @param string
 * @return bool
 */
-function is_web_url($value) {
+function is_url($string) {
-	if (!is_string($value) || !preg_match('~^https?://~i', $value)) {
+	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
-		return false;
+	return preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
-	}
-
-	$components = parse_url($value);
-    if (!$components) {
-        return false;
-    }
-
-    // Encode URL path. If path was encoded already, it will be encoded twice, but we are OK with that.
-	$encodedParts = array_map('urlencode', explode('/', $components['path']));
-	$url = str_replace($components['path'], implode('/', $encodedParts), $value);
-
-	parse_str($components['query'], $params);
-	$url = str_replace($components['query'], http_build_query($params), $url);
-
-	return (bool)filter_var($url, FILTER_VALIDATE_URL);
 }
 
 /** Check if field should be shortened
@@ -1523,7 +1409,6 @@ function edit_form($table, $fields, $row, $update) {
 		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
 	} else {
 		echo "<table cellspacing='0' class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
-
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
 			$default = $_GET["set"][bracket_escape($name)];
@@ -1560,6 +1445,10 @@ function edit_form($table, $fields, $row, $update) {
 				$value = "";
 				$function = "now";
 			}
+			if ($field["type"] == "uuid" && $value == "uuid()") {
+				$value = "";
+				$function = "uuid";
+			}
 			input($field, $value, $function);
 			echo "\n";
 		}

adminer/include/lang.inc.php

@@ -5,7 +5,7 @@ $langs = array(
 	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com | Hossain Ahmed Saiman - hossain.ahmed@altscope.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com, Hossain Ahmed Saiman - hossain.ahmed@altscope.com
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
@@ -87,11 +87,11 @@ function lang($idf, $number = null) {
 
 function switch_lang() {
 	global $LANG, $langs;
-	echo "<div id='lang'><form action='' method='post'>\n";
+	echo "<form action='' method='post'>\n<div id='lang'>";
 	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
 	echo "<input type='hidden' name='token' value='" . get_token() . "'>\n"; // $token may be empty in auth.inc.php
-	echo "</form></div>\n";
+	echo "</div>\n</form>\n";
 }
 
 if (isset($_POST["lang"]) && verify_token()) { // $error not yet available

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.10";
+$VERSION = "4.16.0";

adminer/lang/ar.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'بيانات الدخول غير صالحة.',
 	'Server' => 'الخادم',
 	'Username' => 'اسم المستخدم',
 	'Password' => 'كلمة المرور',
@@ -31,7 +30,6 @@ $translations = array(
 	'Create database' => 'إنشاء قاعدة بيانات',
 	'SQL command' => 'استعلام SQL',
 	'Logout' => 'تسجيل الخروج',
-	'database' => 'قاعدة بيانات',
 	'Use' => 'استعمال',
 	'No tables.' => 'لا توجد جداول.',
 	'select' => 'تحديد',
@@ -189,7 +187,6 @@ $translations = array(
 	'Clone' => 'نسخ',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s.',
 	'Partition by' => 'مقسم بواسطة',
-	'Partition' => null,
 	'Partitions' => 'التقسيمات',
 	'Partition name' => 'اسم التقسيم',
 	'Values' => 'القيم',
@@ -225,7 +222,6 @@ $translations = array(
 	'Databases have been dropped.' => 'تم حذف قواعد البيانات.',
 	'Database has been dropped.' => 'تم حذف قاعدة البيانات.',
 	'Search data in tables' => 'بحث في الجداول',
-	'as a regular expression' => null,
 	'Schema' => 'المخطط',
 	'Alter schema' => 'تعديل المخطط',
 	'Create schema' => 'إنشاء مخطط',
@@ -267,50 +263,4 @@ $translations = array(
 	'Permanent link' => 'رابط دائم',
 	'Edit all' => 'تعديل الكل',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/bg.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Система',
 	'Server' => 'Сървър',
 	'Username' => 'Потребител',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Изход',
 	'Logged as: %s' => 'Текущ потребител: %s',
 	'Logout successful.' => 'Излизането е успешно.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Невалидни потребителски данни.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Прекалено много неуспешни опити за вход, опитайте пак след %d минута.', 'Прекалено много неуспешни опити за вход, опитайте пак след %d минути.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Главната парола вече е невалидна. <a href="https://www.adminer.org/en/extension/"%s>Изберете</a> %s метод, за да я направите постоянна.',
 	'Language' => 'Език',
@@ -23,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесията е изтекла; моля, влезте отново.',
 	'%s version: %s through PHP extension %s' => '%s версия: %s през PHP разширение %s',
 	'Refresh' => 'Обновяване',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Права',
 	'Create user' => 'Създаване на потребител',
 	'User has been dropped.' => 'Потребителя беше премахнат.',
@@ -37,14 +36,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Осигуряване',
 	'Revoke' => 'Отнемане',
-
+	
 	'Process list' => 'Списък с процеси',
 	'%d process(es) have been killed.' => array('%d процес беше прекъснат.', '%d процеса бяха прекъснати.'),
 	'Kill' => 'Прекъсване',
-
+	
 	'Variables' => 'Променливи',
 	'Status' => 'Състояние',
-
+	
 	'SQL command' => 'SQL команда',
 	'%d query(s) executed OK.' => array('%d заявка е изпълнена.', '%d заявки са изпълнени.'),
 	'Query executed OK, %d row(s) affected.' => array('Заявката е изпълнена, %d ред е засегнат.', 'Заявката е изпълнена, %d редове са засегнати.'),
@@ -58,7 +57,7 @@ $translations = array(
 	'History' => 'Хронология',
 	'Clear' => 'Изчистване',
 	'Edit all' => 'Редактиране на всички',
-
+	
 	'File upload' => 'Прикачване на файл',
 	'From server' => 'От сървър',
 	'Webserver file %s' => 'Сървърен файл %s',
@@ -70,16 +69,15 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Изпратени са прекалено много данни. Намалете обема на данните или увеличете %s управляващата директива.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Можете да прикачите голям SQL файл чрез FTP и да го импортирате от сървъра.',
 	'You are offline.' => 'Вие сте офлайн.',
-
+	
 	'Export' => 'Експорт',
 	'Output' => 'Резултат',
 	'open' => 'показване',
 	'save' => 'запис',
 	'Format' => 'Формат',
 	'Data' => 'Данни',
-
+	
 	'Database' => 'База данни',
-	'database' => 'база данни',
 	'Use' => 'Избор',
 	'Select database' => 'Избор на база данни',
 	'Invalid database.' => 'Невалидна база данни.',
@@ -91,10 +89,10 @@ $translations = array(
 	'Alter database' => 'Промяна на база данни',
 	'Create database' => 'Създаване на база данни',
 	'Database schema' => 'Схема на базата данни',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Постоянна препратка',
-
+	
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -117,7 +115,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиците бяха преместени.',
 	'Copy' => 'Копиране',
 	'Tables have been copied.' => 'Таблиците бяха копирани.',
-
+	
 	'Routines' => 'Процедури',
 	'Routine has been called, %d row(s) affected.' => array('Беше приложена процедура, %d ред е засегнат.', 'Беше приложена процедура, %d редове са засегнати.'),
 	'Call' => 'Прилагане',
@@ -130,7 +128,7 @@ $translations = array(
 	'Alter function' => 'Промяна на функция',
 	'Alter procedure' => 'Промяна на процедура',
 	'Return type' => 'Резултат',
-
+	
 	'Events' => 'Събития',
 	'Event has been dropped.' => 'Събитието беше премахнато.',
 	'Event has been altered.' => 'Събитието беше променено.',
@@ -143,7 +141,7 @@ $translations = array(
 	'Start' => 'Начало',
 	'End' => 'Край',
 	'On completion preserve' => 'Запазване след завършване',
-
+	
 	'Tables' => 'Таблици',
 	'Tables and views' => 'Таблици и изгледи',
 	'Table' => 'Таблица',
@@ -175,13 +173,12 @@ $translations = array(
 	'Move down' => 'Преместване надолу',
 	'Remove' => 'Премахване',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Максималния брой полета е превишен. Моля, увеличете %s.',
-
+	
 	'Partition by' => 'Разделяне на',
-	'Partition' => null,
 	'Partitions' => 'Раздели',
 	'Partition name' => 'Име на раздела',
 	'Values' => 'Стойности',
-
+	
 	'View' => 'Изглед',
 	'Materialized view' => 'Запаметен изглед',
 	'View has been dropped.' => 'Изгледа беше премахнат.',
@@ -189,14 +186,14 @@ $translations = array(
 	'View has been created.' => 'Изгледа беше създаден.',
 	'Alter view' => 'Промяна на изглед',
 	'Create view' => 'Създаване на изглед',
-
+	
 	'Indexes' => 'Индекси',
 	'Indexes have been altered.' => 'Индексите бяха променени.',
 	'Alter indexes' => 'Промяна на индекси',
 	'Add next' => 'Добавяне на следващ',
 	'Index Type' => 'Вид на индекса',
 	'Column (length)' => 'Колона (дължина)',
-
+	
 	'Foreign keys' => 'Препратки',
 	'Foreign key' => 'Препратка',
 	'Foreign key has been dropped.' => 'Препратката беше премахната.',
@@ -212,7 +209,7 @@ $translations = array(
 	'ON DELETE' => 'При изтриване',
 	'ON UPDATE' => 'При промяна',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Колоните източник и цел трябва да са от еднакъв вид, трябва да има индекс на колоните приемник и да има въведени данни.',
-
+	
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Добавяне на тригер',
 	'Trigger has been dropped.' => 'Тригера беше премахнат.',
@@ -223,7 +220,7 @@ $translations = array(
 	'Time' => 'Време',
 	'Event' => 'Събитие',
 	'Name' => 'Име',
-
+	
 	'select' => 'показване',
 	'Select' => 'Показване',
 	'Select data' => 'Показване на данни',
@@ -232,7 +229,6 @@ $translations = array(
 	'Search' => 'Търсене',
 	'anywhere' => 'навсякъде',
 	'Search data in tables' => 'Търсене на данни в таблиците',
-	'as a regular expression' => null,
 	'Sort' => 'Сортиране',
 	'descending' => 'низходящо',
 	'Limit' => 'Редове',
@@ -250,16 +246,16 @@ $translations = array(
 	'Loading' => 'Зареждане',
 	'Whole result' => 'Пълен резултат',
 	'%d byte(s)' => array('%d байт', '%d байта'),
-
+	
 	'Import' => 'Импорт',
 	'%d row(s) have been imported.' => array('%d ред беше импортиран.', '%d реда бяха импортирани.'),
 	'File must be in UTF-8 encoding.' => 'Файла трябва да е с UTF-8 кодировка.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Промяна',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+щракване в стойността, за да я промените.',
 	'Use edit link to modify this value.' => 'Използвайте "редакция" за промяна на данните.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Елементи%s бяха вмъкнати.',
 	'Item has been deleted.' => 'Елемента беше изтрит.',
@@ -280,14 +276,14 @@ $translations = array(
 	'Clone' => 'Клониране',
 	'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' => 'Дата и час',
@@ -297,7 +293,7 @@ $translations = array(
 	'Network' => 'Мрежа',
 	'Geometry' => 'Геометрия',
 	'Relations' => 'Зависимости',
-
+	
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -308,11 +304,11 @@ $translations = array(
 	'now' => 'сега',
 	'yes' => 'да',
 	'no' => 'не',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файла вече съществува.',
 	'Please use one of the extensions %s.' => 'Моля, използвайте някое от разширенията %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Промяна на схемата',
 	'Create schema' => 'Създаване на схема',
@@ -321,7 +317,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схемата беше променена.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невалидна схема.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Последователности',
 	'Create sequence' => 'Създаване на последователност',
@@ -329,33 +325,11 @@ $translations = array(
 	'Sequence has been created.' => 'Последователността беше създадена.',
 	'Sequence has been altered.' => 'Последователността беше променена.',
 	'Alter sequence' => 'Промяна на последователност',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Видове потребители',
 	'Create type' => 'Създаване на вид',
 	'Type has been dropped.' => 'Вида беше пермахнат.',
 	'Type has been created.' => 'Вида беше създаден.',
 	'Alter type' => 'Промяна на вид',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Да',
-	'No' => 'Не',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/bn.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'লগইন',
 	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
 	'Server' => 'সার্ভার',
 	'Username' => 'ইউজারের নাম',
 	'Password' => 'পাসওয়ার্ড',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'ডাটাবেজ তৈরী করুন',
 	'SQL command' => 'SQL-কমান্ড',
 	'Logout' => 'লগআউট',
-	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
 	'No tables.' => 'কোন টেবিল নাই।',
 	'select' => 'নির্বাচন',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'ক্লোন',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
 	'Partition by' => 'পার্টিশন যার মাধ্যমে',
-	'Partition' => null,
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
 	'Values' => 'মানসমূহ',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
 	'Search data in tables' => 'টেবিলে তথ্য খুঁজুন',
-	'as a regular expression' => null,
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -267,50 +263,4 @@ $translations = array(
 	'Permanent link' => 'স্থায়ী লিংক',
 	'Edit all' => 'সবগুলো সম্পাদনা করুন',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/bs.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Server',
 	'Username' => 'Korisničko ime',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Odjava',
 	'Logged as: %s' => 'Prijavi se kao: %s',
 	'Logout successful.' => 'Uspešna odjava.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Nevažeće dozvole.',
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
 	'No extension' => 'Bez dodataka',
@@ -74,7 +73,6 @@ $translations = array(
 	'Data' => 'Podaci',
 
 	'Database' => 'Baza podataka',
-	'database' => 'baza podataka',
 	'Use' => 'Koristi',
 	'Select database' => 'Izaberite bazu',
 	'Invalid database.' => 'Neispravna baza podataka.',
@@ -168,7 +166,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Premašen je maksimalni broj dozvoljenih polja. Molim uvećajte %s.',
 
 	'Partition by' => 'Podijeli po',
-	'Partition' => null,
 	'Partitions' => 'Podijele',
 	'Partition name' => 'Ime podijele',
 	'Values' => 'Vrijednosti',
@@ -223,7 +220,6 @@ $translations = array(
 	'Search' => 'Pretraga',
 	'anywhere' => 'bilo gdje',
 	'Search data in tables' => 'Pretraži podatke u tabelama',
-	'as a regular expression' => null,
 	'Sort' => 'Poređaj',
 	'descending' => 'opadajuće',
 	'Limit' => 'Granica',
@@ -321,41 +317,4 @@ $translations = array(
 	'Type has been dropped.' => 'Tip je izbrisan.',
 	'Type has been created.' => 'tip je spašen.',
 	'Alter type' => 'Ažuriraj tip',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Da',
-	'No' => 'Ne',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ca.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Credencials invàlides.',
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Crea una base de dades',
 	'SQL command' => 'Ordre SQL',
 	'Logout' => 'Desconnecta',
-	'database' => 'base de dades',
 	'Use' => 'Utilitza',
 	'No tables.' => 'No hi ha cap taula.',
 	'select' => 'registres',
@@ -190,7 +188,6 @@ $translations = array(
 	'Tables have been dropped.' => 'S\'han suprimit les taules.',
 	'Clone' => 'Clona',
 	'Partition by' => 'Fes particions segons',
-	'Partition' => null,
 	'Partitions' => 'Particions',
 	'Partition name' => 'Nom de la partició',
 	'Values' => 'Valors',
@@ -253,7 +250,6 @@ $translations = array(
 	'Type has been created.' => 'S\'ha creat el tipus.',
 	'Alter type' => 'Modifica el tipus',
 	'Search data in tables' => 'Cerca dades en les taules',
-	'as a regular expression' => null,
 	'From server' => 'En el servidor',
 	'empty' => 'buit',
 	'now' => 'ara',
@@ -268,49 +264,4 @@ $translations = array(
 	'Permanent link' => 'Enllaç permanent',
 	'Edit all' => 'Edita-ho tot',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/cs.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => 'Domů',
 	'System' => 'Systém',
 	'Server' => 'Server',
 	'Username' => 'Uživatel',
@@ -12,7 +11,7 @@ $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.',
-	'Invalid server or credentials.' => 'Neplatný server nebo přihlašovací údaje.',
+	'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>.',
 	'Database does not support password.' => 'Databáze nepodporuje heslo.',
@@ -30,10 +29,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
 	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
 	'Refresh' => 'Obnovit',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Oprávnění',
 	'Create user' => 'Vytvořit uživatele',
 	'User has been dropped.' => 'Uživatel byl odstraněn.',
@@ -44,14 +43,14 @@ $translations = array(
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
-
+	
 	'Process list' => 'Seznam procesů',
 	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
 	'Kill' => 'Ukončit',
-
+	
 	'Variables' => 'Proměnné',
 	'Status' => 'Stav',
-
+	
 	'SQL command' => 'SQL příkaz',
 	'%d query(s) executed OK.' => array('%d příkaz proběhl v pořádku.', '%d příkazy proběhly v pořádku.', '%d příkazů proběhlo v pořádku.'),
 	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
@@ -68,7 +67,7 @@ $translations = array(
 	'History' => 'Historie',
 	'Clear' => 'Vyčistit',
 	'Edit all' => 'Upravit vše',
-
+	
 	'File upload' => 'Nahrání souboru',
 	'From server' => 'Ze serveru',
 	'Webserver file %s' => 'Soubor %s na webovém serveru',
@@ -80,16 +79,15 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Velký SQL soubor můžete nahrát pomocí FTP a importovat ho ze serveru.',
 	'You are offline.' => 'Jste offline.',
-
+	
 	'Export' => 'Export',
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
 	'Format' => 'Formát',
 	'Data' => 'Data',
-
+	
 	'Database' => 'Databáze',
-	'database' => 'databáze',
 	'DB' => 'DB',
 	'Use' => 'Vybrat',
 	'Select database' => 'Vybrat databázi',
@@ -102,10 +100,10 @@ $translations = array(
 	'Alter database' => 'Pozměnit databázi',
 	'Create database' => 'Vytvořit databázi',
 	'Database schema' => 'Schéma databáze',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Trvalý odkaz',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -129,7 +127,7 @@ $translations = array(
 	'Copy' => 'Zkopírovat',
 	'Tables have been copied.' => 'Tabulky byly zkopírovány.',
 	'overwrite' => 'přepsat',
-
+	
 	'Routines' => 'Procedury a funkce',
 	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
 	'Call' => 'Zavolat',
@@ -142,7 +140,7 @@ $translations = array(
 	'Alter function' => 'Změnit funkci',
 	'Alter procedure' => 'Změnit proceduru',
 	'Return type' => 'Návratový typ',
-
+	
 	'Events' => 'Události',
 	'Event has been dropped.' => 'Událost byla odstraněna.',
 	'Event has been altered.' => 'Událost byla změněna.',
@@ -155,7 +153,7 @@ $translations = array(
 	'Start' => 'Začátek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po dokončení zachovat',
-
+	
 	'Tables' => 'Tabulky',
 	'Tables and views' => 'Tabulky a pohledy',
 	'Table' => 'Tabulka',
@@ -188,13 +186,12 @@ $translations = array(
 	'Move down' => 'Přesunout dolů',
 	'Remove' => 'Odebrat',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
-
+	
 	'Partition by' => 'Rozdělit podle',
-	'Partition' => 'Oddíl',
 	'Partitions' => 'Oddíly',
 	'Partition name' => 'Název oddílu',
 	'Values' => 'Hodnoty',
-
+	
 	'View' => 'Pohled',
 	'Materialized view' => 'Materializovaný pohled',
 	'View has been dropped.' => 'Pohled byl odstraněn.',
@@ -202,14 +199,14 @@ $translations = array(
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
-
+	
 	'Indexes' => 'Indexy',
 	'Indexes have been altered.' => 'Indexy byly změněny.',
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Index Type' => 'Typ indexu',
 	'Column (length)' => 'Sloupec (délka)',
-
+	
 	'Foreign keys' => 'Cizí klíče',
 	'Foreign key' => 'Cizí klíč',
 	'Foreign key has been dropped.' => 'Cizí klíč byl odstraněn.',
@@ -225,7 +222,7 @@ $translations = array(
 	'ON DELETE' => 'Při smazání',
 	'ON UPDATE' => 'Při změně',
 	'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 cílové sloupce musí mít stejný datový typ, nad cílovými sloupci musí být definován index a odkazovaná data musí existovat.',
-
+	
 	'Triggers' => 'Triggery',
 	'Add trigger' => 'Přidat trigger',
 	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
@@ -236,7 +233,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Událost',
 	'Name' => 'Název',
-
+	
 	'select' => 'vypsat',
 	'Select' => 'Vypsat',
 	'Select data' => 'Vypsat data',
@@ -245,7 +242,6 @@ $translations = array(
 	'Search' => 'Vyhledat',
 	'anywhere' => 'kdekoliv',
 	'Search data in tables' => 'Vyhledat data v tabulkách',
-	'as a regular expression' => 'jako regulární výraz',
 	'Sort' => 'Seřadit',
 	'descending' => 'sestupně',
 	'Limit' => 'Limit',
@@ -259,20 +255,20 @@ $translations = array(
 	'%d row(s)' => array('%d řádek', '%d řádky', '%d řádků'),
 	'Page' => 'Stránka',
 	'last' => 'poslední',
-	'Load more data' => 'Nahrát další data',
+	'Load more data' => 'Načíst další data',
-	'Loading' => 'Nahrává se',
+	'Loading' => 'Načítá se',
 	'Whole result' => 'Celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
-
+	
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
 	'File must be in UTF-8 encoding.' => 'Soubor musí být v kódování UTF-8.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Změnit',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klikněte na políčko, které chcete změnit.',
 	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Položka%s byla vložena.',
 	'Item has been deleted.' => 'Položka byla smazána.',
@@ -293,14 +289,14 @@ $translations = array(
 	'Clone' => 'Klonovat',
 	'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',
@@ -310,7 +306,7 @@ $translations = array(
 	'Network' => 'Síť',
 	'Geometry' => 'Geometrie',
 	'Relations' => 'Vztahy',
-
+	
 	'Editor' => 'Editor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -321,11 +317,11 @@ $translations = array(
 	'now' => 'teď',
 	'yes' => 'ano',
 	'no' => 'ne',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Soubor existuje.',
 	'Please use one of the extensions %s.' => 'Prosím použijte jednu z koncovek %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Pozměnit schéma',
 	'Create schema' => 'Vytvořit schéma',
@@ -334,7 +330,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schéma bylo změněno.',
 	'Schema' => 'Schéma',
 	'Invalid schema.' => 'Nesprávné schéma.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Vytvořit sekvenci',
@@ -342,20 +338,11 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence byla vytvořena.',
 	'Sequence has been altered.' => 'Sekvence byla změněna.',
 	'Alter sequence' => 'Pozměnit sekvenci',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Uživatelské typy',
 	'Create type' => 'Vytvořit typ',
 	'Type has been dropped.' => 'Typ byl odstraněn.',
 	'Type has been created.' => 'Typ byl vytvořen.',
 	'Alter type' => 'Pozměnit typ',
-
-	// Plugins
-	'Columns' => 'Sloupce',
-	'Nullable' => 'Povoleno null',
-	'Default' => 'Výchozí',
-	'Yes' => 'Ano',
-	'No' => 'Ne',
-	'One Time Password' => 'Jednorázové heslo',
-	'Invalid OTP code.' => 'Neplatný kód OTP.',
 );

adminer/lang/da.inc.php

@@ -1,6 +1,5 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Brugernavn',
@@ -10,7 +9,7 @@ $translations = array(
 	'Logout' => 'Log ud',
 	'Logged as: %s' => 'Logget ind som: %s',
 	'Logout successful.' => 'Log af vellykket.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ugyldige log ind oplysninger.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for at gøre det permanent.',
 	'Language' => 'Sprog',
 	'Invalid CSRF token. Send the form again.' => 'Ugyldigt CSRF-token - Genindsend formen.',
@@ -65,7 +64,6 @@ $translations = array(
 	'Format' => 'Format',
 	'Data' => 'Data',
 	'Database' => 'Database',
-	'database' => 'database',
 	'Use' => 'Brug',
 	'Select database' => 'Vælg database',
 	'Invalid database.' => 'Ugyldig database.',
@@ -152,7 +150,6 @@ $translations = array(
 	'Remove' => 'Fjern',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antal feltnavne overskredet - øg venligst %s.',
 	'Partition by' => 'Partition ved',
-	'Partition' => null,
 	'Partitions' => 'Partitioner',
 	'Partition name' => 'Partitionsnavn',
 	'Values' => 'Værdier',
@@ -201,7 +198,6 @@ $translations = array(
 	'Search' => 'Søg',
 	'anywhere' => 'hvorsomhelst',
 	'Search data in tables' => 'Søg data i tabeller',
-	'as a regular expression' => null,
 	'Sort' => 'Sorter',
 	'descending' => 'faldende',
 	'Limit' => 'Limit',
@@ -282,35 +278,4 @@ $translations = array(
 	'Type has been created.' => 'Typen er oprettet.',
 	'Alter type' => 'Ændre type',
 	'Saving' => 'Gemmer',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Nej',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/de.inc.php

@@ -1,10 +1,9 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>',
-	'Invalid server or credentials.' => 'Ungültige Server oder Anmelde-Informationen.',
+	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
 	'Password' => 'Passwort',
@@ -33,8 +32,7 @@ $translations = array(
 	'Create database' => 'Datenbank erstellen',
 	'SQL command' => 'SQL-Kommando',
 	'Logout' => 'Abmelden',
-	'database' => 'Datenbank',
+	'Use' => 'Auswählen',
-	'Use' => 'Benutzung',
 	'No tables.' => 'Keine Tabellen.',
 	'select' => 'zeigen',
 	'Item has been deleted.' => 'Datensatz wurde gelöscht.',
@@ -192,7 +190,6 @@ $translations = array(
 	'Clone' => 'Klonen',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s erhöhen.',
 	'Partition by' => 'Partitionieren um',
-	'Partition' => 'Partition',
 	'Partitions' => 'Partitionen',
 	'Partition name' => 'Name der Partition',
 	'Values' => 'Werte',
@@ -227,7 +224,6 @@ $translations = array(
 	'Permanent login' => 'Passwort speichern',
 	'Databases have been dropped.' => 'Datenbanken wurden entfernt.',
 	'Search data in tables' => 'Suche in Tabellen',
-	'as a regular expression' => null,
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema ändern',
 	'Create schema' => 'Schema erstellen',
@@ -283,34 +279,25 @@ $translations = array(
 	'If you did not send this request from Adminer then close this page.' => 'Wenn Sie diese Anfrage nicht von Adminer gesendet haben, schließen Sie diese Seite.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Sie können eine große SQL-Datei per FTP hochladen und dann vom Server importieren.',
 	'You are offline.' => 'Sie sind offline.',
-	'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.',
+	'You have no privileges to update this table.' => 'Sie haben keine Rechte, diese Tabelle zu aktualisieren.',
 	'Saving' => 'Speichere',
 	'yes' => 'ja',
 	'no' => 'nein',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
-
+	'Drop %s?' => '%s entfernen?',
-	'Drop %s?' => null,
+	'Materialized view' => 'Strukturierte Ansicht',
-	'Materialized view' => null,
+	'Vacuum' => 'Vacuum',
-	'Vacuum' => null,
+	'overwrite' => 'überschreiben',
-	'overwrite' => null,
+	'DB' => 'DB',
-	'DB' => null,
+	'ATTACH queries are not supported.' => 'ATTACH Abfragen werden nicht unterstützt.',
-	'ATTACH queries are not supported.' => null,
+	'Warnings' => 'Warnungen',
-	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer unterstützt den Zugriff auf eine Datenbank ohne Passwort nicht, <a href="https://www.adminer.org/en/password/"%s>mehr Informationen</a>.',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => 'Vollständige Überprüfung der Tabelle',
-	'Full table scan' => null,
+	'The action will be performed after successful login with the same credentials.' => 'Die Aktion wird nach erfolgreicher Anmeldung mit denselben Anmeldedaten ausgeführt.',
-	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => 'Die Verbindung zu privilegierten Ports ist nicht erlaubt.',
-	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => 'Es gibt ein Leerzeichen im Eingabepasswort, das die Ursache sein könnte.',
-	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => 'Unbekannter Fehler.',
-	'Unknown error.' => null,
+	'Database does not support password.' => 'Die Datenbank unterstützt kein Passwort.',
-	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => 'Deaktivieren Sie %s oder aktivieren Sie die Erweiterungen %s oder %s.',
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Nein',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/el.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Σύστημα',
 	'Server' => 'Διακομιστής',
 	'Username' => 'Όνομα Χρήστη',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Αποσύνδεση',
 	'Logged as: %s' => 'Συνδεθήκατε ως %s',
 	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έληξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
 	'Language' => 'Γλώσσα',
@@ -23,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Η συνεδρία έληξε, παρακαλώ συνδεθείτε ξανά.',
 	'%s version: %s through PHP extension %s' => '%s έκδοση: %s μέσω επέκτασης PHP %s',
 	'Refresh' => 'Ανανέωση',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Δικαιώματα',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
@@ -37,14 +36,14 @@ $translations = array(
 	'Routine' => 'Ρουτίνα',
 	'Grant' => 'Παραχώρηση',
 	'Revoke' => 'Ανάκληση',
-
+	
 	'Process list' => 'Λίστα διεργασιών',
 	'%d process(es) have been killed.' => array('Τερματίστηκε %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
 	'Kill' => 'Τερματισμός',
-
+	
 	'Variables' => 'Μεταβλητές',
 	'Status' => 'Κατάσταση',
-
+	
 	'SQL command' => 'Εντολή SQL',
 	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
 	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
@@ -58,7 +57,7 @@ $translations = array(
 	'History' => 'Ιστορικό',
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
-
+	
 	'File upload' => 'Μεταφόρτωση αρχείου',
 	'From server' => 'Από διακομιστή',
 	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
@@ -70,7 +69,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Πολλά δεδομένα POST. Μείωστε τα περιεχόμενα ή αυξήστε την σχετική ρύθμιση %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να μεταφορτώσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
 	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
-
+	
 	'Export' => 'Εξαγωγή',
 	'Output' => 'Αποτέλεσμα',
 	'open' => 'άνοιγμα',
@@ -78,9 +77,8 @@ $translations = array(
 	'Saving' => 'Γίνεται Αποθήκευση',
 	'Format' => 'Μορφή',
 	'Data' => 'Δεδομένα',
-
+	
 	'Database' => 'Β. Δεδομένων',
-	'database' => 'β. δεδομένων',
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
 	'Invalid database.' => 'Λανθασμένη Β.Δ.',
@@ -92,10 +90,10 @@ $translations = array(
 	'Alter database' => 'Τροποποίηση Β.Δ.',
 	'Create database' => 'Δημιουργία Β.Δ.',
 	'Database schema' => 'Σχήμα Β.Δ.',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Μόνιμος Σύνδεσμος',
-
+	
 	// thousands separator - must contain single byte
 	',' => '.',
 	'0123456789' => '0123456789',
@@ -118,7 +116,7 @@ $translations = array(
 	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
 	'Copy' => 'Αντιγραφή',
 	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
-
+	
 	'Routines' => 'Ρουτίνες',
 	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
@@ -131,7 +129,7 @@ $translations = array(
 	'Alter function' => 'Τροποποίηση λειτουργίας',
 	'Alter procedure' => 'Τροποποίηση διαδικασίας',
 	'Return type' => 'Επιστρεφόμενος τύπος',
-
+	
 	'Events' => 'Γεγονός',
 	'Event has been dropped.' => 'Το γεγονός διαγράφηκε.',
 	'Event has been altered.' => 'Το γεγονός τροποποιήθηκε.',
@@ -144,7 +142,7 @@ $translations = array(
 	'Start' => 'Έναρξη',
 	'End' => 'Λήξη',
 	'On completion preserve' => 'Κατά την ολοκλήρωση διατήρησε',
-
+	
 	'Tables' => 'Πίνακες',
 	'Tables and views' => 'Πίνακες και Προβολές',
 	'Table' => 'Πίνακας',
@@ -176,13 +174,12 @@ $translations = array(
 	'Move down' => 'Μετακίνηση προς τα κάτω',
 	'Remove' => 'Αφαίρεση',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Υπέρβαση μέγιστου επιτρεπόμενου αριθμού πεδίων. Παρακαλώ αυξήστε %s.',
-
+	
 	'Partition by' => 'Τμηματοποίηση ανά',
-	'Partition' => null,
 	'Partitions' => 'Τμήματα',
 	'Partition name' => 'Όνομα Τμήματος',
 	'Values' => 'Τιμές',
-
+	
 	'View' => 'Προβολή',
 	'Materialized view' => 'Υλοποιημένη προβολή',
 	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
@@ -190,14 +187,14 @@ $translations = array(
 	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
 	'Alter view' => 'Τροποποίηση προβολής',
 	'Create view' => 'Δημιουργία προβολής',
-
+	
 	'Indexes' => 'Δείκτες',
 	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
 	'Column (length)' => 'Στήλη (μήκος)',
-
+	
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
 	'Foreign key has been dropped.' => 'Το εξαρτημένο κλειδί διαγράφηκε.',
@@ -213,7 +210,7 @@ $translations = array(
 	'ON DELETE' => 'ΚΑΤΑ ΤΗ ΔΙΑΓΡΑΦΗ',
 	'ON UPDATE' => 'ΚΑΤΑ ΤΗΝ ΑΛΛΑΓΗ',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
-
+	
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
 	'Trigger has been dropped.' => 'Το έναυσμα διαγράφηκε.',
@@ -224,7 +221,7 @@ $translations = array(
 	'Time' => 'Ώρα',
 	'Event' => 'Γεγονός',
 	'Name' => 'Όνομα',
-
+	
 	'select' => 'επιλογή',
 	'Select' => 'Επιλογή',
 	'Select data' => 'Επιλέξτε δεδομένα',
@@ -233,7 +230,6 @@ $translations = array(
 	'Search' => 'Αναζήτηση',
 	'anywhere' => 'παντού',
 	'Search data in tables' => 'Αναζήτηση δεδομένων στους πίνακες',
-	'as a regular expression' => null,
 	'Sort' => 'Ταξινόμηση',
 	'descending' => 'Φθίνουσα',
 	'Limit' => 'Όριο',
@@ -251,16 +247,16 @@ $translations = array(
 	'Loading' => 'Φορτώνει',
 	'Whole result' => 'Όλο το αποτέλεσμα',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
-
+	
 	'Import' => 'Εισαγωγή',
 	'%d row(s) have been imported.' => array('$d σειρά εισήχθη.', '%d σειρές εισήχθησαν.'),
 	'File must be in UTF-8 encoding.' => 'Το αρχείο πρέπει να έχει κωδικοποίηση UTF-8.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Τροποποίηση',
 	'Ctrl+click on a value to modify it.' => 'Πιέστε Ctrl+click σε μια τιμή για να την τροποποιήσετε.',
 	'Use edit link to modify this value.' => 'Χρησιμοποιήστε το σύνδεσμο επεξεργασία για να τροποποιήσετε την τιμή.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
 	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
@@ -280,14 +276,14 @@ $translations = array(
 	'Clone' => 'Κλωνοποίηση',
 	'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' => 'Ημερομηνία και ώρα',
@@ -297,7 +293,7 @@ $translations = array(
 	'Network' => 'Δίκτυο',
 	'Geometry' => 'Γεωμετρία',
 	'Relations' => 'Συσχετήσεις',
-
+	
 	'Editor' => 'Επεξεργαστής',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5/$3/$1',
@@ -308,11 +304,11 @@ $translations = array(
 	'now' => 'τώρα',
 	'yes' => 'ναι',
 	'no' => 'όχι',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Το αρχείο υπάρχει.',
 	'Please use one of the extensions %s.' => 'Παρακαλώ χρησιμοποιείστε μια από τις επεκτάσεις %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Τροποποίηση σχήματος',
 	'Create schema' => 'Δημιουργία σχήματος',
@@ -321,7 +317,7 @@ $translations = array(
 	'Schema has been altered.' => 'Το σχήμα τροποποιήθηκε.',
 	'Schema' => 'Σχήμα',
 	'Invalid schema.' => 'Άκυρο σχήμα.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Αλληλουχία',
 	'Create sequence' => 'Δημιουργία αλληλουχίας',
@@ -329,33 +325,11 @@ $translations = array(
 	'Sequence has been created.' => 'Η αλληλουχία δημιουργήθηκε.',
 	'Sequence has been altered.' => 'Η αλληλουχία τροποποιήθηκε.',
 	'Alter sequence' => 'Τροποποίηση αλληλουχίας',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Τύποι χρήστη',
 	'Create type' => 'Δημιουργία τύπου',
 	'Type has been dropped.' => 'Ο τύπος διαγράφηκε.',
 	'Type has been created.' => 'Ο τύπος δημιουργήθηκε.',
 	'Alter type' => 'Τροποποίηση τύπου',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/es.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Usuario y/o clave de acceso incorrecta.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Crear Base de datos',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Cerrar sesión',
-	'database' => 'base de datos',
 	'Use' => 'Usar',
 	'No tables.' => 'No existen tablas.',
 	'select' => 'registros',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Excedida la cantidad máxima de campos permitidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
-	'Partition' => null,
 	'Partitions' => 'Particiones',
 	'Partition name' => 'Nombre de partición',
 	'Values' => 'Valores',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Guardar contraseña',
 	'Databases have been dropped.' => 'Bases de datos eliminadas.',
 	'Search data in tables' => 'Buscar datos en tablas',
-	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Crear esquema',
@@ -268,49 +264,4 @@ $translations = array(
 	'Permanent link' => 'Enlace permanente',
 	'Edit all' => 'Editar todos',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/et.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ebakorrektsed andmed.',
 	'Server' => 'Server',
 	'Username' => 'Kasutajanimi',
 	'Password' => 'Parool',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Loo uus andmebaas',
 	'SQL command' => 'SQL-Päring',
 	'Logout' => 'Logi välja',
-	'database' => 'andmebaas',
 	'Use' => 'Kasuta',
 	'No tables.' => 'Tabeleid ei leitud.',
 	'select' => 'kuva',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Kloon',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s.',
 	'Partition by' => 'Partitsiooni',
-	'Partition' => null,
 	'Partitions' => 'Partitsioonid',
 	'Partition name' => 'Partitsiooni nimi',
 	'Values' => 'Väärtused',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Jäta mind meelde',
 	'Databases have been dropped.' => 'Andmebaasid on edukalt kustutatud.',
 	'Search data in tables' => 'Otsi kogu andmebaasist',
-	'as a regular expression' => null,
 	'Schema' => 'Struktuur',
 	'Alter schema' => 'Muuda struktuuri',
 	'Create schema' => 'Loo struktuur',
@@ -268,49 +264,4 @@ $translations = array(
 	'Permanent link' => 'Püsilink',
 	'Edit all' => 'Muuda kõiki',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/fa.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'سیستم',
 	'Server' => 'سرور',
 	'Username' => 'نام کاربری',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'خروج',
 	'Logged as: %s' => 'ورود به عنوان: %s',
 	'Logout successful.' => 'با موفقیت خارج شدید.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'اعتبار سنجی نامعتبر.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.', 'ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://www.adminer.org/en/extension/"%s>پیاده سازی</a> کرده تا آن را دائمی سازید.',
 	'Language' => 'زبان',
@@ -22,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'نشست پایان یافته، لطفا دوباره وارد شوید.',
 	'%s version: %s through PHP extension %s' => 'نسخه %s : %s توسعه پی اچ پی %s',
 	'Refresh' => 'بازیابی',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'rtl',
-
+	
 	'Privileges' => 'امتیازات',
 	'Create user' => 'ایجاد کاربر',
 	'User has been dropped.' => 'کاربر حذف شد.',
@@ -36,14 +35,14 @@ $translations = array(
 	'Routine' => 'روتین',
 	'Grant' => 'اعطا',
 	'Revoke' => 'لغو کردن',
-
+	
 	'Process list' => 'لیست فرآیند',
 	'%d process(es) have been killed.' => '%d فرآیند متوقف شد.',
 	'Kill' => 'حذف فرآیند',
-
+	
 	'Variables' => 'متغیرها',
 	'Status' => 'وضعیت',
-
+	
 	'SQL command' => 'دستور SQL',
 	'%d query(s) executed OK.' => '%d کوئری اجرا شد.',
 	'Query executed OK, %d row(s) affected.' => 'کوئری اجرا شد. %d سطر تغیر کرد.',
@@ -57,7 +56,7 @@ $translations = array(
 	'History' => 'تاریخ',
 	'Clear' => 'پاک کردن',
 	'Edit all' => 'ویرایش همه',
-
+	
 	'File upload' => 'بارگذاری فایل',
 	'From server' => 'از سرور',
 	'Webserver file %s' => '%s فایل وب سرور',
@@ -76,9 +75,8 @@ $translations = array(
 	'save' => 'ذخیره',
 	'Format' => 'حذف',
 	'Data' => 'داده',
-
+	
 	'Database' => 'پایگاه داده',
-	'database' => 'پایگاه داده',
 	'Use' => 'استفاده',
 	'Select database' => 'انتخاب پایگاه داده',
 	'Invalid database.' => 'پایگاه داده نامعتبر.',
@@ -90,10 +88,10 @@ $translations = array(
 	'Alter database' => 'ویرایش پایگاه داده',
 	'Create database' => 'ایجاد پایگاه داده',
 	'Database schema' => 'ساختار پایگاه داده',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'ارتباط دائم',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '۰۱۲۳۴۵۶۷۸۹',
@@ -116,7 +114,7 @@ $translations = array(
 	'Tables have been moved.' => 'جدولها انتقال داده شدند.',
 	'Copy' => 'کپی کردن',
 	'Tables have been copied.' => 'جدولها کپی شدند.',
-
+	
 	'Routines' => 'روالها',
 	'Routine has been called, %d row(s) affected.' => array('روال فراخوانی شد %d سطر متاثر شد.', 'روال فراخوانی شد %d سطر متاثر شد.'),
 	'Call' => 'صدا زدن',
@@ -129,7 +127,7 @@ $translations = array(
 	'Alter function' => 'ویرایش تابع',
 	'Alter procedure' => 'ویرایش زیربرنامه',
 	'Return type' => 'برگرداندن نوع',
-
+	
 	'Events' => 'رویدادها',
 	'Event has been dropped.' => 'رویداد حذف شد.',
 	'Event has been altered.' => 'رویداد ویرایش شد.',
@@ -142,7 +140,7 @@ $translations = array(
 	'Start' => 'آغاز',
 	'End' => 'پایان',
 	'On completion preserve' => 'تکمیل حفاظت فعال است',
-
+	
 	'Tables' => 'جدولها',
 	'Tables and views' => 'جدولها و نمایه ها',
 	'Table' => 'جدول',
@@ -174,13 +172,12 @@ $translations = array(
 	'Move down' => 'انتقال به پایین',
 	'Remove' => 'حذف',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
-
+	
 	'Partition by' => 'بخشبندی توسط',
-	'Partition' => null,
 	'Partitions' => 'بخشبندیها',
 	'Partition name' => 'نام بخش',
 	'Values' => 'مقادیر',
-
+	
 	'View' => 'نمایش',
 	'Materialized view' => 'نمایه مادی',
 	'View has been dropped.' => 'نمایش حذف شد.',
@@ -188,14 +185,14 @@ $translations = array(
 	'View has been created.' => 'نمایش ایجاد شد.',
 	'Alter view' => 'حذف نمایش',
 	'Create view' => 'ایجاد نمایش',
-
+	
 	'Indexes' => 'ایندکسها',
 	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
 	'Column (length)' => 'ستون (طول)',
-
+	
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
 	'Foreign key has been dropped.' => 'کلید خارجی حذف شد.',
@@ -211,7 +208,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'داده مبدا و مقصد ستونها بایستی شبیه هم باشند.',
-
+	
 	'Triggers' => 'تریگرها',
 	'Add trigger' => 'افزودن تریگر',
 	'Trigger has been dropped.' => 'تریگر حذف شد.',
@@ -222,7 +219,7 @@ $translations = array(
 	'Time' => 'زمان',
 	'Event' => 'رویداد',
 	'Name' => 'نام',
-
+	
 	'select' => 'انتخاب',
 	'Select' => 'انتخاب',
 	'Select data' => 'انتخاب داده',
@@ -231,7 +228,6 @@ $translations = array(
 	'Search' => 'جستجو',
 	'anywhere' => 'هرکجا',
 	'Search data in tables' => 'جستجوی داده در جدول',
-	'as a regular expression' => null,
 	'Sort' => 'مرتب کردن',
 	'descending' => 'نزولی',
 	'Limit' => 'محدودیت',
@@ -249,16 +245,16 @@ $translations = array(
 	'Loading' => 'در حال بارگزاری',
 	'Whole result' => 'همه نتایج',
 	'%d byte(s)' => array('%d بایت', '%d بایت'),
-
+	
 	'Import' => 'وارد کردن',
 	'%d row(s) have been imported.' => array('%d سطر وارد شد.', '%d سطر وارد شد.'),
 	'File must be in UTF-8 encoding.' => 'فرمت فایل باید UTF-8 باشید.',
-
+	
 	// in-place editing in select
 	'Modify' => 'ویرایش',
 	'Ctrl+click on a value to modify it.' => 'برای ویرایش بر روی مقدار ctrl+click کنید.',
 	'Use edit link to modify this value.' => 'از لینک ویرایش برای ویرایش این مقدار استفاده کنید.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '%s آیتم درج شد.',
 	'Item has been deleted.' => 'آیتم حذف شد.',
@@ -278,14 +274,14 @@ $translations = array(
 	'Clone' => 'تکثیر',
 	'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' => 'تاریخ و زمان',
@@ -295,7 +291,7 @@ $translations = array(
 	'Network' => 'شبکه',
 	'Geometry' => 'هندسه',
 	'Relations' => 'رابطه ها',
-
+	
 	'Editor' => 'ویرایشگر',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -310,7 +306,7 @@ $translations = array(
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'فایل موجود است.',
 	'Please use one of the extensions %s.' => 'لطفا یکی از پسوندها را انتخاب نمائید %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'ویرایش ساختار',
 	'Create schema' => 'ایجاد ساختار',
@@ -319,7 +315,7 @@ $translations = array(
 	'Schema has been altered.' => 'ساختار ویرایش شد.',
 	'Schema' => 'ساختار',
 	'Invalid schema.' => 'ساختار نامعتبر.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'صف ها',
 	'Create sequence' => 'ایجاد صف',
@@ -327,35 +323,11 @@ $translations = array(
 	'Sequence has been created.' => 'صف ایجاد شد.',
 	'Sequence has been altered.' => 'صف ویرایش شد.',
 	'Alter sequence' => 'ویرایش صف',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'انواع کاربر',
 	'Create type' => 'ایجاد نوع',
 	'Type has been dropped.' => 'نوع حذف شد.',
 	'Type has been created.' => 'نوع ایجاد شد.',
 	'Alter type' => 'ویرایش نوع',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/fi.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Järjestelmä',
 	'Server' => 'Palvelin',
 	'Username' => 'Käyttäjänimi',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Kirjaudu ulos',
 	'Logged as: %s' => 'Olet kirjautunut käyttäjänä: %s',
 	'Logout successful.' => 'Uloskirjautuminen onnistui.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Virheelliset kirjautumistiedot.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.', 'Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-salasana ei ole enää voimassa. <a href="https://www.adminer.org/en/extension/"%s>Toteuta</a> %s-metodi sen tekemiseksi pysyväksi.',
 	'Language' => 'Kieli',
@@ -23,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Istunto vanhentunut, kirjaudu uudelleen.',
 	'%s version: %s through PHP extension %s' => '%s versio: %s PHP-laajennuksella %s',
 	'Refresh' => 'Virkistä',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Oikeudet',
 	'Create user' => 'Luo käyttäjä',
 	'User has been dropped.' => 'Käyttäjä poistettiin.',
@@ -37,14 +36,14 @@ $translations = array(
 	'Routine' => 'Rutiini',
 	'Grant' => 'Myönnä',
 	'Revoke' => 'Kiellä',
-
+	
 	'Process list' => 'Prosessilista',
 	'%d process(es) have been killed.' => array('%d prosessi lopetettu.', '%d prosessia lopetettu..'),
 	'Kill' => 'Lopeta',
-
+	
 	'Variables' => 'Muuttujat',
 	'Status' => 'Tila',
-
+	
 	'SQL command' => 'SQL-komento',
 	'%d query(s) executed OK.' => array('%d kysely onnistui.', '%d kyselyä onnistui.'),
 	'Query executed OK, %d row(s) affected.' => array('Kysely onnistui, kohdistui %d riviin.', 'Kysely onnistui, kohdistui %d riviin.'),
@@ -58,7 +57,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Tyhjennä',
 	'Edit all' => 'Muokkaa kaikkia',
-
+	
 	'File upload' => 'Tiedoston lataus palvelimelle',
 	'From server' => 'Verkkopalvelimella Adminer-kansiossa oleva tiedosto',
 	'Webserver file %s' => 'Verkkopalvelintiedosto %s',
@@ -70,7 +69,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Liian suuri POST-datamäärä. Pienennä dataa tai kasvata arvoa %s konfigurointitiedostossa.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Voit ladata suuren SQL-tiedoston FTP:n kautta ja tuoda sen sitten palvelimelta.',
 	'You are offline.' => 'Olet offline-tilassa.',
-
+	
 	'Export' => 'Vienti',
 	'Output' => 'Tulos',
 	'open' => 'avaa',
@@ -78,9 +77,8 @@ $translations = array(
 	'Saving' => 'Tallennetaan',
 	'Format' => 'Muoto',
 	'Data' => 'Data',
-
+	
 	'Database' => 'Tietokanta',
-	'database' => 'tietokanta',
 	'Use' => 'Käytä',
 	'Select database' => 'Valitse tietokanta',
 	'Invalid database.' => 'Tietokanta ei kelpaa.',
@@ -92,10 +90,10 @@ $translations = array(
 	'Alter database' => 'Muuta tietokantaa',
 	'Create database' => 'Luo tietokanta',
 	'Database schema' => 'Tietokantakaava',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Pysyvä linkki',
-
+	
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -118,7 +116,7 @@ $translations = array(
 	'Tables have been moved.' => 'Taulut on siirretty.',
 	'Copy' => 'Kopioi',
 	'Tables have been copied.' => 'Taulut on kopioitu.',
-
+	
 	'Routines' => 'Rutiinit',
 	'Routine has been called, %d row(s) affected.' => array('Rutiini kutsuttu, kohdistui %d riviin.', 'Rutiini kutsuttu, kohdistui %d riviin.'),
 	'Call' => 'Kutsua',
@@ -131,7 +129,7 @@ $translations = array(
 	'Alter function' => 'Muuta funktiota',
 	'Alter procedure' => 'Muuta proseduuria',
 	'Return type' => 'Palautustyyppi',
-
+	
 	'Events' => 'Tapahtumat',
 	'Event has been dropped.' => 'Tapahtuma on poistettu.',
 	'Event has been altered.' => 'Tapahtumaa on muutettu.',
@@ -144,7 +142,7 @@ $translations = array(
 	'Start' => 'Aloitus',
 	'End' => 'Lopetus',
 	'On completion preserve' => 'Säilytä, kun valmis',
-
+	
 	'Tables' => 'Taulut',
 	'Tables and views' => 'Taulut ja näkymät',
 	'Table' => 'Taulu',
@@ -176,13 +174,12 @@ $translations = array(
 	'Move down' => 'Siirrä alas',
 	'Remove' => 'Poista',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
-
+	
 	'Partition by' => 'Osioi arvolla',
-	'Partition' => null,
 	'Partitions' => 'Osiot',
 	'Partition name' => 'Osion nimi',
 	'Values' => 'Arvot',
-
+	
 	'View' => 'Näkymä',
 	'Materialized view' => 'Materialisoitunut näkymä',
 	'View has been dropped.' => 'Näkymä on poistettu.',
@@ -190,14 +187,14 @@ $translations = array(
 	'View has been created.' => 'Näkymä on luotu.',
 	'Alter view' => 'Muuta näkymää',
 	'Create view' => 'Luo näkymä',
-
+	
 	'Indexes' => 'Indeksit',
 	'Indexes have been altered.' => 'Indeksejä on muutettu.',
 	'Alter indexes' => 'Muuta indeksejä',
 	'Add next' => 'Lisää seuraava',
 	'Index Type' => 'Indeksityyppi',
 	'Column (length)' => 'Sarake (pituus)',
-
+	
 	'Foreign keys' => 'Vieraat avaimet',
 	'Foreign key' => 'Vieras avain',
 	'Foreign key has been dropped.' => 'Vieras avain on poistettu.',
@@ -213,7 +210,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lähde- ja kohdesarakkeiden tulee olla samaa tietotyyppiä, kohdesarakkeisiin tulee olla indeksi ja dataa, johon viitataan, täytyy olla.',
-
+	
 	'Triggers' => 'Liipaisimet',
 	'Add trigger' => 'Lisää liipaisin',
 	'Trigger has been dropped.' => 'Liipaisin on poistettu.',
@@ -224,7 +221,7 @@ $translations = array(
 	'Time' => 'Aika',
 	'Event' => 'Tapahtuma',
 	'Name' => 'Nimi',
-
+	
 	'select' => 'valitse',
 	'Select' => 'Valitse',
 	'Select data' => 'Valitse data',
@@ -233,7 +230,6 @@ $translations = array(
 	'Search' => 'Hae',
 	'anywhere' => 'kaikkialta',
 	'Search data in tables' => 'Hae dataa tauluista',
-	'as a regular expression' => null,
 	'Sort' => 'Lajittele',
 	'descending' => 'alenevasti',
 	'Limit' => 'Raja',
@@ -251,16 +247,16 @@ $translations = array(
 	'Loading' => 'Ladataan',
 	'Whole result' => 'Koko tulos',
 	'%d byte(s)' => array('%d tavu', '%d tavua'),
-
+	
 	'Import' => 'Tuonti',
 	'%d row(s) have been imported.' => array('%d rivi tuotiin.', '%d riviä tuotiin.'),
 	'File must be in UTF-8 encoding.' => 'Tiedoston täytyy olla UTF-8-muodossa.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Muuta',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+napsauta arvoa muuttaaksesi.',
 	'Use edit link to modify this value.' => 'Käytä muokkaa-linkkiä muuttaaksesi tätä arvoa.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Tietue%s lisättiin.',
 	'Item has been deleted.' => 'Tietue poistettiin.',
@@ -280,14 +276,14 @@ $translations = array(
 	'Clone' => 'Kloonaa',
 	'Delete' => 'Poista',
 	'You have no privileges to update this table.' => 'Sinulla ei ole oikeutta päivittää tätä taulua.',
-
+	
 	'E-mail' => 'S-posti',
 	'From' => 'Lähettäjä',
 	'Subject' => 'Aihe',
 	'Attachments' => 'Liitteet',
 	'Send' => 'Lähetä',
 	'%d e-mail(s) have been sent.' => array('% sähköpostiviestiä lähetetty.', '% sähköpostiviestiä lähetetty.'),
-
+	
 	// data type descriptions
 	'Numbers' => 'Numerot',
 	'Date and time' => 'Päiväys ja aika',
@@ -297,7 +293,7 @@ $translations = array(
 	'Network' => 'Verkko',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Suhteet',
-
+	
 	'Editor' => 'Editori',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -308,11 +304,11 @@ $translations = array(
 	'now' => 'nyt',
 	'yes' => 'kyllä',
 	'no' => 'ei',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tiedosto on olemassa.',
 	'Please use one of the extensions %s.' => 'Käytä jotain %s-laajennuksista.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Muuta kaavaa',
 	'Create schema' => 'Luo kaava',
@@ -321,7 +317,7 @@ $translations = array(
 	'Schema has been altered.' => 'Kaavaa muutettiin.',
 	'Schema' => 'Kaava',
 	'Invalid schema.' => 'Kaava ei kelpaa.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvenssit',
 	'Create sequence' => 'Luo sekvenssi',
@@ -329,7 +325,7 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvenssi on luotu.',
 	'Sequence has been altered.' => 'Sekvenssiä on muutettu.',
 	'Alter sequence' => 'Muuta sekvenssiä',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Käyttäjän tyypit',
 	'Create type' => 'Luo tyyppi',
@@ -350,12 +346,4 @@ $translations = array(
 	'Unknown error.' => 'Tuntematon virhe.',
 	'Database does not support password.' => 'Tietokanta ei tue salasanaa.',
 	'Disable %s or enable %s or %s extensions.' => 'Poista käytöstä %s tai ota käyttöön laajennus %s tai %s.',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Kyllä',
-	'No' => 'Ei',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/fr.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Authentification échouée.',
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
@@ -31,7 +30,6 @@ $translations = array(
 	'Create database' => 'Créer une base de données',
 	'SQL command' => 'Requête SQL',
 	'Logout' => 'Déconnexion',
-	'database' => 'base de données',
 	'Use' => 'Utiliser',
 	'No tables.' => 'Aucune table.',
 	'select' => 'select',
@@ -189,7 +187,6 @@ $translations = array(
 	'Clone' => 'Cloner',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s.',
 	'Partition by' => 'Partitionner par',
-	'Partition' => null,
 	'Partitions' => 'Partitions',
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
@@ -225,7 +222,6 @@ $translations = array(
 	'Databases have been dropped.' => 'Les bases de données ont été supprimées.',
 	'Database has been dropped.' => 'La base de données a été supprimée.',
 	'Search data in tables' => 'Rechercher dans les tables',
-	'as a regular expression' => 'sous forme d\'expression régulière',
 	'Schema' => 'Schéma',
 	'Alter schema' => 'Modifier le schéma',
 	'Create schema' => 'Créer un schéma',
@@ -291,26 +287,16 @@ $translations = array(
 	'Default value' => 'Valeur par défaut',
 	'If you did not send this request from Adminer then close this page.' => 'Si vous n\'avez pas envoyé cette requête depuis Adminer, alors fermez cette page.',
 	'You are offline.' => 'Vous êtes hors ligne.',
-
 	'Drop %s?' => 'Supprimer %s?',
 	'overwrite' => 'écraser',
 	'DB' => 'BD',
 	'ATTACH queries are not supported.' => 'Requêtes ATTACH ne sont pas supportées.',
 	'Warnings' => 'Avertissements',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ne supporte pas l\'accès aux bases de données sans mot de passe, <a href="https://www.adminer.org/en/password/"%s>plus d\'information</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
 	'The action will be performed after successful login with the same credentials.' => 'Cette action sera exécutée après s\'être connecté avec les mêmes données de connexion.',
 	'Connecting to privileged ports is not allowed.' => 'La connexion aux ports privilégiés n\'est pas autorisée.',
 	'There is a space in the input password which might be the cause.' => 'Il y a un espace dans le mot de passe entré qui pourrait en être la cause.',
 	'Unknown error.' => 'Erreur inconnue',
 	'Database does not support password.' => 'La base de données ne support pas les mots de passe',
 	'Disable %s or enable %s or %s extensions.' => 'Désactiver %s ou activer %s or %s extensions.',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Oui',
-	'No' => 'Non',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/gl.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Credenciais (usuario e/ou contrasinal) inválidos.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contrasinal',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Crear Base de datos',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Pechar sesión',
-	'database' => 'base de datos',
 	'Use' => 'Usar',
 	'No tables.' => 'Nengunha táboa.',
 	'select' => 'selecciona',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Excedida o número máximo de campos permitidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
-	'Partition' => null,
 	'Partitions' => 'Particións',
 	'Partition name' => 'Nome da Partición',
 	'Values' => 'Valores',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Permanecer conectado',
 	'Databases have been dropped.' => 'Elimináronse as bases de datos.',
 	'Search data in tables' => 'Buscar datos en táboas',
-	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Crear esquema',
@@ -291,26 +287,4 @@ $translations = array(
 	'Saving' => 'Gardando',
 	'yes' => 'si',
 	'no' => 'non',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Si',
-	'No' => 'Non',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/he.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'פרטי התחברות שגויים',
 	'Server' => 'שרת',
 	'Username' => 'שם משתמש',
 	'Password' => 'סיסמה',
@@ -31,7 +30,6 @@ $translations = array(
 	'Create database' => 'צור מסד נתונים',
 	'SQL command' => 'שאילתת SQL',
 	'Logout' => 'התנתק',
-	'database' => 'מסד נתונים',
 	'Use' => 'השתמש',
 	'No tables.' => 'אין טבלאות',
 	'select' => 'בחר',
@@ -189,7 +187,6 @@ $translations = array(
 	'Clone' => 'שכפל',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'הגעת למספר השדות המרבי. בבקשה הגדל את %s',
 	'Partition by' => 'מחיצות ע"י',
-	'Partition' => null,
 	'Partitions' => 'מחיצות',
 	'Partition name' => 'שם מחיצה',
 	'Values' => 'ערכים',
@@ -225,7 +222,6 @@ $translations = array(
 	'Databases have been dropped.' => 'מסד הנתונים הושלך',
 	'Database has been dropped.' => 'מסד הנתונים הושלך',
 	'Search data in tables' => 'חפש מידע בטבלאות',
-	'as a regular expression' => null,
 	'Schema' => 'סכמה',
 	'Alter schema' => 'שנה סכמה',
 	'Create schema' => 'צור סכמה',
@@ -293,24 +289,4 @@ $translations = array(
 	'Saving' => 'שומר',
 	'yes' => 'כן',
 	'no' => 'לא',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/hu.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Érvénytelen adatok.',
 	'Server' => 'Szerver',
 	'Username' => 'Felhasználó',
 	'Password' => 'Jelszó',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Adatbázis létrehozása',
 	'SQL command' => 'SQL parancs',
 	'Logout' => 'Kilépés',
-	'database' => 'adatbázis',
 	'Use' => 'Használ',
 	'No tables.' => 'Nincs tábla.',
 	'select' => 'kiválasztás',
@@ -190,7 +188,6 @@ $translations = array(
 	'Tables have been dropped.' => 'Táblák eldobva.',
 	'Clone' => 'Klónoz',
 	'Partition by' => 'Particionálás ezzel',
-	'Partition' => null,
 	'Partitions' => 'Particiók',
 	'Partition name' => 'Partició neve',
 	'Values' => 'Értékek',
@@ -252,7 +249,6 @@ $translations = array(
 	'Type has been created.' => 'Típus létrehozva.',
 	'Alter type' => 'Típus módosítása',
 	'Search data in tables' => 'Keresés a táblákban',
-	'as a regular expression' => null,
 	'From server' => 'Szerverről',
 	'empty' => 'üres',
 	'now' => 'most',
@@ -267,50 +263,4 @@ $translations = array(
 	'Permanent link' => 'Hivatkozás',
 	'Edit all' => 'Összes szerkesztése',
 	'HH:MM:SS' => 'óó:pp:mm',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/id.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Server',
 	'Username' => 'Pengguna',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Keluar',
 	'Logged as: %s' => 'Masuk sebagai: %s',
 	'Logout successful.' => 'Berhasil keluar.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Akses tidak sah.',
 	'Language' => 'Bahasa',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Kirim ulang formulir.',
 	'No extension' => 'Ekstensi tidak ada',
@@ -74,7 +73,6 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Basis data',
-	'database' => 'basis data',
 	'Use' => 'Gunakan',
 	'Select database' => 'Pilih basis data',
 	'Invalid database.' => 'Basis data tidak sah.',
@@ -168,7 +166,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sudah lebih dumlah ruas maksimum yang diizinkan. Harap naikkan %s.',
 
 	'Partition by' => 'Partisi menurut',
-	'Partition' => null,
 	'Partitions' => 'Partisi',
 	'Partition name' => 'Nama partisi',
 	'Values' => 'Nilai',
@@ -222,7 +219,6 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana pun',
 	'Search data in tables' => 'Cari data dalam tabel',
-	'as a regular expression' => null,
 	'Sort' => 'Urutkan',
 	'descending' => 'menurun',
 	'Limit' => 'Batas',
@@ -316,46 +312,4 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis berhasil dihapus.',
 	'Type has been created.' => 'Jenis berhasil dibuat.',
 	'Alter type' => 'Ubah jenis',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/it.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
-	'Invalid server or credentials.' => 'Server o credenziali non valide.',
+	'Invalid credentials.' => 'Credenziali non valide.',
 	'Server' => 'Server',
 	'Username' => 'Utente',
 	'Password' => 'Password',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Crea database',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Esci',
-	'database' => 'database',
 	'Use' => 'Usa',
 	'No tables.' => 'No tabelle.',
 	'select' => 'seleziona',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Clona',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Troppi campi. Per favore aumentare %s.',
 	'Partition by' => 'Partiziona per',
-	'Partition' => null,
 	'Partitions' => 'Partizioni',
 	'Partition name' => 'Nome partizione',
 	'Values' => 'Valori',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Login permanente',
 	'Databases have been dropped.' => 'Database eliminati.',
 	'Search data in tables' => 'Cerca nelle tabelle',
-	'as a regular expression' => 'come espressione regolare',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifica schema',
 	'Create schema' => 'Crea schema',
@@ -268,7 +264,6 @@ $translations = array(
 	'Permanent link' => 'Link permanente',
 	'Edit all' => 'Modifica tutto',
 	'HH:MM:SS' => 'HH:MM:SS',
-
 	'Drop %s?' => 'Scartare %s?',
 	'Tables have been optimized.' => 'Le tabelle sono state ottimizzate',
 	'Materialized view' => 'Vista materializzata',
@@ -282,13 +277,12 @@ $translations = array(
 	'Loading' => 'Caricamento',
 	'ATTACH queries are not supported.' => 'ATTACH queries non sono supportate.',
 	'Warnings' => 'Attenzione',
-	'%d / ' => array('%d / '),
+	'%d / ' => '%d / ',
 	'Limit rows' => 'Limite righe',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer non supporta accesso a databse senza password, <a href="https://www.adminer.org/it/password/"%s>piú informazioni</a>.',
 	'Default value' => 'Valore predefinito',
 	'Full table scan' => 'Analizza intera tabella',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuto.', 'Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuti.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'La password principale é scaduta. <a href="https://www.adminer.org/it/extension/"%s>Implementare</a> %s come metodo per renderla permanente.',
 	'The action will be performed after successful login with the same credentials.' => 'La azione verrá eseguita dopo un login valido con le stesse credenziali.',
 	'Connecting to privileged ports is not allowed.' => 'LA connessione a porte privilegiate non é permessa.',
@@ -305,12 +299,4 @@ $translations = array(
 	'Disable %s or enable %s or %s extensions.' => 'Disabilita %s o abilita %s oppure %s estensioni.',
 	'yes' => 'si',
 	'no' => 'no',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Si',
-	'No' => 'No',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ja.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => '不正なログイン',
 	'Server' => 'サーバ',
 	'Username' => 'ユーザ名',
 	'Password' => 'パスワード',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'データベースを作成',
 	'SQL command' => 'SQLコマンド',
 	'Logout' => 'ログアウト',
-	'database' => 'データベース',
 	'Use' => '使用',
 	'No tables.' => 'テーブルがありません。',
 	'select' => '選択',
@@ -190,7 +188,6 @@ $translations = array(
 	'Clone' => 'クローン',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
 	'Partition by' => 'パーティション',
-	'Partition' => null,
 	'Partitions' => 'パーティション',
 	'Partition name' => 'パーティション名',
 	'Values' => '値',
@@ -227,7 +224,6 @@ $translations = array(
 	'Permanent login' => '永続的にログイン',
 	'Databases have been dropped.' => 'データベースを削除しました',
 	'Search data in tables' => 'データを検索する',
-	'as a regular expression' => null,
 	'Schema' => 'スキーマ',
 	'Alter schema' => 'スキーマ変更',
 	'Create schema' => 'スキーマ追加',
@@ -277,40 +273,4 @@ $translations = array(
 	'yes' => 'はい',
 	'no' => 'いいえ',
 	'Default value' => '既定値',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ka.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'არასწორი მომხმარებელი ან პაროლი.',
 	'Server' => 'სერვერი',
 	'Username' => 'მომხმარებელი',
 	'Password' => 'პაროლი',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'ბაზის შექმნა',
 	'SQL command' => 'SQL-ბრძანება',
 	'Logout' => 'გასვლა',
-	'database' => 'ბაზა',
 	'Use' => 'არჩევა',
 	'No tables.' => 'ბაზაში ცხრილი არაა.',
 	'select' => 'არჩევა',
@@ -188,7 +186,6 @@ $translations = array(
 	'Tables have been dropped.' => 'ცხრილები წაიშალა.',
 	'Clone' => 'კლონირება',
 	'Partition by' => 'დაყოფა',
-	'Partition' => null,
 	'Partitions' => 'დანაყოფები',
 	'Partition name' => 'დანაყოფის სახელი',
 	'Values' => 'პარამეტრები',
@@ -222,7 +219,6 @@ $translations = array(
 	'Permanent login' => 'სისტემაში დარჩენა',
 	'Databases have been dropped.' => 'ბაზა წაიშალა.',
 	'Search data in tables' => 'ცხრილებში ძებნა',
-	'as a regular expression' => null,
 	'Schema' => 'სქემა',
 	'Alter schema' => 'სქემის შეცვლა',
 	'Create schema' => 'ახალი სქემა',
@@ -303,14 +299,4 @@ $translations = array(
 	'Unknown error.' => 'უცნობი შეცდომა.',
 	'Database does not support password.' => 'ბაზაში არაა მხარდაჭერილი პაროლი.',
 	'Disable %s or enable %s or %s extensions.' => 'გათიშეთ %s ან ჩართეთ %s ან %s გაფართოება.',
-
-	'overwrite' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ko.inc.php

@@ -1,6 +1,5 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'$1-$3-$5' => '$1-$3-$5',
 	'%.3f s' => '%.3f 초',
 	'%d byte(s)' => '%d 바이트',
@@ -72,7 +71,6 @@ $translations = array(
 	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
 	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
 	'Database schema' => '데이터베이스 구조',
-	'database' => '데이터베이스',
 	'Database' => '데이터베이스',
 	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
 	'Date and time' => '시간',
@@ -122,7 +120,7 @@ $translations = array(
 	'Indexes have been altered.' => '색인을 변경했습니다.',
 	'Indexes' => '색인',
 	'Insert' => '삽입',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => '잘못된 로그인',
 	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
 	'Invalid database.' => '잘못된 데이터베이스입니다.',
 	'Invalid schema.' => '잘못된 스키마입니다.',
@@ -173,7 +171,6 @@ $translations = array(
 	'Parameter name' => '매개변수 이름',
 	'Partition by' => '파티션',
 	'Partition name' => '파티션 이름',
-	'Partition' => null,
 	'Partitions' => '파티션',
 	'Password' => '비밀번호',
 	'Permanent link' => '영구적으로 링크',
@@ -206,7 +203,6 @@ $translations = array(
 	'Schema has been dropped.' => '스키마를 삭제했습니다.',
 	'Schema' => '스키마',
 	'Search data in tables' => '테이블 내 데이터 검색',
-	'as a regular expression' => null,
 	'Search' => '검색',
 	'Select data' => '데이터를 선택하십시오.',
 	'Select database' => '데이터베이스를 선택하십시오.',
@@ -280,37 +276,4 @@ $translations = array(
 	'You are offline.' => '오프라인입니다.',
 	'You can upload a big SQL file via FTP and import it from server.' => '큰 SQL 파일은 FTP를 통하여 업로드하여 서버에서 가져올 수 있습니다.',
 	'You have no privileges to update this table.' => '이 테이블을 업데이트할 권한이 없습니다.',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'User types' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'ATTACH queries are not supported.' => null,
-	'%d / ' => array(),
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/lt.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistema',
 	'Server' => 'Serveris',
 	'Username' => 'Vartotojas',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Atsijungti',
 	'Logged as: %s' => 'Prisijungęs kaip: %s',
 	'Logout successful.' => 'Jūs atsijungėte nuo sistemos.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Neteisingi prisijungimo duomenys.',
 	'Language' => 'Kalba',
 	'Invalid CSRF token. Send the form again.' => 'Neteisingas CSRF tokenas. Bandykite siųsti formos duomenis dar kartą.',
 	'No extension' => 'Nėra plėtiio',
@@ -20,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Sesijos galiojimas baigėsi. Prisijunkite iš naujo.',
 	'%s version: %s through PHP extension %s' => '%s versija: %s per PHP plėtinį %s',
 	'Refresh' => 'Atnaujinti',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Privilegijos',
 	'Create user' => 'Sukurti vartotoją',
 	'User has been dropped.' => 'Vartotojas ištrintas.',
@@ -34,14 +33,14 @@ $translations = array(
 	'Routine' => 'Procedūra',
 	'Grant' => 'Suteikti',
 	'Revoke' => 'Atšaukti',
-
+	
 	'Process list' => 'Procesų sąrašas',
 	'%d process(es) have been killed.' => array('%d procesas nutrauktas.', '%d procesai nutraukti.', '%d procesų nutraukta.'),
 	'Kill' => 'Nutraukti',
-
+	
 	'Variables' => 'Kintamieji',
 	'Status' => 'Būsena',
-
+	
 	'SQL command' => 'SQL užklausa',
 	'%d query(s) executed OK.' => array('%d užklausa įvykdyta.', '%d užklausos įvykdytos.', '%d užklausų įvykdyta.'),
 	'Query executed OK, %d row(s) affected.' => array('Užklausa įvykdyta. Pakeistas %d įrašas.', 'Užklausa įvykdyta. Pakeisti %d įrašai.', 'Užklausa įvykdyta. Pakeista %d įrašų.'),
@@ -55,7 +54,7 @@ $translations = array(
 	'History' => 'Istorija',
 	'Clear' => 'Išvalyti',
 	'Edit all' => 'Redaguoti visus',
-
+	
 	'File upload' => 'Failo įkėlimas',
 	'From server' => 'Iš serverio',
 	'Webserver file %s' => 'Failas %s iš serverio',
@@ -65,16 +64,15 @@ $translations = array(
 	'Unable to upload a file.' => 'Nepavyko įkelti failo.',
 	'Maximum allowed file size is %sB.' => 'Maksimalus failo dydis - %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Per daug POST duomenų. Sumažinkite duomenų kiekį arba padidinkite konfigūracijos nustatymą %s.',
-
+	
 	'Export' => 'Eksportas',
 	'Output' => 'Išvestis',
 	'open' => 'atidaryti',
 	'save' => 'išsaugoti',
 	'Format' => 'Formatas',
 	'Data' => 'Duomenys',
-
+	
 	'Database' => 'Duomenų bazė',
-	'database' => 'duomenų bazė',
 	'Use' => 'Naudoti',
 	'Select database' => 'Pasirinkti duomenų bazę',
 	'Invalid database.' => 'Neteisinga duomenų bazė.',
@@ -86,10 +84,10 @@ $translations = array(
 	'Alter database' => 'Redaguoti duomenų bazę',
 	'Create database' => 'Sukurti duomenų bazę',
 	'Database schema' => 'Duomenų bazės schema',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Pastovi nuoroda',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -111,7 +109,7 @@ $translations = array(
 	'Tables have been moved.' => 'Lentelės perkeltos.',
 	'Copy' => 'Kopijuoti',
 	'Tables have been copied.' => 'Lentelės nukopijuotos.',
-
+	
 	'Routines' => 'Procedūros',
 	'Routine has been called, %d row(s) affected.' => array('Procedūra įvykdyta. %d įrašas pakeistas.', 'Procedūra įvykdyta. %d įrašai pakeisti.', 'Procedūra įvykdyta. %d įrašų pakeista.'),
 	'Call' => 'Vykdyti',
@@ -124,7 +122,7 @@ $translations = array(
 	'Alter function' => 'Keisti funkciją',
 	'Alter procedure' => 'Keiskti procedūrą',
 	'Return type' => 'Grąžinimo tipas',
-
+	
 	'Events' => 'Įvykiai',
 	'Event has been dropped.' => 'Įvykis pašalintas.',
 	'Event has been altered.' => 'Įvykis pakeistas.',
@@ -137,7 +135,7 @@ $translations = array(
 	'Start' => 'Pradžia',
 	'End' => 'Pabaiga',
 	'On completion preserve' => 'Įvykdžius išsaugoti',
-
+	
 	'Tables' => 'Lentelės',
 	'Tables and views' => 'Lentelės ir vaizdai',
 	'Table' => 'Lentelė',
@@ -165,27 +163,26 @@ $translations = array(
 	'Move down' => 'Perkelti žemyn',
 	'Remove' => 'Pašalinti',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
-
+	
 	'Partition by' => 'Skirstyti pagal',
-	'Partition' => null,
 	'Partitions' => 'Skirsniai',
 	'Partition name' => 'Skirsnio pavadinimas',
 	'Values' => 'Reikšmės',
-
+	
 	'View' => 'Vaizdas',
 	'View has been dropped.' => 'Vaizdas pašalintas.',
 	'View has been altered.' => 'Vaizdas pakeistas.',
 	'View has been created.' => 'Vaizdas sukurtas.',
 	'Alter view' => 'Redaguoti vaizdą',
 	'Create view' => 'Sukurti vaizdą',
-
+	
 	'Indexes' => 'Indeksai',
 	'Indexes have been altered.' => 'Indeksai pakeisti.',
 	'Alter indexes' => 'Redaguoti indeksus',
 	'Add next' => 'Pridėti kitą',
 	'Index Type' => 'Indekso tipas',
 	'Column (length)' => 'Stulpelis (ilgis)',
-
+	
 	'Foreign keys' => 'Išoriniai raktai',
 	'Foreign key' => 'Išorinis raktas',
 	'Foreign key has been dropped.' => 'Išorinis raktas pašalintas.',
@@ -201,7 +198,7 @@ $translations = array(
 	'ON DELETE' => 'Ištrinant',
 	'ON UPDATE' => 'Atnaujinant',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Šaltinio ir tikslinis stulpelis turi būti to paties tipo, tiksliniame stulpelyje turi būti naudojamas indeksas ir duomenys turi egzistuoti.',
-
+	
 	'Triggers' => 'Trigeriai',
 	'Add trigger' => 'Pridėti trigerį',
 	'Trigger has been dropped.' => 'Trigeris pašalintas.',
@@ -212,7 +209,7 @@ $translations = array(
 	'Time' => 'Laikas',
 	'Event' => 'Įvykis',
 	'Name' => 'Pavadinimas',
-
+	
 	'select' => 'atrinkti',
 	'Select' => 'Atrinkti',
 	'Select data' => 'Atrinkti duomenis',
@@ -221,7 +218,6 @@ $translations = array(
 	'Search' => 'Ieškoti',
 	'anywhere' => 'visur',
 	'Search data in tables' => 'Ieškoti duomenų lentelėse',
-	'as a regular expression' => null,
 	'Sort' => 'Rikiuoti',
 	'descending' => 'mažėjimo tvarka',
 	'Limit' => 'Limitas',
@@ -234,13 +230,13 @@ $translations = array(
 	'last' => 'paskutinis',
 	'Whole result' => 'Visas rezultatas',
 	'%d byte(s)' => array('%d baitas', '%d baigai', '%d baitų'),
-
+	
 	'Import' => 'Importas',
 	'%d row(s) have been imported.' => array('%d įrašas įkelta.', '%d įrašai įkelti.', '%d įrašų įkelta.'),
-
+	
 	// in-place editing in select
 	'Use edit link to modify this value.' => 'Norėdami redaguoti reikšmę naudokite redagavimo nuorodą.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Įrašas%s sukurtas.',
 	'Item has been deleted.' => 'Įrašas ištrintas.',
@@ -258,14 +254,14 @@ $translations = array(
 	'Save and insert next' => 'Išsaugoti ir įrašyti kitą',
 	'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',
@@ -275,7 +271,7 @@ $translations = array(
 	'Network' => 'Tinklas',
 	'Geometry' => 'Geometrija',
 	'Relations' => 'Ryšiai',
-
+	
 	'Editor' => 'Redaktorius',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -284,11 +280,11 @@ $translations = array(
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
 	'HH:MM:SS' => 'HH:MM:SS',
 	'now' => 'dabar',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Failas egzistuoja.',
 	'Please use one of the extensions %s.' => 'Naudokite vieną iš plėtinių %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Keisti schemą',
 	'Create schema' => 'Sukurti schemą',
@@ -297,7 +293,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schema pakeista.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Neteisinga schema.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekos',
 	'Create sequence' => 'Sukurti seką',
@@ -305,57 +301,11 @@ $translations = array(
 	'Sequence has been created.' => 'Seka sukurta.',
 	'Sequence has been altered.' => 'Seka pakeista.',
 	'Alter sequence' => 'Keisti seką',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Vartotojų tipai',
 	'Create type' => 'Sukurti tipą',
 	'Type has been dropped.' => 'Tipas pašalintas.',
 	'Type has been created.' => 'Tipas sukurtas.',
 	'Alter type' => 'Keisti tipą',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/lv.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Ieiet',
 	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Nepareizs lietotāja vārds vai parole.',
 	'Server' => 'Serveris',
 	'Username' => 'Lietotājs',
 	'Password' => 'Parole',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Izveidot datubāzi',
 	'SQL command' => 'SQL pieprasījums',
 	'Logout' => 'Iziet',
-	'database' => 'datubāze',
 	'Use' => 'Lietot',
 	'No tables.' => 'Datubāzē nav tabulu.',
 	'select' => 'izvēlēties',
@@ -190,7 +188,6 @@ $translations = array(
 	'Tables have been dropped.' => 'Tabulas dzēstas.',
 	'Clone' => 'Klonēt',
 	'Partition by' => 'Sadalīt pēc',
-	'Partition' => null,
 	'Partitions' => 'Partīcijas',
 	'Partition name' => 'Partīcijas nosaukums',
 	'Values' => 'Vērtības',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Atcerēties mani',
 	'Databases have been dropped.' => 'Datubāzes dzēstas.',
 	'Search data in tables' => 'Meklēt tabulās',
-	'as a regular expression' => null,
 	'Schema' => 'Shēma',
 	'Alter schema' => 'Izmainīt shēmu',
 	'Create schema' => 'Jauna shēma',
@@ -288,10 +284,10 @@ $translations = array(
 	'Size' => 'Izmērs',
 	'Compute' => 'Izskaitļot',
 	'You are offline.' => 'Jūs est bezsasaistē.',
-	'You have no privileges to update this table.' => 'Jums nav pieejas labot šo tabulu.',
+	'You have no privileges to update this table.' => 'jums nav pieejas labot šo tabulu.',
 	'Saving' => 'Saglabāšana',
-	'yes' => 'jā',
+	'yes' => 'Jā',
-	'no' => 'nē',
+	'no' => 'Nē',
 	'Drop %s?' => 'Dzēst %s?',
 	'overwrite' => 'pārrakstīt',
 	'DB' => 'DB',
@@ -303,14 +299,4 @@ $translations = array(
 	'There is a space in the input password which might be the cause.' => 'Parole satur atstarpi, kas varētu būt lieka.',
 	'Unknown error.' => 'Nezināma kļūda.',
 	'Database does not support password.' => 'Datubāze neatbalsta paroli.',
-
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Jā',
-	'No' => 'Nē',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ms.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Pelayan',
 	'Username' => 'Nama pengguna',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Log masuk sebagai: %s',
 	'Logout successful.' => 'Log keluar berjaya.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Terima kasih kerana menggunakan Adminer, pertimbangkan untuk <a href="https://www.adminer.org/en/donation/">menderma</a>.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Akses tidak sah.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Terlalu banyak percubaan log masuk yang gagal, sila cuba lagi dalam masa %d minit.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Kata laluan utama telah luput. <a href="https://www.adminer.org/en/extension/"%s>Gunakan</a> cara %s untuk mengekalkannya.',
 	'Language' => 'Bahasa',
@@ -83,7 +82,6 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Pangkalan data',
-	'database' => 'pangkalan data',
 	'Use' => 'Guna',
 	'Select database' => 'Pilih pangkalan data',
 	'Invalid database.' => 'Pangkalan data tidak sah.',
@@ -182,7 +180,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bilangan medan telah melebihi had yang dibenarkan. Sila tingkatkan %s.',
 
 	'Partition by' => 'Partition mengikut',
-	'Partition' => null,
 	'Partitions' => 'Partition',
 	'Partition name' => 'Nama partition',
 	'Values' => 'Nilai',
@@ -237,7 +234,6 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana-mana',
 	'Search data in tables' => 'Cari data dalam jadual',
-	'as a regular expression' => null,
 	'Sort' => 'Susun',
 	'descending' => 'menurun',
 	'Limit' => 'Had',
@@ -340,22 +336,4 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis telah dijatuhkan.',
 	'Type has been created.' => 'Jenis telah dibuat.',
 	'Alter type' => 'Ubah jenis',
-
-	'overwrite' => null,
-	'DB' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ya',
-	'No' => 'Tidak',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/nl.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Aanmelden',
 	'Logout successful.' => 'Successvol afgemeld.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ongeldige gebruikersgegevens.',
 	'Server' => 'Server',
 	'Username' => 'Gebruikersnaam',
 	'Password' => 'Wachtwoord',
@@ -33,7 +32,6 @@ $translations = array(
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
 	'Logout' => 'Afmelden',
-	'database' => 'database',
 	'Use' => 'Gebruik',
 	'No tables.' => 'Geen tabellen.',
 	'select' => 'kies',
@@ -192,7 +190,6 @@ $translations = array(
 	'Clone' => 'Dupliceer',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maximum aantal velden bereikt. Verhoog %s.',
 	'Partition by' => 'Partitioneren op',
-	'Partition' => null,
 	'Partitions' => 'Partities',
 	'Partition name' => 'Partitie naam',
 	'Values' => 'Waarden',
@@ -226,7 +223,6 @@ $translations = array(
 	'%d in total' => '%d in totaal',
 	'Permanent login' => 'Blijf aangemeld',
 	'Search data in tables' => 'Zoeken in database',
-	'as a regular expression' => 'als een regular expression',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema wijzigen',
 	'Create schema' => 'Schema maken',
@@ -268,7 +264,6 @@ $translations = array(
 	'Permanent link' => 'Permanente link',
 	'Edit all' => 'Alles bewerken',
 	'HH:MM:SS' => 'HH:MM:SS',
-
 	'Drop %s?' => 'Verwijder %s?',
 	'Tables have been optimized.' => 'Tabellen zijn geoptimaliseerd.',
 	'Materialized view' => 'Materialized view',
@@ -288,7 +283,6 @@ $translations = array(
 	'Default value' => 'Standaardwaarde',
 	'Full table scan' => 'Full table scan',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuut.', 'Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuten.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master wachtwoord verlopen. <a href="https://www.adminer.org/en/extension/"%s>Implementeer</a> de %s methode om het permanent te maken.',
 	'The action will be performed after successful login with the same credentials.' => 'Deze actie zal uitgevoerd worden na het succesvol aanmelden met dezelfde gebruikersgegevens',
 	'Connecting to privileged ports is not allowed.' => 'Verbindingen naar geprivilegieerde poorten is niet toegestaan.',
@@ -305,12 +299,4 @@ $translations = array(
 	'Disable %s or enable %s or %s extensions.' => 'Schakel %s uit or schakel extensies %s of %s in.',
 	'yes' => 'ja',
 	'no' => 'neen',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Neen',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/no.inc.php

@@ -1,6 +1,5 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Brukernavn',
@@ -10,7 +9,7 @@ $translations = array(
 	'Logout' => 'Logg ut',
 	'Logged as: %s' => 'Logget inn som: %s',
 	'Logout successful.' => 'Utlogging vellykket.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for å gjøre det permanent.',
 	'Language' => 'Språk',
 	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
@@ -65,7 +64,6 @@ $translations = array(
 	'Format' => 'Format',
 	'Data' => 'Data',
 	'Database' => 'Database',
-	'database' => 'database',
 	'Use' => 'Bruk',
 	'Select database' => 'Velg database',
 	'Invalid database.' => 'Ugyldig database.',
@@ -152,7 +150,6 @@ $translations = array(
 	'Remove' => 'Fjern',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antall feltnavn overskredet - venligst øk %s.',
 	'Partition by' => 'Partisjoner ved',
-	'Partition' => null,
 	'Partitions' => 'Partisjoner',
 	'Partition name' => 'Partisjonsnavn',
 	'Values' => 'Verdier',
@@ -201,7 +198,6 @@ $translations = array(
 	'Search' => 'Søk',
 	'anywhere' => 'hvorsomhelst',
 	'Search data in tables' => 'Søk data i tabeller',
-	'as a regular expression' => null,
 	'Sort' => 'Sorter',
 	'descending' => 'minkende',
 	'Limit' => 'Skranke',
@@ -282,35 +278,4 @@ $translations = array(
 	'Type has been created.' => 'Type er opprettet.',
 	'Alter type' => 'Endre type',
 	'Saving' => 'Lagrer',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Nei',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/pl.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Rodzaj bazy',
 	'Server' => 'Serwer',
 	'Username' => 'Użytkownik',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ proszę <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
-	'Invalid server or credentials.' => 'Nieprawidłowy serwer lub dane logowania.',
+	'Invalid credentials.' => 'Nieprawidłowe dane logowania.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Za dużo nieudanych prób logowania, spróbuj ponownie za %d minutę.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minuty.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minut.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="https://www.adminer.org/pl/extension/"%s>Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
 	'Language' => 'Język',
@@ -43,10 +42,10 @@ $translations = array(
 	'Process list' => 'Lista procesów',
 	'%d process(es) have been killed.' => array('Przerwano %d wątek.', 'Przerwano %d wątki.', 'Przerwano %d wątków.'),
 	'Kill' => 'Przerwij wykonywanie',
-
+	
 	'Variables' => 'Zmienne',
 	'Status' => 'Status',
-
+	
 	'SQL command' => 'Zapytanie SQL',
 	'%d query(s) executed OK.' => array('Pomyślnie wykonano %d zapytanie.', 'Pomyślnie wykonano %d zapytania.', 'Pomyślnie wykonano %d zapytań.'),
 	'Query executed OK, %d row(s) affected.' => array('Zapytanie wykonane pomyślnie, zmieniono %d rekord.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordy.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordów.'),
@@ -61,7 +60,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Wyczyść',
 	'Edit all' => 'Edytuj wszystkie',
-
+	
 	'File upload' => 'Wgranie pliku',
 	'From server' => 'Z serwera',
 	'Webserver file %s' => 'Plik %s na serwerze',
@@ -73,16 +72,15 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Przesłano zbyt dużo danych. Zmniejsz objętość danych lub zwiększ zmienną konfiguracyjną %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Większe pliki SQL możesz wgrać na serwer poprzez FTP przed zaimportowaniem.',
 	'You are offline.' => 'Jesteś offline.',
-
+	
 	'Export' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
 	'Format' => 'Format',
 	'Data' => 'Dane',
-
+	
 	'Database' => 'Baza danych',
-	'database' => 'baza danych',
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
 	'Invalid database.' => 'Nie znaleziono bazy danych.',
@@ -94,10 +92,10 @@ $translations = array(
 	'Alter database' => 'Zmień bazę danych',
 	'Create database' => 'Utwórz bazę danych',
 	'Database schema' => 'Schemat bazy danych',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Trwały link',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -120,7 +118,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele zostały przeniesione.',
 	'Copy' => 'Kopiuj',
 	'Tables have been copied.' => 'Tabele zostały skopiowane.',
-
+	
 	'Routines' => 'Procedury i funkcje',
 	'Routine has been called, %d row(s) affected.' => array('Procedura została uruchomiona, zmieniono %d rekord.', 'Procedura została uruchomiona, zmieniono %d rekordy.', 'Procedura została uruchomiona, zmieniono %d rekordów.'),
 	'Call' => 'Uruchom',
@@ -133,7 +131,7 @@ $translations = array(
 	'Alter function' => 'Zmień funkcję',
 	'Alter procedure' => 'Zmień procedurę',
 	'Return type' => 'Zwracany typ',
-
+	
 	'Events' => 'Wydarzenia',
 	'Event has been dropped.' => 'Wydarzenie zostało usunięte.',
 	'Event has been altered.' => 'Wydarzenie zostało zmienione.',
@@ -146,7 +144,7 @@ $translations = array(
 	'Start' => 'Początek',
 	'End' => 'Koniec',
 	'On completion preserve' => 'Nie kasuj wydarzenia po przeterminowaniu',
-
+	
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele i perspektywy',
 	'Table' => 'Tabela',
@@ -179,13 +177,12 @@ $translations = array(
 	'Move down' => 'Przesuń w dół',
 	'Remove' => 'Usuń',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
-
+	
 	'Partition by' => 'Partycjonowanie',
-	'Partition' => null,
 	'Partitions' => 'Partycje',
 	'Partition name' => 'Nazwa partycji',
 	'Values' => 'Wartości',
-
+	
 	'View' => 'Perspektywa',
 	'Materialized view' => 'Zmaterializowana perspektywa',
 	'View has been dropped.' => 'Perspektywa została usunięta.',
@@ -193,14 +190,14 @@ $translations = array(
 	'View has been created.' => 'Perspektywa została utworzona.',
 	'Alter view' => 'Zmień perspektywę',
 	'Create view' => 'Utwórz perspektywę',
-
+	
 	'Indexes' => 'Indeksy',
 	'Indexes have been altered.' => 'Indeksy zostały zmienione.',
 	'Alter indexes' => 'Zmień indeksy',
 	'Add next' => 'Dodaj następny',
 	'Index Type' => 'Typ indeksu',
 	'Column (length)' => 'Kolumna (długość)',
-
+	
 	'Foreign keys' => 'Klucze obce',
 	'Foreign key' => 'Klucz obcy',
 	'Foreign key has been dropped.' => 'Klucz obcy został usunięty.',
@@ -216,7 +213,7 @@ $translations = array(
 	'ON DELETE' => 'W przypadku usunięcia',
 	'ON UPDATE' => 'W przypadku zmiany',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Źródłowa i docelowa kolumna muszą być tego samego typu, powinien istnieć indeks na docelowej kolumnie oraz muszą istnieć dane referencyjne.',
-
+	
 	'Triggers' => 'Wyzwalacze',
 	'Add trigger' => 'Dodaj wyzwalacz',
 	'Trigger has been dropped.' => 'Wyzwalacz został usunięty.',
@@ -227,7 +224,7 @@ $translations = array(
 	'Time' => 'Czas',
 	'Event' => 'Wydarzenie',
 	'Name' => 'Nazwa',
-
+	
 	'select' => 'przeglądaj',
 	'Select' => 'pokaż',
 	'Select data' => 'Pokaż dane',
@@ -236,7 +233,6 @@ $translations = array(
 	'Search' => 'Szukaj',
 	'anywhere' => 'gdziekolwiek',
 	'Search data in tables' => 'Wyszukaj we wszystkich tabelach',
-	'as a regular expression' => null,
 	'Sort' => 'Sortuj',
 	'descending' => 'malejąco',
 	'Limit' => 'Limit',
@@ -254,16 +250,16 @@ $translations = array(
 	'Loading' => 'Wczytywanie',
 	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
-
+	
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('%d rekord został zaimportowany.', '%d rekordy zostały zaimportowane.', '%d rekordów zostało zaimportowanych.'),
 	'File must be in UTF-8 encoding.' => 'Kodowanie pliku musi być ustawione na UTF-8.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Zmień',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknij wartość, aby ją edytować.',
 	'Use edit link to modify this value.' => 'Użyj linku edycji aby zmienić tę wartość.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Rekord%s został dodany.',
 	'Item has been deleted.' => 'Rekord został usunięty.',
@@ -284,14 +280,14 @@ $translations = array(
 	'Clone' => 'Duplikuj',
 	'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',
@@ -301,7 +297,7 @@ $translations = array(
 	'Network' => 'Sieć',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Relacje',
-
+	
 	'Editor' => 'Edytor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -312,11 +308,11 @@ $translations = array(
 	'now' => 'teraz',
 	'yes' => 'tak',
 	'no' => 'nie',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Plik już istnieje.',
 	'Please use one of the extensions %s.' => 'Proszę użyć jednego z rozszerzeń: %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Zmień schemat',
 	'Create schema' => 'Utwórz schemat',
@@ -325,7 +321,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schemat został zmieniony.',
 	'Schema' => 'Schemat',
 	'Invalid schema.' => 'Nieprawidłowy schemat.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekwencje',
 	'Create sequence' => 'Utwórz sekwencję',
@@ -333,29 +329,11 @@ $translations = array(
 	'Sequence has been created.' => 'Sekwencja została utworzona.',
 	'Sequence has been altered.' => 'Sekwencja została zmieniona.',
 	'Alter sequence' => 'Zmień sekwencję',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Typy użytkownika',
 	'Create type' => 'Utwórz typ',
 	'Type has been dropped.' => 'Typ został usunięty.',
 	'Type has been created.' => 'Typ został utworzony.',
 	'Alter type' => 'Zmień typ',
-
-	'overwrite' => null,
-	'DB' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Tak',
-	'No' => 'Nie',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/pt-br.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Identificação inválida.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuário',
 	'Password' => 'Senha',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Sair',
-	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
 	'select' => 'selecionar',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
-	'Partition' => null,
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
 	'Values' => 'Valores',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Login permanente',
 	'Databases have been dropped.' => 'A Base de dados foi apagada.',
 	'Search data in tables' => 'Buscar dados nas Tabelas',
-	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Alterar esquema',
 	'Create schema' => 'Criar esquema',
@@ -263,54 +259,4 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
-
-	'Drop %s?' => null,
-	'Tables have been copied.' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'Copy' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Permanent link' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Edit all' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-	'HH:MM:SS' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/pt.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Identificação inválida.',
 	'Server' => 'Servidor',
 	'Username' => 'Nome de utilizador',
 	'Password' => 'Senha',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
 	'Logout' => 'Terminar sessão',
-	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
 	'select' => 'registos',
@@ -191,7 +189,6 @@ $translations = array(
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
-	'Partition' => null,
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
 	'Values' => 'Valores',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Memorizar a senha',
 	'Databases have been dropped.' => 'Bases de dados eliminadas.',
 	'Search data in tables' => 'Pesquisar dados nas Tabelas',
-	'as a regular expression' => null,
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Criar esquema',
@@ -263,54 +259,4 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
-
-	'Drop %s?' => null,
-	'Tables have been copied.' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'Copy' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Permanent link' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Edit all' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-	'HH:MM:SS' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ro.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Numele de utilizator sau parola este greșită.',
 	'Server' => 'Server',
 	'Username' => 'Nume de utilizator',
 	'Password' => 'Parola',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Crează baza de date',
 	'SQL command' => 'SQL query',
 	'Logout' => 'Ieșire',
-	'database' => 'baza de date',
 	'Use' => 'Alege',
 	'No tables.' => 'În baza de date nu sunt tabele.',
 	'select' => 'selectează',
@@ -190,7 +188,6 @@ $translations = array(
 	'Tables have been dropped.' => 'Tabelele au fost șterse.',
 	'Clone' => 'Clonează',
 	'Partition by' => 'Împarte',
-	'Partition' => null,
 	'Partitions' => 'Secțiuni',
 	'Partition name' => 'Denumirea secțiunii',
 	'Values' => 'Parametru',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Logare permanentă',
 	'Databases have been dropped.' => 'Bazele de date au fost șterse.',
 	'Search data in tables' => 'Caută în tabele',
-	'as a regular expression' => null,
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifică schema',
 	'Create schema' => 'Crează o schemă',
@@ -268,49 +264,4 @@ $translations = array(
 	'Permanent link' => 'Adresă permanentă',
 	'Edit all' => 'Editează tot',
 	'HH:MM:SS' => 'HH:MM:SS',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ru.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => null,
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
 	'Server' => 'Сервер',
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
@@ -32,7 +31,6 @@ $translations = array(
 	'Create database' => 'Создать базу данных',
 	'SQL command' => 'SQL-запрос',
 	'Logout' => 'Выйти',
-	'database' => 'база данных',
 	'Use' => 'Выбрать',
 	'No tables.' => 'В базе данных нет таблиц.',
 	'select' => 'выбрать',
@@ -190,7 +188,6 @@ $translations = array(
 	'Tables have been dropped.' => 'Таблицы были удалены.',
 	'Clone' => 'Клонировать',
 	'Partition by' => 'Разделить по',
-	'Partition' => null,
 	'Partitions' => 'Разделы',
 	'Partition name' => 'Название раздела',
 	'Values' => 'Параметры',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Оставаться в системе',
 	'Databases have been dropped.' => 'Базы данных удалены.',
 	'Search data in tables' => 'Поиск в таблицах',
-	'as a regular expression' => 'как регулярное выражение',
 	'Schema' => 'Схема',
 	'Alter schema' => 'Изменить схему',
 	'Create schema' => 'Новая схема',
@@ -290,8 +286,8 @@ $translations = array(
 	'You are offline.' => 'Вы не выполнили вход.',
 	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
 	'Saving' => 'Сохранение',
-	'yes' => 'да',
+	'yes' => 'Да',
-	'no' => 'нет',
+	'no' => 'Нет',
 	'Drop %s?' => 'Удалить %s?',
 	'overwrite' => 'перезаписать',
 	'DB' => 'DB',
@@ -303,14 +299,5 @@ $translations = array(
 	'There is a space in the input password which might be the cause.' => 'В введеном пароле есть пробел, это может быть причиною.',
 	'Unknown error.' => 'Неизвестная ошибка.',
 	'Database does not support password.' => 'База данных не поддерживает пароль.',
-
 	'Disable %s or enable %s or %s extensions.' => 'Отключите %s или включите расширения %s или %s.',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Да',
-	'No' => 'Нет',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/sk.inc.php

@@ -1,9 +1,8 @@
 <?php
 $translations = array(
-	'Home' => 'Domov',
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
-	'Invalid server or credentials.' => 'Neplatný server alebo prihlasovacie údaje.',
+	'Invalid credentials.' => 'Neplatné prihlasovacie údaje.',
 	'Server' => 'Server',
 	'Username' => 'Používateľ',
 	'Password' => 'Heslo',
@@ -33,7 +32,6 @@ $translations = array(
 	'Create database' => 'Vytvoriť databázu',
 	'SQL command' => 'SQL príkaz',
 	'Logout' => 'Odhlásiť',
-	'database' => 'databáza',
 	'Use' => 'Vybrať',
 	'No tables.' => 'Žiadne tabuľky.',
 	'select' => 'vypísať',
@@ -191,7 +189,6 @@ $translations = array(
 	'Whole result' => 'Celý výsledok',
 	'Clone' => 'Klonovať',
 	'Partition by' => 'Rozdeliť podľa',
-	'Partition' => 'Oddiel',
 	'Partitions' => 'Oddiely',
 	'Partition name' => 'Názov oddielu',
 	'Values' => 'Hodnoty',
@@ -226,7 +223,6 @@ $translations = array(
 	'Permanent login' => 'Trvalé prihlásenie',
 	'%d in total' => '%d celkom',
 	'Search data in tables' => 'Vyhľadať dáta v tabuľkách',
-	'as a regular expression' => 'ako regulárny výraz',
 	'Alter schema' => 'Pozmeniť schému',
 	'Create schema' => 'Vytvoriť schému',
 	'Schema has been dropped.' => 'Schéma bola odstránená.',
@@ -277,8 +273,8 @@ $translations = array(
 	'DB' => 'DB',
 	'File must be in UTF-8 encoding.' => 'Súbor musí byť v kódovaní UTF-8.',
 	'Modify' => 'Zmeniť',
-	'Load more data' => 'Nahráť ďalšie dáta',
+	'Load more data' => 'Načítať ďalšie dáta',
-	'Loading' => 'Nahráva sa',
+	'Loading' => 'Načítava sa',
 	'ATTACH queries are not supported.' => 'Dotazy ATTACH nie sú podporované.',
 	'Warnings' => 'Varovania',
 	'%d / ' => '%d / ',
@@ -304,11 +300,4 @@ $translations = array(
 	'Disable %s or enable %s or %s extensions.' => 'Zakážte %s alebo povoľte rozšírenie %s alebo %s.',
 	'yes' => 'áno',
 	'no' => 'nie',
-	'Yes' => 'Áno',
-	'No' => 'Nie',
-	'Columns' => 'Stĺpce',
-	'Nullable' => 'Povolené null',
-	'Default' => 'Predvolené',
-	'One Time Password' => 'Jednorázové heslo',
-	'Invalid OTP code.' => 'Neplatný kód OTP.',
 );

adminer/lang/sl.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Strežnik',
 	'Username' => 'Uporabniško ime',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Odjavi se',
 	'Logged as: %s' => 'Prijavljen kot: %s',
 	'Logout successful.' => 'Prijava uspešna.',
-	'Invalid server or credentials.' => 'Neveljaven strežnik ali pravice.',
+	'Invalid credentials.' => 'Neveljavne pravice.',
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Neveljaven token CSRF. Pošljite formular še enkrat.',
 	'No extension' => 'Brez dodatkov',
@@ -20,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Seja je potekla. Prosimo, ponovno se prijavite.',
 	'%s version: %s through PHP extension %s' => 'Verzija %s: %s preko dodatka za PHP %s',
 	'Refresh' => 'Osveži',
-
+	
 	// text direction
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Pravice',
 	'Create user' => 'Ustvari uporabnika',
 	'User has been dropped.' => 'Uporabnik je odstranjen.',
@@ -34,14 +33,14 @@ $translations = array(
 	'Routine' => 'Postopek',
 	'Grant' => 'Dovoli',
 	'Revoke' => 'Odvzemi',
-
+	
 	'Process list' => 'Seznam procesov',
 	'%d process(es) have been killed.' => array('Končan je %d proces.', 'Končana sta %d procesa.', 'Končani so %d procesi.', 'Končanih je %d procesov.'),
 	'Kill' => 'Končaj',
-
+	
 	'Variables' => 'Spremenljivke',
 	'Status' => 'Stanje',
-
+	
 	'SQL command' => 'Ukaz SQL',
 	'%d query(s) executed OK.' => array('Uspešno se je končala %d poizvedba.', 'Uspešno sta se končali %d poizvedbi.', 'Uspešno so se končale %d poizvedbe.', 'Uspešno se je končalo %d poizvedb.'),
 	'Query executed OK, %d row(s) affected.' => array('Poizvedba se je uspešno izvedla, spremenjena je %d vrstica.', 'Poizvedba se je uspešno izvedla, spremenjeni sta %d vrstici.', 'Poizvedba se je uspešno izvedla, spremenjene so %d vrstice.', 'Poizvedba se je uspešno izvedla, spremenjenih je %d vrstic.'),
@@ -54,7 +53,7 @@ $translations = array(
 	'%.3f s' => '%.3f s',
 	'History' => 'Zgodovina',
 	'Clear' => 'Počisti',
-
+	
 	'File upload' => 'Naloži datoteko',
 	'From server' => 'z strežnika',
 	'Webserver file %s' => 'Datoteka na spletnem strežniku %s',
@@ -64,16 +63,15 @@ $translations = array(
 	'Unable to upload a file.' => 'Ne morem naložiti datoteke.',
 	'Maximum allowed file size is %sB.' => 'Največja velikost datoteke je %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Preveliko podatkov za POST. Zmanjšajte število podatkov ali povečajte nastavitev za %s.',
-
+	
 	'Export' => 'Izvozi',
 	'Output' => 'Izhod rezultata',
 	'open' => 'odpri',
 	'save' => 'shrani',
 	'Format' => 'Format',
 	'Data' => 'Podatki',
-
+	
 	'Database' => 'Baza',
-	'database' => 'baza',
 	'Use' => 'Uporabi',
 	'Select database' => 'Izberi bazo',
 	'Invalid database.' => 'Neveljavna baza.',
@@ -85,7 +83,7 @@ $translations = array(
 	'Alter database' => 'Spremeni bazo',
 	'Create database' => 'Ustvari bazo',
 	'Database schema' => 'Shema baze',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -107,7 +105,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele so premaknjene.',
 	'Copy' => 'Kopiraj',
 	'Tables have been copied.' => 'Tabele so kopirane.',
-
+	
 	'Routines' => 'Postopki',
 	'Routine has been called, %d row(s) affected.' => array('Klican je bil postopek, spremenjena je %d vrstica.', 'Klican je bil postopek, spremenjeni sta %d vrstici.', 'Klican je bil postopek, spremenjene so %d vrstice.', 'Klican je bil postopek, spremenjenih je %d vrstic.'),
 	'Call' => 'Pokliči',
@@ -120,7 +118,7 @@ $translations = array(
 	'Alter function' => 'Spremeni funkcijo',
 	'Alter procedure' => 'Spremeni postopek',
 	'Return type' => 'Vračalni tip',
-
+	
 	'Events' => 'Dogodki',
 	'Event has been dropped.' => 'Dogodek je zavržen.',
 	'Event has been altered.' => 'Dogodek je spremenjen.',
@@ -133,7 +131,7 @@ $translations = array(
 	'Start' => 'Začetek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po zaključku ohrani',
-
+	
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele in pogledi',
 	'Table' => 'Tabela',
@@ -161,27 +159,26 @@ $translations = array(
 	'Move down' => 'Premakni dol',
 	'Remove' => 'Odstrani',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
-
+	
 	'Partition by' => 'Porazdeli po',
-	'Partition' => null,
 	'Partitions' => 'Porazdelitve',
 	'Partition name' => 'Ime porazdelitve',
 	'Values' => 'Vrednosti',
-
+	
 	'View' => 'Pogledi',
 	'View has been dropped.' => 'Pogled je zavržen.',
 	'View has been altered.' => 'Pogled je spremenjen.',
 	'View has been created.' => 'Pogled je ustvarjen.',
 	'Alter view' => 'Spremeni pogled',
 	'Create view' => 'Ustvari pogled',
-
+	
 	'Indexes' => 'Indeksi',
 	'Indexes have been altered.' => 'Indeksi so spremenjeni.',
 	'Alter indexes' => 'Spremeni indekse',
 	'Add next' => 'Dodaj naslednjega',
 	'Index Type' => 'Tip indeksa',
 	'Column (length)' => 'Stolpec (dolžina)',
-
+	
 	'Foreign keys' => 'Tuji ključi',
 	'Foreign key' => 'Tuj ključ',
 	'Foreign key has been dropped.' => 'Tuj ključ je zavržen.',
@@ -197,7 +194,7 @@ $translations = array(
 	'ON DELETE' => 'pri brisanju',
 	'ON UPDATE' => 'pri posodabljanju',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Izvorni in ciljni stolpec mora imeti isti podatkovni tip. Obstajati mora indeks na ciljnih stolpcih in obstajati morajo referenčni podatki.',
-
+	
 	'Triggers' => 'Sprožilniki',
 	'Add trigger' => 'Dodaj sprožilnik',
 	'Trigger has been dropped.' => 'Sprožilnik je odstranjen.',
@@ -208,7 +205,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Dogodek',
 	'Name' => 'Naziv',
-
+	
 	'select' => 'izberi',
 	'Select' => 'Izberi',
 	'Select data' => 'Izberi podatke',
@@ -217,7 +214,6 @@ $translations = array(
 	'Search' => 'Išči',
 	'anywhere' => 'kjerkoli',
 	'Search data in tables' => 'Išče podatke po tabelah',
-	'as a regular expression' => null,
 	'Sort' => 'Sortiraj',
 	'descending' => 'padajoče',
 	'Limit' => 'Limita',
@@ -230,14 +226,14 @@ $translations = array(
 	'last' => 'Zadnja',
 	'Whole result' => 'Cel razultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajti', '%d bajtov'),
-
+	
 	'Import' => 'Uvozi',
 	'%d row(s) have been imported.' => array('Uvožena je %d vrstica.', 'Uvoženi sta %d vrstici.', 'Uvožene so %d vrstice.', 'Uvoženih je %d vrstic.'),
-
+	
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrednost za urejanje.',
 	'Use edit link to modify this value.' => 'Uporabite urejanje povezave za spreminjanje te vrednosti.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Predmet%s je vstavljen.',
 	'Item has been deleted.' => 'Predmet je izbrisan.',
@@ -255,14 +251,14 @@ $translations = array(
 	'Save and insert next' => 'Shrani in vstavi tekst',
 	'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',
@@ -272,18 +268,18 @@ $translations = array(
 	'Network' => 'Mrežni',
 	'Geometry' => 'Geometrčni',
 	'Relations' => 'Relacijski',
-
+	
 	'Editor' => 'Urejevalnik',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
 	// hint for date format - use language equivalents for day, month and year shortcuts
 	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
 	'now' => 'zdaj',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Datoteka obstaja.',
 	'Please use one of the extensions %s.' => 'Prosim, uporabite enega od dodatkov %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Spremeni shemo',
 	'Create schema' => 'Ustvari shemo',
@@ -292,7 +288,7 @@ $translations = array(
 	'Schema has been altered.' => 'Shema je spremenjena.',
 	'Schema' => 'Shema',
 	'Invalid schema.' => 'Neveljavna shema.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Ustvari sekvenco',
@@ -300,59 +296,11 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence je ustvarjena.',
 	'Sequence has been altered.' => 'Sekvence je spremenjena.',
 	'Alter sequence' => 'Spremni sekvenco',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Uporabniški tipi',
 	'Create type' => 'Ustvari tip',
 	'Type has been dropped.' => 'Tip je zavržen.',
 	'Type has been created.' => 'Tip je ustvarjen.',
 	'Alter type' => 'Spremeni tip',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Permanent link' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Edit all' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You can upload a big SQL file via FTP and import it from server.' => null,
-	'Size' => null,
-	'Compute' => null,
-	'You are offline.' => null,
-	'You have no privileges to update this table.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-	'yes' => null,
-	'no' => null,
-	'HH:MM:SS' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/sr.inc.php

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

adminer/lang/sv.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'System',
 	'Server' => 'Server',
 	'Username' => 'Användarnamn',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Inloggad som: %s',
 	'Logout successful.' => 'Du är nu utloggad.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Tack för att du använder Adminer, vänligen fundera över att <a href="https://www.adminer.org/en/donation/">donera</a>.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ogiltiga inloggningsuppgifter.',
 	'There is a space in the input password which might be the cause.' => 'Det finns ett mellanslag i lösenordet, vilket kan vara anledningen.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer tillåter inte att ansluta till en databas utan lösenord. <a href="https://www.adminer.org/en/password/"%s>Mer information</a>.',
 	'Database does not support password.' => 'Databasen stödjer inte lösenord.',
@@ -90,7 +89,6 @@ $translations = array(
 	'Data' => 'Data',
 
 	'Database' => 'Databas',
-	'database' => 'databas',
 	'DB' => 'DB',
 	'Use' => 'Använd',
 	'Select database' => 'Välj databas',
@@ -191,7 +189,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Högsta nummer tillåtna fält är överskridet. Vänligen höj %s.',
 
 	'Partition by' => 'Partitionera om',
-	'Partition' => null,
 	'Partitions' => 'Partitioner',
 	'Partition name' => 'Partition',
 	'Values' => 'Värden',
@@ -246,7 +243,6 @@ $translations = array(
 	'Search' => 'Sök',
 	'anywhere' => 'överallt',
 	'Search data in tables' => 'Sök data i tabeller',
-	'as a regular expression' => null,
 	'Sort' => 'Sortera',
 	'descending' => 'Fallande',
 	'Limit' => 'Begränsning',
@@ -349,12 +345,4 @@ $translations = array(
 	'Type has been dropped.' => 'Typ har, typ, tagits bort.',
 	'Type has been created.' => 'Typ har skapats.',
 	'Alter type' => 'Ändra typ',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Nej',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ta.inc.php

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

adminer/lang/th.inc.php

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

adminer/lang/tr.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Sistem',
 	'Server' => 'Sunucu',
 	'Username' => 'Kullanıcı',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
 	'Logout successful.' => 'Oturum başarıyla sonlandı.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Adminer kullandığınız için teşekkür ederiz <a href="https://www.adminer.org/en/donation/">bağış yapmayı düşünün</a>.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Geçersiz kimlik bilgileri.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Çok fazla oturum açma denemesi yapıldı.', '%d Dakika sonra tekrar deneyiniz.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ana şifrenin süresi doldu. Kalıcı olması için <a href="https://www.adminer.org/en/extension/"%s>%s medodunu</a> kullanın.',
 	'Language' => 'Dil',
@@ -85,7 +84,6 @@ $translations = array(
 	'Data' => 'Veri',
 
 	'Database' => 'Veri Tabanı',
-	'database' => 'veri tabanı',
 	'DB' => 'DB',
 	'Use' => 'Kullan',
 	'Select database' => 'Veri tabanı seç',
@@ -185,7 +183,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'İzin verilen en fazla alan sayısı aşıldı. Lütfen %s değerlerini artırın.',
 
 	'Partition by' => 'Bununla bölümle',
-	'Partition' => null,
 	'Partitions' => 'Bölümler',
 	'Partition name' => 'Bölüm adı',
 	'Values' => 'Değerler',
@@ -240,7 +237,6 @@ $translations = array(
 	'Search' => 'Ara',
 	'anywhere' => 'hiçbir yerde',
 	'Search data in tables' => 'Tablolarda veri ara',
-	'as a regular expression' => null,
 	'Sort' => 'Sırala',
 	'descending' => 'Azalan',
 	'Limit' => 'Limit',
@@ -343,19 +339,4 @@ $translations = array(
 	'Type has been dropped.' => 'Tür silindi.',
 	'Type has been created.' => 'Tür oluşturuldu.',
 	'Alter type' => 'Türü değiştir',
-
-	'overwrite' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Evet',
-	'No' => 'Hayır',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/uk.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Система Бази Даних',
 	'Server' => 'Сервер',
 	'Username' => 'Користувач',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Вийти',
 	'Logged as: %s' => 'Ви увійшли як: %s',
 	'Logout successful.' => 'Ви вдало вийшли з системи.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Неправильні дані входу.',
 	'Language' => 'Мова',
 	'Invalid CSRF token. Send the form again.' => 'Недійсний CSRF токен. Надішліть форму ще раз.',
 	'No extension' => 'Нема розширень',
@@ -20,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесія закінчилась, будь ласка, увійдіть в систему знову.',
 	'%s version: %s through PHP extension %s' => 'Версія %s: %s з PHP-розширенням %s',
 	'Refresh' => 'Оновити',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Привілеї',
 	'Create user' => 'Створити користувача',
 	'User has been dropped.' => 'Користувача було видалено.',
@@ -34,14 +33,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Дозволити',
 	'Revoke' => 'Заборонити',
-
+	
 	'Process list' => 'Перелік процесів',
 	'%d process(es) have been killed.' => array('Було завершено %d процес.', 'Було завершено %d процеси.', 'Було завершёно %d процесів.'),
 	'Kill' => 'Завершити процес',
-
+	
 	'Variables' => 'Змінні',
 	'Status' => 'Статус',
-
+	
 	'SQL command' => 'SQL запит',
 	'%d query(s) executed OK.' => array('%d запит виконано успішно.', '%d запити виконано успішно.', '%d запитів виконано успішно.'),
 	'Query executed OK, %d row(s) affected.' => array('Запит виконано успішно, змінено %d рядок.', 'Запит виконано успішно, змінено %d рядки.', 'Запит виконано успішно, змінено %d рядків.'),
@@ -55,7 +54,7 @@ $translations = array(
 	'History' => 'Історія',
 	'Clear' => 'Очистити',
 	'Edit all' => 'Редагувати все',
-
+	
 	'File upload' => 'Завантажити файл',
 	'From server' => 'З сервера',
 	'Webserver file %s' => 'Файл %s на вебсервері',
@@ -65,16 +64,15 @@ $translations = array(
 	'Unable to upload a file.' => 'Неможливо завантажити файл.',
 	'Maximum allowed file size is %sB.' => 'Максимально допустимий розмір файлу %sБ.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
-
+	
 	'Export' => 'Експорт',
 	'Output' => 'Вихідні дані',
 	'open' => 'відкрити',
 	'save' => 'зберегти',
 	'Format' => 'Формат',
 	'Data' => 'Дані',
-
+	
 	'Database' => 'База даних',
-	'database' => 'база даних',
 	'Use' => 'Обрати',
 	'Select database' => 'Обрати базу даних',
 	'Invalid database.' => 'Погана база даних.',
@@ -86,10 +84,10 @@ $translations = array(
 	'Alter database' => 'Змінити базу даних',
 	'Create database' => 'Створити базу даних',
 	'Database schema' => 'Схема бази даних',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Постійне посилання',
-
+	
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -111,7 +109,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиці було перенесено.',
 	'Copy' => 'копіювати',
 	'Tables have been copied.' => 'Таблиці було зкопійовано.',
-
+	
 	'Routines' => 'Збережені процедури',
 	'Routine has been called, %d row(s) affected.' => array('Була викликана процедура, %d запис було змінено.', 'Була викликана процедура, %d записи було змінено.', 'Була викликана процедура, %d записів було змінено.'),
 	'Call' => 'Викликати',
@@ -124,7 +122,7 @@ $translations = array(
 	'Alter function' => 'Змінити функцію',
 	'Alter procedure' => 'Змінити процедуру',
 	'Return type' => 'Тип, що повернеться',
-
+	
 	'Events' => 'Події',
 	'Event has been dropped.' => 'Подію було видалено.',
 	'Event has been altered.' => 'Подію було змінено.',
@@ -137,7 +135,7 @@ $translations = array(
 	'Start' => 'Початок',
 	'End' => 'Кінець',
 	'On completion preserve' => 'Після завершення зберегти',
-
+	
 	'Tables' => 'Таблиці',
 	'Tables and views' => 'Таблиці і вигляди',
 	'Table' => 'Таблиця',
@@ -166,27 +164,26 @@ $translations = array(
 	'Move down' => 'Пересунути вниз',
 	'Remove' => 'Видалити',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
-
+	
 	'Partition by' => 'Розділити по',
-	'Partition' => null,
 	'Partitions' => 'Розділи',
 	'Partition name' => 'Назва розділу',
 	'Values' => 'Значення',
-
+	
 	'View' => 'Вигляд',
 	'View has been dropped.' => 'Вигляд було видалено.',
 	'View has been altered.' => 'Вигляд було змінено.',
 	'View has been created.' => 'Вигляд було створено.',
 	'Alter view' => 'Змінити вигляд',
 	'Create view' => 'Створити вигляд',
-
+	
 	'Indexes' => 'Індекси',
 	'Indexes have been altered.' => 'Індексування було змінено.',
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
 	'Column (length)' => 'Стовпець (довжина)',
-
+	
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
 	'Foreign key has been dropped.' => 'Зовнішній ключ було видалено.',
@@ -202,7 +199,7 @@ $translations = array(
 	'ON DELETE' => 'ПРИ ВИДАЛЕННІ',
 	'ON UPDATE' => 'ПРИ ЗМІНІ',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Стовпці повинні мати той самий тип даних, цільові стовпці повинні бути проіндексовані і дані, на які посилаються повинні існувати.',
-
+	
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Додати тригер',
 	'Trigger has been dropped.' => 'Тригер було видалено.',
@@ -213,7 +210,7 @@ $translations = array(
 	'Time' => 'Час',
 	'Event' => 'Подія',
 	'Name' => 'Назва',
-
+	
 	'select' => 'вибрати',
 	'Select' => 'Вибрати',
 	'Select data' => 'Вибрати дані',
@@ -222,7 +219,6 @@ $translations = array(
 	'Search' => 'Пошук',
 	'anywhere' => 'будь-де',
 	'Search data in tables' => 'Шукати дані в таблицях',
-	'as a regular expression' => null,
 	'Sort' => 'Сортувати',
 	'descending' => 'по спаданню',
 	'Limit' => 'Обмеження',
@@ -235,14 +231,14 @@ $translations = array(
 	'last' => 'остання',
 	'Whole result' => 'Весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
-
+	
 	'Import' => 'Імпортувати',
 	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
-
+	
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+клікніть на значенні щоб змінити його.',
 	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Запис%s було вставлено.',
 	'Item has been deleted.' => 'Запис було видалено.',
@@ -260,14 +256,14 @@ $translations = array(
 	'Save and insert next' => 'Зберегти і вставити знову',
 	'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' => 'Дата і час',
@@ -277,7 +273,7 @@ $translations = array(
 	'Network' => 'Мережа',
 	'Geometry' => 'Геометрія',
 	'Relations' => 'Зв\'язки',
-
+	
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -288,11 +284,11 @@ $translations = array(
 	'now' => 'зараз',
 	'yes' => 'так',
 	'no' => 'ні',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файл існує.',
 	'Please use one of the extensions %s.' => 'Будь ласка, використовуйте одне з розширень %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Змінити схему',
 	'Create schema' => 'Створити схему',
@@ -301,7 +297,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схему було змінено.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невірна схема.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Послідовності',
 	'Create sequence' => 'Створити послідовність',
@@ -309,7 +305,7 @@ $translations = array(
 	'Sequence has been created.' => 'Послідовність було створено.',
 	'Sequence has been altered.' => 'Послідовність було змінено.',
 	'Alter sequence' => 'Змінити послідовність',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Типи користувачів',
 	'Create type' => 'Створити тип',
@@ -346,16 +342,4 @@ $translations = array(
 	'Saving' => 'Збереження',
 	'Unknown error.' => 'Невідома помилка.',
 	'Database does not support password.' => 'База даних не підтримує пароль.',
-
-	'Vacuum' => null,
-	'%d / ' => array(),
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Так',
-	'No' => 'Ні',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/vi.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => 'Hệ thống',
 	'Server' => 'Máy chủ',
 	'Username' => 'Tên người dùng',
@@ -11,7 +10,7 @@ $translations = array(
 	'Logout' => 'Thoát',
 	'Logged as: %s' => 'Vào dưới tên: %s',
 	'Logout successful.' => 'Đã thoát xong.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Tài khoản sai.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Bạn gõ sai tài khoản quá nhiều lần, hãy thử lại sau %d phút nữa.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="https://www.adminer.org/en/extension/"%s>Thử cách làm</a> để giữ cố định.',
 	'Language' => 'Ngôn ngữ',
@@ -22,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Phiên làm việc đã hết, hãy đăng nhập lại.',
 	'%s version: %s through PHP extension %s' => 'Phiên bản %s: %s (PHP extension: %s)',
 	'Refresh' => 'Làm mới',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => 'Quyền truy cập',
 	'Create user' => 'Tạo người dùng',
 	'User has been dropped.' => 'Đã xoá người dùng.',
@@ -36,14 +35,14 @@ $translations = array(
 	'Routine' => 'Hàm tích hợp',
 	'Grant' => 'Cấp quyền',
 	'Revoke' => 'Tước quyền',
-
+	
 	'Process list' => 'Danh sách tiến trình',
 	'%d process(es) have been killed.' => '%d tiến trình đã dừng.',
 	'Kill' => 'Dừng',
-
+	
 	'Variables' => 'Biến',
 	'Status' => 'Trạng thái',
-
+	
 	'SQL command' => 'Câu lệnh SQL',
 	'%d query(s) executed OK.' => '%d câu lệnh đã chạy thành công.',
 	'Query executed OK, %d row(s) affected.' => 'Đã thực hiện xong, ảnh hưởng đến %d dòng.',
@@ -57,7 +56,7 @@ $translations = array(
 	'History' => 'Lịch sử',
 	'Clear' => 'Xoá',
 	'Edit all' => 'Sửa tất cả',
-
+	
 	'File upload' => 'Tải tệp lên',
 	'From server' => 'Dùng tệp trên máy chủ',
 	'Webserver file %s' => 'Tệp trên máy chủ',
@@ -68,16 +67,15 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Kích thước tệp tối đa là %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Dữ liệu tải lên/POST quá lớn. Hãy giảm kích thước tệp hoặc tăng cấu hình (hiện tại %s).',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Bạn có thể tải tệp lên dùng FTP và nhập vào cơ sở dữ liệu.',
-
+	
 	'Export' => 'Xuất',
 	'Output' => 'Kết quả',
 	'open' => 'xem',
 	'save' => 'lưu',
 	'Format' => 'Định dạng',
 	'Data' => 'Dữ liệu',
-
+	
 	'Database' => 'Cơ sở dữ liệu',
-	'database' => 'cơ sở dữ liệu',
 	'Use' => 'Sử dụng',
 	'Select database' => 'Chọn CSDL',
 	'Invalid database.' => 'CSDL sai.',
@@ -89,10 +87,10 @@ $translations = array(
 	'Alter database' => 'Thay đổi CSDL',
 	'Create database' => 'Tạo CSDL',
 	'Database schema' => 'Cấu trúc CSDL',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Liên kết cố định',
-
+	
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -115,7 +113,7 @@ $translations = array(
 	'Tables have been moved.' => 'Bảng.',
 	'Copy' => 'Sao chép',
 	'Tables have been copied.' => 'Bảng đã được sao chép.',
-
+	
 	'Routines' => 'Routines',
 	'Routine has been called, %d row(s) affected.' => 'Đã chạy routine, thay đổi %d dòng.',
 	'Call' => 'Gọi',
@@ -140,7 +138,7 @@ $translations = array(
 	'Start' => 'Bắt đầu',
 	'End' => 'Kết thúc',
 	'On completion preserve' => 'Khi kết thúc, duy trì',
-
+	
 	'Tables' => 'Các bảng',
 	'Tables and views' => 'Bảng và khung nhìn',
 	'Table' => 'Bảng',
@@ -171,27 +169,26 @@ $translations = array(
 	'Move down' => 'Chuyển xuống dưới',
 	'Remove' => 'Xoá',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Thiết lập %s cần tăng thêm. (Đã vượt giới hạnố trường tối đa cho phép trong một biểu mẫu).',
-
+	
 	'Partition by' => 'Phân chia bằng',
-	'Partition' => null,
 	'Partitions' => 'Phân hoạch',
 	'Partition name' => 'Tên phân hoạch',
 	'Values' => 'Giá trị',
-
+	
 	'View' => 'Khung nhìn',
 	'View has been dropped.' => 'Khung nhìn đã bị xoá.',
 	'View has been altered.' => 'Khung nhìn đã được sửa.',
 	'View has been created.' => 'Khung nhìn đã được tạo.',
 	'Alter view' => 'Sửa khung nhìn',
 	'Create view' => 'Tạo khung nhìn',
-
+	
 	'Indexes' => 'Chỉ mục',
 	'Indexes have been altered.' => 'Chỉ mục đã được sửa.',
 	'Alter indexes' => 'Sửa chỉ mục',
 	'Add next' => 'Thêm tiếp',
 	'Index Type' => 'Loại chỉ mục',
 	'Column (length)' => 'Cột (độ dài)',
-
+	
 	'Foreign keys' => 'Các khoá ngoại',
 	'Foreign key' => 'Khoá ngoại',
 	'Foreign key has been dropped.' => 'Khoá ngoại đã bị xoá.',
@@ -207,7 +204,7 @@ $translations = array(
 	'ON DELETE' => 'Khi xoá',
 	'ON UPDATE' => 'Khi cập nhật',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Cột gốc và cột đích phải cùng kiểu, phải đặt chỉ mục trong cột đích và dữ liệu tham chiếu phải tồn tại.',
-
+	
 	'Triggers' => 'Phản xạ',
 	'Add trigger' => 'Thêm phản xạ',
 	'Trigger has been dropped.' => 'Đã xoá phản xạ.',
@@ -218,7 +215,7 @@ $translations = array(
 	'Time' => 'Thời gian',
 	'Event' => 'Sự kiện',
 	'Name' => 'Tên',
-
+	
 	'select' => 'xem',
 	'Select' => 'Xem',
 	'Select data' => 'Xem dữ liệu',
@@ -227,7 +224,6 @@ $translations = array(
 	'Search' => 'Tìm kiếm',
 	'anywhere' => 'bất cứ đâu',
 	'Search data in tables' => 'Tìm kiếm dữ liệu trong các bảng',
-	'as a regular expression' => null,
 	'Sort' => 'Sắp xếp',
 	'descending' => 'giảm dần',
 	'Limit' => 'Giới hạn',
@@ -243,16 +239,16 @@ $translations = array(
 	'Loading' => 'Đang nạp',
 	'Whole result' => 'Toàn bộ kết quả',
 	'%d byte(s)' => '%d byte(s)',
-
+	
 	'Import' => 'Nhập khẩu',
 	'%d row(s) have been imported.' => 'Đã nhập % dòng dữ liệu.',
 	'File must be in UTF-8 encoding.' => 'Tệp phải mã hoá bằng chuẩn UTF-8.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Sửa',
 	'Ctrl+click on a value to modify it.' => 'Nhấn Ctrl và bấm vào giá trị để sửa.',
 	'Use edit link to modify this value.' => 'Dùng nút sửa để thay đổi giá trị này.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Đã thêm%s.',
 	'Item has been deleted.' => 'Đã xoá.',
@@ -272,14 +268,14 @@ $translations = array(
 	'Clone' => 'Sao chép',
 	'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ờ',
@@ -289,7 +285,7 @@ $translations = array(
 	'Network' => 'Mạng',
 	'Geometry' => 'Toạ độ',
 	'Relations' => 'Quan hệ',
-
+	
 	'Editor' => 'Biên tập',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -300,11 +296,11 @@ $translations = array(
 	'now' => 'hiện tại',
 	'yes' => 'có',
 	'no' => 'không',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tệp đã có rồi.',
 	'Please use one of the extensions %s.' => 'Cần phải dùng một trong các phần mở rộng sau: %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Thay đổi schema',
 	'Create schema' => 'Tạo schema',
@@ -313,7 +309,7 @@ $translations = array(
 	'Schema has been altered.' => 'Đã thay đổi schema.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Schema không hợp lệ.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Dãy số',
 	'Create sequence' => 'Tạo dãy số',
@@ -321,40 +317,11 @@ $translations = array(
 	'Sequence has been created.' => 'Đã tạo dãy số.',
 	'Sequence has been altered.' => 'Đã sửa dãy số.',
 	'Alter sequence' => 'Thay đổi dãy số',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Kiểu tự định nghĩa',
 	'Create type' => 'Tạo kiểu',
 	'Type has been dropped.' => 'Đã xoá kiểu.',
 	'Type has been created.' => 'Đã tạo kiểu.',
 	'Alter type' => 'Sửa kiểu dữ liệu',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
-	'The action will be performed after successful login with the same credentials.' => null,
-	'Connecting to privileged ports is not allowed.' => null,
-	'There is a space in the input password which might be the cause.' => null,
-	'If you did not send this request from Adminer then close this page.' => null,
-	'You are offline.' => null,
-	'Saving' => null,
-	'Unknown error.' => null,
-	'Database does not support password.' => null,
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Có',
-	'No' => 'Không',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/xx.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => 'Xx',
 	'System' => 'Xx',
 	'Server' => 'Xx',
 	'Username' => 'Xx',
@@ -12,7 +11,7 @@ $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>.',
-	'Invalid server or credentials.' => 'Xx.',
+	'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>.',
 	'Database does not support password.' => 'Xx.',
@@ -30,10 +29,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => 'Xx.',
 	'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
 	'Refresh' => 'Xx',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'xx',
-
+	
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
 	'User has been dropped.' => 'Xx.',
@@ -44,14 +43,14 @@ $translations = array(
 	'Routine' => 'Xx',
 	'Grant' => 'Xx',
 	'Revoke' => 'Xx',
-
+	
 	'Process list' => 'Xx',
 	'%d process(es) have been killed.' => array('%d xx.', '%d xx.'),
 	'Kill' => 'Xx',
-
+	
 	'Variables' => 'Xx',
 	'Status' => 'Xx',
-
+	
 	'SQL command' => 'Xx',
 	'%d query(s) executed OK.' => array('%d xx.', '%d xx.'),
 	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
@@ -68,7 +67,7 @@ $translations = array(
 	'History' => 'Xx',
 	'Clear' => 'Xx',
 	'Edit all' => 'Xx',
-
+	
 	'File upload' => 'Xx',
 	'From server' => 'Xx',
 	'Webserver file %s' => 'Xx %s',
@@ -80,7 +79,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Xx.',
 	'You are offline.' => 'Xx.',
-
+	
 	'Export' => 'Xx',
 	'Output' => 'Xx',
 	'open' => 'xx',
@@ -88,9 +87,8 @@ $translations = array(
 	'Saving' => 'Xx',
 	'Format' => 'Xx',
 	'Data' => 'Xx',
-
+	
 	'Database' => 'Xx',
-	'database' => 'xx',
 	'DB' => 'XX',
 	'Use' => 'Xx',
 	'Select database' => 'Xx',
@@ -103,10 +101,10 @@ $translations = array(
 	'Alter database' => 'Xx',
 	'Create database' => 'Xx',
 	'Database schema' => 'Xx',
-
+	
 	// link to current database schema layout
 	'Permanent link' => 'Xx',
-
+	
 	// thousands separator - must contain single byte
 	',' => 'x',
 	'0123456789' => 'xxxxxxxxxx',
@@ -130,7 +128,7 @@ $translations = array(
 	'Copy' => 'Xx',
 	'Tables have been copied.' => 'Xx.',
 	'overwrite' => 'xx',
-
+	
 	'Routines' => 'Xx',
 	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'Call' => 'Xx',
@@ -143,7 +141,7 @@ $translations = array(
 	'Alter function' => 'Xx',
 	'Alter procedure' => 'Xx',
 	'Return type' => 'Xx',
-
+	
 	'Events' => 'Xx',
 	'Event has been dropped.' => 'Xx.',
 	'Event has been altered.' => 'Xx.',
@@ -156,7 +154,7 @@ $translations = array(
 	'Start' => 'Xx',
 	'End' => 'Xx',
 	'On completion preserve' => 'Xx',
-
+	
 	'Tables' => 'Xx',
 	'Tables and views' => 'Xx',
 	'Table' => 'Xx',
@@ -189,13 +187,12 @@ $translations = array(
 	'Move down' => 'Xx',
 	'Remove' => 'Xx',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
-
+	
 	'Partition by' => 'Xx',
-	'Partition' => 'Xx',
 	'Partitions' => 'Xx',
 	'Partition name' => 'Xx',
 	'Values' => 'Xx',
-
+	
 	'View' => 'Xx',
 	'Materialized view' => 'Xx',
 	'View has been dropped.' => 'Xx.',
@@ -203,14 +200,14 @@ $translations = array(
 	'View has been created.' => 'Xx.',
 	'Alter view' => 'Xx',
 	'Create view' => 'Xx',
-
+	
 	'Indexes' => 'Xx',
 	'Indexes have been altered.' => 'Xx.',
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
 	'Column (length)' => 'Xx',
-
+	
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
 	'Foreign key has been dropped.' => 'Xx.',
@@ -226,7 +223,7 @@ $translations = array(
 	'ON DELETE' => 'Xx',
 	'ON UPDATE' => 'Xx',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Xx.',
-
+	
 	'Triggers' => 'Xx',
 	'Add trigger' => 'Xx',
 	'Trigger has been dropped.' => 'Xx.',
@@ -237,7 +234,7 @@ $translations = array(
 	'Time' => 'Xx',
 	'Event' => 'Xx',
 	'Name' => 'Xx',
-
+	
 	'select' => 'xx',
 	'Select' => 'Xx',
 	'Select data' => 'Xx',
@@ -246,7 +243,6 @@ $translations = array(
 	'Search' => 'Xx',
 	'anywhere' => 'xx',
 	'Search data in tables' => 'Xx',
-	'as a regular expression' => 'xx',
 	'Sort' => 'Xx',
 	'descending' => 'xx',
 	'Limit' => 'Xx',
@@ -264,16 +260,16 @@ $translations = array(
 	'Loading' => 'Xx',
 	'Whole result' => 'Xx',
 	'%d byte(s)' => array('%d xx', '%d xx'),
-
+	
 	'Import' => 'Xx',
 	'%d row(s) have been imported.' => array('%d xx.', '%d xx.'),
 	'File must be in UTF-8 encoding.' => 'Xx.',
-
+	
 	// in-place editing in select
 	'Modify' => 'Xx',
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
@@ -293,14 +289,14 @@ $translations = array(
 	'Clone' => 'Xx',
 	'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',
@@ -310,7 +306,7 @@ $translations = array(
 	'Network' => 'Xx',
 	'Geometry' => 'Xx',
 	'Relations' => 'Xx',
-
+	
 	'Editor' => 'Xx',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => 'xx',
@@ -321,11 +317,11 @@ $translations = array(
 	'now' => 'xx',
 	'yes' => 'xx',
 	'no' => 'xx',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Xx.',
 	'Please use one of the extensions %s.' => 'Xx %s.',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Xx',
 	'Create schema' => 'Xx',
@@ -334,7 +330,7 @@ $translations = array(
 	'Schema has been altered.' => 'Xx.',
 	'Schema' => 'Xx',
 	'Invalid schema.' => 'Xx.',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => 'Xx',
 	'Create sequence' => 'Xx',
@@ -342,20 +338,11 @@ $translations = array(
 	'Sequence has been created.' => 'Xx.',
 	'Sequence has been altered.' => 'Xx.',
 	'Alter sequence' => 'Xx',
-
+	
 	// PostgreSQL user types support
 	'User types' => 'Xx',
 	'Create type' => 'Xx',
 	'Type has been dropped.' => 'Xx.',
 	'Type has been created.' => 'Xx.',
 	'Alter type' => 'Xx',
-
-	// Plugins
-	'Columns' => 'Xx',
-	'Nullable' => 'Xx',
-	'Default' => 'Xx',
-	'Yes' => 'Xx',
-	'No' => 'Xx',
-	'One Time Password' => 'Xx',
-	'Invalid OTP code.' => 'Xx.',
 );

adminer/lang/zh-tw.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => '資料庫系統',
 	'Server' => '伺服器',
 	'Username' => '帳號',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '登錄為： %s',
 	'Logout successful.' => '成功登出。',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => '無效的憑證。',
 	'There is a space in the input password which might be the cause.' => '您輸入的密碼中有一個空格，這可能是導致問題的原因。',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>.',
 	'Database does not support password.' => '資料庫不支援密碼。',
@@ -30,10 +29,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作將在成功使用相同的憑據登錄後執行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s 透過 PHP 擴充模組 %s',
 	'Refresh' => '重新載入',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-
+	
 	'Privileges' => '權限',
 	'Create user' => '建立使用者',
 	'User has been dropped.' => '已刪除使用者。',
@@ -44,14 +43,14 @@ $translations = array(
 	'Routine' => '程序',
 	'Grant' => '授權',
 	'Revoke' => '廢除',
-
+	
 	'Process list' => '處理程序列表',
 	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
-
+	
 	'Variables' => '變數',
 	'Status' => '狀態',
-
+	
 	'SQL command' => 'SQL 命令',
 	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
 	'Query executed OK, %d row(s) affected.' => '執行查詢 OK，%d 行受影響。',
@@ -68,7 +67,7 @@ $translations = array(
 	'History' => '紀錄',
 	'Clear' => '清除',
 	'Edit all' => '編輯全部',
-
+	
 	'File upload' => '檔案上傳',
 	'From server' => '從伺服器',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
@@ -80,7 +79,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
 	'You can upload a big SQL file via FTP and import it from server.' => '您可以通過FTP上傳大型SQL檔並從伺服器導入。',
 	'You are offline.' => '您離線了。',
-
+	
 	'Export' => '匯出',
 	'Output' => '輸出',
 	'open' => '打開',
@@ -88,9 +87,8 @@ $translations = array(
 	'Saving' => '保存中',
 	'Format' => '格式',
 	'Data' => '資料',
-
+	
 	'Database' => '資料庫',
-	'database' => '資料庫',
 	'DB' => '資料庫',
 	'Use' => '使用',
 	'Select database' => '選擇資料庫',
@@ -103,10 +101,10 @@ $translations = array(
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'Database schema' => '資料庫結構',
-
+	
 	// link to current database schema layout
 	'Permanent link' => '永久連結',
-
+	
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -130,7 +128,7 @@ $translations = array(
 	'Copy' => '複製',
 	'Tables have been copied.' => '資料表已經複製',
 	'overwrite' => '覆蓋',
-
+	
 	'Routines' => '程序',
 	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
@@ -143,7 +141,7 @@ $translations = array(
 	'Alter function' => '修改函式',
 	'Alter procedure' => '修改預存程序',
 	'Return type' => '回傳類型',
-
+	
 	'Events' => '事件',
 	'Event has been dropped.' => '已刪除事件。',
 	'Event has been altered.' => '已修改事件。',
@@ -156,7 +154,7 @@ $translations = array(
 	'Start' => '開始',
 	'End' => '結束',
 	'On completion preserve' => '在完成後儲存',
-
+	
 	'Tables' => '資料表',
 	'Tables and views' => '資料表和檢視表',
 	'Table' => '資料表',
@@ -189,13 +187,12 @@ $translations = array(
 	'Move down' => '下移',
 	'Remove' => '移除',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加 %s。',
-
+	
 	'Partition by' => '分區類型',
-	'Partition' => null,
 	'Partitions' => '分區',
 	'Partition name' => '分區名稱',
 	'Values' => '值',
-
+	
 	'View' => '檢視表',
 	'Materialized view' => '物化視圖',
 	'View has been dropped.' => '已刪除檢視表。',
@@ -203,14 +200,14 @@ $translations = array(
 	'View has been created.' => '已建立檢視表。',
 	'Alter view' => '修改檢視表',
 	'Create view' => '建立檢視表',
-
+	
 	'Indexes' => '索引',
 	'Indexes have been altered.' => '已修改索引。',
 	'Alter indexes' => '修改索引',
 	'Add next' => '新增下一筆',
 	'Index Type' => '索引類型',
 	'Column (length)' => '欄位（長度）',
-
+	
 	'Foreign keys' => '外來鍵',
 	'Foreign key' => '外來鍵',
 	'Foreign key has been dropped.' => '已刪除外來鍵。',
@@ -226,7 +223,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
-
+	
 	'Triggers' => '觸發器',
 	'Add trigger' => '建立觸發器',
 	'Trigger has been dropped.' => '已刪除觸發器。',
@@ -237,7 +234,7 @@ $translations = array(
 	'Time' => '時間',
 	'Event' => '事件',
 	'Name' => '名稱',
-
+	
 	'select' => '選擇',
 	'Select' => '選擇',
 	'Select data' => '選擇資料',
@@ -246,7 +243,6 @@ $translations = array(
 	'Search' => '搜尋',
 	'anywhere' => '任意位置',
 	'Search data in tables' => '在資料庫搜尋',
-	'as a regular expression' => null,
 	'Sort' => '排序',
 	'descending' => '降冪 (遞減)',
 	'Limit' => '限定',
@@ -264,16 +260,16 @@ $translations = array(
 	'Loading' => '載入中',
 	'Whole result' => '所有結果',
 	'%d byte(s)' => '%d byte(s)',
-
+	
 	'Import' => '匯入',
 	'%d row(s) have been imported.' => '已匯入 %d 行。',
 	'File must be in UTF-8 encoding.' => '檔必須使用UTF-8編碼。',
-
+	
 	// in-place editing in select
 	'Modify' => '修改',
 	'Ctrl+click on a value to modify it.' => '按住Ctrl並按一下某個值進行修改。',
 	'Use edit link to modify this value.' => '使用編輯連結來修改。',
-
+	
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '已新增項目 %s。',
 	'Item has been deleted.' => '該項目已被刪除',
@@ -293,14 +289,14 @@ $translations = array(
 	'Clone' => '複製',
 	'Delete' => '刪除',
 	'You have no privileges to update this table.' => '您沒有許可權更新這個資料表。',
-
+	
 	'E-mail' => '電子郵件',
 	'From' => '來自',
 	'Subject' => '主旨',
 	'Attachments' => '附件',
 	'Send' => '寄出',
 	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-
+	
 	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
@@ -310,7 +306,7 @@ $translations = array(
 	'Network' => '網路',
 	'Geometry' => '幾何',
 	'Relations' => '關聯',
-
+	
 	'Editor' => '編輯器',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1.$3.$5',
@@ -321,11 +317,11 @@ $translations = array(
 	'now' => '現在',
 	'yes' => '是',
 	'no' => '否',
-
+	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => '檔案已存在。',
 	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
-
+	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',
@@ -334,7 +330,7 @@ $translations = array(
 	'Schema has been altered.' => '已修改資料表結構。',
 	'Schema' => '資料表結構',
 	'Invalid schema.' => '無效的資料表結構。',
-
+	
 	// PostgreSQL sequences support
 	'Sequences' => '序列',
 	'Create sequence' => '建立序列',
@@ -342,20 +338,11 @@ $translations = array(
 	'Sequence has been created.' => '已建立序列。',
 	'Sequence has been altered.' => '已修改序列。',
 	'Alter sequence' => '修改序列',
-
+	
 	// PostgreSQL user types support
 	'User types' => '使用者類型',
 	'Create type' => '建立類型',
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
 	'Alter type' => '修改類型',
-
-	// Plugins
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/zh.inc.php

@@ -1,7 +1,6 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'Home' => null,
 	'System' => '系统',
 	'Server' => '服务器',
 	'Username' => '用户名',
@@ -12,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '登录用户：%s',
 	'Logout successful.' => '成功登出。',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => '无效凭据。',
 	'There is a space in the input password which might be the cause.' => '您输入的密码中有一个空格，这可能是导致问题的原因。',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>.',
 	'Database does not support password.' => '数据库不支持密码。',
@@ -30,7 +29,7 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作将在成功使用相同的凭据登录后执行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
 	'Refresh' => '刷新',
-
+	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 
@@ -90,7 +89,6 @@ $translations = array(
 	'Data' => '数据',
 
 	'Database' => '数据库',
-	'database' => '数据库',
 	'DB' => '数据库',
 	'Use' => '使用',
 	'Select database' => '选择数据库',
@@ -191,7 +189,6 @@ $translations = array(
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超过最多允许的字段数量。请增加 %s。',
 
 	'Partition by' => '分区类型',
-	'Partition' => null,
 	'Partitions' => '分区',
 	'Partition name' => '分区名',
 	'Values' => '值',
@@ -246,7 +243,6 @@ $translations = array(
 	'Search' => '搜索',
 	'anywhere' => '任意位置',
 	'Search data in tables' => '在表中搜索数据',
-	'as a regular expression' => null,
 	'Sort' => '排序',
 	'descending' => '降序',
 	'Limit' => '范围',
@@ -349,12 +345,4 @@ $translations = array(
 	'Type has been dropped.' => '已删除类型。',
 	'Type has been created.' => '已创建类型。',
 	'Alter type' => '修改类型',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/plugin.php

@@ -2,15 +2,15 @@
 function adminer_object() {
 	// required to run any plugin
 	include_once "../plugins/plugin.php";
-	
+
 	// autoloader
 	foreach (glob("../plugins/*.php") as $filename) {
 		include_once $filename;
 	}
-	
+
 	// enable extra drivers just by including them
 	//~ include "../plugins/drivers/simpledb.php";
-	
+
 	$plugins = array(
 		// specify enabled plugins here
 		new AdminerDatabaseHide(array('information_schema')),
@@ -32,13 +32,13 @@ function adminer_object() {
 		new AdminerTablesFilter,
 		new AdminerEditForeign,
 	);
-	
+
 	/* It is possible to combine customization and plugins:
 	class AdminerCustomization extends AdminerPlugin {
 	}
 	return new AdminerCustomization($plugins);
 	*/
-	
+
 	return new AdminerPlugin($plugins);
 }
 

adminer/privileges.inc.php

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

adminer/scheme.inc.php

@@ -26,8 +26,7 @@ if (!$row) {
 ?>
 
 <form action="" method="post">
-<p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<p><input name="name" autofocus value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php echo script("focus(qs('#name'));"); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {

adminer/select.inc.php

@@ -9,8 +9,6 @@ parse_str($_COOKIE["adminer_import"], $adminer_import);
 
 $rights = array(); // privilege => 0
 $columns = array(); // selectable columns
-$search_columns = array(); // searchable columns
-$order_columns = array(); // searchable columns
 $text_length = null;
 foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
@@ -20,12 +18,6 @@ foreach ($fields as $key => $field) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
-	if (isset($field["privileges"]["where"]) && $name != "") {
-		$search_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
-	}
-	if (isset($field["privileges"]["order"]) && $name != "") {
-		$order_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
-	}
 	$rights += $field["privileges"];
 }
 
@@ -232,7 +224,7 @@ if (is_ajax()) {
 
 $set = null;
 if (isset($rights["insert"]) || !support("table")) {
-	$params = [];
+	$params = array();
 	foreach ((array) $_GET["where"] as $val) {
 		if (isset($foreign_keys[$val["col"]]) && count($foreign_keys[$val["col"]]) == 1
 			&& ($val["op"] == "=" || (!$val["op"] && (is_array($val["val"]) || !preg_match('~[_%]~', $val["val"]))) // LIKE in Editor
@@ -253,11 +245,10 @@ if (!$columns && support("table")) {
 	hidden_fields_get();
 	echo (DB != "" ? '<input type="hidden" name="db" value="' . h(DB) . '">' . (isset($_GET["ns"]) ? '<input type="hidden" name="ns" value="' . h($_GET["ns"]) . '">' : "") : ""); // not used in Editor
 	echo '<input type="hidden" name="select" value="' . h($TABLE) . '">';
-	echo '<input type="submit" value="' . h(lang('Select')) . '">'; # hidden default submit so filter remove buttons aren't "clicked" on submission from enter key
 	echo "</div>\n";
 	$adminer->selectColumnsPrint($select, $columns);
-	$adminer->selectSearchPrint($where, $search_columns, $indexes);
+	$adminer->selectSearchPrint($where, $columns, $indexes);
-	$adminer->selectOrderPrint($order, $order_columns, $indexes);
+	$adminer->selectOrderPrint($order, $columns, $indexes);
 	$adminer->selectLimitPrint($limit);
 	$adminer->selectLengthPrint($text_length);
 	$adminer->selectActionPrint($indexes);
@@ -335,27 +326,19 @@ if (!$columns && support("table")) {
 				if (!isset($unselected[$key])) {
 					$val = $_GET["columns"][key($select)];
 					$field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
-					$name = ($field ? $adminer->fieldName($field, $rank) : ($val["fun"] ? "*" : $key));
+					$name = ($field ? $adminer->fieldName($field, $rank) : ($val["fun"] ? "*" : h($key)));
 					if ($name != "") {
 						$rank++;
 						$names[$key] = $name;
 						$column = idf_escape($key);
 						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
 						$desc = "&desc%5B0%5D=1";
-						$sortable = isset($field["privileges"]["order"]);
 						echo "<th id='th[" . h(bracket_escape($key)) . "]'>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
-						if ($sortable) {
+						echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
-							echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+						echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
-						}
-						echo apply_sql_function($val["fun"], $name); //! columns looking like functions
-						if ($sortable) {
-							echo "</a>";
-						}
 						echo "<span class='column hidden'>";
-						if ($sortable) {
+						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
-							echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+						if (!$val["fun"]) {
-						}
-						if (!$val["fun"] && isset($field["privileges"]["where"])) {
 							echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
 							echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");
 						}
@@ -571,9 +554,9 @@ if (!$columns && support("table")) {
 				}
 				if ($format) {
 					print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
-					echo html_select("format", $format, $adminer_import["format"]);
 					$output = $adminer->dumpOutput();
-					echo ($output ? " " . html_select("output", $output, $adminer_import["output"]) : "");
+					echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
+					echo html_select("format", $format, $adminer_import["format"]);
 					echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
 					echo "</div></fieldset>\n";
 				}
@@ -589,7 +572,7 @@ if (!$columns && support("table")) {
 				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
 				echo "<span id='import' class='hidden'>: ";
 				echo "<input type='file' name='csv_file'> ";
-				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"]);
+				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
 				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
 				echo "</span>";
 				echo "</div>";

adminer/sql.inc.php

@@ -21,18 +21,12 @@ if (!$error && $_POST) {
 	if (!isset($_GET["import"])) {
 		$query = $_POST["query"];
 	} elseif ($_POST["webfile"]) {
-		$import_file_path = $adminer->importServerPath();
+		$sql_file_path = $adminer->importServerPath();
-		if (!$import_file_path) {
+		$fp = @fopen((file_exists($sql_file_path)
-			$fp = false;
+			? $sql_file_path
-		} elseif (file_exists($import_file_path)) {
+			: "compress.zlib://$sql_file_path.gz"
-			$fp = fopen($import_file_path, "rb");
+		), "rb");
-		} elseif (file_exists("$import_file_path.gz")) {
+		$query = ($fp ? fread($fp, 1e6) : false);
-			$fp = fopen("compress.zlib://$import_file_path.gz", "rb");
-		} else {
-			$fp = false;
-		}
-
-		$query = $fp ? fread($fp, 1e6) : false;
 	} else {
 		$query = get_file("sql_file", true);
 	}
@@ -89,25 +83,19 @@ if (!$error && $_POST) {
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
 						$c_style_escapes = is_c_style_escapes() || ($jush == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
 
-						$pattern = '(';
+						$pattern = ($found == '/*' ? '\*/'
-						if ($found == '/*') {
+							: ($found == '[' ? ']'
-							$pattern .= '\*/';
+							: (preg_match('~^-- |^#~', $found) ? "\n"
-						} elseif ($found == '[') {
+							: preg_quote($found) . ($c_style_escapes ? "|\\\\." : "")
-							$pattern .= ']';
+						)));
-						} elseif (preg_match('~^-- |^#~', $found)) {
-							$pattern .= "\n";
-						} else {
-							$pattern .= preg_quote($found) . ($c_style_escapes ? "|\\\\." : "");
-						}
-						$pattern .= '|$)s';
 
-						while (preg_match($pattern, $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
+						while (preg_match("($pattern|\$)s", $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
 							$s = $match[0][0];
 							if (!$s && $fp && !feof($fp)) {
 								$query .= fread($fp, 1e5);
 							} else {
 								$offset = $match[0][1] + strlen($s);
-								if (!isset($s[0]) || $s[0] != "\\") {
+								if (!$s || $s[0] != "\\") {
 									break;
 								}
 							}
@@ -143,7 +131,7 @@ if (!$error && $_POST) {
 
 								if ($connection->error) {
 									echo ($_POST["only_errors"] ? $print : "");
-									echo "<p class='error'>" . lang('Error in query') . (!empty($connection->errno) ? " ($connection->errno)" : "") . ": " . error() . "\n";
+									echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
 									$errors[] = " <a href='#sql-$commands'>$commands</a>";
 									if ($_POST["error_stops"]) {
 										break 2;
@@ -153,7 +141,7 @@ if (!$error && $_POST) {
 									$time = " <span class='time'>(" . format_time($start) . ")</span>"
 										. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
 									;
-									$affected = $connection->affected_rows; // getting warnigns overwrites this
+									$affected = $connection->affected_rows; // getting warnings overwrites this
 									$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
 									$warnings_id = "warnings-$commands";
 									if ($warnings) {
@@ -189,13 +177,12 @@ if (!$error && $_POST) {
 											stop_session();
 										}
 										if (!$_POST["only_errors"]) {
-											$title = isset($connection->info) ? "title='" . h($connection->info) . "'" : "";
+											echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
-											echo "<p class='message' $title>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
 										}
 									}
 									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
 									if ($explain) {
-										echo "<div id='$explain_id' class='hidden'>\n";
+										echo "<div id='$explain_id' class='hidden explain'>\n";
 										select($explain, $connection2, $orgtables);
 										echo "</div>\n";
 									}
@@ -246,7 +233,7 @@ if (!isset($_GET["import"])) {
 	echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . js_escape(remove_from_uri("sql|limit|error_stops|only_errors|history")) . "');");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
-
+	
 } else {
 	echo "<fieldset><legend>" . lang('File upload') . "</legend><div>";
 	$gz = (extension_loaded("zlib") ? "[.gz]" : "");
@@ -255,10 +242,10 @@ if (!isset($_GET["import"])) {
 		: lang('File uploads are disabled.')
 	);
 	echo "</div></fieldset>\n";
-	$import_file_path = $adminer->importServerPath();
+	$importServerPath = $adminer->importServerPath();
-	if ($import_file_path) {
+	if ($importServerPath) {
 		echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
-		echo lang('Webserver file %s', "<code>" . h($import_file_path) . "$gz</code>");
+		echo lang('Webserver file %s', "<code>" . h($importServerPath) . "$gz</code>");
 		echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
 		echo "</div></fieldset>\n";
 	}

adminer/static/default.css

@@ -1,7 +1,8 @@
 /** @author Ondrej Valka, http://valka.info */
 body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; width: -moz-fit-content; width: fit-content; }
 a { color: blue; text-decoration: none; }
-a:hover { color: red; text-decoration: underline; }
+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; }
@@ -10,7 +11,7 @@ h3 { font-weight: normal; font-size: 130%; margin: 1em 0 0; }
 form { margin: 0; }
 td table { width: 100%; margin: 0; }
 table { margin: 1em 20px 0 0; border-collapse: collapse; font-size: 90%; }
-td, th { box-sizing: border-box; border: 1px solid #999; padding: .2em .3em; }
+td, th { border: 1px solid #999; padding: .2em .3em; }
 th { background: #eee; text-align: left; }
 thead th { text-align: center; padding: .2em .5em; }
 thead td, thead th { background: #ddf; } /* position: sticky; causes Firefox to lose borders */
@@ -18,28 +19,22 @@ fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8e
 p { margin: .8em 20px 0 0; }
 img { vertical-align: middle; border: 0; }
 td img { max-width: 200px; max-height: 200px; }
+code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
-code { font-size: 110%; padding: 1px 2px; background: #eee; }
 pre { margin: 1em 0 0; }
-pre code { display: block; font-size: 100%; }
+pre, textarea { font: 100%/1.25 monospace; }
-pre, textarea { font: 110%/1.25 monospace; }
 pre.jush { background: #fff; }
-input, textarea, select { box-sizing: border-box; }
+input, textarea { box-sizing: border-box; }
-input:not([type="radio"]), select { vertical-align: middle; }
+input, select { vertical-align: middle; }
-input[type="number"] { -moz-appearance: textfield; }
-input::-webkit-inner-spin-button { -webkit-appearance: none; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
 input.wayoff { left: -1000px; position: absolute; }
-input::placeholder { color: #000; opacity: 0.4; }
-.center { text-align: center; }
 .block { display: block; }
 .version { color: #777; font-size: 62%; }
 .js .hidden, .nojs .jsonly { display: none; }
 .js .column { position: absolute; background: #ddf; padding: .27em 1ex .3em 0; margin-top: -.27em; }
-.nowrap { white-space: nowrap; }
+.nowrap td, .nowrap th, td.nowrap, p.nowrap { white-space: pre; }
-p.nowrap { white-space: pre; }
 .wrap td { white-space: normal; }
 .error { color: red; background: #fee; }
 .error b { background: #fff; font-weight: normal; }
@@ -61,6 +56,7 @@ p.nowrap { white-space: pre; }
 .view { font-style: italic; }
 .active { font-weight: bold; }
 .sqlarea { width: 98%; }
+.explain { white-space: pre; }
 .icon { width: 18px; height: 18px; background-color: navy; }
 .icon:hover { background-color: red; }
 .size { width: 6ex; }
@@ -69,18 +65,8 @@ p.nowrap { white-space: pre; }
 .footer > div { background: #fff; padding: 0 0 .5em; }
 .footer fieldset { margin-top: 0; }
 .links a { white-space: nowrap; margin-right: 20px; }
-.logout { margin: .5em 20px 0 0; position: absolute; top: 0; right: 0; }
+.logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
 .loadmore { margin-left: 1ex; }
-.tables-filter { padding: .8em 1em 0; }
-.handle { cursor: grab; vertical-align: middle; }
-.handle:before { content: "="; display: inline-block; width: 18px; height: 18px; overflow: hidden; font-size: 130%; text-align: center; line-height: 16px; opacity: 0.2; }
-span.handle { display: inline-block; width: 18px; height: 18px; padding-right: .3em; }
-th.handle:before { vertical-align: middle; }
-.no-sort .handle { cursor: default; opacity: 0; }
-.placeholder { opacity: 0; }
-.dragging { position: absolute; margin: 0; background: #fff; }
-.dragging * { cursor: grabbing; }
-table.dragging { background: #eee; }
 /* .edit used in designs */
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
 #menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
@@ -96,9 +82,7 @@ table.dragging { background: #eee; }
 #schema { margin-left: 60px; position: relative; -moz-user-select: none; -webkit-user-select: none; }
 #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }
-#tables-filter, #database-select, #scheme-select { width: 100%; }
 #help { position: absolute; border: 1px solid #999; background: #eee; padding: 5px; font-family: monospace; z-index: 1; }
-#fieldset-select div:last-child > .remove, #fieldset-search div:last-child > .remove, #fieldset-sort div:last-child > .remove { display: none; }
 
 .rtl h2 { margin: 0 -18px 20px 0; }
 .rtl p, .rtl table, .rtl .error, .rtl .message { margin: 1em 0 0 20px; }
@@ -108,6 +92,7 @@ table.dragging { background: #eee; }
 .rtl .pages { left: auto; right: 21em; }
 .rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
+.rtl pre, .rtl code { direction: ltr; }
 
 @media all and (max-width: 880px) {
 	.pages { left: auto; }

adminer/static/editing.js

@@ -16,17 +16,22 @@ function bodyLoad(version, maria) {
 					if (maria) {
 						for (var i = 1; i < obj.length; i++) {
 							obj[i] = obj[i]
-								.replace(/\.html/, '/')
+								.replace('.html', '/')
-								.replace(/-type-syntax/, '-data-types')
+								.replace('-type-syntax', '-data-types')
 								.replace(/numeric-(data-types)/, '$1-$&')
-								.replace(/#statvar_.*/, '#$$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] = (maria ? obj[key].replace(/dev\.mysql\.com\/doc\/mysql\/en\//, 'mariadb.com/kb/en/library/') : obj[key]) // MariaDB
+
-					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
+				obj[key] = (maria ? obj[key].replace('dev.mysql.com/doc/mysql/en/', 'mariadb.com/kb/en/') : obj[key]) // MariaDB
-					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
+					.replace('/doc/mysql/', '/doc/refman/' + version + '/') // MySQL
+					.replace('/docs/current/', '/docs/' + version) // PostgreSQL
 				;
 			}
 		}
@@ -54,7 +59,7 @@ function bodyLoad(version, maria) {
 function formField(form, name) {
 	// required in IE < 8, form.elements[name] doesn't work
 	for (var i=0; i < form.length; i++) {
-		if (form[i].name === name) {
+		if (form[i].name == name) {
 			return form[i];
 		}
 	}
@@ -106,10 +111,12 @@ function dbMouseDown(event) {
 	// Firefox: mouse-down event does not contain pressed key information for OPTION.
 	// Chrome: mouse-down event has inherited key information from SELECT.
 	// So we ignore the event for OPTION to work Ctrl+click correctly everywhere.
-	if (event.target.tagName === "OPTION") return;
+	if (event.target.tagName == "OPTION") {
+		return;
+	}
 
 	dbCtrl = isCtrl(event);
-	if (dbPrevious[this.name] === undefined) {
+	if (dbPrevious[this.name] == undefined) {
 		dbPrevious[this.name] = this.value;
 	}
 }
@@ -123,7 +130,7 @@ function dbChange() {
 	}
 	this.form.submit();
 	this.form.target = '';
-	if (dbCtrl && dbPrevious[this.name] !== undefined) {
+	if (dbCtrl && dbPrevious[this.name] != undefined) {
 		this.value = dbPrevious[this.name];
 		dbPrevious[this.name] = undefined;
 	}
@@ -154,7 +161,7 @@ function selectFieldChange() {
 			if (match) {
 				var op = selectValue(form[match[1] + 'op]']);
 				var val = form[match[1] + 'val]'].value;
-				if (col in indexColumns && (!/LIKE|REGEXP/.test(op) || (op === 'LIKE' && val.charAt(0) !== '%'))) {
+				if (col in indexColumns && (!/LIKE|REGEXP/.test(op) || (op == 'LIKE' && val.charAt(0) != '%'))) {
 					return true;
 				} else if (col || val) {
 					ok = false;
@@ -166,7 +173,7 @@ function selectFieldChange() {
 				}
 				var val = selectValue(form[match[1] + 'col]']);
 				if (val) {
-					columns[col && col !== 'count' ? '' : val] = 1;
+					columns[col && col != 'count' ? '' : val] = 1;
 				}
 			}
 			if (col && /^order/.test(select.name)) {
@@ -199,7 +206,7 @@ var added = '.', rowCount;
 * @return boolean
 */
 function delimiterEqual(val, a, b) {
-	return (val === a + '_' + b || val === a + b || val === a + b.charAt(0).toUpperCase() + b.substr(1));
+	return (val == a + '_' + b || val == a + b || val == a + b.charAt(0).toUpperCase() + b.substr(1));
 }
 
 /** Escape string to use as identifier
@@ -253,10 +260,14 @@ function editingClick(event) {
 		var name = el.name;
 		if (/^add\[/.test(name)) {
 			editingAddRow.call(el, 1);
+		} else if (/^up\[/.test(name)) {
+			editingMoveRow.call(el, 1);
+		} else if (/^down\[/.test(name)) {
+			editingMoveRow.call(el);
 		} else if (/^drop_col\[/.test(name)) {
 			editingRemoveRow.call(el, 'fields\$1[field]');
 		} else {
-			if (name === 'auto_increment_col') {
+			if (name == 'auto_increment_col') {
 				var field = el.form['fields[' + el.value + '][field]'];
 				if (!field.value) {
 					field.value = 'id';
@@ -291,7 +302,7 @@ function editingNameChange() {
 	for (var i = opts.length; i--; ) {
 		var match = /(.+)`(.+)/.exec(opts[i].value);
 		if (!match) { // common type
-			if (candidate && i === opts.length - 2 && val === opts[candidate].value.replace(/.+`/, '') && name === 'fields[1]') { // single target table, link to column, first field - probably `id`
+			if (candidate && i == opts.length - 2 && val == opts[candidate].value.replace(/.+`/, '') && name == 'fields[1]') { // single target table, link to column, first field - probably `id`
 				return;
 			}
 			break;
@@ -301,7 +312,7 @@ function editingNameChange() {
 		var tables = [ table, table.replace(/s$/, ''), table.replace(/es$/, '') ];
 		for (var j=0; j < tables.length; j++) {
 			table = tables[j];
-			if (val === column || val === table || delimiterEqual(val, table, column) || delimiterEqual(val, column, table)) {
+			if (val == column || val == table || delimiterEqual(val, table, column) || delimiterEqual(val, column, table)) {
 				if (candidate) {
 					return;
 				}
@@ -336,7 +347,7 @@ function editingAddRow(focus) {
 	tags2 = qsa('input', row2);
 	var input = tags2[0]; // IE loose tags2 after insertBefore()
 	for (var i=0; i < tags.length; i++) {
-		if (tags[i].name === 'auto_increment_col') {
+		if (tags[i].name == 'auto_increment_col') {
 			tags2[i].value = x;
 			tags2[i].checked = false;
 		}
@@ -349,10 +360,7 @@ function editingAddRow(focus) {
 		}
 	}
 	tags[0].oninput = editingNameChange;
-
-	initSortableRow(row2);
 	row.parentNode.insertBefore(row2, row.nextSibling);
-
 	if (focus) {
 		input.oninput = editingNameChange;
 		input.focus();
@@ -374,6 +382,22 @@ function editingRemoveRow(name) {
 	return false;
 }
 
+/** Move table row for field
+* @param [boolean]
+* @return boolean false for success
+* @this HTMLInputElement
+*/
+function editingMoveRow(up){
+	var row = parentTag(this, 'tr');
+	if (!('nextElementSibling' in row)) {
+		return true;
+	}
+	row.parentNode.insertBefore(row, up
+		? row.previousElementSibling
+		: row.nextElementSibling ? row.nextElementSibling.nextElementSibling : row.parentNode.firstChild);
+	return false;
+}
+
 var lastType = '';
 
 /** Clear length and hide collation or unsigned
@@ -385,7 +409,7 @@ function editingTypeChange() {
 	var text = selectValue(type);
 	for (var i=0; i < type.form.elements.length; i++) {
 		var el = type.form.elements[i];
-		if (el.name === name + '[length]') {
+		if (el.name == name + '[length]') {
 			if (!(
 				(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
 				|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
@@ -394,19 +418,19 @@ function editingTypeChange() {
 			}
 			el.oninput.apply(el);
 		}
-		if (lastType === 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
+		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
 		}
-		if (el.name === name + '[collation]') {
+		if (el.name == name + '[collation]') {
 			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
 		}
-		if (el.name === name + '[unsigned]') {
+		if (el.name == name + '[unsigned]') {
 			alterClass(el, 'hidden', !/(^|[^o])int(?!er)|numeric|real|float|double|decimal|money/.test(text));
 		}
-		if (el.name === name + '[on_update]') {
+		if (el.name == name + '[on_update]') {
 			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
 		}
-		if (el.name === name + '[on_delete]') {
+		if (el.name == name + '[on_delete]') {
 			alterClass(el, 'hidden', !/`/.test(text));
 		}
 	}
@@ -445,13 +469,13 @@ function enumValues(s) {
 	var offset = 0;
 	var match;
 	while (match = re.exec(s)) {
-		if (offset !== match.index) {
+		if (offset != match.index) {
 			break;
 		}
 		result.push(match[2].replace(/'(')|\\(.)/g, '$1$2'));
 		offset += match[0].length;
 	}
-	return (offset === s.length ? result.join('\n') : s);
+	return (offset == s.length ? result.join('\n') : s);
 }
 
 /** Finish editing of enum or set
@@ -537,7 +561,7 @@ function foreignAddRow() {
 	this.onchange = function () { };
 	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
-		selects[i].name = selects[i].name.replace(']', '1]');
+		selects[i].name = selects[i].name.replace(/\d+]/, '1$&');
 		selects[i].selectedIndex = 0;
 	}
 	parentTag(this, 'table').appendChild(row);
@@ -592,7 +616,7 @@ function indexesAddColumn(prefix) {
 	var field = this;
 	var select = field.form[field.name.replace(/].*/, '][type]')];
 	if (!select.selectedIndex) {
-		while (selectValue(select) !== "INDEX" && select.selectedIndex < select.options.length) {
+		while (selectValue(select) != "INDEX" && select.selectedIndex < select.options.length) {
 			select.selectedIndex++;
 		}
 		select.onchange();
@@ -609,7 +633,7 @@ function indexesAddColumn(prefix) {
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
 		input.name = input.name.replace(/]\[\d+/, '$&1');
-		if (input.type !== 'checkbox') {
+		if (input.type != 'checkbox') {
 			input.value = '';
 		}
 	}
@@ -658,7 +682,7 @@ var that, x, y; // em and tablePos defined in schema.inc.php
 * @this HTMLElement
 */
 function schemaMousedown(event) {
-	if ((event.which ? event.which : event.button) === 1) {
+	if ((event.which ? event.which : event.button) == 1) {
 		that = this;
 		x = event.clientX - this.offsetLeft;
 		y = event.clientY - this.offsetTop;
@@ -675,12 +699,12 @@ function schemaMousemove(event) {
 		var divs = qsa('div', that);
 		var lineSet = { };
 		for (var i=0; i < divs.length; i++) {
-			if (divs[i].className === 'references') {
+			if (divs[i].className == 'references') {
 				var div2 = qs('[id="' + (/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4) + '"]');
 				var ref = (tablePos[divs[i].title] ? tablePos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
 				var left1 = -1;
 				var id = divs[i].id.replace(/^ref.(.+)-.+/, '$1');
-				if (divs[i].parentNode !== div2.parentNode) {
+				if (divs[i].parentNode != div2.parentNode) {
 					left1 = Math.min(0, ref[1] - left) - 1;
 					divs[i].style.left = left1 + 'em';
 					divs[i].querySelector('div').style.width = -left1 + 'em';
@@ -692,7 +716,7 @@ function schemaMousemove(event) {
 					var line = qs('[id="' + divs[i].id.replace(/^....(.+)-.+$/, 'refl$1') + '"]');
 					var top1 = top + divs[i].offsetTop / em;
 					var top2 = top + div2.offsetTop / em;
-					if (divs[i].parentNode !== div2.parentNode) {
+					if (divs[i].parentNode != div2.parentNode) {
 						top2 += ref[0] - top;
 						line.querySelector('div').style.height = Math.abs(top1 - top2) + 'em';
 					}
@@ -740,7 +764,7 @@ function helpMouseover(event, text, side) {
 	var target = getTarget(event);
 	if (!text) {
 		helpClose();
-	} else if (window.jush && (!helpIgnore || this !== target)) {
+	} else if (window.jush && (!helpIgnore || this != target)) {
 		helpOpen = 1;
 		var help = qs('#help');
 		help.innerHTML = text;
@@ -759,7 +783,7 @@ function helpMouseover(event, text, side) {
 */
 function helpMouseout(event) {
 	helpOpen = 0;
-	helpIgnore = (this !== getTarget(event));
+	helpIgnore = (this != getTarget(event));
 	setTimeout(function () {
 		if (!helpOpen) {
 			helpClose();

adminer/static/functions.js

@@ -1,21 +1,10 @@
 
-/**
- * Returns the element found by given identifier.
- *
- * @param {string} id
- * @param {?HTMLElement} context Defaults to document.
- * @return {?HTMLElement}
- */
-function gid(id, context = null) {
-	return (context || document).getElementById(id);
-}
-
 /** Get first element by selector
 * @param string
 * @param [HTMLElement] defaults to document
 * @return HTMLElement
 */
-function qs(selector, context = null) {
+function qs(selector, context) {
 	return (context || document).querySelector(selector);
 }
 
@@ -24,7 +13,7 @@ function qs(selector, context = null) {
 * @param [HTMLElement] defaults to document
 * @return HTMLElement
 */
-function qsl(selector, context = null) {
+function qsl(selector, context) {
 	var els = qsa(selector, context);
 	return els[els.length - 1];
 }
@@ -34,7 +23,7 @@ function qsl(selector, context = null) {
 * @param [HTMLElement] defaults to document
 * @return NodeList
 */
-function qsa(selector, context = null) {
+function qsa(selector, context) {
 	return (context || document).querySelectorAll(selector);
 }
 
@@ -84,15 +73,13 @@ function alterClass(el, className, enable) {
 	}
 }
 
-/**
+/** Toggle visibility
- * Toggles visibility of element with ID.
+* @param string
- *
+* @return boolean false
- * @param {string} id
+*/
- * @return {boolean} Always false.
- */
 function toggle(id) {
-	gid(id).classList.toggle("hidden");
+	var el = qs('#' + id);
-
+	el.className = (el.className == 'hidden' ? '' : 'hidden');
 	return false;
 }
 
@@ -107,31 +94,34 @@ function cookie(assign, days) {
 	document.cookie = assign + '; expires=' + date;
 }
 
-/**
+/** Verify current Adminer version
- * Verifies current Adminer version.
+* @param string
- *
+* @param string own URL base
- * @param currentVersion string
+* @param string
- * @param baseUrl string
+*/
- * @param token string
+function verifyVersion(current, url, token) {
- */
-function verifyVersion(currentVersion, baseUrl, token) {
 	cookie('adminer_version=0', 1);
-
+	var iframe = document.createElement('iframe');
-	ajax('https://api.github.com/repos/pematon/adminer/releases/latest', function (request) {
+	iframe.src = 'https://www.adminer.org/version/?current=' + current;
-		const response = JSON.parse(request.responseText);
+	iframe.frameBorder = 0;
-
+	iframe.marginHeight = 0;
-		const version = response.tag_name.replace(/^\D*/, '');
+	iframe.scrolling = 'no';
-		if (!version) return;
+	iframe.style.width = '7ex';
-
+	iframe.style.height = '1.25em';
-		cookie('adminer_version=' + version, 1);
+	if (window.postMessage && window.addEventListener) {
-
+		iframe.style.display = 'none';
-		const data = 'version=' + version + '&token=' + token;
+		addEventListener('message', function (event) {
-		ajax(baseUrl + 'script=version', function () {}, data);
+			if (event.origin == 'https://www.adminer.org') {
-
+				var match = /version=(.+)/.exec(event.data);
-		if (currentVersion !== version) {
+				if (match) {
-			qs('#version').innerText = version;
+					cookie('adminer_version=' + match[1], 1);
-		}
+					ajax(url + 'script=version', function () {
-	});
+					}, event.data + '&token=' + token);
+				}
+			}
+		}, false);
+	}
+	qs('#version').appendChild(iframe);
 }
 
 /** Get value of select
@@ -191,8 +181,8 @@ function selectCount(id, count) {
 		var inputs = qsa('input', el.parentNode.parentNode);
 		for (var i = 0; i < inputs.length; i++) {
 			var input = inputs[i];
-			if (input.type === 'submit') {
+			if (input.type == 'submit') {
-				input.disabled = (count === '0');
+				input.disabled = (count == '0');
 			}
 		}
 	}
@@ -221,21 +211,13 @@ function tableCheck() {
 	}
 }
 
-/**
+/** Uncheck single element
- * Uncheck single element.
+* @param string
- */
+*/
 function formUncheck(id) {
-	formUncheckAll("#" + id);
+	var el = qs('#' + id);
-}
+	el.checked = false;
-
+	trCheck(el);
-/**
- * Uncheck elements matched by selector.
- */
-function formUncheckAll(selector) {
-	for (const element of qsa(selector)) {
-		element.checked = false;
-		trCheck(element);
-	}
 }
 
 /** Get number of checked elements matching given name
@@ -270,7 +252,7 @@ function tableClick(event, click) {
 	var el = getTarget(event);
 	while (!isTag(el, 'tr')) {
 		if (isTag(el, 'table|a|input|textarea')) {
-			if (el.type !== 'checkbox') {
+			if (el.type != 'checkbox') {
 				return;
 			}
 			checkboxClick.call(el, event);
@@ -286,7 +268,7 @@ function tableClick(event, click) {
 		el.checked = !el.checked;
 		el.onclick && el.onclick();
 	}
-	if (el.name === 'check[]') {
+	if (el.name == 'check[]') {
 		el.form['all'].checked = false;
 		formUncheck('all-page');
 	}
@@ -306,7 +288,7 @@ function checkboxClick(event) {
 	if (!this.name) {
 		return;
 	}
-	if (event.shiftKey && (!lastChecked || lastChecked.name === this.name)) {
+	if (event.shiftKey && (!lastChecked || lastChecked.name == this.name)) {
 		var checked = (lastChecked ? lastChecked.checked : true);
 		var inputs = qsa('input', parentTag(this, 'table'));
 		var checking = !lastChecked;
@@ -363,82 +345,11 @@ function nodePosition(el) {
 */
 function pageClick(href, page) {
 	if (!isNaN(page) && page) {
-		location.href = href + (page !== 1 ? '&page=' + (page - 1) : '');
+		location.href = href + (page != 1 ? '&page=' + (page - 1) : '');
 	}
 }
 
-let tablesFilterTimeout = null;
-let tablesFilterValue = '';
 
-function initTablesFilter(dbName) {
-	if (sessionStorage) {
-		document.addEventListener('DOMContentLoaded', function () {
-			if (dbName === sessionStorage.getItem('adminer_tables_filter_db') && sessionStorage.getItem('adminer_tables_filter')) {
-				qs('#tables-filter').value = sessionStorage.getItem('adminer_tables_filter');
-				filterTables();
-			} else {
-				sessionStorage.removeItem('adminer_tables_filter');
-			}
-
-			sessionStorage.setItem('adminer_tables_filter_db', dbName);
-		});
-	}
-
-	const filterInput = qs('#tables-filter');
-	filterInput.addEventListener('input', function () {
-		window.clearTimeout(tablesFilterTimeout);
-		tablesFilterTimeout = window.setTimeout(filterTables, 200);
-	});
-
-	document.body.addEventListener('keydown', function(event) {
-		if (isCtrl(event) && event.shiftKey && event.key.toUpperCase() === 'F') {
-			filterInput.focus();
-			filterInput.select();
-
-			event.preventDefault();
-		}
-	});
-}
-
-function filterTables() {
-	const value = qs('#tables-filter').value.toLowerCase();
-	if (value === tablesFilterValue) {
-		return;
-	}
-	tablesFilterValue = value;
-
-	let reg
-	if (value !== '') {
-		const valueExp = (`${value}`).replace(/[\\.+*?\[^\]$(){}=!<>|:]/g, '\\$&');
-		reg = new RegExp(`(${valueExp})`, 'gi');
-	}
-
-	if (sessionStorage) {
-		sessionStorage.setItem('adminer_tables_filter', value);
-	}
-
-	const tables = qsa('#tables li');
-	for (let i = 0; i < tables.length; i++) {
-		let a = qs('a[data-main="true"], span[data-main="true"]', tables[i]);
-
-		let tableName = tables[i].dataset.tableName;
-		if (tableName == null) {
-			tableName = a.innerHTML.trim();
-
-			tables[i].dataset.tableName = tableName;
-		}
-
-		if (value === "") {
-			tables[i].classList.remove('hidden');
-			a.innerHTML = tableName;
-		} else if (tableName.toLowerCase().indexOf(value) >= 0) {
-			tables[i].classList.remove('hidden');
-			a.innerHTML = tableName.replace(reg, '<strong>$1</strong>');
-		} else {
-			tables[i].classList.add('hidden');
-		}
-	}
-}
 
 /** Display items in menu
 * @param MouseEvent
@@ -460,66 +371,30 @@ function menuOut() {
 
 
 
-/**
+/** Add row in select fieldset
- * Adds row in select fieldset.
+* @this HTMLSelectElement
- *
+*/
- * @param {Event} event
+function selectAddRow() {
- * @this HTMLSelectElement
+	var field = this;
- */
+	var row = cloneNode(field.parentNode);
-function selectAddRow(event) {
-	const field = this;
-	const row = cloneNode(field.parentNode);
-
 	field.onchange = selectFieldChange;
-	field.onchange(event);
+	field.onchange();
-
+	var selects = qsa('select', row);
-	const selects = qsa('select', row);
+	for (var i=0; i < selects.length; i++) {
-	for (const select of selects) {
+		selects[i].name = selects[i].name.replace(/[a-z]\[\d+/, '$&1');
-		select.name = select.name.replace(/[a-z]\[\d+/, '$&1');
+		selects[i].selectedIndex = 0;
-		select.selectedIndex = 0;
 	}
-
+	var inputs = qsa('input', row);
-	const inputs = qsa('input', row);
+	for (var i=0; i < inputs.length; i++) {
-	for (const input of inputs) {
+		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
-		// Skip buttons.
+		inputs[i].className = '';
-		if (input.type === 'image') {
+		if (inputs[i].type == 'checkbox') {
-			continue;
+			inputs[i].checked = false;
-		}
-
-		input.name = input.name.replace(/[a-z]\[\d+/, '$&1');
-		input.className = '';
-		if (input.type === 'checkbox') {
-			input.checked = false;
 		} else {
-			input.value = '';
+			inputs[i].value = '';
 		}
 	}
-
+	field.parentNode.parentNode.appendChild(row);
-	const buttons = qsa('.icon', row);
-	for (const button of buttons) {
-		button.onclick = selectRemoveRow;
-	}
-
-	const parent = field.parentNode.parentNode;
-	if (parent.classList.contains("sortable")) {
-		initSortableRow(field.parentElement);
-	}
-
-	parent.appendChild(row);
-}
-
-/**
- * Removes a row in select fieldset.
- *
- * @this HTMLInputElement
- * @return {boolean} Always false.
- */
-function selectRemoveRow() {
-	const row = this.parentNode;
-
-	row.parentNode.removeChild(row);
-
-	return false;
 }
 
 /** Prevent onsearch handler on Enter
@@ -527,7 +402,7 @@ function selectRemoveRow() {
 * @this HTMLInputElement
 */
 function selectSearchKeydown(event) {
-	if (event.keyCode === 13 || event.keyCode === 10) {
+	if (event.keyCode == 13 || event.keyCode == 10) {
 		this.onsearch = function () {
 		};
 	}
@@ -542,123 +417,6 @@ function selectSearchSearch() {
 	}
 }
 
-// Sorting.
-(function() {
-	let placeholderRow, nextRow, dragHelper;
-	let startY, minY, maxY;
-
-	/**
-	 * Initializes sortable list of DIV elements.
-	 *
-	 * @param {string} parentId
-	 */
-	window.initSortable = function(parentSelector) {
-		const parent = qs(parentSelector);
-		if (!parent) return;
-
-		for (const row of parent.children) {
-			if (!row.classList.contains("no-sort")) {
-				initSortableRow(row);
-			}
-		}
-	};
-
-	/**
-	 * Initializes one row of sortable parent.
-	 *
-	 * @param {HTMLElement} row
-	 */
-	window.initSortableRow = function(row) {
-		row.classList.remove("no-sort");
-
-		const handle = qs(".handle", row);
-		handle.addEventListener("mousedown", (event) => {
-			event.preventDefault();
-
-			const parent = row.parentNode;
-			startY = event.clientY - getOffsetTop(row);
-			minY = getOffsetTop(parent);
-			maxY = minY + parent.offsetHeight - row.offsetHeight;
-
-			placeholderRow = row.cloneNode(true);
-			placeholderRow.classList.add("placeholder");
-			parent.insertBefore(placeholderRow, row);
-
-			nextRow = row.nextElementSibling;
-
-			let top = event.clientY - startY;
-			let left = getOffsetLeft(row);
-			let width = row.getBoundingClientRect().width;
-
-			if (row.tagName === "TR") {
-				const firstChild = row.firstElementChild;
-				const borderWidth = (firstChild.offsetWidth - firstChild.clientWidth) / 2;
-				const borderHeight = (firstChild.offsetHeight - firstChild.clientHeight) / 2;
-
-				minY -= borderHeight;
-				maxY -= borderHeight;
-				top -= borderHeight;
-				left -= borderWidth;
-				width += 2 * borderWidth;
-
-				for (const child of row.children) {
-					child.style.width = child.getBoundingClientRect().width + "px";
-				}
-
-				dragHelper = document.createElement("table");
-				dragHelper.appendChild(row);
-			} else {
-				dragHelper = row;
-			}
-
-			dragHelper.style.top = `${top}px`;
-			dragHelper.style.left = `${left}px`;
-			dragHelper.style.width = `${width}px`;
-			dragHelper.classList.add("dragging");
-			document.body.appendChild(dragHelper);
-
-			window.addEventListener("mousemove", updateSorting);
-
-			window.addEventListener("mouseup", () => {
-				dragHelper.classList.remove("dragging");
-				parent.insertBefore(dragHelper.tagName === "TABLE" ? dragHelper.firstChild : dragHelper, placeholderRow);
-				placeholderRow.remove();
-
-				window.removeEventListener("mousemove", updateSorting);
-			}, { once: true });
-		});
-	};
-
-	function updateSorting(event) {
-		let top = Math.min(Math.max(event.clientY - startY, minY), maxY);
-		dragHelper.style.top = `${top}px`;
-
-		const parent = placeholderRow.parentNode;
-		top = top - minY + parent.offsetTop;
-
-		let sibling;
-		if (top > placeholderRow.offsetTop + placeholderRow.offsetHeight / 2) {
-			sibling = !nextRow.classList.contains("no-sort") ? nextRow.nextElementSibling : nextRow;
-		} else if (top + placeholderRow.offsetHeight < placeholderRow.offsetTop + placeholderRow.offsetHeight / 2) {
-			sibling = placeholderRow.previousElementSibling;
-		} else {
-			sibling = nextRow;
-		}
-
-		if (sibling !== nextRow) {
-			const parent = placeholderRow.parentNode;
-
-			nextRow = sibling;
-			if (sibling) {
-				parent.insertBefore(placeholderRow, nextRow);
-			} else {
-				parent.appendChild(placeholderRow);
-			}
-		}
-	}
-})();
-
-
 
 
 /** Toggles column context menu
@@ -687,11 +445,11 @@ function selectSearch(name) {
 	for (var i=0; i < divs.length; i++) {
 		var div = divs[i];
 		var el = qs('[name$="[col]"]', div);
-		if (el && selectValue(el) === name) {
+		if (el && selectValue(el) == name) {
 			break;
 		}
 	}
-	if (i === divs.length) {
+	if (i == divs.length) {
 		div.firstChild.value = name;
 		div.firstChild.onchange();
 	}
@@ -729,7 +487,7 @@ function bodyKeydown(event, button) {
 	if (target.jushTextarea) {
 		target = target.jushTextarea;
 	}
-	if (isCtrl(event) && (event.keyCode === 13 || event.keyCode === 10) && isTag(target, 'select|textarea|input')) { // 13|10 - Enter
+	if (isCtrl(event) && (event.keyCode == 13 || event.keyCode == 10) && isTag(target, 'select|textarea|input')) { // 13|10 - Enter
 		target.blur();
 		if (button) {
 			target.form[button].click();
@@ -750,7 +508,7 @@ function bodyKeydown(event, button) {
 */
 function bodyClick(event) {
 	var target = getTarget(event);
-	if ((isCtrl(event) || event.shiftKey) && target.type === 'submit' && isTag(target, 'input')) {
+	if ((isCtrl(event) || event.shiftKey) && target.type == 'submit' && isTag(target, 'input')) {
 		target.form.target = '_blank';
 		setTimeout(function () {
 			// if (isCtrl(event)) { focus(); } doesn't work
@@ -766,9 +524,9 @@ function bodyClick(event) {
 * @return boolean
 */
 function editingKeydown(event) {
-	if ((event.keyCode === 40 || event.keyCode === 38) && isCtrl(event)) { // 40 - Down, 38 - Up
+	if ((event.keyCode == 40 || event.keyCode == 38) && isCtrl(event)) { // 40 - Down, 38 - Up
 		var target = getTarget(event);
-		var sibling = (event.keyCode === 40 ? 'nextSibling' : 'previousSibling');
+		var sibling = (event.keyCode == 40 ? 'nextSibling' : 'previousSibling');
 		var el = target.parentNode.parentNode[sibling];
 		if (el && (isTag(el, 'tr') || (el = el[sibling])) && isTag(el, 'tr') && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
 			el.focus();
@@ -781,62 +539,37 @@ function editingKeydown(event) {
 	return true;
 }
 
-/**
+/** Disable maxlength for functions
- * Disables maxlength for functions and manages value visibility.
+* @this HTMLSelectElement
- *
+*/
- * @this HTMLSelectElement
- */
 function functionChange() {
-	const input = this.form[this.name.replace(/^function/, 'fields')];
+	var input = this.form[this.name.replace(/^function/, 'fields')];
-	const value = selectValue(this);
+	if (input) { // undefined with the set data type
-
+		if (selectValue(this)) {
-	// Undefined with the set data type.
+			if (input.origType === undefined) {
-	if (!input) {
+				input.origType = input.type;
-		helpClose();
+				input.origMaxLength = input.getAttribute('data-maxlength');
-		return;
+			}
-	}
+			input.removeAttribute('data-maxlength');
-
+			input.type = 'text';
-	if (value) {
+		} else if (input.origType) {
-		if (input.origType === undefined) {
+			input.type = input.origType;
-			input.origType = input.type;
+			if (input.origMaxLength >= 0) {
-			input.origMaxLength = input.getAttribute('data-maxlength');
+				input.setAttribute('data-maxlength', input.origMaxLength);
-		}
+			}
-
-		input.removeAttribute('data-maxlength');
-		input.type = 'text';
-	} else if (input.origType) {
-		input.type = input.origType;
-		if (input.origMaxLength >= 0) {
-			input.setAttribute('data-maxlength', input.origMaxLength);
 		}
+		oninput({target: input});
 	}
-
-	// Hide input value if it will be not used by selected function.
-	if (value === "NULL" || value === "now") {
-		if (input.value !== "") {
-			input.dataset.lastValue = input.value;
-			input.value = "";
-		}
-	} else if (input.dataset.lastValue) {
-		input.value = input.dataset.lastValue;
-	}
-
-	oninput({target: input});
-
 	helpClose();
 }
 
-/**
+/** Skip 'original' when typing
- * Unset 'original', 'NULL' and 'now' functions when typing.
+* @param number
- *
+* @this HTMLTableCellElement
- * @param first number
+*/
- * @this HTMLTableCellElement
- */
 function skipOriginal(first) {
-	const fnSelect = this.previousSibling.firstChild;
+	var fnSelect = this.previousSibling.firstChild;
-	const value = selectValue(fnSelect);
+	if (fnSelect.selectedIndex < first) {
-
-	if (fnSelect.selectedIndex < first || value === "NULL" || value === "now") {
 		fnSelect.selectedIndex = first;
 	}
 }
@@ -881,7 +614,7 @@ function ajax(url, callback, data, message) {
 		}
 		request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 		request.onreadystatechange = function () {
-			if (request.readyState === 4) {
+			if (request.readyState == 4) {
 				if (/^2/.test(request.status)) {
 					callback(request);
 				} else {
@@ -923,7 +656,7 @@ function ajaxForm(form, message, button) {
 			if (/^file$/i.test(el.type) && el.value) {
 				return false;
 			}
-			if (!/^(checkbox|radio|submit|file)$/i.test(el.type) || el.checked || el === button) {
+			if (!/^(checkbox|radio|submit|file)$/i.test(el.type) || el.checked || el == button) {
 				data.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(isTag(el, 'select') ? selectValue(el) : el.value));
 			}
 		}
@@ -970,7 +703,7 @@ function selectClick(event, text, warning) {
 		if (!event) {
 			event = window.event;
 		}
-		if (event.keyCode === 27 && !event.shiftKey && !event.altKey && !isCtrl(event)) { // 27 - Esc
+		if (event.keyCode == 27 && !event.shiftKey && !event.altKey && !isCtrl(event)) { // 27 - Esc
 			inputBlur.apply(input);
 			td.innerHTML = original;
 		}
@@ -1004,7 +737,7 @@ function selectClick(event, text, warning) {
 	td.appendChild(input);
 	setupSubmitHighlight(td);
 	input.focus();
-	if (text === 2) { // long text
+	if (text == 2) { // long text
 		return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (request) {
 			if (request.responseText) {
 				input.value = request.responseText;
@@ -1126,7 +859,7 @@ function findDefaultSubmit(el) {
 	var inputs = qsa('input', el.form);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
-		if (input.type === 'submit' && !input.style.zIndex) {
+		if (input.type == 'submit' && !input.style.zIndex) {
 			return input;
 		}
 	}
@@ -1177,18 +910,6 @@ function cloneNode(el) {
 	return el2;
 }
 
-function getOffsetTop(element) {
-	let box = element.getBoundingClientRect();
-
-	return box.top + window.scrollY;
-}
-
-function getOffsetLeft(element) {
-	let box = element.getBoundingClientRect();
-
-	return box.left + window.scrollX;
-}
-
 oninput = function (event) {
 	var target = event.target;
 	var maxLength = target.getAttribute('data-maxlength');

adminer/table.inc.php

@@ -7,18 +7,13 @@ if (!$fields) {
 $table_status = table_status1($TABLE, true);
 $name = $adminer->tableName($table_status);
 
-$rights = [];
+page_header(($fields && is_view($table_status) ? $table_status['Engine'] == 'materialized view' ? lang('Materialized view') : lang('View') : lang('Table')) . ": " . ($name != "" ? $name : h($TABLE)), $error);
+
+$rights = array();
 foreach ($fields as $key => $field) {
 	$rights += $field["privileges"];
 }
-
+$adminer->selectLinks($table_status, (isset($rights["insert"]) || !support("table") ? "" : null));
-page_header(($fields && is_view($table_status) ? $table_status['Engine'] == 'materialized view' ? lang('Materialized view') : lang('View') : lang('Table')) . ": " . ($name != "" ? $name : h($TABLE)), $error);
-
-$set = null;
-if (isset($rights["insert"]) || !support("table")) {
-	$set = "";
-}
-$adminer->selectLinks($table_status, $set);
 
 $comment = $table_status["Comment"];
 if ($comment != "") {
@@ -27,22 +22,6 @@ if ($comment != "") {
 
 if ($fields) {
 	$adminer->tableStructurePrint($fields);
-
-	if (is_view($table_status)) {
-		$editLink = '<p class="links"><a href="' . h(ME) . 'view=' . urlencode($TABLE) . '">' . lang('Alter view') . "</a>\n";
-	} else {
-		$editLink = '<p class="links"><a href="' . h(ME) . 'create=' . urlencode($TABLE) . '">' . lang('Alter table') . "</a>\n";
-	}
-	echo $editLink;
-
-	if (support("partitioning") && preg_match("~partitioned~", $table_status["Create_options"])) {
-		echo "<h3 id='partition-by'>" . lang('Partition by') . "</h3>\n";
-
-		$partitions_info = get_partitions_info($TABLE);
-		$adminer->tablePartitionsPrint($partitions_info);
-
-		echo $editLink;
-	}
 }
 
 if (!is_view($table_status)) {
@@ -59,7 +38,7 @@ if (!is_view($table_status)) {
 		echo "<h3 id='foreign-keys'>" . lang('Foreign keys') . "</h3>\n";
 		$foreign_keys = foreign_keys($TABLE);
 		if ($foreign_keys) {
-			echo "<table>\n";
+			echo "<table cellspacing='0'>\n";
 			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td></thead>\n";
 			foreach ($foreign_keys as $name => $foreign_key) {
 				echo "<tr title='" . h($name) . "'>";
@@ -83,9 +62,9 @@ if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
 	echo "<h3 id='triggers'>" . lang('Triggers') . "</h3>\n";
 	$triggers = triggers($TABLE);
 	if ($triggers) {
-		echo "<table>\n";
+		echo "<table cellspacing='0'>\n";
 		foreach ($triggers as $key => $val) {
-			echo "<tr><td>" . h($val[0]) . "<td>" . h($val[1]) . "<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
+			echo "<tr valign='top'><td>" . h($val[0]) . "<td>" . h($val[1]) . "<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
 		}
 		echo "</table>\n";
 	}

adminer/user.inc.php

@@ -85,8 +85,8 @@ if ($_POST && !$error) {
 					unset($grants[$object]);
 				}
 				if (preg_match('~^(.+)\s*(\(.*\))?$~U', $object, $match) && (
-					!grant(false, $revoke, $match[2], $match[1], $new_user) //! SQL injection
+					!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
-					|| !grant(true, $grant, $match[2], $match[1], $new_user)
+					|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user")
 				)) {
 					$error = true;
 					break;
@@ -100,7 +100,7 @@ if ($_POST && !$error) {
 			} elseif (!isset($_GET["grant"])) {
 				foreach ($grants as $object => $revoke) {
 					if (preg_match('~^(.+)(\(.*\))?$~U', $object, $match)) {
-						grant(false, array_keys($revoke), $match[2], $match[1], $new_user);
+						grant("REVOKE", array_keys($revoke), $match[2], " ON $match[1] FROM $new_user");
 					}
 				}
 			}
@@ -126,14 +126,7 @@ if ($_POST) {
 	if ($old_pass != "") {
 		$row["hashed"] = true;
 	}
-
+	$grants[(DB == "" || $grants ? "" : idf_escape(addcslashes(DB, "%_\\"))) . ".*"] = array();
-	if ($grants) {
-		$grants[".*"] = [];
-	} elseif (DB != "") {
-		$grants[idf_escape(addcslashes(DB, "%_\\")) . ".*"] = [];
-	} else {
-		$grants["*.* "] = []; // Space is added to force editing mode.
-	}
 }
 
 ?>
@@ -148,80 +141,42 @@ if ($_POST) {
 
 <?php
 //! MAX_* limits, REQUIRE
-echo "<table>\n";
+echo "<table cellspacing='0'>\n";
-
+echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level"));
-echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level")) . "</th>";
 $i = 0;
 foreach ($grants as $object => $grant) {
-	echo "<th>";
+	echo '<th>' . ($object != "*.*" ? "<input name='objects[$i]' value='" . h($object) . "' size='10' autocapitalize='off'>" : "<input type='hidden' name='objects[$i]' value='*.*' size='10'>*.*"); //! separate db, table, columns, PROCEDURE|FUNCTION, routine
-	//! separate db, table, columns, PROCEDURE|FUNCTION, routine
-	if ($object == "*.*") {
-		echo "<input type='hidden' name='objects[$i]' value='*.*' size='10'>*.*";
-	} else {
-		echo "<input name='objects[$i]' value='" . h(trim($object)) . "' size='10' autocapitalize='off'>";
-	}
-	echo "</th>";
 	$i++;
 }
-echo "</tr></thead>\n";
+echo "</thead>\n";
 
-foreach ([
+foreach (array(
 	"" => "",
 	"Server Admin" => lang('Server'),
 	"Databases" => lang('Database'),
 	"Tables" => lang('Table'),
 	"Columns" => lang('Column'),
 	"Procedures" => lang('Routine'),
- ] as $context => $desc) {
+) as $context => $desc) {
 	foreach ((array) $privileges[$context] as $privilege => $comment) {
-		echo "<tr" . odd() . ">";
+		echo "<tr" . odd() . "><td" . ($desc ? ">$desc<td" : " colspan='2'") . ' lang="en" title="' . h($comment) . '">' . h($privilege);
-		if ($desc) {
-			echo "<td>$desc</td>";
-		}
-		echo "<td" . (!$desc ? " colspan='2'" : "") . ' lang="en" title="' . h($comment) . '">' . h($privilege) . "</td>";
-
 		$i = 0;
-
 		foreach ($grants as $object => $grant) {
 			$name = "'grants[$i][" . h(strtoupper($privilege)) . "]'";
 			$value = $grant[strtoupper($privilege)];
-
+			if ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*")) {
-			$proxiedUser = strpos($object, "@") !== false;
+				echo "<td>";
-			$newObject = $object == ".*";
-			$allPrivileges = $privilege == "All privileges";
-			$grantOption = $privilege == "Grant option";
-
-			if ($object == "*.*" && $privilege == "Proxy") {
-				echo "<td></td>";
-			} elseif ($proxiedUser && $privilege != "Proxy" && !$grantOption) {
-				echo "<td></td>";
-			} elseif ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*") && !(($proxiedUser || $newObject) && $privilege == "Proxy")) {
-				echo "<td></td>";
 			} elseif (isset($_GET["grant"])) {
-				echo "<td><select name=$name>" .
+				echo "<td><select name=$name><option><option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</select>";
-					"<option></option>" .
-					"<option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "</option>" .
-					"<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</option>" .
-					"</select></td>";
 			} else {
-				echo "<td class='center'><label class='block'>";
+				echo "<td align='center'><label class='block'>";
-				echo "<input type='checkbox' name=$name value='1'" .
+				echo "<input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges"
-					($value ? " checked" : "") .
+					? " id='grants-$i-all'>" //! uncheck all except grant if all is checked
-					($allPrivileges ? " id='grants-$i-all'" : (!$grantOption ? " class='grants-$i'" : "")) .
+					: ">" . ($privilege == "Grant option" ? "" : script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };")));
-					">";
-
-				if ($allPrivileges) {
-					echo script("qsl('input').onclick = function () { if (this.checked) formUncheckAll('.grants-$i'); };");
-				} elseif (!$grantOption) {
-					echo script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };");
-				}
 				echo "</label>";
 			}
-
 			$i++;
 		}
-
-		echo "</tr>";
 	}
 }
 

adminer/variables.inc.php

@@ -6,7 +6,7 @@ $variables = ($status ? show_status() : show_variables());
 if (!$variables) {
 	echo "<p class='message'>" . lang('No rows.') . "\n";
 } else {
-	echo "<table>\n";
+	echo "<table cellspacing='0'>\n";
 	foreach ($variables as $key => $val) {
 		echo "<tr>";
 		echo "<th><code class='jush-" . $jush . ($status ? "status" : "set") . "'>" . h($key) . "</code>";

bin/export.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Root directory.
-BASEDIR=$( cd `dirname $0`/.. ; pwd )
-cd "$BASEDIR"
-
-php compile.php
-php compile.php en
-php compile.php de
-php compile.php cs
-php compile.php sk
-
-php compile.php mysql
-php compile.php mysql en
-php compile.php mysql de
-php compile.php mysql cs
-php compile.php mysql sk
-
-php compile.php editor
-php compile.php editor en
-php compile.php editor mysql
-php compile.php editor mysql en

compile.php

@@ -1,13 +1,8 @@
 #!/usr/bin/env php
 <?php
-function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
-}
-
-error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
-include dirname(__FILE__) . "/vendor/vrana/jsshrink/jsShrink.php";
+include dirname(__FILE__) . "/adminer/include/errors.inc.php";
+include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
 
 function add_apo_slashes($s) {
 	return addcslashes($s, "\\'");
@@ -196,7 +191,7 @@ function php_shrink($input) {
 	$short_variables = array();
 	$shortening = true;
 	$tokens = token_get_all($input);
-
+	
 	// remove unnecessary { }
 	//! change also `while () { if () {;} }` to `while () if () ;` but be careful about `if () { if () { } } else { }
 	$shorten = 0;
@@ -223,13 +218,13 @@ function php_shrink($input) {
 		}
 	}
 	$tokens = array_values($tokens);
-
+	
 	foreach ($tokens as $i => $token) {
 		if ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
 			$short_variables[$token[1]]++;
 		}
 	}
-
+	
 	arsort($short_variables);
 	$chars = implode(range('a', 'z')) . '_' . implode(range('A', 'Z'));
 	// preserve variable names between versions if possible
@@ -240,7 +235,7 @@ function php_shrink($input) {
 	foreach (array_keys($short_variables) as $number => $key) {
 		$short_variables[$key] = short_identifier($number, $chars); // could use also numbers and \x7f-\xff
 	}
-
+	
 	$set = array_flip(preg_split('//', '!"#$%&\'()*+,-./:;<=>?@[]^`{|}'));
 	$space = '';
 	$output = '';
@@ -418,7 +413,7 @@ if ($driver) {
 	if (count($drivers) == 1) {
 		$file = str_replace('<?php echo html_select("auth[driver]", $drivers, DRIVER) . "\n"; ?>', "<input type='hidden' name='auth[driver]' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
 	}
-	$file = preg_replace('(;\.\./vendor/vrana/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 	$file = preg_replace_callback('~doc_link\(array\((.*)\)\)~sU', function ($match) use ($driver) {
 		list(, $links) = $match;
 		$links = preg_replace("~'(?!(" . ($driver == "mysql" ? "sql|mariadb" : $driver) . ")')[^']*' => [^,]*,?~", '', $links);
@@ -427,8 +422,8 @@ if ($driver) {
 	//! strip doc_link() definition
 }
 if ($project == "editor") {
-	$file = preg_replace('~;\.\./vendor/vrana/jush/jush\.css~', '', $file);
+	$file = preg_replace('~;.\.\/externals/jush/jush\.css~', '', $file);
-	$file = preg_replace('~compile_file\(\'\.\./(vendor/vrana/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
+	$file = preg_replace('~compile_file\(\'\.\./(externals/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
 }
 $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 $file = preg_replace_callback('~\b(include|require) "([^"]*\$LANG.inc.php)";~', 'put_file_lang', $file);
@@ -440,18 +435,17 @@ if ($_SESSION["lang"]) {
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('<?php echo script_src("static/editing.js"); ?>' . "\n", "", $file);
-$file = preg_replace('~\s+echo script_src\("\.\./vendor/vrana/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
-$file = str_replace('<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">' . "\n", "", $file);
+$file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
-$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . substr(md5(microtime()), 0, 8) . '"';
+$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';
 $file = preg_replace('~\.\./adminer/static/(default\.css|favicon\.ico)~', '<?php echo h(' . $replace . '); ?>', $file);
 $file = preg_replace('~"\.\./adminer/static/(functions\.js)"~', $replace, $file);
 $file = preg_replace('~\.\./adminer/static/([^\'"]*)~', '" . h(' . $replace . ') . "', $file);
-$file = preg_replace('~"\.\./vendor/vrana/jush/modules/(jush\.js)"~', $replace, $file);
+$file = preg_replace('~"\.\./externals/jush/modules/(jush\.js)"~', $replace, $file);
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 
-@mkdir("temp/export", 0777, true);
+$filename = $project . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
-$filename = "temp/export/$project" . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
 file_put_contents($filename, $file);
 echo "$filename created (" . strlen($file) . " B).\n";

composer.json

@@ -25,43 +25,7 @@
         "Apache-2.0",
         "GPL-2.0-only"
     ],
-    "require": {
-        "php": "5.6 - 8.3",
-        "ext-pdo": "*",
-        "ext-json": "*",
-        "vrana/jush": "@dev",
-        "vrana/jsshrink": "@dev"
-    },
-    "suggest": {
-        "ext-zlib": "*",
-        "ext-suhosin": "*",
-        "ext-mysqli": "*",
-        "ext-mysql": "*",
-        "ext-pgsql": "*",
-        "ext-mongo": "*",
-        "ext-sqlsrv": "*",
-        "ext-mssql": "*",
-        "ext-oci8": "*",
-        "ext-interbase": "*",
-        "ext-pdo_pgsql": "*",
-        "ext-pdo_dblib": "*",
-        "ext-pdo_sqlite": "*",
-        "ext-pdo_oci": "*"
-    },
-    "require-dev": {
-        "ext-xdebug": "*"
-    },
     "scripts": {
         "compile": "php compile.php"
-    },
+    }
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/vrana/jush.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/vrana/jsshrink.git"
-        }
-    ]
 }

coverage.php

@@ -62,7 +62,7 @@ if (!extension_loaded("xdebug")) {
 	if (file_exists($coverage_filename)) {
 		// display list of files
 		$coverage = unserialize(file_get_contents($coverage_filename));
-		echo "<table>\n";
+		echo "<table border='1' cellspacing='0'>\n";
 		foreach (array_merge(glob("adminer/*.php"), glob("adminer/include/*.php"), glob("editor/*.php"), glob("editor/include/*.php")) as $filename) {
 			$cov = $coverage[realpath($filename)];
 			$ratio = 0;

designs/brade/adminer.css

@@ -2,8 +2,8 @@
 *{margin:0;padding:0}
 body{font:13px/18px Helvetica,Arial,sans-serif;background:#fff;color:#333}
 /* generic */
-a,a:visited{color:#06c;text-decoration:none;border-bottom:1px dotted}
+a{color:#06c;text-decoration:none;border-bottom:1px dotted}
-a:hover{border-bottom:1px solid #06c;background:#06c;color:#fff}
+a:hover,a:link:hover{border-bottom:1px solid #06c;background:#06c;color:#fff}
 p{padding-bottom:4px;margin-bottom:4px}
 h1{font-size:18px;font-weight:bold;padding-bottom:0px;height:40px;padding:0 0 8px 0;color:#666;border:0}
 h2{font:32px Georgia,serif;padding:10px 0 8px;margin:0;background:transparent;border:0;color:#333}
@@ -31,6 +31,7 @@ thead th,thead td{white-space:nowrap;font-weight:bold;background:#ddd;border-col
 th:first-child,td:first-child{border-color:transparent;white-space:nowrap}
 td[align=right]{text-align:right}
 table code{font-size:13px;line-height:18px}
+.footer fieldset{float:none;}
 .hidden{display:none}
 .error,.message{padding:0;background:transparent;font-weight:bold}
 .error{color:#c00}
@@ -46,11 +47,12 @@ border:5px solid #ccc;margin:0}
 #menu a:hover{background:#333;color:#fff;border-color:#333}
 #menu a.h1,#menu a.h1:hover{display:block;height:0;width:175px;padding:40px 0 0 0;overflow:hidden;float:left;border:0;margin:0;
 outline:0;background:url(//www.bradezone.com/random/adminer_logo.gif) no-repeat;line-height:32px}
-#menu p,#logins,#tables{white-space:nowrap;border:0;padding:0 0 4px 0;margin:0 0 4px 0}
+#menu p,#logins,#tables{border:0;padding:0 0 4px 0;margin:0 0 4px 0}
 #breadcrumb{background:#333;color:#fff;position:fixed;top:0;left:320px;line-height:40px;padding:0;z-index:1;margin:0}
 #breadcrumb a{color:#ff9}
 #breadcrumb a:hover{background:transparent;color:#ff9;border-color:#ff9}
 #schema .table{padding:4px 8px;background:#f3f3f3}
+.tables-filter{padding:0;margin:10px 0;}
 /* IE hacks */
 *+html th:first-child,*+html td:first-child{border-color:inherit;white-space:inherit}
 * html #lang,* html #menu,* html #breadcrumb{position:absolute}

designs/bueltge/adminer.css

@@ -1,6 +1,6 @@
 /**
  * Alternative style for Adminer by Frank Bültge
- * 
+ *
  * @link     http://bueltge.de/
  * @version  02/18/2014
  */
@@ -31,14 +31,14 @@ p {
 margin: 0.8em 20px 0 5px
 }
 
-a { 
+a {
 color: #21759B;
 background: none !important;
 }
-a:visited { 
+a:visited {
 color: #21759B;
 }
-a:hover, a:hover { 
+a:hover, a:hover {
 text-decoration: none;
 color: #d54e21;
 }
@@ -55,7 +55,9 @@ a.active, a.active + a {
 	text-decoration: none;
 	font-weight: 700;
 }
-
+.icon {
+	background-color: #21759B;
+}
 form {
 margin: 0;
 padding: 0 0 0 5px;
@@ -102,7 +104,7 @@ display: table-header-group;
 vertical-align: middle;
 border-color: inherit;
 }
-thead td, thead th { 
+thead td, thead th {
 background-color: #DFDFDF;
 border: none;
 border-bottom: 1px #BBB solid;
@@ -117,12 +119,18 @@ tr:hover td, tr:hover th {
 background-color: #BCD;
 }
 
+.footer {
+border-image:linear-gradient(rgba(249, 249, 249, .2), #F9F9F9) 100% 0;
+}
+.footer > div {
+background-color: #F9F9F9;
+}
 
-fieldset { 
+fieldset {
-display: inline; 
+display: inline;
-vertical-align: top; 
+vertical-align: top;
-padding: 2px 12px; 
+padding: 2px 12px;
-margin: 25px 12px 12px 0; 
+margin: 25px 12px 12px 0;
 border: none;
 background-color: #F1F1F1;
 border: 1px solid #E3E3E3;
@@ -136,7 +144,7 @@ fieldset {
 padding-top: 14px;
 }
 legend {
-font-weight: 900; 
+font-weight: 900;
 color: #000;
 top: -1.666em;
 left: -1em;
@@ -146,7 +154,7 @@ input {
 padding: 2px 5px 1px 5px;
 }
 input[name='limit'], input[name='length'] {
-width: 3em; 
+width: 3em;
 text-align: right;
 }
 input[name='text_length'] {
@@ -203,7 +211,7 @@ input[type=button], input[type=submit] {
 	background-image:      -o-linear-gradient(top, #fff, #eee);
 	background-image:   linear-gradient(to bottom, #fff, #eee);
 	border-color: #ccc;
-	-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9); 
+	-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
  	box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
  	color: #464646;
 	text-shadow: 1px 1px 0 #fff;
@@ -217,7 +225,7 @@ input[type=button]:focus, input[type=submit]:focus  {
 	background-image:      -o-linear-gradient(top, #fff, #eee);
 	background-image:   linear-gradient(to bottom, #fff, #eee);
 	border-color: #bbb;
-	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1); 
+	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
 	box-shadow: 0px 1px 1px rgba(0,0,0,.1);
 	color: #000;
 }
@@ -230,7 +238,7 @@ input[type=button]:active, input[type=submit]:active {
 	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
 	border-color: #999 #ddd #ddd #999;
 	color: #555;
-	-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
+	-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
 	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
 }
 input[type=button]:focus, input[type=submit]:focus {
@@ -255,9 +263,9 @@ input[name='Auto_increment'] { /* !!! */
 width: 6em;
 }
 
-img { 
+img {
-vertical-align: middle; 
+vertical-align: middle;
-margin: 0; 
+margin: 0;
 padding: 0;
 }
 .js .column {
@@ -265,25 +273,25 @@ position: relative;
 background: none;
 padding: 0;
 }
-.error { 
+.error {
-padding: 8px; 
+padding: 8px;
-color: red; 
+color: red;
 background-color: #FEE;
 }
-.message { 
+.message {
-padding: 8px;  
+padding: 8px;
 background-color: #DDD;
 }
-.char { 
+.char {
 color: #070;
 }
-.date { 
+.date {
 color: #707;
 }
-.enum { 
+.enum {
 color: #077;
 }
-.binary { 
+.binary {
 color: red;
 }
 .jush-sql {
@@ -295,20 +303,20 @@ font-size: 11px;
 color: #333;
 }
 
-#content { 
+#content {
-margin: 2px 0 0 270px; 
+margin: 2px 0 0 270px;
 padding: 10px 20px 20px 0;
 }
 #lang {
 font-size:10px;
 height: 23px;
 width: 255px;
-display: block; 
+display: block;
-padding: 1px 0; 
+padding: 1px 0;
-position: absolute; 
+position: absolute;
 top: 0;
 left: 0;
-text-align: center; 
+text-align: center;
 background-color: #f1f1f1;
 border: 1px solid #E3E3E3;
 line-height: 1.25em;
@@ -316,43 +324,43 @@ line-height: 1.25em;
 #lang select {
 font-size: 10px;
 }
-#breadcrumb { 
+#breadcrumb {
-margin: 0; 
+margin: 0;
 height: 21px;
-display: block; 
+display: block;
-position: absolute; 
+position: absolute;
-top: 0; 
+top: 0;
 left: 270px;
 background-color: #f1f1f1;
 border: 1px solid #E3E3E3;
 padding: 2px 12px;
 line-height: 1.25em }
-#menu {  
+#menu {
-position: absolute; 
+position: absolute;
 margin: 0;
-top: 28px; 
+top: 28px;
-left: 0; 
+left: 0;
-width: 255px; 
+width: 255px;
 background-color: #f1f1f1;
 border: 1px solid #E3E3E3;
 }
-#menu form { 
+#menu form {
 margin: 0;
 }
-#menu p, #logins, #tables {
+#menu p, #logins, #tables, .tables-filter {
 padding-left: 8px;
-border-bottom: none;
-}
-#dbs {
-padding: 0 !important;
 }
 #menu form p {
 padding-left: 0;
 text-align: left;
 }
+#dbs {
+	border-bottom: none !important;
+	padding-left: 3px !important;
+}
 h1 .h1:hover {
 text-decoration: underline;
-} 
+}
 h1, h2 {
 font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 margin: 0;
@@ -371,18 +379,18 @@ h3 {
 font: normal normal normal 18px/22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 margin: 20px 0 0 5px;
 }
-#schema { 
+#schema {
 margin: 1.5em 0 0 220px;
 position: relative;
 }
-#schema .table { 
+#schema .table {
 border: 1px solid #E3E3E3;
 background-color: #F1F1F1;
-padding: 0 2px; 
+padding: 0 2px;
-cursor: move; 
+cursor: move;
 position: absolute;
 }
-#schema .references { 
+#schema .references {
 position: absolute;
 }
 .js .hidden {
@@ -425,4 +433,4 @@ border-bottom-left-radius: 3px;
 -khtml-border-top-right-radius: 3px;
 -webkit-border-top-right-radius: 3px;
 border-top-right-radius: 3px;
-}
+}

designs/dracula/adminer.css

@@ -1,4 +1,4 @@
-/* 
+/*
  * Theme by Douglas Damasio [http://github.com/douglasdamasio]
  * Based on Pepa Linha
  * Color syntax inspired by Dracula Theme [https://draculatheme.com/]
@@ -28,7 +28,7 @@
    height: 100%;
    background: var(--color-darkBackground);
  }
- 
+
  body {
   font-family: 'Source Sans Pro', sans-serif;
  }
@@ -36,14 +36,14 @@
  div {
    color: var(--color-darkForeground);
  }
- 
+
  h1 {
    margin: 0;
    padding: 0;
    background: none;
    border: 0;
  }
- 
+
  h2 {
    margin: 0;
    padding: 0;
@@ -57,12 +57,12 @@
    padding-bottom: 6px;
    margin-bottom: 40px;
  }
- 
+
  .rtl h2 {
    margin: 0;
    margin-bottom: 40px;
  }
- 
+
  h3 {
    font-size: 22px;
    margin: 0 0 10px;
@@ -72,66 +72,70 @@
    color: var(--color-darkGreen);
 
  }
- 
+
  p {
    margin: 0;
    margin-bottom: 15px;
    align-items: center;
    color: var(--color-darkForeground);
  }
- 
+
  a {
    color:var(--color-darkPink);
    text-decoration:none;
  }
- 
+
  a:visited {
    color: var(--color-darkPurple);
  }
- 
+
  a:link:hover,
  a:visited:hover {
    color: var(--color-darkPink);
-   text-decoration:underline; 
+   text-decoration:underline;
  }
- 
+
- 
+
  a[href*=charsets] {
    display: none;
  }
- 
+
  table {
    border: 0;
    margin: 0;
    margin-top: 15px;
  }
- 
+
  th, td {
    border: 0;
    padding: 6px;
    color: var(--color-darkOrange);
  }
- 
+
  th {
    background: none;
    color: var(--color-darkCyan);
    font-weight: normal;
  }
- 
+
  tbody tr:hover td,
  tbody tr:hover th {
    background: var(--color-darkCurrentLine);
  }
- 
+
  table:not(.checkable) th {
    min-width: 120px;
  }
- 
+
+#edit-fields th {
+	min-width: 0;
+}
+
  thead td,
  thead th {
    background: var(--color-darkComment);
  }
- 
+
  thead td,
  thead td a,
  thead td a:link:hover,
@@ -144,37 +148,38 @@
  thead th a:visited:hover {
    color: var(--color-darkForeground);
  }
- 
+
  table.checkable,
  p.links + table,
  pre + table,
  #edit-fields,
  p + table,
- h3 + table {
+ h3 + table,
+ .scrollable table{
    border: 1px solid var(--color-darkCurrentLine);
    margin-bottom: 15px;
  }
- 
+
  table.checkable tbody tr:hover td,
  table.checkable tbody tr:hover th {
    background: var(--color-darkCurrentLine);
  }
- 
+
  .js .checkable .checked td,
  .js .checkable .checked th {
    background: var(--color-darkDraculaSite);
  }
- 
+
  .js .checkable thead .checked td,
  .js .checkable thead .checked th {
    background: var(--color-darkPurple);
  }
- 
+
  .odd th,
  .odd td {
    background: var(--color-darkDraculaVSCode);
  }
- 
+
  fieldset {
    display: inline-block;
    padding: 15px;
@@ -183,21 +188,21 @@
    border: 0;
    background: var(--color-darkBackground);
  }
- 
+
  fieldset select {
    margin-right: 5px;
  }
- 
+
  fieldset input[type=button],
  fieldset input[type=submit],
  fieldset p {
    margin-bottom: 0;
  }
- 
+
  fieldset div p {
    margin-top: 10px;
  }
- 
+
  legend {
    display: inline-block;
    padding: 6px 15px;
@@ -206,17 +211,17 @@
    font-family: 'Source Sans Pro', sans-serif;
    color: var(--color-darkOrange);
  }
- 
+
  legend a,
  legend a:link:hover {
    color: var(--color-darkOrange);
    text-decoration: underline;
  }
- 
+
  code {
    background: none;
  }
- 
+
  p code,
  pre code,
  pre[contenteditable=true] {
@@ -225,7 +230,7 @@
    font-size: 17px;
    margin-bottom: 15px;
  }
- 
+
  p code + a,
  p code + a:link:hover,
  p code + a:visited:hover {
@@ -237,7 +242,7 @@
    text-decoration: underline;
    text-transform: lowercase;
  }
- 
+
  #content {
    margin: 0;
    margin-left: 400px;
@@ -245,12 +250,12 @@
    padding: 0;
    padding-top: 50px;
  }
- 
+
  #content > p {
    margin-bottom: 15px;
    color: var(--color-darkForeground);
  }
- 
+
  .rtl #content {
    margin: 0;
    margin-left: 54px;
@@ -258,7 +263,7 @@
    padding: 0;
    padding-top: 50px;
  }
- 
+
  #menu {
    width: 347px;
    border-right: 1px solid var(--color-darkBackground);
@@ -272,51 +277,44 @@
    padding: 0 15px;
    box-sizing: border-box;
  }
- 
+
  #menu h1 {
-   background: none left top no-repeat;
-   /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAAyCAIAAABgVkRrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA0RDI5NkM5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA0RDI5NkQ5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MDREMjk2QTlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1MDREMjk2QjlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnG4emkAAASXSURBVHja7Fk9aNtAFL6EDKKUoqGDySRKB1FC8dDBdCgeOmQoIUMG0yGE0EFT8dDBUwidPJQQQgcNpYROGjKI0sFDB9GhaMhgSgcPpWgqHjqYYsINJfQ7PfV0tmX9JI4Sgx+HI8f26bt3733fe6elIf/LbqwdHbJWS1wYBrMstrXJVg36ZJnNhQWBWMB9k+215gq3tDeHBH3pRseJtC8ee2ezEzd62+ncDH/DhS+ttC88qbMPDntaj952uyvXD3q7ETvyyE77pq5HFz9614r7V8C2GnBezBgp9tGNl3ffzIjvwZ9B//dA7Mz3YPLTyl29UhE+MI0KW9YKh2yjwQZichEAjsNu6WlUqNqkvwHUO+0BJeD2gn4hJFXTwAIw6jUzYxlwHkCTvWqy1+0Ct7FtsPh/3Ofc9brOJ5+8ezHr9gKMcGpWf2SK8bhKk48sA1kIOiODmzc2c8U0DLrzwhI5ypjA3fsZtNrOgPP4y5pmGJXamqHd1kQMTIkENYpwEfQHEW7GsGkYZse393ewb+Y9IwE0PJcOejQ2pFgK3Li3BI14hZM269XKaiXPVPodHUOs6l48o/+t5wO038OcQGztHzd31uPfUEgQdCQi3JkfumLLHa9LoK2tunPQtJ6v5wQ9zWoPzebupms34QKxmZNJAugIDzJE+V4rbTrDSMYtr3AD+H5WFIfZ0lIFPu50otiF7zfW2dlgquKccTFWRxYQ8wlFJOVTdc2gAChq/V99vxdgD7O5CIBO/Yi/P3vsUY2dOOxBdSrzIBm2dxJwq+hlaiId9dua5OlEv/IhH0vKvAYXfvUjvUTFB2STeinJu91Oxo3Eh58onwRXcB7zWkGj/Maa9203+9soPIyWEKBEkQdc8veo+sS4wQkYzV1Bi+A1Ee5DnhO33BxsSw1/wszGPHkXmqI7yIQzPvnvhPqEFjAWtSq7j7n2YplwSctVV8F/FXazbN76nQXu68btfe3Odmqwahl5Ca6tel0UVdnVc6pRBX/JkrgYn0RCY0cdAMhYvGYxHbEklbJ++FoqD8LTUiwTlZLEha55WKOmSybWTCXD1eJG8dnc4XAYqmdgmoRFyp/ZqqHbgMiD8qGXZeAOs1RD9YyhBgBVTgL3cMTHwKd2xyUL50qmTI5p/oK/F7jnEjeycLZTFz02SrKlaSPGbe0fOx+9mbTGcMHhe/fwuFMGn4Dy7BMPA3oBGkZrbIDgcp9JgK37YYtZjmSuqApH9yPRcTp+TM939THOpkaYroMguRuSE14tbuegif11vS58poYm7i1vn6fdxF6hMoNk4leIvTJ0B1FhPQ/PxM45eZ2HGjkY8jHXqptghGJJqqmKVHn1oCr4k93xgr8XuOcZ9zmf7dQym68Et6QFcFaBk7EsQ5fdfuteHW7xPM3asyVh05EkxFJITMHuGDUCukxwvOz3YI31mtWoX7TRXkrDjQhBLeFOHBtQQ6n/f8TDlAd/6mNBP7xO7Ecbz2qNjfrl6qoU3Mr5Qa4j9yyLHqZd7jwjL241QQFdPiJTdT7RsBuapslzi5mqVSHcKXYetcZlSelU3P8EGADW25uhkIE0mQAAAABJRU5ErkJggg==); */
-   background-image: url();
    line-height: 50px;
-   padding-left: 50px;
+   margin: 10px 0;
-   padding-top: 9px;
-   /* text-transform: lowercase; */
-   margin: 25px 0 10px 16px;
  }
- 
+
- 
  #menu h1 a {
    font-style: normal;
  }
- 
+
  #menu h1 .version {
    color: var(--color-darkPurple);
  }
- 
+
  #menu a {
    color: var(--color-darkForeground);
  }
- 
+
  #menu p, #tables {
    border: 0;
    padding: 0;
  }
- 
+
  #menu #dbs {
    background: var(--color-darkDraculaVSCode);
-   padding: 0 15px 15px;
+   padding: 10px 15px 15px;
    border: 1px solid var(--color-darkForeground);
    border-bottom: 0;
    box-sizing: border-box;
    color: var(--color-darkCyan);
  }
- 
+
  #menu #dbs select {
    outline: 0;
    border-color: var(--color-darkComment);
    width: 100%;
  }
- 
+
  #menu p.links {
    margin: 0 0 15px;
    border: 1px solid var(--color-darkForeground);
@@ -326,50 +324,55 @@
    width: 100%;
    box-sizing: border-box;
  }
- 
+
  #menu p.links a {
    padding: 8px;
    margin: 0;
    display: table-cell;
    font-size: 12px;
  }
- 
+
  #menu p.links a:hover {
    color: var(--color-darkPink);
  }
- 
+
  #menu p.links a.active {
    font-weight: normal;
    background: var(--color-darkCurrentLine);
    color: var(--color-darkYellow);
  }
- 
+
+.tables-filter {
+	margin-top: 32px;
+	padding: 0;
+}
+
  #content p.links {
    margin: -10px 0 15px;
  }
- 
+
  #content p.links a {
    padding: 8px;
    margin: 0;
    display: table-cell;
    border: 1px solid var(--color-darkBackground);
  }
- 
+
  #content p.links a,
  #content p.links a:visited,
  #content p.links a:hover {
    color: var(--color-darkCyan);
  }
- 
+
  #content p.links a.active {
    font-weight: normal;
    border: 1px solid var(--color-darkTitleSite);
    background: var(--color-darkCurrentLine);
  }
- 
+
  #tables {
    max-height: 100%;
-   margin: 32px -15px !important;
+   margin: 15px -15px 32px !important;
    position: absolute;
    left: 15px;
    right: 15px;
@@ -378,33 +381,33 @@
    overflow: hidden !important;
    overflow-y: auto !important;
  }
- 
+
  .rtl #tables {
    overflow: hidden !important;
    overflow-y: auto !important;
  }
- 
+
  #tables a {
    float: right;
    padding: 6px 15px;
  }
- 
+
  .rtl #tables a {
    float: none;
  }
- 
+
  #tables .structure, #tables .view {
    float: none;
    display: block;
  }
- 
+
  .rtl #tables a:first-child,
  .rtl #tables br + a {
    float: left;
    display: block;
    margin-left: 15px;
  }
- 
+
  #tables a:hover,
  #tables a:hover + a,
  #tables a.active,
@@ -416,15 +419,15 @@
  #tables br {
    display: none;
  }
- 
+
  .js .column {
    background: var(--color-darkDraculaVSCode);
  }
- 
+
  .js .checked .column {
    background: var(--color-darkDraculaVSCode);
  }
- 
+
  .pages {
    left: 400px;
    background: var(--color-darkCyan);
@@ -434,7 +437,7 @@
    display: inline-block;
    position: static;
  }
- 
+
  .pages a,
  .pages a:link,
  .pages a:link:hover,
@@ -443,7 +446,7 @@
    color: var(--color-darkBackground);
    font-weight: normal;
  }
- 
+
  #breadcrumb {
    margin: 0;
    left: 400px;
@@ -452,36 +455,40 @@
    padding-top: 25px;
    font-size: 12px;
  }
- 
+
  #breadcrumb a {
    color: var(--color-darkForeground);
    text-decoration: underline;
  }
- 
+
  #breadcrumb,
  #breadcrumb a:hover {
    color: var(--color-darkTitleSite);
  }
- 
+
  .rtl #breadcrumb {
    margin: 0;
    padding: 0;
    padding-top: 25px;
    right: 400px;
  }
- 
+
  .logout,
  .rtl .logout {
-   top: 30px;
+   top: 20px;
    right: 54px;
    margin: 0;
  }
- 
+
  .rtl .logout {
    right: auto;
    left: 54px;
  }
- 
+
+ #logout {
+	 margin-top: 0;
+ }
+
  input:not([type]),
  input[type="color"],
  input[type="email"],
@@ -498,7 +505,11 @@
    box-sizing: border-box;
    color: var(--color-darkForeground);
  }
- 
+
+input::placeholder {
+	color: var(--color-darkForeground);
+}
+
  table:not(#table) input:not([type]),
  table:not(#table) input[type="color"],
  table:not(#table) input[type="email"],
@@ -510,7 +521,7 @@
  table:not(#table) input[type="search"] {
    min-width: 280px;
  }
- 
+
  input[type=submit],
  input[type=button] {
    border: 0;
@@ -526,14 +537,14 @@
    border-radius: 5px;
    margin-top: 20px;
  }
- 
+
  input[type=submit][disabled],
  input[type=button][disabled] {
    background: var(--color-darkTitleSite) !important;
    color: var(--color-darkBackground);
    cursor: not-allowed;
  }
- 
+
  input[type=submit]:hover,
  input[type=button]:hover,
  input[type=submit]:focus,
@@ -541,17 +552,17 @@
    background: var(--color-darkGreen);
    opacity: 0.8;
  }
- 
+
  .logout input[type=submit] {
    background: var(--color-darkRed);
    color: var(--color-darkForeground);
  }
- 
+
  .logout input[type=submit]:hover {
    background: var(--color-darkRed);
    opacity: 0.8;
  }
- 
+
  input.default,
  input.default {
    box-shadow: none;
@@ -559,22 +570,22 @@
    color: var(--color-darkDraculaVSCode);
    font-weight: bold;
  }
- 
+
  select {
    box-sizing: border-box;
    margin: 0;
-   padding: 6px 0;
+   padding: 6px;
    border: 1px solid var(--color-darkCurrentLine);
    background-color: var(--color-darkBackground);
    color: var(--color-darkForeground);
  }
- 
+
  label {
    cursor: pointer;
    margin: 18px;
    color: var(--color-darkOrange);
  }
- 
+
  .error,
  .message {
    margin: 0;
@@ -582,23 +593,23 @@
    background: var(--color-darkCurrentLine);
    color: var(--color-darkRed);
  }
- 
+
  #logins a,
  #tables a,
  #tables span {
    background: none;
  }
- 
+
  #form > p {
    margin-bottom: 15px;
    color: var(--color-darkForeground);
  }
- 
+
 
  #schema .table {
    padding: 6px;
  }
- 
+
  #schema .table a {
    display: block;
    margin: -6px;
@@ -607,20 +618,20 @@
    color: var(--color-darkBackground);
    background: var(--color-darkPurple);
  }
- 
+
  #schema .table br {
    display: none;
  }
- 
+
  #schema .table span {
    display: block;
    margin-bottom: 1px solid var(--color-darkDraculaVSCode);
  }
- 
+
  #lang {
    position: fixed;
-   top: 55px;
+   top: 30px;
-   right: 100%;
+   right: calc(100% + 8px);
    z-index: 10;
    margin-right: -340px;
    line-height: normal;
@@ -628,7 +639,7 @@
    left: auto;
    font-size: 0;
  }
- 
+
  #lang select {
    font-size: 12px;
    padding: 0;
@@ -641,26 +652,26 @@
    cursor: pointer;
    outline: 0;
  }
- 
+
  #lang select option {
    text-align: right;
  }
- 
+
  .rtl #lang {
    margin-right: 0;
    left: 100%;
    margin-left: -261px;
    right: auto;
  }
- 
+
  .jush {
    color: var(--color-darkForeground);
  }
- 
+
  .jush a {
    color: var(--color-darkPurple);
  }
- 
+
  .jush-sql a,
  .jush-sql_code a,
  .jush-sqlite a,
@@ -670,7 +681,7 @@
  .jush-simpledb a {
    font-weight: normal;
  }
- 
+
  .jush-bac,
  .jush-php_bac,
  .jush-bra,
@@ -678,7 +689,7 @@
  .jush-sqlite_quo {
    color: var(--color-darkYellow);
  }
- 
+
  .jush-php_quo,
  .jush-quo,
  .jush-quo_one,
@@ -690,21 +701,21 @@
  .jush-sql_eot {
    color: var(--color-darkOrange);
  }
- 
+
  .jush-num,
  .jush-clr {
    color: var(--color-darkPurple);
  }
- 
+
  @media print {
    .logout {
      display: none;
    }
-   
+
    #breadcrumb {
      position: static;
    }
-   
+
    #content {
      margin: 0;
    }

designs/galkaev/adminer.css

@@ -225,8 +225,8 @@ h1{
 }
 
 h2{
-	font-size: 24px; 
+	font-size: 24px;
-	margin: 0; 
+	margin: 0;
 	padding: 0;
 	padding-left: 50px;
 	border-bottom: 1px solid #333;
@@ -442,6 +442,13 @@ td textarea
 	border-radius: 0;
 }
 
+th input::placeholder,
+td input::placeholder
+{
+	color: #fff;
+}
+
+
 th input:hover,
 th select:hover,
 td input:hover,
@@ -502,7 +509,7 @@ input[type='radio']{
 	height: 18px;
 	vertical-align: middle;
 	margin-left: 8px;
-	margin-right: 0;	
+	margin-right: 0;
 }
 
 /* checkbox */
@@ -657,6 +664,14 @@ legend{
 	color: #999;
 }
 
+.footer {
+	border-image: linear-gradient(rgba(0, 0, 0, .2), #000) 100% 0;
+}
+
+.footer > div{
+	background: #000;
+}
+
 /* menu
    ----------------------------------------------------------------------- */
 
@@ -692,12 +707,6 @@ legend{
   font-size: inherit;
 }
 
-/* db select */
-#dbs select{
-	width: 228px;
-	margin-left: 8px;
-}
-
 /* links */
 #menu .links{
 	padding-top: 0;
@@ -985,6 +994,11 @@ code.jush-sql ~ a:first-of-type::before{
 /* logout form
    ----------------------------------------------------------------------- */
 
-body > form{
+.logout {
-	position: absolute;
+	z-index: 10;
+}
+
+#logout {
+	margin-right: 0;
+	margin-left: 10px;
 }

designs/haeckel/adminer.css

@@ -196,7 +196,7 @@ html>/**/body #content table a[id|="Rows"] {          /* Select data (Rows) */
 	margin-right: 5px;
 }
 /* Edit,modify row (pen icon) */
-html>/**/body #content form table thead>tr>td a[href$="&modify=1"], 
+html>/**/body #content form table thead>tr>td a[href$="&modify=1"],
 html>/**/body #content form table a[href*="&edit="][href*="&where"] {
 	background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2lpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjcwNEVCNDY0MDM4NzExRTFBREUyQ0JDMzAwQUI1NjI2IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjcwNEVCNDYzMDM4NzExRTFBREUyQ0JDMzAwQUI1NjI2IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzMgV2luZG93cyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOkFDMUYyRTgzMzI0QURGMTFBQUI4QzUzOTBEODVCNUIzIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOkM5RDM0OTY2NEEzQ0REMTFCMDhBQkJCQ0ZGMTcyMTU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+MT7FiQAAAiZJREFUeNqMk1FIU1EYx/9nO3e+NranKIw2ErM9SQQXxCKMRdFDCWEaNIuIetseQiIKG/jQQ4H0kkQxdLRaYiijtdWwljjKjQlNRQPHEhWUjca9eb3bPd2tFTdrrgMf53x8/98533e+cwhqDFsDQccpILHYXvbv+f1NBcD5DfB8BcZpLfDAvp9+YrE81c+azc6jLlf3RE/PLgWgtBaoGVZZltv4dLpbcjph6+w8Fhgc3CD/AQIMhzOr5osOV7orlUrBaDTC29gY2L25eZPurwfOtAIHW6rUosKyjOtXr7ns4bEW7G1+Bp7n3Tv1eq+V42bojfMAIdvDpzv67MWiDIvFguFHTS8FgfrnCJmZ4zhUvUQtLEkiVlYWEJ98MW7dg35F0SV/yWgtWBByyGaXEH379L16oFtPyRutlG4H53KrEIQsXo0ORQ0c7qg9C2+V02rw2loakvQdwz7PhMGAXkYR0krVlpaN/gteXp6HohQw9MQzqcK3GSO/Yd8YgyiKf2bAGBrEPC6fdfTZM5nPqq/g8YA3pqZ9S42V4ZEww0iI/VUxFSUYCkW0nbsSOT415YbJZMbDB76PtARTvA5GgWBUqdosmhdJs413tBOdbofR1CXev+uI19Ux94ckCb77xGr9NdD1PE4eOnKhdfR5/3Qk5I99WUIgkkBcLcykxhWNFbf4pd2V0htkl06QgdkMYskFTOdFtlERF0qXXZm1a7kSL9sPAQYA2Q4Ie25SbgYAAAAASUVORK5CYII=") no-repeat 3px 3px;
 }
@@ -485,9 +485,10 @@ fieldset {
 /*** Others ***/
 #lang {
 	background: transparent;
-	font-size: .9em; 
+	font-size: .9em;
 	left: auto;
 	right: 120px;
+	top: 3px;
 	position:fixed;
 	z-index: 10;
 	padding-top: 2px;