Add Adminer namespace

Adminer 5 wrapped itself into a namespace and plugins now need to call Adminer's functions via this namespace.

.editorconfig

@@ -1,20 +0,0 @@
-# https://editorconfig.org/
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{php,css,js}]
-indent_style = tab
-
-[*.json]
-indent_style = space
-indent_size = 4
-
-[*.md]
-indent_style = space
-trim_trailing_whitespace = false
-max_line_length = 120

.gitignore

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

.gitmodules

@@ -1,3 +1,9 @@
+[submodule "jush"]
+	path = externals/jush
+	url = git://github.com/vrana/jush
+[submodule "JsShrink"]
+	path = externals/JsShrink
+	url = git://github.com/vrana/JsShrink
 [submodule "designs/hydra"]
 	path = designs/hydra
 	url = https://github.com/Niyko/Hydra-Dark-Theme-for-Adminer

adminer/create.inc.php

@@ -82,40 +82,21 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		}
 
 		$partitioning = "";
-		if (support("partitioning")) {
-			if (isset($partition_by[$row["partition_by"]])) {
-				$params = array_filter($row, function ($key) {
-					return preg_match('~^partition~', $key);
-				}, ARRAY_FILTER_USE_KEY);
-
-				foreach ($params["partition_names"] as $key => $name) {
-					if ($name === "") {
-						unset($params["partition_names"][$key]);
-						unset($params["partition_values"][$key]);
+		if ($partition_by[$row["partition_by"]]) {
+			$partitions = array();
+			if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
+				foreach (array_filter($row["partition_names"]) as $key => $val) {
+					$value = $row["partition_values"][$key];
+					$partitions[] = "\n  PARTITION " . idf_escape($val) . " VALUES " . ($row["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
 				}
 			}
-
-				if ($params != get_partitions_info($TABLE)) {
-					$partitions = [];
-					if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
-						foreach ($params["partition_names"] as $key => $name) {
-							$value = $params["partition_values"][$key];
-							$partitions[] = "\n  PARTITION " . idf_escape($name) . " VALUES " . ($params["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
-						}
-					}
-
-					// $params["partition"] can be expression, not only column
-					$partitioning .= "\nPARTITION BY {$params["partition_by"]}({$params["partition"]})";
-					if ($partitions) {
-						$partitioning .= " (" . implode(",", $partitions) . "\n)";
-					} elseif ($params["partitions"]) {
-						$partitioning .= " PARTITIONS " . (int)$params["partitions"];
-					}
-				}
-			} elseif (preg_match("~partitioned~", $table_status["Create_options"])) {
+			$partitioning .= "\nPARTITION BY $row[partition_by]($row[partition])" . ($partitions // $row["partition"] can be expression, not only column
+				? " (" . implode(",", $partitions) . "\n)"
+				: ($row["partitions"] ? " PARTITIONS " . (+$row["partitions"]) : "")
+			);
+		} elseif (support("partitioning") && preg_match("~partitioned~", $table_status["Create_options"])) {
 			$partitioning .= "\nREMOVE PARTITIONING";
 		}
-		}
 
 		$message = lang('Table has been altered.');
 		if ($TABLE == "") {
@@ -160,9 +141,13 @@ if (!$_POST) {
 		}
 
 		if (support("partitioning")) {
-			$row += get_partitions_info($TABLE);
-			$row["partition_names"][] = "";
-			$row["partition_values"][] = "";
+			$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
+			$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+			list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
+			$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+			$partitions[""] = "";
+			$row["partition_names"] = array_keys($partitions);
+			$row["partition_values"] = array_values($partitions);
 		}
 	}
 }

adminer/db.inc.php

@@ -61,7 +61,7 @@ if ($adminer->homepage()) {
 				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
-					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
+					$_GET["where"][0]["op"] = "LIKE %%";
 					search_tables();
 				}
 			}

adminer/drivers/elastic.inc.php

@@ -1,105 +1,82 @@
 <?php
-add_driver("elastic5", "Elasticsearch 5 (beta)");
+$drivers["elastic"] = "Elasticsearch (beta)";
 
-if (isset($_GET["elastic5"])) {
-	define("DRIVER", "elastic5");
+if (isset($_GET["elastic"])) {
+	define("DRIVER", "elastic");
 
-	if (ini_bool('allow_url_fopen')) {
+	if (function_exists('json_decode') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
 			var $extension = "JSON", $server_info, $errno, $error, $_url, $_db;
 
-			/**
-			 * @param string $path
-			 * @param array|null $content
-			 * @param string $method
-			 * @return array|false
+			/** Performs query
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
 			 */
-			function rootQuery($path, array $content = null, $method = 'GET') {
+			function rootQuery($path, $content = array(), $method = 'GET') {
 				@ini_set('track_errors', 1); // @ - may be disabled
-
 				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
 					'method' => $method,
-					'content' => $content !== null ? json_encode($content) : null,
-					'header' => $content !== null ? 'Content-Type: application/json' : [],
-					'ignore_errors' => 1,
-					'follow_location' => 0,
-					'max_redirects' => 0,
+					'content' => $content === null ? $content : json_encode($content),
+					'header' => 'Content-Type: application/json',
+					'ignore_errors' => 1, // available since PHP 5.2.10
 				))));
-
-				if ($file === false) {
-					$this->error = lang('Invalid server or credentials.');
+				if (!$file) {
+					$this->error = $php_errormsg;
+					return $file;
+				}
+				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+					$this->error = lang('Invalid credentials.') . " $http_response_header[0]";
 					return false;
 				}
-
 				$return = json_decode($file, true);
 				if ($return === null) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-					if (isset($return['error']['root_cause'][0]['type'])) {
-						$this->error = $return['error']['root_cause'][0]['type'] . ": " . $return['error']['root_cause'][0]['reason'];
+					$this->errno = json_last_error();
+					if (function_exists('json_last_error_msg')) {
+						$this->error = json_last_error_msg();
 					} else {
-						$this->error = lang('Invalid server or credentials.');
+						$constants = get_defined_constants(true);
+						foreach ($constants['json'] as $name => $value) {
+							if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
+								$this->error = $name;
+								break;
+							}
+						}
 					}
-					return false;
 				}
-
 				return $return;
 			}
 
 			/** Performs query relative to actual selected DB
-			 * @param string $path
-			 * @param array|null $content
-			 * @param string $method
-			 * @return array|false
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
 			 */
-			function query($path, array $content = null, $method = 'GET') {
-				// Support for global search through all tables
-				if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) {
-					global $driver;
-
-					$where = explode(" AND ", $matches[2]);
-
-					return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]);
-				}
-
+			function query($path, $content = array(), $method = 'GET') {
 				return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method);
 			}
 
-			/**
-			 * @param string $server
-			 * @param string $username
-			 * @param string $password
-			 * @return bool
-			 */
 			function connect($server, $username, $password) {
-				$this->_url = build_http_url($server, $username, $password, "localhost", 9200);
-
+				preg_match('~^(https?://)?(.*)~', $server, $match);
+				$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
 				$return = $this->query('');
-				if (!$return) {
-					return false;
-				}
-
-				if (!isset($return['version']['number'])) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
+				if ($return) {
 					$this->server_info = $return['version']['number'];
-				return true;
+				}
+				return (bool) $return;
 			}
 
 			function select_db($database) {
 				$this->_db = $database;
-
 				return true;
 			}
 
 			function quote($string) {
 				return $string;
 			}
+
 		}
 
 		class Min_Result {
@@ -108,33 +85,34 @@ if (isset($_GET["elastic5"])) {
 			function __construct($rows) {
 				$this->num_rows = count($rows);
 				$this->_rows = $rows;
-
 				reset($this->_rows);
 			}
 
 			function fetch_assoc() {
 				$return = current($this->_rows);
 				next($this->_rows);
-
 				return $return;
 			}
 
 			function fetch_row() {
-				$row = $this->fetch_assoc();
+				return array_values($this->fetch_assoc());
+			}
 
-				return $row ? array_values($row) : false;
-			}
 		}
+
 	}
 
+
+
 	class Min_Driver extends Min_SQL {
 
 		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			global $adminer;
 			$data = array();
+			$query = "$table/_search";
 			if ($select != array("*")) {
-				$data["fields"] = array_values($select);
+				$data["fields"] = $select;
 			}
-
 			if ($order) {
 				$sort = array();
 				foreach ($order as $col) {
@@ -143,78 +121,58 @@ if (isset($_GET["elastic5"])) {
 				}
 				$data["sort"] = $sort;
 			}
-
 			if ($limit) {
 				$data["size"] = +$limit;
 				if ($page) {
 					$data["from"] = ($page * $limit);
 				}
 			}
-
 			foreach ($where as $val) {
-				if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) {
-					$parts = explode(" OR ", $matches[1]);
-					$terms = array();
-					foreach ($parts as $part) {
-						list($col, $op, $val) = explode(" ", $part, 3);
-						$term = array($col => $val);
-						if ($op == "=") {
-							$terms[] = array("term" => $term);
-						} elseif (in_array($op, array("must", "should", "must_not"))) {
-							$data["query"]["bool"][$op][]["match"] = $term;
-						}
-					}
-
-					if (!empty($terms)) {
-						$data["query"]["bool"]["filter"][]["bool"]["should"] = $terms;
-					}
-				} else {
 				list($col, $op, $val) = explode(" ", $val, 3);
-					$term = array($col => $val);
+				if ($col == "_id") {
+					$data["query"]["ids"]["values"][] = $val;
+				}
+				elseif ($col . $val != "") {
+					$term = array("term" => array(($col != "" ? $col : "_all") => $val));
 					if ($op == "=") {
-						$data["query"]["bool"]["filter"][] = array("term" => $term);
-					} elseif (in_array($op, array("must", "should", "must_not"))) {
-						$data["query"]["bool"][$op][]["match"] = $term;
+						$data["query"]["filtered"]["filter"]["and"][] = $term;
+					} else {
+						$data["query"]["filtered"]["query"]["bool"]["must"][] = $term;
 					}
 				}
 			}
-
-			$query = (min_version(7) ? "" : "$table/") . "_search";
+			if ($data["query"] && !$data["query"]["filtered"]["query"] && !$data["query"]["ids"]) {
+				$data["query"]["filtered"]["query"] = array("match_all" => array());
+			}
 			$start = microtime(true);
 			$search = $this->_conn->query($query, $data);
-
 			if ($print) {
-				echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search);
+				echo $adminer->selectQuery("$query: " . json_encode($data), $start, !$search);
 			}
 			if (!$search) {
 				return false;
 			}
-
 			$return = array();
 			foreach ($search['hits']['hits'] as $hit) {
 				$row = array();
 				if ($select == array("*")) {
 					$row["_id"] = $hit["_id"];
 				}
-
 				$fields = $hit['_source'];
 				if ($select != array("*")) {
 					$fields = array();
 					foreach ($select as $key) {
-						$fields[$key] = $key == "_id" ? [$hit["_id"]] : $hit['fields'][$key];
+						$fields[$key] = $hit['fields'][$key];
 					}
 				}
-
 				foreach ($fields as $key => $val) {
 					if ($data["fields"]) {
 						$val = $val[0];
 					}
 					$row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently
 				}
-
 				$return[] = $row;
 			}
-
 			return new Min_Result($return);
 		}
 
@@ -224,10 +182,8 @@ if (isset($_GET["elastic5"])) {
 			if (count($parts) == 2) {
 				$id = trim($parts[1]);
 				$query = "$type/$id";
-
 				return $this->_conn->query($query, $record, 'POST');
 			}
-
 			return false;
 		}
 
