Release 3.6.1

- uses other colors than JUSH
- not used everywhere (triggers, routines, ...)
- Ctrl+Left and similar works bad
- missing autocomplete
- blocking loader

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "jush"]
 	path = externals/jush
 	url = git://jush.git.sourceforge.net/gitroot/jush/jush
-[submodule "jsmin-php"]
-	path = externals/jsmin-php
-	url = git://github.com/rgrove/jsmin-php.git
 [submodule "tinymce"]
 	path = externals/tinymce
 	url = git://github.com/tinymce/tinymce.git
@@ -16,3 +13,9 @@
 [submodule "wymeditor"]
 	path = externals/wymeditor
 	url = git://github.com/wymeditor/wymeditor.git
+[submodule "JsShrink"]
+	path = externals/JsShrink
+	url = git://github.com/vrana/JsShrink.git
+[submodule "CodeMirror2"]
+	path = externals/CodeMirror2
+	url = git://github.com/marijnh/CodeMirror2.git

adminer/create.inc.php

@@ -23,13 +23,15 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 		query_redirect("DROP TABLE " . table($TABLE), substr(ME, 0, -1), lang('Table has been dropped.'));
 	} else {
 		$fields = array();
+		$all_fields = array();
+		$use_all_fields = false;
 		$foreign = array();
 		ksort($_POST["fields"]);
 		$orig_field = reset($orig_fields);
-		$after = "FIRST";
+		$after = " FIRST";
 		foreach ($_POST["fields"] as $key => $field) {
 			$foreign_key = $foreign_keys[$field["type"]];
-			$type_field = (isset($foreign_key) ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
+			$type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
 			if ($field["field"] != "") {
 				if (!$field["has_default"]) {
 					$field["default"] = null;
@@ -43,18 +45,26 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 					$field["auto_increment"] = true;
 				}
 				$process_field = process_field($field, $type_field);
+				$all_fields[] = array($field["orig"], $process_field, $after);
 				if ($process_field != process_field($orig_field, $orig_field)) {
 					$fields[] = array($field["orig"], $process_field, $after);
+					if ($field["orig"] != "" || $after) {
+						$use_all_fields = true;
+					}
 				}
-				if (isset($foreign_key)) {
-					$foreign[idf_escape($field["field"])] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . table($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (ereg("^($on_actions)\$", $field["on_delete"]) ? " ON DELETE $field[on_delete]" : "");
+				if ($foreign_key !== null) {
+					$foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . table($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (ereg("^($on_actions)\$", $field["on_delete"]) ? " ON DELETE $field[on_delete]" : "");
 				}
-				$after = "AFTER " . idf_escape($field["field"]);
+				$after = " AFTER " . idf_escape($field["field"]);
 			} elseif ($field["orig"] != "") {
+				$use_all_fields = true;
 				$fields[] = array($field["orig"]);
 			}
 			if ($field["orig"] != "") {
 				$orig_field = next($orig_fields);
+				if (!$orig_field) {
+					$after = "";
+				}
 			}
 		}
 		$partitioning = "";
@@ -70,7 +80,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 				? " (" . implode(",", $partitions) . "\n)"
 				: ($_POST["partitions"] ? " PARTITIONS " . (+$_POST["partitions"]) : "")
 			);
-		} elseif ($TABLE != "" && support("partitioning")) {
+		} elseif (support("partitioning") && ereg("partitioned", $orig_status["Create_options"])) {
 			$partitioning .= "\nREMOVE PARTITIONING";
 		}
 		$message = lang('Table has been altered.');
@@ -82,7 +92,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 		queries_redirect(ME . "table=" . urlencode($name), $message, alter_table(
 			$TABLE,
 			$name,
-			$fields,
+			($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
 			$foreign,
 			$_POST["Comment"],
 			($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? $_POST["Engine"] : ""),

adminer/db.inc.php

@@ -67,7 +67,7 @@ if ($adminer->homepage()) {
 			echo (support("comment") ? '<td>' . lang('Comment') : '');
 			echo "</thead>\n";
 			foreach ($tables_list as $name => $type) {
-				$view = (isset($type) && !eregi("table", $type));
+				$view = ($type !== null && !eregi("table", $type));
 				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
 				echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>';
 				if ($view) {
@@ -100,14 +100,14 @@ if ($adminer->homepage()) {
 				echo "<p>" . (ereg('^(sql|sqlite|pgsql)$', $jush)
 					? ($jush != "sqlite" ? "<input type='submit' value='" . lang('Analyze') . "'> " : "")
 					. "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " : ""
-				) . ($jush == "sql" ? "<input type='submit' name='check' value='" . lang('Check') . "'> <input type='submit' name='repair' value='" . lang('Repair') . "'> " : "") . "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm("formChecked(this, /tables/)") . "> <input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /tables|views/)", 1) . ">\n"; // 1 - eventStop
+				) . ($jush == "sql" ? "<input type='submit' name='check' value='" . lang('Check') . "'> <input type='submit' name='repair' value='" . lang('Repair') . "'> " : "") . "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm("formChecked(this, /tables/)") . "> <input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /tables|views/)") . ">\n";
 				$databases = (support("scheme") ? schemas() : $adminer->databases());
 				if (count($databases) != 1 && $jush != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
 					echo "<p>" . lang('Move to other database') . ": ";
 					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '">');
-					echo " <input type='submit' name='move' value='" . lang('Move') . "' onclick='eventStop(event);'>";
-					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "' onclick='eventStop(event);'>" : "");
+					echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
+					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
 					echo "\n";
 				}
 				echo "<input type='hidden' name='token' value='$token'>\n";
@@ -182,6 +182,10 @@ if ($adminer->homepage()) {
 					echo "<td>$row[Ends]";
 				}
 				echo "</table>\n";
+				$event_scheduler = $connection->result("SELECT @@event_scheduler");
+				if ($event_scheduler && $event_scheduler != "ON") {
+					echo "<p class='error'><code class='jush-sqlset'>event_scheduler</code>: " . h($event_scheduler) . "\n";
+				}
 			}
 			echo '<p><a href="' . h(ME) . 'event=">' . lang('Create event') . "</a>\n";
 		}

adminer/drivers/mssql.inc.php

@@ -23,7 +23,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->_link = @sqlsrv_connect($server, array("UID" => $username, "PWD" => $password));
+				$this->_link = @sqlsrv_connect($server, array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8"));
 				if ($this->_link) {
 					$info = sqlsrv_server_info($this->_link);
 					$this->server_info = $info['SQLServerVersion'];
@@ -43,6 +43,7 @@ if (isset($_GET["mssql"])) {
 
 			function query($query, $unbuffered = false) {
 				$result = sqlsrv_query($this->_link, $query); //! , array(), ($unbuffered ? array() : array("Scrollable" => "keyset"))
+				$this->error = "";
 				if (!$result) {
 					$this->_get_error();
 					return false;
@@ -52,6 +53,7 @@ if (isset($_GET["mssql"])) {
 
 			function multi_query($query) {
 				$this->_result = sqlsrv_query($this->_link, $query);
+				$this->error = "";
 				if (!$this->_result) {
 					$this->_get_error();
 					return false;
@@ -159,6 +161,7 @@ if (isset($_GET["mssql"])) {
 
 			function query($query, $unbuffered = false) {
 				$result = mssql_query($query, $this->_link); //! $unbuffered
+				$this->error = "";
 				if (!$result) {
 					$this->error = mssql_get_last_message();
 					return false;
@@ -252,7 +255,7 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return (isset($limit) ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
+		return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
 	}
 
 	function limit1($query, $where) {
@@ -588,6 +591,13 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 		return array();
 	}
 
+	function convert_field($field) {
+	}
+	
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+	
 	function support($feature) {
 		return ereg('^(scheme|trigger|view|drop_col)$', $feature); //! routine|
 	}

adminer/drivers/mysql.inc.php

@@ -108,6 +108,7 @@ if (!defined("DRIVER")) {
 			*/
 			function query($query, $unbuffered = false) {
 				$result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
+				$this->error = "";
 				if (!$result) {
 					$this->error = mysql_error($this->_link);
 					return false;
@@ -264,17 +265,19 @@ if (!defined("DRIVER")) {
 	* @param bool
 	* @return array
 	*/
-	function get_databases($flush = true) {
+	function get_databases($flush) {
 		global $connection;
 		// SHOW DATABASES can take a very long time so it is cached
-		$return = &get_session("dbs");
-		if (!isset($return)) {
-			if ($flush) {
-				restart_session();
-				ob_flush();
-				flush();
-			}
-			$return = get_vals($connection->server_info >= 5 ? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA" : "SHOW DATABASES"); // SHOW DATABASES can be disabled by skip_show_database
+		$return = get_session("dbs");
+		if ($return === null) {
+			$query = ($connection->server_info >= 5
+				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA"
+				: "SHOW DATABASES"
+			); // SHOW DATABASES can be disabled by skip_show_database
+			$return = ($flush ? slow_query($query) : get_vals($query));
+			restart_session();
+			set_session("dbs", $return);
+			stop_session();
 		}
 		return $return;
 	}
@@ -288,11 +291,12 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	/** Formulate SQL modification query with limit 1
 	* @param string everything after UPDATE or DELETE
+	* @param string
 	* @return string
 	*/
 	function limit1($query, $where) {
@@ -499,7 +503,8 @@ if (!defined("DRIVER")) {
 	*/
 	function information_schema($db) {
 		global $connection;
-		return ($connection->server_info >= 5 && $db == "information_schema");
+		return ($connection->server_info >= 5 && $db == "information_schema")
+			|| ($connection->server_info >= 5.5 && $db == "performance_schema");
 	}
 
 	/** Get escaped error message
@@ -510,6 +515,16 @@ if (!defined("DRIVER")) {
 		return h(preg_replace('~^You have an error.*syntax to use~U', "Syntax error", $connection->error));
 	}
 
+	/** Get line of error
+	* @return int 0 for first line
+	*/
+	function error_line() {
+		global $connection;
+		if (ereg(' at line ([0-9]+)$', $connection->error, $regs)) {
+			return $regs[1] - 1;
+		}
+	}
+
 	/** Return expression for binary comparison
 	* @param string
 	* @return string
@@ -520,6 +535,7 @@ if (!defined("DRIVER")) {
 
 	/** Create database
 	* @param string
+	* @param string
 	* @return string
 	*/
 	function create_database($db, $collation) {
@@ -538,7 +554,7 @@ if (!defined("DRIVER")) {
 	
 	/** Rename database from DB
 	* @param string new name
-	* @return string
+	* @param string
 	* @return bool
 	*/
 	function rename_database($name, $collation) {
@@ -592,7 +608,7 @@ if (!defined("DRIVER")) {
 		$alter = array();
 		foreach ($fields as $field) {
 			$alter[] = ($field[1]
-				? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? " $field[2]" : "")
+				? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? $field[2] : "")
 				: "DROP " . idf_escape($field[0])
 			);
 		}
@@ -698,7 +714,7 @@ if (!defined("DRIVER")) {
 	
 	/** Get information about trigger
 	* @param string trigger name
-	* @return array array("Trigger" => , "Timing" => , "Event" => , "Statement" => )
+	* @return array array("Trigger" => , "Timing" => , "Event" => , "Type" => , "Statement" => )
 	*/
 	function trigger($name) {
 		if ($name == "") {
@@ -739,10 +755,10 @@ if (!defined("DRIVER")) {
 	function routine($name, $type) {
 		global $connection, $enum_length, $inout, $types;
 		$aliases = array("bool", "boolean", "integer", "double precision", "real", "dec", "numeric", "fixed", "national char", "national varchar");
-		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
+		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
 		$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
 		$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
-		preg_match("~\\(((?:$pattern\\s*,?)*)\\)" . ($type == "FUNCTION" ? "\\s*RETURNS\\s+$type_pattern" : "") . "\\s*(.*)~is", $create, $match);
+		preg_match("~\\(((?:$pattern\\s*,?)*)\\)\\s*" . ($type == "FUNCTION" ? "RETURNS\\s+$type_pattern\\s+" : "") . "(.*)~is", $create, $match);
 		$fields = array();
 		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
 		foreach ($matches as $param) {
@@ -932,6 +948,34 @@ if (!defined("DRIVER")) {
 		return get_key_vals("SHOW STATUS");
 	}
 	
+	/** Convert field in select and edit
+	* @param array one element from fields()
+	* @return string
+	*/
+	function convert_field($field) {
+		if (ereg("binary", $field["type"])) {
+			return "HEX(" . idf_escape($field["field"]) . ")";
+		}
+		if (ereg("geometry|point|linestring|polygon", $field["type"])) {
+			return "AsWKT(" . idf_escape($field["field"]) . ")";
+		}
+	}
+	
+	/** Convert value in edit after applying functions back
+	* @param array one element from fields()
+	* @param string
+	* @return string
+	*/
+	function unconvert_field($field, $return) {
+		if (ereg("binary", $field["type"])) {
+			$return = "unhex($return)";
+		}
+		if (ereg("geometry|point|linestring|polygon", $field["type"])) {
+			$return = "GeomFromText($return)";
+		}
+		return $return;
+	}
+	
 	/** Check whether a feature is supported
 	* @param string "comment", "copy", "drop_col", "dump", "event", "kill", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "trigger", "type", "variables", "view"
 	* @return bool
@@ -948,23 +992,24 @@ if (!defined("DRIVER")) {
 		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
 		lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
 		lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
-		lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
 		lang('Lists') => array("enum" => 65535, "set" => 64),
+		lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
+		lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
 	) as $key => $val) {
 		$types += $val;
 		$structured_types[$key] = array_keys($val);
 	}
 	$unsigned = array("unsigned", "zerofill", "unsigned zerofill"); ///< @var array number variants
 	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", ""); ///< @var array operators used in select
-	$functions = array("char_length", "date", "from_unixtime", "hex", "lower", "round", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
+	$functions = array("char_length", "date", "from_unixtime", "lower", "round", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
 	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"); ///< @var array grouping functions used in select
 	$edit_functions = array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
 		array(
 			"char" => "md5/sha1/password/encrypt/uuid", //! JavaScript for disabling maxlength
-			"binary" => "md5/sha1/hex",
+			"binary" => "md5/sha1",
 			"date|time" => "now",
 		), array(
-			"int|float|double|decimal" => "+/-",
+			"(^|[^o])int|float|double|decimal" => "+/-", // not point
 			"date" => "+ interval/- interval",
 			"time" => "addtime/subtime",
 			"char|text" => "concat",

adminer/drivers/oracle.inc.php

@@ -37,6 +37,7 @@ if (isset($_GET["oracle"])) {
 
 			function query($query, $unbuffered = false) {
 				$result = oci_parse($this->_link, $query);
+				$this->error = "";
 				if (!$result) {
 					$error = oci_error($this->_link);
 					$this->error = $error["message"];
@@ -154,7 +155,7 @@ if (isset($_GET["oracle"])) {
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
 		return ($offset ? " * FROM (SELECT t.*, rownum AS rnum FROM (SELECT $query$where) t WHERE rownum <= " . ($limit + $offset) . ") WHERE rnum > $offset"
-			: (isset($limit) ? " * FROM (SELECT $query$where) WHERE rownum <= " . ($limit + $offset)
+			: ($limit !== null ? " * FROM (SELECT $query$where) WHERE rownum <= " . ($limit + $offset)
 			: " $query$where"
 		));
 	}
@@ -190,8 +191,8 @@ UNION SELECT view_name, 'view' FROM user_views"
 	function table_status($name = "") {
 		$return = array();
 		$search = q($name);
-		foreach (get_rows('SELECT table_name "Name", \'table\' "Engine" FROM all_tables WHERE tablespace_name = ' . q(DB) . ($name != "" ? " AND table_name = $search" : "") . "
-UNION SELECT view_name, 'view' FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "")
+		foreach (get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q(DB) . ($name != "" ? " AND table_name = $search" : "") . "
+UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "")
 		) as $row) {
 			if ($name != "") {
 				return $row;
@@ -329,28 +330,46 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 	}
 	
 	function schemas() {
-		return array();
+		return get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX'))");
 	}
 	
 	function get_schema() {
-		return "";
+		global $connection;
+		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
 	
 	function set_schema($scheme) {
-		return true;
+		global $connection;
+		return $connection->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
 	}
 	
 	function show_variables() {
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
 	
+	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
+ON sql.sql_id = sess.sql_id
+WHERE sess.type = \'USER\'
+ORDER BY PROCESS
+');
+	}
+	
 	function show_status() {
 		$rows = get_rows('SELECT * FROM v$instance');
 		return reset($rows);
 	}
 	
+	function convert_field($field) {
+	}
+	
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+	
 	function support($feature) {
-		return ereg("view|drop_col|variables|status", $feature); //!
+		return ereg("view|scheme|processlist|drop_col|variables|status", $feature); //!
 	}
 	
 	$jush = "oracle";

adminer/drivers/pgsql.inc.php

@@ -58,6 +58,7 @@ if (isset($_GET["pgsql"])) {
 			
 			function query($query, $unbuffered = false) {
 				$result = @pg_query($this->_link, $query);
+				$this->error = "";
 				if (!$result) {
 					$this->error = pg_last_error($this->_link);
 					return false;
@@ -174,7 +175,7 @@ if (isset($_GET["pgsql"])) {
 	}
 	
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	function limit1($query, $where) {
@@ -205,7 +206,7 @@ if (isset($_GET["pgsql"])) {
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN '' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids AS \"Oid\"
+		foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN 'table' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids AS \"Oid\", reltuples as \"Rows\"
 FROM pg_class
 WHERE relkind IN ('r','v')
 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())"
@@ -258,7 +259,7 @@ ORDER BY a.attnum"
 			$connection2 = $connection;
 		}
 		$return = array();
-		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relname = " . q($table));
+		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
 		$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
 		foreach (get_rows("SELECT relname, indisunique, indisprimary, indkey FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
 			$return[$row["relname"]]["type"] = ($row["indisprimary"] == "t" ? "PRIMARY" : ($row["indisunique"] == "t" ? "UNIQUE" : "INDEX"));
@@ -579,6 +580,13 @@ AND typelem = 0"
 	function show_status() {
 	}
 	
+	function convert_field($field) {
+	}
+	
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+	
 	function support($feature) {
 		return ereg('^(comment|view|scheme|processlist|sequence|trigger|type|variables|drop_col)$', $feature); //! routine|
 	}

adminer/drivers/sqlite.inc.php

@@ -19,6 +19,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				
 				function query($query) {
 					$result = @$this->_link->query($query);
+					$this->error = "";
 					if (!$result) {
 						$this->error = $this->_link->lastErrorMsg();
 						return false;
@@ -30,7 +31,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				}
 				
 				function quote($string) {
-					return "'" . $this->_link->escapeString($string) . "'";
+					return (is_utf8($string)
+						? "'" . $this->_link->escapeString($string) . "'"
+						: "x'" . reset(unpack('H*', $string)) . "'"
+					);
 				}
 				
 				function store_result() {
@@ -90,6 +94,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				function query($query, $unbuffered = false) {
 					$method = ($unbuffered ? "unbufferedQuery" : "query");
 					$result = @$this->_link->$method($query, SQLITE_BOTH, $error);
+					$this->error = "";
 					if (!$result) {
 						$this->error = $error;
 						return false;
@@ -215,7 +220,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
-		return " $query$where" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
 	function limit1($query, $where) {
@@ -245,9 +250,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function table_status($name = "") {
+		global $connection;
 		$return = array();
 		foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
+			$row["Oid"] = "t";
 			$row["Auto_increment"] = "";
+			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
 		}
 		foreach (get_rows("SELECT * FROM sqlite_sequence", null, "") as $row) {
@@ -262,7 +270,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	
 	function fk_support($table_status) {
 		global $connection;
-		return $_GET["create"] == "" && !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
+		return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
 	}
 
 	function fields($table) {
@@ -296,10 +304,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			$return[""] = array("type" => "PRIMARY", "columns" => $primary, "lengths" => array());
 		}
 		foreach (get_rows("PRAGMA index_list(" . table($table) . ")") as $row) {
-			$return[$row["name"]]["type"] = ($row["unique"] ? "UNIQUE" : "INDEX");
-			$return[$row["name"]]["lengths"] = array();
-			foreach (get_rows("PRAGMA index_info(" . idf_escape($row["name"]) . ")") as $row1) {
-				$return[$row["name"]]["columns"][] = $row1["name"];
+			if (!ereg("^sqlite_", $row["name"])) {
+				$return[$row["name"]]["type"] = ($row["unique"] ? "UNIQUE" : "INDEX");
+				$return[$row["name"]]["lengths"] = array();
+				foreach (get_rows("PRAGMA index_info(" . idf_escape($row["name"]) . ")") as $row1) {
+					$return[$row["name"]]["columns"][] = $row1["name"];
+				}
 			}
 		}
 		return $return;
@@ -395,14 +405,90 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 	
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
-		$alter = array();
+		$use_all_fields = ($table == "" || $foreign);
 		foreach ($fields as $field) {
-			if ($field[1]) {
-				$alter[] = ($table != "" && $field[0] == "" ? "ADD " : "  ") . implode($field[1]);
+			if ($field[0] != "" || !$field[1] || $field[2]) {
+				$use_all_fields = true;
+				break;
 			}
 		}
-		$alter = array_merge($alter, $foreign);
-		if ($table != "") {
+		$alter = array();
+		$originals = array();
+		$primary_key = false;
+		foreach ($fields as $field) {
+			if ($field[1]) {
+				if ($field[1][6]) {
+					$primary_key = true;
+				}
+				$alter[] = ($use_all_fields ? "  " : "ADD ") . implode($field[1]);
+				if ($field[0] != "") {
+					$originals[$field[0]] = $field[1][0];
+				}
+			}
+		}
+		if ($use_all_fields) {
+			if ($table != "") {
+				queries("BEGIN");
+				foreach (foreign_keys($table) as $foreign_key) {
+					$columns = array();
+					foreach ($foreign_key["source"] as $column) {
+						if (!$originals[$column]) {
+							continue 2;
+						}
+						$columns[] = $originals[$column];
+					}
+					$foreign[] = "  FOREIGN KEY (" . implode(", ", $columns) . ") REFERENCES "
+						. table($foreign_key["table"])
+						. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"]))
+						. ") ON DELETE $foreign_key[on_delete] ON UPDATE $foreign_key[on_update]"
+					;
+				}
+				$indexes = array();
+				foreach (indexes($table) as $key_name => $index) {
+					$columns = array();
+					foreach ($index["columns"] as $column) {
+						if (!$originals[$column]) {
+							continue 2;
+						}
+						$columns[] = $originals[$column];
+					}
+					$columns = "(" . implode(", ", $columns) . ")";
+					if ($index["type"] != "PRIMARY") {
+						$indexes[] = array($index["type"], $key_name, $columns);
+					} elseif (!$primary_key) {
+						$foreign[] = "  PRIMARY KEY $columns";
+					}
+				}
+			}
+			$alter = array_merge($alter, $foreign);
+			if (!queries("CREATE TABLE " . table($table != "" ? "adminer_$name" : $name) . " (\n" . implode(",\n", $alter) . "\n)")) {
+				// implicit ROLLBACK to not overwrite $connection->error
+				return false;
+			}
+			if ($table != "") {
+				if ($originals && !queries("INSERT INTO " . table("adminer_$name") . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
+					return false;
+				}
+				$triggers = array();
+				foreach (triggers($table) as $trigger_name => $timing_event) {
+					$trigger = trigger($trigger_name);
+					$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
+				}
+				if (!queries("DROP TABLE " . table($table))) { // drop before creating indexes and triggers to allow using old names
+					return false;
+				}
+				queries("ALTER TABLE " . table("adminer_$name") . " RENAME TO " . table($name));
+				if (!alter_indexes($name, $indexes)) {
+					return false;
+				}
+				foreach ($triggers as $trigger) {
+					if (!queries($trigger)) {
+						return false;
+					}
+				}
+				queries("COMMIT");
+			}
+		} else {
 			foreach ($alter as $val) {
 				if (!queries("ALTER TABLE " . table($table) . " $val")) {
 					return false;
@@ -411,8 +497,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			if ($table != $name && !queries("ALTER TABLE " . table($table) . " RENAME TO " . table($name))) {
 				return false;
 			}
-		} elseif (!queries("CREATE TABLE " . table($name) . " (\n" . implode(",\n", $alter) . "\n)")) {
-			return false;
 		}
 		if ($auto_increment) {
 			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
@@ -559,8 +643,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return $return;
 	}
 	
+	function convert_field($field) {
+	}
+	
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+	
 	function support($feature) {
-		return ereg('^(view|trigger|variables|status|dump)$', $feature);
+		return ereg('^(view|trigger|variables|status|dump|move_col|drop_col)$', $feature);
 	}
 	
 	$jush = "sqlite";

adminer/dump.inc.php

@@ -13,10 +13,10 @@ if ($_POST) {
 		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
 
 " . ($jush != "sql" ? "" : "SET NAMES utf8;
-SET foreign_key_checks = 0;
+" . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
 SET time_zone = " . q($connection->result("SELECT @@time_zone")) . ";
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
-
+" : "") . "
 ");
 	}
 	
@@ -48,14 +48,14 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
 						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
 							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
-							. $connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2) . ";;\n\n";
+							. remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2)) . ";;\n\n";
 						}
 					}
 				}
 				if ($_POST["events"]) {
 					foreach (get_rows("SHOW EVENTS", null, "-- ") as $row) {
 						$out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
-						. $connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3) . ";;\n\n";
+						. remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3)) . ";;\n\n";
 					}
 				}
 				if ($out) {
@@ -197,11 +197,11 @@ if (DB != "") {
 		$name = $table_status["Name"];
 		$prefix = ereg_replace("_.*", "", $name);
 		$checked = ($TABLE == "" || $TABLE == (substr($TABLE, -1) == "%" ? "$prefix%" : $name)); //! % may be part of table name
-		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "formUncheck('check-tables');");
+		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "checkboxClick(event, this); formUncheck('check-tables');");
 		if (is_view($table_status)) {
 			$views .= "$print\n";
 		} else {
-			echo "$print<td align='right'><label>" . ($table_status["Engine"] == "InnoDB" && $table_status["Rows"] ? "~ " : "") . $table_status["Rows"] . checkbox("data[]", $name, $checked, "", "formUncheck('check-data');") . "</label>\n";
+			echo "$print<td align='right'><label>" . ($table_status["Engine"] == "InnoDB" && $table_status["Rows"] ? "~ " : "") . $table_status["Rows"] . checkbox("data[]", $name, $checked, "", "checkboxClick(event, this); formUncheck('check-data');") . "</label>\n";
 		}
 		$prefixes[$prefix]++;
 	}

adminer/edit.inc.php

@@ -53,7 +53,14 @@ if ($_POST["save"]) {
 	$select = array();
 	foreach ($fields as $name => $field) {
 		if (isset($field["privileges"]["select"])) {
-			$select[] = ($_POST["clone"] && $field["auto_increment"] ? "'' AS " : (ereg("enum|set", $field["type"]) ? "1*" . idf_escape($name) . " AS " : "")) . idf_escape($name);
+			$as = convert_field($field);
+			if ($_POST["clone"] && $field["auto_increment"]) {
+				$as = "''";
+			}
+			if ($jush == "sql" && ereg("enum|set", $field["type"])) {
+				$as = "1*" . idf_escape($name);
+			}
+			$select[] = ($as ? "$as AS " : "") . idf_escape($name);
 		}
 	}
 	$row = array();
@@ -75,14 +82,14 @@ if ($fields) {
 	foreach ($fields as $name => $field) {
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$default = $_GET["set"][bracket_escape($name)];
-		$value = (isset($row)
-			? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name])
-			: (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : (isset($default) ? $default : $field["default"])))
+		$value = ($row !== null
+			? ($row[$name] != "" && $jush == "sql" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name])
+			: (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : ($default !== null ? $default : $field["default"])))
 		);
 		if (!$_POST["save"] && is_string($value)) {
 			$value = $adminer->editVal($value, $field);
 		}
-		$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
+		$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : ($value !== null ? '' : 'NULL'))));
 		if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
 			$value = "";
 			$function = "now";

adminer/file.inc.php

@@ -1,24 +1,29 @@
 <?php
+if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
+	header("HTTP/1.1 304 Not Modified");
+	exit;
+}
+
 header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
-	echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');");
+	echo compile_file('../adminer/static/favicon.ico');
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	?>compile_file('../adminer/static/default.css', 'minify_css');<?php
+	echo lzw_decompress(compile_file('../adminer/static/default.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
+	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {
-		case "plus.gif": echo base64_decode("compile_file('../adminer/static/plus.gif', 'base64_encode');"); break;
-		case "cross.gif": echo base64_decode("compile_file('../adminer/static/cross.gif', 'base64_encode');"); break;
-		case "up.gif": echo base64_decode("compile_file('../adminer/static/up.gif', 'base64_encode');"); break;
-		case "down.gif": echo base64_decode("compile_file('../adminer/static/down.gif', 'base64_encode');"); break;
-		case "arrow.gif": echo base64_decode("compile_file('../adminer/static/arrow.gif', 'base64_encode');"); break;
-		case "loader.gif": echo base64_decode("compile_file('../adminer/static/loader.gif', 'base64_encode');"); break;
+		case "plus.gif": echo compile_file('../adminer/static/plus.gif'); break;
+		case "cross.gif": echo compile_file('../adminer/static/cross.gif'); break;
+		case "up.gif": echo compile_file('../adminer/static/up.gif'); break;
+		case "down.gif": echo compile_file('../adminer/static/down.gif'); break;
+		case "arrow.gif": echo compile_file('../adminer/static/arrow.gif'); break;
 	}
 }
 exit;

adminer/foreign.inc.php

@@ -51,7 +51,7 @@ foreach (table_status() as $name => $table_status) {
 <p>
 <?php if ($row["db"] == "" && $row["ns"] == "") { ?>
 <?php echo lang('Target table'); ?>:
-<?php echo html_select("table", $referencable, $row["table"], "this.form['change-js'].value = '1'; if (!ajaxForm(this.form)) this.form.submit();"); ?>
+<?php echo html_select("table", $referencable, $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">

adminer/include/adminer.inc.php

@@ -42,6 +42,13 @@ class Adminer {
 		return get_databases($flush);
 	}
 	
+	/** Specify limit for waiting on some slow queries like DB list
+	* @return float number of seconds
+	*/
+	function queryTimeout() {
+		return 5;
+	}
+	
 	/** Headers to send before HTML output
 	* @return bool true to send security headers
 	*/
@@ -63,19 +70,20 @@ class Adminer {
 		global $drivers;
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('System'); ?><td><?php echo html_select("driver", $drivers, DRIVER, "loginDriver(this);"); ?>
-<tr><th><?php echo lang('Server'); ?><td><input name="server" value="<?php echo h(SERVER); ?>" title="hostname[:port]">
-<tr><th><?php echo lang('Username'); ?><td><input id="username" name="username" value="<?php echo h($_GET["username"]); ?>">
-<tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
+<tr><th><?php echo lang('System'); ?><td><?php echo html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);"); ?>
+<tr><th><?php echo lang('Server'); ?><td><input name="auth[server]" value="<?php echo h(SERVER); ?>" title="hostname[:port]">
+<tr><th><?php echo lang('Username'); ?><td><input id="username" name="auth[username]" value="<?php echo h($_GET["username"]); ?>">
+<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
+<tr><th><?php echo lang('Database'); ?><td><input name="auth[db]" value="<?php echo h($_GET["db"]); ?>">
 </table>
 <script type="text/javascript">
 var username = document.getElementById('username');
 username.focus();
-username.form['driver'].onchange();
+username.form['auth[driver]'].onchange();
 </script>
 <?php
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
-		echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
 	
 	/** Authorize the user
@@ -117,7 +125,7 @@ username.form['driver'].onchange();
 		} else {
 			$links["create"] = lang('Alter table');
 		}
-		if (isset($set)) {
+		if ($set !== null) {
 			$links["edit"] = lang('New item');
 		}
 		foreach ($links as $key => $val) {
@@ -184,9 +192,9 @@ username.form['driver'].onchange();
 	* @return string
 	*/
 	function selectVal($val, $link, $field) {
-		$return = ($val != "<i>NULL</i>" && ereg("char|binary", $field["type"]) && !ereg("var", $field["type"]) ? "<code>$val</code>" : $val);
+		$return = ($val === null ? "<i>NULL</i>" : (ereg("char|binary", $field["type"]) && !ereg("var", $field["type"]) ? "<code>$val</code>" : $val));
 		if (ereg('blob|bytea|raw|file', $field["type"]) && !is_utf8($val)) {
-			$return = lang('%d byte(s)', strlen(html_entity_decode($val, ENT_QUOTES)));
+			$return = lang('%d byte(s)', strlen($val));
 		}
 		return ($link ? "<a href='$link'>$return</a>" : $return);
 	}
@@ -197,7 +205,7 @@ username.form['driver'].onchange();
 	* @return string
 	*/
 	function editVal($val, $field) {
-		return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val);
+		return $val;
 	}
 	
 	/** Print columns box in select
@@ -213,7 +221,7 @@ username.form['driver'].onchange();
 		foreach ($select as $key => $val) {
 			$val = $_GET["columns"][$key];
 			echo "<div>" . html_select("columns[$i][fun]", array(-1 => "") + $fun_group, $val["fun"]);
-			echo "(<select name='columns[$i][col]'><option>" . optionlist($columns, $val["col"], true) . "</select>)</div>\n";
+			echo "(<select name='columns[$i][col]' onchange='selectFieldChange(this.form);'><option>" . optionlist($columns, $val["col"], true) . "</select>)</div>\n";
 			$i++;
 		}
 		echo "<div>" . html_select("columns[$i][fun]", array(-1 => "") + $fun_group, "", "this.nextSibling.nextSibling.onchange();");
@@ -232,23 +240,22 @@ username.form['driver'].onchange();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
 				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
-				echo " <input name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
+				echo " <input name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "' onchange='selectFieldChange(this.form);'>";
 				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
 				echo "<br>\n";
 			}
 		}
-		$i = 0;
-		foreach ((array) $_GET["where"] as $val) {
-			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
-				echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
-				echo html_select("where[$i][op]", $this->operators, $val["op"]);
-				echo "<input name='where[$i][val]' value='" . h($val["val"]) . "'></div>\n";
-				$i++;
+		$_GET["where"] = (array) $_GET["where"];
+		reset($_GET["where"]);
+		$change_next = "this.nextSibling.onchange();";
+		for ($i = 0; $i <= count($_GET["where"]); $i++) {
+			list(, $val) = each($_GET["where"]);
+			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
+				echo "<div><select name='where[$i][col]' onchange='$change_next'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
+				echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
+				echo "<input name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";'></div>\n";
 			}
 		}
-		echo "<div><select name='where[$i][col]' onchange='this.nextSibling.nextSibling.onchange();'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, null, true) . "</select>";
-		echo html_select("where[$i][op]", $this->operators, "=");
-		echo "<input name='where[$i][val]' onchange='selectAddRow(this);'></div>\n";
 		echo "</div></fieldset>\n";
 	}
 	
@@ -263,7 +270,7 @@ username.form['driver'].onchange();
 		$i = 0;
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if (isset($columns[$val])) {
-				echo "<div><select name='order[$i]'><option>" . optionlist($columns, $val, true) . "</select>";
+				echo "<div><select name='order[$i]' onchange='selectFieldChange(this.form);'><option>" . optionlist($columns, $val, true) . "</select>";
 				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
 				$i++;
 			}
@@ -279,7 +286,7 @@ username.form['driver'].onchange();
 	*/
 	function selectLimitPrint($limit) {
 		echo "<fieldset><legend>" . lang('Limit') . "</legend><div>"; // <div> for easy styling
-		echo "<input name='limit' size='3' value='" . h($limit) . "'>";
+		echo "<input name='limit' size='3' value='" . h($limit) . "' onchange='selectFieldChange(this.form);'>";
 		echo "</div></fieldset>\n";
 	}
 	
@@ -288,7 +295,7 @@ username.form['driver'].onchange();
 	* @return null
 	*/
 	function selectLengthPrint($text_length) {
-		if (isset($text_length)) {
+		if ($text_length !== null) {
 			echo "<fieldset><legend>" . lang('Text length') . "</legend><div>";
 			echo '<input name="text_length" size="3" value="' . h($text_length) . '">';
 			echo "</div></fieldset>\n";
@@ -296,11 +303,28 @@ username.form['driver'].onchange();
 	}
 	
 	/** Print action box in select
+	* @param array
 	* @return null
 	*/
-	function selectActionPrint() {
+	function selectActionPrint($indexes) {
 		echo "<fieldset><legend>" . lang('Action') . "</legend><div>";
 		echo "<input type='submit' value='" . lang('Select') . "'>";
+		echo " <span id='noindex' title='" . lang('Full table scan') . "'></span>";
+		echo "<script type='text/javascript'>\n";
+		echo "var indexColumns = ";
+		$columns = array();
+		foreach ($indexes as $index) {
+			if ($index["type"] != "FULLTEXT") {
+				$columns[reset($index["columns"])] = 1;
+			}
+		}
+		$columns[""] = 1;
+		foreach ($columns as $key => $val) {
+			json_row($key);
+		}
+		echo ";\n";
+		echo "selectFieldChange(document.getElementById('form'));\n";
+		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
 	
@@ -315,7 +339,7 @@ username.form['driver'].onchange();
 	* @return bool whether to print default import
 	*/
 	function selectImportPrint() {
-		return true;
+		return !information_schema(DB);
 	}
 	
 	/** Print extra text in the end of a select form
@@ -378,9 +402,12 @@ username.form['driver'].onchange();
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if (is_numeric($val["val"]) || !ereg('int|float|double|decimal', $field["type"])) {
+						$is_text = ereg('char|text|enum|set', $field["type"]);
+						if ((is_numeric($val["val"]) || !ereg('int|float|double|decimal|bit', $field["type"]))
+							&& (!ereg("[\x80-\xFF]", $val["val"]) || $is_text)
+						) {
 							$name = idf_escape($name);
-							$cols[] = ($jush == "sql" && ereg('char|text|enum|set', $field["type"]) && !ereg('^utf8', $field["collation"]) ? "CONVERT($name USING utf8)" : $name);
+							$cols[] = ($jush == "sql" && $is_text && !ereg('^utf8', $field["collation"]) ? "CONVERT($name USING utf8)" : $name);
 						}
 					}
 					$return[] = ($cols ? "(" . implode("$cond OR ", $cols) . "$cond)" : "0");
@@ -428,6 +455,19 @@ username.form['driver'].onchange();
 		return false;
 	}
 	
+	/** Build SQL query used in select
+	* @param array result of selectColumnsProcess()[0]
+	* @param array result of selectSearchProcess()
+	* @param array result of selectColumnsProcess()[1]
+	* @param array result of selectOrderProcess()
+	* @param int result of selectLimitProcess()
+	* @param int index of page starting at zero
+	* @return string empty string to use default query
+	*/
+	function selectQueryBuild($select, $where, $group, $order, $limit, $page) {
+		return "";
+	}
+	
 	/** Query printed after execution in the message
 	* @param string executed query
 	* @return string
@@ -438,11 +478,11 @@ username.form['driver'].onchange();
 		restart_session();
 		$id = "sql-" . ($count++);
 		$history = &get_session("queries");
-		if (strlen($query) > 1e6) { // not DB - reset in drop database
+		if (strlen($query) > 1e6) {
 			$query = ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..."; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 		}
-		$history[$_GET["db"]][] = $query; // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
-		return " <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre><p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a></div>';
+		$history[$_GET["db"]][] = array($query, time()); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
+		return " <span class='time'>" . @date("H:i:s") . "</span> <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a><div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre><p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a></div>'; // @ - time zone may be not set
 	}
 	
 	/** Functions displayed in edit form
@@ -477,7 +517,7 @@ username.form['driver'].onchange();
 	function editInput($table, $field, $attrs, $value) {
 		if ($field["type"] == "enum") {
 			return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
-				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
+				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
 				. enum_input("radio", $attrs, $field, $value, 0) // 0 - empty
 			;
 		}
@@ -506,13 +546,10 @@ username.form['driver'].onchange();
 			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+$~i", $value) ? $value : $return);
 		} elseif (ereg('^(addtime|subtime|concat)$', $function)) {
 			$return = "$function(" . idf_escape($name) . ", $return)";
-		} elseif (ereg('^(md5|sha1|password|encrypt|hex)$', $function)) {
+		} elseif (ereg('^(md5|sha1|password|encrypt)$', $function)) {
 			$return = "$function($return)";
 		}
-		if (ereg("binary", $field["type"])) {
-			$return = "unhex($return)";
-		}
-		return $return;
+		return unconvert_field($field, $return);
 	}
 	
 	/** Returns export output options
@@ -556,8 +593,7 @@ username.form['driver'].onchange();
 					echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . table($table) . ";\n";
 				}
 				if ($is_view) {
-					// remove DEFINER with current user
-					$create = preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $create); //! proper escaping of user
+					$create = remove_definer($create);
 				}
 				echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
 			}
@@ -577,12 +613,12 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
 				$after = "";
 				foreach (get_rows($query) as $row) {
 					$default = $row["COLUMN_DEFAULT"];
-					$row["default"] = (isset($default) ? q($default) : "NULL");
+					$row["default"] = ($default !== null ? q($default) : "NULL");
 					$row["after"] = q($after); //! rgt AFTER lft, lft AFTER id doesn't work
 					$row["alter"] = escape_string(idf_escape($row["COLUMN_NAME"])
 						. " $row[COLUMN_TYPE]"
 						. ($row["COLLATION_NAME"] ? " COLLATE $row[COLLATION_NAME]" : "")
-						. (isset($default) ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
+						. ($default !== null ? " DEFAULT " . ($default == "CURRENT_TIMESTAMP" ? $default : $row["default"]) : "")
 						. ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
 						. ($row["EXTRA"] ? " $row[EXTRA]" : "")
 						. ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
@@ -655,43 +691,45 @@ DROP PROCEDURE adminer_alter;
 			if ($result) {
 				$insert = "";
 				$buffer = "";
-				while ($row = $result->fetch_assoc()) {
+				$keys = array();
+				$suffix = "";
+				while ($row = $result->fetch_row()) {
+					if (!$keys) {
+						$values = array();
+						foreach ($row as $val) {
+							$field = $result->fetch_field();
+							$keys[] = $field->name;
+							$key = idf_escape($field->name);
+							$values[] = "$key = VALUES($key)";
+						}
+						$suffix = ($style == "INSERT+UPDATE" ? "\nON DUPLICATE KEY UPDATE " . implode(", ", $values) : "") . ";\n";
+					}
 					if ($_POST["format"] != "sql") {
 						if ($style == "table") {
-							dump_csv(array_keys($row));
+							dump_csv($keys);
 							$style = "INSERT";
 						}
 						dump_csv($row);
 					} else {
 						if (!$insert) {
-							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
-							$row[$key] = (isset($val) ? (ereg('int|float|double|decimal|bit', $fields[$key]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
+							$row[$key] = ($val !== null ? (ereg('int|float|double|decimal|bit', $fields[$keys[$key]]["type"]) ? $val : q($val)) : "NULL"); //! columns looking like functions
 						}
-						$s = implode(",\t", $row);
-						if ($style == "INSERT+UPDATE") {
-							$set = array();
-							foreach ($row as $key => $val) {
-								$set[] = idf_escape($key) . " = $val";
-							}
-							echo "$insert ($s) ON DUPLICATE KEY UPDATE " . implode(", ", $set) . ";\n";
+						$s = ($max_packet ? "\n" : " ") . "(" . implode(",\t", $row) . ")";
+						if (!$buffer) {
+							$buffer = $insert . $s;
+						} elseif (strlen($buffer) + 4 + strlen($s) + strlen($suffix) < $max_packet) { // 4 - length specification
+							$buffer .= ",$s";
 						} else {
-							$s = ($max_packet ? "\n" : " ") . "($s)";
-							if (!$buffer) {
-								$buffer = $insert . $s;
-							} elseif (strlen($buffer) + 4 + strlen($s) < $max_packet) { // 4 - length specification
-								$buffer .= ",$s";
-							} else {
-								echo "$buffer;\n";
-								$buffer = $insert . $s;
-							}
+							echo $buffer . $suffix;
+							$buffer = $insert . $s;
 						}
 					}
 				}
-				if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
-					$buffer .= ";\n";
-					echo $buffer;
+				if ($buffer) {
+					echo $buffer . $suffix;
 				}
 			} elseif ($_POST["format"] == "sql") {
 				echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
@@ -699,6 +737,14 @@ DROP PROCEDURE adminer_alter;
 		}
 	}
 	
+	/** Set export filename
+	* @param string
+	* @return string filename without extension
+	*/
+	function dumpFilename($identifier) {
+		return friendly_url($identifier != "" ? $identifier : (SERVER != "" ? SERVER : "localhost"));
+	}
+	
 	/** Send headers for export
 	* @param string
 	* @param bool
@@ -738,7 +784,7 @@ DROP PROCEDURE adminer_alter;
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $connection, $token, $jush, $drivers;
+		global $VERSION, $token, $jush, $drivers;
 		?>
 <h1>
 <?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
@@ -750,18 +796,20 @@ DROP PROCEDURE adminer_alter;
 			foreach ((array) $_SESSION["pwds"] as $driver => $servers) {
 				foreach ($servers as $server => $usernames) {
 					foreach ($usernames as $username => $password) {
-						if (isset($password)) {
+						if ($password !== null) {
 							if ($first) {
-								echo "<p onclick='eventStop(event);'>\n";
+								echo "<p id='logins' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 								$first = false;
 							}
-							echo "<a href='" . h(auth_url($driver, $server, $username)) . "'>($drivers[$driver]) " . h($username . ($server != "" ? "@$server" : "")) . "</a><br>\n";
+							$dbs = $_SESSION["db"][$driver][$server][$username];
+							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
+								echo "<a href='" . h(auth_url($driver, $server, $username, $db)) . "'>($drivers[$driver]) " . h($username . ($server != "" ? "@$server" : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
+							}
 						}
 					}
 				}
 			}
 		} else {
-			$databases = $this->databases();
 			?>
 <form action="" method="post">
 <p class="logout">
@@ -773,57 +821,69 @@ DROP PROCEDURE adminer_alter;
 				}
 			}
 			?>
-<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" onclick="eventStop(event);">
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </p>
 </form>
-<form action="">
-<p>
-<?php hidden_fields_get(); ?>
-<?php echo ($databases ? html_select("db", array("" => "(" . lang('database') . ")") + $databases, DB, "this.form.submit();") : '<input name="db" value="' . h(DB) . '">'); ?>
-<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?> onclick="eventStop(event);">
 <?php
-			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-				if (support("scheme")) {
-					echo "<br>" . html_select("ns", array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"], "this.form.submit();");
-					if ($_GET["ns"] != "") {
-						set_schema($_GET["ns"]);
+			$this->databasesPrint($missing);
+			if ($_GET["ns"] !== "" && !$missing && DB != "") {
+				echo '<p><a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create new table') . "</a>\n";
+				$tables = tables_list();
+				if (!$tables) {
+					echo "<p class='message'>" . lang('No tables.') . "\n";
+				} else {
+					$this->tablesPrint($tables);
+					$links = array();
+					foreach ($tables as $table => $type) {
+						$links[] = preg_quote($table, '/');
 					}
-				}
-				if ($_GET["ns"] !== "" && !$missing) {
-					echo '<p><a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create new table') . "</a>\n";
-					$tables = tables_list();
-					if (!$tables) {
-						echo "<p class='message'>" . lang('No tables.') . "\n";
-					} else {
-						$this->tablesPrint($tables);
-						$links = array();
-						foreach ($tables as $table => $type) {
-							$links[] = preg_quote($table, '/');
-						}
-						echo "<script type='text/javascript'>\n";
-						echo "var jushLinks = { $jush: [ '" . js_escape(ME) . "table=\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
-						foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
-							echo "jushLinks.$val = jushLinks.$jush;\n";
-						}
-						echo "</script>\n";
+					echo "<script type='text/javascript'>\n";
+					echo "var jushLinks = { $jush: [ '" . js_escape(ME) . "table=\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+					foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
+						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
+					echo "</script>\n";
 				}
 			}
-			echo (isset($_GET["sql"]) ? '<input type="hidden" name="sql" value="">'
-				: (isset($_GET["schema"]) ? '<input type="hidden" name="schema" value="">'
-				: (isset($_GET["dump"]) ? '<input type="hidden" name="dump" value="">'
-			: "")));
-			echo "</p></form>\n";
 		}
 	}
 	
+	/** Prints databases list in menu
+	* @param string
+	* @return null
+	*/
+	function databasesPrint($missing) {
+		global $connection;
+		$databases = $this->databases();
+		?>
+<form action="">
+<p id="dbs">
+<?php hidden_fields_get(); ?>
+<?php echo ($databases ? html_select("db", array("" => "(" . lang('database') . ")") + $databases, DB, "this.form.submit();") : '<input name="db" value="' . h(DB) . '">'); ?>
+<input type="submit" value="<?php echo lang('Use'); ?>"<?php echo ($databases ? " class='hidden'" : ""); ?>>
+<?php
+		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
+			if (support("scheme")) {
+				echo "<br>" . html_select("ns", array("" => "(" . lang('schema') . ")") + schemas(), $_GET["ns"], "this.form.submit();");
+				if ($_GET["ns"] != "") {
+					set_schema($_GET["ns"]);
+				}
+			}
+		}
+		echo (isset($_GET["sql"]) ? '<input type="hidden" name="sql" value="">'
+			: (isset($_GET["schema"]) ? '<input type="hidden" name="schema" value="">'
+			: (isset($_GET["dump"]) ? '<input type="hidden" name="dump" value="">'
+		: "")));
+		echo "</p></form>\n";
+	}
+	
 	/** Prints table list in menu
 	* @param array
 	* @return null
 	*/
 	function tablesPrint($tables) {
-		echo "<p id='tables'>\n";
+		echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 		foreach ($tables as $table => $type) {
 			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table) . ">" . lang('select') . "</a> ";
 			echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold($_GET["table"] == $table) . " title='" . lang('Show structure') . "'>" . $this->tableName(array("Name" => $table)) . "</a><br>\n"; //! Adminer::tableName may work with full table status
@@ -833,6 +893,6 @@ DROP PROCEDURE adminer_alter;
 }
 
 $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
-if (!isset($adminer->operators)) {
+if ($adminer->operators === null) {
 	$adminer->operators = $operators;
 }

adminer/include/auth.inc.php

@@ -14,21 +14,24 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
-if (isset($_POST["server"])) {
+$auth = $_POST["auth"];
+if ($auth) {
 	session_regenerate_id(); // defense against session fixation
-	$_SESSION["pwds"][$_POST["driver"]][$_POST["server"]][$_POST["username"]] = $_POST["password"];
-	if ($_POST["permanent"]) {
-		$key = base64_encode($_POST["driver"]) . "-" . base64_encode($_POST["server"]) . "-" . base64_encode($_POST["username"]);
+	$_SESSION["pwds"][$auth["driver"]][$auth["server"]][$auth["username"]] = $auth["password"];
+	$_SESSION["db"][$auth["driver"]][$auth["server"]][$auth["username"]][$auth["db"]] = true;
+	if ($auth["permanent"]) {
+		$key = base64_encode($auth["driver"]) . "-" . base64_encode($auth["server"]) . "-" . base64_encode($auth["username"]) . "-" . base64_encode($auth["db"]);
 		$private = $adminer->permanentLogin();
-		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($_POST["password"], $private) : "");
+		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($auth["password"], $private) : "");
 		cookie("adminer_permanent", implode(" ", $permanent));
 	}
-	if (count($_POST) == ($_POST["permanent"] ? 5 : 4) // 4 - driver, server, username, password
-		|| DRIVER != $_POST["driver"]
-		|| SERVER != $_POST["server"]
-		|| $_GET["username"] !== $_POST["username"] // "0" == "00"
+	if (count($_POST) == 1 // 1 - auth
+		|| DRIVER != $auth["driver"]
+		|| SERVER != $auth["server"]
+		|| $_GET["username"] !== $auth["username"] // "0" == "00"
+		|| DB != $auth["db"]
 	) {
-		redirect(auth_url($_POST["driver"], $_POST["server"], $_POST["username"]));
+		redirect(auth_url($auth["driver"], $auth["server"], $auth["username"], $auth["db"]));
 	}
 } elseif ($_POST["logout"]) {
 	if ($token && $_POST["token"] != $token) {
@@ -36,14 +39,10 @@ if (isset($_POST["server"])) {
 		page_footer("db");
 		exit;
 	} else {
-		foreach (array("pwds", "dbs", "queries") as $key) {
+		foreach (array("pwds", "db", "dbs", "queries") as $key) {
 			set_session($key, null);
 		}
-		$key = base64_encode(DRIVER) . "-" . base64_encode(SERVER) . "-" . base64_encode($_GET["username"]);
-		if ($permanent[$key]) {
-			unset($permanent[$key]);
-			cookie("adminer_permanent", implode(" ", $permanent));
-		}
+		unset_permanent();
 		redirect(substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
 	}
 } elseif ($permanent && !$_SESSION["pwds"]) {
@@ -51,11 +50,23 @@ if (isset($_POST["server"])) {
 	$private = $adminer->permanentLogin(); // try to decode even if not set
 	foreach ($permanent as $key => $val) {
 		list(, $cipher) = explode(":", $val);
-		list($driver, $server, $username) = array_map('base64_decode', explode("-", $key));
+		list($driver, $server, $username, $db) = array_map('base64_decode', explode("-", $key));
 		$_SESSION["pwds"][$driver][$server][$username] = decrypt_string(base64_decode($cipher), $private);
+		$_SESSION["db"][$driver][$server][$username][$db] = true;
 	}
 }
 
+function unset_permanent() {
+	global $permanent;
+	foreach ($permanent as $key => $val) {
+		list($driver, $server, $username) = array_map('base64_decode', explode("-", $key));
+		if ($driver == DRIVER && $server == SERVER && $db == $_GET["username"]) {
+			unset($permanent[$key]);
+		}
+	}
+	cookie("adminer_permanent", implode(" ", $permanent));
+}
+
 function auth_error($exception = null) {
 	global $connection, $adminer, $token;
 	$session_name = session_name();
@@ -67,17 +78,18 @@ function auth_error($exception = null) {
 			$error = lang('Session expired, please login again.');
 		} else {
 			$password = &get_session("pwds");
-			if (isset($password)) {
+			if ($password !== null) {
 				$error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.')));
 				$password = null;
 			}
+			unset_permanent();
 		}
 	}
 	page_header(lang('Login'), $error, null);
-	echo "<form action='' method='post' onclick='eventStop(event);'>\n";
+	echo "<form action='' method='post'>\n";
 	$adminer->loginForm();
 	echo "<div>";
-	hidden_fields($_POST, array("driver", "server", "username", "password", "permanent")); // expired session
+	hidden_fields($_POST, array("auth")); // expired session
 	echo "</div>\n";
 	echo "</form>\n";
 	page_footer("auth");
@@ -85,7 +97,8 @@ function auth_error($exception = null) {
 
 if (isset($_GET["username"])) {
 	if (!class_exists("Min_DB")) {
-		unset($_SESSION["pwds"][DRIVER]); //! remove also from adminer_permanent
+		unset($_SESSION["pwds"][DRIVER]);
+		unset_permanent();
 		page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
 		page_footer("auth");
 		exit;
@@ -98,7 +111,7 @@ if (is_string($connection) || !$adminer->login($_GET["username"], get_session("p
 }
 
 $token = $_SESSION["token"]; ///< @var string CSRF protection
-if (isset($_POST["server"]) && $_POST["token"]) {
+if ($auth && $_POST["token"]) {
 	$_POST["token"] = $token; // reset token after explicit login
 }
 $error = ($_POST ///< @var string

adminer/include/bootstrap.inc.php

@@ -21,7 +21,8 @@ if (isset($_GET["file"])) {
 
 include "../adminer/include/functions.inc.php";
 
-global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $structured_types, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
+
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; 
 }
@@ -73,12 +74,13 @@ include "./include/adminer.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
-include "./include/connect.inc.php";
-include "./include/editing.inc.php";
 
-session_cache_limiter(""); // to allow restarting session
 if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
+	session_cache_limiter(""); // to allow restarting session
 	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 
+include "./include/connect.inc.php";
+include "./include/editing.inc.php";
+
 $on_actions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()

adminer/include/connect.inc.php

@@ -23,9 +23,7 @@ function connect_error() {
 		}
 		echo "<p>" . lang('%s version: %s through PHP extension %s', $drivers[DRIVER], "<b>$connection->server_info</b>", "<b>$connection->extension</b>") . "\n";
 		echo "<p>" . lang('Logged as: %s', "<b>" . h(logged_user()) . "</b>") . "\n";
-		if ($_GET["refresh"]) {
-			set_session("dbs", null);
-		}
+		$refresh = "<a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>\n";
 		$databases = $adminer->databases();
 		if ($databases) {
 			$scheme = support("scheme");
@@ -43,10 +41,12 @@ function connect_error() {
 			}
 			echo "</table>\n";
 			echo "<script type='text/javascript'>tableCheck();</script>\n";
-			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)", 1) . ">\n"; // 1 - eventStop
+			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)") . ">\n";
 			echo "<input type='hidden' name='token' value='$token'>\n";
-			echo "<a href='" . h(ME) . "refresh=1' onclick='eventStop(event);'>" . lang('Refresh') . "</a>\n";
+			echo $refresh;
 			echo "</form>\n";
+		} else {
+			echo "<p>$refresh";
 		}
 	}
 	page_footer("db");
@@ -58,8 +58,9 @@ function connect_error() {
 if (isset($_GET["status"])) {
 	$_GET["variables"] = $_GET["status"];
 }
-if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect")) {
-	if (DB != "") {
+if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
+	if (DB != "" || $_GET["refresh"]) {
+		restart_session();
 		set_session("dbs", null);
 	}
 	connect_error(); // separate function to catch SQLite error

adminer/include/design.inc.php

@@ -15,10 +15,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	}
 	$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
-	if (is_ajax()) {
-		header("X-AJAX-Title: " . rawurlencode($title_page));
-	} else {
-		?>
+	?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -26,10 +23,6 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <meta name="robots" content="noindex">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
-<script type="text/javascript">
-var areYouSure = '<?php echo lang('Resend POST data?'); ?>';
-var noResponse = '<?php echo lang('No response from server.'); ?>';
-</script>
 <script type="text/javascript" src="../adminer/static/functions.js"></script>
 <script type="text/javascript" src="static/editing.js"></script>
 <?php if ($adminer->head()) { ?>
@@ -39,16 +32,14 @@ var noResponse = '<?php echo lang('No response from server.'); ?>';
 <?php } ?>
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?> nojs"<?php echo ($_POST ? "" : " onclick=\"return bodyClick(event, '" . h(js_escape(DB) . "', '" . js_escape($_GET["ns"])) . "');\""); // avoid re-post confirmation after refreshing the next page in Google Chrome ?> onkeydown="bodyKeydown(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion();"); ?>">
+<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion();"); ?>">
 <script type="text/javascript">
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 </script>
 
-<div id="loader"><img src="../adminer/static/loader.gif" alt=""></div>
 <div id="content">
 <?php
-	}
-	if (isset($breadcrumb)) {
+	if ($breadcrumb !== null) {
 		$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
 		echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
 		$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
@@ -86,6 +77,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 	if (DB != "" && $databases && !in_array(DB, $databases, true)) {
 		$databases = null;
 	}
+	stop_session();
 	if ($error) {
 		echo "<div class='error'>$error</div>\n";
 	}
@@ -98,8 +90,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 */
 function page_footer($missing = "") {
 	global $adminer;
-	if (!is_ajax()) {
-		?>
+	?>
 </div>
 
 <?php switch_lang(); ?>
@@ -107,5 +98,4 @@ function page_footer($missing = "") {
 <?php $adminer->navigation($missing); ?>
 </div>
 <?php
-	}
 }

adminer/include/editing.inc.php

@@ -3,14 +3,16 @@
 * @param Min_Result
 * @param Min_DB connection to examine indexes
 * @param string base link for <th> fields
+* @param array 
 * @return null
 */
-function select($result, $connection2 = null, $href = "") {
+function select($result, $connection2 = null, $href = "", $orgtables = array()) {
 	$links = array(); // colno => orgtable - create links from these columns
 	$indexes = array(); // orgtable => array(column => colno) - primary keys
 	$columns = array(); // orgtable => array(column => ) - not selected columns in primary key
 	$blobs = array(); // colno => bool - display bytes for blobs
 	$types = array(); // colno => type - display char in <code>
+	$return = array(); // table => orgtable - mapping to use in EXPLAIN
 	odd(''); // reset odd for each result
 	for ($i=0; $row = $result->fetch_row(); $i++) {
 		if (!$i) {
@@ -21,6 +23,7 @@ function select($result, $connection2 = null, $href = "") {
 				$name = $field->name;
 				$orgtable = $field->orgtable;
 				$orgname = $field->orgname;
+				$return[$field->table] = $orgtable;
 				if ($href) { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
@@ -52,7 +55,7 @@ function select($result, $connection2 = null, $href = "") {
 		}
 		echo "<tr" . odd() . ">";
 		foreach ($row as $key => $val) {
-			if (!isset($val)) {
+			if ($val === null) {
 				$val = "<i>NULL</i>";
 			} elseif ($blobs[$key] && !is_utf8($val)) {
 				$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
@@ -66,7 +69,8 @@ function select($result, $connection2 = null, $href = "") {
 			}
 			if (isset($links[$key]) && !$columns[$links[$key]]) {
 				if ($href) { // MySQL EXPLAIN
-					$link = $links[$key] . urlencode($row[array_search("table=", $links)]);
+					$table = $row[array_search("table=", $links)];
+					$link = $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
 				} else {
 					$link = "edit=" . urlencode($links[$key]);
 					foreach ($indexes[$links[$key]] as $col => $j) {
@@ -79,6 +83,7 @@ function select($result, $connection2 = null, $href = "") {
 		}
 	}
 	echo ($i ? "</table>" : "<p class='message'>" . lang('No rows.')) . "\n";
+	return $return;
 }
 
 /** Get referencable tables with single column primary key except self
@@ -114,7 +119,7 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event);'>"; // spellcheck, wrap - not valid before HTML5
 	if (is_array($value)) {
 		foreach ($value as $val) { // not implode() to save memory
-			echo h($val) . "\n\n\n";
+			echo h($val[0]) . "\n\n\n"; // $val == array($query, $time)
 		}
 	} else {
 		echo h($value);
@@ -229,7 +234,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <td<?php echo ($_POST["defaults"] ? "" : " class='hidden'"); ?>><?php echo lang('Default values'); ?>
 <?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
 <?php } ?>
-<td><?php echo "<input type='image' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
+<td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
 </thead>
 <tbody onkeydown="return editingKeydown(event);">
 <?php
@@ -251,11 +256,11 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <?php
 		echo "<td>";
 		echo (support("move_col") ?
-			"<input type='image' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>&nbsp;"
-			. "<input type='image' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;"
-			. "<input type='image' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;"
+			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>&nbsp;"
+			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;"
+			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;"
 		: "");
-		echo ($orig == "" || support("drop_col") ? "<input type='image' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editingRemoveRow(this);'>" : "");
+		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editingRemoveRow(this);'>" : "");
 		echo "\n";
 	}
 }
@@ -352,6 +357,14 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
 	return $dropped;
 }
 
+/** Remove current user definer from SQL command
+ * @param string
+ * @return string
+ */
+function remove_definer($query) {
+	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $query); //! proper escaping of user
+}
+
 /** Get string to add a file in TAR
 * @param string
 * @param string
@@ -361,7 +374,7 @@ function tar_file($filename, $contents) {
 	$return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct(strlen($contents)), decoct(time()));
 	$checksum = 8*32; // space for checksum itself
 	for ($i=0; $i < strlen($return); $i++) {
-		$checksum += ord($return{$i});
+		$checksum += ord($return[$i]);
 	}
 	$return .= sprintf("%06o", $checksum) . "\0 ";
 	return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);

adminer/include/functions.inc.php

@@ -149,11 +149,10 @@ function html_select($name, $options, $value = "", $onchange = true) {
 
 /** Get onclick confirmation
 * @param string JavaScript expression
-* @param bool stop event propagation
 * @return string
 */
-function confirm($count = "", $stop = false) {
-	return " onclick=\"" . ($stop ? "eventStop(event); " : "") . "return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
+function confirm($count = "") {
+	return " onclick=\"return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
 }
 
 /** Print header for hidden fieldset (close by </div></fieldset>)
@@ -206,7 +205,7 @@ function json_row($key, $val = null) {
 		echo "{";
 	}
 	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\") . '": ' . (isset($val) ? '"' . addcslashes($val, "\r\n\"\\") . '"' : 'undefined');
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\") . '"' : 'undefined');
 		$first = false;
 	} else {
 		echo "\n}\n";
@@ -228,7 +227,7 @@ function ini_bool($ini) {
 */
 function sid() {
 	static $return;
-	if (!isset($return)) { // restart_session() defines SID
+	if ($return === null) { // restart_session() defines SID
 		$return = (SID && !($_COOKIE && ini_bool("session.use_cookies"))); // $_COOKIE - don't pass SID with permanent login
 	}
 	return $return;
@@ -360,11 +359,11 @@ function where_check($val) {
 * @param int condition order
 * @param string column identifier
 * @param string
-* @return string
+* @param string
 * @return string
 */
 function where_link($i, $column, $value, $operator = "=") {
-	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode((isset($value) ? $operator : "IS NULL")) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value);
+	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode(($value !== null ? $operator : "IS NULL")) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
 /** Set cookie valid for 1 month
@@ -397,6 +396,15 @@ function restart_session() {
 	}
 }
 
+/** Stop session if it would be possible to restart it later
+* @return null
+*/
+function stop_session() {
+	if (!ini_bool("session.use_cookies")) {
+		session_write_close();
+	}
+}
+
 /** Get session variable for current server
 * @param string
 * @return mixed
@@ -418,15 +426,17 @@ function set_session($key, $val) {
 * @param string
 * @param string
 * @param string
+* @param string
 * @return string
 */
-function auth_url($driver, $server, $username) {
+function auth_url($driver, $server, $username, $db = null) {
 	global $drivers;
-	preg_match('~([^?]*)\\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . session_name()), $match);
+	preg_match('~([^?]*)\\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . ($db !== null ? "db|" : "") . session_name()), $match);
 	return "$match[1]?"
 		. (sid() ? SID . "&" : "")
 		. ($driver != "server" || $server != "" ? urlencode($driver) . "=" . urlencode($server) . "&" : "")
 		. "username=" . urlencode($username)
+		. ($db != "" ? "&db=" . urlencode($db) : "")
 		. ($match[2] ? "&$match[2]" : "")
 	;
 }
@@ -444,15 +454,15 @@ function is_ajax() {
 * @return null
 */
 function redirect($location, $message = null) {
-	if (isset($message)) {
+	if ($message !== null) {
 		restart_session();
-		$_SESSION["messages"][preg_replace('~^[^?]*~', '', (isset($location) ? $location : $_SERVER["REQUEST_URI"]))][] = $message;
+		$_SESSION["messages"][preg_replace('~^[^?]*~', '', ($location !== null ? $location : $_SERVER["REQUEST_URI"]))][] = $message;
 	}
-	if (isset($location)) {
+	if ($location !== null) {
 		if ($location == "") {
 			$location = ".";
 		}
-		header((is_ajax() ? "X-AJAX-Redirect" : "Location") . ": $location");
+		header("Location: $location");
 		exit;
 	}
 }
@@ -492,7 +502,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 function queries($query = null) {
 	global $connection;
 	static $queries = array();
-	if (!isset($query)) {
+	if ($query === null) {
 		// return executed queries without parameter
 		return implode(";\n", $queries);
 	}
@@ -535,6 +545,7 @@ function remove_from_uri($param = "") {
 
 /** Generate page number for pagination
 * @param int
+* @param int
 * @return string
 */
 function pagination($page, $current) {
@@ -668,7 +679,7 @@ function column_foreign_keys($table) {
 function enum_input($type, $attrs, $field, $value, $empty = null) {
 	global $adminer;
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
-	$return = (isset($empty) ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
+	$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));
@@ -705,7 +716,7 @@ function input($field, $value, $function) {
 		}
 		$onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
 		$attrs .= $onchange;
-		echo (count($functions) > 1 ? html_select("function[$name]", $functions, !isset($function) || in_array($function, $functions) || isset($functions[$function]) ? $function : "", "functionChange(this);") : nbsp(reset($functions))) . '<td>';
+		echo (count($functions) > 1 ? html_select("function[$name]", $functions, $function === null || in_array($function, $functions) || isset($functions[$function]) ? $function : "", "functionChange(this);") : nbsp(reset($functions))) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
@@ -718,8 +729,14 @@ function input($field, $value, $function) {
 			}
 		} elseif (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
 			echo "<input type='file' name='fields-$name'$onchange>";
-		} elseif (ereg('text|lob', $field["type"])) {
-			echo "<textarea " . ($jush != "sqlite" || ereg("\n", $value) ? "cols='50' rows='12'" : "cols='30' rows='1' style='height: 1.2em;'") . "$attrs>" . h($value) . '</textarea>'; // 1.2em - line-height
+		} elseif (($text = ereg('text|lob', $field["type"])) || ereg("\n", $value)) {
+			if ($text && $jush != "sqlite") {
+				$attrs .= " cols='50' rows='12'";
+			} else {
+				$rows = min(12, substr_count($value, "\n") + 1);
+				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
+			}
+			echo "<textarea$attrs>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
 			$maxlength = (!ereg('int', $field["type"]) && preg_match('~^(\\d+)(,(\\d+))?$~', $field["length"], $match) ? ((ereg("binary", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
@@ -782,12 +799,14 @@ function search_tables() {
 		$name = $adminer->tableName($table_status);
 		if (isset($table_status["Engine"]) && $name != "" && (!$_POST["tables"] || in_array($table, $_POST["tables"]))) {
 			$result = $connection->query("SELECT" . limit("1 FROM " . table($table), " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())), 1));
-			if ($result->fetch_row()) {
+			if (!$result || $result->fetch_row()) {
 				if (!$found) {
 					echo "<ul>\n";
 					$found = true;
 				}
-				echo "<li><a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>\n";
+				echo "<li>" . ($result
+					? "<a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>\n"
+					: "$name: <span class='error'>" . error() . "</span>\n");
 			}
 		}
 	}
@@ -804,7 +823,7 @@ function dump_headers($identifier, $multi_table = false) {
 	$return = $adminer->dumpHeaders($identifier, $multi_table);
 	$output = $_POST["output"];
 	if ($output != "text") {
-		header("Content-Disposition: attachment; filename=" . friendly_url($identifier != "" ? $identifier : (SERVER != "" ? SERVER : "localhost")) . ".$return" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
+		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
 	}
 	session_write_close();
 	return $return;
@@ -882,3 +901,72 @@ function is_url($string) {
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
 	return (preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string, $match) ? strtolower($match[1]) : ""); //! restrict path, query and fragment characters
 }
+
+/** Run query which can be killed by AJAX call after timing out
+* @param string
+* @return Min_Result
+*/
+function slow_query($query) {
+	global $adminer, $token;
+	$db = $adminer->database();
+	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
+		$kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
+		?>
+<script type="text/javascript">
+var timeout = setTimeout(function () {
+	ajax('<?php echo js_escape(ME); ?>script=kill', function () {
+	}, 'token=<?php echo $token; ?>&kill=<?php echo $kill; ?>');
+}, <?php echo 1000 * $adminer->queryTimeout(); ?>);
+</script>
+<?php
+	} else {
+		$connection2 = null;
+	}
+	ob_flush();
+	flush();
+	$return = @get_key_vals($query, $connection2); // @ - may be killed
+	if ($connection2) {
+		echo "<script type='text/javascript'>clearTimeout(timeout);</script>\n";
+		ob_flush();
+		flush();
+	}
+	return array_keys($return);
+}
+
+// used in compiled version
+function lzw_decompress($binary) {
+	// convert binary string to codes
+	$dictionary_count = 256;
+	$bits = 8; // ceil(log($dictionary_count, 2))
+	$codes = array();
+	$rest = 0;
+	$rest_length = 0;
+	for ($i=0; $i < strlen($binary); $i++) {
+		$rest = ($rest << 8) + ord($binary[$i]);
+		$rest_length += 8;
+		if ($rest_length >= $bits) {
+			$rest_length -= $bits;
+			$codes[] = $rest >> $rest_length;
+			$rest &= (1 << $rest_length) - 1;
+			$dictionary_count++;
+			if ($dictionary_count >> $bits) {
+				$bits++;
+			}
+		}
+	}
+	// decompression
+	$dictionary = range("\0", "\xFF");
+	$return = "";
+	foreach ($codes as $i => $code) {
+		$element = $dictionary[$code];
+		if (!isset($element)) {
+			$element = $word . $word[0];
+		}
+		$return .= $element;
+		if ($i) {
+			$dictionary[] = $word . $element[0];
+		}
+		$word = $element;
+	}
+	return $return;
+}

adminer/include/lang.inc.php

@@ -14,16 +14,20 @@ $langs = array(
 	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
 	'pl' => 'Polski', // Radosław Kowalewski - http://srsbiz.pl/
 	'ca' => 'Català', // Joan Llosas
-	'pt' => 'Português', // Gian Live - gian@live.com
+	'pt' => 'Português', // Gian Live - gian@live.com, Davi Alexandre davi@davialexandre.com.br
 	'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
 	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
 	'ro' => 'Limba Română', // .nick .messing - dot.nick.dot.messing@gmail.com
+	'id' => 'Bahasa Indonesia', // Ivan Lanin - http://ivan.lanin.org
 	'ru' => 'Русский язык', // Maksim Izmaylov
+	'uk' => 'Українська', // Valerii Kryzhov
+	'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
 	'zh' => '简体中文', // Mr. Lodar
 	'zh-tw' => '繁體中文', // http://tzangms.com
 	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
 	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com
 );
@@ -43,7 +47,7 @@ function get_lang() {
 */
 function lang($idf, $number = null) {
 	global $LANG, $translations;
-	$translation = $translations[$idf];
+	$translation = ($translations[$idf] ? $translations[$idf] : $idf);
 	if (is_array($translation)) {
 		$pos = ($number == 1 ? 0
 			: ($LANG == 'cs' || $LANG == 'sk' ? ($number && $number < 5 ? 1 : 2) // different forms for 1, 2-4, other
@@ -51,28 +55,34 @@ function lang($idf, $number = null) {
 			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4, other
 			: ($LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
 			: ($LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: ($LANG == 'ru' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 2-4, other
+			: ($LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 2-4, other
 			: 1
 		))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
 		$translation = $translation[$pos];
 	}
 	$args = func_get_args();
 	array_shift($args);
-	return vsprintf((isset($translation) ? $translation : $idf), $args);
+	$format = str_replace("%d", "%s", $translation);
+	if ($format != $translation) {
+		$args[0] = number_format($number, 0, ".", lang(','));
+	}
+	return vsprintf($format, $args);
 }
 
 function switch_lang() {
-	global $LANG, $langs;
-	echo "<form action=''>\n<div id='lang'>";
-	hidden_fields($_GET, array('lang'));
-	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "var loc = location.search.replace(/[?&]lang=[^&]*/, ''); location.search = loc + (loc ? '&' : '') + 'lang=' + this.value;");
+	global $LANG, $langs, $token;
+	echo "<form action='' method='post'>\n<div id='lang'>";
+	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
+	echo "<input type='hidden' name='token' value='$token'>\n";
 	echo "</div>\n</form>\n";
 }
 
-if (isset($_GET["lang"])) {
-	$_COOKIE["adminer_lang"] = $_GET["lang"];
-	$_SESSION["lang"] = $_GET["lang"]; // cookies may be disabled
+if (isset($_POST["lang"]) && $_SESSION["token"] == $_POST["token"]) { // $token and $error not yet available
+	cookie("adminer_lang", $_POST["lang"]);
+	$_SESSION["lang"] = $_POST["lang"]; // cookies may be disabled
+	$_SESSION["translations"] = array(); // used in compiled version
+	redirect(remove_from_uri());
 }
 
 $LANG = "en";

adminer/include/pdo.inc.php

@@ -24,6 +24,7 @@ if (extension_loaded('pdo')) {
 		
 		function query($query, $unbuffered = false) {
 			$result = parent::query($query);
+			$this->error = "";
 			if (!$result) {
 				$errorInfo = $this->errorInfo();
 				$this->error = $errorInfo[2];
@@ -50,7 +51,8 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function next_result() {
-			return $this->_result->nextRowset();
+			$this->_result->_offset = 0;
+			return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
 		}
 		
 		function result($query, $field = 0) {
@@ -78,7 +80,7 @@ if (extension_loaded('pdo')) {
 			$row = (object) $this->getColumnMeta($this->_offset++);
 			$row->orgtable = $row->table;
 			$row->orgname = $row->name;
-			$row->charsetnr = (in_array("blob", $row->flags) ? 63 : 0);
+			$row->charsetnr = (in_array("blob", (array) $row->flags) ? 63 : 0);
 			return $row;
 		}
 	}

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "3.3.4";
+$VERSION = "3.6.1";

adminer/lang/ar.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'نسخ',
 	'Permanent link' => 'وصلة دائمة',
 	'Edit all' => 'تعديل الكل',
-	'Resend POST data?' => 'هل تود إعادة إرسال بيانات POST ؟',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/bn.inc.php

@@ -0,0 +1,272 @@
+<?php
+$translations = array(
+	'Login' => 'লগইন',
+	'Logout successful.' => 'লগআউট সম্পন্ন হয়েছে।',
+	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
+	'Server' => 'সার্ভার',
+	'Username' => 'ইউজারের নাম',
+	'Password' => 'পাসওয়ার্ড',
+	'Select database' => 'ডাটাবেজ নির্বাচন করো',
+	'Invalid database.' => 'ভুল ডাটাবেজ।',
+	'Create new database' => 'নতুন ডাটাবেজ তৈরী করো',
+	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
+	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
+	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',
+	'Alter table' => 'টেবিল সম্পাদনা',
+	'Create table' => 'টেবিল তৈরী করো',
+	'Table name' => 'টেবিলের নাম',
+	'engine' => 'ইন্জিন',
+	'collation' => 'কলোকেশন',
+	'Column name' => 'কলামের নাম',
+	'Type' => 'টাইপ',
+	'Length' => 'দৈর্ঘ্য',
+	'Auto Increment' => 'স্বয়ংক্রিয় বৃদ্ধি',
+	'Options' => 'অপশন',
+	'Save' => 'সংরক্ষণ',
+	'Drop' => 'মুছে ফেলো',
+	'Database has been dropped.' => 'ডাটাবেজ মুছে ফেলা হয়েছে।',
+	'Database has been created.' => 'ডাটাবেজ তৈরী করা হয়েছে।',
+	'Database has been renamed.' => 'ডাটাবেজের নতুন নামকরণ করা হয়েছে।',
+	'Database has been altered.' => 'ডাটাবেজ সম্পাদনা করা হয়েছে।',
+	'Alter database' => 'ডাটাবেজ সম্পাদনা',
+	'Create database' => 'ডাটাবেজ তৈরী',
+	'SQL command' => 'SQL-কোয়্যারী',
+	'Dump' => 'এক্সপোর্ট',
+	'Logout' => 'লগআউট',
+	'database' => 'ডাটাবেজ',
+	'Use' => 'ব্যবহার',
+	'No tables.' => 'কোন টেবিল নাই।',
+	'select' => 'নির্বাচন',
+	'Create new table' => 'নতুন টেবিল তৈরী করো',
+	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
+	'Item has been updated.' => 'বিষয়বস্তু আপডেট করা হয়েছে।',
+	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
+	'Edit' => 'সম্পাদনা',
+	'Insert' => 'সংযোজন',
+	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন',
+	'Delete' => 'মুছে ফেলো',
+	'Database' => 'ডাটাবেজ',
+	'Routines' => 'রুটিনসমূহ',
+	'Indexes have been altered.' => 'সূচীসমূহ সম্পাদনা করা হয়েছে।',
+	'Indexes' => 'সূচীসমূহ',
+	'Alter indexes' => 'সূচীসমূহ সম্পাদনা',
+	'Add next' => 'সংযোজন',
+	'Language' => 'ভাষা',
+	'Select' => 'নির্বাচন',
+	'New item' => 'নতুন বিষয়বস্তু',
+	'Search' => 'খোঁজ',
+	'Sort' => 'সাজানো',
+	'descending' => 'ক্রমহ্রাস',
+	'Limit' => 'সীমা',
+	'No rows.' => 'কোন সারি নাই।',
+	'Action' => 'ক্রিয়া',
+	'edit' => 'সম্পাদনা',
+	'Page' => 'পৃষ্ঠা',
+	'Query executed OK, %d row(s) affected.' => array('কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।', 'কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।'),
+	'Error in query' => 'কোয়্যারীতে ভুল আছে।',
+	'Execute' => 'সম্পাদন করো',
+	'Table' => 'টেবিল',
+	'Foreign keys' => 'ফরেন কী',
+	'Triggers' => 'ট্রিগার',
+	'View' => 'ভিউ',
+	'Unable to select the table' => 'টেবিল নির্বাচন করতে অক্ষম',
+	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্ম আবার পাঠাও।',
+	'Comment' => 'মন্তব্য',
+	'Default values' => 'ডিফল্ট মান',
+	'%d byte(s)' => array('%d বাইট', '%d বাইটসমূহ'),
+	'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 টি সারি (সমূহ) প্রভাবিত হয়েছে।'),
+	'Call' => 'কল',
+	'No extension' => 'কোন এক্সটেনশান নাই',
+	'None of the supported PHP extensions (%s) are available.' => 'কোন PHP সমর্থিত এক্সটেনশন (%s) পাওয়া যায় নাই।',
+	'Session support must be enabled.' => 'সেশন সমর্থন সক্রিয় করা আবশ্যক।',
+	'Session expired, please login again.' => 'সেশানের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
+	'Text length' => 'টেক্সট দৈর্ঘ্য',
+	'Foreign key has been dropped.' => 'ফরেন কী মুছে ফেলা হয়েছে।',
+	'Foreign key has been altered.' => 'ফরেন কী সম্পাদনা করা হয়েছে।',
+	'Foreign key has been created.' => 'ফরেন কী তৈরী করা হয়েছে।',
+	'Foreign key' => 'ফরেন কী ',
+	'Target table' => 'টার্গেট টেবিল',
+	'Change' => 'পরিবর্তন',
+	'Source' => 'উৎস',
+	'Target' => 'লক্ষ্য',
+	'Add column' => 'কলাম সংযোজন',
+	'Alter' => 'সম্পাদনা',
+	'Add foreign key' => 'ফরেন কী সংযোজন করো',
+	'ON DELETE' => 'অন ডিলিট',
+	'ON UPDATE' => 'অন আপডেট',
+	'Index Type' => 'সূচী-ধরণ',
+	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
+	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
+	'View has been altered.' => 'ভিউ সম্পাদনা করা হয়েছে।',
+	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',
+	'Alter view' => 'ভিউ সম্পাদনা করো',
+	'Create view' => 'ভিউ তৈরী করো',
+	'Name' => 'নাম',
+	'Process list' => 'প্রসেস তালিকা',
+	'%d process(es) have been killed.' => array('%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।'),
+	'Kill' => 'বিনষ্ট করো',
+	'Parameter name' => 'প্যারামিটারের নাম',
+	'Database schema' => 'ডাটাবেজ স্কিমা',
+	'Create procedure' => 'প্রসিডিওর তৈরী করো',
+	'Create function' => 'ফাংশন তৈরী করো',
+	'Routine has been dropped.' => 'রুটিন মুছে ফেলা হয়েছে।',
+	'Routine has been altered.' => 'রুটিন সম্পাদনা করা হয়েছে।',
+	'Routine has been created.' => 'রুটিন তৈরী করা হয়েছে।',
+	'Alter function' => 'ফাংশন সম্পাদনা করো',
+	'Alter procedure' => 'প্রসিডিওর সম্পাদনা করো',
+	'Return type' => 'রিটার্ন টাইপ',
+	'Add trigger' => 'ট্রিগার সংযোজন করো',
+	'Trigger has been dropped.' => 'ট্রিগার মুছে ফেলা হয়েছে।',
+	'Trigger has been altered.' => 'ট্রিগার সম্পাদনা করা হয়েছে।',
+	'Trigger has been created.' => 'ট্রিগার তৈরী করা হয়েছে।',
+	'Alter trigger' => 'ট্রিগার সম্পাদনা করো',
+	'Create trigger' => 'ট্রিগার তৈরী করো',
+	'Time' => 'সময়',
+	'Event' => 'ইভেন্ট',
+	'%s version: %s through PHP extension %s' => 'ভার্সন %s: %s, %s PHP এক্সটেনশনের মধ্য দিয়ে',
+	'%d row(s)' => array('%d সারি', '%d সারি সমূহ'),
+	'Remove' => 'অপসারণ',
+	'Are you sure?' => 'তুমি কি নিশ্চিত?',
+	'Privileges' => 'প্রিভিলেজেস',
+	'Create user' => 'ইউজার তৈরী করো',
+	'User has been dropped.' => 'ইউজার মুছে ফেলা হয়েছে।',
+	'User has been altered.' => 'ইউজার সম্পাদনা করা হয়েছে।',
+	'User has been created.' => 'ইউজার তৈরী করা হয়েছে।',
+	'Hashed' => 'হ্যাসড',
+	'Column' => 'কলাম',
+	'Routine' => 'রুটিন',
+	'Grant' => 'গ্র্যান্ট',
+	'Revoke' => 'রিভোক',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো',
+	'Logged as: %s' => '%s হিসাবে লগড',
+	'Move up' => 'উপরে স্থানান্তর',
+	'Move down' => 'নীচে স্থানান্তর',
+	'Functions' => 'ফাংশন সমূহ',
+	'Aggregation' => 'মোট পরিমাণ',
+	'Export' => 'এক্সপোর্ট',
+	'Output' => 'আউটপুট',
+	'open' => 'খোলা',
+	'save' => 'সংরক্ষণ',
+	'Format' => 'বিন্যাস',
+	'Tables' => 'টেবিলসমূহ',
+	'Data' => 'ডাটা',
+	'Event has been dropped.' => 'ইভেন্ট মুছে ফেলা হয়েছে।',
+	'Event has been altered.' => 'ইভেন্ট সম্পাদনা করা হয়েছে।',
+	'Event has been created.' => 'ইভেন্ট তৈরী করা হয়েছে।',
+	'Alter event' => 'ইভেন্ট সম্পাদনা করো',
+	'Create event' => 'ইভেন্ট তৈরী করো',
+	'At given time' => 'প্রদত্ত সময়ে',
+	'Every' => 'প্রত্যেক',
+	'Events' => 'ইভেন্টসমূহ',
+	'Schedule' => 'সময়সূচি',
+	'Start' => 'শুরু',
+	'End' => 'সমাপ্তি',
+	'Status' => 'স্ট্যাটাস',
+	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করো',
+	'Tables and views' => 'টেবিল এবং ভিউ সমূহ',
+	'Data Length' => 'ডাটার দৈর্ঘ্য',
+	'Index Length' => 'ইনডেক্স এর দৈর্ঘ্য',
+	'Data Free' => 'তথ্য মুক্ত',
+	'Collation' => 'কলোকেশন',
+	'Analyze' => 'বিশ্লেষণ',
+	'Optimize' => 'অপটিমাইজ',
+	'Check' => 'পরীক্ষা',
+	'Repair' => 'মেরামত',
+	'Truncate' => 'ছাঁটাই',
+	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
+	'Rows' => 'সারি',
+	',' => ',',
+	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
+	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
+	'Move' => 'স্থানান্তর করো',
+	'Engine' => 'ইঞ্জিন',
+	'Save and continue edit' => 'সংরক্ষণ করো এবং সম্পাদনা চালিয়ে যাও',
+	'original' => 'প্রকৃত',
+	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
+	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
+	'whole result' => 'সম্পূর্ণ ফলাফল',
+	'Clone' => 'ক্লোন',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s এবং %s বৃদ্ধি করুন।',
+	'Partition by' => 'পার্টিশন যার মাধ্যমে',
+	'Partitions' => 'পার্টিশন',
+	'Partition name' => 'পার্টিশনের নাম',
+	'Values' => 'মানসমূহ',
+	'%d row(s) have been imported.' => array('%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।'),
+	'anywhere' => 'যে কোন স্থানে',
+	'Import' => 'ইমপোর্ট',
+	'Stop on error' => 'ত্রুটি পেলে থেমে যাও',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$6.$4.$1',
+	'[yyyy]-mm-dd' => 't.m.[jjjj]',
+	'History' => 'ইতিহাস',
+	'Variables' => 'চলকসমূহ',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'সোর্স এবং টার্গেট কলামে একই ডাটা টাইপ থাকতে হবে, টার্গেট কলামসমূহে একটি সূচী এবং রেফারেন্সড ডেটার উপস্থিতি থাকা আবশ্যক।',
+	'Relations' => 'সম্পর্ক',
+	'Run file' => 'ফাইল চালাও',
+	'Clear' => 'সাফ করো',
+	'Maximum allowed file size is %sB.' => 'সর্বাধিক অনুমোদিত ফাইল সাইজ %sB.',
+	'Numbers' => 'সংখ্যা',
+	'Date and time' => 'তারিখ এবং সময়',
+	'Strings' => 'স্ট্রিং',
+	'Binary' => 'বাইনারি',
+	'Lists' => 'তালিকা',
+	'Editor' => 'সম্পাদক',
+	'E-mail' => '​​ই-মেইল',
+	'From' => 'থেকে',
+	'Subject' => 'বিষয়',
+	'Send' => 'পাঠাও',
+	'%d e-mail(s) have been sent.' => array('%d ইমেইল (গুলি) পাঠানো হয়েছে।', '%d ইমেইল (গুলি) পাঠানো হয়েছে।'),
+	'Webserver file %s' => 'ওয়েবসার্ভার ফাইল %s',
+	'File does not exist.' => 'ফাইলের কোন অস্তিত্ব নেই।',
+	'%d in total' => 'সর্বমোটঃ %d টি',
+	'Permanent login' => 'স্থায়ী লগইন',
+	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
+	'Search data in tables' => 'টেবিলে খোঁজ করো',
+	'schema' => 'স্কিমা',
+	'Schema' => 'স্কিমা',
+	'Alter schema' => 'স্কিমা পরিবর্তন করো',
+	'Create schema' => 'স্কিমা তৈরী করো',
+	'Schema has been dropped.' => 'স্কিমা মুছে ফেলা হয়েছে।',
+	'Schema has been created.' => 'স্কিমা তৈরি করা হয়েছে।',
+	'Schema has been altered.' => 'স্কিমা সম্পাদনা করা হয়েছে।',
+	'Sequences' => 'অনুক্রম',
+	'Create sequence' => 'অনুক্রম তৈরি করো',
+	'Alter sequence' => 'অনুক্রম সম্পাদনা করো',
+	'Sequence has been dropped.' => 'অনুক্রম মুছে ফেলা হয়েছে।',
+	'Sequence has been created.' => 'অনুক্রম তৈরি করা হয়েছে।',
+	'Sequence has been altered.' => 'অনুক্রম সম্পাদনা করা হয়েছে।',
+	'User types' => 'ইউজারের টাইপ',
+	'Create type' => 'টাইপ তৈরী করো',
+	'Alter type' => 'টাইপ পরিবর্তন করো',
+	'Type has been dropped.' => 'টাইপ মুছে ফেলা হয়েছে।',
+	'Type has been created.' => 'টাইপ তৈরি করা হয়েছে।',
+	'Double click on a value to modify it.' => 'কোন মানকে পরিবর্তন করতে এতে ডবল ক্লিক করো।',
+	'Use edit link to modify this value.' => 'এই মান পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করো।',
+	'last' => 'সর্বশেষ',
+	'From server' => 'সার্ভার থেকে',
+	'System' => 'সিস্টেম',
+	'Select data' => 'তথ্য নির্বাচন করো',
+	'Show structure' => 'গঠন দেখাও',
+	'empty' => 'খালি',
+	'Network' => 'নেটওয়ার্ক',
+	'Geometry' => 'জ্যামিতি',
+	'File exists.' => 'ফাইল রয়েছে।',
+	'Attachments' => 'সংযুক্তি',
+	'%d query(s) executed OK.' => array('SQL-কোয়্যারী সফলভাবে সম্পন্ন হয়েছে', '%d SQL-কোয়্যারীসমূহ সফলভাবে সম্পন্ন হয়েছে'),
+	'Show only errors' => 'শুধুমাত্র ত্রুটি দেখাও',
+	'Last page' => 'শেষ পাতা',
+	'Refresh' => 'রিফ্রেশ',
+	'Invalid schema.' => 'অবৈধ স্কিমা।',
+	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করো।',
+	'now' => 'এখন',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'টেবিল কপি করা হয়েছে।',
+	'Copy' => 'কপি',
+	'Permanent link' => 'স্থায়ী লিংক',
+	'Edit all' => 'সকল সম্পাদনা করো',
+	'HH:MM:SS' => 'HH:MM:SS',
+);

adminer/lang/ca.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Còpia',
 	'Permanent link' => 'Enllaç permanent',
 	'Edit all' => 'Edita-ho tot',
-	'Resend POST data?' => 'Torna a enviar les dades POST?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/cs.inc.php

@@ -13,11 +13,11 @@ $translations = array(
 	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
 	'Language' => 'Jazyk',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
-	'No extension' => 'Žádná extenze',
-	'None of the supported PHP extensions (%s) are available.' => 'Není dostupná žádná z podporovaných PHP extenzí (%s).',
+	'No extension' => 'Žádné rozšíření',
+	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%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.',
-	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP extenzi %s',
+	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
 	'Refresh' => 'Obnovit',
 	
 	// text direction - 'ltr' or 'rtl'
@@ -227,12 +227,15 @@ $translations = array(
 	'Limit' => 'Limit',
 	'Text length' => 'Délka textů',
 	'Action' => 'Akce',
+	'Full table scan' => 'Průchod celé tabulky',
 	'Unable to select the table' => 'Nepodařilo se vypsat tabulku',
 	'No rows.' => 'Žádné řádky.',
 	'%d row(s)' => array('%d řádek', '%d řádky', '%d řádků'),
 	'Page' => 'Stránka',
 	'last' => 'poslední',
 	'Last page' => 'Poslední stránka',
+	'Load more data' => 'Nahrát další data',
+	'Loading' => 'Nahrává se',
 	'whole result' => 'celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
 	
@@ -278,10 +281,6 @@ $translations = array(
 	'Geometry' => 'Geometrie',
 	'Relations' => 'Vztahy',
 	
-	// reload confirmation in AJAX
-	'Resend POST data?' => 'Znovu odeslat POST data?',
-	'No response from server.' => 'Server neodpověděl.',
-	
 	'Editor' => 'Editor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',

adminer/lang/de.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Kopieren',
 	'Permanent link' => 'Dauerhafter Link',
 	'Edit all' => 'Alle ändern',
-	'Resend POST data?' => 'POST data noch einmal senden ?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/es.inc.php

@@ -13,7 +13,7 @@ $translations = array(
 	'Table has been altered.' => 'Tabla modificada.',
 	'Table has been created.' => 'Tabla creada.',
 	'Alter table' => 'Modifique estructura',
-	'Create table' => 'Cree tabla',
+	'Create table' => 'Crear tabla',
 	'Table name' => 'Nombre de la tabla',
 	'engine' => 'motor',
 	'collation' => 'colación',
@@ -104,7 +104,7 @@ $translations = array(
 	'View has been altered.' => 'Vista modificada.',
 	'View has been created.' => 'Vista creada.',
 	'Alter view' => 'Modificar vista',
-	'Create view' => 'Cear vista',
+	'Create view' => 'Crear vista',
 	'Name' => 'Nombre',
 	'Process list' => 'Lista de procesos',
 	'%d process(es) have been killed.' => array('%d proceso detenido.', '%d procesos detenidos.'),
@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Copiar',
 	'Permanent link' => 'Enlace permanente',
 	'Edit all' => 'Editar todos',
-	'Resend POST data?' => 'Volver a enviar POST data?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/et.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Kopeeri',
 	'Permanent link' => 'Püsilink',
 	'Edit all' => 'Muuda kõiki',
-	'Resend POST data?' => 'Saada POST andmed uuesti?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/fa.inc.php

@@ -277,9 +277,6 @@ $translations = array(
 	'Geometry' => 'هندسه',
 	'Relations' => 'رابطه ها',
 	
-	// reload confirmation in AJAX
-	'Resend POST data?' => 'ارسال مجدد داده ها؟',
-	
 	'Editor' => 'ویرایشگر',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',

adminer/lang/fr.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Copier',
 	'Permanent link' => 'Lien permanent',
 	'Edit all' => 'Tout modifier',
-	'Resend POST data?' => 'Renvoyer les données POST ?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/hu.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Másolás',
 	'Permanent link' => 'Hivatkozás',
 	'Edit all' => 'Összes szerkesztése',
-	'Resend POST data?' => 'Újraküldi a POST adatokat?',
 	'HH:MM:SS' => 'óó:pp:mm',
 );

adminer/lang/id.inc.php

@@ -0,0 +1,321 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Sistem',
+	'Server' => 'Server',
+	'Username' => 'Pengguna',
+	'Password' => 'Sandi',
+	'Permanent login' => 'Masuk permanen',
+	'Login' => 'Masuk',
+	'Logout' => 'Keluar',
+	'Logged as: %s' => 'Masuk sebagai: %s',
+	'Logout successful.' => 'Berhasil keluar.',
+	'Invalid credentials.' => 'Akses invalid.',
+	'Language' => 'Bahasa',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalid. Kirim ulang formulir.',
+	'No extension' => 'Ekstensi tidak tersedia',
+	'None of the supported PHP extensions (%s) are available.' => 'Ekstensi PHP yang didukung (%s) tidak tersedia.',
+	'Session support must be enabled.' => 'Dukungan sesi harus aktif.',
+	'Session expired, please login again.' => 'Sesi habis, silakan masuk lagi.',
+	'%s version: %s through PHP extension %s' => 'Versi %s: %s dengan ekstensi PHP %s',
+	'Refresh' => 'Segarkan',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Privilese',
+	'Create user' => 'Buat pengguna',
+	'User has been dropped.' => 'Pengguna berhasil dihapus.',
+	'User has been altered.' => 'Pengguna berhasil diubah.',
+	'User has been created.' => 'Pengguna berhasil dibuat.',
+	'Hashed' => 'Hashed*',
+	'Column' => 'Kolom',
+	'Routine' => 'Rutin',
+	'Grant' => 'Beri',
+	'Revoke' => 'Tarik',
+
+	'Process list' => 'Daftar proses',
+	'%d process(es) have been killed.' => '%d proses berhasil dihentikan.',
+	'Kill' => 'Hentikan',
+
+	'Variables' => 'Variabel',
+	'Status' => 'Status',
+
+	'SQL command' => 'Perintah SQL',
+	'%d query(s) executed OK.' => '%d kueri berhasil dijalankan.',
+	'Query executed OK, %d row(s) affected.' => 'Kueri berhasil, %d baris terpengaruh.',
+	'No commands to execute.' => 'Tiada perintah untuk dijalankan.',
+	'Error in query' => 'Kesalahan dalam kueri',
+	'Execute' => 'Jalankan',
+	'Stop on error' => 'Hentikan pada kesalahan',
+	'Show only errors' => 'Hanya tampilkan kesalahan',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Riwayat',
+	'Clear' => 'Bersihkan',
+	'Edit all' => 'Edit semua',
+
+	'File upload' => 'Unggah berkas',
+	'From server' => 'Dari server',
+	'Webserver file %s' => 'Berkas server web %s',
+	'Run file' => 'Jalankan berkas',
+	'File does not exist.' => 'Berkas tidak ditemukan.',
+	'File uploads are disabled.' => 'Pengunggahan berkas dimatikan.',
+	'Unable to upload a file.' => 'Tidak dapat mengunggah berkas.',
+	'Maximum allowed file size is %sB.' => 'Besar berkas yang diizinkan adalah %s bita.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar pengarah konfigurasi %s.',
+
+	'Export' => 'Ekspor',
+	'Dump' => 'Ekspor',
+	'Output' => 'Hasil',
+	'open' => 'buka',
+	'save' => 'simpan',
+	'Format' => 'Format',
+	'Data' => 'Data',
+
+	'Database' => 'Basis data',
+	'database' => 'basis data',
+	'Use' => 'Gunakan',
+	'Select database' => 'Pilih basis data',
+	'Invalid database.' => 'Basis data invalid.',
+	'Create new database' => 'Buat basis data baru',
+	'Database has been dropped.' => 'Basis data berhasil dihapus.',
+	'Databases have been dropped.' => 'Basis data berhasil dihapus.',
+	'Database has been created.' => 'Basis data berhasil dibuat.',
+	'Database has been renamed.' => 'Basis data berhasil diganti nama.',
+	'Database has been altered.' => 'Basis data berhasil diubah.',
+	'Alter database' => 'Ubah basis data',
+	'Create database' => 'Buat basis data',
+	'Database schema' => 'Skema basis data',
+
+	// link to current database schema layout
+	'Permanent link' => 'Tautan permanen',
+
+	// thousands separator - must contain single byte
+	',' => '.',
+	'Engine' => 'Mesin',
+	'Collation' => 'Kolasi',
+	'Data Length' => 'Panjang Data',
+	'Index Length' => 'Panjang Indeks',
+	'Data Free' => 'Data Bebas',
+	'Rows' => 'Baris',
+	'%d in total' => '%d total',
+	'Analyze' => 'Analisis',
+	'Optimize' => 'Optimalkan',
+	'Check' => 'Periksa',
+	'Repair' => 'Perbaiki',
+	'Truncate' => 'Kosongkan',
+	'Tables have been truncated.' => 'Tabel berhasil dikosongkan.',
+	'Move to other database' => 'Pindahkan ke basis data lain',
+	'Move' => 'Pindahkan',
+	'Tables have been moved.' => 'Tabel berhasil dipindahkan.',
+	'Copy' => 'Salin',
+	'Tables have been copied.' => 'Tabel berhasil disalin.',
+
+	'Routines' => 'Rutin',
+	'Routine has been called, %d row(s) affected.' => array('Rutin telah dipanggil, %d baris terpengaruh.', 'Rutin telah dipanggil, %d baris terpengaruh'),
+	'Call' => 'Panggilan',
+	'Parameter name' => 'Nama paramater',
+	'Create procedure' => 'Buat prosedur',
+	'Create function' => 'Buat fungsi',
+	'Routine has been dropped.' => 'Rutin berhasil dihapus.',
+	'Routine has been altered.' => 'Rutin berhasil diubah.',
+	'Routine has been created.' => 'Rutin berhasil dibuat.',
+	'Alter function' => 'Ubah fungsi',
+	'Alter procedure' => 'Ubah prosedur',
+	'Return type' => 'Jenis balikan',
+
+	'Events' => 'Peristiwa',
+	'Event has been dropped.' => 'Peristiwa berhasil dihapus.',
+	'Event has been altered.' => 'Peristiwa berhasil diubah.',
+	'Event has been created.' => 'Peristiwa berhasil dibuat.',
+	'Alter event' => 'Ubah peristiwa',
+	'Create event' => 'Buat peristiwa',
+	'At given time' => 'Pada waktu tertentu',
+	'Every' => 'Setiap',
+	'Schedule' => 'Jadwal',
+	'Start' => 'Mulai',
+	'End' => 'Selesai',
+	'On completion preserve' => 'Pertahankan saat selesai',
+
+	'Tables' => 'Tabel',
+	'Tables and views' => 'Tabel dan tampilan',
+	'Table' => 'Tabel',
+	'No tables.' => 'Tiada tabel.',
+	'Alter table' => 'Ubah tabel',
+	'Create table' => 'Buat tabel',
+	'Create new table' => 'Buat tabel baru',
+	'Table has been dropped.' => 'Tabel berhasil dihapus.',
+	'Tables have been dropped.' => 'Tabel berhasil dihapus.',
+	'Tables have been optimized.' => 'Tabel berhasil dioptimalkan.',
+	'Table has been altered.' => 'Tabel berhasil diubah.',
+	'Table has been created.' => 'Tabel berhasil dibuat.',
+	'Table name' => 'Nama tabel',
+	'Show structure' => 'Lihat struktur',
+	'engine' => 'mesin',
+	'collation' => 'kolasi',
+	'Column name' => 'Nama kolom',
+	'Type' => 'Jenis',
+	'Length' => 'Panjang',
+	'Auto Increment' => 'Kenaikan Otomatis',
+	'Options' => 'Opsi',
+	'Comment' => 'Komentar',
+	'Default values' => 'Nilai bawaan',
+	'Drop' => 'Hapus',
+	'Are you sure?' => 'Anda yakin',
+	'Move up' => 'Naik',
+	'Move down' => 'Turun',
+	'Remove' => 'Hapus',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Jumlah ruas maksimum yang diizinkan dilewati. Harap naikkan %s dan %s.',
+
+	'Partition by' => 'Partisi menurut',
+	'Partitions' => 'Partisi',
+	'Partition name' => 'Nama partisi',
+	'Values' => 'Nilai',
+
+	'View' => 'Tampilan',
+	'View has been dropped.' => 'Tampilan berhasil dihapus.',
+	'View has been altered.' => 'Tampilan berhasil diubah.',
+	'View has been created.' => 'Tampilan berhasil dibuat.',
+	'Alter view' => 'Ubah tampilan',
+	'Create view' => 'Buat tampilan',
+
+	'Indexes' => 'Indeks',
+	'Indexes have been altered.' => 'Indeks berhasil diubah.',
+	'Alter indexes' => 'Ubah indeks',
+	'Add next' => 'Tambah setelahnya',
+	'Index Type' => 'Jenis Indeks',
+	'Column (length)' => 'Kolom (panjang)',
+
+	'Foreign keys' => 'Kunci asing',
+	'Foreign key' => 'Kunci asing',
+	'Foreign key has been dropped.' => 'Kunci asing berhasil dihapus.',
+	'Foreign key has been altered.' => 'Kunci asing berhasil diubah.',
+	'Foreign key has been created.' => 'Kunci asing berhasil dibuat.',
+	'Target table' => 'Tabel sasaran',
+	'Change' => 'Ubah',
+	'Source' => 'Sumber',
+	'Target' => 'Sasaran',
+	'Add column' => 'Tambah kolom',
+	'Alter' => 'Ubah',
+	'Add foreign key' => 'Tambah kunci asing',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Kolom sumber dan sasaran harus memiliki jenis data yang sama. Kolom sasaran harus memiliki indeks dan data rujukan harus ada.',
+
+	'Triggers' => 'Picu',
+	'Add trigger' => 'Tambah picu',
+	'Trigger has been dropped.' => 'Picu berhasil dihapus.',
+	'Trigger has been altered.' => 'Picu berhasil diubah.',
+	'Trigger has been created.' => 'Picu berhasil dibuat.',
+	'Alter trigger' => 'Ubah picu',
+	'Create trigger' => 'Buat picu',
+	'Time' => 'Waktu',
+	'Event' => 'Peristiwa',
+	'Name' => 'Nama',
+
+	'select' => 'pilih',
+	'Select' => 'Pilih',
+	'Select data' => 'Pilih data',
+	'Functions' => 'Fungsi',
+	'Aggregation' => 'Agregasi',
+	'Search' => 'Cari',
+	'anywhere' => 'di mana pun',
+	'Search data in tables' => 'Cari data dalam tabel',
+	'Sort' => 'Urutan',
+	'descending' => 'menurun',
+	'Limit' => 'Limit',
+	'Text length' => 'Panjang teks',
+	'Action' => 'Tindakan',
+	'Full table scan' => 'Pindai tabel lengkap',
+	'Unable to select the table' => 'Gagal memilih tabel',
+	'No rows.' => 'Tiada baris.',
+	'%d row(s)' => '%d baris',
+	'Page' => 'Halaman',
+	'last' => 'terakhir',
+	'Last page' => 'Halaman terakhir',
+	'whole result' => 'Seluruh hasil',
+	'%d byte(s)' => '%d bita',
+
+	'Import' => 'Impor',
+	'%d row(s) have been imported.' => '%d baris berhasil diimpor.',
+
+	// in-place editing in select
+	'Double click on a value to modify it.' => 'Klik ganda suatu nilai untuk mengubahnya.',
+	'Use edit link to modify this value.' => 'Gunakan tautan edit untuk mengubah nilai ini.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Entri%s berhasil disisipkan.',
+	'Item has been deleted.' => 'Entri berhasil dihapus.',
+	'Item has been updated.' => 'Entri berhasil diperbarui.',
+	'%d item(s) have been affected.' => '%d entri terpengaruh.',
+	'New item' => 'Entri baru',
+	'original' => 'orisinal',
+	// label for value '' in enum data type
+	'empty' => 'kosong',
+	'edit' => 'edit',
+	'Edit' => 'Edit',
+	'Insert' => 'Sisipkan',
+	'Save' => 'Simpan',
+	'Save and continue edit' => 'Simpan dan terus mengedit',
+	'Save and insert next' => 'Simpan dan sisipkan yang lain',
+	'Clone' => 'Gandakan',
+	'Delete' => 'Hapus',
+
+	'E-mail' => 'Surel',
+	'From' => 'Dari',
+	'Subject' => 'Subjek',
+	'Attachments' => 'Lampiran',
+	'Send' => 'Kirim',
+	'%d e-mail(s) have been sent.' => array('%d surel berhasil dikirim.', '%d surel berhasil dikirim'),
+
+	// data type descriptions
+	'Numbers' => 'Angka',
+	'Date and time' => 'Tanggal dan waktu',
+	'Strings' => 'String',
+	'Binary' => 'Biner',
+	'Lists' => 'Daftar',
+	'Network' => 'Jaringan',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relasi',
+
+	'Editor' => 'Editor',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$1-$3-$5',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'now',
+	'yes' => 'yes',
+	'no' => 'no',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Berkas sudah ada.',
+	'Please use one of the extensions %s.' => 'Harap gunakan salah satu ekstensi %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Ubah skema',
+	'Create schema' => 'Buat skema',
+	'Schema has been dropped.' => 'Skema berhasil dihapus.',
+	'Schema has been created.' => 'Skema berhasil dibuat.',
+	'Schema has been altered.' => 'Skema berhasil diubah.',
+	'schema' => 'skema',
+	'Schema' => 'Skema',
+	'Invalid schema.' => 'Skema invalid.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Deret',
+	'Create sequence' => 'Buat deret',
+	'Sequence has been dropped.' => 'Deret berhasil dihapus.',
+	'Sequence has been created.' => 'Deret berhasil dibuat.',
+	'Sequence has been altered.' => 'Deret berhasil diubah.',
+	'Alter sequence' => 'Ubah deret',
+
+	// PostgreSQL user types support
+	'User types' => 'Jenis pengguna',
+	'Create type' => 'Buat jenis',
+	'Type has been dropped.' => 'Jenis berhasil dihapus.',
+	'Type has been created.' => 'Jenis berhasil dibuat.',
+	'Alter type' => 'Ubah jenis',
+);

adminer/lang/it.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Copia',
 	'Permanent link' => 'Link permanente',
 	'Edit all' => 'Modifica tutto',
-	'Resend POST data?' => 'Reinvio i dati POST?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/ja.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'コピー',
 	'Permanent link' => 'パーマネントリンク',
 	'Edit all' => 'すべて編集',
-	'Resend POST data?' => '再送信しますか？',
 	'HH:MM:SS' => '時:分:秒',
 );

adminer/lang/lt.inc.php

@@ -277,9 +277,6 @@ $translations = array(
 	'Geometry' => 'Geometrija',
 	'Relations' => 'Ryšiai',
 	
-	// reload confirmation in AJAX
-	'Resend POST data?' => 'Persiųsti POST duomenis?',
-	
 	'Editor' => 'Redaktorius',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',

adminer/lang/nl.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Kopieren',
 	'Permanent link' => 'Permanente link',
 	'Edit all' => 'Alles bewerken',
-	'Resend POST data?' => 'POST data opnieuw verzenden',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/pl.inc.php

@@ -20,7 +20,7 @@ $translations = array(
 	'%s version: %s through PHP extension %s' => 'Wersja %s: %s za pomocą %s',
 	'Refresh' => 'Odśwież',
 
-	// text direction
+	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 
 	'Privileges' => 'Uprawnienia użytkowników',
@@ -147,6 +147,7 @@ $translations = array(
 	'Create new table' => 'Utwórz nową tabelę',
 	'Table has been dropped.' => 'Tabela została usunięta.',
 	'Tables have been dropped.' => 'Tabele zostały usunięte.',
+	'Tables have been optimized.' => 'Tabele zostały zoptymalizowane.',
 	'Table has been altered.' => 'Tabela została zmieniona.',
 	'Table has been created.' => 'Tabela została utworzona.',
 	'Table name' => 'Nazwa tabeli',
@@ -277,9 +278,6 @@ $translations = array(
 	'Geometry' => 'Geometria',
 	'Relations' => 'Relacje',
 	
-	// reload confirmation in AJAX
-	'Resend POST data?' => 'Wysłać dane ponownie?',
-	
 	'Editor' => 'Edytor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -288,6 +286,8 @@ $translations = array(
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
 	'HH:MM:SS' => 'HH:MM:SS',
 	'now' => 'teraz',
+	'yes' => 'tak',
+	'no' => 'nie',
 	
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Plik już istnieje.',

adminer/lang/pt.inc.php

@@ -4,7 +4,7 @@ $translations = array(
 	'Logout successful.' => 'Saida bem sucedida.',
 	'Invalid credentials.' => 'Identificação inválida.',
 	'Server' => 'Servidor',
-	'Username' => 'Usuario',
+	'Username' => 'Usuário',
 	'Password' => 'Senha',
 	'Select database' => 'Selecionar Base de dados',
 	'Invalid database.' => 'Base de dados inválida.',
@@ -47,9 +47,9 @@ $translations = array(
 	'Delete' => 'Apagar',
 	'Database' => 'Base de dados',
 	'Routines' => 'Procedimentos',
-	'Indexes have been altered.' => 'Indices modificados.',
-	'Indexes' => 'Indices',
-	'Alter indexes' => 'Modificar indices',
+	'Indexes have been altered.' => 'Índices modificados.',
+	'Indexes' => 'Índices',
+	'Alter indexes' => 'Modificar índices',
 	'Add next' => 'Adicionar proximo',
 	'Language' => 'Idioma',
 	'Select' => 'Selecionar',
@@ -62,7 +62,7 @@ $translations = array(
 	'Action' => 'Ação',
 	'edit' => 'modificar',
 	'Page' => 'Página',
-	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d registro afetados.', 'Consulta executada, %d registros afetados.'),
+	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d registro afetado.', 'Consulta executada, %d registros afetados.'),
 	'Error in query' => 'Erro na consulta',
 	'Execute' => 'Executar',
 	'Table' => 'Tabela',
@@ -71,17 +71,17 @@ $translations = array(
 	'View' => 'Visualizar',
 	'Unable to select the table' => 'Não é possivel selecionar a Tabela',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Enviar o formulario novamente.',
-	'Comment' => 'Comentario',
+	'Comment' => 'Comentário',
 	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nenhum comando para executar.',
-	'Unable to upload a file.' => 'Não é possivel enviar o arquivo.',
+	'Unable to upload a file.' => 'Não é possível enviar o arquivo.',
 	'File upload' => 'Importar arquivo',
-	'File uploads are disabled.' => 'Importação de arquivos desablilitado.',
+	'File uploads are disabled.' => 'Importação de arquivos desablilitada.',
 	'Routine has been called, %d row(s) affected.' => array('Consulta executada, %d registro afetado.', 'Consulta executada, %d registros afetados.'),
 	'Call' => 'Chamar',
-	'No extension' => 'Não ha extension',
-	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP soportadas (%s) está disponivel.',
+	'No extension' => 'Não há extension',
+	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP suportadas (%s) está disponivel.',
 	'Session support must be enabled.' => 'Devem estar habilitadas as sessões.',
 	'Session expired, please login again.' => 'Sessão expirada, por favor entre sua Chave de novo.',
 	'Text length' => 'Tamanho de texto',
@@ -109,7 +109,7 @@ $translations = array(
 	'Process list' => 'Lista de processos',
 	'%d process(es) have been killed.' => array('%d processo terminado.', '%d processos terminados.'),
 	'Kill' => 'Parar',
-	'Parameter name' => 'Nome de Parametro',
+	'Parameter name' => 'Nome de Parâmetro',
 	'Database schema' => 'Esquema de Base de dados',
 	'Create procedure' => 'Criar procedimento',
 	'Create function' => 'Criar função',
@@ -117,7 +117,7 @@ $translations = array(
 	'Routine has been altered.' => 'Procedimento modificado.',
 	'Routine has been created.' => 'Procedimento criado.',
 	'Alter function' => 'Modificar Função',
-	'Alter procedure' => 'Modificar procedimiento',
+	'Alter procedure' => 'Modificar procedimento',
 	'Return type' => 'Tipo de valor de regreso',
 	'Add trigger' => 'Adicionar trigger',
 	'Trigger has been dropped.' => 'Trigger eliminado.',
@@ -131,11 +131,11 @@ $translations = array(
 	'%d row(s)' => array('%d registro', '%d registros'),
 	'Remove' => 'Remover',
 	'Are you sure?' => 'Está seguro?',
-	'Privileges' => 'Privilegios',
-	'Create user' => 'Criar Usuario',
-	'User has been dropped.' => 'Usuario eliminado.',
-	'User has been altered.' => 'Usuario modificado.',
-	'User has been created.' => 'Usuario criado.',
+	'Privileges' => 'Privilégios',
+	'Create user' => 'Criar Usuário',
+	'User has been dropped.' => 'Usuário eliminado.',
+	'User has been altered.' => 'Usuário modificado.',
+	'User has been created.' => 'Usuário criado.',
 	'Hashed' => 'Hash',
 	'Column' => 'Coluna',
 	'Routine' => 'Rotina',
@@ -148,7 +148,7 @@ $translations = array(
 	'Functions' => 'Funções',
 	'Aggregation' => 'Adições',
 	'Export' => 'Exportar',
-	'Output' => 'Saida',
+	'Output' => 'Saída',
 	'open' => 'mostrar',
 	'save' => 'salvas',
 	'Format' => 'Formato',
@@ -163,7 +163,7 @@ $translations = array(
 	'Every' => 'Cada',
 	'Events' => 'Eventos',
 	'Schedule' => 'Agenda',
-	'Start' => 'Inicio',
+	'Start' => 'Início',
 	'End' => 'Fim',
 	'Status' => 'Estado',
 	'On completion preserve' => 'Ao completar preservar',
@@ -187,10 +187,10 @@ $translations = array(
 	'Save and continue edit' => 'Salvar e continuar editando',
 	'original' => 'original',
 	'Tables have been dropped.' => 'Tabelas eliminadas.',
-	'%d item(s) have been affected.' => array('%d ítem afetado.', '%d itens afetados.'),
+	'%d item(s) have been affected.' => array('%d item afetado.', '%d itens afetados.'),
 	'whole result' => 'resultado completo',
 	'Clone' => 'Clonar',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Cantida máxima de campos permitidos excedidos. Por favor aumente %s y %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s e %s.',
 	'Partition by' => 'Particionar por',
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
@@ -202,8 +202,8 @@ $translations = array(
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
-	'History' => 'Historico',
-	'Variables' => 'Variaveis',
+	'History' => 'Histórico',
+	'Variables' => 'Variáveis',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'As colunas de origen e destino devem ser do mesmo tipo, deve existir um índice entre as colunas de destino e o registro referenciado deve existir.',
 	'Relations' => 'Relações',
 	'Run file' => 'Executar Arquivo',
@@ -212,7 +212,7 @@ $translations = array(
 	'Numbers' => 'Números',
 	'Date and time' => 'Data e hora',
 	'Strings' => 'Cadena',
-	'Binary' => 'Binario',
+	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
 	'E-mail' => 'E-mail',
@@ -233,18 +233,18 @@ $translations = array(
 	'Schema has been dropped.' => 'Esquema eliminado.',
 	'Schema has been created.' => 'Esquema criado.',
 	'Schema has been altered.' => 'Esquema modificado.',
-	'Sequences' => 'Sequencias',
-	'Create sequence' => 'Criar sequencias',
-	'Alter sequence' => 'Modificar sequencia',
-	'Sequence has been dropped.' => 'Sequencia eliminada.',
-	'Sequence has been created.' => 'Sequencia criada.',
-	'Sequence has been altered.' => 'Sequencia modificada.',
-	'User types' => 'Tipos definido pelo usuario',
+	'Sequences' => 'Sequências',
+	'Create sequence' => 'Criar sequências',
+	'Alter sequence' => 'Modificar sequência',
+	'Sequence has been dropped.' => 'Sequência eliminada.',
+	'Sequence has been created.' => 'Sequência criada.',
+	'Sequence has been altered.' => 'Sequência modificada.',
+	'User types' => 'Tipos definido pelo usuário',
 	'Create type' => 'Criar tipo',
 	'Alter type' => 'Modificar tipo',
 	'Type has been dropped.' => 'Tipo eliminado.',
 	'Type has been created.' => 'Tipo criado.',
-	'Double click on a value to modify it.' => 'Doble-clic sobre o valor para edita-lo.',
+	'Double click on a value to modify it.' => 'Clique duas vezes sobre o valor para edita-lo.',
 	'Use edit link to modify this value.' => 'Utilize o link modificar para alterar.',
 	'last' => 'último',
 	'From server' => 'Desde servidor',
@@ -253,12 +253,12 @@ $translations = array(
 	'Show structure' => 'Mostrar estrutura',
 	'empty' => 'vazio',
 	'Network' => 'Rede',
-	'Geometry' => 'Geometría',
-	'File exists.' => 'Arquivo ja existe.',
+	'Geometry' => 'Geometria',
+	'File exists.' => 'Arquivo já existe.',
 	'Attachments' => 'Anexos',
-	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consulta sql executadas corretamente.'),
+	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consultas sql executadas corretamente.'),
 	'Show only errors' => 'Mostrar somente erros',
-	'Last page' => 'Ultima página',
+	'Last page' => 'Última página',
 	'Refresh' => 'Atualizar',
 	'Invalid schema.' => 'Esquema inválido.',
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',

adminer/lang/ro.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Copiază',
 	'Permanent link' => 'Adresă permanentă',
 	'Edit all' => 'Editează tot',
-	'Resend POST data?' => 'Retrimite datele POST?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/ru.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Копировать',
 	'Permanent link' => 'Постоянная ссылка',
 	'Edit all' => 'Редактировать всё',
-	'Resend POST data?' => 'Еще раз послать данные POST запроса?',
 	'HH:MM:SS' => 'ЧЧ:ММ:СС',
 );

adminer/lang/sk.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'Kopírovať',
 	'Permanent link' => 'Permanentný odkaz',
 	'Edit all' => 'Upraviť všetko',
-	'Resend POST data?' => 'Znovu poslať POST data?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/sr.inc.php

@@ -0,0 +1,323 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Систем',
+	'Server' => 'Сервер',
+	'Username' => 'Корисничко име',
+	'Password' => 'Лозинка',
+	'Permanent login' => 'Трајна пријава',
+	'Login' => 'Пријава',
+	'Logout' => 'Одјава',
+	'Logged as: %s' => 'Пријави се као: %s',
+	'Logout successful.' => 'Успешна одјава.',
+	'Invalid credentials.' => 'Неважеће дозволе.',
+	'Language' => 'Језик',
+	'Invalid CSRF token. Send the form again.' => 'Неважећи CSRF код. Проследите поново форму.',
+	'No extension' => 'Без додатака',
+	'None of the supported PHP extensions (%s) are available.' => 'Ниједан од подржаних PHP додатака није доступан.',
+	'Session support must be enabled.' => 'Морате омогућити подршку за сесије.',
+	'Session expired, please login again.' => 'Ваша сесија је истекла, пријавите се поново.',
+	'%s version: %s through PHP extension %s' => '%s верзија: %s помоћу PHP додатка је %s',
+	'Refresh' => 'Освежи',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Дозволе',
+	'Create user' => 'Направи корисника',
+	'User has been dropped.' => 'Корисник је избрисан.',
+	'User has been altered.' => 'Корисник је измењен.',
+	'User has been created.' => 'корисник је креиран.',
+	'Hashed' => 'Хеширано',
+	'Column' => 'Колона',
+	'Routine' => 'Рутина',
+	'Grant' => 'Дозволи',
+	'Revoke' => 'Опозови',
+
+	'Process list' => 'Списак процеса',
+	'%d process(es) have been killed.' => array('%d процес је убијен.', '%d процеса су убијена.', '%d процеса је убијено.'),
+	'Kill' => 'Убиј',
+
+	'Variables' => 'Променљиве',
+	'Status' => 'Статус',
+
+	'SQL command' => 'SQL команда',
+	'%d query(s) executed OK.' => array('%d упит је успешно извршен.', '%d упита су успешно извршена.', '%d упита је успешно извршено.'),
+	'Query executed OK, %d row(s) affected.' => array('Упит је успешно извршен, %d ред је погођен.', 'Упит је успешно извршен, %d реда су погођена.', 'Упит је успешно извршен, %d редова је погођено.'),
+	'No commands to execute.' => 'Без команди за извршавање.',
+	'Error in query' => 'Грешка у упиту',
+	'Execute' => 'Изврши',
+	'Stop on error' => 'Заустави приликом грешке',
+	'Show only errors' => 'Приказуј само грешке',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Историјат',
+	'Clear' => 'Очисти',
+	'Edit all' => 'Измени све',
+
+	'File upload' => 'Слање датотека',
+	'From server' => 'Са сервера',
+	'Webserver file %s' => 'Датотека %s са веб сервера',
+	'Run file' => 'Покрени датотеку',
+	'File does not exist.' => 'Датотека не постоји.',
+	'File uploads are disabled.' => 'Онемогућено је слање датотека.',
+	'Unable to upload a file.' => 'Слање датотеке није успело.',
+	'Maximum allowed file size is %sB.' => 'Највећа дозвољена величина датотеке је %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Превелики POST податак. Морате да смањите податак или повећајте вредност конфигурационе директиве %s.',
+
+	'Export' => 'Извоз',
+	'Dump' => 'Истовар',
+	'Output' => 'Испис',
+	'open' => 'отвори',
+	'save' => 'сачувај',
+	'Format' => 'Формат',
+	'Data' => 'Податци',
+
+	'Database' => 'База података',
+	'database' => 'база података',
+	'Use' => 'Користи',
+	'Select database' => 'Изаберите базу',
+	'Invalid database.' => 'Неисправна база података.',
+	'Create new database' => 'Направи нову базу података',
+	'Database has been dropped.' => 'База података је избрисана.',
+	'Databases have been dropped.' => 'Базњ података су избрисане.',
+	'Database has been created.' => 'База података је креирана.',
+	'Database has been renamed.' => 'База података је преименована.',
+	'Database has been altered.' => 'База података је измењена.',
+	'Alter database' => 'Уреди базу података',
+	'Create database' => 'Формирај базу података',
+	'Database schema' => 'Шема базе података',
+
+	// link to current database schema layout
+	'Permanent link' => 'Трајна веза',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'Engine' => 'Механизам',
+	'Collation' => 'Сравњивање',
+	'Data Length' => 'Дужина података',
+	'Index Length' => 'Дужина индекса',
+	'Data Free' => 'Слободно података',
+	'Rows' => 'Редова',
+	'%d in total' => 'укупно %d',
+	'Analyze' => 'Анализирај',
+	'Optimize' => 'Оптимизуј',
+	'Check' => 'Провери',
+	'Repair' => 'Поправи',
+	'Truncate' => 'Испразни',
+	'Tables have been truncated.' => 'Табеле су испражњене.',
+	'Move to other database' => 'Премести у другу базу података',
+	'Move' => 'Премести',
+	'Tables have been moved.' => 'Табеле су премешћене.',
+	'Copy' => 'Умножи',
+	'Tables have been copied.' => 'Табеле су умножене.',
+
+	'Routines' => 'Рутине',
+	'Routine has been called, %d row(s) affected.' => array('Позвана је рутина, %d ред је погођен.', 'Позвана је рутина, %d реда су погођена.', 'Позвана је рутина, %d редова је погођено.'),
+	'Call' => 'Позови',
+	'Parameter name' => 'Назив параметра',
+	'Create procedure' => 'Формирај процедуру',
+	'Create function' => 'Формирај функцију',
+	'Routine has been dropped.' => 'Рутина је избрисана.',
+	'Routine has been altered.' => 'Рутина је измењена.',
+	'Routine has been created.' => 'Рутина је креирана.',
+	'Alter function' => 'Уреди функцију',
+	'Alter procedure' => 'Уреди процедуру',
+	'Return type' => 'Повратни тип',
+
+	'Events' => 'Догађаји',
+	'Event has been dropped.' => 'Догађај је избрисан.',
+	'Event has been altered.' => 'Догађај је измењен.',
+	'Event has been created.' => 'Догађај је креиран.',
+	'Alter event' => 'Уреди догађај',
+	'Create event' => 'Направи догађај',
+	'At given time' => 'У задато време',
+	'Every' => 'Сваки',
+	'Schedule' => 'Распоред',
+	'Start' => 'Почетак',
+	'End' => 'Крај',
+	'On completion preserve' => 'Задржи по завршетку',
+
+	'Tables' => 'Табеле',
+	'Tables and views' => 'Табеле и погледи',
+	'Table' => 'Табела',
+	'No tables.' => 'Без табела.',
+	'Alter table' => 'Уреди табелу',
+	'Create table' => 'Направи табелу',
+	'Create new table' => 'направи нову табелу',
+	'Table has been dropped.' => 'Табела је избрисана.',
+	'Tables have been dropped.' => 'Табеле су избрисане.',
+	'Tables have been optimized.' => 'Табеле су оптимизоване.',
+	'Table has been altered.' => 'Табела је измењена.',
+	'Table has been created.' => 'Табела је креирана.',
+	'Table name' => 'Назив табеле',
+	'Show structure' => 'Прикажи структуру',
+	'engine' => 'механизам',
+	'collation' => 'Сравњивање',
+	'Column name' => 'Назив колоне',
+	'Type' => 'Тип',
+	'Length' => 'Дужина',
+	'Auto Increment' => 'Ауто-прираштај',
+	'Options' => 'Опције',
+	'Comment' => 'Коментар',
+	'Default values' => 'Подразумеване вредности',
+	'Drop' => 'Избриши',
+	'Are you sure?' => 'Да ли сте сигурни?',
+	'Move up' => 'Помери на горе',
+	'Move down' => 'Помери на доле',
+	'Remove' => 'Уклони',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s и %s.',
+
+	'Partition by' => 'Подели по',
+	'Partitions' => 'Поделе',
+	'Partition name' => 'Име поделе',
+	'Values' => 'Вредности',
+
+	'View' => 'Поглед',
+	'View has been dropped.' => 'Поглед је избрисан.',
+	'View has been altered.' => 'Поглед је измењен.',
+	'View has been created.' => 'Поглед је креиран.',
+	'Alter view' => 'Уреди поглед',
+	'Create view' => 'Направи поглед',
+
+	'Indexes' => 'Индекси',
+	'Indexes have been altered.' => 'Индекси су измењени.',
+	'Alter indexes' => 'Уреди индексе',
+	'Add next' => 'Додај следећи',
+	'Index Type' => 'Тип индекса',
+	'Column (length)' => 'Колона (дужина)',
+
+	'Foreign keys' => 'Страни кључеви',
+	'Foreign key' => 'Страни кључ',
+	'Foreign key has been dropped.' => 'Страни кључ је избрисан.',
+	'Foreign key has been altered.' => 'Страни кључ је измењен.',
+	'Foreign key has been created.' => 'Страни кључ је креиран.',
+	'Target table' => 'Циљна табела',
+	'Change' => 'Измени',
+	'Source' => 'Извор',
+	'Target' => 'Циљ',
+	'Add column' => 'Додај колону',
+	'Alter' => 'Уреди',
+	'Add foreign key' => 'Додај страни кључ',
+	'ON DELETE' => 'ON DELETE (приликом брисања)',
+	'ON UPDATE' => 'ON UPDATE (приликом освежавања)',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Изворне и циљне колоне морају бити истог типа, циљна колона мора бити индексирана и изворна табела мора садржати податке из циљне.',
+
+	'Triggers' => 'Окидачи',
+	'Add trigger' => 'Додај окидач',
+	'Trigger has been dropped.' => 'Окидач је избрисан.',
+	'Trigger has been altered.' => 'Окидач је измењен.',
+	'Trigger has been created.' => 'Окидач је креиран.',
+	'Alter trigger' => 'Уреди окидач',
+	'Create trigger' => 'Формирај окидач',
+	'Time' => 'Време',
+	'Event' => 'Догађај',
+	'Name' => 'Име',
+
+	'select' => 'изабери',
+	'Select' => 'Изабери',
+	'Select data' => 'Изабери податке',
+	'Functions' => 'Функције',
+	'Aggregation' => 'Сакупљање',
+	'Search' => 'Претрага',
+	'anywhere' => 'било где',
+	'Search data in tables' => 'Претражи податке у табелама',
+	'Sort' => 'Поређај',
+	'descending' => 'опадајуће',
+	'Limit' => 'Граница',
+	'Text length' => 'Дужина текста',
+	'Action' => 'Акција',
+	'Full table scan' => 'Скренирање комплетне табеле',
+	'Unable to select the table' => 'Не могу да изаберем табелу',
+	'No rows.' => 'Без редова.',
+	'%d row(s)' => array('%d ред', '%d реда', '%d редова'),
+	'Page' => 'Страна',
+	'last' => 'последња',
+	'Last page' => 'Последња страна',
+	'Loading'  => 'Учитавам',
+	'Load more data'  => 'Учитавам још података',
+	'whole result' => 'цео резултат',
+	'%d byte(s)' => array('%d бајт', '%d бајта', '%d бајтова'),
+
+	'Import' => 'Увоз',
+	'%d row(s) have been imported.' => array('%d ред је увежен.', '%d реда су увежена.', '%d редова је увежено.'),
+
+	// in-place editing in select
+	'Double click on a value to modify it.' => 'Дупли клик на вредност за измену.',
+	'Use edit link to modify this value.' => 'Користи везу за измену ове вредности.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Ставка%s је додата.',
+	'Item has been deleted.' => 'Ставка је избрисана.',
+	'Item has been updated.' => 'Ставка је измењена.',
+	'%d item(s) have been affected.' => array('%d ставка је погођена.', '%d ставке су погођене.', '%d ставки је погођено.'),
+	'New item' => 'Нова ставка',
+	'original' => 'оригинал',
+	// label for value '' in enum data type
+	'empty' => 'празно',
+	'edit' => 'измени',
+	'Edit' => 'Измени',
+	'Insert' => 'Уметни',
+	'Save' => 'Сачувај',
+	'Save and continue edit' => 'Сачувај и настави уређење',
+	'Save and insert next' => 'Сачувај и уметни следеће',
+	'Clone' => 'Дуплирај',
+	'Delete' => 'Избриши',
+
+	'E-mail' => 'Ел. пошта',
+	'From' => 'Од',
+	'Subject' => 'Наслов',
+	'Attachments' => 'Прилози',
+	'Send' => 'Пошаљи',
+	'%d e-mail(s) have been sent.' => array('%d порука ел. поште је послата.', '%d поруке ел. поште су послате.', '%d порука ел. поште је послато.'),
+
+	// data type descriptions
+	'Numbers' => 'Број',
+	'Date and time' => 'Датум и време',
+	'Strings' => 'Текст',
+	'Binary' => 'Бинарно',
+	'Lists' => 'Листе',
+	'Network' => 'Мрежа',
+	'Geometry' => 'Геометрија',
+	'Relations' => 'Односи',
+
+	'Editor' => 'Уређивач',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1.',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'dd.mm.[yyyy].',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'сад',
+	'yes' => 'да',
+	'no' => 'не',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Датотека већ постоји.',
+	'Please use one of the extensions %s.' => 'Молим користите један од наставака %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Уреди шему',
+	'Create schema' => 'Формирај шему',
+	'Schema has been dropped.' => 'Шема је избрисана.',
+	'Schema has been created.' => 'Шема је креирана.',
+	'Schema has been altered.' => 'Шема је измењена.',
+	'schema' => 'шема',
+	'Schema' => 'Шема',
+	'Invalid schema.' => 'Шема није исправна.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Низови',
+	'Create sequence' => 'Направи низ',
+	'Sequence has been dropped.' => 'Низ је избрисан.',
+	'Sequence has been created.' => 'Низ је формиран.',
+	'Sequence has been altered.' => 'Низ је измењен.',
+	'Alter sequence' => 'Уреди низ',
+
+	// PostgreSQL user types support
+	'User types' => 'Кориснички типови',
+	'Create type' => 'Дефиниши тип',
+	'Type has been dropped.' => 'Тип је избрисан.',
+	'Type has been created.' => 'тип је креиран.',
+	'Alter type' => 'Уреди тип',
+);

adminer/lang/ta.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => 'நகல்',
 	'Permanent link' => 'நிரந்தர இணைப்பு',
 	'Edit all' => 'அனைத்தையும் தொகு',
-	'Resend POST data?' => 'POST data வை மீண்டும் அனுப்பவா?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/uk.inc.php

@@ -0,0 +1,320 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Система Бази Даних',
+	'Server' => 'Сервер',
+	'Username' => 'Користувач',
+	'Password' => 'Пароль',
+	'Permanent login' => 'Пам\'ятати сесію',
+	'Login' => 'Увійти',
+	'Logout' => 'Вийти',
+	'Logged as: %s' => 'Ви увійшли як: %s',
+	'Logout successful.' => 'Ви вдало вийшли з системи.',
+	'Invalid credentials.' => 'Неправильні дані входу.',
+	'Language' => 'Мова',
+	'Invalid CSRF token. Send the form again.' => 'Недійсний CSRF токен. Надішліть форму ще раз.',
+	'No extension' => 'Нема розширень',
+	'None of the supported PHP extensions (%s) are available.' => 'Жодне з PHP-розширень (%s), що підтримуються, не доступне.',
+	'Session support must be enabled.' => 'Сесії повинні бути дозволені.',
+	'Session expired, please login again.' => 'Сесія закінчилась, будь ласка, увійдіть в систему знову.',
+	'%s version: %s through PHP extension %s' => 'Версія %s: %s з PHP-розширенням %s',
+	'Refresh' => 'Оновити',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => 'Привілеї',
+	'Create user' => 'Створити користувача',
+	'User has been dropped.' => 'Користувача було видалено.',
+	'User has been altered.' => 'Користувача було змінено.',
+	'User has been created.' => 'Користувача було створено.',
+	'Hashed' => 'Хешовано',
+	'Column' => 'Колонка',
+	'Routine' => 'Процедура',
+	'Grant' => 'Дозволити',
+	'Revoke' => 'Заборонити',
+	
+	'Process list' => 'Перелік процесів',
+	'%d process(es) have been killed.' => array('Було завершено %d процес.', 'Було завершено %d процеси.', 'Було завершёно %d процесів.'),
+	'Kill' => 'Завершити процес',
+	
+	'Variables' => 'Змінні',
+	'Status' => 'Статус',
+	
+	'SQL command' => 'SQL запит',
+	'%d query(s) executed OK.' => array('%d запит виконано успішно.', '%d запити виконано успішно.', '%d запитів виконано успішно.'),
+	'Query executed OK, %d row(s) affected.' => array('Запит виконано успішно, змінено %d рядок.', 'Запит виконано успішно, змінено %d рядки.', 'Запит виконано успішно, змінено %d рядків.'),
+	'No commands to execute.' => 'Нема запитів до виконання.',
+	'Error in query' => 'Помилка в запиті',
+	'Execute' => 'Виконати',
+	'Stop on error' => 'Зупинитись при помилці',
+	'Show only errors' => 'Показувати тільки помилки',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Історія',
+	'Clear' => 'Очистити',
+	'Edit all' => 'Редагувати все',
+	
+	'File upload' => 'Завантажити файл',
+	'From server' => 'З сервера',
+	'Webserver file %s' => 'Файл %s на вебсервері',
+	'Run file' => 'Запустити файл',
+	'File does not exist.' => 'Файл не існує.',
+	'File uploads are disabled.' => 'Завантаження файлів заборонене.',
+	'Unable to upload a file.' => 'Неможливо завантажити файл.',
+	'Maximum allowed file size is %sB.' => 'Максимально допустимий розмір файлу %sБ.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
+	
+	'Export' => 'Експорт',
+	'Dump' => 'Дамп',
+	'Output' => 'Вихідні дані',
+	'open' => 'відкрити',
+	'save' => 'зберегти',
+	'Format' => 'Формат',
+	'Data' => 'Дані',
+	
+	'Database' => 'База даних',
+	'database' => 'база даних',
+	'Use' => 'Обрати',
+	'Select database' => 'Обрати базу даних',
+	'Invalid database.' => 'Погана база даних.',
+	'Create new database' => 'Створити нову базу даних',
+	'Database has been dropped.' => 'Базу даних було видалено.',
+	'Databases have been dropped.' => 'Бази даних були видалені.',
+	'Database has been created.' => 'Базу даних було створено.',
+	'Database has been renamed.' => 'Базу даних було переіменовано.',
+	'Database has been altered.' => 'Базу даних було змінено.',
+	'Alter database' => 'Змінити базу даних',
+	'Create database' => 'Створити базу даних',
+	'Database schema' => 'Схема бази даних',
+	
+	// link to current database schema layout
+	'Permanent link' => 'Постійне посилання',
+	
+	// thousands separator - must contain single byte
+	',' => ' ',
+	'Engine' => 'Рушій',
+	'Collation' => 'Співставлення',
+	'Data Length' => 'Об\'єм даних',
+	'Index Length' => 'Об\'єм індексів',
+	'Data Free' => 'Вільне місце',
+	'Rows' => 'Рядків',
+	'%d in total' => '%d всього',
+	'Analyze' => 'Аналізувати',
+	'Optimize' => 'Оптимізувати',
+	'Check' => 'Перевірити',
+	'Repair' => 'Виправити',
+	'Truncate' => 'Очистити',
+	'Tables have been truncated.' => 'Таблиці було очищено.',
+	'Move to other database' => 'Перенести до іншої бази даних',
+	'Move' => 'Перенести',
+	'Tables have been moved.' => 'Таблиці було перенесено.',
+	'Copy' => 'копіювати',
+	'Tables have been copied.' => 'Таблиці було зкопійовано.',
+	
+	'Routines' => 'Збережені процедури',
+	'Routine has been called, %d row(s) affected.' => array('Була викликана процедура, %d запис було змінено.', 'Була викликана процедура, %d записи було змінено.', 'Була викликана процедура, %d записів було змінено.'),
+	'Call' => 'Викликати',
+	'Parameter name' => 'Назва параметра',
+	'Create procedure' => 'Створити процедуру',
+	'Create function' => 'Створити функцію',
+	'Routine has been dropped.' => 'Процедуру було видалено.',
+	'Routine has been altered.' => 'Процедуру було змінено.',
+	'Routine has been created.' => 'Процедуру було створено.',
+	'Alter function' => 'Змінити функцію',
+	'Alter procedure' => 'Змінити процедуру',
+	'Return type' => 'Тип, що повернеться',
+	
+	'Events' => 'Події',
+	'Event has been dropped.' => 'Подію було видалено.',
+	'Event has been altered.' => 'Подію було змінено.',
+	'Event has been created.' => 'Подію було створено.',
+	'Alter event' => 'Змінити подію',
+	'Create event' => 'Створити подію',
+	'At given time' => 'В даний час',
+	'Every' => 'Кожного',
+	'Schedule' => 'Розклад',
+	'Start' => 'Початок',
+	'End' => 'Кінець',
+	'On completion preserve' => 'Після завершення зберегти',
+	
+	'Tables' => 'Таблиці',
+	'Tables and views' => 'Таблиці і вигляди',
+	'Table' => 'Таблиця',
+	'No tables.' => 'Нема таблиць.',
+	'Alter table' => 'Змінити таблицю',
+	'Create table' => 'Створити таблицю',
+	'Create new table' => 'Створити нову таблицю',
+	'Table has been dropped.' => 'Таблицю було видалено.',
+	'Tables have been dropped.' => 'Таблиці були видалені.',
+	'Tables have been optimized.' => 'Таблиці були оптимізовані.',
+	'Table has been altered.' => 'Таблица була змінена.',
+	'Table has been created.' => 'Таблиця була створена.',
+	'Table name' => 'Назва таблиці',
+	'Show structure' => 'Показати структуру',
+	'engine' => 'рушій',
+	'collation' => 'співставлення',
+	'Column name' => 'Назва стовпця',
+	'Type' => 'Тип',
+	'Length' => 'Довжина',
+	'Auto Increment' => 'Автоматичне збільшення',
+	'Options' => 'Опції',
+	'Comment' => 'Коментарі',
+	'Default values' => 'Значення за замовчуванням',
+	'Drop' => 'Видалити',
+	'Are you sure?' => 'Ви впевнені?',
+	'Move up' => 'Пересунути вгору',
+	'Move down' => 'Пересунути вниз',
+	'Remove' => 'Видалити',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s і %s.',
+	
+	'Partition by' => 'Розділити по',
+	'Partitions' => 'Розділи',
+	'Partition name' => 'Назва розділу',
+	'Values' => 'Значення',
+	
+	'View' => 'Вигляд',
+	'View has been dropped.' => 'Вигляд було видалено.',
+	'View has been altered.' => 'Вигляд було змінено.',
+	'View has been created.' => 'Вигляд було створено.',
+	'Alter view' => 'Змінити вигляд',
+	'Create view' => 'Створити вигляд',
+	
+	'Indexes' => 'Індекси',
+	'Indexes have been altered.' => 'Індексування було змінено.',
+	'Alter indexes' => 'Змінити індексування',
+	'Add next' => 'Додати ще',
+	'Index Type' => 'Тип індексу',
+	'Column (length)' => 'Стовпець (довжина)',
+	
+	'Foreign keys' => 'Зовнішні ключі',
+	'Foreign key' => 'Зовнішній ключ',
+	'Foreign key has been dropped.' => 'Зовнішній ключ було видалено.',
+	'Foreign key has been altered.' => 'Зовнішній ключ було змінено.',
+	'Foreign key has been created.' => 'Зовнішній ключ було створено.',
+	'Target table' => 'Цільова таблиця',
+	'Change' => 'Змінити',
+	'Source' => 'Джерело',
+	'Target' => 'Ціль',
+	'Add column' => 'Додати стовпець',
+	'Alter' => 'Змінити',
+	'Add foreign key' => 'Додати зовнішній ключ',
+	'ON DELETE' => 'ПРИ ВИДАЛЕННІ',
+	'ON UPDATE' => 'ПРИ ЗМІНІ',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Стовпці повинні мати той самий тип даних, цільові стовпці повинні бути проіндексовані і дані, на які посилаються повинні існувати.',
+	
+	'Triggers' => 'Тригери',
+	'Add trigger' => 'Додати тригер',
+	'Trigger has been dropped.' => 'Тригер було видалено.',
+	'Trigger has been altered.' => 'Тригер було змінено.',
+	'Trigger has been created.' => 'Тригер було створено.',
+	'Alter trigger' => 'Змінити тригер',
+	'Create trigger' => 'Створити тригер',
+	'Time' => 'Час',
+	'Event' => 'Подія',
+	'Name' => 'Назва',
+	
+	'select' => 'вибрати',
+	'Select' => 'Вибрати',
+	'Select data' => 'Вибрати дані',
+	'Functions' => 'Функції',
+	'Aggregation' => 'Агрегація',
+	'Search' => 'Пошук',
+	'anywhere' => 'будь-де',
+	'Search data in tables' => 'Шукати дані в таблицях',
+	'Sort' => 'Сортувати',
+	'descending' => 'по спаданню',
+	'Limit' => 'Обмеження',
+	'Text length' => 'Довжина тексту',
+	'Action' => 'Дія',
+	'Unable to select the table' => 'Неможливо вибрати таблицю',
+	'No rows.' => 'Нема рядків.',
+	'%d row(s)' => array('%d рядок', '%d рядки', '%d рядків'),
+	'Page' => 'Сторінка',
+	'last' => 'остання',
+	'Last page' => 'Остання сторінка',
+	'whole result' => 'весь результат',
+	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
+	
+	'Import' => 'Імпортувати',
+	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
+	
+	// in-place editing in select
+	'Double click on a value to modify it.' => 'Двічі клікніть на значенні щоб змінити його.',
+	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Запис%s було вставлено.',
+	'Item has been deleted.' => 'Запис було видалено.',
+	'Item has been updated.' => 'Запис було змінено.',
+	'%d item(s) have been affected.' => array('Було змінено %d запис.', 'Було змінено %d записи.', 'Було змінено %d записів.'),
+	'New item' => 'Новий запис',
+	'original' => 'початковий',
+	// label for value '' in enum data type
+	'empty' => 'порожньо',
+	'edit' => 'редагувати',
+	'Edit' => 'Редагувати',
+	'Insert' => 'Вставити',
+	'Save' => 'Зберегти',
+	'Save and continue edit' => 'Зберегти і продовжити редагування',
+	'Save and insert next' => 'Зберегти і вставити знову',
+	'Clone' => 'Клонувати',
+	'Delete' => 'Видалити',
+	
+	'E-mail' => 'E-mail',
+	'From' => 'Від',
+	'Subject' => 'Заголовок',
+	'Attachments' => 'Додатки',
+	'Send' => 'Надіслати',
+	'%d e-mail(s) have been sent.' => array('Було надіслано %d повідомлення.', 'Було надіслано %d повідомлення.', 'Було надіслано %d повідомлень.'),
+	
+	// data type descriptions
+	'Numbers' => 'Числа',
+	'Date and time' => 'Дата і час',
+	'Strings' => 'Радки',
+	'Binary' => 'Двійкові',
+	'Lists' => 'Списки',
+	'Network' => 'Мережа',
+	'Geometry' => 'Геометрія',
+	'Relations' => 'Зв\'язки',
+	
+	'Editor' => 'Редактор',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'дд.мм.[рррр]',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'ГГ:ХХ:СС',
+	'now' => 'зараз',
+	'yes' => 'так',
+	'no' => 'ні',
+	
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Файл існує.',
+	'Please use one of the extensions %s.' => 'Будь ласка, використовуйте одне з розширень %s.',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Змінити схему',
+	'Create schema' => 'Створити схему',
+	'Schema has been dropped.' => 'Схему було видалено.',
+	'Schema has been created.' => 'Схему було створено.',
+	'Schema has been altered.' => 'Схему було змінено.',
+	'schema' => 'схема',
+	'Schema' => 'Схема',
+	'Invalid schema.' => 'Невірна схема.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Послідовності',
+	'Create sequence' => 'Створити послідовність',
+	'Sequence has been dropped.' => 'Послідовність було видалено.',
+	'Sequence has been created.' => 'Послідовність було створено.',
+	'Sequence has been altered.' => 'Послідовність було змінено.',
+	'Alter sequence' => 'Змінити послідовність',
+	
+	// PostgreSQL user types support
+	'User types' => 'Типи користувачів',
+	'Create type' => 'Створити тип',
+	'Type has been dropped.' => 'Тип було видалено.',
+	'Type has been created.' => 'Тип було створено.',
+	'Alter type' => 'Змінити тип',
+);

adminer/lang/xx.inc.php

@@ -0,0 +1,321 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'xx',
+	'Server' => 'xx',
+	'Username' => 'xx',
+	'Password' => 'xx',
+	'Permanent login' => 'xx',
+	'Login' => 'xx',
+	'Logout' => 'xx',
+	'Logged as: %s' => 'xx',
+	'Logout successful.' => 'xx',
+	'Invalid credentials.' => 'xx',
+	'Language' => 'xx',
+	'Invalid CSRF token. Send the form again.' => 'xx',
+	'No extension' => 'xx',
+	'None of the supported PHP extensions (%s) are available.' => 'xx',
+	'Session support must be enabled.' => 'xx',
+	'Session expired, please login again.' => 'xx',
+	'%s version: %s through PHP extension %s' => 'xx',
+	'Refresh' => 'xx',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'xx',
+	
+	'Privileges' => 'xx',
+	'Create user' => 'xx',
+	'User has been dropped.' => 'xx',
+	'User has been altered.' => 'xx',
+	'User has been created.' => 'xx',
+	'Hashed' => 'xx',
+	'Column' => 'xx',
+	'Routine' => 'xx',
+	'Grant' => 'xx',
+	'Revoke' => 'xx',
+	
+	'Process list' => 'xx',
+	'%d process(es) have been killed.' => array('xx', 'xx'),
+	'Kill' => 'xx',
+	
+	'Variables' => 'xx',
+	'Status' => 'xx',
+	
+	'SQL command' => 'xx',
+	'%d query(s) executed OK.' => array('xx', 'xx'),
+	'Query executed OK, %d row(s) affected.' => array('xx', 'xx'),
+	'No commands to execute.' => 'xx',
+	'Error in query' => 'xx',
+	'Execute' => 'xx',
+	'Stop on error' => 'xx',
+	'Show only errors' => 'xx',
+	// sprintf() format for time of the command
+	'%.3f s' => 'xx',
+	'History' => 'xx',
+	'Clear' => 'xx',
+	'Edit all' => 'xx',
+	
+	'File upload' => 'xx',
+	'From server' => 'xx',
+	'Webserver file %s' => 'xx',
+	'Run file' => 'xx',
+	'File does not exist.' => 'xx',
+	'File uploads are disabled.' => 'xx',
+	'Unable to upload a file.' => 'xx',
+	'Maximum allowed file size is %sB.' => 'xx',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'xx',
+	
+	'Export' => 'xx',
+	'Dump' => 'xx',
+	'Output' => 'xx',
+	'open' => 'xx',
+	'save' => 'xx',
+	'Format' => 'xx',
+	'Data' => 'xx',
+	
+	'Database' => 'xx',
+	'database' => 'xx',
+	'Use' => 'xx',
+	'Select database' => 'xx',
+	'Invalid database.' => 'xx',
+	'Create new database' => 'xx',
+	'Database has been dropped.' => 'xx',
+	'Databases have been dropped.' => 'xx',
+	'Database has been created.' => 'xx',
+	'Database has been renamed.' => 'xx',
+	'Database has been altered.' => 'xx',
+	'Alter database' => 'xx',
+	'Create database' => 'xx',
+	'Database schema' => 'xx',
+	
+	// link to current database schema layout
+	'Permanent link' => 'xx',
+	
+	// thousands separator - must contain single byte
+	',' => 'xx',
+	'Engine' => 'xx',
+	'Collation' => 'xx',
+	'Data Length' => 'xx',
+	'Index Length' => 'xx',
+	'Data Free' => 'xx',
+	'Rows' => 'xx',
+	'%d in total' => 'xx',
+	'Analyze' => 'xx',
+	'Optimize' => 'xx',
+	'Check' => 'xx',
+	'Repair' => 'xx',
+	'Truncate' => 'xx',
+	'Tables have been truncated.' => 'xx',
+	'Move to other database' => 'xx',
+	'Move' => 'xx',
+	'Tables have been moved.' => 'xx',
+	'Copy' => 'xx',
+	'Tables have been copied.' => 'xx',
+	
+	'Routines' => 'xx',
+	'Routine has been called, %d row(s) affected.' => array('xx', 'xx'),
+	'Call' => 'xx',
+	'Parameter name' => 'xx',
+	'Create procedure' => 'xx',
+	'Create function' => 'xx',
+	'Routine has been dropped.' => 'xx',
+	'Routine has been altered.' => 'xx',
+	'Routine has been created.' => 'xx',
+	'Alter function' => 'xx',
+	'Alter procedure' => 'xx',
+	'Return type' => 'xx',
+	
+	'Events' => 'xx',
+	'Event has been dropped.' => 'xx',
+	'Event has been altered.' => 'xx',
+	'Event has been created.' => 'xx',
+	'Alter event' => 'xx',
+	'Create event' => 'xx',
+	'At given time' => 'xx',
+	'Every' => 'xx',
+	'Schedule' => 'xx',
+	'Start' => 'xx',
+	'End' => 'xx',
+	'On completion preserve' => 'xx',
+	
+	'Tables' => 'xx',
+	'Tables and views' => 'xx',
+	'Table' => 'xx',
+	'No tables.' => 'xx',
+	'Alter table' => 'xx',
+	'Create table' => 'xx',
+	'Create new table' => 'xx',
+	'Table has been dropped.' => 'xx',
+	'Tables have been dropped.' => 'xx',
+	'Tables have been optimized.' => 'xx',
+	'Table has been altered.' => 'xx',
+	'Table has been created.' => 'xx',
+	'Table name' => 'xx',
+	'Show structure' => 'xx',
+	'engine' => 'xx',
+	'collation' => 'xx',
+	'Column name' => 'xx',
+	'Type' => 'xx',
+	'Length' => 'xx',
+	'Auto Increment' => 'xx',
+	'Options' => 'xx',
+	'Comment' => 'xx',
+	'Default values' => 'xx',
+	'Drop' => 'xx',
+	'Are you sure?' => 'xx',
+	'Move up' => 'xx',
+	'Move down' => 'xx',
+	'Remove' => 'xx',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'xx',
+	
+	'Partition by' => 'xx',
+	'Partitions' => 'xx',
+	'Partition name' => 'xx',
+	'Values' => 'xx',
+	
+	'View' => 'xx',
+	'View has been dropped.' => 'xx',
+	'View has been altered.' => 'xx',
+	'View has been created.' => 'xx',
+	'Alter view' => 'xx',
+	'Create view' => 'xx',
+	
+	'Indexes' => 'xx',
+	'Indexes have been altered.' => 'xx',
+	'Alter indexes' => 'xx',
+	'Add next' => 'xx',
+	'Index Type' => 'xx',
+	'Column (length)' => 'xx',
+	
+	'Foreign keys' => 'xx',
+	'Foreign key' => 'xx',
+	'Foreign key has been dropped.' => 'xx',
+	'Foreign key has been altered.' => 'xx',
+	'Foreign key has been created.' => 'xx',
+	'Target table' => 'xx',
+	'Change' => 'xx',
+	'Source' => 'xx',
+	'Target' => 'xx',
+	'Add column' => 'xx',
+	'Alter' => 'xx',
+	'Add foreign key' => 'xx',
+	'ON DELETE' => 'xx',
+	'ON UPDATE' => 'xx',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'xx',
+	
+	'Triggers' => 'xx',
+	'Add trigger' => 'xx',
+	'Trigger has been dropped.' => 'xx',
+	'Trigger has been altered.' => 'xx',
+	'Trigger has been created.' => 'xx',
+	'Alter trigger' => 'xx',
+	'Create trigger' => 'xx',
+	'Time' => 'xx',
+	'Event' => 'xx',
+	'Name' => 'xx',
+	
+	'select' => 'xx',
+	'Select' => 'xx',
+	'Select data' => 'xx',
+	'Functions' => 'xx',
+	'Aggregation' => 'xx',
+	'Search' => 'xx',
+	'anywhere' => 'xx',
+	'Search data in tables' => 'xx',
+	'Sort' => 'xx',
+	'descending' => 'xx',
+	'Limit' => 'xx',
+	'Text length' => 'xx',
+	'Action' => 'xx',
+	'Full table scan' => 'xx',
+	'Unable to select the table' => 'xx',
+	'No rows.' => 'xx',
+	'%d row(s)' => array('xx', 'xx'),
+	'Page' => 'xx',
+	'last' => 'xx',
+	'Last page' => 'xx',
+	'whole result' => 'xx',
+	'%d byte(s)' => array('xx', 'xx'),
+	
+	'Import' => 'xx',
+	'%d row(s) have been imported.' => array('xx', 'xx'),
+	
+	// in-place editing in select
+	'Double click on a value to modify it.' => 'xx',
+	'Use edit link to modify this value.' => 'xx',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'xx',
+	'Item has been deleted.' => 'xx',
+	'Item has been updated.' => 'xx',
+	'%d item(s) have been affected.' => array('xx', 'xx'),
+	'New item' => 'xx',
+	'original' => 'xx',
+	// label for value '' in enum data type
+	'empty' => 'xx',
+	'edit' => 'xx',
+	'Edit' => 'xx',
+	'Insert' => 'xx',
+	'Save' => 'xx',
+	'Save and continue edit' => 'xx',
+	'Save and insert next' => 'xx',
+	'Clone' => 'xx',
+	'Delete' => 'xx',
+	
+	'E-mail' => 'xx',
+	'From' => 'xx',
+	'Subject' => 'xx',
+	'Attachments' => 'xx',
+	'Send' => 'xx',
+	'%d e-mail(s) have been sent.' => array('xx', 'xx'),
+	
+	// data type descriptions
+	'Numbers' => 'xx',
+	'Date and time' => 'xx',
+	'Strings' => 'xx',
+	'Binary' => 'xx',
+	'Lists' => 'xx',
+	'Network' => 'xx',
+	'Geometry' => 'xx',
+	'Relations' => 'xx',
+	
+	'Editor' => 'xx',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => 'xx',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'xx',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'xx',
+	'now' => 'xx',
+	'yes' => 'xx',
+	'no' => 'xx',
+	
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'xx',
+	'Please use one of the extensions %s.' => 'xx',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'xx',
+	'Create schema' => 'xx',
+	'Schema has been dropped.' => 'xx',
+	'Schema has been created.' => 'xx',
+	'Schema has been altered.' => 'xx',
+	'schema' => 'xx',
+	'Schema' => 'xx',
+	'Invalid schema.' => 'xx',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'xx',
+	'Create sequence' => 'xx',
+	'Sequence has been dropped.' => 'xx',
+	'Sequence has been created.' => 'xx',
+	'Sequence has been altered.' => 'xx',
+	'Alter sequence' => 'xx',
+	
+	// PostgreSQL user types support
+	'User types' => 'xx',
+	'Create type' => 'xx',
+	'Type has been dropped.' => 'xx',
+	'Type has been created.' => 'xx',
+	'Alter type' => 'xx',
+);

adminer/lang/zh-tw.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => '複製',
 	'Permanent link' => '永久鏈接',
 	'Edit all' => '編輯全部',
-	'Resend POST data?' => '重新發送表單資料?',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/zh.inc.php

@@ -268,6 +268,5 @@ $translations = array(
 	'Copy' => '复制',
 	'Permanent link' => '固定链接',
 	'Edit all' => '编辑全部',
-	'Resend POST data?' => '重新发送 POST 数据？',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/processlist.inc.php

@@ -23,7 +23,13 @@ foreach (process_list() as $i => $row) {
 	}
 	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row["Id"], 0) : "");
 	foreach ($row as $key => $val) {
-		echo "<td>" . (($jush == "sql" ? $key == "Info" && $val != "" : $key == "current_query" && $val != "<IDLE>") ? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>' : nbsp($val));
+		echo "<td>" . (
+			($jush == "sql" && $key == "Info" && ereg("Query|Killed", $row["Command"]) && $val != "") ||
+			($jush == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
+			($jush == "oracle" && $key == "sql_text" && $val != "")
+			? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>'
+			: nbsp($val)
+		);
 	}
 	echo "\n";
 }

adminer/script.inc.php

@@ -13,8 +13,12 @@ if ($_GET["script"] == "db") {
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = number_format($table_status[$key], 0, '.', lang(','));
-					json_row("$key-$id", ($key == "Rows" && $table_status["Engine"] == "InnoDB" && $val ? "~ $val" : $val));
+					json_row("$key-$id", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
+						? "~ $val"
+						: $val
+					));
 					if (isset($sums[$key])) {
+						// ignore innodb_file_per_table because it is not active for tables created before it was enabled
 						$sums[$key] += ($table_status["Engine"] != "InnoDB" || $key != "Data_free" ? $table_status[$key] : 0);
 					}
 				} elseif (array_key_exists($key, $table_status)) {
@@ -27,6 +31,10 @@ if ($_GET["script"] == "db") {
 		json_row("sum-$key", number_format($val, 0, '.', lang(',')));
 	}
 	json_row("");
+
+} elseif ($_GET["script"] == "kill") {
+	$connection->query("KILL " . (+$_POST["kill"]));
+
 } else { // connect
 	foreach (count_tables($adminer->databases()) as $db => $val) {
 		json_row("tables-" . js_escape($db), $val);

adminer/select.inc.php

@@ -4,8 +4,10 @@ $table_status = table_status($TABLE);
 $indexes = indexes($TABLE);
 $fields = fields($TABLE);
 $foreign_keys = column_foreign_keys($TABLE);
+$oid = "";
 if ($table_status["Oid"] == "t") {
-	$indexes[] = array("type" => "PRIMARY", "columns" => array("oid"));
+	$oid = ($jush == "sqlite" ? "rowid" : "oid");
+	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
 }
 parse_str($_COOKIE["adminer_import"], $adminer_import);
 
@@ -16,7 +18,7 @@ foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
 	if (isset($field["privileges"]["select"]) && $name != "") {
 		$columns[$key] = html_entity_decode(strip_tags($name));
-		if (ereg('text|lob', $field["type"])) {
+		if (ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
@@ -24,16 +26,27 @@ foreach ($fields as $key => $field) {
 }
 
 list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes);
+$is_group = count($group) < count($select);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
-$from = ($select ? implode(", ", $select) : ($table_status["Oid"] == "t" ? "oid, " : "") . "*") . "\nFROM " . table($TABLE);
-$group_by = ($group && count($group) < count($select) ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
+$from = ($select ? implode(", ", $select) : "*" . ($oid ? ", $oid" : ""));
+if ($jush == "sql") {
+	foreach ($columns as $key => $val) {
+		$as = convert_field($fields[$key]);
+		if ($as) {
+			$from .= ", $as AS " . idf_escape($key);
+		}
+	}
+}
+$from .= "\nFROM " . table($TABLE);
+$group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
 if ($_GET["val"] && is_ajax()) {
 	header("Content-Type: text/plain; charset=utf-8");
 	foreach ($_GET["val"] as $unique_idf => $row) {
-		echo $connection->result("SELECT" . limit(idf_escape(key($row)) . " FROM " . table($TABLE), " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : "") . ($order ? " ORDER BY " . implode(", ", $order) : ""), 1));
+		$as = convert_field($fields[key($row)]);
+		echo $connection->result("SELECT" . limit(($as ? $as : idf_escape(key($row))) . " FROM " . table($TABLE), " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : "") . ($order ? " ORDER BY " . implode(", ", $order) : ""), 1));
 	}
 	exit;
 }
@@ -103,8 +116,8 @@ if ($_POST && !$error) {
 					$command = "INSERT";
 					$query = "INTO $query";
 				}
-				if ($_POST["all"] || ($unselected === array() && $_POST["check"]) || count($group) < count($select)) {
-					$result = queries($command . " $query" . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
+				if ($_POST["all"] || ($unselected === array() && $_POST["check"]) || $is_group) {
+					$result = queries("$command $query" . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
 					$affected = $connection->affected_rows;
 				} else {
 					foreach ((array) $_POST["check"] as $val) {
@@ -117,7 +130,14 @@ if ($_POST && !$error) {
 					}
 				}
 			}
-			queries_redirect(remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result);
+			$message = lang('%d item(s) have been affected.', $affected);
+			if ($_POST["clone"] && $result && $affected == 1) {
+				$last_id = last_id();
+				if ($last_id) {
+					$message = lang('Item%s has been inserted.', " $last_id");
+				}
+			}
+			queries_redirect(remove_from_uri("page"), $message, $result);
 			//! display edit page in case of an error
 		} elseif (!$_POST["import"]) { // modify
 			if (!$_POST["val"]) {
@@ -133,7 +153,7 @@ if ($_POST && !$error) {
 					}
 					$query = table($TABLE) . " SET " . implode(", ", $set);
 					$where2 = " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : "");
-					$result = queries("UPDATE" . (count($group) < count($select) ? " $query$where2" : limit1($query, $where2))); // can change row on a different page without unique key
+					$result = queries("UPDATE" . ($is_group ? " $query$where2" : limit1($query, $where2))); // can change row on a different page without unique key
 					if (!$result) {
 						break;
 					}
@@ -179,8 +199,11 @@ if ($_POST && !$error) {
 }
 
 $table_name = $adminer->tableName($table_status);
+if (is_ajax()) {
+	// needs to send headers
+	ob_start();
+}
 page_header(lang('Select') . ": $table_name", $error);
-session_write_close();
 
 $set = null;
 if (isset($rights["insert"])) {
@@ -209,7 +232,7 @@ if (!$columns) {
 	$adminer->selectOrderPrint($order, $columns, $indexes);
 	$adminer->selectLimitPrint($limit);
 	$adminer->selectLengthPrint($text_length);
-	$adminer->selectActionPrint();
+	$adminer->selectActionPrint($indexes);
 	echo "</form>\n";
 	
 	$page = $_GET["page"];
@@ -218,7 +241,16 @@ if (!$columns) {
 		$page = floor(max(0, $found_rows - 1) / $limit);
 	}
 
-	$query = "SELECT" . limit((+$limit && $group && count($group) < count($select) && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from, ($where ? "\nWHERE " . implode(" AND ", $where) : "") . $group_by, ($limit != "" ? +$limit : null), ($page ? $limit * $page : 0), "\n");
+	$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
+	if (!$query) {
+		$query = "SELECT" . limit(
+			(+$limit && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from,
+			($where ? "\nWHERE " . implode(" AND ", $where) : "") . $group_by,
+			($limit != "" ? +$limit : null),
+			($page ? $limit * $page : 0),
+			"\n"
+		);
+	}
 	echo $adminer->selectQuery($query);
 	
 	$result = $connection->query($query);
@@ -239,7 +271,7 @@ if (!$columns) {
 		}
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
 		if ($_GET["page"] != "last") {
-			$found_rows = (+$limit && $group && count($group) < count($select)
+			$found_rows = (+$limit && $group && $is_group
 				? ($jush == "sql" ? $connection->result(" SELECT FOUND_ROWS()") : $connection->result("SELECT COUNT(*) FROM ($query) x")) // space to allow mysql.trace_mode
 				: count($rows)
 			);
@@ -250,14 +282,14 @@ if (!$columns) {
 		} else {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 			
-			echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' onkeydown='return editingKeydown(event);'>\n";
+			echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' onkeydown='return editingKeydown(event);'>\n";
 			echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('edit') . "</a>");
 			$names = array();
 			$functions = array();
 			reset($select);
 			$rank = 1;
 			foreach ($rows[0] as $key => $val) {
-				if ($table_status["Oid"] != "t" || $key != "oid") {
+				if ($key != $oid) {
 					$val = $_GET["columns"][key($select)];
 					$field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
 					$name = ($field ? $adminer->fieldName($field, $rank) : "*");
@@ -265,9 +297,17 @@ if (!$columns) {
 						$rank++;
 						$names[$key] = $name;
 						$column = idf_escape($key);
-						echo '<th><a href="' . h(remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key)
-							. ($order[0] == $column || $order[0] == $key || (!$order && count($group) < count($select) && $group[0] == $column) ? '&desc%5B0%5D=1' : '') // $order[0] == $key - COUNT(*)
-						) . '">' . (!$select || $val ? apply_sql_function($val["fun"], $name) : h(current($select))) . "</a>"; //! columns looking like functions
+						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
+						$desc = "&desc%5B0%5D=1";
+						echo '<th onmouseover="columnMouse(this);" onmouseout="columnMouse(this, \' hidden\');">';
+						echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+						echo (!$select || $val ? apply_sql_function($val["fun"], $name) : h(current($select))) . "</a>"; //! columns looking like functions
+						echo "<span class='column hidden'>";
+						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+						if (!$val["fun"]) {
+							echo '<a href="#fieldset-search" onclick="selectSearch(\'' . h(js_escape($key)) . '\'); return false;" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+						}
+						echo "</span>";
 					}
 					$functions[$key] = $val["fun"];
 					next($select);
@@ -282,13 +322,19 @@ if (!$columns) {
 				}
 			}
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
+			if (is_ajax()) {
+				if ($limit % 2 == 1 && $page % 2 == 1) {
+					odd();
+				}
+				ob_end_clean();
+			}
 			foreach ($adminer->rowDescriptions($rows, $foreign_keys) as $n => $row) {
 				$unique_array = unique_array($rows[$n], $indexes);
 				$unique_idf = "";
 				foreach ($unique_array as $key => $val) {
-					$unique_idf .= "&" . (isset($val) ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
+					$unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
 				}
-				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . (count($group) < count($select) || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>"));
+				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>"));
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						$field = $fields[$key];
@@ -297,18 +343,18 @@ if (!$columns) {
 						}
 						$link = "";
 						$val = $adminer->editVal($val, $field);
-						if (!isset($val)) {
-							$val = "<i>NULL</i>";
-						} else {
+						if ($val !== null) {
 							if (ereg('blob|bytea|raw|file', $field["type"]) && $val != "") {
 								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf);
 							}
 							if ($val === "") { // === - may be int
 								$val = "&nbsp;";
-							} elseif ($text_length != "" && ereg('text|blob', $field["type"]) && is_utf8($val)) {
-								$val = shorten_utf8($val, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
-							} else {
-								$val = h($val);
+							} elseif (is_utf8($val)) {
+								if ($text_length != "" && ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
+									$val = shorten_utf8($val, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
+								} else {
+									$val = h($val);
+								}
 							}
 							
 							if (!$link) { // link related items
@@ -351,11 +397,11 @@ if (!$columns) {
 						}
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
-						$h_value = h(isset($value) ? $value : $row[$key]);
+						$h_value = h($value !== null ? $value : $row[$key]);
 						$long = strpos($val, "<i>...</i>");
 						$editable = is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
 						$text = ereg('text|lob', $field["type"]);
-						echo (($_GET["modify"] && $editable) || isset($value)
+						echo (($_GET["modify"] && $editable) || $value !== null
 							? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
 							: "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
 						);
@@ -367,35 +413,41 @@ if (!$columns) {
 				$adminer->backwardKeysPrint($backward_keys, $rows[$n]);
 				echo "</tr>\n"; // close to allow white-space: pre
 			}
+			if (is_ajax()) {
+				exit;
+			}
 			echo "</table>\n";
 			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
 		}
 		
-		if ($rows || $page) {
+		if (($rows || $page) && !is_ajax()) {
 			$exact_count = true;
-			if ($_GET["page"] != "last" && +$limit && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
+			if ($_GET["page"] != "last" && +$limit && !$is_group && ($found_rows >= $limit || $page)) {
 				$found_rows = found_rows($table_status, $where);
 				if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
 					// slow with big tables
-					ob_flush(); //! doesn't work with AJAX
-					flush();
-					$found_rows = $connection->result("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : ""));
+					$found_rows = reset(slow_query("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : "")));
 				} else {
 					$exact_count = false;
 				}
 			}
 			echo "<p class='pages'>";
-			if (+$limit && $found_rows > $limit) {
+			if (+$limit && ($found_rows === false || $found_rows > $limit)) {
 				// display first, previous 4, next 4 and last page
-				$max_page = floor(($found_rows - 1) / $limit);
+				$max_page = ($found_rows === false
+					? $page + (count($rows) >= $limit ? 2 : 1)
+					: floor(($found_rows - 1) / $limit)
+				);
 				echo '<a href="' . h(remove_from_uri("page")) . "\" onclick=\"pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "'), event); return false;\">" . lang('Page') . "</a>:";
 				echo pagination(0, $page) . ($page > 5 ? " ..." : "");
 				for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
 					echo pagination($i, $page);
 				}
-				echo ($page + 5 < $max_page ? " ..." : "") . ($exact_count ? pagination($max_page, $page) : ' <a href="' . h(remove_from_uri() . "&page=last") . '">' . lang('last') . "</a>");
+				echo ($page + 5 < $max_page ? " ..." : "") . ($exact_count && $found_rows !== false ? pagination($max_page, $page) : ' <a href="' . h(remove_from_uri("page") . "&page=last") . '">' . lang('last') . "</a>");
 			}
-			echo " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " . checkbox("all", 1, 0, lang('whole result')) . "\n";
+			echo ($found_rows !== false ? " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ")" : "");
+			echo (+$limit && ($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit ? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '\');">' . lang('Load more data') . '</a>' : '');
+			echo " " . checkbox("all", 1, 0, lang('whole result')) . "\n";
 			
 			if ($adminer->selectCommandPrint()) {
 				?>
@@ -413,7 +465,7 @@ if (!$columns) {
 				$output = $adminer->dumpOutput();
 				echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
 				echo html_select("format", $format, $adminer_import["format"]);
-				echo " <input type='submit' name='export' value='" . lang('Export') . "' onclick='eventStop(event);'>\n";
+				echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
 				echo "</div></fieldset>\n";
 			}
 		}
@@ -431,3 +483,8 @@ if (!$columns) {
 		echo "</form>\n";
 	}
 }
+
+if (is_ajax()) {
+	ob_end_clean();
+	exit;
+}

adminer/sql.inc.php

@@ -34,14 +34,14 @@ if (!$error && $_POST) {
 		}
 		if ($query != "" && strlen($query) < 1e6) { // don't add big queries
 			$q = $query . (ereg(";[ \t\r\n]*\$", $query) ? "" : ";"); //! doesn't work with DELIMITER |
-			if (!$history || end($history) != $q) { // no repeated queries
-				$history[] = $q;
+			if (!$history || reset(end($history)) != $q) { // no repeated queries
+				restart_session();
+				$history[] = array($q, time());
+				set_session("queries", $history_all); // required because reference is unlinked by stop_session()
+				stop_session();
 			}
 		}
 		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\n)";
-		if (!ini_bool("session.use_cookies")) {
-			session_write_close();
-		}
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
@@ -51,26 +51,27 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
+		$line = 0;
 		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\\*|-- |$' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : '');
 		$total_start = microtime();
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		$dump_format = $adminer->dumpFormat();
 		unset($dump_format["sql"]);
 		while ($query != "") {
-			if (!$offset && preg_match("~^$space*DELIMITER\\s+(.+)~i", $query, $match)) {
+			if (!$offset && preg_match("~^$space*DELIMITER\\s+(\\S+)~i", $query, $match)) {
 				$delimiter = $match[1];
 				$query = substr($query, strlen($match[0]));
 			} else {
-				preg_match('(' . preg_quote($delimiter) . "|$parse)", $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match
-				$found = $match[0][0];
+				preg_match('(' . preg_quote($delimiter) . "\\s*|$parse)", $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match
+				list($found, $pos) = $match[0];
 				if (!$found && $fp && !feof($fp)) {
 					$query .= fread($fp, 1e5);
 				} else {
-					$offset = $match[0][1] + strlen($found);
 					if (!$found && rtrim($query) == "") {
 						break;
 					}
-					if ($found && $found != $delimiter) { // find matching quote or comment end
+					$offset = $pos + strlen($found);
+					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
 						while (preg_match('(' . ($found == '/*' ? '\\*/' : ($found == '[' ? ']' : (ereg('^-- |^#', $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)) {
@@ -84,7 +85,7 @@ if (!$error && $_POST) {
 						}
 					} else { // end of a query
 						$empty = false;
-						$q = substr($query, 0, $match[0][1]);
+						$q = substr($query, 0, $pos);
 						$commands++;
 						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . shorten_utf8(trim($q), 1000) . "</code></pre>\n";
 						if (!$_POST["only_errors"]) {
@@ -109,7 +110,7 @@ if (!$error && $_POST) {
 									break 2;
 								}
 							} elseif (is_object($result)) {
-								select($result, $connection2);
+								$orgtables = select($result, $connection2);
 								if (!$_POST["only_errors"]) {
 									echo "<form action='' method='post'>\n";
 									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $time;
@@ -118,13 +119,13 @@ if (!$error && $_POST) {
 										. html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
 										. html_select("format", $dump_format, $adminer_export["format"])
 										. "<input type='hidden' name='query' value='" . h($q) . "'>"
-										. " <input type='submit' name='export' value='" . lang('Export') . "' onclick='eventStop(event);'><input type='hidden' name='token' value='$token'></span>\n"
+										. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
 									;
 									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q) && ($explain = explain($connection2, $q))) {
 										$id = "explain-$commands";
 										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>$export";
 										echo "<div id='$id' class='hidden'>\n";
-										select($explain, $connection2, ($jush == "sql" ? "http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/explain-output.html#explain_" : ""));
+										select($explain, $connection2, ($jush == "sql" ? "http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/explain-output.html#explain_" : ""), $orgtables);
 										echo "</div>\n";
 									} else {
 										echo $export;
@@ -135,7 +136,7 @@ if (!$error && $_POST) {
 								if (preg_match("~^$space*(CREATE|DROP|ALTER)$space+(DATABASE|SCHEMA)\\b~isU", $q)) {
 									restart_session();
 									set_session("dbs", null); // clear cache
-									session_write_close();
+									stop_session();
 								}
 								if (!$_POST["only_errors"]) {
 									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
@@ -143,6 +144,7 @@ if (!$error && $_POST) {
 							}
 							$start = $end;
 						} while ($connection->next_result());
+						$line += substr_count($q.$found, "\n");
 						$query = substr($query, $offset);
 						$offset = 0;
 					}
@@ -171,7 +173,7 @@ if ($_POST) {
 } elseif ($_GET["history"] == "all") {
 	$q = $history;
 } elseif ($_GET["history"] != "") {
-	$q = $history[$_GET["history"]];
+	$q = $history[$_GET["history"]][0];
 }
 textarea("query", $q, 20);
 echo ($_POST ? "" : "<script type='text/javascript'>document.getElementsByTagName('textarea')[0].focus();</script>\n");
@@ -202,8 +204,8 @@ echo "</div></fieldset>\n";
 if ($history) {
 	print_fieldset("history", lang('History'), $_GET["history"] != "");
 	foreach ($history as $key => $val) {
-		//! save and display timestamp
-		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a> <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $val)))), 80, "</code>") . "<br>\n";
+		list($q, $time) = $val;
+		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a> <span class='time'>" . @date("H:i:s", $time) . "</span> <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>") . "<br>\n"; // @ - time zone may be not set
 	}
 	echo "<input type='submit' name='clear' value='" . lang('Clear') . "'>\n";
 	echo "<a href='" . h(ME . "sql=&history=all") . "'>" . lang('Edit all') . "</a>\n";

adminer/static/default.css

@@ -3,6 +3,7 @@ body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica,
 a { color: blue; }
 a:visited { color: navy; }
 a:hover { color: red; }
+a.text { text-decoration: none; }
 h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: 1em 0 0; }
@@ -20,10 +21,9 @@ code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
 pre { margin: 1em 0 0; }
 input[type=image] { vertical-align: middle; }
-.loading { cursor: progress; }
-.loading #loader { display: inline; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
+.js .column { position: absolute; background: #ddf; padding: .3em 1ex .3em 0; margin-top: -.3em; }
 .nowrap td, .nowrap th, td.nowrap { white-space: pre; }
 .wrap td { white-space: normal; }
 .error { color: red; background: #fee; }
@@ -44,12 +44,17 @@ input[type=image] { vertical-align: middle; }
 .options select { width: 20ex; width: auto\9; }
 .active { font-weight: bold; }
 .sqlarea { width: 98%; }
-#menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; overflow: auto; overflow-y: hidden; white-space: nowrap; }
+.icon { width: 18px; height: 18px; }
+#menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
 #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#dbs { overflow: hidden; }
+#logins, #tables { white-space: nowrap; overflow: auto; }
+#logins a, #tables a { background: #fff; }
+#logout { background: none; border: none; color: blue; font: inherit; padding: 0; text-decoration: underline; cursor: pointer; }
+#logout:hover { color: red; }
 #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; }
 #breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
-#loader { display: none; position: fixed; top: 2px; right: 2px; z-index: 1; }
 #h1 { color: #777; text-decoration: none; font-style: italic; }
 #version { font-size: 67%; color: red; }
 #schema { margin-left: 60px; position: relative; -moz-user-select: none; -webkit-user-select: none; }

adminer/static/editing.js

@@ -6,10 +6,14 @@ var jushRoot = '../externals/jush/'; // global variable to allow simple customiz
 * @param string first three characters of database system version
 */
 function bodyLoad(version) {
-	if (history.state !== undefined) { // copied from editor/static/editing.js
-		onpopstate(history);
-	}
 	if (jushRoot) {
+		// copy of jush.style to load JS and CSS at once
+		var link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.type = 'text/css';
+		link.href = jushRoot + 'jush.css';
+		document.getElementsByTagName('head')[0].appendChild(link);
+		
 		var script = document.createElement('script');
 		script.src = jushRoot + 'jush.js';
 		script.onload = function () {
@@ -19,7 +23,6 @@ function bodyLoad(version) {
 				var pgsql = 'http://www.postgresql.org/docs/' + version + '/static/';
 				jush.urls.pgsql_pgsqlset = jush.urls.pgsql[0] = pgsql + '$key';
 				jush.urls.pgsqlset[0] = pgsql + 'runtime-config-$key.html#GUC-$1';
-				jush.style(jushRoot + 'jush.css');
 				if (window.jushLinks) {
 					jush.custom_links = jushLinks;
 				}
@@ -61,8 +64,8 @@ function typePassword(el, disable) {
 }
 
 function loginDriver(driver) {
-	var trs = driver.parentNode.parentNode.parentNode.rows;
-	for (var i=1; i < trs.length; i++) {
+	var trs = parentTag(driver, 'table').rows;
+	for (var i=1; i < trs.length - 1; i++) {
 		trs[i].className = (/sqlite/.test(driver.value) ? 'hidden' : '');
 	}
 }
@@ -106,6 +109,64 @@ function textareaKeydown(target, event) {
 
 
 
+/** Check whether the query will be executed with index
+* @param HTMLFormElement
+*/
+function selectFieldChange(form) {
+	var ok = (function () {
+		var inputs = form.getElementsByTagName('input');
+		for (var i=0; i < inputs.length; i++) {
+			if (inputs[i].value && /^fulltext/.test(inputs[i].name)) {
+				return true;
+			}
+		}
+		var ok = form.limit.value;
+		var selects = form.getElementsByTagName('select');
+		var group = false;
+		var columns = {};
+		for (var i=0; i < selects.length; i++) {
+			var select = selects[i];
+			var col = selectValue(select);
+			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) != '%'))) {
+					return true;
+				} else if (col || val) {
+					ok = false;
+				}
+			}
+			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;
+				}
+			}
+			if (col && /^order/.test(select.name)) {
+				if (!(col in indexColumns)) {
+					 ok = false;
+				}
+				break;
+			}
+		}
+		if (group) {
+			for (var col in columns) {
+				if (!(col in indexColumns)) {
+					ok = false;
+				}
+			}
+		}
+		return ok;
+	})();
+	setHtml('noindex', (ok ? '' : '!'));
+}
+
+
+
 var added = '.', rowCount;
 
 /** Check if val is equal to a-delimiter-b where delimiter is '_', '' or big letter
@@ -175,7 +236,7 @@ function editingAddRow(button, allowed, focus) {
 	}
 	var match = /(\d+)(\.\d+)?/.exec(button.name);
 	var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
-	var row = button.parentNode.parentNode;
+	var row = parentTag(button, 'tr');
 	var row2 = row.cloneNode(true);
 	var tags = row.getElementsByTagName('select');
 	var tags2 = row2.getElementsByTagName('select');
@@ -221,7 +282,7 @@ function editingAddRow(button, allowed, focus) {
 function editingRemoveRow(button) {
 	var field = formField(button.form, button.name.replace(/drop_col(.+)/, 'fields$1[field]'));
 	field.parentNode.removeChild(field);
-	button.parentNode.parentNode.style.display = 'none';
+	parentTag(button, 'tr').style.display = 'none';
 	return true;
 }
 
@@ -307,9 +368,9 @@ function partitionByChange(el) {
 * @param HTMLInputElement
 */
 function partitionNameChange(el) {
-	var row = el.parentNode.parentNode.cloneNode(true);
+	var row = parentTag(el, 'tr').cloneNode(true);
 	row.firstChild.firstChild.value = '';
-	el.parentNode.parentNode.parentNode.appendChild(row);
+	parentTag(el, 'table').appendChild(row);
 	el.onchange = function () {};
 }
 
@@ -320,13 +381,13 @@ function partitionNameChange(el) {
 */
 function foreignAddRow(field) {
 	field.onchange = function () { };
-	var row = field.parentNode.parentNode.cloneNode(true);
+	var row = parentTag(field, 'tr').cloneNode(true);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/\]/, '1$&');
 		selects[i].selectedIndex = 0;
 	}
-	field.parentNode.parentNode.parentNode.appendChild(row);
+	parentTag(field, 'table').appendChild(row);
 }
 
 
@@ -336,8 +397,7 @@ function foreignAddRow(field) {
 */
 function indexesAddRow(field) {
 	field.onchange = function () { };
-	var parent = field.parentNode.parentNode;
-	var row = parent.cloneNode(true);
+	var row = parentTag(field, 'tr').cloneNode(true);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
@@ -348,7 +408,7 @@ function indexesAddRow(field) {
 		inputs[i].name = inputs[i].name.replace(/indexes\[\d+/, '$&1');
 		inputs[i].value = '';
 	}
-	parent.parentNode.appendChild(row);
+	parentTag(field, 'table').appendChild(row);
 }
 
 /** Change column in index
@@ -356,7 +416,7 @@ function indexesAddRow(field) {
 * @param string name prefix
 */
 function indexesChangeColumn(field, prefix) {
-	var columns = field.parentNode.parentNode.getElementsByTagName('select');
+	var columns = parentTag(field, 'td').getElementsByTagName('select');
 	var names = [];
 	for (var i=0; i < columns.length; i++) {
 		var value = selectValue(columns[i]);
@@ -387,7 +447,7 @@ function indexesAddColumn(field, prefix) {
 	var input = column.getElementsByTagName('input')[0];
 	input.name = input.name.replace(/\]\[\d+/, '$&1');
 	input.value = '';
-	field.parentNode.parentNode.appendChild(column);
+	parentTag(field, 'td').appendChild(column);
 	field.onchange();
 }
 

adminer/static/functions.js

@@ -38,11 +38,24 @@ function selectValue(select) {
 	return ((selected.attributes.value || {}).specified ? selected.value : selected.text);
 }
 
+/** Get parent node with specified tag name.
+ * @param HTMLElement
+ * @param string
+ * @return HTMLElement
+ */
+function parentTag(el, tag) {
+	var re = new RegExp('^' + tag + '$', 'i');
+	while (!re.test(el.tagName)) {
+		el = el.parentNode;
+	}
+	return el;
+}
+
 /** Set checked class
 * @param HTMLInputElement
 */
 function trCheck(el) {
-	var tr = el.parentNode.parentNode;
+	var tr = parentTag(el, 'tr');
 	tr.className = tr.className.replace(/(^|\s)checked(\s|$)/, '$2') + (el.checked ? ' checked' : '');
 }
 
@@ -106,10 +119,11 @@ function tableClick(event) {
 	var click = (!window.getSelection || getSelection().isCollapsed);
 	var el = event.target || event.srcElement;
 	while (!/^tr$/i.test(el.tagName)) {
-		if (/^table$/i.test(el.tagName)) {
-			return;
-		}
-		if (/^(a|input|textarea)$/i.test(el.tagName)) {
+		if (/^(table|a|input|textarea)$/i.test(el.tagName)) {
+			if (el.type != 'checkbox') {
+				return;
+			}
+			checkboxClick(event, el);
 			click = false;
 		}
 		el = el.parentNode;
@@ -122,6 +136,40 @@ function tableClick(event) {
 	trCheck(el);
 }
 
+var lastChecked;
+
+/** Shift-click on checkbox for multiple selection.
+ * @param MouseEvent
+ * @param HTMLInputElement
+ */
+function checkboxClick(event, el) {
+	if (!el.name) {
+		return;
+	}
+	if (event.shiftKey && (!lastChecked || lastChecked.name == el.name)) {
+		var checked = (lastChecked ? lastChecked.checked : true);
+		var inputs = parentTag(el, 'table').getElementsByTagName('input');
+		var checking = !lastChecked;
+		for (var i=0; i < inputs.length; i++) {
+			var input = inputs[i];
+			if (input.name === el.name) {
+				if (checking) {
+					input.checked = checked;
+					trCheck(input);
+				}
+				if (input === el || input === lastChecked) {
+					if (checking) {
+						break;
+					}
+					checking = true;
+				}
+			}
+		}
+	} else {
+		lastChecked = el;
+	}
+}
+
 /** Set HTML code of an element
 * @param string
 * @param string undefined to set parentNode to &nbsp;
@@ -157,19 +205,40 @@ function nodePosition(el) {
 function pageClick(href, page, event) {
 	if (!isNaN(page) && page) {
 		href += (page != 1 ? '&page=' + (page - 1) : '');
-		if (!ajaxSend(href)) {
-			location.href = href;
-		}
+		location.href = href;
 	}
 }
 
 
 
+/** Display items in menu
+* @param HTMLElement
+* @param MouseEvent
+*/
+function menuOver(el, event) {
+	var a = event.target;
+	if (/^a$/i.test(a.tagName) && a.offsetLeft + a.offsetWidth > a.parentNode.offsetWidth) {
+		el.style.overflow = 'visible';
+	}
+}
+
+/** Hide items in menu
+* @param HTMLElement
+*/
+function menuOut(el) {
+	el.style.overflow = 'auto';
+}
+
+
+
 /** Add row in select fieldset
 * @param HTMLSelectElement
 */
 function selectAddRow(field) {
-	field.onchange = function () { };
+	field.onchange = function () {
+		selectFieldChange(field.form);
+	};
+	field.onchange();
 	var row = field.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
@@ -187,18 +256,43 @@ function selectAddRow(field) {
 
 
 
-/** Abort AJAX request
-* @uses ajaxRequest
-*/
-function ajaxAbort() {
-	ajaxRequest.onreadystatechange = null;
-	if (ajaxRequest.abort) {
-		ajaxRequest.abort();
+/** Toggles column context menu
+ * @param HTMLElement
+ * @param [string] extra class name
+ */
+function columnMouse(el, className) {
+	var spans = el.getElementsByTagName('span');
+	for (var i=0; i < spans.length; i++) {
+		if (/column/.test(spans[i].className)) {
+			spans[i].className = 'column' + (className || '');
+		}
 	}
 }
 
 
 
+/** Fill column in search field
+ * @param string
+ */
+function selectSearch(name) {
+	var el = document.getElementById('fieldset-search');
+	el.className = '';
+	var divs = el.getElementsByTagName('div');
+	for (var i=0; i < divs.length; i++) {
+		var div = divs[i];
+		if (/select/i.test(div.firstChild.tagName) && selectValue(div.firstChild) == name) {
+			break;
+		}
+	}
+	if (i == divs.length) {
+		div.firstChild.value = name;
+		div.firstChild.onchange();
+	}
+	div.lastChild.focus();
+}
+
+
+
 /** Send form by Ctrl+Enter on <select> and <textarea>
 * @param KeyboardEvent
 * @param [string]
@@ -206,28 +300,32 @@ function ajaxAbort() {
 */
 function bodyKeydown(event, button) {
 	var target = event.target || event.srcElement;
-	if (event.keyCode == 27 && !event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey) { // 27 - Esc
-		ajaxAbort();
-		document.body.className = document.body.className.replace(/ loading/g, '');
-		onblur = function () { };
-		if (originalFavicon) {
-			replaceFavicon(originalFavicon);
-		}
-	}
 	if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey && /select|textarea|input/i.test(target.tagName)) { // 13|10 - Enter, shiftKey allowed
 		target.blur();
-		if (!ajaxForm(target.form, (button ? button + '=1' : ''))) {
-			if (button) {
-				target.form[button].click();
-			} else {
-				target.form.submit();
-			}
+		if (button) {
+			target.form[button].click();
+		} else {
+			target.form.submit();
 		}
 		return false;
 	}
 	return true;
 }
 
+/** Open form to a new window on Ctrl+click or Shift+click
+* @param MouseEvent
+*/
+function bodyClick(event) {
+	var target = event.target || event.srcElement;
+	if ((event.ctrlKey || event.shiftKey) && target.type == 'submit' && /input/i.test(target.tagName)) {
+		target.form.target = '_blank';
+		setTimeout(function () {
+			// if (event.ctrlKey) { focus(); } doesn't work
+			target.form.target = '';
+		}, 0);
+	}
+}
+
 
 
 /** Change focus by Ctrl+Up or Ctrl+Down
@@ -307,132 +405,6 @@ function ajaxSetHtml(url) {
 	});
 }
 
-var originalFavicon;
-
-/** Replace favicon
-* @param string
-*/
-function replaceFavicon(href) {
-	var favicon = document.getElementById('favicon');
-	if (favicon) {
-		favicon.href = href;
-		favicon.parentNode.appendChild(favicon); // to replace the icon in Firefox
-	}
-}
-
-var ajaxRequest = {};
-
-/** Safely load content to #content
-* @param string
-* @param [string]
-* @param [boolean]
-* @param [boolean]
-* @return XMLHttpRequest or false in case of an error
-* @uses ajaxRequest
-*/
-function ajaxSend(url, data, popState, noscroll) {
-	if (!history.pushState) {
-		return false;
-	}
-	ajaxAbort();
-	onblur = function () {
-		if (!originalFavicon) {
-			originalFavicon = (document.getElementById('favicon') || {}).href;
-		}
-		replaceFavicon(document.getElementById('loader').firstChild.src);
-	};
-	document.body.className += ' loading';
-	ajaxRequest = ajax(url, function (request) {
-		var title = request.getResponseHeader('X-AJAX-Title');
-		if (title) {
-			document.title = decodeURIComponent(title);
-		}
-		var redirect = request.getResponseHeader('X-AJAX-Redirect');
-		if (redirect) {
-			return ajaxSend(redirect, '', popState);
-		}
-		onblur = function () { };
-		if (originalFavicon) {
-			replaceFavicon(originalFavicon);
-		}
-		if (!popState) {
-			if (data || url != location.href) {
-				history.pushState(data, '', url); //! remember window position
-			}
-		}
-		if (!noscroll && !/&order/.test(url)) {
-			scrollTo(0, 0);
-		}
-		setHtml('content', (request.status ? request.responseText : '<p class="error">' + noResponse));
-		document.body.className = document.body.className.replace(/ loading/g, '');
-		var content = document.getElementById('content');
-		var scripts = content.getElementsByTagName('script');
-		var length = scripts.length; // required to avoid infinite loop
-		for (var i=0; i < length; i++) {
-			var script = document.createElement('script');
-			script.text = scripts[i].text;
-			content.appendChild(script);
-		}
-		
-		var as = document.getElementById('menu').getElementsByTagName('a');
-		var href = location.href.replace(/(&(sql=|dump=|(select|table)=[^&]*)).*/, '$1');
-		for (var i=0; i < as.length; i++) {
-			as[i].className = (href == as[i].href ? 'active' : '');
-		}
-		var dump = document.getElementById('dump');
-		if (dump) {
-			var match = /&(select|table)=([^&]+)/.exec(href);
-			dump.href = dump.href.replace(/[^=]+$/, '') + (match ? match[2] : '');
-		}
-		//! modify Change database hidden fields
-		
-		if (window.jush) {
-			jush.highlight_tag('code', 0);
-		}
-	}, data);
-	return ajaxRequest;
-}
-
-/** Revive page from history
-* @param PopStateEvent|history
-* @uses ajaxRequest
-*/
-onpopstate = function (event) {
-	if ((ajaxRequest.send || event.state) && !/#/.test(location.href)) {
-		ajaxSend(location.href, (event.state && confirm(areYouSure) ? event.state : ''), 1); // 1 - disable pushState
-	} else {
-		ajaxRequest.send = true; // to enable AJAX for next call of this function
-	}
-};
-
-/** Send form by AJAX GET
-* @param HTMLFormElement
-* @param [string]
-* @param [boolean]
-* @return XMLHttpRequest or false in case of an error
-*/
-function ajaxForm(form, data, noscroll) {
-	if ((/&(database|scheme|create|view|sql|user|dump|call)=/.test(location.href) && !/\./.test(data)) || (form.onsubmit && form.onsubmit() === false)) { // . - type="image"
-		return false;
-	}
-	var params = [ ];
-	for (var i=0; i < form.elements.length; i++) {
-		var el = form.elements[i];
-		if (/file/i.test(el.type) && el.value) {
-			return false;
-		} else if (el.name && (!/checkbox|radio|submit|file/i.test(el.type) || el.checked)) {
-			params.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(/select/i.test(el.tagName) ? selectValue(el) : el.value));
-		}
-	}
-	if (data) {
-		params.push(data);
-	}
-	if (form.method == 'post') {
-		return ajaxSend((/\?/.test(form.action) ? form.action : location.href), params.join('&'), false, noscroll); // ? - always part of Adminer URL
-	}
-	return ajaxSend((form.action || location.href).replace(/\?.*/, '') + '?' + params.join('&'), '', false, noscroll);
-}
-
 
 
 /** Display edit field
@@ -445,6 +417,7 @@ function selectDblClick(td, event, text) {
 		return;
 	}
 	var original = td.innerHTML;
+	text = text || /\n/.test(original);
 	var input = document.createElement(text ? 'textarea' : 'input');
 	input.onkeydown = function (event) {
 		if (!event) {
@@ -499,38 +472,38 @@ function selectDblClick(td, event, text) {
 
 
 
-/** Load link by AJAX
-* @param MouseEvent
-* @param string
+/** Load and display next page in select
+* @param HTMLLinkElement
 * @param string
+* @param number
 * @return boolean
 */
-function bodyClick(event, db, ns) {
-	if (event.button || event.shiftKey || event.altKey || event.metaKey) {
-		return;
+function selectLoadMore(a, limit, loading) {
+	var title = a.innerHTML;
+	var href = a.href;
+	a.innerHTML = loading;
+	if (href) {
+		a.removeAttribute('href');
+		return ajax(href, function (request) {
+			document.getElementById('table').innerHTML += request.responseText;
+			var rows = 0;
+			request.responseText.replace(/(^|\n)<tr/g, function () {
+				rows++;
+			});
+			if (rows < limit) {
+				a.parentNode.removeChild(a);
+			} else {
+				a.href = href.replace(/\d+$/, function (page) {
+					return +page + 1;
+				});
+				a.innerHTML = title;
+			}
+		});
 	}
-	if (event.getPreventDefault ? event.getPreventDefault() : event.returnValue === false || event.defaultPrevented) {
-		return false;
-	}
-	var el = event.target || event.srcElement;
-	if (/^a$/i.test(el.parentNode.tagName)) {
-		el = el.parentNode;
-	}
-	if (/^a$/i.test(el.tagName) && !/:|#|&download=/i.test(el.getAttribute('href')) && /[&?]username=/.test(el.href) && !event.ctrlKey) {
-		var match = /&db=([^&]*)/.exec(el.href);
-		var match2 = /&ns=([^&]*)/.exec(el.href);
-		return !(db == (match ? decodeURIComponent(match[1]) : '') && ns == (match2 ? decodeURIComponent(match2[1]) : '') && ajaxSend(el.href));
-	}
-	if (/^input$/i.test(el.tagName) && /image|submit/.test(el.type)) {
-		if (event.ctrlKey) {
-			el.form.target = '_blank';
-		} else {
-			return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + (el.type == 'image' ? '.x' : '') + '=1' : ''), el.type == 'image');
-		}
-	}
-	return true;
 }
 
+
+
 /** Stop event propagation
 * @param Event
 */

adminer/table.inc.php

@@ -58,9 +58,7 @@ if ($fields) {
 					echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
 					echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
 					echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
-					if ($jush != "sqlite") {
-						echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
-					}
+					echo ($jush == "sqlite" ? "" : '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>');
 				}
 				echo "</table>\n";
 			}

changes.txt

@@ -1,3 +1,55 @@
+Adminer 3.6.1 (released 2012-09-17):
+Fix compiled version on PHP with multibyte support
+
+Adminer 3.6.0 (released 2012-09-16):
+Load more data in select
+Edit strings with \n in textarea
+Time out long running database list and select count
+Use VALUES() in INSERT+UPDATE export
+Style logout button as link
+Store selected database to permanent login
+Ctrl+click and Shift+click on button opens form to a blank window
+Switch language by POST
+Compress translations
+MySQL: Support geometry data types
+selectQueryBuild() method (customization)
+Serbian translation
+
+Adminer 3.5.1 (released 2012-08-10):
+Support same name fields in CSV export
+Support Shift+click in export
+
+Adminer 3.5.0 (released 2012-08-05):
+Links for column search in select
+Autohide column context menu in select
+Autodisplay long table names in tables list
+Display assigned auto_increment after clone
+SQLite: Full alter table
+SQLite: Better editing in tables without primary key
+SQLite: Display number of rows in database overview
+
+Adminer 3.4.0 (released 2012-06-30):
+Link to descending order
+Shift+click on checkbox to select consecutive rows
+Print current time next to executed SQL queries
+Warn about selecting data without index
+Allow specifying database in login form
+Link to original table in EXPLAIN of SELECT * FROM table t
+Format numbers in translations
+MySQL: inform about disabled event_scheduler
+SQLite: support binary data
+PostgreSQL: approximate row count in table overview
+PostgreSQL: improve PDO support in SQL command
+Oracle: schema, processlist, table overview numbers
+Simplify work with NULL values (customization)
+Use namespace in login form (customization)
+Customizable export filename (customization)
+Replace JSMin by better JavaScript minifier
+Don't use AJAX links and forms
+Indonesian translation
+Ukrainian translation
+Bengali translation
+
 Adminer 3.3.4 (released 2012-03-07):
 Foreign keys default actions (bug #3397606)
 SET DEFAULT foreign key action

compile.php

@@ -1,28 +1,17 @@
+#!/usr/bin/env php
 <?php
 error_reporting(6135); // errors and warnings
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
-include dirname(__FILE__) . "/externals/jsmin-php/jsmin.php";
-
-if (!class_exists("JSMin")) {
-	/** Simple JS minifier without full support for regex literals
-	* @link http://pastebin.com/2Jc2swSr
-	*/
-	class JSMin {
-		/*private static*/ function callback($match) {
-			$s = trim($match[0]);
-			return ($s === "" ? "\n" : ($s[0] === "/" && ($s[1] === "*" || $s[1] === "/") ? "" : $s));
-		}
-		
-		/*static*/ function minify($input) {
-			return preg_replace_callback('~//[^\n]*|/\*.*?\*/|/(?!\s)(?:\\\\.|[^/\\\\])*/|\'(?:\\\\.|[^\'\\\\])*\'|"(?:\\\\.|[^"\\\\])*"|\s*[^0-9a-z_$\'"/\s]\s*|\s+~si', array('JSMin', 'callback'), $input);
-		}
-	}
-}
+include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
 
 function add_apo_slashes($s) {
 	return addcslashes($s, "\\'");
 }
 
+function add_quo_slashes($s) {
+	return addcslashes($s, "\n\r\$\0\"\\");
+}
+
 function remove_lang($match) {
 	global $translations;
 	$idf = strtr($match[2], array("\\'" => "'", "\\\\" => "\\"));
@@ -36,7 +25,7 @@ function remove_lang($match) {
 function lang_ids($match) {
 	global $lang_ids;
 	$lang_id = &$lang_ids[stripslashes($match[1])];
-	if (!isset($lang_id)) {
+	if ($lang_id === null) {
 		$lang_id = count($lang_ids) - 1;
 	}
 	return ($_SESSION["lang"] ? $match[0] : "lang($lang_id$match[2]");
@@ -60,7 +49,9 @@ function put_file($match) {
 function lang(\$translation, \$number) {
 	\$pos = $match2[2]\t\t: " . (preg_match("~\\\$LANG == '$_SESSION[lang]'.* \\? (.+)\n~U", $match2[1], $match3) ? $match3[1] : "1") . '
 	);
-	return sprintf($translation[$pos], $number);
+	$translation = str_replace("%d", "%s", $translation[$pos]);
+	$number = number_format($number, 0, ".", lang(\',\'));
+	return sprintf($translation, $number);
 }
 ';
 	} else {
@@ -68,6 +59,43 @@ function lang(\$translation, \$number) {
 	}
 }
 
+function lzw_compress($string) {
+	// compression
+	$dictionary = array_flip(range("\0", "\xFF"));
+	$word = "";
+	$codes = array();
+	for ($i=0; $i <= strlen($string); $i++) {
+		$x = $string[$i];
+		if (strlen($x) && isset($dictionary[$word . $x])) {
+			$word .= $x;
+		} elseif ($i) {
+			$codes[] = $dictionary[$word];
+			$dictionary[$word . $x] = count($dictionary);
+			$word = $x;
+		}
+	}
+	// convert codes to binary string
+	$dictionary_count = 256;
+	$bits = 8; // ceil(log($dictionary_count, 2))
+	$return = "";
+	$rest = 0;
+	$rest_length = 0;
+	foreach ($codes as $code) {
+		$rest = ($rest << $bits) + $code;
+		$rest_length += $bits;
+		$dictionary_count++;
+		if ($dictionary_count >> $bits) {
+			$bits++;
+		}
+		while ($rest_length > 7) {
+			$rest_length -= 8;
+			$return .= chr($rest >> $rest_length);
+			$rest &= (1 << $rest_length) - 1;
+		}
+	}
+	return $return . ($rest_length ? chr($rest << (8 - $rest_length)) : "");
+}
+
 function put_file_lang($match) {
 	global $lang_ids, $project, $langs;
 	if ($_SESSION["lang"]) {
@@ -78,23 +106,34 @@ function put_file_lang($match) {
 		include dirname(__FILE__) . "/adminer/lang/$lang.inc.php"; // assign $translations
 		$translation_ids = array_flip($lang_ids); // default translation
 		foreach ($translations as $key => $val) {
-			if (isset($val)) {
-				$translation_ids[$lang_ids[$key]] = $val;
+			if ($val !== null) {
+				$translation_ids[$lang_ids[$key]] = implode("\t", (array) $val);
 			}
 		}
-		$return .= "\tcase \"$lang\": \$translations = array(";
-		foreach ($translation_ids as $val) {
-			$return .= (is_array($val) ? "array('" . implode("', '", array_map('add_apo_slashes', $val)) . "')" : "'" . add_apo_slashes($val) . "'") . ", ";
-		}
-		$return = substr($return, 0, -2) . "); break;\n";
+		$return .= '
+		case "' . $lang . '": $compressed = "' . add_quo_slashes(lzw_compress(implode("\n", $translation_ids))) . '"; break;';
 	}
-	return "switch (\$LANG) {\n$return}\n";
+	$translations_version = crc32($return);
+	return '$translations = &$_SESSION["translations"];
+if ($_SESSION["translations_version"] != ' . $translations_version . ') {
+	$translations = array();
+	$_SESSION["translations_version"] = ' . $translations_version . ';
+}
+if (!$translations) {
+	switch ($LANG) {' . $return . '
+	}
+	$translations = array();
+	foreach (explode("\n", lzw_decompress($compressed)) as $val) {
+		$translations[] = (strpos($val, "\t") ? explode("\t", $val) : $val);
+	}
+}
+';
 }
 
 function short_identifier($number, $chars) {
 	$return = '';
 	while ($number >= 0) {
-		$return .= $chars{$number % strlen($chars)};
+		$return .= $chars[$number % strlen($chars)];
 		$number = floor($number / strlen($chars)) - 1;
 	}
 	return $return;
@@ -108,6 +147,33 @@ function php_shrink($input) {
 	$shortening = true;
 	$tokens = token_get_all($input);
 	
+	// remove unnecessary { }
+	//! change also `while () { if () {;} }` to `while () if () ;` but be careful about `if () { if () { } } else { }
+	$shorten = 0;
+	$opening = -1;
+	foreach ($tokens as $i => $token) {
+		if (in_array($token[0], array(T_IF, T_ELSE, T_ELSEIF, T_WHILE, T_DO, T_FOR, T_FOREACH), true)) {
+			$shorten = ($token[0] == T_FOR ? 4 : 2);
+			$opening = -1;
+		} elseif (in_array($token[0], array(T_SWITCH, T_FUNCTION, T_CLASS, T_CLOSE_TAG), true)) {
+			$shorten = 0;
+		} elseif ($token === ';') {
+			$shorten--;
+		} elseif ($token === '{') {
+			if ($opening < 0) {
+				$opening = $i;
+			} elseif ($shorten > 1) {
+				$shorten = 0;
+			}
+		} elseif ($token === '}' && $opening >= 0 && $shorten == 1) {
+			unset($tokens[$opening]);
+			unset($tokens[$i]);
+			$shorten = 0;
+			$opening = -1;
+		}
+	}
+	$tokens = array_values($tokens);
+	
 	foreach ($tokens as $i => $token) {
 		if ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
 			$short_variables[$token[1]]++;
@@ -125,7 +191,7 @@ function php_shrink($input) {
 		$short_variables[$key] = short_identifier($number, $chars); // could use also numbers and \x7f-\xff
 	}
 	
-	$set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}'));
+	$set = array_flip(preg_split('//', '!"#$%&\'()*+,-./:;<=>?@[\]^`{|}'));
 	$space = '';
 	$output = '';
 	$in_echo = false;
@@ -135,10 +201,10 @@ function php_shrink($input) {
 			$token = array(0, $token);
 		}
 		if ($tokens[$i+2][0] === T_CLOSE_TAG && $tokens[$i+3][0] === T_INLINE_HTML && $tokens[$i+4][0] === T_OPEN_TAG
-			&& strlen(addcslashes($tokens[$i+3][1], "'\\")) < strlen($tokens[$i+3][1]) + 3
+			&& strlen(add_apo_slashes($tokens[$i+3][1])) < strlen($tokens[$i+3][1]) + 3
 		) {
 			$tokens[$i+2] = array(T_ECHO, 'echo');
-			$tokens[$i+3] = array(T_CONSTANT_ENCAPSED_STRING, "'" . addcslashes($tokens[$i+3][1], "'\\") . "'");
+			$tokens[$i+3] = array(T_CONSTANT_ENCAPSED_STRING, "'" . add_apo_slashes($tokens[$i+3][1]) . "'");
 			$tokens[$i+4] = array(0, ';');
 		}
 		if ($token[0] == T_COMMENT || $token[0] == T_WHITESPACE || ($token[0] == T_DOC_COMMENT && $doc_comment)) {
@@ -182,12 +248,27 @@ function php_shrink($input) {
 }
 
 function minify_css($file) {
-	return preg_replace('~\\s*([:;{},])\\s*~', '\\1', preg_replace('~/\\*.*\\*/~sU', '', $file));
+	return lzw_compress(preg_replace('~\\s*([:;{},])\\s*~', '\\1', preg_replace('~/\\*.*\\*/~sU', '', $file)));
+}
+
+function minify_js($file) {
+	$file = str_replace("'../externals/jush/'", "location.protocol + '//www.adminer.org/static/'", $file);
+	if (function_exists('jsShrink')) {
+		$file = jsShrink($file);
+	}
+	return lzw_compress($file);
 }
 
 function compile_file($match) {
 	global $project;
-	return call_user_func($match[2], file_get_contents(dirname(__FILE__) . "/$project/$match[1]"));
+	$file = "";
+	foreach (explode(";", $match[1]) as $filename) {
+		$file .= file_get_contents(dirname(__FILE__) . "/$project/$filename");
+	}
+	if ($match[2]) {
+		$file = call_user_func($match[2], $file);
+	}
+	return '"' . add_quo_slashes($file) . '"';
 }
 
 $driver = "";
@@ -217,7 +298,7 @@ foreach (glob(dirname(__FILE__) . "/adminer/drivers/" . ($driver ? $driver : "*"
 		$file = file_get_contents($filename);
 		foreach ($functions as $val) {
 			if (!strpos($file, "$val(")) {
-				echo "Missing $val in $filename\n";
+				fprintf(STDERR, "Missing $val in $filename\n");
 			}
 		}
 	}
@@ -270,11 +351,10 @@ foreach (array("adminer", "editor") as $project) {
 		$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 	}
 	$file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
-	$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
+	$file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 	$replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION;
-	$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico|loader\\.gif)~', '<?php echo ' . $replace . '"; ?>', $file);
+	$file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
 	$file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);
-	$file = str_replace("'../externals/jush/'", "location.protocol + '//www.adminer.org/static/'", $file);
 	$file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 	$file = php_shrink($file);
 

coverage.php

@@ -33,7 +33,7 @@ if (!extension_loaded("xdebug")) {
 	$filename = $_GET["coverage"];
 	$coverage = (file_exists($coverage_filename) ? unserialize(file_get_contents($coverage_filename)) : array());
 	$file = explode("<br />", highlight_file($filename, true));
-	unset($prev_color);
+	$prev_color = null;
 	$s = "";
 	for ($l=0; $l <= count($file); $l++) {
 		$line = $file[$l];
@@ -43,10 +43,10 @@ if (!extension_loaded("xdebug")) {
 			case -2: $color = "Silver"; break; // dead code
 			case null: $color = ""; break; // not executable
 		}
-		if (!isset($prev_color)) {
+		if ($prev_color === null) {
 			$prev_color = $color;
 		}
-		if ($prev_color != $color || !isset($line)) {
+		if ($prev_color != $color || $line === null) {
 			echo "<div" . ($prev_color ? " style='background-color: $prev_color;'" : "") . ">$s";
 			$open_tags = xhtml_open_tags($s);
 			foreach (array_reverse($open_tags) as $tag) {

designs/brade/adminer.css

@@ -56,3 +56,7 @@ outline:0;background:url(http://www.bradezone.com/random/adminer_logo.gif) no-re
 * html #lang,* html #menu,* html #breadcrumb{position:absolute}
 * html #lang{padding-top:10px;height:30px}
 * html form#form{height:100%}
+#logins a,#tables a{background: none}
+#logout{color:#333;text-decoration:none;border-bottom:1px dotted}
+#logout:hover{border-color:#333;background:#333;color:#fff}
+.js .column{background:#ddd}

designs/bueltge/adminer.css

@@ -285,12 +285,9 @@ position: absolute;
 #schema .references { 
 position: absolute;
 }
-.js .hidden {
+.js div.hidden {
 display: inline;
 }
-.js td.hidden, .js input.hidden {
-display: none;
-}
 legend a {
 color: #333;
 text-decoration: none;
@@ -325,4 +322,17 @@ border-bottom-left-radius: 5px;
 -khtml-border-top-right-radius: 5px;
 -webkit-border-top-right-radius: 5px;
 border-bottom-top-radius: 5px;
-}
+}
+.js .column {
+background: #DFDFDF;
+}
+#logout {
+color: #21759B;
+}
+#logout:hover {
+text-decoration: none;
+}
+#logins a, #tables a {
+background: #F1F1F1;
+line-height: 1.5em;
+}

designs/haeckel/adminer.css

@@ -2,11 +2,11 @@
 /* So I merged them into one file, fixed a couple of problems, added some paddings here and there, voila!
 
 /* Redesigned (iconized) by Hever [hev.cz] - June 2009, ver 0.1.3 */
-/** 
+/**
  * Alternative style for Adminer by Frank Bueltge
  * @link http://bueltge.de/
  */
- 
+
 /* Added icons */
 /* IE doesn't support inline images - using some hack that eliminate IE*/
 html/*\*/>/*/*/body .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;}
@@ -21,9 +21,7 @@ html/*\*/>/*/*/body select[name="db"] option {padding-left:18px;}
 
 html/*\*/>/*/*/body #menu 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 left bottom; clear:left; display:block; float:left; height:16px; margin-right:8px; padding-top:1px; overflow:hidden; padding-left:16px; width:0; text-decoration:none;}
 
-html/*\*/>/*/*/body #menu p a[href*="&table="], html/*\*/>/*/*/body #menu p a[href*="&view="] {clear:right; margin-left:24px; display:block; height:17px; padding-bottom:1px; text-decoration:none;}
-
-html/*\*/>/*/*/body #menu p#tables br {display:none;}
+html/*\*/>/*/*/body #menu p a[href*="&table="], html/*\*/>/*/*/body #menu p a[href*="&view="] {margin:0; line-height:18px; padding-bottom:1px; text-decoration:none;}
 
 html/*\*/>/*/*/body 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;}
 html/*\*/>/*/*/body 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;}
@@ -53,7 +51,8 @@ html/*\*/>/*/*/body table thead input {margin-right: 5px;}
 html/*\*/>/*/*/body input[name="delete"], html/*\*/>/*/*/body 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;}
 html/*\*/>/*/*/body input[name="delete"]:hover, html/*\*/>/*/*/body 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==")}
 
-html/*\*/>/*/*/body input[name="logout"]{ height:16px; border: none; position: absolute; top: 0; left: 140px; margin-top: 8px; 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 center left; overflow: hidden; text-indent: 12px; line-height: 0px; cursor:pointer; }
+html/*\*/>/*/*/body input[name="logout"], #logout{ height:16px; border: none; position: absolute; top: 0; left: 140px; margin-top: 8px; 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 center left; text-indent: 16px; color: #21759B; }
+#logout:hover { color: #D54E21; text-decoration: none; }
 
 body {margin: 0; line-height: 1.25em; font-size: 13px; background: #F9F9F9;}
 body, select, option, optgroup, button {font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;} /* IE6 */
@@ -100,39 +99,25 @@ img {vertical-align: middle; margin: 0; padding: 0;}
 .jush-sql {padding: 2px 4px; margin-right: 4px; outline: 1px #BBB dashed; font-size: 9pt;}
 #content {margin: 2px 0 0 260px; padding: 10px 20px 20px 0;}
 #breadcrumb, #lang {margin: 0; height: 21px; display: block; position: absolute; top: 0; left: 260px; background-color: #f1f1f1; border: 1px solid #E3E3E3; padding: 2px 12px; line-height: 1.25em }
-#lang {
-	right: 20px;
-	left: auto;
-	z-index: 10;
-}
+#lang {right: 20px; left: auto; z-index: 10; }
 #lang select {font-size: 8pt;}
-
 #menu {position: absolute; padding: 10px; margin: 0; top: 0; left: 0; width: 220px; background-color: #f1f1f1; border: 1px solid #E3E3E3;}
 #menu form {margin: 0;}
 #menu p {padding-left: 8px; font-size: 10pt; border-bottom: none;}
 #menu form p {padding-left: 0; text-align: left;}
-h1 .h1:hover {text-decoration: underline;} 
+h1 .h1:hover {text-decoration: underline;}
 h1, h2 {font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; margin: 0; padding: 14px 15px 3px 10px; line-height: 35px; text-shadow: rgba(255,255,255,1) 0 1px 0px; background: none;}
 h1 {font-size: 12px;}
 h1 .h1 {font-size: 12px;}
 h2 {padding: 22px 0 0 10px; font-size: 0; height: 2px;}
 h3 {margin: 40px 0 0; font-weight: 400; font-size: 130%;}
-#menu h1 {
-	height: 25px;
-	padding: 0 10px;
-	margin: 0;
-	line-height: 20px;
-	display: block;
-}
-
-#menu h1 a {
-	font-size: 13px;
-}
-
+#menu h1 {height: 25px; padding: 0 10px; margin: 0; line-height: 20px; display: block; }
+#menu h1 a { font-size: 13px; }
 #schema {margin: 1.5em 0 0 220px; position: relative;}
 #schema .table {border: 1px solid #E3E3E3; background-color: #F1F1F1; padding: 0 2px; cursor: move; position: absolute;}
 #schema .references {position: absolute;}
 .js .hidden {display: inline;}
+.js .column {background: none; margin: 0; padding: 0; position: relative; }
 .js td.hidden, .js input.hidden {display: none;}
 legend a {color: #333; text-decoration: none; cursor: default;}
 legend a:hover {color: #333;}
@@ -141,4 +126,4 @@ fieldset, legend, table, .error, .message {-moz-border-radius: 5px; -khtml-borde
 #breadcrumb, #lang, #menu {-moz-border-radius-bottomright: 5px; -khtml-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;}
 #breadcrumb, #lang {-moz-border-radius-bottomleft: 5px; -khtml-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;}
 #menu {-moz-border-radius-topright: 5px; -khtml-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px; border-bottom-top-radius: 5px;}
-#loader {margin-left: 35px;}
+#logins a, #tables a {background: #F1F1F1;}

designs/hever/adminer.css

@@ -17,7 +17,7 @@ html/*\*/>/*/*/body #menu p a[href*="&select="] {background:url("data:image/png;
 
 html/*\*/>/*/*/body #menu p a[href*="&table="], html/*\*/>/*/*/body #menu p a[href*="&view="] {clear:right; margin-left:24px; display:block; height:17px; padding-bottom:1px; text-decoration:none;}
 
-html/*\*/>/*/*/body #menu p br {display:none;}
+html/*\*/>/*/*/body #tables br {display:none;}
 
 
 html/*\*/>/*/*/body 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;}
@@ -49,6 +49,6 @@ html/*\*/>/*/*/body table td:first-child {white-space:nowrap;}
 html/*\*/>/*/*/body input[name="delete"], html/*\*/>/*/*/body 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;}
 html/*\*/>/*/*/body input[name="delete"]:hover, html/*\*/>/*/*/body 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==")}
 
-html/*\*/>/*/*/body input[name="logout"]{ width:16px; height:16px; border: none; 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 center left; overflow: hidden; text-indent: 18px; line-height: 0px; cursor:pointer; margin-left:6px;}
+html/*\*/>/*/*/body input[name="logout"], #logout{ width:16px; height:16px; border: none; 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 center left; overflow: hidden; text-indent: 18px; line-height: 0px; cursor:pointer; margin-left:6px;}
 
 /*Used icons: Silk icon set 1.3 by Mark James --- http://www.famfamfam.com/lab/icons/silk/  */

designs/konya/adminer.css

@@ -123,4 +123,3 @@ fieldset, legend, h2, table, .error, .message {-moz-border-radius: 5px; -khtml-b
 #breadcrumb, #lang, #menu {-moz-border-radius-bottomright: 5px; -khtml-border-bottom-right-radius: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;}
 #breadcrumb {-moz-border-radius-bottomleft: 5px; -khtml-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;}
 #menu {-moz-border-radius-topright: 5px; -khtml-border-top-right-radius: 5px; -webkit-border-top-right-radius: 5px; border-bottom-top-radius: 5px;}
-#loader {margin-left: 35px;}

designs/ng9/adminer.css

@@ -0,0 +1,259 @@
+* {
+	font: 13px/1.5 Verdana, 'Geneva CE', lucida, sans-serif;
+	color:#333333;
+	margin:0px;
+	padding:0px;
+}
+
+a,a:visited {
+	color:#006aeb;
+	text-decoration:none;
+	padding:3px 1px;
+}
+
+#content table thead span, #content table thead a {
+	font-weight:bold;
+	color:black;
+}
+
+#content table thead a:hover {
+	background:none;
+	text-decoration:underline;
+	color:black;
+}
+
+a:hover {
+	color:white;
+	background:#006aeb;
+}
+
+h1 {
+	font-size:1.9em;
+	font-weight:normal;
+	background:white;
+	color:#1e5eb6;
+	border-bottom:1px solid #f4f4f4;
+
+	padding:20px;
+	margin:0px;
+}
+
+#menu h1 {
+	padding:0px 0px 5px 20px;
+	background:none;
+}
+
+h2,h3 {
+	font-size:1.5em;
+	font-weight:normal;
+	background:white;
+	color:#1e5eb6;
+	border-bottom:1px solid #f4f4f4;
+
+	padding:20px 0px;
+	margin:0px;
+}
+
+fieldset {
+	padding:5px;
+	border:1px solid #f4f4f4;
+}
+
+input,select,textarea {
+	border:1px solid #e5e5e5;
+	margin:1px;
+	padding:3px;
+}
+
+input[type=submit] {
+	color:white;
+	background:#3390e6;
+	padding:3px 10px;
+	cursor:pointer;
+	border:0px solid;
+}
+
+input[type=submit]:hover{
+	background:blue;
+}
+
+input[type=checkbox]{
+	margin-right:5px;
+}
+
+input[type=image] {
+	border:1px solid #d0cdc4;
+}
+
+input[type=checkbox],input[type=radio]{
+	border:1px solid #e5e5e5;
+	padding:2px 5px;
+}
+
+code{
+	background:#f0ffe1;
+	border:1px dashed #d5f1b9;
+	padding:2px 4px;
+	font-family:"Courier New";
+}
+code a:hover{background:transparent}
+
+table{
+	margin:10px 0px;
+	border:1px solid #d0cdc4;
+	border-collapse:collapse;
+}
+
+tbody tr:hover td,tbody tr:hover th{
+	background:#edf4ff
+}
+
+thead th, thead td {
+	text-align:center;
+	vertical-align:middle;
+	font-weight:bold;
+	white-space:nowrap;
+	background:#f2eee1;
+	color:#808080;
+}
+
+th,td{
+	border:1px solid #d0cdc4;
+	padding:3px 6px;
+	vertical-align:top;
+}
+
+th a {
+	font-weight:bold;
+	padding-bottom:0px;
+}
+
+th {
+	background:white;
+}
+
+tr.odd td {
+	background:#fcfaf5;
+}
+
+#content tbody tr.checked td, tr.checked.odd td {
+	background:#fbe2e2;
+	color:red;
+}
+
+.hidden{
+	display:none
+}
+
+.error,.message{
+	padding:0px;
+	background:transparent;
+	font-weight:bold
+}
+
+.error{
+	color:#c00
+}
+
+.message{
+	color:#090
+}
+
+#content{
+	margin:0px 0px 0px 320px;
+	padding:50px 20px 40px 0px;
+	height:100%;
+}
+
+#lang {
+	background:#f2eee1;
+	color:#808080;
+	position:fixed;
+	top:0px;
+	left:0px;
+	width:100%;
+	padding:10px 20px;
+	z-index:1;
+}
+
+#breadcrumb {
+	position:fixed;
+	top:0px;
+	left:300px;
+	background:#f2eee1;
+	z-index:2;
+	width:100%;
+	padding:10px;
+}
+
+#menu {
+	background:#fcfaf5;
+	position:fixed;
+	top:-10px;
+	padding:20px;
+	padding-top:40px;
+	bottom:0px;
+	overflow:auto;
+	left:0px;
+	width:240px;
+	border-right:5px solid #f2eee1;
+}
+
+#schema .table {
+	padding:5px;
+	background:#fcfaf5;
+	border:1px solid #d0cdc4;
+}
+
+#schema .table b {
+	color:#006aeb;
+	font-weight:bold;
+	text-decoration:underline;
+}
+
+#schema .table b:hover {
+	color:white;
+}
+
+input[name=logout] {
+	color:#fce2e2;
+	background:#d73e3e;
+}
+
+input[name=logout]:hover {
+	background:#ea0202;
+}
+
+#logins a, #tables a { 
+	background:none;
+}
+
+#logins a:hover, #tables a:hover { 
+	background:#006aeb;
+}
+
+#logout {
+	color:#006aeb;
+	text-decoration:none;
+}
+
+#logout:hover {
+	color:white;
+	background:#006aeb;
+}
+
+.js .column {
+	background:#f2eee1;
+}
+
+#content table thead a.text:hover {
+	text-decoration:none;
+}
+
+#version, .version {
+	font-size:50%;
+}
+
+#h1:hover {
+	color:white;
+}

designs/pokorny/adminer.css

@@ -288,8 +288,3 @@ fieldset {
 p {
     margin: 0.8em 0 0 0
 }
-#loader {
-    position: fixed;
-    top: 0;
-    left: 16em;
-}

editor/include/adminer.inc.php

@@ -30,6 +30,10 @@ class Adminer {
 		return get_databases($flush);
 	}
 	
+	function queryTimeout() {
+		return 5;
+	}
+	
 	function headers() {
 		return true;
 	}
@@ -41,15 +45,15 @@ class Adminer {
 	function loginForm() {
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="driver" value="server"><input type="hidden" name="server" value=""><input id="username" name="username" value="<?php echo h($_GET["username"]);  ?>">
-<tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
+<tr><th><?php echo lang('Username'); ?><td><input type="hidden" name="auth[driver]" value="server"><input id="username" name="auth[username]" value="<?php echo h($_GET["username"]);  ?>">
+<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
 </table>
 <script type="text/javascript">
 document.getElementById('username').focus();
 </script>
 <?php
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
-		echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
 	
 	function login($login, $password) {
@@ -68,7 +72,7 @@ document.getElementById('username').focus();
 	
 	function selectLinks($tableStatus, $set = "") {
 		$TABLE = $tableStatus["Name"];
-		if (isset($set)) {
+		if ($set !== null) {
 			echo '<p class="tabs"><a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . "</a>\n";
 		}
 		echo "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Last page') . "'>&gt;&gt;</a>\n";
@@ -159,7 +163,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function selectVal($val, $link, $field) {
-		$return = ($val == "<i>NULL</i>" ? "&nbsp;" : $val);
+		$return = ($val === null ? "&nbsp;" : $val);
 		if (ereg('blob|bytea', $field["type"]) && !is_utf8($val)) {
 			$return = lang('%d byte(s)', strlen($val));
 			if (ereg("^(GIF|\xFF\xD8\xFF|\x89PNG\x0D\x0A\x1A\x0A)", $val)) { // GIF|JPG|PNG, getimagetype() works with filename
@@ -181,10 +185,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function editVal($val, $field) {
-		if (ereg('date|timestamp', $field["type"]) && isset($val)) {
+		if (ereg('date|timestamp', $field["type"]) && $val !== null) {
 			return preg_replace('~^(\\d{2}(\\d+))-(0?(\\d+))-(0?(\\d+))~', lang('$1-$3-$5'), $val);
 		}
-		return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val);
+		return $val;
 	}
 	
 	function selectColumnsPrint($select, $columns) {
@@ -193,7 +197,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	
 	function selectSearchPrint($where, $columns, $indexes) {
 		$where = (array) $_GET["where"];
-		echo '<fieldset><legend>' . lang('Search') . "</legend><div>\n";
+		echo '<fieldset id="fieldset-search"><legend>' . lang('Search') . "</legend><div>\n";
 		$keys = array();
 		foreach ($where as $key => $val) {
 			$keys[$val["col"]] = $key;
@@ -271,7 +275,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	function selectLengthPrint($text_length) {
 	}
 	
-	function selectActionPrint() {
+	function selectActionPrint($indexes) {
 		echo "<fieldset><legend>" . lang('Action') . "</legend><div>";
 		echo "<input type='submit' value='" . lang('Select') . "'>";
 		echo "</div></fieldset>\n";
@@ -291,7 +295,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			echo "<div onkeydown=\"eventStop(event); return bodyKeydown(event, 'email');\">\n";
 			echo "<p>" . lang('From') . ": <input name='email_from' value='" . h($_POST ? $_POST["email_from"] : $_COOKIE["adminer_email"]) . "'>\n";
 			echo lang('Subject') . ": <input name='email_subject' value='" . h($_POST["email_subject"]) . "'>\n";
-			echo "<p><textarea name='email_message' rows='15' cols='75'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea>\n"; //! Ctrl+Enter for this.form.email
+			echo "<p><textarea name='email_message' rows='15' cols='75'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea>\n";
 			echo "<p onkeydown=\"eventStop(event); return bodyKeydown(event, 'email_append');\">" . html_select("email_addition", $columns, $_POST["email_addition"]) . "<input type='submit' name='email_append' value='" . lang('Insert') . "'>\n"; //! JavaScript
 			echo "<p>" . lang('Attachments') . ": <input type='file' name='email_files[]' onchange=\"this.onchange = function () { }; var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el);\">";
 			echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : html_select("email_field", $emailFields));
@@ -407,8 +411,12 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		return false;
 	}
 	
+	function selectQueryBuild($select, $where, $group, $order, $limit, $page) {
+		return "";
+	}
+	
 	function messageQuery($query) {
-		return "<!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->";
+		return " <span class='time'>" . @date("H:i:s") . "</span><!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->";
 	}
 	
 	function editFunctions($field) {
@@ -434,7 +442,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			;
 		}
 		$options = $this->_foreignKeyOptions($table, $field["field"], $value);
-		if (isset($options)) {
+		if ($options !== null) {
 			return (is_array($options)
 				? "<select$attrs>" . optionlist($options, $value, true) . "</select>"
 				:  "<input value='" . h($value) . "'$attrs class='hidden'><input value='" . h($options) . "' class='jsonly' onkeyup=\"whisper('" . h(ME . "script=complete&source=" . urlencode($table) . "&field=" . urlencode($field["field"])) . "&value=', this);\"><div onclick='return whisperClick(event, this.previousSibling);'></div>"
@@ -468,15 +476,14 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			$return = ($match["p1"] != "" ? $match["p1"] : ($match["p2"] != "" ? ($match["p2"] < 70 ? 20 : 19) . $match["p2"] : gmdate("Y"))) . "-$match[p3]$match[p4]-$match[p5]$match[p6]" . end($match);
 		}
 		$return = ($field["type"] == "bit" && ereg('^[0-9]+$', $value) ? $return : q($return));
-		if ($value == "" && ($field["null"] || !ereg('char|text', $field["type"])) && !like_bool($field)) {
+		if ($value == "" && like_bool($field)) {
+			$return = "0";
+		} elseif ($value == "" && ($field["null"] || !ereg('char|text', $field["type"]))) {
 			$return = "NULL";
 		} elseif (ereg('^(md5|sha1)$', $function)) {
 			$return = "$function($return)";
 		}
-		if (ereg("binary", $field["type"])) {
-			$return = "unhex($return)";
-		}
-		return $return;
+		return unconvert_field($field, $return);
 	}
 	
 	function dumpOutput() {
@@ -505,6 +512,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		}
 	}
 	
+	function dumpFilename($identifier) {
+		return friendly_url($identifier);
+	}
+	
 	function dumpHeaders($identifier, $multi_table = false) {
 		$ext = "csv";
 		header("Content-Type: text/csv; charset=utf-8");
@@ -526,9 +537,9 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		if ($missing == "auth") {
 			$first = true;
 			foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) {
-				if (isset($password)) {
+				if ($password !== null) {
 					if ($first) {
-						echo "<p onclick='eventStop(event);'>\n";
+						echo "<p id='logins' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 						$first = false;
 					}
 					echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n";
@@ -538,11 +549,12 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			?>
 <form action="" method="post">
 <p class="logout">
-<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" onclick="eventStop(event);">
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </p>
 </form>
 <?php
+			$this->databasesPrint($missing);
 			if ($missing != "db" && $missing != "ns") {
 				$table_status = table_status();
 				if (!$table_status) {
@@ -554,8 +566,11 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		}
 	}
 	
+	function databasesPrint($missing) {
+	}
+	
 	function tablesPrint($tables) {
-		echo "<p id='tables'>\n";
+		echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 		foreach ($tables as $row) {
 			$name = $this->tableName($row);
 			if (isset($row["Engine"]) && $name != "") { // ignore views and tables without name
@@ -580,11 +595,11 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		global $connection;
 		if (list($target, $id, $name) = $this->_foreignColumn(column_foreign_keys($table), $column)) {
 			$return = &$this->_values[$target];
-			if (!isset($return)) {
+			if ($return === null) {
 				$table_status = table_status($target);
 				$return = ($table_status["Rows"] > 1000 ? "" : array("" => "") + get_key_vals("SELECT $id, $name FROM " . table($target) . " ORDER BY 2"));
 			}
-			if (!$return && isset($value)) {
+			if (!$return && $value !== null) {
 				return $connection->result("SELECT $name FROM " . table($target) . " WHERE $id = " . q($value));
 			}
 			return $return;

editor/script.inc.php

@@ -1,5 +1,8 @@
 <?php
-if (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
+if ($_GET["script"] == "kill") {
+	$connection->query("KILL " . (+$_POST["kill"]));
+
+} elseif (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
 	$result = $connection->query("SELECT $id, $name FROM " . table($table) . " WHERE " . (ereg('^[0-9]+$', $_GET["value"]) ? "$id = $_GET[value] OR " : "") . "$name LIKE " . q("$_GET[value]%") . " ORDER BY 2 LIMIT 11");
 	for ($i=0; $i < 10 && ($row = $result->fetch_row()); $i++) {
 		echo "<a href='" . h(ME . "edit=" . urlencode($table) . "&where" . urlencode("[" . bracket_escape(idf_unescape($id)) . "]") . "=" . urlencode($row[0])) . "'>" . h($row[1]) . "</a><br>\n";

editor/static/editing.js

@@ -1,9 +1,9 @@
 // Editor specific functions
 
 function bodyLoad(version) {
-	if (history.state !== undefined) {
-		onpopstate(history);
-	}
+}
+
+function selectFieldChange(form) {
 }
 
 function whisperClick(event, field) {
@@ -12,7 +12,6 @@ function whisperClick(event, field) {
 		field.value = el.firstChild.data;
 		field.previousSibling.value = decodeURIComponent(el.href.replace(/.*=/, ''));
 		field.nextSibling.style.display = 'none';
-		eventStop(event);
 		return false;
 	}
 }

lang.php

@@ -1,3 +1,4 @@
+#!/usr/bin/env php
 <?php
 error_reporting(6135); // errors and warnings
 unset($_COOKIE["adminer_lang"]);

plugins/database-hide.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Hide some databases from the interface - just to improve design, not a security plugin
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/dump-date.php

@@ -0,0 +1,16 @@
+<?php
+
+/** Include current date and time in export filename
+* @link http://www.adminer.org/plugins/#use
+* @author Jakub Vrana, http://www.vrana.cz/
+* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+*/
+class AdminerDumpDate {
+	
+	function dumpFilename($identifier) {
+		$connection = connection();
+		return friendly_url(($identifier != "" ? $identifier : (SERVER != "" ? SERVER : "localhost")) . "-" . $connection->result("SELECT NOW()"));
+	}
+
+}

plugins/dump-xml.php

@@ -1,11 +1,14 @@
 <?php
 
 /** Dump to XML format in structure <database name=""><table name=""><column name="">value
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpXml {
+	/** @access protected */
+	var $database = false;
 	
 	function dumpFormat() {
 		return array('xml' => 'XML');
@@ -22,10 +25,9 @@ class AdminerDumpXml {
 	}
 	
 	function dumpData($table, $style, $query) {
-		static $database = false;
 		if ($_POST["format"] == "xml") {
-			if (!$database) {
-				$database = true;
+			if (!$this->database) {
+				$this->database = true;
 				echo "<database name='" . h(DB) . "'>\n";
 				register_shutdown_function(array($this, '_database'));
 			}
@@ -35,7 +37,7 @@ class AdminerDumpXml {
 				while ($row = $result->fetch_assoc()) {
 					echo "\t<table name='" . h($table) . "'>\n";
 					foreach ($row as $key => $val) {
-						echo "\t\t<column name='" . h($key) . "'>" . h($val) . "</column>\n";
+						echo "\t\t<column name='" . h($key) . "'" . (isset($val) ? "" : " null='null'") . ">" . h($val) . "</column>\n";
 					}
 					echo "\t</table>\n";
 				}

plugins/dump-zip.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Dump to ZIP format
+* @link http://www.adminer.org/plugins/#use
 * @uses ZipArchive, tempnam("")
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
@@ -8,7 +9,7 @@
 */
 class AdminerDumpZip {
 	/** @access protected */
-	var $filename;
+	var $filename, $data;
 	
 	function dumpOutput() {
 		if (!class_exists('ZipArchive')) {
@@ -18,13 +19,12 @@ class AdminerDumpZip {
 	}
 	
 	function _zip($string, $state) {
-		static $data = "";
-		$data .= $string;
+		$this->data .= $string;
 		if ($state & PHP_OUTPUT_HANDLER_END) {
 			$zip = new ZipArchive;
 			$zipFile = tempnam("", "zip");
 			$zip->open($zipFile, ZipArchive::OVERWRITE); // php://output is not supported
-			$zip->addFromString($this->filename, $data);
+			$zip->addFromString($this->filename, $this->data);
 			$zip->close();
 			$return = file_get_contents($zipFile);
 			unlink($zipFile);
@@ -37,8 +37,8 @@ class AdminerDumpZip {
 		$this->filename = "$identifier." . ($multi_table && ereg("[ct]sv", $_POST["format"]) ? "tar" : $_POST["format"]);
 		if ($_POST["output"] == "zip") {
 			header("Content-Type: application/zip");
+			ob_start(array($this, '_zip'));
 		}
-		ob_start(array($this, '_zip'));
 	}
 
 }

plugins/edit-calendar.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Display jQuery UI Timepicker for each date and datetime field
+* @link http://www.adminer.org/plugins/#use
 * @uses jQuery-Timepicker, http://trentrichardson.com/examples/timepicker/
 * @uses jQuery UI: core, widget, mouse, slider, datepicker
 * @author Jakub Vrana, http://www.vrana.cz/

plugins/edit-foreign.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Select foreign key in edit form
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -11,7 +12,7 @@ class AdminerEditForeign {
 		static $foreignTables = array();
 		static $values = array();
 		$foreignKeys = &$foreignTables[$table];
-		if (!isset($foreignKeys)) {
+		if ($foreignKeys === null) {
 			$foreignKeys = column_foreign_keys($table);
 		}
 		foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) {

plugins/edit-textarea.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Use <textarea> for char and varchar
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/email-table.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Get e-mail subject and message from database (Adminer Editor)
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/enum-option.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Use <select><option> for enum edit instead of <input type="radio">
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -16,7 +17,7 @@ class AdminerEnumOption {
 			}
 			if ($field["null"]) {
 				$options[""][""] = "NULL";
-				if (!isset($value) && !isset($_GET["select"])) {
+				if ($value === null && !isset($_GET["select"])) {
 					$selected = "";
 				}
 			}

plugins/file-upload.php

@@ -2,6 +2,7 @@
 //! delete
 
 /** Edit fields ending with "_path" by <input type="file"> and link to the uploaded files from select
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -17,7 +18,7 @@ class AdminerFileUpload {
 	*/
 	function AdminerFileUpload($uploadPath = "../static/data/", $displayPath = null, $extensions = "[a-zA-Z0-9]+") {
 		$this->uploadPath = $uploadPath;
-		$this->displayPath = (isset($displayPath) ? $displayPath : $uploadPath);
+		$this->displayPath = ($displayPath !== null ? $displayPath : $uploadPath);
 		$this->extensions = $extensions;
 	}
 	

plugins/foreign-system.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Link system tables (in mysql and information_schema databases) by foreign keys
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/frames.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Allow using Adminer inside a frame (disables ClickJacking protection)
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/login-servers.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Display constant list of servers in login form
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -37,13 +38,13 @@ class AdminerLoginServers {
 	function loginForm() {
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('Server'); ?><td><input type="hidden" name="driver" value="<?php echo $this->driver; ?>"><select name="server"><?php echo optionlist($this->servers, SERVER); ?></select>
-<tr><th><?php echo lang('Username'); ?><td><input id="username" name="username" value="<?php echo h($_GET["username"]);  ?>">
-<tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
+<tr><th><?php echo lang('Server'); ?><td><input type="hidden" name="auth[driver]" value="<?php echo $this->driver; ?>"><select name="auth[server]"><?php echo optionlist($this->servers, SERVER); ?></select>
+<tr><th><?php echo lang('Username'); ?><td><input id="username" name="auth[username]" value="<?php echo h($_GET["username"]);  ?>">
+<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
 </table>
 <p><input type="submit" value="<?php echo lang('Login'); ?>">
 <?php
-		echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 		return true;
 	}
 	

plugins/login-table.php

@@ -10,6 +10,7 @@ CREATE TABLE login (
 */
 
 /** Authenticate a user from the login table
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/password-sha1.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Store password's SHA1 to session
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -18,8 +19,8 @@ class AdminerPasswordSha1 {
 		$this->login = $login;
 		$this->passwordSha1 = $passwordSha1;
 		$this->credentials = $credentials;
-		if (isset($_POST["password"])) {
-			$_POST["password"] = sha1($_POST["password"]);
+		if (isset($_POST["auth"])) {
+			$_POST["auth"]["password"] = sha1($_POST["auth"]["password"]);
 		}
 	}
 	
@@ -32,7 +33,7 @@ class AdminerPasswordSha1 {
 	}
 	
 	function permanentLogin() {
-		//! should save original $_POST["password"] and hash after load
+		//! should save original $_POST["auth"]["password"] and hash after load
 	}
 	
 }

plugins/plugin.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Adminer customization allowing usage of plugins
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -20,7 +21,7 @@ class AdminerPlugin extends Adminer {
 	* @param array object instances or null to register all classes starting by 'Adminer'
 	*/
 	function AdminerPlugin($plugins) {
-		if (!isset($plugins)) {
+		if ($plugins === null) {
 			$plugins = array();
 			foreach (get_declared_classes() as $class) {
 				if (preg_match('~^Adminer.~i', $class) && strcasecmp($this->_findRootClass($class), 'Adminer')) { // can use interface since PHP 5
@@ -39,6 +40,8 @@ class AdminerPlugin extends Adminer {
 			case 2: return parent::$function($args[0], $args[1]);
 			case 3: return parent::$function($args[0], $args[1], $args[2]);
 			case 4: return parent::$function($args[0], $args[1], $args[2], $args[3]);
+			case 5: return parent::$function($args[0], $args[1], $args[2], $args[3], $args[4]);
+			case 6: return parent::$function($args[0], $args[1], $args[2], $args[3], $args[4], $args[5]);
 			default: trigger_error('Too many parameters.', E_USER_WARNING);
 		}
 	}
@@ -52,9 +55,11 @@ class AdminerPlugin extends Adminer {
 					case 2: $return = $plugin->$function($args[0], $args[1]); break;
 					case 3: $return = $plugin->$function($args[0], $args[1], $args[2]); break;
 					case 4: $return = $plugin->$function($args[0], $args[1], $args[2], $args[3]); break;
+					case 5: $return = $plugin->$function($args[0], $args[1], $args[2], $args[3], $args[4]); break;
+					case 6: $return = $plugin->$function($args[0], $args[1], $args[2], $args[3], $args[4], $args[5]); break;
 					default: trigger_error('Too many parameters.', E_USER_WARNING);
 				}
-				if (isset($return)) {
+				if ($return !== null) {
 					return $return;
 				}
 			}
@@ -116,6 +121,11 @@ class AdminerPlugin extends Adminer {
 		return $this->_applyPlugin(__FUNCTION__, $args);
 	}
 
+	function queryTimeout() {
+		$args = func_get_args();
+		return $this->_applyPlugin(__FUNCTION__, $args);
+	}
+
 	function headers() {
 		$args = func_get_args();
 		return $this->_applyPlugin(__FUNCTION__, $args);
@@ -266,6 +276,11 @@ class AdminerPlugin extends Adminer {
 		return $this->_applyPlugin(__FUNCTION__, $args);
 	}
 
+	function selectQueryBuild() {
+		$args = func_get_args();
+		return $this->_applyPlugin(__FUNCTION__, $args);
+	}
+
 	function messageQuery() {
 		$args = func_get_args();
 		return $this->_applyPlugin(__FUNCTION__, $args);
@@ -291,6 +306,11 @@ class AdminerPlugin extends Adminer {
 		return $this->_applyPlugin(__FUNCTION__, $args);
 	}
 
+	function dumpFilename() {
+		$args = func_get_args();
+		return $this->_applyPlugin(__FUNCTION__, $args);
+	}
+
 	function dumpHeaders() {
 		$args = func_get_args();
 		return $this->_applyPlugin(__FUNCTION__, $args);
@@ -306,6 +326,11 @@ class AdminerPlugin extends Adminer {
 		return $this->_applyPlugin(__FUNCTION__, $args);
 	}
 
+	function databasesPrint() {
+		$args = func_get_args();
+		return $this->_applyPlugin(__FUNCTION__, $args);
+	}
+
 	function tablesPrint() {
 		$args = func_get_args();
 		return $this->_applyPlugin(__FUNCTION__, $args);

plugins/readme.txt

@@ -1,2 +1,2 @@
 ../adminer/plugin.php - demo usage
-http://www.adminer.org/en/plugins/ - documentation
+http://www.adminer.org/plugins/ - documentation

plugins/slugify.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Prefill field containing "_slug" with slugified value of a previous field (JavaScript)
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -21,7 +22,7 @@ class AdminerSlugify {
 	function editInput($table, $field, $attrs, $value) {
 		static $slugify;
 		if (!$_GET["select"] && !$_GET["where"]) {
-			if (!isset($slugify)) {
+			if ($slugify === null) {
 				$slugify = array();
 				$prev = null;
 				foreach (fields($table) as $name => $val) {
@@ -32,7 +33,7 @@ class AdminerSlugify {
 				}
 			}
 			$slug = $slugify[$field["field"]];
-			if (isset($slug)) {
+			if ($slug !== null) {
 				return "<input value='" . h($value) . "' maxlength='$field[length]' size='40'$attrs onchange=\"var find = '$this->from'; var repl = '$this->to'; this.form['fields[$slug]'].value = this.value.toLowerCase().replace(new RegExp('[' + find + ']', 'g'), function (str) { return repl[find.indexOf(str)]; }).replace(/[^a-z0-9_]+/g, '-').replace(/^-|-\$/g, '').substr(0, $field[length]);\">";
 			}
 		}

plugins/sql-log.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Log all queries to SQL file (manual queries through SQL command are not logged)
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/tables-filter.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Use filter in tables list
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -22,7 +23,7 @@ function tablesFilter(value) {
 </script>
 <p class="jsonly"><input onkeyup="tablesFilter(this.value);">
 <?php
-		echo "<p id='tables'>\n";
+		echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 		foreach ($tables as $table => $type) {
 			echo '<span><a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table) . ">" . lang('select') . "</a> ";
 			echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold($_GET["table"] == $table) . ">" . h($table) . "</a><br></span>\n";

plugins/tinymce.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Edit all fields containing "_html" by HTML editor TinyMCE and display the HTML in select
+* @link http://www.adminer.org/plugins/#use
 * @uses TinyMCE, http://tinymce.moxiecode.com/
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0

plugins/translation.php

@@ -11,6 +11,7 @@ CREATE TABLE translation (
 */
 
 /** Translate all table and field comments, enum and set values from the translation table (inserts new translations)
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
@@ -19,17 +20,17 @@ class AdminerTranslation {
 	
 	function _translate($idf) {
 		static $translations, $lang;
-		if (!isset($lang)) {
+		if ($lang === null) {
 			$lang = get_lang();
 		}
 		if ($idf == "" || $lang == "en") {
 			return $idf;
 		}
-		if (!isset($translations)) {
+		if ($translations === null) {
 			$translations = get_key_vals("SELECT idf, translation FROM translation WHERE language_id = " . q($lang));
 		}
 		$return = &$translations[$idf];
-		if (!isset($return)) {
+		if ($return === null) {
 			$return = $idf;
 			$connection = connection();
 			$connection->query("INSERT INTO translation (language_id, idf, translation) VALUES (" . q($lang) . ", " . q($idf) . ", " . q($idf) . ")");

plugins/version-noverify.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Disable version checker
+* @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)

plugins/wymeditor.php

@@ -1,6 +1,7 @@
 <?php
 
 /** Edit all fields containing "_html" by HTML editor WYMeditor and display the HTML in select
+* @link http://www.adminer.org/plugins/#use
 * @uses WYMeditor, http://www.wymeditor.org/
 * @author Jakub Vrana, http://www.vrana.cz/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0

readme.txt

@@ -11,6 +11,6 @@ editor/index.php - Run development version of Adminer Editor
 editor/example.php - Example customization
 plugins/readme.txt - Plugins for Adminer and Adminer Editor
 adminer/plugin.php - Plugin demo
-compile.php [driver] [lang] - Create a single file version
-lang.php [lang] - Update translations
+compile.php - Create a single file version
+lang.php - Update translations
 tests/selenium.html - Selenium test suite