@@ -236,17 +192,16 @@ if (isset($_GET["elastic5"])) {
 			$query = "$type/$id";
 			$response = $this->_conn->query($query, $record, 'POST');
 			$this->_conn->last_id = $response['_id'];
-
 			return $response['created'];
 		}
 
 		function delete($type, $queryWhere, $limit = 0) {
 			//! use $limit
 			$ids = array();
-			if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) {
+			if (is_array($_GET["where"]) && $_GET["where"]["_id"]) {
 				$ids[] = $_GET["where"]["_id"];
 			}
-			if (isset($_POST['check'])) {
+			if (is_array($_POST['check'])) {
 				foreach ($_POST['check'] as $check) {
 					$parts = preg_split('~ *= *~', $check);
 					if (count($parts) == 2) {
@@ -254,46 +209,30 @@ if (isset($_GET["elastic5"])) {
 					}
 				}
 			}
-
 			$this->_conn->affected_rows = 0;
-
 			foreach ($ids as $id) {
 				$query = "{$type}/{$id}";
-				$response = $this->_conn->query($query, null, 'DELETE');
-				if ((isset($response['found']) && $response['found']) || (isset($response['result']) && $response['result'] == 'deleted')) {
+				$response = $this->_conn->query($query, '{}', 'DELETE');
+				if (is_array($response) && $response['found'] == true) {
 					$this->_conn->affected_rows++;
 				}
 			}
-
 			return $this->_conn->affected_rows;
 		}
-
-		function convertOperator($operator) {
-			return $operator == "LIKE %%" ? "should" : $operator;
-		}
 	}
 
-	/**
-	 * @param string $hostPath
-	 * @return bool
-	 */
-	function is_server_host_valid($hostPath)
-	{
-		return strpos(rtrim($hostPath, '/'), '/') === false;
-	}
+
 
 	function connect() {
+		global $adminer;
 		$connection = new Min_DB;
-
-		list($server, $username, $password) = adminer()->credentials();
+		list($server, $username, $password) = $adminer->credentials();
 		if ($password != "" && $connection->connect($server, $username, "")) {
 			return lang('Database does not support password.');
 		}
-
 		if ($connection->connect($server, $username, $password)) {
 			return $connection;
 		}
-
 		return $connection->error;
 	}
 
@@ -302,31 +241,26 @@ if (isset($_GET["elastic5"])) {
 	}
 
 	function logged_user() {
-		$credentials = adminer()->credentials();
-
+		global $adminer;
+		$credentials = $adminer->credentials();
 		return $credentials[1];
 	}
 
 	function get_databases() {
-		$return = connection()->rootQuery('_aliases');
+		global $connection;
+		$return = $connection->rootQuery('_aliases');
 		if ($return) {
 			$return = array_keys($return);
 			sort($return, SORT_STRING);
 		}
-
 		return $return;
 	}
 
-	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
-	}
-
 	function collations() {
 		return array();
 	}
 
 	function db_collation($db, $collations) {
-		//
 	}
 	
 	function engines() {
@@ -334,9 +268,9 @@ if (isset($_GET["elastic5"])) {
 	}
 
 	function count_tables($databases) {
+		global $connection;
 		$return = array();
-
-		$result = connection()->query('_stats');
+		$result = $connection->query('_stats');
 		if ($result && $result['indices']) {
 			$indices = $result['indices'];
 			foreach ($indices as $indice => $stats) {
@@ -344,25 +278,26 @@ if (isset($_GET["elastic5"])) {
 				$return[$indice] = $indexing['index_total'];
 			}
 		}
-
 		return $return;
 	}
 
 	function tables_list() {
-		if (min_version(7)) {
+		global $connection;
+
+		if (min_version(6)) {
 			return array('_doc' => 'table');
 		}
 
-		$return = connection()->query('_mapping');
+		$return = $connection->query('_mapping');
 		if ($return) {
-			$return = array_fill_keys(array_keys($return[connection()->_db]["mappings"]), 'table');
+			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
 		}
-
 		return $return;
 	}
 
 	function table_status($name = "", $fast = false) {
-		$search = connection()->query("_search", array(
+		global $connection;
+		$search = $connection->query("_search", array(
 			"size" => 0,
 			"aggregations" => array(
 				"count_by_type" => array(
@@ -372,30 +307,26 @@ if (isset($_GET["elastic5"])) {
 				)
 			)
 		), "POST");
-
 		$return = array();
-
 		if ($search) {
 			$tables = $search["aggregations"]["count_by_type"]["buckets"];
-
 			foreach ($tables as $table) {
 				$return[$table["key"]] = array(
 					"Name" => $table["key"],
 					"Engine" => "table",
 					"Rows" => $table["doc_count"],
 				);
-
 				if ($name != "" && $name == $table["key"]) {
 					return $return[$name];
 				}
 			}
 		}
-
 		return $return;
 	}
 
 	function error() {
-		return h(connection()->error);
+		global $connection;
+		return h($connection->error);
 	}
 
 	function information_schema() {
@@ -411,54 +342,39 @@ if (isset($_GET["elastic5"])) {
 	}
 
 	function fields($table) {
-		$mappings = array();
+		global $connection;
 
-		if (min_version(7)) {
-			$result = connection()->query("_mapping");
+		$mappings = array();
+		if (min_version(6)) {
+			$result = $connection->query("_mapping");
 			if ($result) {
-				$mappings = $result[connection()->_db]['mappings']['properties'];
+				$mappings = $result[$connection->_db]['mappings']['properties'];
 			}
 		} else {
-			$result = connection()->query("$table/_mapping");
+			$result = $connection->query("$table/_mapping");
 			if ($result) {
 				$mappings = $result[$table]['properties'];
 				if (!$mappings) {
-					$mappings = $result[connection()->_db]['mappings'][$table]['properties'];
+					$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
 				}
 			}
 		}
 
-		$return = array(
-			"_id" => array(
-				"field" => "_id",
-				"full_type" => "text",
-				"type" => "text",
-				"privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1),
-			)
-		);
-
+		$return = array();
+		if ($mappings) {
 			foreach ($mappings as $name => $field) {
-			if (isset($field["index"]) && !$field["index"]) continue;
-
 				$return[$name] = array(
 					"field" => $name,
 					"full_type" => $field["type"],
 					"type" => $field["type"],
-				"privileges" => array(
-					"insert" => 1,
-					"select" => 1,
-					"update" => 1,
-					"where" => !isset($field["index"]) || $field["index"] ?: null,
-					"order" => $field["type"] != "text" ?: null
-				),
+					"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				);
-
 				if ($field["properties"]) { // only leaf fields can be edited
 					unset($return[$name]["privileges"]["insert"]);
 					unset($return[$name]["privileges"]["update"]);
 				}
 			}
-
+		}
 		return $return;
 	}
 
@@ -475,7 +391,6 @@ if (isset($_GET["elastic5"])) {
 	}
 
 	function convert_field($field) {
-		//
 	}
 
 	function unconvert_field($field, $return) {
@@ -483,7 +398,6 @@ if (isset($_GET["elastic5"])) {
 	}
 
 	function fk_support($table_status) {
-		//
 	}
 
 	function found_rows($table_status, $where) {
@@ -495,7 +409,8 @@ if (isset($_GET["elastic5"])) {
 	* @return mixed
 	*/
 	function create_database($db) {
-		return connection()->rootQuery(urlencode($db), null, 'PUT');
+		global $connection;
+		return $connection->rootQuery(urlencode($db), null, 'PUT');
 	}
 
 	/** Remove index
@@ -503,7 +418,8 @@ if (isset($_GET["elastic5"])) {
 	* @return mixed
 	*/
 	function drop_databases($databases) {
-		return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE');
+		global $connection;
+		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
 	}
 
 	/** Alter type
@@ -511,6 +427,7 @@ if (isset($_GET["elastic5"])) {
 	* @return mixed
 	*/
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
 		$properties = array();
 		foreach ($fields as $f) {
 			$field_name = trim($f[1][0]);
@@ -519,11 +436,10 @@ if (isset($_GET["elastic5"])) {
 				'type' => $field_type
 			);
 		}
-
 		if (!empty($properties)) {
 			$properties = array('properties' => $properties);
 		}
-		return connection()->query("_mapping/{$name}", $properties, 'PUT');
+		return $connection->query("_mapping/{$name}", $properties, 'PUT');
 	}
 
 	/** Drop types
@@ -531,22 +447,22 @@ if (isset($_GET["elastic5"])) {
 	* @return bool
 	*/
 	function drop_tables($tables) {
+		global $connection;
 		$return = true;
 		foreach ($tables as $table) { //! convert to bulk api
-			$return = $return && connection()->query(urlencode($table), null, 'DELETE');
+			$return = $return && $connection->query(urlencode($table), array(), 'DELETE');
 		}
-
 		return $return;
 	}
 
 	function last_id() {
-		return connection()->last_id;
+		global $connection;
+		return $connection->last_id;
 	}
 
 	function driver_config() {
 		$types = array();
 		$structured_types = array();
-
 		foreach (array(
 			lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
 			lang('Date and time') => array("date" => 10),
@@ -556,11 +472,10 @@ if (isset($_GET["elastic5"])) {
 			$types += $val;
 			$structured_types[$key] = array_keys($val);
 		}
-
 		return array(
 			'possible_drivers' => array("json + allow_url_fopen"),
 			'jush' => "elastic",
-			'operators' => array("=", "must", "should", "must_not"),
+			'operators' => array("=", "query"),
 			'functions' => array(),
 			'grouping' => array(),
 			'edit_functions' => array(array("json")),

adminer/drivers/mongo.inc.php

@@ -463,8 +463,6 @@ if (isset($_GET["mongo"])) {
 									"insert" => 1,
 									"select" => 1,
 									"update" => 1,
-									"where" => 1,
-									"order" => 1,
 								),
 							);
 						}

adminer/drivers/mssql.inc.php

@@ -387,7 +387,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 +432,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) {
@@ -630,17 +630,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;
-	}
-
 	function show_status() {
 		return 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'])) {
-					$this->ssl_set(
-						isset($ssl['key']) ? $ssl['key'] : null,
-						isset($ssl['cert']) ? $ssl['cert'] : null,
-						isset($ssl['ca']) ? $ssl['ca'] : null,
-						null, null
-					);
+				if ($ssl) {
+					$this->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca'], '', '');
 				}
-
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
@@ -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 ? 64 : 0) // 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
 				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
@@ -241,28 +234,30 @@ if (!defined("DRIVER")) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-
-				$dsn = "mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server));
-
-				$options = [PDO::MYSQL_ATTR_LOCAL_INFILE => false];
+				$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
 				$ssl = $adminer->connectSsl();
-				if (isset($ssl['key'])) {
+				if ($ssl) {
+					if (!empty($ssl['key'])) {
 						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
 					}
-				if (isset($ssl['cert'])) {
+					if (!empty($ssl['cert'])) {
 						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
 					}
-				if (isset($ssl['ca'])) {
+					if (!empty($ssl['ca'])) {
 						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
 					}
-
-				$this->dsn($dsn, $username, $password, $options);
-
+				}
+				$this->dsn(
+					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)),
+					$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 +316,8 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-		function convertSearch($idf, array $where, array $field) {
-			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $where['val'])
+		function convertSearch($idf, $val, $field) {
+			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
 			);
@@ -375,7 +370,7 @@ if (!defined("DRIVER")) {
 		$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";
@@ -556,7 +551,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,29 +1056,6 @@ if (!defined("DRIVER")) {
 		return get_key_vals("SHOW VARIABLES");
 	}
 
-	/**
-	 * @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;
-		}
-
-		return $c_style;
-	}
-
 	/** Get process list
 	* @return array ($row)
 	*/
@@ -1188,7 +1160,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
-			'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
+			'functions' => array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
 			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"), ///< @var array grouping functions used in select
 			'edit_functions' => array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
 				array(

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) . '"';
@@ -304,7 +297,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,17 +479,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;
-	}
-
 	function process_list() {
 		return get_rows('SELECT sess.process AS "process", sess.username AS "user", sess.schemaname AS "schema", sess.status AS "status", sess.wait_class AS "wait_class", sess.seconds_in_wait AS "seconds_in_wait", sql.sql_text AS "sql_text", sess.machine AS "machine", sess.port AS "port"
 FROM v$session sess LEFT OUTER JOIN v$sql sql

adminer/drivers/pgsql.inc.php

@@ -19,14 +19,7 @@ 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
@@ -43,7 +36,7 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function quote($string) {
-				return pg_escape_literal($this->_link, $string);
+				return "'" . pg_escape_string($this->_link, $string) . "'";
 			}
 
 			function value($val, $field) {
@@ -155,19 +148,9 @@ 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);
-
+				$this->dsn("pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password); //! client_encoding is supported since 9.1 but we can't yet use min_version here
+				//! connect without DB in case of an error
 				return true;
 			}
 
@@ -229,13 +212,13 @@ if (isset($_GET["pgsql"])) {
 			return $query;
 		}
 
-		function convertSearch($idf, array $where, array $field) {
-			$textTypes = "char|text";
-			if (strpos($where["op"], "LIKE") === false) {
-				$textTypes .= "|date|time(stamp)?|boolean|uuid|inet|cidr|macaddr|" . number_type();
-			}
-
-			return (preg_match("~$textTypes~", $field["type"]) ? $idf : "CAST($idf AS text)");
+		function convertSearch($idf, $val, $field) {
+			return (preg_match('~char|text'
+					. (!preg_match('~LIKE~', $val["op"]) ? '|date|time(stamp)?|boolean|uuid|' . number_type() : '')
+					. '~', $field["type"])
+				? $idf
+				: "CAST($idf AS text)"
+			);
 		}
 
 		function quoteBinary($s) {
@@ -291,9 +274,7 @@ 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')
-                 ORDER BY d.datname");
+		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -341,7 +322,7 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_table_size(c.oid) AS \"Data_length\", pg_indexes_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
 WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
@@ -395,7 +376,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 +469,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) {
@@ -792,7 +773,7 @@ AND typelem = 0"
 		$return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n    ";
 
 		// fields' definitions
-		foreach ($fields as $field) {
+		foreach ($fields as $field_name => $field) {
 			$part = idf_escape($field['field']) . ' ' . $field['full_type']
 				. default_value($field)
 				. ($field['attnotnull'] ? " NOT NULL" : "");
@@ -801,11 +782,10 @@ AND typelem = 0"
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$rows = get_rows(min_version(10)
-					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
+				$sq = reset(get_rows(min_version(10)
+					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name)
 					: "SELECT * FROM $sequence_name"
-				);
-				$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];";
 			}
@@ -878,23 +858,6 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 
-	/**
-	 * @return bool
-	 */
-	function is_strict_mode() {
-		return false;
-	}
-
-	function is_c_style_escapes() {
-		static $c_style = null;
-
-		if ($c_style === null) {
-			$c_style = get_vals("SHOW standard_conforming_strings")[0] == "off";
-		}
-
-		return $c_style;
-	}
-
 	function process_list() {
 		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
@@ -934,7 +897,7 @@ AND typelem = 0"
 			lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
 			lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
 			lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
-			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "macaddr8" => 23, "txid_snapshot" => 0),
+			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
 			lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
 		) as $key => $val) { //! can be retrieved from pg_type
 			$types += $val;
@@ -959,7 +922,6 @@ AND typelem = 0"
 					"char|text" => "||",
 				)
 			),
-			'c_style_escapes' => true,
 		);
 	}
 }

adminer/drivers/sqlite.inc.php

@@ -321,7 +321,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				"full_type" => $type,
 				"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"]) {
@@ -764,17 +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;
-	}
-
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {

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

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

adminer/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

@@ -25,16 +25,12 @@ class Adminer {
 	function connectSsl() {
 	}
 
-	/**
-	 * Gets a private key used for permanent login.
-	 *
-	 * @param bool $create
-	 *
-	 * @return string|false Cryptic string which gets combined with password or false in case of an error.
-	 * @throws \Random\RandomException
+	/** Get key used for permanent login
+	* @param bool
+	* @return string cryptic string which gets combined with password or false in case of an error
 	*/
 	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
@@ -100,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;
 	}
@@ -235,25 +231,17 @@ class Adminer {
 	*/
 	function selectQuery($query, $start, $failed = false) {
 		global $jush, $driver;
-
-        $supportSql = support("sql");
-
-		$result = "<p>"
-            . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> "
-            . "<span class='time'>(" . format_time($start) . ")</span>"
-			. ($supportSql ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "");
-
+		$return = "</p>\n"; // required for IE9 inline edit
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
-			$result = ($supportSql ? "," : "")
-                . " <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
-                . "</p>\n"
-                . "<div id='$id' class='hidden'>\n$warnings</div>\n";
-		} else {
-			$result .= "</p>\n";
+			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
+			;
 		}
-
-        return $result;
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
+			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
+			. $return
+		;
 	}
 
 	/** Query printed in SQL command before execution
@@ -305,7 +293,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
@@ -541,60 +529,49 @@ class Adminer {
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $driver;
-
-		$return = [];
-
+		global $connection, $driver;
+		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
 				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-
-		foreach ((array) $_GET["where"] as $where) {
-			$col = $where["col"];
-			$op = $where["op"];
-			$val = $where["val"];
-
-			if ("$col$val" != "" && in_array($op, $this->operators)) {
+		foreach ((array) $_GET["where"] as $key => $val) {
+			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
 				$prefix = "";
-				$cond = " $op";
-
-				if (preg_match('~IN$~', $op)) {
-					$in = process_length($val);
+				$cond = " $val[op]";
+				if (preg_match('~IN$~', $val["op"])) {
+					$in = process_length($val["val"]);
 					$cond .= " " . ($in != "" ? $in : "(NULL)");
-				} elseif ($op == "SQL") {
-					$cond = " $val"; // SQL injection
-				} elseif ($op == "LIKE %%") {
-					$cond = " LIKE " . $this->processInput($fields[$col], "%$val%");
-				} elseif ($op == "ILIKE %%") {
-					$cond = " ILIKE " . $this->processInput($fields[$col], "%$val%");
-				} elseif ($op == "FIND_IN_SET") {
-					$prefix = "$op(" . q($val) . ", ";
+				} elseif ($val["op"] == "SQL") {
+					$cond = " $val[val]"; // SQL injection
+				} elseif ($val["op"] == "LIKE %%") {
+					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+				} elseif ($val["op"] == "ILIKE %%") {
+					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+				} elseif ($val["op"] == "FIND_IN_SET") {
+					$prefix = "$val[op](" . q($val["val"]) . ", ";
 					$cond = ")";
-				} elseif (!preg_match('~NULL$~', $op)) {
-					$cond .= " " . $this->processInput($fields[$col], $val);
+				} elseif (!preg_match('~NULL$~', $val["op"])) {
+					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
 				}
-
-				if ($col != "") {
-					$return[] = $prefix . $driver->convertSearch(idf_escape($col), $where, $fields[$col]) . $cond;
+				if ($val["col"] != "") {
+					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if (isset($field["privileges"]["where"])
-                            && (preg_match('~^[-\d.' . (preg_match('~IN$~', $op) ? ',' : '') . ']+$~', $val) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val) || preg_match('~char|text|enum|set~', $field["type"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val))
+						if ((preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
+							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
 						) {
-							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $where, $field) . $cond;
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
 					}
 					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
-
 		return $return;
 	}
 
@@ -777,11 +754,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;
 	}
 
@@ -855,7 +831,6 @@ class Adminer {
 				$insert = "";
 				$buffer = "";
 				$keys = array();
-				$generatedKeys = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -863,10 +838,6 @@ class Adminer {
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
-							if (!empty($fields[$field->name]['generated'])) {
-								$generatedKeys[$field->name] = true;
-								continue;
-                            }
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -884,10 +855,6 @@ class Adminer {
 							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
-							if (isset($generatedKeys[$key])) {
-								unset($row[$key]);
-								continue;
-                            }
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
 								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
@@ -941,10 +908,8 @@ class Adminer {
 		return $ext;
 	}
 
-	/**
-	 * Gets the path of the file for webserver load.
-	 *
-	 * @return string Path of the sql import file.
+	/** Set the path of the file for webserver load
+	* @return string path of the sql dump file
 	*/
 	function importServerPath() {
 		return "adminer.sql";
@@ -969,11 +934,8 @@ class Adminer {
 		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
-    <?php echo $this->name(); ?>
-    <?php if ($missing != "auth"): ?>
-    <span class="version"><?php echo $VERSION; ?></span>
-    <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>
-    <?php endif; ?>
+<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
+<a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php
 		if ($missing == "auth") {
@@ -999,12 +961,12 @@ class Adminer {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
-			echo script_src("../vendor/vrana/jush/modules/jush.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-textarea.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-txt.js");
-			echo script_src("../vendor/vrana/jush/modules/jush-js.js");
+			echo script_src("../externals/jush/modules/jush.js");
+			echo script_src("../externals/jush/modules/jush-textarea.js");
+			echo script_src("../externals/jush/modules/jush-txt.js");
+			echo script_src("../externals/jush/modules/jush-js.js");
 			if (support("sql")) {
-				echo script_src("../vendor/vrana/jush/modules/jush-$jush.js");
+				echo script_src("../externals/jush/modules/jush-$jush.js");
 				?>
 <script<?php echo nonce(); ?>>
 <?php

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");
-	if (!$file) {
+	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
+	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;
-
-	$filename = get_temp_dir() . "/adminer.invalid";
-	$invalids = file_exists($filename) ? unserialize(file_get_contents($filename)) : [];
-	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : []);
-
+	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
+	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
 	$next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
 	if ($next_attempt > 0) { //! do the same with permanent login
 		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
@@ -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"];
@@ -172,10 +103,9 @@ function unset_permanent() {
 }
 
 /** Renders an error message and a login form
- * @param string plain text
- * @return null exits
- * @throws \Random\RandomException
- */
+* @param string plain text
+* @return null exits
+*/
 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.') : ''));
 }
 

adminer/include/bootstrap.inc.php

@@ -1,12 +1,11 @@
 <?php
 function adminer_errors($errno, $errstr) {
-	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
+	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
 }
 
 error_reporting(6135); // errors and warnings
 set_error_handler('adminer_errors', E_WARNING);
 
-include "../adminer/include/debug.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -32,9 +31,9 @@ if (isset($_GET["file"])) {
 }
 
 if ($_GET["script"] == "version") {
-	$file = open_file_with_lock(get_temp_dir() . "/adminer.version");
-	if ($file) {
-		write_and_unlock_file($file, serialize(["signature" => $_POST["signature"], "version" => $_POST["version"]]));
+	$fp = file_open_lock(get_temp_dir() . "/adminer.version");
+	if ($fp) {
+		file_write_unlock($fp, serialize(array("signature" => $_POST["signature"], "version" => $_POST["version"])));
 	}
 	exit;
 }
@@ -82,6 +81,7 @@ include "../adminer/drivers/pgsql.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
 include "../adminer/drivers/mongo.inc.php";
+include "../adminer/drivers/elastic.inc.php";
 include "./include/adminer.inc.php";
 $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver

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

@@ -142,20 +142,14 @@ function csp() {
 	);
 }
 
-/**
- * Gets a CSP nonce.
- *
- * @return string Base64 value.
- * @throws \Random\RandomException
- */
-function get_nonce()
-{
+/** Get a CSP nonce
+* @return string Base64 value
+*/
+function get_nonce() {
 	static $nonce;
-
 	if (!$nonce) {
-		$nonce = base64_encode(get_random_string(true));
+		$nonce = base64_encode(rand_string());
 	}
-
 	return $nonce;
 }
 

adminer/include/driver.inc.php

@@ -11,15 +11,6 @@ function add_driver($id, $name) {
 	$drivers[$id] = $name;
 }
 
-/** Get driver name
-* @param string
-* @return string
-*/
-function get_driver($id) {
-	global $drivers;
-	return $drivers[$id];
-}
-
 /*abstract*/ class Min_SQL {
 	var $_conn;
 	
@@ -147,18 +138,10 @@ function get_driver($id) {
 	* @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

adminer/include/editing.inc.php

@@ -21,11 +21,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();
-				$name = $field["name"];
-				$orgtable = $field["orgtable"];
-				$orgname = $field["orgname"];
-				$return[$field["table"]] = $orgtable;
+				$field = $result->fetch_field();
+				$name = $field->name;
+				$orgtable = $field->orgtable;
+				$orgname = $field->orgname;
+				$return[$field->table] = $orgtable;
 				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
@@ -46,11 +46,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$links[$j] = $orgtable;
 					}
 				}
-				if ($field["charsetnr"] == 63) { // 63 - binary
+				if ($field->charsetnr == 63) { // 63 - binary
 					$blobs[$j] = true;
 				}
-				$types[$j] = $field["type"];
-				echo "<th" . ($orgtable != "" || $field["name"] != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+				$types[$j] = $field->type;
+				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
 					. ($orgtables ? doc_link(array(
 						'sql' => "explain-output.html#explain_" . strtolower($name),
 						'mariadb' => "explain/#the-columns-in-explain-select",
@@ -72,7 +72,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 +86,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";
 		}
@@ -221,17 +221,12 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
-	// MariaDB exports CURRENT_TIMESTAMP as a function.
-	if ($field["on_update"]) {
-		$field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
-	}
-
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
 		default_value($field),
-		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE " . $field["on_update"] : ""),
+		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
 		(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
 		($field["auto_increment"] ? auto_increment() : null),
 	);
@@ -243,18 +238,7 @@ function process_field($field, $type_field) {
 */
 function default_value($field) {
 	$default = $field["default"];
-	if ($default === null) return "";
-
-	if (stripos($default, "GENERATED ") === 0) {
-		return " $default";
-	}
-
-	// MariaDB exports CURRENT_TIMESTAMP as a function.
-	$default = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $default);
-
-	$quote = preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default);
-
-	return " DEFAULT " . ($quote ? q($default) : $default);
+	return ($default === null ? "" : " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default));
 }
 
 /** Get type class to use in CSS
@@ -295,11 +279,11 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 <td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
 <?php if ($type == "TABLE") { ?>
 <td id="label-null">NULL
-<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
+<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
 	'sql' => "example-auto-increment.html",
 	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
-	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
+	'pgsql' => "datatype.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
 <td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
@@ -384,43 +368,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.
- *
- * @param bool $grant
- * @param array $privileges
- * @param string $columns
- * @param string $on
- * @param string $user
- *
- * @return bool
- */
-function grant($grant, array $privileges, $columns, $on, $user) {
-	if (!$privileges) return true;
-
-	if ($privileges == ["ALL PRIVILEGES", "GRANT OPTION"]) {
-		if ($grant) {
-			return (bool) queries("GRANT ALL PRIVILEGES ON $on TO $user WITH GRANT OPTION");
-		} else {
-			return queries("REVOKE ALL PRIVILEGES ON $on FROM $user") &&
-				queries("REVOKE GRANT OPTION ON $on FROM $user");
+/** Issue grant or revoke commands
+* @param string GRANT or REVOKE
+* @param array
+* @param string
+* @param string
+* @return bool
+*/
+function grant($grant, $privileges, $columns, $on) {
+	if (!$privileges) {
+		return true;
 	}
-	}
-
-	if ($privileges == ["GRANT OPTION", "PROXY"]) {
-		if ($grant) {
-			return (bool) queries("GRANT PROXY ON $on TO $user WITH GRANT OPTION");
-		} else {
-			return (bool) queries("REVOKE PROXY ON $on FROM $user");
-		}
-	}
-
-	return (bool) queries(
-		($grant ? "GRANT " : "REVOKE ") .
-		preg_replace('~(GRANT OPTION)\([^)]*\)~', '$1', implode("$columns, ", $privileges) . $columns) .
-		" ON $on " .
-		($grant ? "TO " : "FROM ") . $user
+	if ($privileges == array("ALL PRIVILEGES", "GRANT OPTION")) {
+		// can't be granted or revoked together
+		return ($grant == "GRANT"
+			? queries("$grant ALL PRIVILEGES$on WITH GRANT OPTION")
+			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
 		);
+	}
+	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
 }
 
 /** Drop old object and create a new one
@@ -549,9 +515,9 @@ function tar_file($filename, $tmp_file) {
 function ini_bytes($ini) {
 	$val = ini_get($ini);
 	switch (strtolower(substr($val, -1))) {
-		case 'g': $val = (int)$val * 1024; // no break
-		case 'm': $val = (int)$val * 1024; // no break
-		case 'k': $val = (int)$val * 1024;
+		case 'g': $val *= 1024; // no break
+		case 'm': $val *= 1024; // no break
+		case 'k': $val *= 1024;
 	}
 	return $val;
 }

adminer/include/functions.inc.php

@@ -1,5 +1,4 @@
 <?php
-
 /** Get database connection
 * @return Min_DB
 */
@@ -158,6 +157,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 +213,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
 */
@@ -470,36 +477,24 @@ function escape_key($key) {
 */
 function where($where, $fields = array()) {
 	global $connection, $jush;
-
-	$conditions = [];
-
+	$return = array();
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
-
-		if ($jush == "sql" && $fields[$key]["type"] == "json") {
-			$conditions[] = "$column = CAST(" . q($val) . " AS JSON)";
-		} elseif ($jush == "sql" && is_numeric($val) && strpos($val, ".") !== false) {
-			// LIKE because of floats but slow with ints.
-			$conditions[] = "$column LIKE " . q($val);
-		} elseif ($jush == "mssql") {
-			// LIKE because of text.
-			$conditions[] = "$column LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val));
-		} else {
-			$conditions[] = "$column = " . unconvert_field($fields[$key], q($val));
-		}
-
-		// Not just [a-z] to catch non-ASCII characters.
-		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) {
-			$conditions[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
+		$return[] = $column
+			. ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
+				: " = " . unconvert_field($fields[$key], q($val))
+			))
+		; //! enum and set
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
+			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
-
 	foreach ((array) $where["null"] as $key) {
-		$conditions[] = escape_key($key) . " IS NULL";
+		$return[] = escape_key($key) . " IS NULL";
 	}
-
-	return implode(" AND ", $conditions);
+	return implode(" AND ", $return);
 }
 
 /** Create SQL condition from query string
@@ -919,16 +914,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;
 }
 
@@ -940,15 +932,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"]);
@@ -956,18 +947,13 @@ 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";
-
-	echo "<td class='function'>";
-
+	$attrs = " name='fields[$name]'";
 	if ($field["type"] == "enum") {
 		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]'>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
 				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
 				. script("qsl('select').onchange = functionChange;", "")
 			: h(reset($functions))
@@ -992,7 +978,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"])) {
@@ -1032,11 +1018,6 @@ function input($field, $value, $function) {
 */
 function process_input($field) {
 	global $adminer, $driver;
-
-	if (stripos($field["default"], "GENERATED ALWAYS AS ") === 0) {
-		return null;
-	}
-
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
@@ -1096,7 +1077,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),
 		);
@@ -1127,27 +1108,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
@@ -1208,98 +1168,60 @@ function get_temp_dir() {
 	return $return;
 }
 
-/**
- * Opens and exclusively lock a file.
- *
- * @param string $filename
- * @return resource|null
- */
-function open_file_with_lock($filename)
-{
-	$file = fopen($filename, "c+");
-	if (!$file) {
-		return null;
+/** Open and exclusively lock a file
+* @param string
+* @return resource or null for error
+*/
+function file_open_lock($filename) {
+	$fp = @fopen($filename, "r+"); // @ - may not exist
+	if (!$fp) { // c+ is available since PHP 5.2.6
+		$fp = @fopen($filename, "w"); // @ - may not be writable
+		if (!$fp) {
+			return;
 		}
-
 		chmod($filename, 0660);
-
-	if (!flock($file, LOCK_EX)) {
-		fclose($file);
-		return null;
 	}
-
-	return $file;
+	flock($fp, LOCK_EX);
+	return $fp;
 }
 
-/**
- * Writes and unlocks a file.
- *
- * @param resource $file
- * @param string $data
- */
-function write_and_unlock_file($file, $data)
-{
-	rewind($file);
-	fwrite($file, $data);
-	ftruncate($file, strlen($data));
-
-	unlock_file($file);
+/** Write and unlock a file
+* @param resource
+* @param string
+*/
+function file_write_unlock($fp, $data) {
+	rewind($fp);
+	fwrite($fp, $data);
+	ftruncate($fp, strlen($data));
+	flock($fp, LOCK_UN);
+	fclose($fp);
 }
 
-/**
- * Unlocks and closes the file.
- *
- * @param resource $file
- */
-function unlock_file($file)
-{
-	flock($file, LOCK_UN);
-	fclose($file);
-}
-
-/**
- * Reads password from file adminer.key in temporary directory or create one.
- *
- * @param $create bool
- * @return string|false Returns false if the file can not be created.
- * @throws \Random\RandomException
- */
-function get_private_key($create)
-{
+/** Read password from file adminer.key in temporary directory or create one
+* @param bool
+* @return string or false if the file can not be created
+*/
+function password_file($create) {
 	$filename = get_temp_dir() . "/adminer.key";
-
-	if (!$create && !file_exists($filename)) {
-		return false;
+	$return = @file_get_contents($filename); // @ - may not exist
+	if ($return || !$create) {
+		return $return;
 	}
-
-	$file = open_file_with_lock($filename);
-	if (!$file) {
-		return false;
+	$fp = @fopen($filename, "w"); // @ - can have insufficient rights //! is not atomic
+	if ($fp) {
+		chmod($filename, 0660);
+		$return = rand_string();
+		fwrite($fp, $return);
+		fclose($fp);
 	}
-
-	$key = stream_get_contents($file);
-	if (!$key) {
-		$key = get_random_string();
-		write_and_unlock_file($file, $key);
-	} else {
-		unlock_file($file);
-	}
-
-	return $key;
+	return $return;
 }
 
-/**
- * Returns a random 32 characters long string.
- *
- * @param $binary bool
- * @return string
- * @throws \Random\RandomException
- */
-function get_random_string($binary = false)
-{
-	$bytes = function_exists('random_bytes') ? random_bytes(32) : uniqid(mt_rand(), true);
-
-	return $binary ? $bytes : md5($bytes);
+/** Get a random string
+* @return string 32 hexadecimal characters
+*/
+function rand_string() {
+	return md5(uniqid(mt_rand(), true));
 }
 
 /** Format value to use in select
@@ -1328,7 +1250,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
 		}
 	}
@@ -1349,32 +1271,20 @@ function select_value($val, $link, $field, $text_length) {
 * @param string
 * @return bool
 */
-function is_mail($value) {
-	return is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL);
+function is_mail($email) {
+	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
+	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
+	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
+	return is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
 }
 
-/** Check whether the string is web URL address
+/** Check whether the string is URL address
 * @param string
 * @return bool
 */
-function is_web_url($value) {
-	if (!is_string($value) || !preg_match('~^https?://~i', $value)) {
-		return false;
-	}
-
-	$components = parse_url($value);
-    if (!$components) {
-        return false;
-    }
-
-    // Encode URL path. If path was encoded already, it will be encoded twice, but we are OK with that.
-	$encodedParts = array_map('urlencode', explode('/', $components['path']));
-	$url = str_replace($components['path'], implode('/', $encodedParts), $value);
-
-	parse_str($components['query'], $params);
-	$url = str_replace($components['query'], http_build_query($params), $url);
-
-	return (bool)filter_var($url, FILTER_VALIDATE_URL);
+function is_url($string) {
+	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
+	return preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
 }
 
 /** Check if field should be shortened
@@ -1516,7 +1426,6 @@ function edit_form($table, $fields, $row, $update) {
 	$adminer->editRowPrint($table, $fields, $row, $update);
 	if ($row === false) {
 		echo "<p class='error'>" . lang('No rows.') . "\n";
-		return;
 	}
 	?>
 <form action="" method="post" enctype="multipart/form-data" id="form">

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
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
@@ -25,7 +25,6 @@ $langs = array(
 	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
 	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
-    'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
 	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.9.4";
+$VERSION = "4.8.2-dev";

adminer/lang/ar.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'بيانات الدخول غير صالحة.',
 	'Server' => 'الخادم',
 	'Username' => 'اسم المستخدم',
 	'Password' => 'كلمة المرور',
@@ -264,50 +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,
-	'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

@@ -10,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' => 'Език',
@@ -333,26 +333,4 @@ $translations = array(
 	'Type has been dropped.' => 'Вида беше пермахнат.',
 	'Type has been created.' => 'Вида беше създаден.',
 	'Alter type' => 'Промяна на вид',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'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,53 +1,53 @@
 <?php
 $translations = array(
 	'Login' => 'লগইন',
-	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
-	'Invalid server or credentials.' => null,
+	'Logout successful.' => 'লগআউট সম্পন্ন হয়েছে।',
+	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
 	'Server' => 'সার্ভার',
 	'Username' => 'ইউজারের নাম',
 	'Password' => 'পাসওয়ার্ড',
-	'Select database' => 'ডাটাবেজ নির্বাচন করুন',
-	'Invalid database.' => 'অকার্যকর ডাটাবেজ।',
+	'Select database' => 'ডাটাবেজ নির্বাচন করো',
+	'Invalid database.' => 'ভুল ডাটাবেজ।',
 	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
-	'Table has been altered.' => 'টেবিল পরিবর্তন করা হয়েছে।',
+	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
 	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',
-	'Alter table' => 'টেবিল পরিবর্তন করুন',
-	'Create table' => 'টেবিল তৈরী করুন',
+	'Alter table' => 'টেবিল সম্পাদনা',
+	'Create table' => 'টেবিল তৈরী করো',
 	'Table name' => 'টেবিলের নাম',
 	'engine' => 'ইন্জিন',
-	'collation' => 'সমষ্টি',
+	'collation' => 'কলোকেশন',
 	'Column name' => 'কলামের নাম',
-	'Type' => 'ধরণ',
+	'Type' => 'টাইপ',
 	'Length' => 'দৈর্ঘ্য',
 	'Auto Increment' => 'স্বয়ংক্রিয় বৃদ্ধি',
-	'Options' => 'বিকল্পসমূহ',
-	'Save' => 'সংরক্ষণ করুন',
+	'Options' => 'অপশন',
+	'Save' => 'সংরক্ষণ',
 	'Drop' => 'মুছে ফেলো',
 	'Database has been dropped.' => 'ডাটাবেজ মুছে ফেলা হয়েছে।',
 	'Database has been created.' => 'ডাটাবেজ তৈরী করা হয়েছে।',
 	'Database has been renamed.' => 'ডাটাবেজের নতুন নামকরণ করা হয়েছে।',
-	'Database has been altered.' => 'ডাটাবেজ পরিবর্তন করা হয়েছে।',
-	'Alter database' => 'ডাটাবেজ পরিবর্তন করুন',
-	'Create database' => 'ডাটাবেজ তৈরী করুন',
-	'SQL command' => 'SQL-কমান্ড',
+	'Database has been altered.' => 'ডাটাবেজ সম্পাদনা করা হয়েছে।',
+	'Alter database' => 'ডাটাবেজ সম্পাদনা',
+	'Create database' => 'ডাটাবেজ তৈরী',
+	'SQL command' => 'SQL-কোয়্যারী',
 	'Logout' => 'লগআউট',
 	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
 	'No tables.' => 'কোন টেবিল নাই।',
 	'select' => 'নির্বাচন',
 	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
-	'Item has been updated.' => 'বিষয়বস্তু হালনাগাদ করা হয়েছে।',
+	'Item has been updated.' => 'বিষয়বস্তু আপডেট করা হয়েছে।',
 	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
 	'Edit' => 'সম্পাদনা',
 	'Insert' => 'সংযোজন',
-	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন করুন',
-	'Delete' => 'মুছে ফেলুন',
+	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন',
+	'Delete' => 'মুছে ফেলো',
 	'Database' => 'ডাটাবেজ',
 	'Routines' => 'রুটিনসমূহ',
 	'Indexes have been altered.' => 'সূচীসমূহ সম্পাদনা করা হয়েছে।',
 	'Indexes' => 'সূচীসমূহ',
-	'Alter indexes' => 'সূচীসমূহ পরিবর্তন করুন',
-	'Add next' => 'পরবর্তী সংযোজন করুন',
+	'Alter indexes' => 'সূচীসমূহ সম্পাদনা',
+	'Add next' => 'সংযোজন',
 	'Language' => 'ভাষা',
 	'Select' => 'নির্বাচন',
 	'New item' => 'নতুন বিষয়বস্তু',
@@ -60,90 +60,90 @@ $translations = array(
 	'edit' => 'সম্পাদনা',
 	'Page' => 'পৃষ্ঠা',
 	'Query executed OK, %d row(s) affected.' => array('কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।', 'কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।'),
-	'Error in query' => 'অনুসন্ধানে ভুল আছে।',
+	'Error in query' => 'কোয়্যারীতে ভুল আছে।',
 	'Execute' => 'সম্পাদন করো',
 	'Table' => 'টেবিল',
 	'Foreign keys' => 'ফরেন কী',
 	'Triggers' => 'ট্রিগার',
 	'View' => 'ভিউ',
 	'Unable to select the table' => 'টেবিল নির্বাচন করতে অক্ষম',
-	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্মটি আবার পাঠান।',
+	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্ম আবার পাঠাও।',
 	'Comment' => 'মন্তব্য',
 	'Default values' => 'ডিফল্ট মান',
 	'%d byte(s)' => array('%d বাইট', '%d বাইটসমূহ'),
-	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নেই।',
+	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নাই।',
 	'Unable to upload a file.' => 'ফাইল আপলোড করা সম্ভব হচ্ছে না।',
 	'File upload' => 'ফাইল আপলোড',
 	'File uploads are disabled.' => 'ফাইল আপলোড নিষ্ক্রিয় করা আছে।',
-	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।'),
+	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।'),
 	'Call' => 'কল',
 	'No extension' => 'কোন এক্সটেনশান নাই',
 	'None of the supported PHP extensions (%s) are available.' => 'কোন PHP সমর্থিত এক্সটেনশন (%s) পাওয়া যায় নাই।',
 	'Session support must be enabled.' => 'সেশন সমর্থন সক্রিয় করা আবশ্যক।',
-	'Session expired, please login again.' => 'সেশনের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
+	'Session expired, please login again.' => 'সেশানের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
 	'Text length' => 'টেক্সট দৈর্ঘ্য',
 	'Foreign key has been dropped.' => 'ফরেন কী মুছে ফেলা হয়েছে।',
-	'Foreign key has been altered.' => 'ফরেন কী পরিবর্তন করা হয়েছে।',
+	'Foreign key has been altered.' => 'ফরেন কী সম্পাদনা করা হয়েছে।',
 	'Foreign key has been created.' => 'ফরেন কী তৈরী করা হয়েছে।',
 	'Foreign key' => 'ফরেন কী ',
 	'Target table' => 'টার্গেট টেবিল',
 	'Change' => 'পরিবর্তন',
 	'Source' => 'উৎস',
 	'Target' => 'লক্ষ্য',
-	'Add column' => 'কলাম সংযোজন করুন',
-	'Alter' => 'পরিবর্তন',
-	'Add foreign key' => 'ফরেন কী সংযোজন করুন',
+	'Add column' => 'কলাম সংযোজন',
+	'Alter' => 'সম্পাদনা',
+	'Add foreign key' => 'ফরেন কী সংযোজন করো',
 	'ON DELETE' => 'অন ডিলিট',
 	'ON UPDATE' => 'অন আপডেট',
 	'Index Type' => 'সূচী-ধরণ',
 	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
 	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
-	'View has been altered.' => 'ভিউ পরিবর্তন করা হয়েছে।',
+	'View has been altered.' => 'ভিউ সম্পাদনা করা হয়েছে।',
 	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',
-	'Alter view' => 'ভিউ পরিবর্তন করুন',
-	'Create view' => 'ভিউ তৈরী করুন',
+	'Alter view' => 'ভিউ সম্পাদনা করো',
+	'Create view' => 'ভিউ তৈরী করো',
 	'Name' => 'নাম',
 	'Process list' => 'প্রসেস তালিকা',
-	'%d process(es) have been killed.' => array('%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।'),
+	'%d process(es) have been killed.' => array('%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।'),
 	'Kill' => 'বিনষ্ট করো',
 	'Parameter name' => 'প্যারামিটারের নাম',
 	'Database schema' => 'ডাটাবেজ স্কিমা',
-	'Create procedure' => 'কার্যপ্রণালী তৈরী করুন',
-	'Create function' => 'ফাংশন তৈরী করুন',
+	'Create procedure' => 'প্রসিডিওর তৈরী করো',
+	'Create function' => 'ফাংশন তৈরী করো',
 	'Routine has been dropped.' => 'রুটিন মুছে ফেলা হয়েছে।',
-	'Routine has been altered.' => 'রুটিন পরিবর্তন করা হয়েছে।',
+	'Routine has been altered.' => 'রুটিন সম্পাদনা করা হয়েছে।',
 	'Routine has been created.' => 'রুটিন তৈরী করা হয়েছে।',
-	'Alter function' => 'ফাংশন পরিবর্তন করুন',
-	'Alter procedure' => 'কার্যপ্রণালী পরিবর্তন করুন',
+	'Alter function' => 'ফাংশন সম্পাদনা করো',
+	'Alter procedure' => 'প্রসিডিওর সম্পাদনা করো',
 	'Return type' => 'রিটার্ন টাইপ',
-	'Add trigger' => 'ট্রিগার সংযোজন করুন',
+	'Add trigger' => 'ট্রিগার সংযোজন করো',
 	'Trigger has been dropped.' => 'ট্রিগার মুছে ফেলা হয়েছে।',
-	'Trigger has been altered.' => 'ট্রিগার পরিবর্তন করা হয়েছে।',
+	'Trigger has been altered.' => 'ট্রিগার সম্পাদনা করা হয়েছে।',
 	'Trigger has been created.' => 'ট্রিগার তৈরী করা হয়েছে।',
-	'Alter trigger' => 'ট্রিগার পরিবর্তন করুন',
-	'Create trigger' => 'ট্রিগার তৈরী করুন',
+	'Alter trigger' => 'ট্রিগার সম্পাদনা করো',
+	'Create trigger' => 'ট্রিগার তৈরী করো',
 	'Time' => 'সময়',
 	'Event' => 'ইভেন্ট',
 	'%s version: %s through PHP extension %s' => 'ভার্সন %s: %s, %s PHP এক্সটেনশনের মধ্য দিয়ে',
 	'%d row(s)' => array('%d সারি', '%d সারি সমূহ'),
-	'Remove' => 'মুছে ফেলুন',
-	'Are you sure?' => 'আপনি কি নিশ্চিত?',
+	'Remove' => 'অপসারণ',
+	'Are you sure?' => 'তুমি কি নিশ্চিত?',
 	'Privileges' => 'প্রিভিলেজেস',
-	'Create user' => 'ব্যবহারকারি তৈরী করুন',
-	'User has been dropped.' => 'ব্যবহারকারি মুছে ফেলা হয়েছে।',
-	'User has been altered.' => 'ব্যবহারকারি সম্পাদনা করা হয়েছে।',
-	'User has been created.' => 'ব্যবহারকারি তৈরী করা হয়েছে।',
-	'Hashed' => 'হ্যাশড',
+	'Create user' => 'ইউজার তৈরী করো',
+	'User has been dropped.' => 'ইউজার মুছে ফেলা হয়েছে।',
+	'User has been altered.' => 'ইউজার সম্পাদনা করা হয়েছে।',
+	'User has been created.' => 'ইউজার তৈরী করা হয়েছে।',
+	'Hashed' => 'হ্যাসড',
 	'Column' => 'কলাম',
 	'Routine' => 'রুটিন',
-	'Grant' => 'অনুমতি',
-	'Revoke' => 'প্রত্যাহার',
+	'Grant' => 'গ্র্যান্ট',
+	'Revoke' => 'রিভোক',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো',
 	'Logged as: %s' => '%s হিসাবে লগড',
 	'Move up' => 'উপরে স্থানান্তর',
 	'Move down' => 'নীচে স্থানান্তর',
 	'Functions' => 'ফাংশন সমূহ',
-	'Aggregation' => 'সমষ্টি',
+	'Aggregation' => 'মোট পরিমাণ',
 	'Export' => 'এক্সপোর্ট',
 	'Output' => 'আউটপুট',
 	'open' => 'খোলা',
@@ -162,8 +162,8 @@ $translations = array(
 	'Schedule' => 'সময়সূচি',
 	'Start' => 'শুরু',
 	'End' => 'সমাপ্তি',
-	'Status' => 'অবস্থা',
-	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করুন',
+	'Status' => 'স্ট্যাটাস',
+	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করো',
 	'Tables and views' => 'টেবিল এবং ভিউ সমূহ',
 	'Data Length' => 'ডাটার দৈর্ঘ্য',
 	'Index Length' => 'ইনডেক্স এর দৈর্ঘ্য',
@@ -175,14 +175,14 @@ $translations = array(
 	'Repair' => 'মেরামত',
 	'Truncate' => 'ছাঁটাই',
 	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
-	'Rows' => 'সারিসমূহ',
+	'Rows' => 'সারি',
 	',' => ',',
 	'0123456789' => '০১২৩৪৫৬৭৮৯',
 	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
-	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করুন',
-	'Move' => 'স্থানান্তর করুন',
+	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
+	'Move' => 'স্থানান্তর করো',
 	'Engine' => 'ইঞ্জিন',
-	'Save and continue edit' => 'সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান',
+	'Save and continue edit' => 'সংরক্ষণ করো এবং সম্পাদনা চালিয়ে যাও',
 	'original' => 'প্রকৃত',
 	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
 	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
@@ -193,10 +193,10 @@ $translations = array(
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
 	'Values' => 'মানসমূহ',
-	'%d row(s) have been imported.' => array('%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।'),
+	'%d row(s) have been imported.' => array('%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।'),
 	'anywhere' => 'যে কোন স্থানে',
 	'Import' => 'ইমপোর্ট',
-	'Stop on error' => 'ত্রুটি পেলে থেমে যান',
+	'Stop on error' => 'ত্রুটি পেলে থেমে যাও',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',
@@ -216,14 +216,14 @@ $translations = array(
 	'E-mail' => '​​ই-মেইল',
 	'From' => 'থেকে',
 	'Subject' => 'বিষয়',
-	'Send' => 'পাঠান',
-	'%d e-mail(s) have been sent.' => array('%d ইমেইল(গুলি) পাঠানো হয়েছে।', '%d ইমেইল(গুলি) পাঠানো হয়েছে।'),
+	'Send' => 'পাঠাও',
+	'%d e-mail(s) have been sent.' => array('%d ইমেইল (গুলি) পাঠানো হয়েছে।', '%d ইমেইল (গুলি) পাঠানো হয়েছে।'),
 	'Webserver file %s' => 'ওয়েবসার্ভার ফাইল %s',
-	'File does not exist.' => 'ফাইলটির কোন অস্তিত্ব নেই।',
+	'File does not exist.' => 'ফাইলের কোন অস্তিত্ব নেই।',
 	'%d in total' => 'সর্বমোটঃ %d টি',
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
-	'Search data in tables' => 'টেবিলে তথ্য খুঁজুন',
+	'Search data in tables' => 'টেবিলে খোঁজ করো',
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -236,78 +236,32 @@ $translations = array(
 	'Sequence has been dropped.' => 'অনুক্রম মুছে ফেলা হয়েছে।',
 	'Sequence has been created.' => 'অনুক্রম তৈরি করা হয়েছে।',
 	'Sequence has been altered.' => 'অনুক্রম সম্পাদনা করা হয়েছে।',
-	'User types' => 'ব্যবহারকারির ধরণ',
-	'Create type' => 'ধরণ তৈরী করুন',
-	'Alter type' => 'ধরণ পরিবর্তন করুন',
-	'Type has been dropped.' => 'ধরণ মুছে ফেলা হয়েছে।',
-	'Type has been created.' => 'ধরণ তৈরি করা হয়েছে।',
-	'Use edit link to modify this value.' => 'এই মানটি পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করুন।',
+	'User types' => 'ইউজারের টাইপ',
+	'Create type' => 'টাইপ তৈরী করো',
+	'Alter type' => 'টাইপ পরিবর্তন করো',
+	'Type has been dropped.' => 'টাইপ মুছে ফেলা হয়েছে।',
+	'Type has been created.' => 'টাইপ তৈরি করা হয়েছে।',
+	'Use edit link to modify this value.' => 'এই মান পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করো।',
 	'last' => 'সর্বশেষ',
 	'From server' => 'সার্ভার থেকে',
 	'System' => 'সিস্টেম',
 	'Select data' => 'তথ্য নির্বাচন করো',
-	'Show structure' => 'গঠন দেখান',
+	'Show structure' => 'গঠন দেখাও',
 	'empty' => 'খালি',
 	'Network' => 'নেটওয়ার্ক',
 	'Geometry' => 'জ্যামিতি',
 	'File exists.' => 'ফাইল রয়েছে।',
-	'Attachments' => 'সংযুক্তিগুলো',
-	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে'),
-	'Show only errors' => 'শুধুমাত্র ত্রুটিগুলো দেখান',
+	'Attachments' => 'সংযুক্তি',
+	'%d query(s) executed OK.' => array('SQL-কোয়্যারী সফলভাবে সম্পন্ন হয়েছে', '%d SQL-কোয়্যারীসমূহ সফলভাবে সম্পন্ন হয়েছে'),
+	'Show only errors' => 'শুধুমাত্র ত্রুটি দেখাও',
 	'Refresh' => 'রিফ্রেশ',
 	'Invalid schema.' => 'অবৈধ স্কিমা।',
-	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করুন।',
+	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করো।',
 	'now' => 'এখন',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => 'টেবিলগুলো কপি করা হয়েছে।',
+	'Tables have been copied.' => 'টেবিল কপি করা হয়েছে।',
 	'Copy' => 'কপি',
 	'Permanent link' => 'স্থায়ী লিংক',
-	'Edit all' => 'সবগুলো সম্পাদনা করুন',
+	'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

@@ -10,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',
@@ -318,41 +318,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -265,49 +265,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

@@ -11,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.',
@@ -23,7 +23,7 @@ $translations = array(
 	'No extension' => 'Žádné rozšíření',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Připojování k privilegovaným portům není povoleno.',
-	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte rozšíření %s nebo %s.',
+	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte extenze %s nebo %s.',
 	'Session support must be enabled.' => 'Session proměnné musí být povolené.',
 	'Session expired, please login again.' => 'Session vypršela, přihlašte se prosím znovu.',
 	'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
@@ -346,13 +346,4 @@ $translations = array(
 	'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

@@ -9,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.',
@@ -279,35 +279,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

@@ -3,7 +3,7 @@ $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>',
-	'Invalid server or credentials.' => 'Ungültige Server oder Anmelde-Informationen.',
+	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
 	'Password' => 'Passwort',
@@ -286,28 +286,4 @@ $translations = array(
 	'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?' => null,
-	'Materialized view' => null,
-	'Vacuum' => 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,
-	'Full table scan' => 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' => 'Ja',
-	'No' => 'Nein',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/el.inc.php

@@ -10,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' => 'Γλώσσα',
@@ -333,26 +333,4 @@ $translations = array(
 	'Type has been dropped.' => 'Ο τύπος διαγράφηκε.',
 	'Type has been created.' => 'Ο τύπος δημιουργήθηκε.',
 	'Alter type' => 'Τροποποίηση τύπου',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -265,49 +265,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Ebakorrektsed andmed.',
 	'Server' => 'Server',
 	'Username' => 'Kasutajanimi',
 	'Password' => 'Parool',
@@ -265,49 +265,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

@@ -10,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' => 'زبان',
@@ -331,28 +331,4 @@ $translations = array(
 	'Type has been dropped.' => 'نوع حذف شد.',
 	'Type has been created.' => 'نوع ایجاد شد.',
 	'Alter type' => 'ویرایش نوع',
-
-	'Drop %s?' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'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

@@ -10,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',
@@ -347,12 +347,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Authentification échouée.',
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
@@ -288,26 +288,4 @@ $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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -288,26 +288,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'פרטי התחברות שגויים',
 	'Server' => 'שרת',
 	'Username' => 'שם משתמש',
 	'Password' => 'סיסמה',
@@ -290,24 +290,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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ó',
@@ -264,50 +264,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

@@ -10,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',
@@ -313,46 +313,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -265,49 +265,4 @@ $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',
-	'Vacuum' => 'Aspira',
-	'Selected' => 'Selezionato',
-	'overwrite' => 'sovrascrivi',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Il file deve avere codifica UTF-8.',
-	'Modify' => 'Modifica',
-	'Load more data' => 'Carica piú dati',
-	'Loading' => 'Caricamento',
-	'ATTACH queries are not supported.' => 'ATTACH queries non sono supportate.',
-	'Warnings' => 'Attenzione',
-	'%d / ' => array('%d / '),
-	'Limit rows' => 'Limite righe',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer non supporta accesso a databse senza password, <a href="https://www.adminer.org/it/password/"%s>piú informazioni</a>.',
-	'Default value' => 'Valore predefinito',
-	'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.',
-	'There is a space in the input password which might be the cause.' => 'Esiste uno spazio nella passoword inserita che potrebbe essere la causa.',
-	'If you did not send this request from Adminer then close this page.' => 'Se non hai inviato tu la richiesta tramite Adminer puoi chiudere la pagina.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Puoi caricare un grande file SQL tramite FTP ed impirtarlo dal server.',
-	'Size' => 'Taglia',
-	'Compute' => 'Elabora',
-	'You are offline.' => 'Sei disconnesso.',
-	'You have no privileges to update this table.' => 'Non hai i privilegi per aggiornare questa tabella.',
-	'Saving' => 'Salvataggio',
-	'Unknown error.' => 'Errore sconosciuto',
-	'Database does not support password.' => 'Il database non supporta password.',
-	'Disable %s or enable %s or %s extensions.' => 'Disabilita %s o abilita %s oppure %s estensioni.',
-	'yes' => 'si',
-	'no' => 'no',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Si',
-	'No' => 'No',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/ja.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => '不正なログイン',
 	'Server' => 'サーバ',
 	'Username' => 'ユーザ名',
 	'Password' => 'パスワード',
@@ -274,40 +274,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'არასწორი მომხმარებელი ან პაროლი.',
 	'Server' => 'სერვერი',
 	'Username' => 'მომხმარებელი',
 	'Password' => 'პაროლი',
@@ -300,14 +300,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

@@ -121,7 +121,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.' => '잘못된 스키마입니다.',
@@ -277,37 +277,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

@@ -10,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',
@@ -309,50 +309,4 @@ $translations = array(
 	'Type has been dropped.' => 'Tipas pašalintas.',
 	'Type has been created.' => 'Tipas sukurtas.',
 	'Alter type' => 'Keisti tipą',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Ctrl+click on a value to modify it.' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'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,313 +0,0 @@
-<?php
-$translations = array(
-	'Login' => 'Ieiet',
-	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
-	'Invalid server or credentials.' => null,
-	'Server' => 'Serveris',
-	'Username' => 'Lietotājs',
-	'Password' => 'Parole',
-	'Select database' => 'Izvēlēties datubāzi',
-	'Invalid database.' => 'Nederīga datubāze.',
-	'Table has been dropped.' => 'Tabula dzēsta.',
-	'Table has been altered.' => 'Tabula mainīta.',
-	'Table has been created.' => 'Tabula izveidota.',
-	'Alter table' => 'Mainīt tabulu',
-	'Create table' => 'Izveidot tabulu',
-	'Table name' => 'Tabulas nosaukums',
-	'engine' => 'Tabulas tips',
-	'collation' => 'Kolācija',
-	'Column name' => 'Lauka nosaukums',
-	'Type' => 'Tips',
-	'Length' => 'Garums',
-	'Auto Increment' => 'Auto inkrements',
-	'Options' => 'Opcijas',
-	'Save' => 'Saglabāt',
-	'Drop' => 'Dzēst',
-	'Database has been dropped.' => 'Datubāze tika nodzēsta.',
-	'Database has been created.' => 'Datubāze tika izveidota.',
-	'Database has been renamed.' => 'Datubāze tika pārsaukta.',
-	'Database has been altered.' => 'Datubāze tika mainīta.',
-	'Alter database' => 'Mainīt datubāzi',
-	'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',
-	'Item has been deleted.' => 'Ieraksts dzests.',
-	'Item has been updated.' => 'Ieraksts atjaunots.',
-	'Item%s has been inserted.' => 'Ieraksti tika ievietoti.',
-	'Edit' => 'Rediģēt',
-	'Insert' => 'Ievietot',
-	'Save and insert next' => 'Saglabāt un ievietot nākamo',
-	'Delete' => 'Dzēst',
-	'Database' => 'Datubāze',
-	'Routines' => 'Procedūras un funkcijas',
-	'Indexes have been altered.' => 'Indeksi mainīti.',
-	'Indexes' => 'Indeksi',
-	'Alter indexes' => 'Izmainīt indeksus',
-	'Add next' => 'Pievienot vēl',
-	'Language' => 'Valoda',
-	'Select' => 'Izvēlēties',
-	'New item' => 'Jauns ieraksts',
-	'Search' => 'Meklēšana',
-	'Sort' => 'Kārtošana',
-	'descending' => 'dilstoši',
-	'Limit' => 'Limits',
-	'No rows.' => 'Nav rindu.',
-	'Action' => 'Darbība',
-	'edit' => 'rediģēt',
-	'Page' => 'Lapa',
-	'Query executed OK, %d row(s) affected.' => array('Pieprasījums pabeigts, izmainīts %d ieraksts.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.'),
-	'Error in query' => 'Kļūda pieprasījumā',
-	'Execute' => 'Izpidīt',
-	'Table' => 'Tabula',
-	'Foreign keys' => 'Ārejā atslēgas',
-	'Triggers' => 'Trigeri',
-	'View' => 'Skats',
-	'Unable to select the table' => 'Tabula nav pieejama',
-	'Invalid CSRF token. Send the form again.' => 'Nederīgs CSRF žetons. Nosūtiet formu vēl vienu reizi.',
-	'Comment' => 'Komentārs',
-	'Default values' => 'Noklusētā vērtība',
-	'%d byte(s)' => array('%d baits', '%d baiti', '%d baiti'),
-	'No commands to execute.' => 'Nav izpildāmu komandu.',
-	'Unable to upload a file.' => 'Neizdevās ielādēt failu uz servera.',
-	'File upload' => 'Augšupielāde',
-	'File uploads are disabled.' => 'Augšupielādes aizliegtas.',
-	'Routine has been called, %d row(s) affected.' => array('Procedūra izsaukta, izmainīts %d ieraksts.', 'Procedūra izsaukta, izmainīti %d ieraksti.', 'Procedūra izsaukta, izmainīti %d ieraksti.'),
-	'Call' => 'Izsaukt',
-	'No extension' => 'Nav paplašinājuma',
-	'None of the supported PHP extensions (%s) are available.' => 'Neviens PHP no atbalstītajiem paplašinājumiem (%s) nav pieejams.',
-	'Session support must be enabled.' => 'Sesiju atbalstam jābūt ieslēgtam.',
-	'Session expired, please login again.' => 'Sesijas laiks ir beidzies, piesakies no jauna sistēmā.',
-	'Text length' => 'Teksta garums',
-	'Foreign key has been dropped.' => 'Ārejā atslēga dzēsta.',
-	'Foreign key has been altered.' => 'Ārejā atslēga izmainīta.',
-	'Foreign key has been created.' => 'Ārejā atslēga izveidota.',
-	'Foreign key' => 'Ārejā atslēga',
-	'Target table' => 'Mērķa tabula',
-	'Change' => 'Mainīt',
-	'Source' => 'Avots',
-	'Target' => 'Mērķis',
-	'Add column' => 'Pievienot lauku',
-	'Alter' => 'Izmainīt',
-	'Add foreign key' => 'Pievienot ārējo atslēgu',
-	'ON DELETE' => 'Pie dzēšanas',
-	'ON UPDATE' => 'Pie atjaunošanas',
-	'Index Type' => 'Indeksa tips',
-	'Column (length)' => 'Lauks (garums)',
-	'View has been dropped.' => 'Skats dzēsts.',
-	'View has been altered.' => 'Skats izmainīts.',
-	'View has been created.' => 'Skats izveidots.',
-	'Alter view' => 'Izmainīt skatu',
-	'Create view' => 'Izveidot skatu',
-	'Name' => 'Nosaukums',
-	'Process list' => 'Procesu saraksts',
-	'%d process(es) have been killed.' => array('Pabeigts %d process.', 'Pabeigti %d procesi.', 'Pabeigti %d procesi.'),
-	'Kill' => 'Nobeigt',
-	'Parameter name' => 'Parametra nosaukums',
-	'Database schema' => 'Datubāzes shēma',
-	'Create procedure' => 'Izveidot procedūru',
-	'Create function' => 'Izveidot funkciju',
-	'Routine has been dropped.' => 'Procedūru dzēsta.',
-	'Routine has been altered.' => 'Procedūru izmainīta.',
-	'Routine has been created.' => 'Procedūru izveidota.',
-	'Alter function' => 'Mainīt funkciju',
-	'Alter procedure' => 'Mainīt procedūru',
-	'Return type' => 'Atgriezt tips',
-	'Add trigger' => 'Pievienot trigeri',
-	'Trigger has been dropped.' => 'Trigeris dzēsts.',
-	'Trigger has been altered.' => 'Trigeris izmainīts.',
-	'Trigger has been created.' => 'Trigeris izveidots.',
-	'Alter trigger' => 'Izmainīt trigeri',
-	'Create trigger' => 'Izveidot trigeri',
-	'Time' => 'Laiks',
-	'Event' => 'Notikums',
-	'%s version: %s through PHP extension %s' => 'Versija %s: %s ar PHP paplašinājumu %s',
-	'%d row(s)' => array('%d rinda', '%d rindas', '%d rindu'),
-	'Remove' => 'Noņemt',
-	'Are you sure?' => 'Vai Tu esi pārliecināts?',
-	'Privileges' => 'Tiesības',
-	'Create user' => 'Izveidot lietotāju',
-	'User has been dropped.' => 'Lietotājs dzests.',
-	'User has been altered.' => 'Lietotājs izmainīts.',
-	'User has been created.' => 'Lietotājs izveidots.',
-	'Hashed' => 'Sajaukts',
-	'Column' => 'Lauks',
-	'Routine' => 'Procedūra',
-	'Grant' => 'Atļaut',
-	'Revoke' => 'Aizliegt',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST metodes pieprasījums apjoms par lielu. Atsūtiet mazāka apjoma pieprasījumu kā konfigurācijas %s.',
-	'Logged as: %s' => 'Ielogojies kā: %s',
-	'Move up' => 'Pārvietot uz augšu',
-	'Move down' => 'Pārvietot uz leju',
-	'Functions' => 'Funkcijas',
-	'Aggregation' => 'Agregācija',
-	'Export' => 'Eksports',
-	'Output' => 'Izejas dati',
-	'open' => 'atvērt',
-	'save' => 'saglabāt',
-	'Format' => 'Formāts',
-	'Tables' => 'Tabulas',
-	'Data' => 'Dati',
-	'Event has been dropped.' => 'Notikums dzēsts.',
-	'Event has been altered.' => 'Notikums izmainīts.',
-	'Event has been created.' => 'Notikums izveidots.',
-	'Alter event' => 'Izmainīt notikumu',
-	'Create event' => 'Izveidot notikumu',
-	'At given time' => 'Norāditā laikā',
-	'Every' => 'Katru',
-	'Events' => 'Notikumi',
-	'Schedule' => 'Grafiks',
-	'Start' => 'Sākums',
-	'End' => 'Beigas',
-	'Status' => 'Statuss',
-	'On completion preserve' => 'Beigās saglabāt',
-	'Tables and views' => 'Tabulas un skati',
-	'Data Length' => 'Datu apjoms',
-	'Index Length' => 'Indeksu izmērs',
-	'Data Free' => 'Brīvā vieta',
-	'Collation' => 'Kolācija',
-	'Analyze' => 'Analizēt',
-	'Optimize' => 'Optimizēt',
-	'Check' => 'Pārbaudīt',
-	'Repair' => 'Salabot',
-	'Truncate' => 'Iztīrīt',
-	'Tables have been truncated.' => 'Tabulas iztīrītas.',
-	'Rows' => 'Rindas',
-	',' => ' ',
-	'0123456789' => '0123456789',
-	'Tables have been moved.' => 'Tabulas pārvietotas.',
-	'Move to other database' => 'Pārvietot uz citu datubāzi',
-	'Move' => 'Pārvietot',
-	'Engine' => 'Dzinējs',
-	'Save and continue edit' => 'Saglabāt un turpināt rediģēt',
-	'original' => 'oriģināls',
-	'%d item(s) have been affected.' => array('Izmainīts %d ieraksts.', 'Izmainīti %d ieraksti.', 'Izmainīti %d ieraksti.'),
-	'Whole result' => 'Viss rezultāts',
-	'Tables have been dropped.' => 'Tabulas dzēstas.',
-	'Clone' => 'Klonēt',
-	'Partition by' => 'Sadalīt pēc',
-	'Partitions' => 'Partīcijas',
-	'Partition name' => 'Partīcijas nosaukums',
-	'Values' => 'Vērtības',
-	'%d row(s) have been imported.' => array('Importēta %d rinda.', 'Importētas %d rindas.', 'Importētas %d rindas.'),
-	'Import' => 'Imports',
-	'Stop on error' => 'Astāties kļūdas gadījumā',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sasniegts maksimālais lauku skaita ierobežojums. Palieliniet %s.',
-	'anywhere' => 'jebkurā vietā',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$5.$3.$1',
-	'[yyyy]-mm-dd' => 'dd.mm.[gggg]',
-	'History' => 'Vēsture',
-	'Variables' => 'Mainīgie',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lauku tipiem jābūt vienādiem, rezultējošā laukā jābut indeksa datiem.',
-	'Relations' => 'Relācijas',
-	'Run file' => 'Izpildīt failu',
-	'Clear' => 'Notīrīt',
-	'Maximum allowed file size is %sB.' => 'Faila maksimālais izmērs — %sB.',
-	'Numbers' => 'Skaitļi',
-	'Date and time' => 'Datums un laiks',
-	'Strings' => 'Virknes',
-	'Binary' => 'Binārie',
-	'Lists' => 'Saraksti',
-	'Editor' => 'Redaktors',
-	'E-mail' => 'Epasts',
-	'From' => 'No',
-	'Subject' => 'Tēma',
-	'Send' => 'Sūtīt',
-	'%d e-mail(s) have been sent.' => array('Nosūtīts %d epasts.', 'Nosūtīti %d epasti.', 'Nosūtīti %d epasti.'),
-	'Webserver file %s' => 'Fails %s uz servera',
-	'File does not exist.' => 'Fails neeksistē.',
-	'%d in total' => 'Kopā %d',
-	'Permanent login' => 'Atcerēties mani',
-	'Databases have been dropped.' => 'Datubāzes dzēstas.',
-	'Search data in tables' => 'Meklēt tabulās',
-	'Schema' => 'Shēma',
-	'Alter schema' => 'Izmainīt shēmu',
-	'Create schema' => 'Jauna shēma',
-	'Schema has been dropped.' => 'Shēma dzēsta.',
-	'Schema has been created.' => 'Izveidota jauna shēma.',
-	'Schema has been altered.' => 'Shēma izmainīta.',
-	'Sequences' => 'Virknes',
-	'Create sequence' => 'Izveidot virkni',
-	'Alter sequence' => 'Izmainīt virkni',
-	'Sequence has been dropped.' => 'Virkne dzēsta.',
-	'Sequence has been created.' => 'Izveidota virkne.',
-	'Sequence has been altered.' => 'Virkne izmainīta.',
-	'User types' => 'Lietotāju tipi',
-	'Create type' => 'Izveidot tipu',
-	'Alter type' => 'Izmainīt tipu',
-	'Type has been dropped.' => 'Tips dzēsts.',
-	'Type has been created.' => 'Tips izveidots.',
-	'Ctrl+click on a value to modify it.' => 'Lai izmainītu vērtību, izmanto Ctrl + peles klikšķi.',
-	'Use edit link to modify this value.' => 'Izmainīt vērtību var tikai ar saiti "Izmainīt".',
-	'last' => 'pēdējā',
-	'From server' => 'No servera',
-	'System' => 'Sistēma',
-	'Select data' => 'Izvēlēties datus',
-	'Show structure' => 'Parādīt struktūru',
-	'empty' => 'tukšs',
-	'Network' => 'Tīkls',
-	'Geometry' => 'Ģeometrija',
-	'File exists.' => 'Fails eksistē.',
-	'Attachments' => 'Pielikumi',
-	'%d query(s) executed OK.' => array('%d pieprasījums veiksmīgs.', '%d pieprasījumi veiksmīgi.', '%d pieprasījumi veiksmīgi.'),
-	'Show only errors' => 'Rādīt tikai kļūdas',
-	'Refresh' => 'Atjaunot',
-	'Invalid schema.' => 'Nederīga shēma.',
-	'Please use one of the extensions %s.' => 'Izmainojiet kādu no paplašinājumiem %s.',
-	'now' => 'tagad',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => 'Tabulas nokopētas.',
-	'Copy' => 'kopēt',
-	'Permanent link' => 'Pastāvīga saite',
-	'Edit all' => 'Rediģēt visus',
-	'HH:MM:SS' => 'HH:MM:SS',
-	'Tables have been optimized.' => 'Tabulas optimizētas.',
-	'Materialized view' => 'Matrializēts skats',
-	'Vacuum' => 'Vakums',
-	'Selected' => 'Izvēlētie',
-	'File must be in UTF-8 encoding.' => 'Failam jābūt UTF-8 kodējumam.',
-	'Modify' => 'Izmainīt',
-	'Loading' => 'Ielāde',
-	'Load more data' => 'Ielādēt vēl datus',
-	'ATTACH queries are not supported.' => 'ATTACH-pieprasījumi nav atbalstīti.',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Rindu limits',
-	'Default value' => 'Noklusētā vērtība',
-	'Full table scan' => 'Pilna tabulas analīze',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtes.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.'),
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-parole nav derīga. <a href="https://www.adminer.org/en/extension/"%s>Implementējiet</a> metodi %s, lai padarīgu šo par ierastu metodi.',
-	'If you did not send this request from Adminer then close this page.' => 'Ja nesūtījāt šo pieprasījumu no Adminer, tad aizveriet pārlūka logu.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Varat ielādēt lielu SQL failu uz servera un tad importēt to.',
-	'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.',
-	'Saving' => 'Saglabāšana',
-	'yes' => 'jā',
-	'no' => 'nē',
-	'Drop %s?' => 'Dzēst %s?',
-	'overwrite' => 'pārrakstīt',
-	'DB' => 'DB',
-	'Warnings' => 'Brīdinājumi',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer neatbalsta pieeju bez paroles, <a href="https://www.adminer.org/en/password/"%s>vairāk informācijas šeit</a>.',
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Paldies, ka izmantoji Adminer, vai vēlies veikt <a href="https://www.adminer.org/en/donation/">ziedojumu</a>.',
-	'The action will be performed after successful login with the same credentials.' => 'Darbība tiks pabeigta pēc derīgas pieteikšanās sistēmā.',
-	'Connecting to privileged ports is not allowed.' => 'Pieeja priviliģētiem portiem nav atļauta.',
-	'There is a space in the input password which might be the cause.' => 'Parole satur atstarpi, kas varētu būt lieka.',
-	'Unknown error.' => 'Nezināma kļūda.',
-	'Database does not support password.' => 'Datubāze neatbalsta paroli.',
-
-	'Disable %s or enable %s or %s extensions.' => null,
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Jā',
-	'No' => 'Nē',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
-);

adminer/lang/ms.inc.php

@@ -11,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',
@@ -337,22 +337,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,8 +1,8 @@
 <?php
 $translations = array(
-	'Login' => 'Aanmelden',
-	'Logout successful.' => 'Successvol afgemeld.',
-	'Invalid server or credentials.' => null,
+	'Login' => 'Inloggen',
+	'Logout successful.' => 'Uitloggen geslaagd.',
+	'Invalid credentials.' => 'Ongeldige logingegevens.',
 	'Server' => 'Server',
 	'Username' => 'Gebruikersnaam',
 	'Password' => 'Wachtwoord',
@@ -31,7 +31,7 @@ $translations = array(
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
-	'Logout' => 'Afmelden',
+	'Logout' => 'Uitloggen',
 	'database' => 'database',
 	'Use' => 'Gebruik',
 	'No tables.' => 'Geen tabellen.',
@@ -41,7 +41,7 @@ $translations = array(
 	'Item%s has been inserted.' => 'Item%s toegevoegd.',
 	'Edit' => 'Bewerk',
 	'Insert' => 'Toevoegen',
-	'Save and insert next' => 'Opslaan en volgende toevoegen',
+	'Save and insert next' => 'Opslaan, daarna toevoegen',
 	'Delete' => 'Verwijderen',
 	'Database' => 'Database',
 	'Routines' => 'Procedures',
@@ -60,7 +60,7 @@ $translations = array(
 	'Action' => 'Acties',
 	'edit' => 'bewerk',
 	'Page' => 'Pagina',
-	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij aangepast.', 'Query uitgevoerd, %d rijen aangepast.'),
+	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen beïnvloed.'),
 	'Error in query' => 'Fout in query',
 	'Execute' => 'Uitvoeren',
 	'Table' => 'Tabel',
@@ -81,7 +81,7 @@ $translations = array(
 	'No extension' => 'Geen extensie',
 	'None of the supported PHP extensions (%s) are available.' => 'Geen geldige PHP extensies beschikbaar (%s).',
 	'Session support must be enabled.' => 'Sessies moeten geactiveerd zijn.',
-	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw aan te melden.',
+	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw in te loggen.',
 	'Text length' => 'Tekst lengte',
 	'Foreign key has been dropped.' => 'Foreign key verwijderd.',
 	'Foreign key has been altered.' => 'Foreign key aangepast.',
@@ -265,49 +265,4 @@ $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',
-	'Vacuum' => 'Vacuum',
-	'Selected' => 'Geselecteerd',
-	'overwrite' => 'overschrijven',
-	'DB' => 'DB',
-	'File must be in UTF-8 encoding.' => 'Het bestand moet met UTF-8 encodering zijn opgeslagen.',
-	'Modify' => 'Aanpassen',
-	'Load more data' => 'Meer data inladen',
-	'Loading' => 'Aan het laden',
-	'ATTACH queries are not supported.' => 'ATTACH queries worden niet ondersteund',
-	'Warnings' => 'Waarschuwingen',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Rijen beperken',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ondersteunt geen toegang tot databases zonder wachtwoord, <a href="https://www.adminer.org/en/password/"%s>meer informatie</a>.',
-	'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.',
-	'There is a space in the input password which might be the cause.' => 'Er staat een spatie in het wachtwoord, wat misschien de oorzaak is.',
-	'If you did not send this request from Adminer then close this page.' => 'Als u deze actie niet via Adminer hebt gedaan, gelieve deze pagina dan te sluiten.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'U kan een groot SQL-bestand uploaden via FTP en het importeren via de server.',
-	'Size' => 'Grootte',
-	'Compute' => 'Bereken',
-	'You are offline.' => 'U bent offline.',
-	'You have no privileges to update this table.' => 'U bent niet gemachtigd om deze tabel aan te passen.',
-	'Saving' => 'Opslaan',
-	'Unknown error.' => 'Onbekende fout',
-	'Database does not support password.' => 'Database ondersteunt het wachtwoord niet.',
-	'Disable %s or enable %s or %s extensions.' => 'Schakel %s uit or schakel extensies %s of %s in.',
-	'yes' => 'ja',
-	'no' => 'neen',
-
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => 'Ja',
-	'No' => 'Neen',
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/no.inc.php

@@ -9,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.',
@@ -279,35 +279,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

@@ -11,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',
@@ -337,22 +337,4 @@ $translations = array(
 	'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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -260,54 +260,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -260,54 +260,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -265,49 +265,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
 	'Server' => 'Сервер',
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
@@ -287,8 +287,8 @@ $translations = array(
 	'You are offline.' => 'Вы не выполнили вход.',
 	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
 	'Saving' => 'Сохранение',
-	'yes' => 'да',
-	'no' => 'нет',
+	'yes' => 'Да',
+	'no' => 'Нет',
 	'Drop %s?' => 'Удалить %s?',
 	'overwrite' => 'перезаписать',
 	'DB' => 'DB',
@@ -300,14 +300,4 @@ $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

@@ -2,7 +2,7 @@
 $translations = array(
 	'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',
@@ -70,7 +70,7 @@ $translations = array(
 	'Unable to select the table' => 'Tabuľku sa nepodarilo vypísať',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
-	'Default values' => 'Predvolené hodnoty',
+	'Default values' => 'Východzie hodnoty',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtov'),
 	'No commands to execute.' => 'Žiadne príkazy na vykonanie.',
 	'Unable to upload a file.' => 'Súbor sa nepodarilo nahrať.',
@@ -94,8 +94,8 @@ $translations = array(
 	'Add column' => 'Pridať stĺpec',
 	'Alter' => 'Zmeniť',
 	'Add foreign key' => 'Pridať cudzí kľúč',
-	'ON DELETE' => 'Pri zmazaní',
-	'ON UPDATE' => 'Pri aktualizácii',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Typ indexu',
 	'Column (length)' => 'Stĺpec (dĺžka)',
 	'View has been dropped.' => 'Pohľad bol odstránený.',
@@ -265,47 +265,4 @@ $translations = array(
 	'Permanent link' => 'Permanentný odkaz',
 	'Edit all' => 'Upraviť všetko',
 	'HH:MM:SS' => 'HH:MM:SS',
-	'Drop %s?' => 'Odstrániť %s?',
-	'Tables have been optimized.' => 'Tabuľky boli optimalizované.',
-	'Materialized view' => 'Materializovaný pohľad',
-	'Vacuum' => 'Vyčistiť',
-	'Selected' => 'Označené',
-	'overwrite' => 'prepísať',
-	'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',
-	'Loading' => 'Nahráva sa',
-	'ATTACH queries are not supported.' => 'Dotazy ATTACH nie sú podporované.',
-	'Warnings' => 'Varovania',
-	'%d / ' => '%d / ',
-	'Limit rows' => 'Limit riadkov',
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje prístup k databáze bez hesla, <a href="https://www.adminer.org/cs/password/"%s>viac informácií</a>.',
-	'Default value' => 'Predvolená hodnota',
-	'Full table scan' => 'Prechod celej tabuľky',
-	'Too many unsuccessful logins, try again in %d minute(s).' => array('Príliš veľa pokusov o prihlásenie, skúste to znova za %d minutu.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minuty.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minút.'),
-	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Vďaka za používanie Admineru, <a href="https://www.adminer.org/cs/donation/">prispejte</a> na vývoj.',
-	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Platnosť hlavného hesla vypršala. <a href="https://www.adminer.org/cs/extension/"%s>Implementujte</a> metodu %s, aby platilo natrvalo.',
-	'The action will be performed after successful login with the same credentials.' => 'Akcia sa vykoná po úspešnom prihlásení s rovnakými prihlasovacími údajmi.',
-	'Connecting to privileged ports is not allowed.' => 'Pripojenie k privilegovaným portom nie je povolené.',
-	'There is a space in the input password which might be the cause.' =>  'V zadanom hesle je medzera, ktorá môže byť príčinou.',
-	'If you did not send this request from Adminer then close this page.' => 'Pokiaľ ste tento požiadavok neodoslali z Adminera, zatvorte túto stránku.',
-	'You can upload a big SQL file via FTP and import it from server.' => 'Veľký SQL soubor môžete nahrať pomocou FTP a importovať ho zo servera.',
-	'Size' => 'Veľkosť',
-	'Compute' => 'Spočítať',
-	'You are offline.' => 'Ste offline.',
-	'You have no privileges to update this table.' => 'Nemáte oprávnenie na aktualizáciu tejto tabuľky.',
-	'Saving' => 'Ukladá sa',
-	'Unknown error.' => 'Neznáma chyba.',
-	'Database does not support password.' => 'Databáza nepodporuje heslo.',
-	'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

@@ -10,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',
@@ -304,52 +304,4 @@ $translations = array(
 	'Type has been dropped.' => 'Tip je zavržen.',
 	'Type has been created.' => 'Tip je ustvarjen.',
 	'Alter type' => 'Spremeni tip',
-
-	'Drop %s?' => null,
-	'Tables have been optimized.' => null,
-	'Materialized view' => null,
-	'Vacuum' => null,
-	'Selected' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'Permanent link' => null,
-	'File must be in UTF-8 encoding.' => null,
-	'Modify' => null,
-	'Load more data' => null,
-	'Loading' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Edit all' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'Full table scan' => null,
-	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
-	'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

@@ -10,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' => 'Без додатака',
@@ -316,43 +316,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

@@ -11,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.',
@@ -346,12 +346,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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'ச‌ரியான‌ விப‌ர‌ங்க‌ள் இல்லை.',
 	'Server' => 'வ‌ழ‌ங்கி (Server)',
 	'Username' => 'ப‌ய‌னாள‌ர் (User)',
 	'Password' => 'க‌ட‌வுச்சொல்',
@@ -264,50 +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,
-	'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

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
-	'Invalid server or credentials.' => null,
+	'Invalid credentials.' => 'ข้อมูลไม่ถูกต้อง.',
 	'Server' => 'เซอเวอร์',
 	'Username' => 'ชื่อผู้ใช้งาน',
 	'Password' => 'รหัสผ่าน',
@@ -265,49 +265,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

@@ -11,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',
@@ -340,19 +340,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

@@ -10,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' => 'Нема розширень',
@@ -343,16 +343,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

@@ -10,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ữ',
@@ -325,33 +325,4 @@ $translations = array(
 	'Type has been dropped.' => 'Đã xoá kiểu.',
 	'Type has been created.' => 'Đã tạo kiểu.',
 	'Alter type' => 'Sửa kiểu dữ liệu',
-
-	'Drop %s?' => null,
-	'Materialized view' => null,
-	'overwrite' => null,
-	'DB' => null,
-	'ATTACH queries are not supported.' => null,
-	'Warnings' => null,
-	'%d / ' => array(),
-	'Limit rows' => null,
-	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
-	'Default value' => null,
-	'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

@@ -11,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.',
@@ -346,13 +346,4 @@ $translations = array(
 	'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

@@ -11,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.' => '資料庫不支援密碼。',
@@ -346,13 +346,4 @@ $translations = array(
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
 	'Alter type' => '修改類型',
-
-	// Plugins
-	'Columns' => null,
-	'Nullable' => null,
-	'Default' => null,
-	'Yes' => null,
-	'No' => null,
-	'One Time Password' => null,
-	'Invalid OTP code.' => null,
 );

adminer/lang/zh.inc.php

@@ -11,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.' => '数据库不支持密码。',
@@ -346,12 +346,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/script.inc.php

@@ -12,7 +12,7 @@ if ($_GET["script"] == "db") {
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = format_number($table_status[$key]);
-					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
 						? "~ $val"
 						: $val
 					));

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,16 +224,14 @@ if (is_ajax()) {
 
 $set = null;
 if (isset($rights["insert"]) || !support("table")) {
-	$params = [];
+	$set = "";
 	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
+		if ($foreign_keys[$val["col"]] && count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
+			|| (!$val["op"] && !preg_match('~[_%]~', $val["val"])) // LIKE in Editor
 		)) {
-			$params["set" . "[" . bracket_escape($val["col"]) . "]"] = $val["val"];
+			$set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]);
 		}
 	}
-
-	$set = $params ? "&" . http_build_query($params) : "";
 }
 $adminer->selectLinks($table_status, $set);
 
@@ -255,8 +245,8 @@ if (!$columns && support("table")) {
 	echo '<input type="hidden" name="select" value="' . h($TABLE) . '">';
 	echo "</div>\n";
 	$adminer->selectColumnsPrint($select, $columns);
-	$adminer->selectSearchPrint($where, $search_columns, $indexes);
-	$adminer->selectOrderPrint($order, $order_columns, $indexes);
+	$adminer->selectSearchPrint($where, $columns, $indexes);
+	$adminer->selectOrderPrint($order, $columns, $indexes);
 	$adminer->selectLimitPrint($limit);
 	$adminer->selectLengthPrint($text_length);
 	$adminer->selectActionPrint($indexes);
@@ -341,20 +331,12 @@ if (!$columns && support("table")) {
 						$column = idf_escape($key);
 						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
 						$desc = "&desc%5B0%5D=1";
-						$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 apply_sql_function($val["fun"], $name); //! columns looking like functions
-						if ($sortable) {
-							echo "</a>";
-						}
+						echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
 						echo "<span class='column hidden'>";
-						if ($sortable) {
 						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
-						}
-						if (!$val["fun"] && isset($field["privileges"]["where"])) {
+						if (!$val["fun"]) {
 							echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
 							echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");
 						}
@@ -570,9 +552,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";
 				}
@@ -588,7 +570,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,25 +21,19 @@ if (!$error && $_POST) {
 	if (!isset($_GET["import"])) {
 		$query = $_POST["query"];
 	} elseif ($_POST["webfile"]) {
-		$import_file_path = $adminer->importServerPath();
-		if (!$import_file_path) {
-			$fp = false;
-		} elseif (file_exists($import_file_path)) {
-			$fp = fopen($import_file_path, "rb");
-		} elseif (file_exists("$import_file_path.gz")) {
-			$fp = fopen("compress.zlib://$import_file_path.gz", "rb");
-		} else {
-			$fp = false;
-		}
-
-		$query = $fp ? fread($fp, 1e6) : false;
+		$sql_file_path = $adminer->importServerPath();
+		$fp = @fopen((file_exists($sql_file_path)
+			? $sql_file_path
+			: "compress.zlib://$sql_file_path.gz"
+		), "rb");
+		$query = ($fp ? fread($fp, 1e6) : false);
 	} else {
 		$query = get_file("sql_file", true);
 	}
 
 	if (is_string($query)) { // get_file() returns error as number, fread() as false
-		if (function_exists('memory_get_usage') && ($memory_limit = ini_bytes("memory_limit")) != "-1") {
-			@ini_set("memory_limit", max($memory_limit, 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
+		if (function_exists('memory_get_usage')) {
+			@ini_set("memory_limit", max(ini_bytes("memory_limit"), 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
 		}
 
 		if ($query != "" && strlen($query) < 1e6) { // don't add big queries
@@ -87,27 +81,13 @@ if (!$error && $_POST) {
 					$offset = $pos + strlen($found);
 
 					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 = '(';
-						if ($found == '/*') {
-							$pattern .= '\*/';
-						} elseif ($found == '[') {
-							$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('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
 							$s = $match[0][0];
 							if (!$s && $fp && !feof($fp)) {
 								$query .= fread($fp, 1e5);
 							} else {
 								$offset = $match[0][1] + strlen($s);
-								if (!isset($s[0]) || $s[0] != "\\") {
+								if ($s[0] != "\\") {
 									break;
 								}
 							}
@@ -143,7 +123,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;
@@ -189,8 +169,7 @@ if (!$error && $_POST) {
 											stop_session();
 										}
 										if (!$_POST["only_errors"]) {
-											$title = isset($connection->info) ? "title='" . h($connection->info) . "'" : "";
-											echo "<p class='message' $title>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
+											echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
 										}
 									}
 									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
@@ -255,10 +234,10 @@ if (!isset($_GET["import"])) {
 		: lang('File uploads are disabled.')
 	);
 	echo "</div></fieldset>\n";
-	$import_file_path = $adminer->importServerPath();
-	if ($import_file_path) {
+	$importServerPath = $adminer->importServerPath();
+	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

@@ -19,19 +19,15 @@ 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: 110%/1.25 monospace; }
-pre.jush { background: #fff; }
-input, textarea { box-sizing: border-box; }
-input, select { vertical-align: middle; }
+pre, textarea { font: 100%/1.25 monospace; }
+input { vertical-align: middle; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
 input.wayoff { left: -1000px; position: absolute; }
-.center { text-align: center; }
 .block { display: block; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
@@ -73,7 +69,7 @@ input.wayoff { left: -1000px; position: absolute; }
 #menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
 #logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
-#logins, #tables { white-space: nowrap; overflow: hidden; }
+#logins, #tables { white-space: nowrap; overflow: auto; }
 #logins a, #tables a, #tables span { background: #fff; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
@@ -94,7 +90,7 @@ input.wayoff { left: -1000px; position: absolute; }
 .rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 
-@media all and (max-width: 880px) {
+@media all and (max-device-width: 880px) {
 	.pages { left: auto; }
 	#menu { position: static; width: auto; }
 	#content { margin-left: 10px; }

adminer/static/editing.js

@@ -54,7 +54,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];
 		}
 	}
@@ -103,13 +103,8 @@ var dbPrevious = {};
 * @this HTMLSelectElement
 */
 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;
-
 	dbCtrl = isCtrl(event);
-	if (dbPrevious[this.name] === undefined) {
+	if (dbPrevious[this.name] == undefined) {
 		dbPrevious[this.name] = this.value;
 	}
 }
@@ -123,7 +118,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;
 	}
@@ -150,23 +145,23 @@ function selectFieldChange() {
 		for (var i=0; i < selects.length; i++) {
 			var select = selects[i];
 			var col = selectValue(select);
-			var match = /^(where.+)col]/.exec(select.name);
+			var match = /^(where.+)col\]/.exec(select.name);
 			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;
 				}
 			}
-			if ((match = /^(columns.+)fun]/.exec(select.name))) {
+			if ((match = /^(columns.+)fun\]/.exec(select.name))) {
 				if (/^(avg|count|count distinct|group_concat|max|min|sum)$/.test(col)) {
 					group = true;
 				}
 				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 +194,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
@@ -260,7 +255,7 @@ function editingClick(event) {
 		} 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';
@@ -278,7 +273,7 @@ function editingClick(event) {
 */
 function editingInput(event) {
 	var el = getTarget(event);
-	if (/\[default]$/.test(el.name)) {
+	if (/\[default\]$/.test(el.name)) {
 		 el.previousSibling.checked = true;
 	}
 }
@@ -295,7 +290,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;
@@ -305,7 +300,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;
 				}
@@ -340,7 +335,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;
 		}
@@ -402,7 +397,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))
@@ -411,19 +406,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));
 		}
 	}
@@ -462,13 +457,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
@@ -536,7 +531,7 @@ function dumpClick(event) {
 	var el = parentTag(getTarget(event), 'label');
 	if (el) {
 		el = qs('input', el);
-		var match = /(.+)\[]$/.exec(el.name);
+		var match = /(.+)\[\]$/.exec(el.name);
 		if (match) {
 			checkboxClick.call(el, event);
 			formUncheck('check-' + match[1]);
@@ -554,7 +549,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(/\]/, '1$&');
 		selects[i].selectedIndex = 0;
 	}
 	parentTag(this, 'table').appendChild(row);
@@ -590,7 +585,7 @@ function indexesChangeColumn(prefix) {
 	for (var tag in { 'select': 1, 'input': 1 }) {
 		var columns = qsa(tag, parentTag(this, 'td'));
 		for (var i=0; i < columns.length; i++) {
-			if (/\[columns]/.test(columns[i].name)) {
+			if (/\[columns\]/.test(columns[i].name)) {
 				var value = selectValue(columns[i]);
 				if (value) {
 					names.push(value);
@@ -598,7 +593,7 @@ function indexesChangeColumn(prefix) {
 			}
 		}
 	}
-	this.form[this.name.replace(/].*/, '][name]')].value = prefix + names.join('_');
+	this.form[this.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
 }
 
 /** Add column for index
@@ -607,9 +602,9 @@ function indexesChangeColumn(prefix) {
 */
 function indexesAddColumn(prefix) {
 	var field = this;
-	var select = field.form[field.name.replace(/].*/, '][type]')];
+	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();
@@ -618,15 +613,15 @@ function indexesAddColumn(prefix) {
 	var selects = qsa('select', column);
 	for (var i = 0; i < selects.length; i++) {
 		select = selects[i];
-		select.name = select.name.replace(/]\[\d+/, '$&1');
+		select.name = select.name.replace(/\]\[\d+/, '$&1');
 		select.selectedIndex = 0;
 	}
 	field.onchange = partial(indexesChangeColumn, prefix);
 	var inputs = qsa('input', column);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
-		input.name = input.name.replace(/]\[\d+/, '$&1');
-		if (input.type !== 'checkbox') {
+		input.name = input.name.replace(/\]\[\d+/, '$&1');
+		if (input.type != 'checkbox') {
 			input.value = '';
 		}
 	}
@@ -675,7 +670,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;
@@ -692,12 +687,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';
@@ -709,7 +704,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';
 					}
@@ -757,7 +752,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;
@@ -776,7 +771,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

@@ -4,7 +4,7 @@
 * @param [HTMLElement] defaults to document
 * @return HTMLElement
 */
-function qs(selector, context = null) {
+function qs(selector, context) {
 	return (context || document).querySelector(selector);
 }
 
@@ -13,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];
 }
@@ -23,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);
 }
 
@@ -79,7 +79,7 @@ function alterClass(el, className, enable) {
 */
 function toggle(id) {
 	var el = qs('#' + id);
-	el.className = (el.className === 'hidden' ? '' : 'hidden');
+	el.className = (el.className == 'hidden' ? '' : 'hidden');
 	return false;
 }
 
@@ -111,7 +111,7 @@ function verifyVersion(current, url, token) {
 	if (window.postMessage && window.addEventListener) {
 		iframe.style.display = 'none';
 		addEventListener('message', function (event) {
-			if (event.origin === 'https://www.adminer.org') {
+			if (event.origin == 'https://www.adminer.org') {
 				var match = /version=(.+)/.exec(event.data);
 				if (match) {
 					cookie('adminer_version=' + match[1], 1);
@@ -139,7 +139,7 @@ function selectValue(select) {
 /** Verify if element has a specified tag name
 * @param HTMLElement
 * @param string regular expression
-* @return boolean
+* @return bool
 */
 function isTag(el, tag) {
 	var re = new RegExp('^(' + tag + ')$', 'i');
@@ -181,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') {
-				input.disabled = (count === '0');
+			if (input.type == 'submit') {
+				input.disabled = (count == '0');
 			}
 		}
 	}
@@ -211,21 +211,13 @@ function tableCheck() {
 	}
 }
 
-/**
- * Uncheck single element.
- */
+/** Uncheck single element
+* @param string
+*/
 function formUncheck(id) {
-	formUncheckAll("#" + id);
-}
-
-/**
- * Uncheck elements matched by selector.
- */
-function formUncheckAll(selector) {
-	for (const element of qsa(selector)) {
-		element.checked = false;
-		trCheck(element);
-	}
+	var el = qs('#' + id);
+	el.checked = false;
+	trCheck(el);
 }
 
 /** Get number of checked elements matching given name
@@ -260,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);
@@ -276,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');
 	}
@@ -296,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;
@@ -341,7 +333,7 @@ function setHtml(id, html) {
 */
 function nodePosition(el) {
 	var pos = 0;
-	while ((el = el.previousSibling)) {
+	while (el = el.previousSibling) {
 		pos++;
 	}
 	return pos;
@@ -353,7 +345,7 @@ 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) : '');
 	}
 }
 
@@ -374,7 +366,7 @@ function menuOver(event) {
 * @this HTMLElement
 */
 function menuOut() {
-	this.style.overflow = 'hidden';
+	this.style.overflow = 'auto';
 }
 
 
@@ -396,7 +388,7 @@ function selectAddRow() {
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
 		inputs[i].className = '';
-		if (inputs[i].type === 'checkbox') {
+		if (inputs[i].type == 'checkbox') {
 			inputs[i].checked = false;
 		} else {
 			inputs[i].value = '';
@@ -410,7 +402,7 @@ function selectAddRow() {
 * @this HTMLInputElement
 */
 function selectSearchKeydown(event) {
-	if (event.keyCode === 13 || event.keyCode === 10) {
+	if (event.keyCode == 13 || event.keyCode == 10) {
 		this.onsearch = function () {
 		};
 	}
@@ -453,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();
 	}
@@ -495,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();
@@ -516,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
@@ -532,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();
@@ -622,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 {
@@ -664,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));
 			}
 		}
@@ -711,18 +703,14 @@ 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;
 		}
 	};
-
-	let pos = event.rangeOffset;
-	let value = (td.firstChild && td.firstChild.alt) || td.textContent || td.innerText;
-	const tdStyle = window.getComputedStyle(td, null);
-
-	input.style.width = Math.max(td.clientWidth - parseFloat(tdStyle.paddingLeft) - parseFloat(tdStyle.paddingRight), 20) + 'px';
-
+	var pos = event.rangeOffset;
+	var value = (td.firstChild && td.firstChild.alt) || td.textContent || td.innerText;
+	input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
 	if (text) {
 		var rows = 1;
 		value.replace(/\n/g, function () {
@@ -745,7 +733,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;
@@ -867,7 +855,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;
 		}
 	}

adminer/table.inc.php

@@ -7,19 +7,9 @@ if (!$fields) {
 $table_status = table_status1($TABLE, true);
 $name = $adminer->tableName($table_status);
 
-$rights = [];
-foreach ($fields as $key => $field) {
-	$rights += $field["privileges"];
-}
-
 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);
-
+$adminer->selectLinks($table_status);
 $comment = $table_status["Comment"];
 if ($comment != "") {
 	echo "<p class='nowrap'>" . lang('Comment') . ": " . h($comment) . "\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(true, $grant, $match[2], $match[1], $new_user)
+					!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
+					|| !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;
 	}
-
-	if ($grants) {
-		$grants[".*"] = [];
-	} elseif (DB != "") {
-		$grants[idf_escape(addcslashes(DB, "%_\\")) . ".*"] = [];
-	} else {
-		$grants["*.* "] = []; // Space is added to force editing mode.
-	}
+	$grants[(DB == "" || $grants ? "" : idf_escape(addcslashes(DB, "%_\\"))) . ".*"] = array();
 }
 
 ?>
@@ -149,79 +142,41 @@ if ($_POST) {
 <?php
 //! MAX_* limits, REQUIRE
 echo "<table cellspacing='0'>\n";
-
-echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level")) . "</th>";
+echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level"));
 $i = 0;
 foreach ($grants as $object => $grant) {
-	echo "<th>";
-	//! 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>";
+	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
 	$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() . ">";
-		if ($desc) {
-			echo "<td>$desc</td>";
-		}
-		echo "<td" . (!$desc ? " colspan='2'" : "") . ' lang="en" title="' . h($comment) . '">' . h($privilege) . "</td>";
-
+		echo "<tr" . odd() . "><td" . ($desc ? ">$desc<td" : " colspan='2'") . ' lang="en" title="' . h($comment) . '">' . h($privilege);
 		$i = 0;
-
 		foreach ($grants as $object => $grant) {
 			$name = "'grants[$i][" . h(strtoupper($privilege)) . "]'";
 			$value = $grant[strtoupper($privilege)];
-
-			$proxiedUser = strpos($object, "@") !== false;
-			$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>";
+			if ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*")) {
+				echo "<td>";
 			} elseif (isset($_GET["grant"])) {
-				echo "<td><select name=$name>" .
-					"<option></option>" .
-					"<option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "</option>" .
-					"<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</option>" .
-					"</select></td>";
+				echo "<td><select name=$name><option><option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</select>";
 			} else {
-				echo "<td class='center'><label class='block'>";
-				echo "<input type='checkbox' name=$name value='1'" .
-					($value ? " checked" : "") .
-					($allPrivileges ? " id='grants-$i-all'" : (!$grantOption ? " class='grants-$i'" : "")) .
-					">";
-
-				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 "<td align='center'><label class='block'>";
+				echo "<input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges"
+					? " id='grants-$i-all'>" //! uncheck all except grant if all is checked
+					: ">" . ($privilege == "Grant option" ? "" : script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };")));
 				echo "</label>";
 			}
-
 			$i++;
 		}
-
-		echo "</tr>";
 	}
 }
 

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

changes.txt

@@ -1,78 +1,8 @@
-Adminer 4.9.4 (released 2024-10-09):
-- Fix the width of inline edit field.
-- Unify displaying of 'New item' action based on privileges.
-- Better default value for object definition (*.*) while creating new database user.
-- Firefox: Fix opening a database to the new browser's tab with Ctrl+click.
-- Remove suppressing errors while reading local files.
-- More secure random strings on PHP 7+.
-- Editor: Fix array conversion to string (issue #3).
-- Editor: Fix building links with array parameters.
-- Clean up the code for PHP < 5.6.
-
-Adminer 4.9.3 (released 2024-10-02):
-- MySQL, PostgreSQL: Fix queries splitting and string constants.
-- MySQL: Fix where clause for JSON column.
-- MySQL: Fix editing user's proxy privilege, refactoring.
-- MariaDB: Fix comparing CURRENT_TIMESTAMP definition while altering a table.
-- PostgreSQL: Fix editing record that contains a field with GENERATED ALWAYS default value.
-- Fix using undefined Min_DB::info property.
-- Do not include unchanged PARTITION BY definition into ALTER TABLE query.
-- Do not limit unlimited memory while executing queries.
-- Fix number conversion warning while reading INI settings.
-- Hide invalid edit form if table record is not found.
-- CSS: Fix background color of <pre> used as edit field.
-- CSS: Bigger font size for code blocks.
-
-Adminer 4.9.2 (released 2024-09-18):
-- Fix textarea height for single-line inputs (used typically for SQLite text field).
-- Fix undefined property in error message if driver does not support error number (e.g. PostgreSQL).
-- PostgreSQL: Fix search fields configuration (regression from 4.9).
-- PostgreSQL: Fix search condition for network address types, add macaddr8 type.
-- PostgreSQL: Fix exporting CREATE TABLE query with GENERATED default values.
-- PostgreSQL: Fix exporting CREATE TABLE query with sequence default value.
-- PostgreSQL: Allow to set connection's sslmode with AdminerLoginSsl plugin.
-- MySQL: Do not show 'empty' enum value in strict mode.
-- Editor: Fix searching in tables.
-- Function to retrieve driver name that can be used in plugins.
-
-Adminer 4.9.1 (released 2024-09-09):
-- Compatibility with PHP 8.3.
-- Fix compiling jush external files.
-- Improved displaying of long table names in menu.
-- Replace deprecated <acronym> with <abbr>.
-- Add support for translations in plugins.
-- Add .editorconfig file.
-- MySQL: Add unix_timestamp to functions.
-- PostgreSQL: Show only accessible databases.
-- PostgreSQL: Make data length calculation more accurate.
-- PostgreSQL: Fix documentation link for SERIAL type.
-- PostgreSQL: Fix undefined properties on PHP 8.
-- Elasticsearch: Fix field selection.
-- AdminerEditForeign: Refactor and fix the plugin.
-- AdminerLoginOtp: Autocomplete hints for OTP input field, code refactoring.
-
-Adminer 4.9 (released 2024-08-19):
-- Validate server input in login form.
-- Validate connection to server in HTTP based drivers.
-- Move dependencies from submodules to Composer.
-- Update hydra and pepa-lintha-dark themes.
-- Elasticsearch 5: Make unusable driver usable again, move it to plugins.
-- Add new Elasticsearch 7 driver.
-- Set saving to file as a default export option.
-- Improve URL and email detection.
-- Fix AdminerVersionNoverify plugin blocking other plugins to modify HTML head.
-- Fix several bugs and security issues in AdminerFileUpload plugin.
-- Skip dump of generated columns.
-- Update composer.json.
-- Add script for exporting compiled adminer variants.
-
-Adminer 4.8.2 (released 2024-03-16):
+Adminer 4.8.2-dev:
 Support multi-line table comments
 MySQL: Use ST_SRID() instead of SRID() for MySQL 8 (PR #418)
 PostgreSQL: Don't reset table comments (regression from 4.2.0)
 PostgreSQL PDO: Allow editing rows identified by boolean column (PR #380)
-Update several translations: lv, bn, fr, it, nl, ru, cs, sk
-Allow responsive styles on larger devices
 
 Adminer 4.8.1 (released 2021-05-14):
 Internet Explorer or PDO in Adminer 4.7.8-4.8.0: Fix XSS in doc_link (bug #797)

compile.php

@@ -7,7 +7,7 @@ function adminer_errors($errno, $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__) . "/externals/JsShrink/jsShrink.php";
 
 function add_apo_slashes($s) {
 	return addcslashes($s, "\\'");
@@ -418,7 +418,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 +427,8 @@ if ($driver) {
 	//! strip doc_link() definition
 }
 if ($project == "editor") {
-	$file = preg_replace('~;\.\./vendor/vrana/jush/jush\.css~', '', $file);
-	$file = preg_replace('~compile_file\(\'\.\./(vendor/vrana/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
+	$file = preg_replace('~;.\.\/externals/jush/jush\.css~', '', $file);
+	$file = preg_replace('~compile_file\(\'\.\./(externals/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
 }
 $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 $file = preg_replace_callback('~\b(include|require) "([^"]*\$LANG.inc.php)";~', 'put_file_lang', $file);
@@ -440,18 +440,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 = str_replace('<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">' . "\n", "", $file);
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
+$file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
-$replace = '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 = "temp/export/$project" . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
+$filename = $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"
     }
-    ]
 }

designs/hever/adminer.css

@@ -18,7 +18,7 @@ a[href$="&dump="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgA
 a[href*="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDQPlDJUDwAAAiNJREFUOMutk0tI1FEUh7//Y9TJghyc1KQ20lMthRAlgoKgVkWte6wid0EICUHUQjdBErRqHYmQghgU5KLQGB8FKVEMCi0G1JmRbPLJ/O89p8XYOAMZBB24HM5dfL/fOfdcB6Aj1j6kqm2qWv/o5NMk/xBOR6z9dVVpzbmQEyKxPMcBc5svbheHs91YK1hRjJWCY7FGsSKT3VcPtviquqaqVJVVY6xlZu0hYpRrpyJ/Vb7fN3sMwAG4965Hw+ElKrzdlPphPqTHaYw0EdiAQEwuW4MRg7GGzrYu7j6L8/hGg+MD7DNXmF7tpDpSg6MOYpWbzbe2VV/dMATGAuADTLt3UFEmU+OICCpK72hqW8CFExGymwAAnrya15X1QJ+PJFVVtW90QQvjRay4TmfW9XrPpOYdBFYQVXwP+mMpPM9lYCyF44K7KTI4kQJVQj4cqd1BNihowVpBAd9zuNQSZXAizcWWPXmH/WPJonp27ifGCEUOVMB34eXHNJ6Xy5C7+w3xHRDg6N4ylEKAEVSVkAfnm6MMTy1y9nhlXvHNpzSthyrYFfYBiCcylJf6WwAjOZrnOgxPLQLks+tAIDDydSkPrIuWYG2BA2NMbgYunGms5O3nRU43bDkYGEtzuTWar+OJDN5ma1szUKVh/07mv69TVxXm28JK/i/U15YQT2SKdkFEpeAV9P2D3pmmrJXywFgCY7FGCKxgrPnjMv1Y3hjif8QvwdlGGi2XXTgAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
 a[href$="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDMETKEbQAAAAjZJREFUOMuVkjFoU2EUhc//3gsvptFCIdRHh2CrQ1AcmsUYHTKJDkJrFUdx6uJkpuLspCI4xaJLNik4SMGlOKgEdekQ0EEwFhJqCw+a16RJ//+/x0Heo6XN4B0v537nHLgKAKqNxXckSyTPPyu//IP/GFVtLL6f9INrKZXC791f3UvDysPP3tryjcHt7yTPkRQRaZL8KSKvRGRtbm7OxgCPZJ8kJtOnYaw99ZUfl8UQ5XK5kMlkQBI7OzuzURTNbmxs3Nne3v60srJyd2FhoQ0AztPLtflOv/22tdtCVo3hwvhFUATZbBaO48B1XUxMTCCfz6NUKmF6evqKtfZxnMABgOdXl+c7vTZ87wQUFcRyZOepqSmIyPWkAgA8+HCfFMG3rS8QEVCIvb09pFIpkES/30cYhmi325iZmYGI4BDgReW1Wl1d3apUKrler4coitBqtUASxhh0u10Mh0N4ngeSRwEAQBIk4bou0uk0PM+D53nQWsMYA/JfLRGBtfYoQEQSx/hIKQVrbbJzHGd0ghgQHxhj4LourLXQWkNrDdd1E81IQCy21iaAOEFcU2t9PEBEEvcYeDBZrNvf38ehPwAAay3CMEQul4Pv+4f/XSkEQYBisYhOpzMywb1Go/GmUCiM5fN5+L4PpRRIIggCRFGEZrOJ9fX1TWPMzQR+0Kler58RkUcicstxnPFMJgNjDMIwxGAw2DTG1K21T5aWlraOBRycWq120hhz1hgjWusf1Wp1eJzuL3uxkTGLHB98AAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
 
-@media all and (min-width: 881px) {
+@media all and (min-device-width: 881px) {
   #menu .links {height:22px; transition:.2s;}
   #menu .links:hover {height:5em;}
   #menu .links a {color:transparent; transition:.2s; display:block; margin-bottom:-1.25em;}

designs/lucas-sandery/adminer.css

@@ -708,7 +708,7 @@ input[type="file"]:disabled::-moz-file-upload-button {
 	margin-left: 0;
 }
 
-@media all and (max-width: 880px) {
+@media all and (max-device-width: 880px) {
 	body {
 		padding-bottom: 2em;
 	}

designs/mvt/adminer.css

@@ -374,7 +374,7 @@ thead td, thead th {
 	padding: 7px 2px;
 }
 
-thead td abbr, thead td sup, thead th acronym, thead th sup {
+thead td acronym, thead td sup, thead th acronym, thead th sup {
 	color: #cdf
 }
 

designs/nicu/adminer.css

@@ -368,7 +368,7 @@ td.nowrap {
     right: 0;
     left: auto;
 }
-@media all and (max-width: 880px) {
+@media all and (max-device-width:880px) {
     .pages {
         left: auto;
     }

designs/pappu687/adminer.css

@@ -136,7 +136,7 @@ thead th, thead td {
 	color:#FFFFFF;	
 	padding-right:10px;
 }
-thead th abbr, thead td acronym, thead th sup, thead td sup{
+thead th acronym, thead td acronym, thead th sup, thead td sup{
 	color:#CCDDFF;
 }
 

designs/zerocloud/zerocloud.css

@@ -0,0 +1,152 @@
+/*
+@author: mariani
+@package: ZeroCloud Theme https://www.zerocloud.it
+*/
+
+/*
+blue: #2ba6cb
+*/
+h1{
+    background-color: #333; border-color: #666; color: #c9da29;
+
+    -webkit-box-shadow:inset 0 -7px 0 0 #c9da29;
+    -moz-box-shadow:inset 0 -7px 0 0 #c9da29;
+    box-shadow:inset 0 -7px 0 0 #c9da29;
+
+    border: 0!important;
+}
+
+table{ border-color: #666; }
+table thead tr td, table thead tr th,
+table thead tr.checked td, table thead tr.checked th{ background-color: #333!important; border-color: #666!important; color: #c9da29;}
+
+table thead td a:link, table thead th a:link,
+table thead td a:visited, table thead th a:visited,
+table thead td a:hover, table thead th a:hover,
+table thead td a:active, table thead th a:active
+{color: #fff;}
+
+.error {background:#FFEEEE url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIsSURBVDjLpVNLSJQBEP7+h6uu62vLVAJDW1KQTMrINQ1vPQzq1GOpa9EppGOHLh0kCEKL7JBEhVCHihAsESyJiE4FWShGRmauu7KYiv6Pma+DGoFrBQ7MzGFmPr5vmDFIYj1mr1WYfrHPovA9VVOqbC7e/1rS9ZlrAVDYHig5WB0oPtBI0TNrUiC5yhP9jeF4X8NPcWfopoY48XT39PjjXeF0vWkZqOjd7LJYrmGasHPCCJbHwhS9/F8M4s8baid764Xi0Ilfp5voorpJfn2wwx/r3l77TwZUvR+qajXVn8PnvocYfXYH6k2ioOaCpaIdf11ivDcayyiMVudsOYqFb60gARJYHG9DbqQFmSVNjaO3K2NpAeK90ZCqtgcrjkP9aUCXp0moetDFEeRXnYCKXhm+uTW0CkBFu4JlxzZkFlbASz4CQGQVBFeEwZm8geyiMuRVntzsL3oXV+YMkvjRsydC1U+lhwZsWXgHb+oWVAEzIwvzyVlk5igsi7DymmHlHsFQR50rjl+981Jy1Fw6Gu0ObTtnU+cgs28AKgDiy+Awpj5OACBAhZ/qh2HOo6i+NeA73jUAML4/qWux8mt6NjW1w599CS9xb0mSEqQBEDAtwqALUmBaG5FV3oYPnTHMjAwetlWksyByaukxQg2wQ9FlccaK/OXA3/uAEUDp3rNIDQ1ctSk6kHh1/jRFoaL4M4snEMeD73gQx4M4PsT1IZ5AfYH68tZY7zv/ApRMY9mnuVMvAAAAAElFTkSuQmCC") no-repeat scroll 0.8em center; padding-left:38px;}
+.message, #menu p.message {background:#EEFFEE url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKfSURBVDjLpZPrS1NhHMf9O3bOdmwDCWREIYKEUHsVJBI7mg3FvCxL09290jZj2EyLMnJexkgpLbPUanNOberU5taUMnHZUULMvelCtWF0sW/n7MVMEiN64AsPD8/n83uucQDi/id/DBT4Dolypw/qsz0pTMbj/WHpiDgsdSUyUmeiPt2+V7SrIM+bSss8ySGdR4abQQv6lrui6VxsRonrGCS9VEjSQ9E7CtiqdOZ4UuTqnBHO1X7YXl6Daa4yGq7vWO1D40wVDtj4kWQbn94myPGkCDPdSesczE2sCZShwl8CzcwZ6NiUs6n2nYX99T1cnKqA2EKui6+TwphA5k4yqMayopU5mANV3lNQTBdCMVUA9VQh3GuDMHiVcLCS3J4jSLhCGmKCjBEx0xlshjXYhApfMZRP5CyYD+UkG08+xt+4wLVQZA1tzxthm2tEfD3JxARH7QkbD1ZuozaggdZbxK5kAIsf5qGaKMTY2lAU/rH5HW3PLsEwUYy+YCcERmIjJpDcpzb6l7th9KtQ69fi09ePUej9l7cx2DJbD7UrG3r3afQHOyCo+V3QQzE35pvQvnAZukk5zL5qRL59jsKbPzdheXoBZc4saFhBS6AO7V4zqCpiawuptwQG+UAa7Ct3UT0hh9p9EnXT5Vh6t4C22QaUDh6HwnECOmcO7K+6kW49DKqS2DrEZCtfuI+9GrNHg4fMHVSO5kE7nAPVkAxKBxcOzsajpS4Yh4ohUPPWKTUh3PaQEptIOr6BiJjcZXCwktaAGfrRIpwblqOV3YKdhfXOIvBLeREWpnd8ynsaSJoyESFphwTtfjN6X1jRO2+FxWtCWksqBApeiFIR9K6fiTpPiigDoadqCEag5YUFKl6Yrciw0VOlhOivv/Ff8wtn0KzlebrUYwAAAABJRU5ErkJggg==") no-repeat scroll 0.8em center; padding-left:38px;}
+
+
+#dbs span, th a[href*="&db="]:not([href*="&select="]):not([href*="&table="]) {background:transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC") no-repeat scroll left bottom; padding-left:22px;}
+
+span.separator {display: none;}
+
+a[href$="&sql="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHGSURBVHjaxFPNLkNREP5aB6WhaKLSVtKFiIUqK1sLT2DhTXgDL2FlxSOw8FOLRiyQWhDRiKSEhKQJou49P9fMnFsLsevCJCcz594z3/m+mTmJKIrQjSXRpXUNoGqbm39qcMbAkbyIvbVwYQhD3tIeWsOQ1+QVH86Xyz+JXJPIOb9iAI4ZpOMd/yN/vb/vAdiC93cP0El2dNA6z4RjYyW2MaPU0BB0u+0BOGGsVML49LSA3J+cYDCblb0l6jeHBwg/26isrOB0a8uzYBlBgKShgD8M53J4aTTQqFaRSCYl+WxnG83zcxTmKpKg+vtFu9W8NDQDMCXW+VivYyAzjKmlJahUSpiYUKPVbCKTz0sCGzOyOpBLzdcXlCMdDDIxO4vboyoyhQIKlYocLi0uIjczIyBcA98dYqx9NywxUEyDi/P29IyF1VU5dFeroS+dRnF+Xvajk5N0ayjx8tq6+FuSyiwUF4LRHi/reLg4o9ijs6xG9RjWGowUi/h4fcXexoa0L4oc0mNZuVgFzID09VKBnFXoUb7Pnb5zQrvVovpkZC4QzwfiN6QM1eBqdxcmnq6IAA395Mlz8eTxTZwg/pcl/v01fgswAESqYZbsIsnLAAAAAElFTkSuQmCC") no-repeat scroll left bottom; padding-left:22px;}
+a[href*="&dump="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJrSURBVHjajFPPaxNREP72V8ymTbGQbRB/IT0otdV6CcWTgqCoUFQQEXoSEQ/+AypK755E1KsULIpGgw1F9KC22lgstFgQLdoWhSab2PRHTNrs7nvObGhSsRa/ZXjv7c6b+eabWUVKiX9AJQuRRci2k+260N91VwgJIQSEV1mVnjf5axTjvCfFFn7hCcBlBzJNVRA0gAZTQ1ODgXC4gDtjV9AW2QNFUTA0/Q66kPLSqVg4shYF8vEdKQ7mln+i+/VVRM0oFpbmETLq/SS6J4R/OfHtHmV24XouHFo94REDAyE9hMZgBMkvT2GZFqxQE6by0/g4P74SoKLB2ZZzWA8ffqRQLBcxNTuFjRTwxpmbfad7Oo/rHhdN6B20/6JvaKyBCnODhqNbL+PRxHXUGXWINV5kl9TDrkQct/pnZKHkyPsDGcl4MJiWq5Ecsf84LxTL8nbyK2+Pke3XHWJAQkLXgMdDNjRNRTxlQ6UmakRD0vN8NEd7EBsFO6Impu1fzGCCrOSXwCro5HEiZiExnEVnrKlaypNhG4fba02aTC8ik1/ibZrM9RlIkkGnjH0jWWJQWRn8TpLI8fcZ6MSA1WrZFERx2eHPTEPqjksBqASDLh7ZZ+HlWA6H9tYyvhjNomNnI8Km7p8/f5+HGdB46/lJeOoYPHV8mbGy8gA59HngU74asNkKYKVzlQCuW9GA6B5si+DVeA4HWmsM4qksTnZY1TMz0NRauysaUAmt2+oxM1tCM6k8mS74WXjIdm8O+JdWg36oKgXqgnzb3TvRXvZEneN6YPNIFw7MY70W5haXnlUHbp3f+b/wW4ABAAtWTLcKdqLcAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+a[href$="&dump="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHzSURBVHjajJPPS+NQEMcnaaxpdWsp6Q8vtWtdkIo9+B948SjIgruCUg8F/wGP/glePe5JcBehwl4qePGm0J6KQj30UBHEzaFLUromTfPizJMnrxhhB4bJvDfzme97SZQgCOB/be98J2AsAMYYMP81KjKg0WhMYljHtS30RSz4gjkGdot559F7OLt8vvi1bJRBURS4vr8CTTQ3m80SFv1MpVJlwzBA13XuNGUwGKyY1p+Vk9aPzWw8C7ZjQXximu+9ATA5KhQK5Uwmw+nCIpEIJBIJOLjah3Q8w7379x5urFsOUEUhTl/C6R+ef35mARzPhW6vC+q/iHvyvaYwXwIQje6j1+tBv98H13VhNBpxxyPA5tw2TI50MPQsrMbXbOo53fmtaJIC7iSZAMPhkOe+73MA5Ruz3yCfz9NlvykLBUSjUR41TQPP8zhE7JNSyj8E0CbJpkiXKRoIRFABeQcQd0DFwlVV5evUTFBZRSiATEwnp4lCAa0LI2AoQC4WimRl4qgyYOw12rYNyWSSX6L4mKiBnukDK5VKYJrmmBpZwW6r1TotFotTuVyOQwQgnU7zV9npdKDdbj+hgnXRN/Yz1ev1zwg6QP+KU2disRiXblkWOI7zhJOPce+wWq2aoQDZarXaJ2xYQGfod5VKxQ2rexFgAI4OiAKxKkWeAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+a[href*="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDQPlDJUDwAAAiNJREFUOMutk0tI1FEUh7//Y9TJghyc1KQ20lMthRAlgoKgVkWte6wid0EICUHUQjdBErRqHYmQghgU5KLQGB8FKVEMCi0G1JmRbPLJ/O89p8XYOAMZBB24HM5dfL/fOfdcB6Aj1j6kqm2qWv/o5NMk/xBOR6z9dVVpzbmQEyKxPMcBc5svbheHs91YK1hRjJWCY7FGsSKT3VcPtviquqaqVJVVY6xlZu0hYpRrpyJ/Vb7fN3sMwAG4965Hw+ElKrzdlPphPqTHaYw0EdiAQEwuW4MRg7GGzrYu7j6L8/hGg+MD7DNXmF7tpDpSg6MOYpWbzbe2VV/dMATGAuADTLt3UFEmU+OICCpK72hqW8CFExGymwAAnrya15X1QJ+PJFVVtW90QQvjRay4TmfW9XrPpOYdBFYQVXwP+mMpPM9lYCyF44K7KTI4kQJVQj4cqd1BNihowVpBAd9zuNQSZXAizcWWPXmH/WPJonp27ifGCEUOVMB34eXHNJ6Xy5C7+w3xHRDg6N4ylEKAEVSVkAfnm6MMTy1y9nhlXvHNpzSthyrYFfYBiCcylJf6WwAjOZrnOgxPLQLks+tAIDDydSkPrIuWYG2BA2NMbgYunGms5O3nRU43bDkYGEtzuTWar+OJDN5ma1szUKVh/07mv69TVxXm28JK/i/U15YQT2SKdkFEpeAV9P2D3pmmrJXywFgCY7FGCKxgrPnjMv1Y3hjif8QvwdlGGi2XXTgAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
+a[href$="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDMETKEbQAAAAjZJREFUOMuVkjFoU2EUhc//3gsvptFCIdRHh2CrQ1AcmsUYHTKJDkJrFUdx6uJkpuLspCI4xaJLNik4SMGlOKgEdekQ0EEwFhJqCw+a16RJ//+/x0Heo6XN4B0v537nHLgKAKqNxXckSyTPPyu//IP/GFVtLL6f9INrKZXC791f3UvDysPP3tryjcHt7yTPkRQRaZL8KSKvRGRtbm7OxgCPZJ8kJtOnYaw99ZUfl8UQ5XK5kMlkQBI7OzuzURTNbmxs3Nne3v60srJyd2FhoQ0AztPLtflOv/22tdtCVo3hwvhFUATZbBaO48B1XUxMTCCfz6NUKmF6evqKtfZxnMABgOdXl+c7vTZ87wQUFcRyZOepqSmIyPWkAgA8+HCfFMG3rS8QEVCIvb09pFIpkES/30cYhmi325iZmYGI4BDgReW1Wl1d3apUKrler4coitBqtUASxhh0u10Mh0N4ngeSRwEAQBIk4bou0uk0PM+D53nQWsMYA/JfLRGBtfYoQEQSx/hIKQVrbbJzHGd0ghgQHxhj4LourLXQWkNrDdd1E81IQCy21iaAOEFcU2t9PEBEEvcYeDBZrNvf38ehPwAAay3CMEQul4Pv+4f/XSkEQYBisYhOpzMywb1Go/GmUCiM5fN5+L4PpRRIIggCRFGEZrOJ9fX1TWPMzQR+0Kler58RkUcicstxnPFMJgNjDMIwxGAw2DTG1K21T5aWlraOBRycWq120hhz1hgjWusf1Wp1eJzuL3uxkTGLHB98AAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+
+a:link,
+a:visited,
+a:active
+{
+    color: blue;
+}
+a:hover {
+    color: blue !important;
+}
+
+a.edit-all{
+    background: #fff;
+}
+
+/*
+@media all and (min-device-width: 881px) {
+    #menu .links {height:22px; transition:.2s;}
+    #menu .links:hover {height:5em;}
+    #menu .links a {color:transparent; transition:.2s; display:block; margin-bottom:-1.25em;}
+    #menu .links > a + a {margin-left:22px;}
+    #menu .links > a + a + a {margin-left:44px;}
+    #menu .links > a + a + a + a {margin-left:66px;}
+    #menu .links:hover a {color:blue; margin:0;}
+    #menu .links a:hover {color:red;}
+}
+
+*/
+
+
+#menu h1{
+    background-size: 9%;
+    background-position: top 16px left 18px;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABbmlDQ1BpY2MAACiRdZG9S0JRGMZ/amWU0VBDSIODRYOCWERj2eAiEWaQ1aLXr8CPy71KSGvQ0iA0RC19Df0HtQatBUFQBBGNzX0tIbf3ZKBEnsu574/nnOflnOeAPZLXCmZHAArFshENhzxL8WWP84Uu3HQTZCKhmfrM/HyEtuPzDpuqt37Vq/2+f0dvKm1qYOsWntR0oyw8LRxZL+uKt4UHtVwiJXwo7DPkgMJXSk82+FlxtsHvio1YdBbsqqcn28LJFtZyRkF4TNhbyFe03/Oom7jSxcUFqW6Zw5hECRPCQ5IKa+Qp45dalMz+9wV+fHOUxKPJX6eKIY4sOfH6RK1I17TUjOhp+fJUVe5/8zQz48FGd1cIOp8s620EnDtQr1nW15Fl1Y/B8QgXxaa/JDlNfYhea2reA+jfhLPLppbchfMtGHrQE0biR3LItGcy8HoKfXEYuIGelUZWv+uc3ENsQ57oGvb2YVT2969+A0VSaCp9B4rPAAAACXBIWXMAAAsSAAALEgHS3X78AAACxElEQVRYw7WXS4hPURzHz73+5TUrymthgUbMeIahaWI2ZmpkijxKeWwosmFDyWIQkmJlI4qdvBYeKWSQEmXhMbGgqTFhYqNpvPl+556j0+l37rn/6/jWZ6b7O/f+fr9z7++c8/snKqCHr6bZl4tAG2gCtWAsSMAP0Au6wB1wCbzkAw21Xbn+KyqsFKwGe0Bdjp+JmhZwELSCGyHnFWeGrurBKTBfVadrRYKb2fm0HjwqEfwz2Fz0Zt8n2AGOqnLaCd4KNVQDloAroQQ2BIL/Ap3gHngN+sEowEgjwUnPc6yLLWCpLtRBJU4NzNCvfajg4Cc4AQ6DHmMMVbn236ST5or5AGaC924NpLrgpOB8pY1gux28oEZov4m+HgOOS0W4DswTHHSDhZxMyZrYB6Y4tjXa598EmN0u4eEveuPpUeX1zGPfbRchs5ku3NSBb/xc/ZtOgxVgmWPn9TjzBlYKD34Ex1Qc7fXsQe0mgcXCDWfBQKQEnoD7gr051d+/Xhi8ruLqqmCrYwITwDBP1jH1VLBNSvXuJakvcgK90h6RWhvE/9Zv5anEfs8DoyMnMF6wDaT61XwTBmdFTkAq9DdMgKebtNm0RE6gVbC9MPvAXWGQx/LwSMF5FjQL9k6TwHlhkA3ntkgJdAjFzqK8aPoBDvJgn+oWicoajW6f5wL9QDv+XRaG2De2VaxsDqns4LDFjuddIEDecIPKtnRJB/jHbsnOqKzhmKuv2QFtxAy/lkxglcoakRphjJ/8gdkHjLgaNgET8Ah4XOJ781i/AM55gvfpiQ4qEWbAdpzNwhyVNSSuWJjLwU1dGzy2TVPKhrMxJ7nvKtCUGtHhJ8E+WWWHSpnlyeBrWfm2MXgOWAny3tsq6+2rFd8S+8Bb7kBahZOtJYPzh8hsKbi7CvI0RO+M1Ygd0H6sotzfiEUT4JJcoEr8PA/pD2HcmchgSlm1AAAAAElFTkSuQmCC');
+}
+#menu ul#tables a[href*="&select="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHISURBVDjLpVPNK0RRFP+9D98syMwUspHkm9I0YkFZWBFKkZ0s7a3Ewh+ilChK7FgoZCJFKYlYKB8zk2+Z5t0P577He29kQU7dd+6575zf+d1zztWklPiPmOozt/U4SThjXIoyIQS4AJjSXO0lGGlvcXAm6Vzsz4xUhm0AIeX4QLig+C+ZpxbOG1wGhGYHr1zMUmZGWRgs0ha3PE1nX/8mWmdgWTzLB+DUYbhm9FfZ35IEyrhXA3VXJfPbsV8B9LQUIeUHYJ8ASobag1jcucNgW8g9W4reYSDi2YnnZDoDiwCokDANct6NwTB0LEdj0HRA/wxa2SN25JNBEdWluUhZ366gqmAaGvrCAXKOozccTGPgt8+vn8GYSGcgyTYp3dpBnBg42nbQPRBTo5bTvqYkmxL6AQhNTWQGBXY3B7BxlEBXozcW64dxRKoKUZBju+P06gl5WaaviMJBM3TNDlbypemIZgHYOnlwASsCmW7nHADGnBoQ3c76YmweJ9BR5zFYjsbRHwm4tmJg6PhWA7pCXXk+bu7fURHKweXtq/sWaksz7SC/CCGFrwtyZ3r+rCnFRZ7qr1qc6mLZj4f9OEyPL8lVpbX/PucPv5QPKHB1TdEAAAAASUVORK5CYII=") no-repeat scroll right bottom; display:inline-block; vertical-align:middle; overflow:hidden; padding-left:16px; width:0;}
+/*
+#menu ul#tables a.active[href*="&select="] {border-left:2px solid #00f; margin-left:-4px; padding-left:18px;}
+*/
+#menu ul#tables{padding: 0;}
+
+.links a {margin-right:8px; display: block;}
+.links a[href*="&create="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJ6SURBVDjLpZNZSNRRGMV//2XGsjFrMg2z0so2K21xIFpepYUiAsGIICLffI8eWiBBeg3qQV+KwBYKLB8qpHUmrahcKLc0QsxldNSxdPz/79LD1ChBUXTh8sG93POdc75zDa01/7NsgGvPR09rzQmpVZZSCqlAKIWUCqk0QqoZWyKFRir1uvxIbsAGUFqXHQqkpP1L57M3Pm5MMJBKpQHUdF9BKIGQAlcJXOlOVykSdye3leO6MmkGQNyHw+uO/1X3bzGBK+S0B1IqAKqDg3986HeCZPffwvJtoNT7lOZLvUdtAPEDAKBkRzo3QwMUb89InN1uGGD3spdE214xe8MRUnM2MfppNW0Pqy7YAK5UKK2xLbhdP4hlmdxpGMQwwQT8ziNiI534c7cT6WrFazikzF2Eb8HS1IQEDdiWwcHAQmpehTkQSAcgNvSMiYFW5uUUMdV3HW+ywefGNqITJsbUUL75k4FWYJtQ+yaMZcXrk1ANk/33mbdiD7EvlRieETy+FJLkMFcjRRSW3emIAwiF1hqPBfu2LGSWbbA1uZ41SfWkrtxPrPcypsfFiWYzFGzGKTjFV28WEJeIUHETLdOgrmkI1VdHpCdEet5enP4qLK9mKrqMgedv6cyrAP+qxOTiUxAi7oEJi8frELoFoTLpa7nI/HQvscgSRt+0kV1SSW7qYtp7xrBMphm4Mi5h/VIfTcEq1u0oJaknSEdNiMYHET7UvcMpPEN31Ed7zxgASmk1I0g6dK66s8CRak5mVxjnfS05+TsZCw/T9baTx1nnGb47DrQksjE6HrsHYPz6nYt3+Sc3L8+wA2tz0J6pF5OD4WP7Kpq7f5fO79DfSxjdtCtDAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+.links a[href$="&create="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIpSURBVDjLpZNPSFRRFMZ/749/Kt3IqFTSRoSMmrGIYTTbpEJtjBCCok1Em9JVG1dRC8FFEES5aGFEgRRZWq1iLKKxBiNqLDcltQgmHR9hY6LOu+feFm+YGVsZXbh8nHO53/nud8+xjDH8z3IB7r5avGgMZ8XoBq01okFpjYhGtEGJLtmCKINo/XbgVFPUBdDG9PVEq0P/UvnSvdlwQYFoHQIY/3obpRVKFL5W+OIXUVThrL91AN+XihKCwIeTu85sqPryqsJXUvRARAMwkshsiKB7fw25UgKVJwA40V7H/cl5jh+oL+RGk/P0xIqxl11dr8AXjTYG14HRNxkcx+ZhMoNlg52/ND6VAWMoc6F5+2Zy/l9PMIDrWByL1jI+tcDRaN06BaXxbDqLUnq9AqPBteHpuwUcJ0AIcgBXH93h+/wEyyuLrPk5cmv7gNY8gdIYYyhz4PDeWuIpj85IsS2ujQ2zJAk6DkZpqGnixcwYyU+PifUOX7Eh6DoAx7aIpzwA4imPeMrj+bTH+88PaNkZQWwhsrULsXxie9oAzgcESgUe2NAZCeE6AXZGQhwKh/Cyc5RZVXQ39wFwoeMmjXVhgMqiB8awe0cVP36u0Fi/iW9zvwuzkF3+xUz6Nal0gv6uWww+O02lUwGwmv8FM3l55EtLTvQWXwm+EkRpfNEoUZRXHCE5PUFbuJ0nH4cot1wSH14C3LA2Os6x3m2DwDmgGlgChpLX0/1/AIu8MA7WsWBMAAAAAElFTkSuQmCC") no-repeat scroll left bottom; padding-left:22px;}
+.links #content a[href*="&database="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKRSURBVDjLhVNLTBNRFD3TTju1FCcBaxuaQEr94ydiZIHGpcFISBOi0YREZWHCVoyRxKUxxq0LXcACQyLsjO6KjSEiDfHDz0S0CLSxlFKd2g7MTDudGd+bMAQCxJucuXfuu+fcO/PeYwzDALVoNMqRuI3guq7rR4g/SEBC/Svxc8T3EUTD4bCGTcZQAUI+RvxLr9d70u/3o6KiAm63G3Qtn89DFEUkk0lks9lRkrvW3t6e2lCgRZFI5F0ikaDtjN1MVVVjYmLCGBoa6qccC7Z1kQafz4f/WSAQAGlyaXOOpQ+SNNUymQxcLhc4joPD4TBzkiRBEASkUimEQiGzdlcBlmWRy+WgKIr5Xi6XUSgUUCwWzTVN+IAzeOOde71orP0eAaOkbrDWf6Cw2+3mBLSYgny3KULXPOUY2BUB/hMd4IOn8XfhMGYjvU+2TECLLRLDMNA0zYw5JYa6Ghke/hyEn9/gZEqo3OuHp7qW3yJgESjoNPSdlb8gWCOCr29BMT0Ip5tBYnIWqlL6o8irzVsEaHcKSqQCen4cweok+FAblNRz2JxlODx1cEkzGWmVbTl7Z/jHhgCF1Z3GYjIKf+U8+ANhQn4Gm6OMUiGI9MhHg5Gl1sbu8UnKNc8B7Ui3ipxEcwvlpVFw6hz2N1xGabkXdqeBYqEOmfefEZWac4e6xz9Z22hbn+BmLBZbi8fjEBdG4NF/QdUDSM88hQ4FawKJR6cxLDZl86qzZdtdoDYwMBAkQg/2LL/ovNLVh++Dd7G0OAau9hTkrKgnnE39GW3f/Z6enpUdBSx7ePu4eq+zi4VNw+TbV0gsxFd5b9X5i4+mpnY63tsErl6okhvrfWzT0SAMR3FMXsnean08Pb/b/fgHqpjCspi90kkAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
+
+#content p a[href*="&create="] {padding-left:22px;}
+#content p a[href*="&select="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHISURBVDjLpVPNK0RRFP+9D98syMwUspHkm9I0YkFZWBFKkZ0s7a3Ewh+ilChK7FgoZCJFKYlYKB8zk2+Z5t0P577He29kQU7dd+6575zf+d1zztWklPiPmOozt/U4SThjXIoyIQS4AJjSXO0lGGlvcXAm6Vzsz4xUhm0AIeX4QLig+C+ZpxbOG1wGhGYHr1zMUmZGWRgs0ha3PE1nX/8mWmdgWTzLB+DUYbhm9FfZ35IEyrhXA3VXJfPbsV8B9LQUIeUHYJ8ASobag1jcucNgW8g9W4reYSDi2YnnZDoDiwCokDANct6NwTB0LEdj0HRA/wxa2SN25JNBEdWluUhZ366gqmAaGvrCAXKOozccTGPgt8+vn8GYSGcgyTYp3dpBnBg42nbQPRBTo5bTvqYkmxL6AQhNTWQGBXY3B7BxlEBXozcW64dxRKoKUZBju+P06gl5WaaviMJBM3TNDlbypemIZgHYOnlwASsCmW7nHADGnBoQ3c76YmweJ9BR5zFYjsbRHwm4tmJg6PhWA7pCXXk+bu7fURHKweXtq/sWaksz7SC/CCGFrwtyZ3r+rCnFRZ7qr1qc6mLZj4f9OEyPL8lVpbX/PucPv5QPKHB1TdEAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
+#content p a[href*="&page="] {background-image:none; padding-left:0;}
+#content p a[href$="&database="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIkSURBVDjLpVNNiFJRFP7eU1E0KSLTMpAwYSxyaidDtChm0WYQ3NSutv2s2kwwm2igNgMtooUQEQhhA9GqhSDTQsZZFDbNDBgVg5bSw9J8rzFF33udc+HGg0ladOHj3nPe+b7zc99VbNvG/yy30yiVSl4SnCNcsixrivYEgY7WJu0faX9EKGUyGVNyFFkBkY/T+WkoFEpFIhEEAgH4/X7w916vB8Mw0Gg00G63y+S7mM1mm4LIAYxisbhSr9c5nT1pjUYju1qt2oVC4YnkqbIUMk6Ew+F/9hyNRkFJLuyaATmFoqZp8Pl88Hq98Hg8wtfv99HpdNBsNhGPx0XsRAG3241ut4vBYCDs8XgMXdcxHA7FN/b9VUD25HK5RAUczKC+hYgcNpNN05xcAQdLkqIoIlj6VFWdXIEUkAQGV8M2k2vaG3z6sYGfVR39XzsHlm/dX3h5d31xlwAHM5goBd5+LuO75z3OnU3jyP4EVrZeKGub2p309cP7VKcAQ2Znoiz3deMVTk1Nw1RNTB+ahamMkD45w7RrfwSYwFdFf6K4Quf6pmvwKHswl7wh7Jvnc4gfTPHR52zhcqVSeZZMJgOxWEyI8BC5CmOnh63WKtZbZczPPsa94hX4XCLJQHG+xnw+f5SEFghZmvhefgvcTqn2HN3gBmZSZ5CInMaHr1Wsvivjy3ZvSZn0nHO5XJDIxwgWDbW2vL10m9xXCUGCQXi49qA1/xvyq6BCh7yZeQAAAABJRU5ErkJggg==") no-repeat scroll 2px bottom; padding-left:22px;}
+#content p a[href*="&edit="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlkoqCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94VTUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpKtE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0HglWNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1VMzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVPC4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnjahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQyu/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg==") no-repeat scroll 2px bottom; padding-left:22px;}
+#content p a[href*="&table="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJcSURBVDjLpZPtT5JhFMafrW997I9rscA+FFu2QRurtlw5cQ4InLpwBogIPNFSiNJ4C+JVkj0QTBHQKFPQlJfwlanY1tXz3ARkn2jd27Wz++yc33XOvd0UAOp/RNGR/X5zeH9rOlTDVKAK3fsqJrxlqN27GHPuYHh+G4rXRQzZNjEws47Hli/oo/PxNsAU3qvWT3/gX3TPuHrWBhiC30nSktXDtKLB1NI4NKkxqBMqjDByPFkcxNBCPwbCfXgUeEBq705m0AZM+qsk2e3hau88W+4ANOy+XPLFQrkrcbW31KkOYJx9rBaAOzPR0gVHW6x593q9cDgcqB6e4sZoogMYdXzD0ck5ZhfLsHGKVfAqVoadKcMdzcLr82PuwwZCoRACgQCWVzdhoK2gaVpDAMNzWzhkAXamQpze/I4t13w+j2AwiFwuh7W1NXg8HmQyGSgUCshkssuU3F7AQf0c84kK3n68KFc4hXQ6DavVCqlUCqVSSdaIx+NQq9UGMsHg7Ab2jxtwp5rOvqUqia3CUqnEObWn0mp1KBaLcLlckMvloPpfrhOAl230/SGLxQK3241CoQC9Xg9nskKk1emQzWZZkBZCoRBU3/NP2GMBgXTTObjSjI1GA8lkEgzDwO/3E4iObXY6nYhEIhCJRHoWcIW6b1pF7egMlYNT7NROUKzU8XX3GJ+3D2E0GgmAm4Zbh2s0mUyIRqMcAGKx+BIlMeSiYu1K/fbEMm4+TaFnJIHrSgZX5TFIZNPo7e1Fj9QOs9kMlUqFaw9pCASCnzwe7x15xG6/rUQiAZ/Px9/5XyhZOMVGKlOdAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+th a[href*="&table="]  {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHISURBVDjLpVPNK0RRFP+9D98syMwUspHkm9I0YkFZWBFKkZ0s7a3Ewh+ilChK7FgoZCJFKYlYKB8zk2+Z5t0P577He29kQU7dd+6575zf+d1zztWklPiPmOozt/U4SThjXIoyIQS4AJjSXO0lGGlvcXAm6Vzsz4xUhm0AIeX4QLig+C+ZpxbOG1wGhGYHr1zMUmZGWRgs0ha3PE1nX/8mWmdgWTzLB+DUYbhm9FfZ35IEyrhXA3VXJfPbsV8B9LQUIeUHYJ8ASobag1jcucNgW8g9W4reYSDi2YnnZDoDiwCokDANct6NwTB0LEdj0HRA/wxa2SN25JNBEdWluUhZ366gqmAaGvrCAXKOozccTGPgt8+vn8GYSGcgyTYp3dpBnBg42nbQPRBTo5bTvqYkmxL6AQhNTWQGBXY3B7BxlEBXozcW64dxRKoKUZBju+P06gl5WaaviMJBM3TNDlbypemIZgHYOnlwASsCmW7nHADGnBoQ3c76YmweJ9BR5zFYjsbRHwm4tmJg6PhWA7pCXXk+bu7fURHKweXtq/sWaksz7SC/CCGFrwtyZ3r+rCnFRZ7qr1qc6mLZj4f9OEyPL8lVpbX/PucPv5QPKHB1TdEAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
+
+#content p a[href*="&schema="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFOSURBVDjLtVK7SgNRED0b9iuM2lr4QK1DQIyk0FZsJAj+gH+ilRZb2NjaRHTLmA9QFKz9huzm7t37Hu+u7IJgQjR6YLjDzOXMmcMERIR5EE5qXA4z4sqACYWEC5wfLQXf/WtMIuDSoL0A7DZDjBj/uYI0l8jzEEJYJMkvCEZM4PqZIxlzpGk+kSCY18TGtGYcx9Tv96dOqBUMBgNyzsFaC621312Ac+59yJFlGRhj5VvVoigKvniglEK32w1mkd3r9ejPPAjOhqdknYX18p1/rzo3pYqTh0OSRkJI5UMgPn4s61sX66SkhtEGcISGsQad5gH2FvehfV5BaIF2cwet5RZyKeu68pe5ubKG7dUNP5AQGltMN57Mosgr5EIiVQmYGvtc1PVicqHY+dXpk8Dg7v22XKFo1ARe9v1bDOlXKKKCs4Sn1xdU1v3vIc2CD3bN4xJjfJWvAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+#content p a[href*="&privileges="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGnSURBVDjLxVM9T8JQFD2lBRQRFPAjEhIwXRgwEUjERRMnZPYXuPoHSJz8BQ7+BCcHJzZHiST4MWC0fsQBJUKCEQnGWihtfa/QBgK6MHiT2/tu3+1559x3y2iahlHMghFtZACuUqmkSdyiiaqqoJJo7HVFUQZi1w+Zcrnc9vl8LAXo7YexHhaNdaFQUDiSsFarFftXClriJz4eTqHJX7DMhDEbiiDlfALP80if1CFKLYjfxCUZR9s8ZcByvadG7w/QLl/guVRC8U2Etnutv5dlGXvr44S+3ZRFjcrgjEQvnFvG2pIfGzYOZ5c3KLCsWZjNZvual0wmOwD0oX/cVnFeXQDHfcDpcuGqtYJaTQKcHYBEImGebrDuY1AvPWImtIhjLoraSwtjHhvmv17Nwnw+/zcD/0QDt+9TUD1TmJ6zQWpImFTfyM64XhiLxdAr17h2E2Bnc9XcEEURzWaTFARM2na7HW63+3eAEul8tVqF1+tFMBiEw+EYmDpBEFAsFhEIBBCJRHQAhgyDQEDCFCgejzO5XE4bNn2Gp1IpJpPJaF05d8y//40/Nlww9OOVWvkAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
+
+#content p a[href*="&event="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJlSURBVDjLpZNbaM9hGMc/v8NsTqF2yMhZKIexmpFyRZIiblwouZDauLYoTVEryg2uXIoIOUU5zJkh4e9QDmtJbWxrbUzz/72/9/m6+P3HLslbT9/3ufm+n/f7Pm8gif9ZMcDxe717JLZ62UQzwxukZnhveBOptyHl8anwZk/3b5pZEwOYtGNDzejSfzm58dTH+b8JvFkpwMizdSCBT8E8OJftkzy4BPIOnONHQzPO+eIhBoM5CCrLwNKslBZM8uDykCbwtgMAl/o/GXhvBYMA2rtAlpGYZSR+UIGKCgCSggGSOHy1Q/0DTifufZUknbr/RZJ0+mHWn3mU9edbMu3qG9DmQ08lKSNw3jCJOIKzjzqJopBzLZ3EEVx40smDr/u4e96QGUXPGpkzYQSJywjCwSsIiKOADUvKiUNYX1tOUQhra8oJg4hZ02cQhhGrqyuyp03tTwbOGzKIQ7j8rIsn3Qd4fEVIIn6+kzAMaH35Fn37wbZD68gnCUl+EbAkI3CpIYmiCNZUlwEwbfIUgiBg1cIyJqbzGFPiWbl8GXUb66mqnkrJ2IvUbq88GEI2dQBRGHDjZTcAbZ8+ERDQnOvm+fszVM1egA89C8avwAeO2nlLAeqRxK7j79TzPa/mXJck6darTG8XdM3uhbry+piGrou5I1pcP17h7wwk5k4aRUfPANMrhtP2pZ8J44bx7nMfff29vGl/SNP1LQA0XdtCa2cO4GdhkPRg78kPVYm3kS71uNTjU8N5I/UpxSWracndZOn8ZVx6dZRhQcz9F3cAjgR/+51rt1c2AXXAaOA7cLTlcHvDL6y6kIpO9lqsAAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+#content p a[href$="&view="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFwohC2f85AAAAsxJREFUOMulk8tr3HUAxD+/1z5+u5smMYlmm6R1rTlEmrY0RKqtWMVWW6qtePBv8NaKUFGUgmBB9CJ48aIH8SKGBhGKKEIaPdgam0gTQ7Bm3U2zTbKPZrP7+32fHkqDx0LnNocZmGHGsdbyIHB5QPj/J8Vi8bDV8m0RtY5qGaeNMVijsdbiOF6cDDNXw47u8/l8/so9jXMvQqlU+lK0m6+LdjMRBAFCCBq1DYRU+L5P944OtIiRxtru/qHvhh7d8/K2QalUutysrx/zHEu5XGZl9TbWDUilsygDSimMbJGyEYVdAwB09g3MPTayb9RfXl7+RLTuHHOtYn5hkYHCCH5nAW0sUmmEVCiliIRisL8HWf8b0apj4qW9CvcL5+bSX6uNjcrD2gkYPTDG7zf+YWsrRinF9I8TWGt5Yvw4QioSgc+rx8e5uThPeWGGRrOt/Np6pa83v4ue3j4AlFBEsUDru+UBxEIihdwue7DwOKl0yPTlS77f0z9kMtmcp7XGdV2ymQRr1Qax1AwfeA6pNHEUEwvNYL4XYwxaa7Kd3QzsLlhnfm6mms11dOU6H8L3fep3WswuFFmrNu7ml4pYaKJwllv2Gk1RRciY8f7nGW7tEd7Zc28WNjcqB0W0heMFpNNJUgkPqRSbm1toY2lnZmj2/cYzB5/khf2naGf+ZerWNyyVVyqOtZbZ63/8EtVWDyV9j0xXby0Z5qJkmBGu5xuAcxOndr924kXHeA6nH3mPj+bO4OPy1beTkQ8wum//U9NXpi7drpRPhBtrXWEYkkikcIMEAGvNFQLTwUs7zwLw1t4JJosXgcnU9pSfPnzkla8//zRZbtRPR7E447ru0cB1soBTjdbTf1Z/4lrtB94d/Z4Pr58k5aYAIud+3jh2Ifhg53D4zpGRZxnuOsRi7VembvxMebH1sXO/dx67EFwE3gBywCbw2dX35fn/ANYEZmpcDQc/AAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
+
+#content p a[href*="&refresh="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAI/SURBVDjLjZPbS9NhHMYH+zNidtCSQrqwQtY5y2QtT2QGrTZf13TkoYFlzsWa/tzcoR3cSc2xYUlGJfzAaIRltY0N12H5I+jaOxG8De+evhtdOP1hu3hv3sPzPO/z4SsBIPnfuvG8cbBlWiEVO5OUItA0VS8oxi9EdhXo+6yV3V3UGHRvVXHNfNv6zRfNuBZVoiFcB/3LdnQ8U+Gk+bhPVKB3qUOuf6/muaQR/qwDkZ9BRFdCmMr5EPz6BN7lMYylLGgNNaKqt3K0SKDnQ7us690t3rNsxeyvaUz+8OJpzo/QNzd8WTtcaQ7WlBmPvxhx1V2Pg7oDziIBimwwf3qAGWESkVwQ7owNujk1ztvk+cg4NnAUTT4FrrjqUKHdF9jxBfXr1rgjaSk4OlMcLrnOrJ7latxbL1V2lgvlbG9MtMTrMw1r1PImtfyn1n5q47TlBLf90n5NmalMtUdKZoyQMkLKlIGLjMyYhFpmlz3nGEVmFJlRZNaf7pIaEndM24XIjCOzjX9mm2S2JsqdkMYIqbB1j5C6yWzVk7YRFTsGFu7l+4nveExIA9aMCcOJh6DIoMigyOh+o4UryRWQOtIjaJtoziM1FD0mpE4uZcTc72gBaUyYKEI6khgqINXO3saR7kM8IZUVCRDS0Ucf+xFbCReQhr97MZ51wpWxYnhpCD3zOrT4lTisr+AJqVx0Fiiyr4/vhP4VyyMFIUWNqRrV96vWKXKckBoIqWzXYcoPDrUslDJoopuEVEpIB0sR+AuErIiZ6OqMKAAAAABJRU5ErkJggg==") no-repeat scroll 2px bottom; padding-left:22px;}
+
+#content p a[href*="&sql="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJ5SURBVHjapFNLaxNRFP4mnZmQZtKYpJ2I8ZE0NSbSWKpgBYNUhIJQUDddCaILwb34C0RcCi60vpa14sZFoSjxUWxTFEubFkxf9kFS+7Jp0yQmM5mH905SF9pSwQt3vnPnnvPNd86cA13Xsds+23XKsdMdQx//s0z/6hi54he3e8/0d3ZuK0FTFGhUJkVVhSbLUAiq5IxSCQrBEkGWOu8Lh38HGrlpWnlXCKhNSbZQo3cEE9FomYAuKZstE2wFa8RR1cpKqK2o4JhxmLVJVAlh5Df6IFj5MgENcHq9EAMBg2RucBDVLpdxVon0iXdvIf8sQHRIsNReht3XjI3ZI8iuPAOrkDyorBq3G6vT08ikUuAsFiN46HkXXL56eI41QV1/BMF+GulvCfCMDFvNXtSIHrC0KDTPhXgc7lAQdQ2thk2XIpewnkzCJvTA4T8PabEbfDWD+ZFxyEUdX94sw6QVCkZlxWAQU+8/YGZgALV+v0HgbWmBNzQMR0M7it8fg+HWwQk2cLkkcvJh5NNFsCVJMgq1ubiE5o4OI5CS8FYrya8b9saLKC48gIlTIG/6sBaLw3PpHrTEMrSXr4kPIaAKFkbjSA0PEVuFlB+DO8Ah2HoB8tITVPE6iplDWOn7jLn0CSQevoDV6TI+zEpUASkkZzaTYrLIrH3C/qMCFEbE4th9OEQexfQBrPYP44d+DuY91eBp+1dGgFVIDb729kKpdJfQtIy2yFNMdN/E5McYzAebUEhOYjZuQXaj5+9W/nOYbl9vLN26doOFScVI9BXmZ6dy9jpnpO1O5dfsRtBxxlk4Xu9mT4Z80DkpVlhZvdp+d3RmpyH7JcAAnHiAVYWMsdkAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:24px;}
+
+table tbody input[name*="check"] {display:block; float:left;}
+
+table a[href*="&edit="][href*="&where"] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFUSURBVDjLrZM/SAJxGIZdWwuDlnCplkAEm1zkaIiGFFpyMIwGK5KGoK2lphDKkMDg3LLUSIJsSKhIi+684CokOtTiMizCGuzEU5K3vOEgKvtBDe/2Pc8H3x8NAM1fQlx4H9M3pcOWp6TXWmM8A7j0629v1nraiAVC0IrrwATKIgs5xyG5QiE+Z4iQdoeU2oAsnqCSO1NSTu+D9VhqRLD8nIB8F0Q2MgmJDyipCzjvYJkIfpN2UBLG8MpP4dxvQ3ZzGuyyBQ2H+AnOOCBd9aL6soh81A5hyYSGWyCFvxUcerqI4S+CvYVOFPMHxLAq8I3qdHVY5LbBhJzEsCrwutpRFBlUHy6wO2tEYtWAzLELPN2P03kjfj3luqDycV2F8AgefWbEnVqEHa2IznSD6BdsVDNStB0lfh0FPoQjdx8RrAqGzC0YprSgxzsUMOY2bf37N/6Ud1Vc9yYcH50CAAAAAElFTkSuQmCC") no-repeat scroll right bottom; padding-right:18px;}
+
+table input + a[href*="&edit="][href*="&where"] {width:0; float:left; display:block; overflow:hidden; text-decoration:none; padding:0 0 0 18px; background-position:2px bottom;}
+
+/*
+table thead a[href*="&modify=1"] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEKDjA70u7s9gAAAMZJREFUOMvtksFpwzAUhr9fcUsWyAQewWDIHt6iLrlriBDIBl4maARPYNH6VtAh2FEuCSQksUV77Qc66Ef63nvw5JyLTNA0DXme03UdVVU9PnDOxWEYJk9d109z733MrqLN/oAkiBEJEAjYfqwJIbzsMLu9vC9XoIgxJ94yEX6+meNOoAXACWPAmEsnqQIBx/CFgEGRo0DEdMHuc81vkPd+soy1lqIoaNsWa+2jYG4PkkYoy/IuHMcx6XPf9xj+yL8gYQ/mOAPpeHRKiIdANAAAAABJRU5ErkJggg==") no-repeat scroll right bottom; }
+table thead a[href*="&modify=1"] {width:0; display:inline-block; height:16px; overflow:hidden; text-decoration:none; padding:0 0 0 16px; vertical-align: middle;}
+*/
+table td:first-child {white-space:nowrap;}
+
+.sqlarea,
+fieldset, pre, input, textarea, select {
+    border-radius: 0;
+}
+input[type="image"]{
+    padding: 0;
+}
+
+input[name="delete"], input[name="drop"] {background:transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHSSURBVHjapFM5bsJQEB2zSIDFJrHYpEtyAyoKJAp6CrqIkBPkNDlBAKXjBEgUpKOBCyQNijFiEZvZl8z7wsjESYpkpNFfPO/Nmz9j6Xg80n/M9fWi3W7fMOnd4XAo8qogAbvO5xKvL6lU6s0aL1kVMDjP5ye/36+Gw2FyOp3EQFqtVtTr9WixWHT5/JhOp6s2ghP4ORaLyaFQiGazGa3Xa0HgdrvJ6/WSpmk0Go0MjnvIZDLVM0Gr1brm/WskEkkA3O/3abvdQjq5XC6xgoiVka7rNB6PNT6ns9nsu+OkpODxeBLBYJAGgwHt9/uzQ8Vms6Hdbie+KYqC+ASTFrARBMx2HwgEaDKZiHqn0yktl0uxtzrMMAyKx+MCc+4Cs13hwQCC1GQy+W3Lms2mUIUygbEqEBLNun8z8zswVgUfLO0WD4Z6kekn8/l8okNM8GFVUMYDoVWQ6HA4bEAzoyzL1O12kbRsJajwhYZhiUajJEnShWSAQaqqKnU6HahEGysXg9RoNPJ8+cwZZLSKp47m8/k5Kxzg4XBocNxDLper2ka5Xq+LUeatilahJLN1mEJ+ZDHKJthGAKvVauJnYi9ysHIqQee1xOsLg3/+mf5inwIMAJMhb74NwG5wAAAAAElFTkSuQmCC") no-repeat scroll left center; padding:1px 5px 1px 18px; border:0; cursor:pointer; font-size:.9em;}
+input[name="delete"]:hover, input[name="drop"]:hover {color:red; background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJdSURBVDjLpZP7S1NhGMf9W7YfogSJboSEUVCY8zJ31trcps6zTI9bLGJpjp1hmkGNxVz4Q6ildtXKXzJNbJRaRmrXoeWx8tJOTWptnrNryre5YCYuI3rh+8vL+/m8PA/PkwIg5X+y5mJWrxfOUBXm91QZM6UluUmthntHqplxUml2lciF6wrmdHriI0Wx3xw2hAediLwZRWRkCPzdDswaSvGqkGCfq8VEUsEyPF1O8Qu3O7A09RbRvjuIttsRbT6HHzebsDjcB4/JgFFlNv9MnkmsEszodIIY7Oaut2OJcSF68Qx8dgv8tmqEL1gQaaARtp5A+N4NzB0lMXxon/uxbI8gIYjB9HytGYuusfiPIQcN71kjgnW6VeFOkgh3XcHLvAwMSDPohOADdYQJdF1FtLMZPmslvhZJk2ahkgRvq4HHUoWHRDqTEDDl2mDkfheiDgt8pw340/EocuClCuFvboQzb0cwIZgki4KhzlaE6w0InipbVzBfqoK/qRH94i0rgokSFeO11iBkp8EdV8cfJo0yD75aE2ZNRvSJ0lZKcBXLaUYmQrCzDT6tDN5SyRqYlWeDLZAg0H4JQ+Jt6M3atNLE10VSwQsN4Z6r0CBwqzXesHmV+BeoyAUri8EyMfi2FowXS5dhd7doo2DVII0V5BAjigP89GEVAtda8b2ehodU4rNaAW+dGfzlFkyo89GTlcrHYCLpKD+V7yeeHNzLjkp24Uu1Ed6G8/F8qjqGRzlbl2H2dzjpMg1KdwsHxOlmJ7GTeZC/nesXbeZ6c9OYnuxUc3fmBuFft/Ff8xMd0s65SXIb/gAAAABJRU5ErkJggg==")}
+
+/*
+input[name="logout"] {background:transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJHSURBVDjLlZPNi81hFMc/z7137p1mTCFvNZfGSzLIWNjZKRvFRoqNhRCSYm8xS3+AxRRZ2JAFJWJHSQqTQkbEzYwIM+6Yid/znJfH4prLXShOnb6r8/nWOd8Tcs78bz0/f+KMu50y05nK/wy+uHDylbutqS5extvGcxaWqtoGDA8PZ3dnrs2srQc2Zko41UXLmLdyDW5OfvsUkUgbYGbU63UAQggdmvMzFmzZCgTi7CQmkZwdEaX0JwDgTnGbTCaE0G4zw80omhPI92lcEtkNkdgJCCHwJX7mZvNaB0A14SaYJlwTrpHsTkoFlV1nt2c3x5YYo1/vM9A/gKpxdfwyu/v3teCayKq4JEwT5EB2R6WgYmrs2bYbcUNNUVfEhIfFYy69uci+1fuRX84mkawFSxd/4nVWUopUVIykwlQxRTJBTIDA4Pp1jBZPuNW4wUAPmCqWIn29X1k4f5Ku8g9mpKCkakRLVEs1auVuauVuyqHMo8ejNCe+sWPVTkQKXCMmkeZUmUZjETF1tc6ooly+fgUVw9So1/tRN6YnZji46QghBFKKuAouERNhMlbAHZFE6e7pB+He8MMw+GGI4xtOMf1+lsl3TQ4NHf19BSlaO1DB9BfMHdX0O0iqSgiBbJkjm491hClJbA1LxCURgpPzXwAHhg63necAIi3XngXLcRU0fof8ETMljIyM5LGxMcbHxzvy/6fuXdWgt6+PWncv1e4euqo1ZmabvHs5+jn8yzufO7hiiZmuNpNBM13rbvVSpbrXJE7/BMkHtU9jFIC/AAAAAElFTkSuQmCC") no-repeat scroll right center; padding:1px 22px 1px 5px; border:0; cursor:pointer; font-size:.9em;}
+
+ */
+input[name="logout"]:hover {font-weight: bold;}
+#content h2{ background-color: #333; color: #fff; }
+
+#fieldset-search input,
+#fieldset-search select{
+    margin-right: 5px;
+}
+
+/* aperto di default */
+#fieldset-search{
+    display: block;
+}
+
+#suggest_tablefields_container{
+    width: 200px;
+}
+.sqlarea{
+    width: 850px;
+    height: 600px;
+}

editor/include/adminer.inc.php

@@ -16,11 +16,8 @@ class Adminer {
 	function connectSsl() {
 	}
 
-	/**
-	 * @throws \Random\RandomException
-	 */
 	function permanentLogin($create = false) {
-		return get_private_key($create);
+		return password_file($create);
 	}
 
 	function bruteForceKey() {
@@ -205,7 +202,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			$return = (preg_match('~^(1|t|true|y|yes|on)$~i', $val) ? lang('yes') : lang('no'));
 		}
 		if ($link) {
-			$return = "<a href='$link'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>";
+			$return = "<a href='$link'" . (is_url($link) ? target_blank() : "") . ">$return</a>";
 		}
 		if (!$link && !like_bool($field) && preg_match(number_type(), $field["type"])) {
 			$return = "<div class='number'>$return</div>"; // Firefox doesn't support <colgroup>
@@ -345,44 +342,35 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 
 	function selectSearchProcess($fields, $indexes) {
 		global $driver;
-
-		$return = [];
-
+		$return = array();
 		foreach ((array) $_GET["where"] as $key => $where) {
 			$col = $where["col"];
 			$op = $where["op"];
 			$val = $where["val"];
-
-			if (($key >= 0 && $col != "") || $val != "") {
-				$conds = [];
-
-				foreach (($col != "" ? [$col => $fields[$col]] : $fields) as $name => $field) {
+			if (($key < 0 ? "" : $col) . $val != "") {
+				$conds = array();
+				foreach (($col != "" ? array($col => $fields[$col]) : $fields) as $name => $field) {
 					if ($col != "" || is_numeric($val) || !preg_match(number_type(), $field["type"])) {
 						$name = idf_escape($name);
-
 						if ($col != "" && $field["type"] == "enum") {
 							$conds[] = (in_array(0, $val) ? "$name IS NULL OR " : "") . "$name IN (" . implode(", ", array_map('intval', $val)) . ")";
 						} else {
 							$text_type = preg_match('~char|text|enum|set~', $field["type"]);
 							$value = $this->processInput($field, (!$op && $text_type && preg_match('~^[^%]+$~', $val) ? "%$val%" : $val));
-
-							$conds[] = $driver->convertSearch($name, $where, $field) . ($value == "NULL" ? " IS" . ($op == ">=" ? " NOT" : "") . " $value"
+							$conds[] = $driver->convertSearch($name, $val, $field) . ($value == "NULL" ? " IS" . ($op == ">=" ? " NOT" : "") . " $value"
 								: (in_array($op, $this->operators) || $op == "=" ? " $op $value"
 								: ($text_type ? " LIKE $value"
 								: " IN (" . str_replace(",", "', '", $value) . ")"
 							)));
-
 							if ($key < 0 && $val == "0") {
 								$conds[] = "$name IS NULL";
 							}
 						}
 					}
 				}
-
 				$return[] = ($conds ? "(" . implode(" OR ", $conds) . ")" : "1 = 0");
 			}
 		}
-
 		return $return;
 	}
 
@@ -582,7 +570,6 @@ qsl('div').onclick = whisperClick;", "")
 	}
 
 	function importServerPath() {
-		return null;
 	}
 
 	function homepage() {
@@ -593,11 +580,8 @@ qsl('div').onclick = whisperClick;", "")
 		global $VERSION;
 		?>
 <h1>
-    <?php echo $this->name(); ?>
-    <?php if ($missing != "auth"): ?>
-    <span class="version"><?php echo $VERSION; ?></span>
-    <a href="https://www.adminer.org/editor/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
-	<?php endif; ?>
+<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
+<a href="https://www.adminer.org/editor/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
 </h1>
 <?php
 		if ($missing == "auth") {

editor/include/editing.inc.php

@@ -17,7 +17,7 @@ function email_header($header) {
 * @return bool
 */
 function send_mail($email, $subject, $message, $from = "", $files = array()) {
-	$eol = "\r\n";
+	$eol = (DIRECTORY_SEPARATOR == "/" ? "\n" : "\r\n"); // PHP_EOL available since PHP 5.0.2
 	$message = str_replace("\n", $eol, wordwrap(str_replace("\r", "", "$message\n")));
 	$boundary = uniqid("boundary");
 	$attachments = "";

lang.php

@@ -2,7 +2,7 @@
 <?php
 error_reporting(6135); // errors and warnings
 unset($_COOKIE["adminer_lang"]);
-$_SESSION["lang"] = isset($_SERVER["argv"][1]) ? $_SERVER["argv"][1] : null; // Adminer functions read language from session
+$_SESSION["lang"] = $_SERVER["argv"][1]; // Adminer functions read language from session
 if (isset($_SESSION["lang"])) {
 	include dirname(__FILE__) . "/adminer/include/lang.inc.php";
 	if (isset($_SERVER["argv"][2]) || (!isset($langs[$_SESSION["lang"]]) && $_SESSION["lang"] != "xx")) {
@@ -17,9 +17,7 @@ foreach (array_merge(
 	glob(dirname(__FILE__) . "/adminer/include/*.php"),
 	glob(dirname(__FILE__) . "/adminer/drivers/*.php"),
 	glob(dirname(__FILE__) . "/editor/*.php"),
-	glob(dirname(__FILE__) . "/editor/include/*.php"),
-	glob(dirname(__FILE__) . "/plugins/*.php"),
-	glob(dirname(__FILE__) . "/plugins/drivers/*.php")
+	glob(dirname(__FILE__) . "/editor/include/*.php")
 ) as $filename) {
 	$file = file_get_contents($filename);
 	if (preg_match_all("~lang\\(('(?:[^\\\\']+|\\\\.)*')([),])~", $file, $matches)) { // lang() always uses apostrophes

plugins/disable-tables.php

@@ -0,0 +1,32 @@
+<?php
+
+/** Disable tables
+ * @link https://www.adminer.org/plugins/#use
+ * @author Andrea Mariani, https://www.fasys.it/
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+ */
+class AdminerDisableTables {
+
+    function tableName($tableStatus) {
+        // tables without comments would return empty string and will be ignored by Adminer
+        $disabledTables = [
+            'tableName1' => true,
+            'tableName2' => true,
+            'tableName3' => true,
+            //...
+        ];
+
+        $select = filter_input(INPUT_GET, 'table', FILTER_SANITIZE_STRING);
+        if(isset($select) && $disabledTables[$select]) die(Adminer\h('Access Denied.'));
+
+        if($disabledTables[$tableStatus['Name']]){
+            return false;
+        }
+
+        return Adminer\h($tableStatus['Name']);
+        // tables without comments would return empty string and will be ignored by Adminer
+        //return Adminer\h($tableStatus['Comment']);
+    }
+
+}

plugins/drivers/clickhouse.php

@@ -8,78 +8,56 @@ if (isset($_GET["clickhouse"])) {
 		var $extension = "JSON", $server_info, $errno, $_result, $error, $_url;
 		var $_db = 'default';
 
-		/**
-		 * @param string $db
-		 * @param string $query
-		 * @return Min_Result|bool
-		 */
 		function rootQuery($db, $query) {
 			@ini_set('track_errors', 1); // @ - may be disabled
 			$file = @file_get_contents("$this->_url/?database=$db", false, stream_context_create(array('http' => array(
 				'method' => 'POST',
 				'content' => $this->isQuerySelectLike($query) ? "$query FORMAT JSONCompact" : $query,
 				'header' => 'Content-type: application/x-www-form-urlencoded',
-				'ignore_errors' => 1,
-				'follow_location' => 0,
-				'max_redirects' => 0,
+				'ignore_errors' => 1, // available since PHP 5.2.10
 			))));
 
 			if ($file === false) {
-				$this->error = lang('Invalid server or credentials.');
-				return false;
+				$this->error = $php_errormsg;
+				return $file;
 			}
-
 			if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-				foreach ($http_response_header as $header) {
-					if (preg_match('~^X-ClickHouse-Exception-Code:~i', $header)) {
-						$this->error = preg_replace('~\(version [^(]+\(.+$~', '', $file);
+				$this->error = lang('Invalid credentials.') . " $http_response_header[0]";
 				return false;
 			}
-				}
-
-				$this->error = lang('Invalid server or credentials.');
-				return false;
-			}
-
+			$return = json_decode($file, true);
+			if ($return === null) {
 				if (!$this->isQuerySelectLike($query) && $file === '') {
 					return true;
 				}
 
-			$return = json_decode($file, true);
-			if ($return === null) {
-				$this->error = lang('Invalid server or credentials.');
-				return false;
+				$this->errno = json_last_error();
+				if (function_exists('json_last_error_msg')) {
+					$this->error = json_last_error_msg();
+				} else {
+					$constants = get_defined_constants(true);
+					foreach ($constants['json'] as $name => $value) {
+						if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
+							$this->error = $name;
+							break;
 						}
-
-			if (!isset($return['rows']) || !isset($return['data']) || !isset($return['meta'])) {
-				$this->error = lang('Invalid server or credentials.');
-				return false;
 					}
-
-			return new Min_Result($return['rows'], $return['data'], $return['meta']);
+				}
+			}
+			return new Min_Result($return);
 		}
 
 		function isQuerySelectLike($query) {
 			return (bool) preg_match('~^(select|show)~i', $query);
 		}
 
-		/**
-		 * @param string $query
-		 * @return bool|Min_Result
-		 */
 		function query($query) {
 			return $this->rootQuery($this->_db, $query);
 		}
 
-		/**
-		 * @param string $server
-		 * @param string $username
-		 * @param string $password
-		 * @return bool
-		 */
 		function connect($server, $username, $password) {
-			$this->_url = build_http_url($server, $username, $password, "localhost", 8123);
-
+			preg_match('~^(https?://)?(.*)~', $server, $match);
+			$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
 			$return = $this->query('SELECT 1');
 			return (bool) $return;
 		}
@@ -114,17 +92,11 @@ if (isset($_GET["clickhouse"])) {
 	class Min_Result {
 		var $num_rows, $_rows, $columns, $meta, $_offset = 0;
 
-		/**
-		 * @param int $rows
-		 * @param array[] $data
-		 * @param array[] $meta
-		 */
-		function __construct($rows, array $data, array $meta) {
-			$this->num_rows = $rows;
-			$this->_rows = $data;
-			$this->meta = $meta;
-			$this->columns = array_column($meta, 'name');
-
+		function __construct($result) {
+			$this->num_rows = $result['rows'];
+			$this->_rows = $result['data'];
+			$this->meta = $result['meta'];
+			$this->columns = array_column($this->meta, 'name');
 			reset($this->_rows);
 		}
 
@@ -240,15 +212,6 @@ if (isset($_GET["clickhouse"])) {
 		return apply_queries("DROP TABLE", $tables);
 	}
 
-	/**
-	 * @param string $hostPath
-	 * @return bool
-	 */
-	function is_server_host_valid($hostPath)
-	{
-		return strpos(rtrim($hostPath, '/'), '/') === false;
-	}
-
 	function connect() {
 		global $adminer;
 		$connection = new Min_DB;
@@ -353,7 +316,7 @@ if (isset($_GET["clickhouse"])) {
 				"default" => trim($row['default_expression']),
 				"null" => $nullable,
 				"auto_increment" => '0',
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 0, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 0),
 			);
 		}
 

plugins/drivers/elastic.php

@@ -1,591 +0,0 @@
-<?php
-add_driver("elastic", "Elasticsearch 7 (beta)");
-
-if (isset($_GET["elastic"])) {
-	define("DRIVER", "elastic");
-
-	if (ini_bool('allow_url_fopen')) {
-		define("ELASTIC_DB_NAME", "elastic");
-
-		class Min_DB {
-			var $extension = "JSON", $server_info, $errno, $error, $_url;
-
-			/**
-			 * @param string $path
-			 * @param array|null $content
-			 * @param string $method
-			 * @return array|false
-			 */
-			function rootQuery($path, array $content = null, $method = 'GET') {
-				@ini_set('track_errors', 1); // @ - may be disabled
-
-				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
-					'method' => $method,
-					'content' => $content !== null ? json_encode($content) : null,
-					'header' => $content !== null ? 'Content-Type: application/json' : [],
-					'ignore_errors' => 1,
-					'follow_location' => 0,
-					'max_redirects' => 0,
-				))));
-
-				if ($file === false) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				$return = json_decode($file, true);
-				if ($return === null) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-					if (isset($return['error']['root_cause'][0]['type'])) {
-						$this->error = $return['error']['root_cause'][0]['type'] . ": " . $return['error']['root_cause'][0]['reason'];
-					} elseif (isset($return['status']) && isset($return['error']) && is_string($return['error'])) {
-						$this->error = $return['error'];
-					}
-
-					return false;
-				}
-
-				return $return;
-			}
-
-			/** Performs query relative to actual selected DB
-			 * @param string $path
-			 * @param array|null $content
-			 * @param string $method
-			 * @return array|false
-			 */
-			function query($path, array $content = null, $method = 'GET') {
-				// Support for global search through all tables
-				if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) {
-					global $driver;
-
-					$where = explode(" AND ", $matches[2]);
-
-					return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]);
-				}
-
-				return $this->rootQuery($path, $content, $method);
-			}
-
-			/**
-			 * @param string $server
-			 * @param string $username
-			 * @param string $password
-			 * @return bool
-			 */
-			function connect($server, $username, $password) {
-				$this->_url = build_http_url($server, $username, $password, "localhost", 9200);
-
-				$return = $this->query('');
-				if (!$return) {
-					return false;
-				}
-
-				if (!isset($return['version']['number'])) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				$this->server_info = $return['version']['number'];
-				return true;
-			}
-
-			function select_db($database) {
-				return true;
-			}
-
-			function quote($string) {
-				return $string;
-			}
-		}
-
-		class Min_Result {
-			var $num_rows, $_rows;
-
-			function __construct($rows) {
-				$this->num_rows = count($rows);
-				$this->_rows = $rows;
-
-				reset($this->_rows);
-			}
-
-			function fetch_assoc() {
-				$return = current($this->_rows);
-				next($this->_rows);
-
-				return $return;
-			}
-
-			function fetch_row() {
-				$row = $this->fetch_assoc();
-
-				return $row ? array_values($row) : false;
-			}
-		}
-	}
-
-	class Min_Driver extends Min_SQL {
-
-		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			$data = array();
-			if ($select != array("*")) {
-				$data["fields"] = array_values($select);
-			}
-
-			if ($order) {
-				$sort = array();
-				foreach ($order as $col) {
-					$col = preg_replace('~ DESC$~', '', $col, 1, $count);
-					$sort[] = ($count ? array($col => "desc") : $col);
-				}
-				$data["sort"] = $sort;
-			}
-
-			if ($limit) {
-				$data["size"] = +$limit;
-				if ($page) {
-					$data["from"] = ($page * $limit);
-				}
-			}
-
-			foreach ($where as $val) {
-				if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) {
-					$parts = explode(" OR ", $matches[1]);
-					$terms = array();
-					foreach ($parts as $part) {
-						list($col, $op, $val) = explode(" ", $part, 3);
-						$term = array($col => $val);
-						if ($op == "=") {
-							$terms[] = array("term" => $term);
-						} elseif (in_array($op, array("must", "should", "must_not"))) {
-							$data["query"]["bool"][$op][]["match"] = $term;
-						}
-					}
-
-					if (!empty($terms)) {
-						$data["query"]["bool"]["filter"][]["bool"]["should"] = $terms;
-					}
-				} else {
-					list($col, $op, $val) = explode(" ", $val, 3);
-					$term = array($col => $val);
-					if ($op == "=") {
-						$data["query"]["bool"]["filter"][] = array("term" => $term);
-					} elseif (in_array($op, array("must", "should", "must_not"))) {
-						$data["query"]["bool"][$op][]["match"] = $term;
-					}
-				}
-			}
-
-			$query = "$table/_search";
-			$start = microtime(true);
-			$search = $this->_conn->rootQuery($query, $data);
-
-			if ($print) {
-				echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search);
-			}
-			if (empty($search)) {
-				return false;
-			}
-
-			$return = array();
-			foreach ($search["hits"]["hits"] as $hit) {
-				$row = array();
-				if ($select == array("*")) {
-					$row["_id"] = $hit["_id"];
-				}
-
-				if ($select != array("*")) {
-					$fields = array();
-					foreach ($select as $key) {
-						$fields[$key] = $key == "_id" ? $hit["_id"] : $hit["_source"][$key];
-					}
-				} else {
-					$fields = $hit["_source"];
-				}
-				foreach ($fields as $key => $val) {
-					$row[$key] = (is_array($val) ? json_encode($val) : $val);
-				}
-
-				$return[] = $row;
-			}
-
-			return new Min_Result($return);
-		}
-
-		function update($type, $record, $queryWhere, $limit = 0, $separator = "\n") {
-			//! use $limit
-			$parts = preg_split('~ *= *~', $queryWhere);
-			if (count($parts) == 2) {
-				$id = trim($parts[1]);
-				$query = "$type/$id";
-
-				return $this->_conn->query($query, $record, 'POST');
-			}
-
-			return false;
-		}
-
-		function insert($type, $record) {
-			$id = ""; //! user should be able to inform _id
-			$query = "$type/$id";
-			$response = $this->_conn->query($query, $record, 'POST');
-			$this->_conn->last_id = $response['_id'];
-
-			return $response['created'];
-		}
-
-		function delete($table, $queryWhere, $limit = 0) {
-			//! use $limit
-			$ids = array();
-			if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) {
-				$ids[] = $_GET["where"]["_id"];
-			}
-			if (isset($_POST['check'])) {
-				foreach ($_POST['check'] as $check) {
-					$parts = preg_split('~ *= *~', $check);
-					if (count($parts) == 2) {
-						$ids[] = trim($parts[1]);
-					}
-				}
-			}
-
-			$this->_conn->affected_rows = 0;
-
-			foreach ($ids as $id) {
-				$query = "$table/_doc/$id";
-				$response = $this->_conn->query($query, null, 'DELETE');
-				if (isset($response['result']) && $response['result'] == 'deleted') {
-					$this->_conn->affected_rows++;
-				}
-			}
-
-			return $this->_conn->affected_rows;
-		}
-
-		function convertOperator($operator) {
-			return $operator == "LIKE %%" ? "should" : $operator;
-		}
-	}
-
-	function connect() {
-		$connection = new Min_DB;
-
-		list($server, $username, $password) = adminer()->credentials();
-		if ($password != "" && $connection->connect($server, $username, "")) {
-			return lang('Database does not support password.');
-		}
-
-		if ($connection->connect($server, $username, $password)) {
-			return $connection;
-		}
-
-		return $connection->error;
-	}
-
-	function support($feature) {
-		return preg_match("~table|columns~", $feature);
-	}
-
-	function logged_user() {
-		$credentials = adminer()->credentials();
-
-		return $credentials[1];
-	}
-
-	function get_databases() {
-		return array(ELASTIC_DB_NAME);
-	}
-
-	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
-	}
-
-	function collations() {
-		return array();
-	}
-
-	function db_collation($db, $collations) {
-		//
-	}
-
-	function engines() {
-		return array();
-	}
-
-	function count_tables($databases) {
-		$return = connection()->rootQuery('_aliases');
-		if (empty($return)) {
-			return array(
-				ELASTIC_DB_NAME => 0
-			);
-		}
-
-		return array(
-			ELASTIC_DB_NAME => count($return)
-		);
-	}
-
-	function tables_list() {
-		$aliases = connection()->rootQuery('_aliases');
-		if (empty($aliases)) {
-			return array();
-		}
-
-		ksort($aliases);
-
-		$tables = array();
-		foreach ($aliases as $name => $index) {
-			$tables[$name] = "table";
-
-			ksort($index["aliases"]);
-			$tables += array_fill_keys(array_keys($index["aliases"]), "view");
-		}
-
-		return $tables;
-	}
-
-	function table_status($name = "", $fast = false) {
-		$stats = connection()->rootQuery('_stats');
-		$aliases = connection()->rootQuery('_aliases');
-
-		if (empty($stats) || empty($aliases)) {
-			return array();
-		}
-
-		$result = array();
-
-		if ($name != "") {
-			if (isset($stats["indices"][$name])) {
-				return format_index_status($name, $stats["indices"][$name]);
-			} else foreach ($aliases as $index_name => $index) {
-				foreach ($index["aliases"] as $alias_name => $alias) {
-					if ($alias_name == $name) {
-						return format_alias_status($alias_name, $stats["indices"][$index_name]);
-					}
-				}
-			}
-		}
-
-		ksort($stats["indices"]);
-		foreach ($stats["indices"] as $name => $index) {
-			if ($name[0] == ".") {
-				continue;
-			}
-
-			$result[$name] = format_index_status($name, $index);
-
-			if (!empty($aliases[$name]["aliases"])) {
-				ksort($aliases[$name]["aliases"]);
-				foreach ($aliases[$name]["aliases"] as $alias_name => $alias) {
-					$result[$alias_name] = format_alias_status($alias_name, $stats["indices"][$name]);
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	function format_index_status($name, $index) {
-		return array(
-			"Name" => $name,
-			"Engine" => "Lucene",
-			"Oid" => $index["uuid"],
-			"Rows" => $index["total"]["docs"]["count"],
-			"Auto_increment" => 0,
-			"Data_length" => $index["total"]["store"]["size_in_bytes"],
-			"Index_length" => 0,
-			"Data_free" => $index["total"]["store"]["reserved_in_bytes"],
-		);
-	}
-
-	function format_alias_status($name, $index) {
-		return array(
-			"Name" => $name,
-			"Engine" => "view",
-			"Rows" => $index["total"]["docs"]["count"],
-		);
-	}
-
-	function is_view($table_status) {
-		return $table_status["Engine"] == "view";
-	}
-
-	function error() {
-		return h(connection()->error);
-	}
-
-	function information_schema() {
-		//
-	}
-
-	function indexes($table, $connection2 = null) {
-		return array(
-			array("type" => "PRIMARY", "columns" => array("_id")),
-		);
-	}
-
-	function fields($table) {
-		$mappings = array();
-		$mapping = connection()->rootQuery("_mapping");
-
-		if (!isset($mapping[$table])) {
-			$aliases = connection()->rootQuery('_aliases');
-
-			foreach ($aliases as $index_name => $index) {
-				foreach ($index["aliases"] as $alias_name => $alias) {
-					if ($alias_name == $table) {
-						$table = $index_name;
-						break;
-					}
-				}
-			}
-		}
-
-		if (!empty($mapping)) {
-			$mappings = $mapping[$table]["mappings"]["properties"];
-		}
-
-		$result = array(
-			"_id" => array(
-				"field" => "_id",
-				"full_type" => "text",
-				"type" => "text",
-				"privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1),
-			)
-		);
-
-		foreach ($mappings as $name => $field) {
-			$has_index = !isset($field["index"]) || $field["index"];
-
-			// TODO: privileges: where => $has_index
-			// TODO: privileges: sort => $field["type"] != "text"
-
-			$result[$name] = array(
-				"field" => $name,
-				"full_type" => $field["type"],
-				"type" => $field["type"],
-				"privileges" => array(
-					"insert" => 1,
-					"select" => 1,
-					"update" => 1,
-					"where" => !isset($field["index"]) || $field["index"] ?: null,
-					"order" => $field["type"] != "text" ?: null
-				),
-			);
-		}
-
-		return $result;
-	}
-
-	function foreign_keys($table) {
-		return array();
-	}
-
-	function table($idf) {
-		return $idf;
-	}
-
-	function idf_escape($idf) {
-		return $idf;
-	}
-
-	function convert_field($field) {
-		//
-	}
-
-	function unconvert_field($field, $return) {
-		return $return;
-	}
-
-	function fk_support($table_status) {
-		//
-	}
-
-	function found_rows($table_status, $where) {
-		return null;
-	}
-
-	/** Create index
-	 * @param string
-	 * @return mixed
-	 */
-	function create_database($db) {
-		return connection()->rootQuery(urlencode($db), null, 'PUT');
-	}
-
-	/** Remove index
-	 * @param array
-	 * @return mixed
-	 */
-	function drop_databases($databases) {
-		return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE');
-	}
-
-	/** Alter type
-	 * @param array
-	 * @return mixed
-	 */
-	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
-		$properties = array();
-		foreach ($fields as $f) {
-			$field_name = trim($f[1][0]);
-			$field_type = trim($f[1][1] ? $f[1][1] : "text");
-			$properties[$field_name] = array(
-				'type' => $field_type
-			);
-		}
-
-		if (!empty($properties)) {
-			$properties = array('properties' => $properties);
-		}
-
-		return connection()->query("_mapping/{$name}", $properties, 'PUT');
-	}
-
-	/** Drop types
-	 * @param array
-	 * @return bool
-	 */
-	function drop_tables($tables) {
-		$return = true;
-		foreach ($tables as $table) { //! convert to bulk api
-			$return = $return && connection()->query(urlencode($table), null, 'DELETE');
-		}
-
-		return $return;
-	}
-
-	function last_id() {
-		return connection()->last_id;
-	}
-
-	function driver_config() {
-		$types = array();
-		$structured_types = array();
-
-		foreach (array(
-			lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
-			lang('Date and time') => array("date" => 10),
-			lang('Strings') => array("string" => 65535, "text" => 65535),
-			lang('Binary') => array("binary" => 255),
-		) as $key => $val) {
-			$types += $val;
-			$structured_types[$key] = array_keys($val);
-		}
-
-		return array(
-			'possible_drivers' => array("json + allow_url_fopen"),
-			'jush' => "elastic",
-			'operators' => array("=", "must", "should", "must_not"),
-			'functions' => array(),
-			'grouping' => array(),
-			'edit_functions' => array(array("json")),
-			'types' => $types,
-			'structured_types' => $structured_types,
-		);
-	}
-}

plugins/drivers/firebird.php

@@ -250,7 +250,7 @@ ORDER BY r.RDB$FIELD_POSITION';
 				"null" => (trim($row["FIELD_NOT_NULL_CONSTRAINT"]) == "YES"),
 				"auto_increment" => '0',
 				"collation" => trim($row["FIELD_COLLATION"]),
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
 				"comment" => trim($row["FIELD_DESCRIPTION"]),
 			);
 		}

plugins/drivers/simpledb.php

@@ -6,49 +6,13 @@ if (isset($_GET["simpledb"])) {
 
 	if (class_exists('SimpleXMLElement') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
-			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_url, $_result;
-
-			/**
-			 * @param string $server
-			 * @param string $password
-			 * @return bool
-			 */
-			function connect($server, $password) {
-				if ($server == '' || $password == '') {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				$parts = parse_url($server);
-
-				if (!$parts || !isset($parts['host']) || !preg_match('~^sdb\.([a-z0-9-]+\.)?amazonaws\.com$~i', $parts['host']) ||
-					isset($parts['port'])
-				) {
-					$this->error = lang('Invalid server or credentials.');
-					return false;
-				}
-
-				$this->_url = build_http_url($server, '', '', '');
-
-				return (bool) $this->workaroundLoginRequest('ListDomains', ['MaxNumberOfDomains' => 1]);
-			}
-
-			// FIXME: This is so wrong :-( Move sdb_request to Min_DB!
-			private function workaroundLoginRequest($action, $params = array()) {
-				global $connection;
-
-				$connection = $this;
-				$result = sdb_request($action, $params);
-				$connection = null;
-
-				return $result;
-			}
+			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_result;
 
 			function select_db($database) {
 				return ($database == "domain");
 			}
 
-			function query($query) {
+			function query($query, $unbuffered = false) {
 				$params = array('SelectExpression' => $query, 'ConsistentRead' => 'true');
 				if ($this->next) {
 					$params['NextToken'] = $this->next;
@@ -280,26 +244,15 @@ if (isset($_GET["simpledb"])) {
 
 	}
 
-	/**
-	 * @param string $hostPath
-	 * @return bool
-	 */
-	function is_server_host_valid($hostPath)
-	{
-		return strpos(rtrim($hostPath, '/'), '/') === false;
-	}
+
 
 	function connect() {
 		global $adminer;
-
-		$connection = new Min_DB;
-
-		list($server, , $password) = $adminer->credentials();
-		if ($connection->connect($server, $password)) {
-			return $connection;
+		list(, , $password) = $adminer->credentials();
+		if ($password != "") {
+			return lang('Database does not support password.');
 		}
-
-		return $connection->error;
+		return new Min_DB;
 	}
 
 	function support($feature) {
@@ -437,6 +390,22 @@ if (isset($_GET["simpledb"])) {
 	function last_id() {
 	}
 
+	function hmac($algo, $data, $key, $raw_output = false) {
+		// can use hash_hmac() since PHP 5.1.2
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack("H*", $algo($key));
+		}
+		$key = str_pad($key, $blocksize, "\0");
+		$k_ipad = $key ^ str_repeat("\x36", $blocksize);
+		$k_opad = $key ^ str_repeat("\x5C", $blocksize);
+		$return = $algo($k_opad . pack("H*", $algo($k_ipad . $data)));
+		if ($raw_output) {
+			$return = pack("H*", $return);
+		}
+		return $return;
+	}
+
 	function sdb_request($action, $params = array()) {
 		global $adminer, $connection;
 		list($host, $params['AWSAccessKeyId'], $secret) = $adminer->credentials();
@@ -451,18 +420,15 @@ if (isset($_GET["simpledb"])) {
 			$query .= '&' . rawurlencode($key) . '=' . rawurlencode($val);
 		}
 		$query = str_replace('%7E', '~', substr($query, 1));
-		$query .= "&Signature=" . urlencode(base64_encode(hash_hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
+		$query .= "&Signature=" . urlencode(base64_encode(hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
 		@ini_set('track_errors', 1); // @ - may be disabled
-
-		$file = @file_get_contents($connection->_url, false, stream_context_create(array('http' => array(
+		$file = @file_get_contents((preg_match('~^https?://~', $host) ? $host : "http://$host"), false, stream_context_create(array('http' => array(
 			'method' => 'POST', // may not fit in URL with GET
 			'content' => $query,
-			'ignore_errors' => 1,
-			'follow_location' => 0,
-			'max_redirects' => 0,
+			'ignore_errors' => 1, // available since PHP 5.2.10
 		))));
 		if (!$file) {
-			$connection->error = error_get_last()['message'];
+			$connection->error = $php_errormsg;
 			return false;
 		}
 		libxml_use_internal_errors(true);

plugins/edit-foreign.php

@@ -1,75 +1,43 @@
 <?php
 
 /** Select foreign key in edit form
- * @link https://www.adminer.org/plugins/#use
- * @author Jakub Vrana, https://www.vrana.cz/
- * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
- */
-class AdminerEditForeign
-{
-	private $limit;
-	private $foreignTables = [];
-	private $foreignOptions = [];
+* @link https://www.adminer.org/plugins/#use
+* @author Jakub Vrana, https://www.vrana.cz/
+* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+*/
+class AdminerEditForeign {
+	var $_limit;
 	
-	/**
-	 * @param int $limit
-	 */
-	function __construct($limit = 0)
-	{
-		$this->limit = $limit;
+	function __construct($limit = 0) {
+		$this->_limit = $limit;
 	}
 	
-	/**
-	 * @param string $table
-	 * @param array $field
-	 * @param string $attrs
-	 * @param string|null $value
-	 *
-	 * @return string
-	 */
-	function editInput($table, array $field, $attrs, $value)
-	{
-		if (!isset($this->foreignTables[$table])) {
-			$this->foreignTables[$table] = column_foreign_keys($table);
+	function editInput($table, $field, $attrs, $value) {
+		static $foreignTables = array();
+		static $values = array();
+		$foreignKeys = &$foreignTables[$table];
+		if ($foreignKeys === null) {
+			$foreignKeys = column_foreign_keys($table);
 		}
-		$foreignKeys = $this->foreignTables[$table];
-
-		if (empty($foreignKeys[$field["field"]])) {
-			return "";
-		}
-
-		foreach ($foreignKeys[$field["field"]] as $foreignKey) {
-			if (count($foreignKey["source"]) != 1) {
-				continue;
-			}
-
+		foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) {
+			if (count($foreignKey["source"]) == 1) {
 				$target = $foreignKey["table"];
 				$id = $foreignKey["target"][0];
-
-			if (!isset($this->foreignOptions[$target][$id])) {
+				$options = &$values[$target][$id];
+				if (!$options) {
 					$column = idf_escape($id);
 					if (preg_match('~binary~', $field["type"])) {
 						$column = "HEX($column)";
 					}
-
-				$values = get_vals("SELECT $column FROM " . table($target) . " ORDER BY 1" .
-					($this->limit ? " LIMIT " . ($this->limit + 1) : ""));
-
-				if ($this->limit && count($values) > $this->limit) {
-					$this->foreignOptions[$target][$id] = false;
-				} else {
-					$this->foreignOptions[$target][$id] = ["" => ""] + $values;
+					$options = array("" => "") + get_vals("SELECT $column FROM " . table($target) . " ORDER BY 1" . ($this->_limit ? " LIMIT " . ($this->_limit + 1) : ""));
+					if ($this->_limit && count($options) - 1 > $this->_limit) {
+						return;
 					}
 				}
-
-			if ($options = $this->foreignOptions[$target][$id]) {
 				return "<select$attrs>" . optionlist($options, $value) . "</select>";
-			} else {
-				return "";
+			}
 		}
 	}
 	
-		return "";
-	}
 }