Show commands in navigation

adminer/call.inc.php

@@ -57,13 +57,8 @@ if ($in) {
 		$name = $field["field"];
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$value = $_POST["fields"][$name];
-		if ($value != "") {
-			if ($field["type"] == "enum") {
-				$value = +$value;
-			}
-			if ($field["type"] == "set") {
-				$value = array_sum($value);
-			}
+		if ($value != "" && ereg("enum|set", $field["type"])) {
+			$value = intval($value);
 		}
 		input($field, $value, (string) $_POST["function"][$name]); // param name can be empty
 		echo "\n";

adminer/create.inc.php

@@ -25,26 +25,27 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 		$orig_field = reset($orig_fields);
 		$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 = (isset($types[$field["type"]]) ? $field : $referencable_primary[$foreign_keys[$field["type"]]]);
 			if ($field["field"] != "") {
-				if (!$field["has_default"]) {
-					$field["default"] = null;
-				}
-				$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
-				if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
-					$field["on_update"] = "CURRENT_TIMESTAMP";
-					$field["default"] = $default;
-				}
-				if ($key == $_POST["auto_increment_col"]) {
-					$field["auto_increment"] = true;
-				}
-				$process_field = process_field($field, $type_field);
-				if ($process_field != process_field($orig_field, $orig_field)) {
-					$fields[] = array($field["orig"], $process_field, $after);
-				}
-				if (isset($foreign_key)) {
-					$foreign[] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (in_array($field["on_delete"], $on_actions) ? " ON DELETE $field[on_delete]" : "");
+				if ($type_field) {
+					if (!$field["has_default"]) {
+						$field["default"] = null;
+					}
+					$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
+					if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
+						$field["on_update"] = "CURRENT_TIMESTAMP";
+						$field["default"] = $default;
+					}
+					if ($key == $_POST["auto_increment_col"]) {
+						$field["auto_increment"] = true;
+					}
+					$process_field = process_field($field, $type_field);
+					if ($process_field != process_field($orig_field, $orig_field)) {
+						$fields[] = array($field["orig"], $process_field, $after);
+					}
+					if (!isset($types[$field["type"]])) {
+						$foreign[] = ($TABLE != "" ? "ADD " : "  ") . "FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (in_array($field["on_delete"], $on_actions) ? " ON DELETE $field[on_delete]" : "");
+					}
 				}
 				$after = "AFTER " . idf_escape($field["field"]);
 			} elseif ($field["orig"] != "") {
@@ -65,7 +66,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 			}
 			$partitioning .= "\nPARTITION BY $_POST[partition_by]($_POST[partition])" . ($partitions // $_POST["partition"] can be expression, not only column
 				? " (" . implode(",", $partitions) . "\n)"
-				: ($_POST["partitions"] ? " PARTITIONS " . (+$_POST["partitions"]) : "")
+				: ($_POST["partitions"] ? " PARTITIONS " . intval($_POST["partitions"]) : "")
 			);
 		} elseif ($TABLE != "" && support("partitioning")) {
 			$partitioning .= "\nREMOVE PARTITIONING";
@@ -83,7 +84,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 			$_POST["Comment"],
 			($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? $_POST["Engine"] : ""),
 			($_POST["Collation"] && $_POST["Collation"] != $orig_status["Collation"] ? $_POST["Collation"] : ""),
-			($_POST["Auto_increment"] != "" ? +$_POST["Auto_increment"] : ""),
+			($_POST["Auto_increment"] != "" ? preg_replace('~[^0-9]+~', '', $_POST["Auto_increment"]) : ""),
 			$partitioning
 		));
 	}
@@ -117,12 +118,13 @@ if ($_POST) {
 		$row["fields"][] = $field;
 	}
 	if (support("partitioning")) {
-		$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
+		$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . $connection->quote(DB) . " AND TABLE_NAME = " . $connection->quote($TABLE);
 		$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION LIMIT 1");
 		list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
 		$row["partition_names"] = array();
 		$row["partition_values"] = array();
-		foreach (get_rows("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION") as $row1) {
+		$result = $connection->query("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+		while ($row1 = $result->fetch_assoc()) {
 			$row["partition_names"][] = $row1["PARTITION_NAME"];
 			$row["partition_values"][] = $row1["PARTITION_DESCRIPTION"];
 		}
@@ -150,7 +152,7 @@ foreach ($engines as $engine) {
 <p>
 <?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo h($row["name"]); ?>">
 <?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) : ""); ?>
- <?php echo ($collations && !ereg("sqlite|mssql", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
+ <?php echo ($collations ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php $comments = edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys, $row["Comment"] != ""); ?>
@@ -160,11 +162,11 @@ foreach ($engines as $engine) {
 <script type="text/javascript">
 document.write('<label><input type="checkbox" onclick="columnShow(this.checked, 5);"><?php echo lang('Default values'); ?><\/label>');
 </script>
-<?php echo (support("comment") ? checkbox("", "", $comments, lang('Comment'), "columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus();") . ' <input id="Comment" name="Comment" value="' . h($row["Comment"]) . '" maxlength="60"' . ($comments ? '' : ' class="hidden"') . '>' : ''); ?>
+<?php echo (support("comment") ? checkbox("", "", $comments, lang('Comment'), "columnShow(this.checked, 6); toggle('Comment');") . ' <input id="Comment" name="Comment" value="' . h($row["Comment"]) . '" maxlength="60"' . ($comments ? '' : ' class="hidden"') . '>' : ''); ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);
@@ -185,7 +187,5 @@ foreach ($row["partition_names"] as $key => $val) {
 ?>
 </table>
 </div></fieldset>
-<?php
-}
-?>
+<?php } ?>
 </form>

adminer/database.inc.php

@@ -10,11 +10,11 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 			$_GET["db"] = $_POST["name"];
 			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($_POST["name"]), lang('Database has been renamed.'), rename_database($_POST["name"], $_POST["collation"]));
 		} else {
-			$databases = explode("\n", str_replace("\r", "", $_POST["name"]));
+			$dbs = explode("\n", str_replace("\r", "", $_POST["name"]));
 			$success = true;
 			$last = "";
-			foreach ($databases as $db) {
-				if (count($databases) == 1 || $db != "") { // ignore empty lines but always try to create single database
+			foreach ($dbs as $db) {
+				if (count($dbs) == 1 || $db != "") { // ignore empty lines but always try to create single database
 					if (!create_database($db, $_POST["collation"])) {
 						$success = false;
 					}
@@ -28,7 +28,7 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 		if (!$_POST["collation"]) {
 			redirect(substr(ME, 0, -1));
 		}
-		query_redirect("ALTER DATABASE " . idf_escape($_POST["name"]) . (eregi('^[a-z0-9_]+$', $_POST["collation"]) ? " COLLATE $_POST[collation]" : ""), substr(ME, 0, -1), lang('Database has been altered.'));
+		query_redirect("ALTER DATABASE " . idf_escape($_POST["name"]) . " COLLATE " . $connection->quote($_POST["collation"]), substr(ME, 0, -1), lang('Database has been altered.'));
 	}
 }
 
@@ -57,16 +57,15 @@ if ($_POST) {
 <p>
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
-	? '<textarea id="name" name="name" rows="10" cols="40" onkeydown="return textareaKeydown(this, event);">' . h($name) . '</textarea><br>'
-	: '<input id="name" name="name" value="' . h($name) . '" maxlength="64">'
+	? '<textarea name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
+	: '<input name="name" value="' . h($name) . '" maxlength="64">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
 ?>
-<script type='text/javascript'>document.getElementById('name').focus();</script>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (DB != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }

adminer/db.inc.php

@@ -33,11 +33,11 @@ if ($tables_views && !$error && !$_POST["search"]) {
 
 page_header(($_GET["ns"] == "" ? lang('Database') . ": " . h(DB) : lang('Schema') . ": " . h($_GET["ns"])), $error, true);
 echo '<p>' . ($_GET["ns"] == "" ? '<a href="' . h(ME) . 'database=">' . lang('Alter database') . "</a>\n" : "");
-if (support("scheme")) {
-	echo "<a href='" . h(ME) . "scheme='>" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "</a>\n";
-}
+echo (support("scheme") ? "<a href='" . h(ME) . "scheme='>" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "</a>\n" : "");
 if ($_GET["ns"] !== "") {
 	echo '<a href="' . h(ME) . 'schema=">' . lang('Database schema') . "</a>\n";
+	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
+	
 	echo "<h3>" . lang('Tables and views') . "</h3>\n";
 	$tables_list = tables_list();
 	if (!$tables_list) {
@@ -46,6 +46,8 @@ if ($_GET["ns"] !== "") {
 		echo "<form action='' method='post'>\n";
 		echo "<p>" . lang('Search data in tables') . ": <input name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 		if ($_POST["search"] && $_POST["query"] != "") {
+			$_GET["where"][0]["op"] = "LIKE %%";
+			$_GET["where"][0]["val"] = $_POST["query"];
 			search_tables();
 		}
 		echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
@@ -66,18 +68,18 @@ if ($_GET["ns"] !== "") {
 			echo (support("comment") ? "<td id='Comment-" . h($name) . "'>&nbsp;" : "");
 		}
 		echo "<tr><td>&nbsp;<th>" . lang('%d in total', count($tables_list));
-		echo "<td>" . nbsp($connection->result("SELECT @@storage_engine"));
-		echo "<td>" . nbsp(db_collation(DB, collations()));
-		foreach (array("Data_length", "Index_length", "Data_free") as $key) {
+		echo "<td>" . $connection->result("SELECT @@storage_engine");
+		echo "<td>" . db_collation(DB, collations());
+		foreach ($sums as $key => $val) {
 			echo "<td align='right' id='sum-$key'>&nbsp;";
 		}
 		echo "</table>\n";
 		if (!information_schema(DB)) {
-			echo "<p><input type='hidden' name='token' value='$token'>" . ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> <input type='submit' name='optimize' value='" . lang('Optimize') . "'> <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() : get_databases());
-			if (count($databases) != 1 && $jush != "sqlite") {
+			echo "<p><input type='hidden' name='token' value='$token'>" . ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> <input type='submit' name='optimize' value='" . lang('Optimize') . "'> <input type='submit' name='check' value='" . lang('Check') . "'> <input type='submit' name='repair' value='" . lang('Repair') . "'> " : "") . "<input type='submit' name='truncate' value='" . lang('Truncate') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /tables/) + ')');\"> <input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /tables|views/) + ')');\">\n";
+			$dbs = (support("scheme") ? schemas() : get_databases());
+			if (count($dbs) != 1 && $jush != "sqlite") {
 				$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
-				echo "<p>" . lang('Move to other database') . ($databases ? ": " . html_select("target", $databases, $db) : ': <input name="target" value="' . h($db) . '">') . " <input type='submit' name='move' value='" . lang('Move') . "'>\n";
+				echo "<p>" . lang('Move to other database') . ($dbs ? ": " . html_select("target", $dbs, $db) : ': <input name="target" value="' . h($db) . '">') . " <input type='submit' name='move' value='" . lang('Move') . "'>\n";
 			}
 		}
 		echo "</form>\n";
@@ -122,28 +124,13 @@ if ($_GET["ns"] !== "") {
 		echo "<p><a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>\n";
 	}
 	
-	if (support("type")) {
-		echo "<h3>" . lang('User types') . "</h3>\n";
-		$types = types();
-		if ($types) {
-			echo "<table cellspacing='0'>\n";
-			echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
-			odd('');
-			foreach ($types as $val) {
-				echo "<tr" . odd() . "><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
-			}
-			echo "</table>\n";
-		}
-		echo "<p><a href='" . h(ME) . "type='>" . lang('Create type') . "</a>\n";
-	}
-	
 	if (support("event")) {
 		echo "<h3>" . lang('Events') . "</h3>\n";
-		$rows = get_rows("SHOW EVENTS");
-		if ($rows) {
+		$result = $connection->query("SHOW EVENTS");
+		if ($result && $result->num_rows) {
 			echo "<table cellspacing='0'>\n";
 			echo "<thead><tr><th>" . lang('Name') . "<td>" . lang('Schedule') . "<td>" . lang('Start') . "<td>" . lang('End') . "</thead>\n";
-			foreach ($rows as $row) {
+			while ($row = $result->fetch_assoc()) {
 				echo "<tr>";
 				echo '<th><a href="' . h(ME) . 'event=' . urlencode($row["Name"]) . '">' . h($row["Name"]) . "</a>";
 				echo "<td>" . ($row["Execute at"] ? lang('At given time') . "<td>" . $row["Execute at"] : lang('Every') . " " . $row["Interval value"] . " " . $row["Interval field"] . "<td>$row[Starts]");
@@ -154,9 +141,34 @@ if ($_GET["ns"] !== "") {
 		echo '<p><a href="' . h(ME) . 'event=">' . lang('Create event') . "</a>\n";
 	}
 	
-	if ($tables_list) {
-		page_footer();
-		echo "<script type='text/javascript' src='" . h(ME . "script=db&token=$token") . "'></script>\n";
-		exit; // page_footer() already called
+	page_footer();
+	$table_status = table_status();
+	if ($table_status) {
+		echo "<script type='text/javascript'>\n";
+		foreach ($table_status as $row) {
+			$id = addcslashes($row["Name"], "\\'/");
+			echo "setHtml('Comment-$id', '" . nbsp($row["Comment"]) . "');\n";
+			if (!eregi("view", $row["Engine"])) {
+				foreach (array("Engine", "Collation") as $key) {
+					echo "setHtml('$key-$id', '" . nbsp($row[$key]) . "');\n";
+				}
+				foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
+					if ($row[$key] != "") {
+						$val = number_format($row[$key], 0, '.', lang(','));
+						echo "setHtml('$key-$id', '" . ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "');\n";
+						if (isset($sums[$key])) {
+							$sums[$key] += ($row["Engine"] != "InnoDB" || $key != "Data_free" ? $row[$key] : 0);
+						}
+					} elseif (array_key_exists($key, $row)) {
+						echo "setHtml('$key-$id');\n";
+					}
+				}
+			}
+		}
+		foreach ($sums as $key => $val) {
+			echo "setHtml('sum-$key', '" . number_format($val, 0, '.', lang(',')) . "');\n";
+		}
+		echo "</script>\n";
 	}
+	exit; // page_footer() already called
 }

adminer/drivers/mssql.inc.php

@@ -5,10 +5,13 @@
 * @author Jakub Vrana
 */
 
-$drivers["mssql"] = "MS SQL";
+$possible_drivers[] = "SQLSRV";
+$possible_drivers[] = "MSSQL";
+if (extension_loaded("sqlsrv") || extension_loaded("mssql")) {
+	$drivers["mssql"] = "MS SQL";
+}
 
 if (isset($_GET["mssql"])) {
-	$possible_drivers = array("SQLSRV", "MSSQL");
 	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
 		class Min_DB {
@@ -89,7 +92,7 @@ if (isset($_GET["mssql"])) {
 
 			function Min_Result($result) {
 				$this->_result = $result;
-				// $this->num_rows = sqlsrv_num_rows($result); // available only in scrollable results
+				$this->num_rows = sqlsrv_has_rows($result); //! sqlsrv_num_rows($result)
 			}
 
 			function _convert($row) {
@@ -142,7 +145,7 @@ if (isset($_GET["mssql"])) {
 				if ($this->_link) {
 					$result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')");
 					$row = $result->fetch_row();
-					$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					$this->server_info = $this->result("sp_server_info 2", 2)." [$row[0]] $row[1]";
 				} else {
 					$this->error = mssql_get_last_message();
 				}
@@ -261,7 +264,7 @@ if (isset($_GET["mssql"])) {
 
 	function db_collation($db, $collations) {
 		global $connection;
-		return $connection->result("SELECT collation_name FROM sys.databases WHERE name =  " . q($db));
+		return $connection->result("SELECT collation_name FROM sys.databases WHERE name =  " . $connection->quote($db));
 	}
 
 	function engines() {
@@ -274,7 +277,8 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT name, type_desc FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') ORDER BY name");
+		global $connection;
+		return get_key_vals("SELECT name, type_desc FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . $connection->quote(get_schema()) . ") AND type IN ('S', 'U', 'V') ORDER BY name");
 	}
 
 	function count_tables($databases) {
@@ -282,14 +286,16 @@ if (isset($_GET["mssql"])) {
 		$return = array();
 		foreach ($databases as $db) {
 			$connection->select_db($db);
-			$return[$db] = $connection->result("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES");
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM information_schema.TABLES");
 		}
 		return $return;
 	}
 	
 	function table_status($name = "") {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT name AS Name, type_desc AS Engine FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
+		$result = $connection->query("SELECT name AS Name, type_desc AS Engine FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . $connection->quote(get_schema()) . ") AND type IN ('S', 'U', 'V')" . ($name != "" ? " AND name = " . $connection->quote($name) : ""));
+		while ($row = $result->fetch_assoc()) {
 			if ($name != "") {
 				return $row;
 			}
@@ -298,29 +304,26 @@ if (isset($_GET["mssql"])) {
 		return $return;
 	}
 
-	function is_view($table_status) {
-		return $table_status["Engine"] == "VIEW";
-	}
-	
 	function fk_support($table_status) {
 		return true;
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT c.*, t.name type, d.definition [default]
+		$result = $connection->query("SELECT c.*, t.name type, d.definition [default]
 FROM sys.all_columns c
 JOIN sys.all_objects o ON c.object_id = o.object_id
 JOIN sys.types t ON c.user_type_id = t.user_type_id
 LEFT JOIN sys.default_constraints d ON c.default_object_id = d.parent_column_id
-WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table)
-		) as $row) {
-			$type = $row["type"];
-			$length = (ereg("char|binary", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
+WHERE o.schema_id = SCHEMA_ID(" . $connection->quote(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . $connection->quote($table)
+		);
+		while ($row = $result->fetch_assoc()) {
+			$length = $row["max_length"]; //! precision, scale
 			$return[$row["name"]] = array(
 				"field" => $row["name"],
-				"full_type" => $type . ($length ? "($length)" : ""),
-				"type" => $type,
+				"full_type" => $row["type"] . ($length ? "($length)" : ""),
+				"type" => $row["type"],
 				"length" => $length,
 				"default" => $row["default"],
 				"null" => $row["is_nullable"],
@@ -340,24 +343,22 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 		}
 		$return = array();
 		// sp_statistics doesn't return information about primary key
-		foreach (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name
-FROM sys.indexes i
-INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
-INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
-WHERE OBJECT_NAME(i.object_id) = " . q($table)
-		, $connection2) as $row) {
-			$return[$row["name"]]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
-			$return[$row["name"]]["lengths"] = array();
-			$return[$row["name"]]["columns"][$row["key_ordinal"]] = $row["column_name"];
+		$result = $connection2->query("SELECT indexes.name, key_ordinal, is_unique, is_primary_key, columns.name AS column_name
+FROM sys.indexes
+INNER JOIN sys.index_columns ON indexes.object_id = index_columns.object_id AND indexes.index_id = index_columns.index_id
+INNER JOIN sys.columns ON index_columns.object_id = columns.object_id AND index_columns.column_id = columns.column_id
+WHERE OBJECT_NAME(indexes.object_id) = " . $connection2->quote($table)
+		);
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				$return[$row["name"]]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
+				$return[$row["name"]]["lengths"] = array();
+				$return[$row["name"]]["columns"][$row["key_ordinal"]] = $row["column_name"];
+			}
 		}
 		return $return;
 	}
 
-	function view($name) {
-		global $connection;
-		return array("select" => preg_replace('~^(?:[^[]|\\[[^]]*])*\\s+AS\\s+~isU', '', $connection->result("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
-	}
-	
 	function collations() {
 		$return = array();
 		foreach (get_vals("SELECT name FROM fn_helpcollations()") as $collation) {
@@ -376,11 +377,12 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 	
 	function exact_value($val) {
-		return q($val);
+		global $connection;
+		return $connection->quote($val);
 	}
 
 	function create_database($db, $collation) {
-		return queries("CREATE DATABASE " . idf_escape($db) . (eregi('^[a-z0-9_]+$', $collation) ? " COLLATE $collation" : ""));
+		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . idf_escape($collation) : ""));
 	}
 	
 	function drop_databases($databases) {
@@ -388,71 +390,15 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 	
 	function rename_database($name, $collation) {
-		if (eregi('^[a-z0-9_]+$', $collation)) {
-			queries("ALTER DATABASE " . idf_escape(DB) . " COLLATE $collation");
+		if ($collation) {
+			queries("ALTER DATABASE " . idf_escape(DB) . " COLLATE " . idf_escape($collation));
 		}
 		queries("ALTER DATABASE " . idf_escape(DB) . " MODIFY NAME = " . idf_escape($name));
 		return true; //! false negative "The database name 'test2' has been set."
 	}
 
 	function auto_increment() {
-		return " IDENTITY" . ($_POST["Auto_increment"] != "" ? "(" . (+$_POST["Auto_increment"]) . ",1)" : "");
-	}
-	
-	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
-		$alter = array();
-		foreach ($fields as $field) {
-			$column = idf_escape($field[0]);
-			$val = $field[1];
-			if (!$val) {
-				$alter["DROP"][] = " COLUMN $field[0]";
-			} else {
-				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", "\\1\\2", $val[1]);
-				if ($field[0] == "") {
-					$alter["ADD"][] = "\n  " . implode("", $val);
-				} else {
-					unset($val[6]); //! identity can't be removed
-					if ($column != $val[0]) {
-						queries("EXEC sp_rename " . q(table($table) . ".$column") . ", " . q(idf_unescape($val[0])) . ", 'COLUMN'");
-					}
-					$alter["ALTER COLUMN " . implode("", $val)][] = "";
-				}
-			}
-		}
-		if ($table == "") {
-			return queries("CREATE TABLE " . table($name) . " (" . implode(",", (array) $alter["ADD"]) . "\n)");
-		}
-		if ($table != $name) {
-			queries("EXEC sp_rename " . q(table($table)) . ", " . q($name));
-		}
-		foreach ($alter as $key => $val) {
-			if (!queries("ALTER TABLE " . idf_escape($name) . " $key" . implode(",", $val))) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	function alter_indexes($table, $alter) {
-		$index = array();
-		$drop = array();
-		foreach ($alter as $val) {
-			if ($val[2]) {
-				if ($val[0] == "PRIMARY") { //! sometimes used also for UNIQUE
-					$drop[] = $val[1];
-				} else {
-					$index[] = "$val[1] ON " . table($table);
-				}
-			} elseif (!queries(($val[0] != "PRIMARY"
-				? "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)
-				: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
-			) . " $val[1]")) {
-				return false;
-			}
-		}
-		return (!$index || queries("DROP INDEX " . implode(", ", $index)))
-			&& (!$drop || queries("ALTER TABLE " . table($table) . " DROP " . implode(", ", $drop)))
-		;
+		return " IDENTITY";
 	}
 	
 	function begin() {
@@ -463,22 +409,6 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}
 	
-	function insert_update($table, $set, $primary) {
-		$update = array();
-		$where = array();
-		foreach ($set as $key => $val) {
-			$update[] = "$key = $val";
-			if (isset($primary[idf_unescape($key)])) {
-				$where[] = "$key = $val";
-			}
-		}
-		// can use only one query for all rows with different API
-		return queries("MERGE " . table($table) . " USING (VALUES(" . implode(", ", $set) . ")) AS source (c" . implode(", c", range(1, count($set))) . ") ON " . implode(" AND ", $where) //! source, c1 - possible conflict
-			. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
-			. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
-		);
-	}
-	
 	function last_id() {
 		global $connection;
 		return $connection->result("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
@@ -492,8 +422,10 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 	
 	function foreign_keys($table) {
+		global $connection;
+		$result = $connection->query("EXEC sp_fkeys @fktable_name = " . $connection->quote($table));
 		$return = array();
-		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
+		while ($row = $result->fetch_assoc()) {
 			$foreign_key = &$return[$row["FK_NAME"]];
 			$foreign_key["table"] = $row["PKTABLE_NAME"];
 			$foreign_key["source"][] = $row["FKCOLUMN_NAME"];
@@ -519,30 +451,31 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 	
 	function trigger($name) {
-		$rows = get_rows("SELECT s.name [Trigger],
+		global $connection;
+		$result = $connection->query("SELECT s.name [Trigger],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(s.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(s.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(s.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing],
 c.text
 FROM sysobjects s
 JOIN syscomments c ON s.id = c.id
-WHERE s.xtype = 'TR' AND s.name = " . q($name)
+WHERE s.xtype = 'TR' AND s.name = " . $connection->quote($name)
 		); // triggers are not schema-scoped
-		$return = reset($rows);
-		if ($return) {
-			$return["Statement"] = preg_replace('~^.+\\s+AS\\s+~isU', '', $return["text"]); //! identifiers, comments
-		}
-		return $return;
+		$row = $result->fetch_assoc();
+		$row["Statement"] = preg_replace('~^.+\\s+AS\\s+~isU', '', $row["text"]); //! identifiers, comments
+		return $row;
 	}
 	
 	function triggers($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT sys1.name,
+		$result = $connection->query("SELECT sys1.name,
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsertTrigger') = 1 THEN 'INSERT' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsUpdateTrigger') = 1 THEN 'UPDATE' WHEN OBJECTPROPERTY(sys1.id, 'ExecIsDeleteTrigger') = 1 THEN 'DELETE' END [Event],
 CASE WHEN OBJECTPROPERTY(sys1.id, 'ExecIsInsteadOfTrigger') = 1 THEN 'INSTEAD OF' ELSE 'AFTER' END [Timing]
 FROM sysobjects sys1
 JOIN sysobjects sys2 ON sys1.parent_obj = sys2.id
-WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
-		) as $row) { // triggers are not schema-scoped
+WHERE sys1.xtype = 'TR' AND sys2.name = " . $connection->quote($table)
+		); // triggers are not schema-scoped
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["name"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
@@ -584,7 +517,7 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	}
 
 	function support($feature) {
-		return ereg('^(scheme|trigger|view|drop_col)$', $feature); //! routine|
+		return ereg('^(scheme|trigger|drop_col)$', $feature); //! view|routine|
 	}
 	
 	$jush = "mssql";

adminer/drivers/mysql.inc.php

@@ -1,8 +1,12 @@
 <?php
-$drivers = array("server" => "MySQL") + $drivers;
+$possible_drivers[] = "MySQLi";
+$possible_drivers[] = "MySQL";
+$possible_drivers[] = "PDO_MySQL";
+if (extension_loaded("mysqli") || extension_loaded("mysql") || extension_loaded("pdo_mysql")) {
+	$drivers = array("server" => "MySQL") + $drivers;
+}
 
 if (!defined("DRIVER")) {
-	$possible_drivers = array("MySQLi", "MySQL", "PDO_MySQL");
 	define("DRIVER", "server"); // server - backwards compatibility
 	// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
 	if (extension_loaded("mysqli")) {
@@ -14,9 +18,8 @@ if (!defined("DRIVER")) {
 			}
 			
 			function connect($server, $username, $password) {
-				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
-				$return = @$this->real_connect(
+				return @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					("$server$username" != "" ? $username : ini_get("mysqli.default_user")),
 					("$server$username$password" != "" ? $password : ini_get("mysqli.default_pw")),
@@ -24,14 +27,6 @@ if (!defined("DRIVER")) {
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
 					(!is_numeric($port) ? $port : null)
 				);
-				if ($return) {
-					if (method_exists($this, 'set_charset')) {
-						$this->set_charset("utf8");
-					} else {
-						$this->query("SET NAMES utf8");
-					}
-				}
-				return $return;
 			}
 			
 			function result($query, $field = 0) {
@@ -74,11 +69,6 @@ if (!defined("DRIVER")) {
 				);
 				if ($this->_link) {
 					$this->server_info = mysql_get_server_info($this->_link);
-					if (function_exists('mysql_set_charset')) {
-						mysql_set_charset("utf8", $this->_link);
-					} else {
-						$this->query("SET NAMES utf8");
-					}
 				} else {
 					$this->error = mysql_error();
 				}
@@ -160,7 +150,7 @@ if (!defined("DRIVER")) {
 		class Min_Result {
 			var
 				$num_rows, ///< @var int number of rows in the result
-				$_result, $_offset = 0 ///< @access private
+				$_result ///< @access private
 			;
 			
 			/** Constructor
@@ -189,7 +179,7 @@ if (!defined("DRIVER")) {
 			* @return object properties: name, type, orgtable, orgname, charsetnr
 			*/
 			function fetch_field() {
-				$return = mysql_fetch_field($this->_result, $this->_offset++); // offset required under certain conditions
+				$return = mysql_fetch_field($this->_result);
 				$return->orgtable = $return->table;
 				$return->orgname = $return->name;
 				$return->charsetnr = ($return->blob ? 63 : 0);
@@ -208,8 +198,7 @@ if (!defined("DRIVER")) {
 			var $extension = "PDO_MySQL";
 			
 			function connect($server, $username, $password) {
-				$this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
-				$this->query("SET NAMES utf8"); // charset in DSN is ignored
+				$this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:([0-9])~', ';port=\\1', $server)), $username, $password);
 				return true;
 			}
 			
@@ -251,6 +240,7 @@ if (!defined("DRIVER")) {
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			$connection->query("SET SQL_QUOTE_SHOW_CREATE=1");
+			$connection->query("SET NAMES utf8");
 			return $connection;
 		}
 		return $connection->error;
@@ -262,7 +252,7 @@ if (!defined("DRIVER")) {
 	*/
 	function get_databases($flush = true) {
 		// SHOW DATABASES can take a very long time so it is cached
-		$return = &get_session("dbs");
+		$return = &get_session("databases");
 		if (!isset($return)) {
 			if ($flush) {
 				restart_session();
@@ -316,8 +306,10 @@ if (!defined("DRIVER")) {
 	* @return array
 	*/
 	function engines() {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW ENGINES") as $row) {
+		$result = $connection->query("SHOW ENGINES");
+		while ($row = $result->fetch_assoc()) {
 			if (ereg("YES|DEFAULT", $row["Support"])) {
 				$return[] = $row["Engine"];
 			}
@@ -358,13 +350,16 @@ if (!defined("DRIVER")) {
 	* @return array
 	*/
 	function table_status($name = "") {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_")) : "")) as $row) {
+		$result = $connection->query("SHOW TABLE STATUS" . ($name != "" ? " LIKE " . $connection->quote(addcslashes($name, "%_")) : ""));
+		while ($row = $result->fetch_assoc()) {
 			if ($row["Engine"] == "InnoDB") {
 				// ignore internal comment, unnecessary since MySQL 5.1.21
 				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["Comment"]);
 			}
 			if (!isset($row["Rows"])) {
+				$row["Engine"] = "VIEW";
 				$row["Comment"] = "";
 			}
 			if ($name != "") {
@@ -375,14 +370,6 @@ if (!defined("DRIVER")) {
 		return $return;
 	}
 
-	/** Find out whether the identifier is view
-	* @param array
-	* @return bool
-	*/
-	function is_view($table_status) {
-		return !isset($table_status["Rows"]);
-	}
-
 	/** Check if table supports foreign keys
 	* @param array result of table_status
 	* @return bool
@@ -396,24 +383,28 @@ if (!defined("DRIVER")) {
 	* @return array array($name => array("field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => ))
 	*/
 	function fields($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
-			preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
-			$return[$row["Field"]] = array(
-				"field" => $row["Field"],
-				"full_type" => $row["Type"],
-				"type" => $match[1],
-				"length" => $match[2],
-				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($row["Default"] != "" || ereg("char", $match[1]) ? $row["Default"] : null),
-				"null" => ($row["Null"] == "YES"),
-				"auto_increment" => ($row["Extra"] == "auto_increment"),
-				"on_update" => (eregi('^on update (.+)', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
-				"collation" => $row["Collation"],
-				"privileges" => array_flip(explode(",", $row["Privileges"])),
-				"comment" => $row["Comment"],
-				"primary" => ($row["Key"] == "PRI"),
-			);
+		$result = $connection->query("SHOW FULL COLUMNS FROM " . table($table));
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
+				$return[$row["Field"]] = array(
+					"field" => $row["Field"],
+					"full_type" => $row["Type"],
+					"type" => $match[1],
+					"length" => $match[2],
+					"unsigned" => ltrim($match[3] . $match[4]),
+					"default" => ($row["Default"] != "" || ereg("char", $match[1]) ? $row["Default"] : null),
+					"null" => ($row["Null"] == "YES"),
+					"auto_increment" => ($row["Extra"] == "auto_increment"),
+					"on_update" => (eregi('^on update (.+)', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
+					"collation" => $row["Collation"],
+					"privileges" => array_flip(explode(",", $row["Privileges"])),
+					"comment" => $row["Comment"],
+					"primary" => ($row["Key"] == "PRI"),
+				);
+			}
 		}
 		return $return;
 	}
@@ -429,10 +420,13 @@ if (!defined("DRIVER")) {
 			$connection2 = $connection;
 		}
 		$return = array();
-		foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
-			$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
-			$return[$row["Key_name"]]["columns"][] = $row["Column_name"];
-			$return[$row["Key_name"]]["lengths"][] = $row["Sub_part"];
+		$result = $connection2->query("SHOW INDEX FROM " . table($table));
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
+				$return[$row["Key_name"]]["columns"][] = $row["Column_name"];
+				$return[$row["Key_name"]]["lengths"][] = $row["Sub_part"];
+			}
 		}
 		return $return;
 	}
@@ -477,8 +471,10 @@ if (!defined("DRIVER")) {
 	* @return array
 	*/
 	function collations() {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW COLLATION") as $row) {
+		$result = $connection->query("SHOW COLLATION");
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["Charset"]][] = $row["Collation"];
 		}
 		ksort($return);
@@ -510,7 +506,8 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function exact_value($val) {
-		return q($val) . " COLLATE utf8_bin";
+		global $connection;
+		return $connection->quote($val) . " COLLATE utf8_bin";
 	}
 
 	/** Create database
@@ -518,8 +515,9 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function create_database($db, $collation) {
-		set_session("dbs", null);
-		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . q($collation) : ""));
+		global $connection;
+		set_session("databases", null);
+		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
 	}
 	
 	/** Drop databases
@@ -527,8 +525,8 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_databases($databases) {
-		set_session("dbs", null);
-		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
+		set_session("databases", null);
+		return apply_queries("DROP DATABASE", $db, 'idf_escape');
 	}
 	
 	/** Rename database from DB
@@ -537,18 +535,23 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function rename_database($name, $collation) {
+		global $connection;
+		$return = false;
 		if (create_database($name, $collation)) {
 			//! move triggers
-			$rename = array();
-			foreach (tables_list() as $table => $type) {
-				$rename[] = table($table) . " TO " . idf_escape($name) . "." . table($table);
+			$return = true; // table list may by empty
+			foreach (tables_list() as $table) {
+				if (!queries("RENAME TABLE " . table($table) . " TO " . idf_escape($name) . "." . table($table))) {
+					$return = false;
+					break;
+				}
 			}
-			if (!$rename || queries("RENAME TABLE " . implode(", ", $rename))) {
+			if ($return) {
 				queries("DROP DATABASE " . idf_escape(DB));
-				return true;
+				//! saved to history of removed database
 			}
 		}
-		return false;
+		return $return;
 	}
 	
 	/** Generate modifier for auto increment column
@@ -584,6 +587,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
 		$alter = array();
 		foreach ($fields as $field) {
 			$alter[] = ($field[1]
@@ -592,9 +596,9 @@ if (!defined("DRIVER")) {
 			);
 		}
 		$alter = array_merge($alter, $foreign);
-		$status = "COMMENT=" . q($comment)
-			. ($engine ? " ENGINE=" . q($engine) : "")
-			. ($collation ? " COLLATE " . q($collation) : "")
+		$status = "COMMENT=" . $connection->quote($comment)
+			. ($engine ? " ENGINE=" . $connection->quote($engine) : "")
+			. ($collation ? " COLLATE " . $connection->quote($collation) : "")
 			. ($auto_increment != "" ? " AUTO_INCREMENT=$auto_increment" : "")
 			. $partitioning
 		;
@@ -663,8 +667,9 @@ if (!defined("DRIVER")) {
 	* @return array array("Trigger" => , "Timing" => , "Event" => , "Statement" => )
 	*/
 	function trigger($name) {
-		$rows = get_rows("SHOW TRIGGERS WHERE `Trigger` = " . q($name));
-		return reset($rows);
+		global $connection;
+		$result = $connection->query("SHOW TRIGGERS WHERE `Trigger` = " . $connection->quote($name));
+		return $result->fetch_assoc();
 	}
 	
 	/** Get defined triggers
@@ -672,8 +677,10 @@ if (!defined("DRIVER")) {
 	* @return array array($name => array($timing, $event))
 	*/
 	function triggers($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_"))) as $row) {
+		$result = $connection->query("SHOW TRIGGERS LIKE " . $connection->quote(addcslashes($table, "%_")));
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["Trigger"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
@@ -697,8 +704,8 @@ 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]+)['\"]?)?";
+		$aliases = array("bit" => "tinyint", "bool" => "tinyint", "boolean" => "tinyint", "integer" => "int", "double precision" => "float", "real" => "float", "dec" => "decimal", "numeric" => "decimal", "fixed" => "decimal", "national char" => "char", "national varchar" => "varchar");
+		$type_pattern = "((" . implode("|", array_keys($types + $aliases)) . ")(?:\\s*\\(((?:[^'\")]*|$enum_length)+)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
 		$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : implode("|", $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);
@@ -706,9 +713,10 @@ if (!defined("DRIVER")) {
 		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
 		foreach ($matches as $param) {
 			$name = str_replace("``", "`", $param[2]) . $param[3];
+			$data_type = strtolower($param[5]);
 			$fields[] = array(
 				"field" => $name,
-				"type" => strtolower($param[5]),
+				"type" => (isset($aliases[$data_type]) ? $aliases[$data_type] : $data_type),
 				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
 				"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
 				"full_type" => $param[4],
@@ -727,7 +735,13 @@ if (!defined("DRIVER")) {
 	}
 	
 	function routines() {
-		return get_rows("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
+		global $connection;
+		$return = array();
+		$result = $connection->query("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . $connection->quote(DB));
+		while ($row = $result->fetch_assoc()) {
+			$return[] = $row;
+		}
+		return $return;
 	}
 	
 	/** Begin transaction
@@ -746,20 +760,6 @@ if (!defined("DRIVER")) {
 		return queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")");
 	}
 	
-	/** Insert or update data in the table
-	* @param string
-	* @param array
-	* @param array columns in keys
-	* @return bool
-	*/
-	function insert_update($table, $set, $primary) {
-		foreach ($set as $key => $val) {
-			$set[$key] = "$key = $val";
-		}
-		$update = implode(", ", $set);
-		return queries("INSERT INTO " . table($table) . " SET $update ON DUPLICATE KEY UPDATE $update");
-	}
-	
 	/** Get last auto increment ID
 	* @return string
 	*/
@@ -777,13 +777,6 @@ if (!defined("DRIVER")) {
 		return $connection->query("EXPLAIN $query");
 	}
 	
-	/** Get user defined types
-	* @return array
-	*/
-	function types() {
-		return array();
-	}
-	
 	/** Get existing schemas
 	* @return array
 	*/
@@ -808,24 +801,11 @@ if (!defined("DRIVER")) {
 	
 	/** Get SQL command to create table
 	* @param string
-	* @param bool
 	* @return string
 	*/
-	function create_sql($table, $auto_increment) {
+	function create_sql($table) {
 		global $connection;
-		$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
-		if (!$auto_increment) {
-			$return = preg_replace('~ AUTO_INCREMENT=\\d+~', '', $return); //! skip comments
-		}
-		return $return;
-	}
-	
-	/** Get SQL command to truncate table
-	* @param string
-	* @return string
-	*/
-	function truncate_sql($table) {
-		return "TRUNCATE " . table($table);
+		return $connection->result("SHOW CREATE TABLE " . table($table), 1);
 	}
 	
 	/** Get SQL command to change database
@@ -842,10 +822,14 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function trigger_sql($table, $style) {
+		global $connection;
+		$result = $connection->query("SHOW TRIGGERS LIKE " . $connection->quote(addcslashes($table, "%_")));
 		$return = "";
-		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_")), null, "-- ") as $row) {
-			$return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
-			. "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+		if ($result->num_rows) {
+			while ($row = $result->fetch_assoc()) {
+				$return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
+				. "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+			}
 		}
 		return $return;
 	}
@@ -865,12 +849,12 @@ if (!defined("DRIVER")) {
 	}
 	
 	/** Check whether a feature is supported
-	* @param string "comment", "drop_col", "dump", "event", "partitioning", "routine", "scheme", "sequence", "status", "trigger", "type", "variables", "view"
+	* @param string
 	* @return bool
 	*/
 	function support($feature) {
 		global $connection;
-		return !ereg("scheme|sequence|type" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|view|routine|trigger" : "") : ""), $feature);
+		return !ereg("scheme|sequence" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|view|routine|trigger" : "") : ""), $feature);
 	}
 
 	$jush = "sql"; ///< @var string JUSH identifier
@@ -893,7 +877,6 @@ if (!defined("DRIVER")) {
 	$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",
 			"date|time" => "now",
 		), array(
 			"int|float|double|decimal" => "+/-",

adminer/drivers/oracle.inc.php

@@ -1,8 +1,11 @@
 <?php
-$drivers["oracle"] = "Oracle";
+$possible_drivers[] = "OCI8";
+$possible_drivers[] = "PDO_OCI";
+if (extension_loaded("oci8") || extension_loaded("pdo_oci")) {
+	$drivers["oracle"] = "Oracle";
+}
 
 if (isset($_GET["oracle"])) {
-	$possible_drivers = array("OCI8", "PDO_OCI");
 	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
 		class Min_DB {
@@ -80,6 +83,7 @@ if (isset($_GET["oracle"])) {
 
 			function Min_Result($result) {
 				$this->_result = $result;
+				$this->num_rows = -1; // all results unbuffered
 			}
 
 			function _convert($row) {
@@ -172,9 +176,8 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "
-UNION SELECT view_name, 'view' FROM user_views"
-		); //! views don't have schema
+		global $connection;
+		return get_key_vals("SELECT table_name FROM all_tables WHERE tablespace_name = " . $connection->quote(DB)); //! views
 	}
 
 	function count_tables($databases) {
@@ -182,11 +185,10 @@ UNION SELECT view_name, 'view' FROM user_views"
 	}
 	
 	function table_status($name = "") {
+		global $connection;
 		$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" : "")
-		) as $row) {
+		$result = $connection->query('SELECT table_name "Name" FROM all_tables' . ($name != "" ? ' WHERE table_name = ' . $connection->quote($name) : ''));
+		while ($row = $result->fetch_assoc()) {
 			if ($name != "") {
 				return $row;
 			}
@@ -195,35 +197,35 @@ UNION SELECT view_name, 'view' FROM user_views" . ($name != "" ? " WHERE view_na
 		return $return;
 	}
 
-	function is_view($table_status) {
-		return $table_status["Engine"] == "view";
-	}
-	
 	function fk_support($table_status) {
 		return true;
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . " ORDER BY column_id") as $row) {
-			$type = $row["DATA_TYPE"];
-			$length = "$row[DATA_PRECISION],$row[DATA_SCALE]";
-			if ($length == ",") {
-				$length = $row["DATA_LENGTH"];
-			} //! int
-			$return[$row["COLUMN_NAME"]] = array(
-				"field" => $row["COLUMN_NAME"],
-				"full_type" => $type . ($length ? "($length)" : ""),
-				"type" => strtolower($type),
-				"length" => $length,
-				"default" => $row["DATA_DEFAULT"],
-				"null" => ($row["NULLABLE"] == "Y"),
-				//! "auto_increment" => false,
-				//! "collation" => $row["CHARACTER_SET_NAME"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
-				//! "comment" => $row["Comment"],
-				//! "primary" => ($row["Key"] == "PRI"),
-			);
+		$result = $connection->query("SELECT * FROM all_tab_columns WHERE table_name = " . $connection->quote($table) . " ORDER BY column_id");
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				$type = $row["DATA_TYPE"];
+				$length = "$row[DATA_PRECISION],$row[DATA_SCALE]";
+				if ($length == ",") {
+					$length = $row["DATA_LENGTH"];
+				} //! int
+				$return[$row["COLUMN_NAME"]] = array(
+					"field" => $row["COLUMN_NAME"],
+					"full_type" => $type . ($length ? "($length)" : ""),
+					"type" => strtolower($type),
+					"length" => $length,
+					"default" => $row["DATA_DEFAULT"],
+					"null" => ($row["NULLABLE"] == "Y"),
+					//! "auto_increment" => false,
+					//! "collation" => $row["CHARACTER_SET_NAME"],
+					"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+					//! "comment" => $row["Comment"],
+					//! "primary" => ($row["Key"] == "PRI"),
+				);
+			}
 		}
 		return $return;
 	}
@@ -232,11 +234,6 @@ UNION SELECT view_name, 'view' FROM user_views" . ($name != "" ? " WHERE view_na
 		return array(); //!
 	}
 
-	function view($name) {
-		$rows = get_rows('SELECT text "select" FROM user_views WHERE view_name = ' . q($name));
-		return reset($rows);
-	}
-	
 	function collations() {
 		return array(); //!
 	}
@@ -251,12 +248,12 @@ UNION SELECT view_name, 'view' FROM user_views" . ($name != "" ? " WHERE view_na
 	}
 	
 	function exact_value($val) {
-		return q($val);
+		global $connection;
+		return $connection->quote($val);
 	}
 	
 	function explain($connection, $query) {
-		$connection->query("EXPLAIN PLAN FOR $query");
-		return $connection->query("SELECT * FROM plan_table");
+		//!
 	}
 	
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
@@ -321,17 +318,8 @@ UNION SELECT view_name, 'view' FROM user_views" . ($name != "" ? " WHERE view_na
 		return true;
 	}
 	
-	function show_variables() {
-		return get_key_vals('SELECT name, display_value FROM v$parameter');
-	}
-	
-	function show_status() {
-		$rows = get_rows('SELECT * FROM v$instance');
-		return reset($rows);
-	}
-	
 	function support($feature) {
-		return ereg("view|drop_col|variables|status", $feature); //!
+		return ereg("drop_col", $feature); //!
 	}
 	
 	$jush = "oracle";

adminer/drivers/pgsql.inc.php

@@ -1,8 +1,11 @@
 <?php
-$drivers["pgsql"] = "PostgreSQL";
+$possible_drivers[] = "PgSQL";
+$possible_drivers[] = "PDO_PgSQL";
+if (extension_loaded("pgsql") || extension_loaded("pdo_pgsql")) {
+	$drivers["pgsql"] = "PostgreSQL";
+}
 
 if (isset($_GET["pgsql"])) {
-	$possible_drivers = array("PgSQL", "PDO_PgSQL");
 	define("DRIVER", "pgsql");
 	if (extension_loaded("pgsql")) {
 		class Min_DB {
@@ -19,11 +22,11 @@ if (isset($_GET["pgsql"])) {
 			function connect($server, $username, $password) {
 				set_error_handler(array($this, '_error'));
 				$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
-				$this->_link = @pg_connect($this->_string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : " dbname='template1'"), PGSQL_CONNECT_FORCE_NEW);
+				$this->_link = @pg_connect($this->_string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : ""), PGSQL_CONNECT_FORCE_NEW);
 				if (!$this->_link && DB != "") {
 					// try to connect directly with database for performance
 					$this->_database = false;
-					$this->_link = @pg_connect("$this->_string dbname='template1'", PGSQL_CONNECT_FORCE_NEW);
+					$this->_link = @pg_connect($this->_string, PGSQL_CONNECT_FORCE_NEW);
 				}
 				restore_error_handler();
 				if ($this->_link) {
@@ -42,7 +45,7 @@ if (isset($_GET["pgsql"])) {
 				if ($database == DB) {
 					return $this->_database;
 				}
-				$return = @pg_connect("$this->_string dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
+				$return = @pg_connect($this->_connection . " dbname='" . addcslashes($database, "'\\") . "'", PGSQL_CONNECT_FORCE_NEW);
 				if ($return) {
 					$this->_link = $return;
 				}
@@ -50,7 +53,7 @@ if (isset($_GET["pgsql"])) {
 			}
 			
 			function close() {
-				$this->_link = @pg_connect("$this->_string dbname='template1'");
+				$this->_link = @pg_connect($this->_string);
 			}
 			
 			function query($query, $unbuffered = false) {
@@ -187,6 +190,7 @@ if (isset($_GET["pgsql"])) {
 	}
 	
 	function tables_list() {
+		global $connection;
 		return get_key_vals("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema() ORDER BY table_name");
 	}
 	
@@ -195,47 +199,46 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function table_status($name = "") {
+		global $connection;
 		$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\"
-FROM pg_class
+		$result = $connection->query("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\", pg_catalog.obj_description(oid, 'pg_class') AS \"Comment\"
+FROM pg_catalog.pg_class
 WHERE relkind IN ('r','v')
 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())"
-			. ($name != "" ? " AND relname = " . q($name) : "")
-		) as $row) { //! Index_length, Auto_increment
+			. ($name != "" ? " AND relname = " . $connection->quote($name) : "")
+		); //! Index_length, Auto_increment
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["Name"]] = $row;
 		}
 		return ($name != "" ? $return[$name] : $return);
 	}
 	
-	function is_view($table_status) {
-		return $table_status["Engine"] == "view";
-	}
-	
 	function fk_support($table_status) {
 		return true;
 	}
 	
 	function fields($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, d.adsrc AS default, a.attnotnull, col_description(c.oid, a.attnum) AS comment
-FROM pg_class c
-JOIN pg_namespace n ON c.relnamespace = n.oid
-JOIN pg_attribute a ON c.oid = a.attrelid
-LEFT JOIN pg_attrdef d ON c.oid = d.adrelid AND a.attnum = d.adnum
-WHERE c.relname = " . q($table) . "
-AND n.nspname = current_schema()
-AND NOT a.attisdropped
-AND a.attnum > 0
-ORDER BY a.attnum"
-		) as $row) {
-			//! collation, primary
-			ereg('(.*)(\\((.*)\\))?', $row["full_type"], $match);
-			list(, $row["type"], , $row["length"]) = $match;
-			$row["full_type"] = $row["type"] . ($row["length"] ? "($row[length])" : "");
-			$row["null"] = ($row["attnotnull"] == "f");
-			$row["auto_increment"] = eregi("^nextval\\(", $row["default"]);
-			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
-			$return[$row["field"]] = $row;
+		$table_oid = $connection->result("SELECT oid FROM pg_class WHERE relname = " . $connection->quote($table));
+		$result = $connection->query("SELECT *, col_description($table_oid, ordinal_position) AS comment FROM information_schema.columns WHERE table_name = " . $connection->quote($table) . " ORDER BY ordinal_position");
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				$length = $row["character_maximum_length"];
+				$return[$row["column_name"]] = array(
+					"field" => $row["column_name"],
+					"full_type" => $row["data_type"] . ($length ? "($length)" : ""),
+					"type" => $row["data_type"],
+					"length" => $length,
+					"default" => $row["column_default"],
+					"null" => ($row["is_nullable"] == "YES"),
+					"auto_increment" => eregi("^nextval\\(", $row["column_default"]),
+					"collation" => $row["collation_name"],
+					"privileges" => array("insert" => 1, "select" => 1, "update" => 1), //! is_updatable
+					"primary" => false, //!
+					"comment" => $row["comment"],
+				);
+			}
 		}
 		return $return;
 	}
@@ -246,9 +249,10 @@ 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 relname = " . $connection2->quote($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) {
+		$result = $connection2->query("SELECT relname, indisunique, indisprimary, indkey FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid");
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["relname"]]["type"] = ($row["indisprimary"] == "t" ? "PRIMARY" : ($row["indisunique"] == "t" ? "UNIQUE" : "INDEX"));
 			$return[$row["relname"]]["columns"] = array();
 			foreach (explode(" ", $row["indkey"]) as $indkey) {
@@ -260,14 +264,15 @@ ORDER BY a.attnum"
 	}
 	
 	function foreign_keys($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT tc.constraint_name, kcu.column_name, rc.update_rule AS on_update, rc.delete_rule AS on_delete, ccu.table_name AS table, ccu.column_name AS ref
+		$result = $connection->query("SELECT tc.constraint_name, kcu.column_name, rc.update_rule AS on_update, rc.delete_rule AS on_delete, ccu.table_name AS table, ccu.column_name AS ref
 FROM information_schema.table_constraints tc
 LEFT JOIN information_schema.key_column_usage kcu USING (constraint_catalog, constraint_schema, constraint_name)
 LEFT JOIN information_schema.referential_constraints rc USING (constraint_catalog, constraint_schema, constraint_name)
 LEFT JOIN information_schema.constraint_column_usage ccu ON rc.unique_constraint_catalog = ccu.constraint_catalog AND rc.unique_constraint_schema = ccu.constraint_schema AND rc.unique_constraint_name = ccu.constraint_name
-WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! there can be more unique_constraint_name
-			) as $row) {
+WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . $connection->quote($table)); //! there can be more unique_constraint_name
+		while ($row = $result->fetch_assoc()) {
 			$foreign_key = &$return[$row["constraint_name"]];
 			if (!$foreign_key) {
 				$foreign_key = $row;
@@ -280,7 +285,7 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 	
 	function view($name) {
 		global $connection;
-		return array("select" => $connection->result("SELECT pg_get_viewdef(" . q($name) . ")"));
+		return array("select" => $connection->result("SELECT pg_get_viewdef(" . $connection->quote($name) . ")"));
 	}
 	
 	function collations() {
@@ -302,7 +307,8 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 	}
 	
 	function exact_value($val) {
-		return q($val);
+		global $connection;
+		return $connection->quote($val);
 	}
 	
 	function create_database($db, $collation) {
@@ -325,6 +331,7 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 	}
 	
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
 		$alter = array();
 		$queries = array();
 		foreach ($fields as $field) {
@@ -365,10 +372,10 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
 		}
 		if ($table != "" || $comment != "") {
-			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
+			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . $connection->quote($comment);
 		}
 		if ($auto_increment != "") {
-			//! $queries[] = "SELECT setval(pg_get_serial_sequence(" . q($name) . ", ), $auto_increment)";
+			//! $queries[] = "SELECT setval(pg_get_serial_sequence(" . $connection->quote($name) . ", ), $auto_increment)";
 		}
 		foreach ($queries as $query) {
 			if (!queries($query)) {
@@ -423,13 +430,16 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 	}
 	
 	function trigger($name) {
-		$rows = get_rows('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . q($_GET["trigger"]) . ' AND trigger_name = ' . q($name));
-		return reset($rows);
+		global $connection;
+		$result = $connection->query('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . $connection->quote($_GET["trigger"]) . ' AND trigger_name = ' . $connection->quote($name));
+		return $result->fetch_assoc();
 	}
 	
 	function triggers($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE event_object_table = " . q($table)) as $row) {
+		$result = $connection->query("SELECT * FROM information_schema.triggers WHERE event_object_table = " . $connection->quote($table));
+		while ($row = $result->fetch_assoc()) {
 			$return[$row["trigger_name"]] = array($row["condition_timing"], $row["event_manipulation"]);
 		}
 		return $return;
@@ -450,21 +460,6 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}
 	
-	function insert_update($table, $set, $primary) {
-		global $connection;
-		$update = array();
-		$where = array();
-		foreach ($set as $key => $val) {
-			$update[] = "$key = $val";
-			if (isset($primary[idf_unescape($key)])) {
-				$where[] = "$key = $val";
-			}
-		}
-		return ($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-			|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
-		;
-	}
-	
 	function last_id() {
 		return 0; // there can be several sequences
 	}
@@ -473,15 +468,6 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . q($table) //! t
 		return $connection->query("EXPLAIN $query");
 	}
 	
-	function types() {
-		return get_vals("SELECT typname
-FROM pg_type
-WHERE typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
-AND typtype IN ('b','d','e')
-AND typelem = 0"
-		);
-	}
-	
 	function schemas() {
 		return get_vals("SELECT nspname FROM pg_namespace");
 	}
@@ -492,15 +478,8 @@ AND typelem = 0"
 	}
 	
 	function set_schema($schema) {
-		global $connection, $types, $structured_types;
-		$return = $connection->query("SET search_path TO " . idf_escape($schema));
-		foreach (types() as $type) { //! get types from current_schemas('t')
-			if (!isset($types[$type])) {
-				$types[$type] = 0;
-				$structured_types[lang('User types')][] = $type;
-			}
-		}
-		return $return;
+		global $connection;
+		return $connection->query("SET search_path TO " . idf_escape($schema));
 	}
 	
 	function use_sql($database) {
@@ -511,11 +490,8 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 	
-	function show_status() {
-	}
-	
 	function support($feature) {
-		return ereg('^(comment|view|scheme|sequence|trigger|type|variables|drop_col)$', $feature); //! routine|
+		return ereg('^(comment|view|scheme|sequence|trigger|variables|drop_col)$', $feature); //! routine|
 	}
 	
 	$jush = "pgsql";
@@ -528,7 +504,7 @@ AND typelem = 0"
 		lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
 		lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
 		lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
-	) as $key => $val) { //! can be retrieved from pg_type
+	) as $key => $val) {
 		$types += $val;
 		$structured_types[$key] = array_keys($val);
 	}

adminer/drivers/sqlite.inc.php

@@ -1,83 +1,18 @@
 <?php
-$drivers["sqlite"] = "SQLite 3";
-$drivers["sqlite2"] = "SQLite 2";
+$possible_drivers[] = "SQLite";
+$possible_drivers[] = "SQLite3";
+$possible_drivers[] = "PDO_SQLite";
+if (extension_loaded("sqlite3") || extension_loaded("pdo_sqlite")) {
+	$drivers["sqlite"] = "SQLite 3";
+}
+if (extension_loaded("sqlite") || extension_loaded("pdo_sqlite")) {
+	$drivers["sqlite2"] = "SQLite 2";
+}
 
 if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
-	$possible_drivers = array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite");
 	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
-	if (extension_loaded(isset($_GET["sqlite"]) ? "sqlite3" : "sqlite")) {
-		if (isset($_GET["sqlite"])) {
-			
-			class Min_SQLite {
-				var $extension = "SQLite3", $server_info, $affected_rows, $error, $_link;
-				
-				function Min_SQLite($filename) {
-					$this->_link = new SQLite3($filename);
-					$version = $this->_link->version();
-					$this->server_info = $version["versionString"];
-				}
-				
-				function query($query) {
-					$result = @$this->_link->query($query);
-					if (!$result) {
-						$this->error = $this->_link->lastErrorMsg();
-						return false;
-					} elseif ($result->numColumns()) {
-						return new Min_Result($result);
-					}
-					$this->affected_rows = $this->_link->changes();
-					return true;
-				}
-				
-				function quote($string) {
-					return "'" . $this->_link->escapeString($string) . "'";
-				}
-				
-				function store_result() {
-					return $this->_result;
-				}
-				
-				function result($query, $field = 0) {
-					$result = $this->query($query);
-					if (!is_object($result)) {
-						return false;
-					}
-					$row = $result->_result->fetchArray();
-					return $row[$field];
-				}
-			}
-			
-			class Min_Result {
-				var $_result, $_offset = 0, $num_rows;
-				
-				function Min_Result($result) {
-					$this->_result = $result;
-				}
-				
-				function fetch_assoc() {
-					return $this->_result->fetchArray(SQLITE3_ASSOC);
-				}
-				
-				function fetch_row() {
-					return $this->_result->fetchArray(SQLITE3_NUM);
-				}
-				
-				function fetch_field() {
-					$column = $this->_offset++;
-					$type = $this->_result->columnType($column);
-					return (object) array(
-						"name" => $this->_result->columnName($column),
-						"type" => $type,
-						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
-					);
-				}
-				
-				function __desctruct() {
-					return $this->_result->finalize();
-				}
-			}
-			
-		} else {
+	if (extension_loaded(isset($_GET["sqlite2"]) ? "sqlite" : "sqlite3")) {
+		if (isset($_GET["sqlite2"])) {
 			
 			class Min_SQLite {
 				var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
@@ -104,10 +39,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					return "'" . sqlite_escape_string($string) . "'";
 				}
 				
-				function store_result() {
-					return $this->_result;
-				}
-				
 				function result($query, $field = 0) {
 					$result = $this->query($query);
 					if (!is_object($result)) {
@@ -160,6 +91,74 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				
 			}
 			
+		} else {
+			
+			class Min_SQLite {
+				var $extension = "SQLite3", $server_info, $affected_rows, $error, $_link;
+				
+				function Min_SQLite($filename) {
+					$this->_link = new SQLite3($filename);
+					$version = $this->_link->version();
+					$this->server_info = $version["versionString"];
+				}
+				
+				function query($query) {
+					$result = @$this->_link->query($query);
+					if (!$result) {
+						$this->error = $this->_link->lastErrorMsg();
+						return false;
+					} elseif ($result->numColumns()) {
+						return new Min_Result($result);
+					}
+					$this->affected_rows = $this->_link->changes();
+					return true;
+				}
+				
+				function quote($string) {
+					return "'" . $this->_link->escapeString($string) . "'";
+				}
+				
+				function result($query, $field = 0) {
+					$result = $this->query($query);
+					if (!is_object($result)) {
+						return false;
+					}
+					$row = $result->_result->fetchArray();
+					return $row[$field];
+				}
+			}
+			
+			class Min_Result {
+				var $_result, $_offset = 0, $num_rows;
+				
+				function Min_Result($result) {
+					$this->_result = $result;
+					$this->num_rows = 1; //!
+				}
+				
+				function fetch_assoc() {
+					return $this->_result->fetchArray(SQLITE3_ASSOC);
+				}
+				
+				function fetch_row() {
+					return $this->_result->fetchArray(SQLITE3_NUM);
+				}
+				
+				function fetch_field() {
+					$column = $this->_offset++;
+					$type = $this->_result->columnType($column);
+					return (object) array(
+						"name" => $this->_result->columnName($column),
+						"type" => $type,
+						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
+					);
+				}
+				
+				function __desctruct() {
+					return $this->_result->finalize();
+				}
+			}
+			
 		}
 		
 	} elseif (extension_loaded("pdo_sqlite")) {
@@ -191,6 +190,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return $this->_result = $this->query($query);
 		}
 		
+		function store_result() {
+			return $this->_result;
+		}
+		
 		function next_result() {
 			return false;
 		}
@@ -235,7 +238,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') ORDER BY (name = 'sqlite_sequence'), name", 1);
+		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view')", 1);
 	}
 
 	function count_tables($databases) {
@@ -243,46 +246,52 @@ 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) {
+		$result = $connection->query("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . $connection->quote($name) : ""));
+		while ($row = $result->fetch_assoc()) {
 			$row["Auto_increment"] = "";
 			$return[$row["Name"]] = $row;
 		}
-		foreach (get_rows("SELECT * FROM sqlite_sequence", null, "") as $row) {
-			$return[$row["name"]]["Auto_increment"] = $row["seq"];
+		$result = $connection->query("SELECT * FROM sqlite_sequence");
+		if ($result) {
+			while ($row = $result->fetch_assoc()) {
+				$return[$row["name"]]["Auto_increment"] = $row["seq"];
+			}
 		}
 		return ($name != "" ? $return[$name] : $return);
 	}
 
-	function is_view($table_status) {
-		return $table_status["Engine"] == "view";
-	}
-	
 	function fk_support($table_status) {
 		global $connection;
 		return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
-			$type = strtolower($row["type"]);
-			$default = $row["dflt_value"];
-			$return[$row["name"]] = array(
-				"field" => $row["name"],
-				"type" => (eregi("int", $type) ? "integer" : (eregi("char|clob|text", $type) ? "text" : (eregi("blob", $type) ? "blob" : (eregi("real|floa|doub", $type) ? "real" : "numeric")))),
-				"full_type" => $type,
-				"default" => (ereg("'(.*)'", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
-				"null" => !$row["notnull"],
-				"auto_increment" => eregi('^integer$', $type) && $row["pk"], //! possible false positive
-				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
-				"primary" => $row["pk"],
-			);
+		$result = $connection->query("PRAGMA table_info(" . table($table) . ")");
+		if (is_object($result)) {
+			while ($row = $result->fetch_assoc()) {
+				$type = strtolower($row["type"]);
+				$return[$row["name"]] = array(
+					"field" => $row["name"],
+					"type" => (eregi("int", $type) ? "integer" : (eregi("char|clob|text", $type) ? "text" : (eregi("blob", $type) ? "blob" : (eregi("real|floa|doub", $type) ? "real" : "numeric")))),
+					"full_type" => $type,
+					"default" => $row["dflt_value"],
+					"null" => !$row["notnull"],
+					"auto_increment" => eregi('^integer$', $type) && $row["pk"], //! possible false positive
+					"collation" => null, //!
+					"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
+					"primary" => $row["pk"],
+				);
+			}
 		}
 		return $return;
 	}
 
 	function indexes($table, $connection2 = null) {
+		global $connection;
 		$return = array();
 		$primary = array();
 		foreach (fields($table) as $field) {
@@ -293,33 +302,41 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if ($primary) {
 			$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"];
+		$result = $connection->query("PRAGMA index_list(" . table($table) . ")");
+		if (is_object($result)) {
+			while ($row = $result->fetch_assoc()) {
+				$return[$row["name"]]["type"] = ($row["unique"] ? "UNIQUE" : "INDEX");
+				$return[$row["name"]]["lengths"] = array();
+				$result1 = $connection->query("PRAGMA index_info(" . idf_escape($row["name"]) . ")");
+				while ($row1 = $result1->fetch_assoc()) {
+					$return[$row["name"]]["columns"][] = $row1["name"];
+				}
 			}
 		}
 		return $return;
 	}
 
 	function foreign_keys($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("PRAGMA foreign_key_list(" . table($table) . ")") as $row) {
-			$foreign_key = &$return[$row["id"]];
-			//! idf_unescape in SQLite2
-			if (!$foreign_key) {
-				$foreign_key = $row;
+		$result = $connection->query("PRAGMA foreign_key_list(" . table($table) . ")");
+		if (is_object($result)) {
+			while ($row = $result->fetch_assoc()) {
+				$foreign_key = &$return[$row["id"]];
+				//! idf_unescape in SQLite2
+				if (!$foreign_key) {
+					$foreign_key = $row;
+				}
+				$foreign_key["source"][] = $row["from"];
+				$foreign_key["target"][] = $row["to"];
 			}
-			$foreign_key["source"][] = $row["from"];
-			$foreign_key["target"][] = $row["to"];
 		}
 		return $return;
 	}
 
 	function view($name) {
 		global $connection;
-		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)))); //! identifiers may be inside []
+		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . $connection->quote($name)))); //! identifiers may be inside []
 	}
 
 	function collations() {
@@ -336,29 +353,16 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 	
 	function exact_value($val) {
-		return q($val);
-	}
-	
-	function check_sqlite_name($name) {
-		// avoid creating PHP files on unsecured servers
 		global $connection;
-		$extensions = "db|sdb|sqlite";
-		if (!preg_match("~^[^\\0]*\\.($extensions)\$~", $name)) {
-			$connection->error = lang('Please use one of the extensions %s.', str_replace("|", ", ", $extensions));
-			return false;
-		}
-		return true;
+		return $connection->quote($val);
 	}
-	
+
 	function create_database($db, $collation) {
 		global $connection;
 		if (file_exists($db)) {
 			$connection->error = lang('File exists.');
 			return false;
 		}
-		if (!check_sqlite_name($db)) {
-			return false;
-		}
 		$link = new Min_SQLite($db); //! exception handler
 		$link->query('PRAGMA encoding = "UTF-8"');
 		$link->query('CREATE TABLE adminer (i)'); // otherwise creates empty file
@@ -380,9 +384,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	
 	function rename_database($name, $collation) {
 		global $connection;
-		if (!check_sqlite_name($name)) {
-			return false;
-		}
 		$connection->Min_SQLite(":memory:");
 		$connection->error = lang('File exists.');
 		return @rename(DB, $name);
@@ -393,6 +394,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 	
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
 		$alter = array();
 		foreach ($fields as $field) {
 			if ($field[1]) {
@@ -413,14 +415,14 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return false;
 		}
 		if ($auto_increment) {
-			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
+			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . $connection->quote($name)); // ignores error
 		}
 		return true;
 	}
 	
 	function alter_indexes($table, $alter) {
 		foreach ($alter as $val) {
-			if (!queries(($val[2] ? "DROP INDEX" : "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)) . " $val[1]")) {
+			if (!queries(($val[2] ? "DROP INDEX" : "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)) . " $val[1]")) { //! primary key must be created in CREATE TABLE
 				return false;
 			}
 		}
@@ -445,13 +447,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	
 	function trigger($name) {
 		global $connection;
-		preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*([a-z]+)\\s+([a-z]+)\\s+ON\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(?:FOR\\s*EACH\\s*ROW\\s)?(.*)~is', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)), $match);
+		preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*([a-z]+)\\s+([a-z]+)\\s+ON\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(?:FOR\\s*EACH\\s*ROW\\s)?(.*)~is', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . $connection->quote($name)), $match);
 		return array("Timing" => strtoupper($match[1]), "Event" => strtoupper($match[2]), "Trigger" => $name, "Statement" => $match[3]);
 	}
 	
 	function triggers($table) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT * FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)) as $row) {
+		$result = $connection->query("SELECT * FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . $connection->quote($table));
+		while ($row = $result->fetch_assoc()) {
 			preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*([a-z]+)\\s*([a-z]+)~i', $row["sql"], $match);
 			$return[$row["name"]] = array($match[1], $match[2]);
 		}
@@ -481,10 +485,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
 	}
 	
-	function insert_update($table, $set, $primary) {
-		return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")");
-	}
-	
 	function last_id() {
 		global $connection;
 		return $connection->result("SELECT LAST_INSERT_ROWID()");
@@ -494,10 +494,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return $connection->query("EXPLAIN $query");
 	}
 	
-	function types() {
-		return array();
-	}
-	
 	function schemas() {
 		return array();
 	}
@@ -510,20 +506,19 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return true;
 	}
 	
-	function create_sql($table, $auto_increment) {
+	function create_sql($table) {
 		global $connection;
-		return $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
-	}
-	
-	function truncate_sql($table) {
-		return "DELETE FROM " . table($table);
+		return $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . $connection->quote($table));
 	}
 	
 	function use_sql($database) {
+		global $connection;
+		return "ATTACH " . $connection->quote($database) . " AS " . idf_escape($database);
 	}
 	
 	function trigger_sql($table, $style) {
-		return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . q($table)));
+		global $connection;
+		return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . $connection->quote($table)));
 	}
 	
 	function show_variables() {
@@ -545,7 +540,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 	
 	function support($feature) {
-		return ereg('^(view|trigger|variables|status|dump)$', $feature);
+		return ereg('^(view|trigger|variables|status)$', $feature);
 	}
 	
 	$jush = "sqlite";

adminer/dump.inc.php

@@ -7,14 +7,13 @@ if ($_POST) {
 		$cookie .= "&$key=" . urlencode($_POST[$key]);
 	}
 	cookie("adminer_export", substr($cookie, 1));
-	$ext = $adminer->dumpHeaders(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
-	$is_sql = ($_POST["format"] == "sql");
-	if ($is_sql) {
+	$ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
+	if ($_POST["format"] == "sql") {
 		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
 
 " . ($jush != "sql" ? "" : "SET NAMES utf8;
 SET foreign_key_checks = 0;
-SET time_zone = " . q($connection->result("SELECT @@time_zone")) . ";
+SET time_zone = " . $connection->quote($connection->result("SELECT @@time_zone")) . ";
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 
 ");
@@ -30,13 +29,13 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 	}
 	foreach ((array) $databases as $db) {
 		if ($connection->select_db($db)) {
-			if ($is_sql && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+			if ($_POST["format"] == "sql" && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
 				if ($style == "DROP+CREATE") {
 					echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
 				}
 				echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n";
 			}
-			if ($is_sql) {
+			if ($_POST["format"] == "sql") {
 				if ($style) {
 					echo use_sql($db) . ";\n\n";
 				}
@@ -46,16 +45,20 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 				$out = "";
 				if ($_POST["routines"]) {
 					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
-						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
+						$result = $connection->query("SHOW $routine STATUS WHERE Db = " . $connection->quote($db));
+						while ($row = $result->fetch_assoc()) {
 							$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";
 						}
 					}
 				}
 				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";
+					$result = $connection->query("SHOW EVENTS");
+					if ($result) {
+						while ($row = $result->fetch_assoc()) {
+							$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";
+						}
 					}
 				}
 				if ($out) {
@@ -69,15 +72,15 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 					$table = (DB == "" || in_array($row["Name"], (array) $_POST["tables"]));
 					$data = (DB == "" || in_array($row["Name"], (array) $_POST["data"]));
 					if ($table || $data) {
-						if (!is_view($row)) {
+						if (isset($row["Engine"])) {
 							if ($ext == "tar") {
 								ob_start();
 							}
-							$adminer->dumpTable($row["Name"], ($table ? $_POST["table_style"] : ""));
+							dump_table($row["Name"], ($table ? $_POST["table_style"] : ""));
 							if ($data) {
-								$adminer->dumpData($row["Name"], $_POST["data_style"], "SELECT * FROM " . table($row["Name"]));
+								dump_data($row["Name"], $_POST["data_style"]);
 							}
-							if ($is_sql && $_POST["triggers"]) {
+							if ($_POST["format"] == "sql" && $_POST["triggers"]) {
 								$triggers = trigger_sql($row["Name"], $_POST["table_style"]);
 								if ($triggers) {
 									echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
@@ -85,23 +88,23 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 							}
 							if ($ext == "tar") {
 								echo tar_file((DB != "" ? "" : "$db/") . "$row[Name].csv", ob_get_clean());
-							} elseif ($is_sql) {
+							} elseif ($_POST["format"] == "sql") {
 								echo "\n";
 							}
-						} elseif ($is_sql) {
+						} elseif ($_POST["format"] == "sql") {
 							$views[] = $row["Name"];
 						}
 					}
 				}
 				foreach ($views as $view) {
-					$adminer->dumpTable($view, $_POST["table_style"], true);
+					dump_table($view, $_POST["table_style"], true);
 				}
 				if ($ext == "tar") {
 					echo pack("x512");
 				}
 			}
 			
-			if ($style == "CREATE+ALTER" && $is_sql) {
+			if ($style == "CREATE+ALTER" && $_POST["format"] == "sql") {
 				// drop old tables
 				$query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()";
 				echo "DELIMITER ;;
@@ -116,10 +119,11 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
 		FETCH tables INTO _table_name, _engine, _table_collation, _table_comment;
 		IF NOT done THEN
 			CASE _table_name";
-				foreach (get_rows($query) as $row) {
-					$comment = q($row["ENGINE"] == "InnoDB" ? preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["TABLE_COMMENT"]) : $row["TABLE_COMMENT"]);
+				$result = $connection->query($query);
+				while ($row = $result->fetch_assoc()) {
+					$comment = $connection->quote($row["ENGINE"] == "InnoDB" ? preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["TABLE_COMMENT"]) : $row["TABLE_COMMENT"]);
 					echo "
-				WHEN " . q($row["TABLE_NAME"]) . " THEN
+				WHEN " . $connection->quote($row["TABLE_NAME"]) . " THEN
 					" . (isset($row["ENGINE"]) ? "IF _engine != '$row[ENGINE]' OR _table_collation != '$row[TABLE_COLLATION]' OR _table_comment != $comment THEN
 						ALTER TABLE " . idf_escape($row["TABLE_NAME"]) . " ENGINE=$row[ENGINE] COLLATE=$row[TABLE_COLLATION] COMMENT=$comment;
 					END IF" : "BEGIN END") . ";";
@@ -137,14 +141,11 @@ CALL adminer_alter(@adminer_alter);
 DROP PROCEDURE adminer_alter;
 ";
 			}
-			if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $is_sql) {
+			if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $_POST["format"] == "sql") {
 				echo "SELECT @adminer_alter;\n";
 			}
 		}
 	}
-	if ($is_sql) {
-		echo "-- " . $connection->result("SELECT NOW()") . "\n";
-	}
 	exit;
 }
 
@@ -156,25 +157,23 @@ page_header(lang('Export'), "", ($_GET["export"] != "" ? array("table" => $_GET[
 <?php
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
-$data_style = array('', 'TRUNCATE+INSERT', 'INSERT');
+$data_style = array('', 'TRUNCATE+INSERT', 'INSERT', 'INSERT+UPDATE');
 if ($jush == "sql") {
 	$db_style[] = 'CREATE+ALTER';
 	$table_style[] = 'CREATE+ALTER';
-	$data_style[] = 'INSERT+UPDATE';
 }
 parse_str($_COOKIE["adminer_export"], $row);
 if (!$row) {
 	$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
 }
 $checked = ($_GET["dump"] == "");
-echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
-echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
-echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
+echo "<tr><th>" . lang('Output') . "<td>" . $adminer->dumpOutput(0, $row["output"]) . "\n";
+echo "<tr><th>" . lang('Format') . "<td>" . $adminer->dumpFormat(0, $row["format"]) . "\n";
+echo "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
 	. (support("routine") ? checkbox("routines", 1, $checked, lang('Routines')) : "")
 	. (support("event") ? checkbox("events", 1, $checked, lang('Events')) : "")
-);
+;
 echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_style, $row["table_style"])
-	. checkbox("auto_increment", 1, $row["table_style"], lang('Auto Increment'))
 	. (support("trigger") ? checkbox("triggers", 1, $row["table_style"], lang('Triggers')) : "")
 ;
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
@@ -198,7 +197,7 @@ if (DB != "") {
 		$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');");
-		if (is_view($row)) {
+		if (eregi("view", $row["Engine"])) {
 			$views .= "$print\n";
 		} else {
 			echo "$print<td align='right'><label>" . ($row["Engine"] == "InnoDB" && $row["Rows"] ? "~ " : "") . $row["Rows"] . checkbox("data[]", $name, $checked, "", "formUncheck('check-data');") . "</label>\n";
@@ -218,7 +217,7 @@ if (DB != "") {
 			}
 		}
 	} else {
-		echo "<tr><td><textarea name='databases' rows='10' cols='20' onkeydown='return textareaKeydown(this, event);'></textarea>";
+		echo "<tr><td><textarea name='databases' rows='10' cols='20'></textarea>";
 	}
 }
 ?>

adminer/edit.inc.php

@@ -16,7 +16,7 @@ if ($_POST && !$error && !isset($_GET["select"])) {
 		$location = ME . "select=" . urlencode($TABLE);
 	}
 	if (isset($_POST["delete"])) {
-		query_redirect("DELETE" . limit1("FROM " . table($TABLE), " WHERE $where"), $location, lang('Item has been deleted.'));
+		query_redirect("DELETE" . limit1("FROM " . table($TABLE), $where), $location, lang('Item has been deleted.'));
 	} else {
 		$set = array();
 		foreach ($fields as $name => $field) {
@@ -58,8 +58,11 @@ if ($_POST["save"]) {
 	}
 	$row = array();
 	if ($select) {
-		$rows = get_rows("SELECT" . limit(implode(", ", $select) . " FROM " . table($TABLE), " WHERE $where", (isset($_GET["select"]) ? 2 : 1)));
-		$row = (isset($_GET["select"]) && count($rows) != 1 ? null : reset($rows));
+		$result = $connection->query("SELECT" . limit(implode(", ", $select) . " FROM " . table($TABLE), " WHERE $where", (isset($_GET["select"]) ? 2 : 1)));
+		$row = $result->fetch_assoc();
+		if (isset($_GET["select"]) && $result->fetch_assoc()) {
+			$row = null;
+		}
 	}
 }
 ?>
@@ -72,7 +75,7 @@ if ($fields) {
 		echo "<tr><th>" . $adminer->fieldName($field);
 		$default = $_GET["set"][bracket_escape($name)];
 		$value = (isset($row)
-			? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? +$row[$name] : $row[$name])
+			? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? intval($row[$name]) : $row[$name])
 			: (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : (isset($default) ? $default : $field["default"])))
 		);
 		if (!$_POST["save"] && is_string($value)) {
@@ -100,11 +103,11 @@ if (isset($_GET["select"])) {
 if ($fields) {
 	echo "<input type='submit' value='" . lang('Save') . "'>\n";
 	if (!isset($_GET["select"])) {
-		echo '<input type="submit" name="insert" value="' . ($update ? lang('Save and continue edit') : lang('Save and insert next')) . "\">\n";
+		echo "<input type='submit' name='insert' value='" . ($update ? lang('Save and continue edit') : lang('Save and insert next')) . "'>\n";
 	}
 }
 if ($update) {
-	echo "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='delete' value='" . lang('Delete') . "'$confirm>\n";
 }
 ?>
 </form>

adminer/event.inc.php

@@ -8,17 +8,17 @@ if ($_POST && !$error) {
 		query_redirect("DROP EVENT " . idf_escape($EVENT), substr(ME, 0, -1), lang('Event has been dropped.'));
 	} elseif (in_array($_POST["INTERVAL_FIELD"], $intervals) && isset($statuses[$_POST["STATUS"]])) {
 		$schedule = "\nON SCHEDULE " . ($_POST["INTERVAL_VALUE"]
-			? "EVERY " . q($_POST["INTERVAL_VALUE"]) . " $_POST[INTERVAL_FIELD]"
-			. ($_POST["STARTS"] ? " STARTS " . q($_POST["STARTS"]) : "")
-			. ($_POST["ENDS"] ? " ENDS " . q($_POST["ENDS"]) : "") //! ALTER EVENT doesn't drop ENDS - MySQL bug #39173
-			: "AT " . q($_POST["STARTS"])
+			? "EVERY " . $connection->quote($_POST["INTERVAL_VALUE"]) . " $_POST[INTERVAL_FIELD]"
+			. ($_POST["STARTS"] ? " STARTS " . $connection->quote($_POST["STARTS"]) : "")
+			. ($_POST["ENDS"] ? " ENDS " . $connection->quote($_POST["ENDS"]) : "") //! ALTER EVENT doesn't drop ENDS - MySQL bug #39173
+			: "AT " . $connection->quote($_POST["STARTS"])
 			) . " ON COMPLETION" . ($_POST["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
 		query_redirect(($EVENT != ""
 			? "ALTER EVENT " . idf_escape($EVENT) . $schedule
 			. ($EVENT != $_POST["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($_POST["EVENT_NAME"]) : "")
 			: "CREATE EVENT " . idf_escape($_POST["EVENT_NAME"]) . $schedule
-			) . "\n" . $statuses[$_POST["STATUS"]] . " COMMENT " . q($_POST["EVENT_COMMENT"])
+			) . "\n" . $statuses[$_POST["STATUS"]] . " COMMENT " . $connection->quote($_POST["EVENT_COMMENT"])
 			. " DO\n$_POST[EVENT_DEFINITION]"
 		, substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')));
 	}
@@ -30,8 +30,8 @@ $row = array();
 if ($_POST) {
 	$row = $_POST;
 } elseif ($EVENT != "") {
-	$rows = get_rows("SELECT * FROM information_schema.EVENTS WHERE EVENT_SCHEMA = " . q(DB) . " AND EVENT_NAME = " . q($EVENT));
-	$row = reset($rows);
+	$result = $connection->query("SELECT * FROM information_schema.EVENTS WHERE EVENT_SCHEMA = " . $connection->quote(DB) . " AND EVENT_NAME = " . $connection->quote($EVENT));
+	$row = $result->fetch_assoc();
 }
 ?>
 
@@ -49,5 +49,5 @@ if ($_POST) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 </form>

adminer/file.inc.php

@@ -1,14 +1,13 @@
 <?php
 header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
-
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
 	echo base64_decode("compile_file('../adminer/static/favicon.ico', 'base64_encode');");
 } elseif ($_GET["file"] == "default.css") {
-	header("Content-Type: text/css; charset=utf-8");
+	header("Content-Type: text/css");
 	?>compile_file('../adminer/static/default.css', 'minify_css');<?php
 } elseif ($_GET["file"] == "functions.js") {
-	header("Content-Type: text/javascript; charset=utf-8");
+	header("Content-Type: text/javascript");
 	?>compile_file('../adminer/static/functions.js', 'JSMin::minify');compile_file('static/editing.js', 'JSMin::minify');<?php
 } else {
 	header("Content-Type: image/gif");

adminer/foreign.inc.php

@@ -60,8 +60,8 @@ foreach (table_status() as $name => $table_status) {
 $j = 0;
 foreach ($row["source"] as $key => $val) {
 	echo "<tr>";
-	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1));
-	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key]);
+	echo "<td>" . html_select("source[" . intval($key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1));
+	echo "<td>" . html_select("target[" . intval($key) . "]", $target, $row["target"][$key]);
 	$j++;
 }
 ?>
@@ -73,6 +73,6 @@ foreach ($row["source"] as $key => $val) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
 <?php } ?>
-<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/include/adminer.inc.php

@@ -14,7 +14,7 @@ class Adminer {
 	* @return array ($server, $username, $password)
 	*/
 	function credentials() {
-		return array(SERVER, $_GET["username"], get_session("pwds"));
+		return array(SERVER, $_GET["username"], get_session("passwords"));
 	}
 	
 	/** Get key used for permanent login
@@ -32,22 +32,14 @@ class Adminer {
 		return DB;
 	}
 	
-	/** Headers to send before HTML output
-	* @return null
-	*/
-	function headers() {
-		header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
-		header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
-	}
-	
 	/** Print login form
 	* @return null
 	*/
 	function loginForm() {
-		global $drivers;
+		global $drivers, $possible_drivers;
 		?>
 <table cellspacing="0">
-<tr><th><?php echo lang('System'); ?><td><?php echo html_select("driver", $drivers, DRIVER); ?>
+<tr><th><?php echo lang('System'); ?><td><?php echo (count($possible_drivers) > 3 ? html_select("driver", $drivers, DRIVER) : "<input type='hidden' name='driver' value='" . key($drivers) . "'>" . reset($drivers)); ?></tr>
 <tr><th><?php echo lang('Server'); ?><td><input name="server" value="<?php echo h(SERVER); ?>">
 <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">
@@ -94,7 +86,7 @@ document.getElementById('username').focus();
 	function selectLinks($tableStatus, $set = "") {
 		echo '<p class="tabs">';
 		$links = array("select" => lang('Select data'), "table" => lang('Show structure'));
-		if (is_view($tableStatus)) {
+		if (eregi("view", $tableStatus["Engine"])) {
 			$links["view"] = lang('Alter view');
 		} else {
 			$links["create"] = lang('Alter table');
@@ -108,14 +100,6 @@ document.getElementById('username').focus();
 		echo "\n";
 	}
 	
-	/** Get foreign keys for table
-	* @param string
-	* @return array same format as foreign_keys()
-	*/
-	function foreignKeys($table) {
-		return foreign_keys($table);
-	}
-	
 	/** Find backward keys for table
 	* @param string
 	* @param string
@@ -139,7 +123,7 @@ document.getElementById('username').focus();
 	*/
 	function selectQuery($query) {
 		global $jush;
-		return "<p><a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Last page') . "'>&gt;&gt;</a> <code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
 	}
 	
 	/** Description of a row in a table
@@ -166,9 +150,9 @@ document.getElementById('username').focus();
 	* @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);
-		if (ereg('blob|bytea|raw|file', $field["type"]) && !is_utf8($val)) {
-			$return = lang('%d byte(s)', strlen(html_entity_decode($val, ENT_QUOTES)));
+		$return = ($val != "<i>NULL</i>" && $field["type"] == "char" ? "<code>$val</code>" : $val);
+		if (ereg('binary|blob|bytea', $field["type"]) && !is_utf8($val)) {
+			$return = lang('%d byte(s)', strlen($val));
 		}
 		return ($link ? "<a href='$link'>$return</a>" : $return);
 	}
@@ -179,7 +163,7 @@ document.getElementById('username').focus();
 	* @return string
 	*/
 	function editVal($val, $field) {
-		return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val);
+		return $val;
 	}
 	
 	/** Print columns box in select
@@ -320,11 +304,11 @@ document.getElementById('username').focus();
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $jush;
+		global $connection;
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
-				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
+				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . $connection->quote($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
 		foreach ((array) $_GET["where"] as $val) {
@@ -346,7 +330,7 @@ document.getElementById('username').focus();
 					foreach ($fields as $name => $field) {
 						if (is_numeric($val["val"]) || !ereg('int|float|double|decimal', $field["type"])) {
 							$name = idf_escape($name);
-							$cols[] = ($jush == "sql" && ereg('char|text|enum|set', $field["type"]) && !ereg('^utf8', $field["collation"]) ? "CONVERT($name USING utf8)" : $name);
+							$cols[] = (ereg('char|text|enum|set', $field["type"]) && !ereg('^utf8', $field["collation"]) ? "CONVERT($name USING utf8)" : $name);
 						}
 					}
 					$return[] = ($cols ? "(" . implode("$cond OR ", $cols) . "$cond)" : "0");
@@ -402,7 +386,7 @@ document.getElementById('username').focus();
 		global $jush;
 		restart_session();
 		$id = "sql-" . count($_SESSION["messages"]);
-		$history = &get_session("queries");
+		$history = &get_session("history");
 		$history[$_GET["db"]][] = (strlen($query) > 1e6 // not DB - reset in drop database
 			? ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..." // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 			: $query
@@ -438,10 +422,8 @@ document.getElementById('username').focus();
 	*/
 	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> " : "")
-				. "<label><input type='radio'$attrs value='0'" . ($value === 0 ? " checked" : "") . "><i>" . lang('empty') . "</i></label>"
-				. enum_input("radio", $attrs, $field, $value)
+			return ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><em>NULL</em></label> " : "")
+				. "<input type='radio'$attrs value='0'" . ($value === 0 ? " checked" : "") . ">"
 			;
 		}
 		return "";
@@ -454,8 +436,9 @@ document.getElementById('username').focus();
 	* @return string expression to use in a query
 	*/
 	function processInput($field, $value, $function = "") {
+		global $connection;
 		$name = $field["field"];
-		$return = q($value);
+		$return = $connection->quote($value);
 		if (ereg('^(now|getdate|uuid)$', $function)) {
 			$return = "$function()";
 		} elseif (ereg('^current_(date|timestamp)$', $function)) {
@@ -463,22 +446,21 @@ document.getElementById('username').focus();
 		} elseif (ereg('^([+-]|\\|\\|)$', $function)) {
 			$return = idf_escape($name) . " $function $return";
 		} elseif (ereg('^[+-] interval$', $function)) {
-			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+$~i", $value) ? $value : $return);
+			$return = idf_escape($name) . " $function " . (preg_match("~^([0-9]+|'[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;
 	}
 	
 	/** Returns export output options
-	* @return array
+	* @param bool generate select (otherwise radio)
+	* @param string
+	* @return string
 	*/
-	function dumpOutput() {
+	function dumpOutput($select, $value = "") {
 		$return = array('text' => lang('open'), 'file' => lang('save'));
 		if (function_exists('gzencode')) {
 			$return['gz'] = 'gzip';
@@ -487,203 +469,20 @@ document.getElementById('username').focus();
 			$return['bz2'] = 'bzip2';
 		}
 		// ZipArchive requires temporary file, ZIP can be created by gzcompress - see PEAR File_Archive
-		return $return;
+		return html_select("output", $return, $value, $select);
 	}
 	
 	/** Returns export format options
-	* @return array
+	* @param bool generate select (otherwise radio)
+	* @param string
+	* @return string
 	*/
-	function dumpFormat() {
-		return array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
-	}
-	
-	/** Export table structure
-	* @param string
-	* @param string
-	* @param bool
-	* @return null prints data
-	*/
-	function dumpTable($table, $style, $is_view = false) {
-		if ($_POST["format"] != "sql") {
-			echo "\xef\xbb\xbf"; // UTF-8 byte order mark
-			if ($style) {
-				dump_csv(array_keys(fields($table)));
-			}
-		} elseif ($style) {
-			$create = create_sql($table, $_POST["auto_increment"]);
-			if ($create) {
-				if ($style == "DROP+CREATE") {
-					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=`' . str_replace("@", "`@`", logged_user()) . '`~', '\\1', $create); //! proper escaping of user
-				}
-				echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
-			}
-			if ($style == "CREATE+ALTER" && !$is_view) {
-				// create procedure which iterates over original columns and adds new and removes old
-				$query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION";
-				echo "DELIMITER ;;
-CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
-	DECLARE _column_name, _collation_name, after varchar(64) DEFAULT '';
-	DECLARE _column_type, _column_default text;
-	DECLARE _is_nullable char(3);
-	DECLARE _extra varchar(30);
-	DECLARE _column_comment varchar(255);
-	DECLARE done, set_after bool DEFAULT 0;
-	DECLARE add_columns text DEFAULT '";
-				$fields = array();
-				$after = "";
-				foreach (get_rows($query) as $row) {
-					$default = $row["COLUMN_DEFAULT"];
-					$row["default"] = (isset($default) ? 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"]) : "")
-						. ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
-						. ($row["EXTRA"] ? " $row[EXTRA]" : "")
-						. ($row["COLUMN_COMMENT"] ? " COMMENT " . q($row["COLUMN_COMMENT"]) : "")
-						. ($after ? " AFTER " . idf_escape($after) : " FIRST")
-					);
-					echo ", ADD $row[alter]";
-					$fields[] = $row;
-					$after = $row["COLUMN_NAME"];
-				}
-				echo "';
-	DECLARE columns CURSOR FOR $query;
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-	SET @alter_table = '';
-	OPEN columns;
-	REPEAT
-		FETCH columns INTO _column_name, _column_default, _is_nullable, _collation_name, _column_type, _extra, _column_comment;
-		IF NOT done THEN
-			SET set_after = 1;
-			CASE _column_name";
-			foreach ($fields as $row) {
-				echo "
-				WHEN " . q($row["COLUMN_NAME"]) . " THEN
-					SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
-					IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . q($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . q($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
-						SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
-					END IF;"; //! don't replace in comment
-			}
-			echo "
-				ELSE
-					SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
-					SET set_after = 0;
-			END CASE;
-			IF set_after THEN
-				SET after = _column_name;
-			END IF;
-		END IF;
-	UNTIL done END REPEAT;
-	CLOSE columns;
-	IF @alter_table != '' OR add_columns != '' THEN
-		SET alter_command = CONCAT(alter_command, 'ALTER TABLE " . table($table) . "', SUBSTR(CONCAT(add_columns, @alter_table), 2), ';\\n');
-	END IF;
-END;;
-DELIMITER ;
-CALL adminer_alter(@adminer_alter);
-DROP PROCEDURE adminer_alter;
-
-";
-				//! indexes
-			}
-		}
-	}
-	
-	/** Export table data
-	* @param string
-	* @param string
-	* @param string
-	* @return null prints data
-	*/
-	function dumpData($table, $style, $query) {
-		global $connection, $jush;
-		$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
-		if ($style) {
-			if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
-				echo truncate_sql($table) . ";\n";
-			}
-			$fields = fields($table);
-			$result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers
-			if ($result) {
-				$insert = "";
-				$buffer = "";
-				while ($row = $result->fetch_assoc()) {
-					if ($_POST["format"] != "sql") {
-						dump_csv($row);
-					} else {
-						if (!$insert) {
-							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
-						}
-						foreach ($row as $key => $val) {
-							$row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$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";
-						} else {
-							$s = ($max_packet ? "\n" : " ") . "($s)";
-							if (!$buffer) {
-								$buffer = $insert . $s;
-							} elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length
-								$buffer .= ",$s";
-							} else {
-								$buffer .= ";\n";
-								echo $buffer;
-								$buffer = $insert . $s;
-							}
-						}
-					}
-				}
-				if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
-					$buffer .= ";\n";
-					echo $buffer;
-				}
-			} elseif ($_POST["format"] == "sql") {
-				echo "-- " . str_replace("\n", " ", $connection->error) . "\n";
-			}
-		}
-	}
-	
-	/** Send headers for export
-	* @param string
-	* @param bool
-	* @return string extension
-	*/
-	function dumpHeaders($identifier, $multi_table = false) {
-		$filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
-		$output = $_POST["output"];
-		$ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
-		header("Content-Type: " .
-			($output == "bz2" ? "application/x-bzip" :
-			($output == "gz" ? "application/x-gzip" :
-			($ext == "tar" ? "application/x-tar" :
-			($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
-		))));
-		if ($output != "text") {
-			header("Content-Disposition: attachment; filename=$filename.$ext" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
-		}
-		session_write_close();
-		if ($_POST["output"] == "bz2") {
-			ob_start('bzcompress', 1e6);
-		}
-		if ($_POST["output"] == "gz") {
-			ob_start('gzencode', 1e6);
-		}
-		return $ext;
+	function dumpFormat($select, $value = "") {
+		return html_select("format", array('sql' => 'SQL', 'csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
 	}
 	
 	/** Prints navigation after Adminer title
-	* @param string can be "auth" if there is no database connection, "db" if there is no database selected, "ns" with invalid schema
+	* @param string can be "auth" if there is no database connection or "db" if there is no database selected
 	* @return null
 	*/
 	function navigation($missing) {
@@ -697,7 +496,7 @@ DROP PROCEDURE adminer_alter;
 <?php
 		if ($missing == "auth") {
 			$first = true;
-			foreach ((array) $_SESSION["pwds"] as $driver => $servers) {
+			foreach ((array) $_SESSION["passwords"] as $driver => $servers) {
 				foreach ($servers as $server => $usernames) {
 					foreach ($usernames as $username => $password) {
 						if (isset($password)) {
@@ -715,14 +514,8 @@ DROP PROCEDURE adminer_alter;
 			?>
 <form action="" method="post">
 <p class="logout">
-<?php
-			if (DB == "" || !$missing) {
-				echo "<a href='" . h(ME) . "sql='>" . bold(lang('SQL command'), isset($_GET["sql"])) . "</a>\n";
-				if (support("dump")) {
-					echo "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "'>" . bold(lang('Dump'), isset($_GET["dump"])) . "</a>\n";
-				}
-			}
-			?>
+<a href="<?php echo h(ME); ?>sql="><?php echo bold(lang('SQL command'), isset($_GET["sql"])); ?></a>
+<a href="<?php echo h(ME); ?>dump=<?php echo urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]); ?>"><?php echo bold(lang('Dump'), isset($_GET["dump"])); ?></a>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" name="logout" value="<?php echo lang('Logout'); ?>">
 </p>
@@ -740,8 +533,7 @@ DROP PROCEDURE adminer_alter;
 						set_schema($_GET["ns"]);
 					}
 				}
-				if ($_GET["ns"] !== "" && !$missing) {
-					echo '<p><a href="' . h(ME) . 'create=">' . bold(lang('Create new table'), $_GET["create"] === "") . "</a>\n";
+				if ($_GET["ns"] !== "") {
 					$tables = tables_list();
 					if (!$tables) {
 						echo "<p class='message'>" . lang('No tables.') . "\n";
@@ -752,12 +544,13 @@ DROP PROCEDURE adminer_alter;
 							$links[] = preg_quote($table, '/');
 						}
 						echo "<script type='text/javascript'>\n";
-						echo "var jushLinks = { $jush: [ '" . js_escape(ME) . "table=\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+						echo "var jushLinks = { $jush: [ '" . addcslashes(h(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 '<p><a href="' . h(ME) . 'create=">' . bold(lang('Create new table'), $_GET["create"] === "") . "</a>\n";
 				}
 			}
 			echo (isset($_GET["sql"]) ? '<input type="hidden" name="sql" value="">'
@@ -773,11 +566,18 @@ DROP PROCEDURE adminer_alter;
 	* @return null
 	*/
 	function tablesPrint($tables) {
-		echo "<p id='tables'>\n";
+		echo "<ul id='tables'>\n";
+		$i = 1;
 		foreach ($tables as $table => $type) {
-			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '">' . bold(lang('select'), $_GET["select"] == $table) . '</a> ';
-			echo '<a href="' . h(ME) . 'table=' . urlencode($table) . '">' . bold($this->tableName(array("Name" => $table)), $_GET["table"] == $table) . "</a><br>\n"; //! Adminer::tableName may work with full table status
+			echo "<li onmouseover=\"toggle('table-$i');\" onmouseout=\"toggle('table-$i');\"><a href='" . h(ME) . "table=" . urlencode($table) . "'>" . bold($this->tableName(array("Name" => $table)), $_GET["table"] == $table) . "</a>"; //! Adminer::tableName may work with full table status
+			echo "<span id='table-$i' class='hidden'>";
+			echo ' <a href="' . h(ME) . 'select=' . urlencode($table) . '">' . bold(lang('select'), $_GET["select"] == $table) . '</a>';
+			echo ' <a href="' . h(ME) . 'create=' . urlencode($table) . '">' . bold(lang('alter'), $_GET["create"] == $table) . '</a>';
+			echo ' <a href="' . h(ME) . 'edit=' . urlencode($table) . '">' . bold(lang('insert'), $_GET["edit"] == $table) . '</a>';
+			echo "</span>\n";
+			$i++;
 		}
+		echo "</ul>\n";
 	}
 	
 }

adminer/include/auth.inc.php

@@ -1,6 +1,12 @@
 <?php
 $connection = '';
 
+if (!$drivers) {
+	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), null);
+	page_footer("auth");
+	exit;
+}
+
 $token = $_SESSION["token"];
 if (!$_SESSION["token"]) {
 	$_SESSION["token"] = rand(1, 1e6); // defense against cross-site request forgery
@@ -16,7 +22,7 @@ if ($_COOKIE["adminer_permanent"]) {
 
 if (isset($_POST["server"])) {
 	session_regenerate_id(); // defense against session fixation
-	$_SESSION["pwds"][$_POST["driver"]][$_POST["server"]][$_POST["username"]] = $_POST["password"];
+	$_SESSION["passwords"][$_POST["driver"]][$_POST["server"]][$_POST["username"]] = $_POST["password"];
 	if ($_POST["permanent"]) {
 		$key = base64_encode($_POST["driver"]) . "-" . base64_encode($_POST["server"]) . "-" . base64_encode($_POST["username"]);
 		$private = $adminer->permanentLogin();
@@ -36,7 +42,7 @@ if (isset($_POST["server"])) {
 		page_footer("db");
 		exit;
 	} else {
-		foreach (array("pwds", "dbs", "queries") as $key) {
+		foreach (array("passwords", "databases", "history") as $key) {
 			set_session($key, null);
 		}
 		$key = base64_encode(DRIVER) . "-" . base64_encode(SERVER) . "-" . base64_encode($_GET["username"]);
@@ -46,13 +52,13 @@ if (isset($_POST["server"])) {
 		}
 		redirect(substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
 	}
-} elseif ($permanent && !$_SESSION["pwds"]) {
+} elseif ($permanent && !$_SESSION["passwords"]) {
 	session_regenerate_id();
 	$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));
-		$_SESSION["pwds"][$driver][$server][$username] = decrypt_string(base64_decode($cipher), $private);
+		$_SESSION["passwords"][$driver][$server][$username] = decrypt_string($cipher, $private);
 	}
 }
 
@@ -66,7 +72,7 @@ function auth_error($exception = null) {
 		if (($_COOKIE[$session_name] || $_GET[$session_name]) && !$token) {
 			$error = lang('Session expired, please login again.');
 		} else {
-			$password = &get_session("pwds");
+			$password = &get_session("passwords");
 			if (isset($password)) {
 				$error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.')));
 				$password = null;
@@ -83,16 +89,10 @@ function auth_error($exception = null) {
 	page_footer("auth");
 }
 
-if (isset($_GET["username"])) {
-	if (!class_exists("Min_DB")) {
-		unset($_SESSION["pwds"][DRIVER]); //! remove also from adminer_permanent
-		page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
-		page_footer("auth");
-		exit;
-	}
+if (isset($_GET["username"]) && class_exists("Min_DB")) { // doesn't exists with passing wrong driver
 	$connection = connect();
 }
-if (is_string($connection) || !$adminer->login($_GET["username"], get_session("pwds"))) {
+if (is_string($connection) || !$adminer->login($_GET["username"], get_session("passwords"))) {
 	auth_error();
 	exit;
 }

adminer/include/bootstrap.inc.php

@@ -24,12 +24,11 @@ include "../adminer/include/functions.inc.php";
 if (!isset($_SERVER["REQUEST_URI"])) {
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . ($_SERVER["QUERY_STRING"] != "" ? "?$_SERVER[QUERY_STRING]" : ""); // IIS 5 compatibility
 }
-$HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
-if (!defined("SID")) {
+if (!ini_bool("session.auto_start")) {
 	session_name("adminer_sid"); // use specific session name to get own namespace
-	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
+	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off"));
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
 		$params[] = true; // HttpOnly
 	}
@@ -38,13 +37,25 @@ if (!defined("SID")) {
 }
 
 // disable magic quotes to be able to use database escaping function
-remove_slashes(array(&$_GET, &$_POST, &$_COOKIE));
-if (function_exists("set_magic_quotes_runtime")) { // removed in PHP 6
+if (get_magic_quotes_gpc()) {
+	$process = array(&$_GET, &$_POST, &$_COOKIE);
+	while (list($key, $val) = each($process)) {
+		foreach ($val as $k => $v) {
+			unset($process[$key][$k]);
+			if (is_array($v)) {
+				$process[$key][stripslashes($k)] = $v;
+				$process[] = &$process[$key][stripslashes($k)];
+			} else {
+				$process[$key][stripslashes($k)] = ($filter ? $v : stripslashes($v));
+			}
+		}
+	}
+	unset($process);
+}
+if (function_exists("set_magic_quotes_runtime")) {
 	set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
-@ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
-@ini_set("precision", 20); // @ - can be disabled
 
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";
@@ -71,6 +82,7 @@ include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 include "./include/connect.inc.php";
 include "./include/editing.inc.php";
+include "./include/export.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
@@ -78,3 +90,4 @@ if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !
 }
 
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); ///< @var array used in foreign_keys()
+$confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; ///< @var string

adminer/include/connect.inc.php

@@ -1,11 +1,12 @@
 <?php
 function connect_error() {
-	global $connection, $token, $error, $drivers;
+	global $connection, $VERSION, $token, $error, $drivers;
 	$databases = array();
 	if (DB != "") {
 		page_header(lang('Database') . ": " . h(DB), lang('Invalid database.'), true);
 	} else {
 		if ($_POST["db"] && !$error) {
+			set_session("databases", null);
 			queries_redirect(substr(ME, 0, -1), lang('Databases have been dropped.'), drop_databases($_POST["db"]));
 		}
 		
@@ -23,12 +24,8 @@ 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);
-		}
 		$databases = get_databases();
 		if ($databases) {
-			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
 			echo "<table cellspacing='0' onclick='tableClick(event);'>\n";
@@ -37,40 +34,34 @@ function connect_error() {
 				$root = h(ME) . "db=" . urlencode($db);
 				echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]));
 				echo "<th><a href='$root'>" . h($db) . "</a>";
-				echo "<td><a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
+				echo "<td><a href='$root&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
 				echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "'>?</a>";
 				echo "\n";
 			}
 			echo "</table>\n";
-			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)") . ">\n";
-			echo "<a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>\n";
+			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /db/) + ')');\">\n";
 			echo "</form>\n";
 		}
 	}
 	page_footer("db");
-	if ($databases) {
-		echo "<script type='text/javascript' src='" . h(ME . "script=connect&token=$token") . "'></script>\n";
+	echo "<script type='text/javascript'>\n";
+	foreach (count_tables($databases) as $db => $val) {
+		echo "setHtml('tables-" . addcslashes($db, "\\'/") . "', '$val');\n";
 	}
+	echo "</script>\n";
 }
 
 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 != "" ? $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"]))) {
 	if (DB != "") {
-		set_session("dbs", null);
+		set_session("databases", null);
 	}
 	connect_error(); // separate function to catch SQLite error
 	exit;
 }
 
-if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
-	if (!isset($_GET["ns"])) {
-		redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
-	}
-	if (!set_schema($_GET["ns"])) {
-		page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
-		page_footer("ns");
-		exit;
-	}
+if (support("scheme") && DB != "" && $_GET["ns"] !== "" && (!isset($_GET["ns"]) || !set_schema($_GET["ns"]))) {
+	redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
 }

adminer/include/design.inc.php

@@ -7,14 +7,14 @@
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-	global $LANG, $HTTPS, $adminer, $connection, $drivers;
+	global $LANG, $VERSION, $adminer, $connection, $drivers;
 	header("Content-Type: text/html; charset=utf-8");
-	$adminer->headers();
+	header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox NoScript plugin
 	$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
-	$protocol = ($HTTPS ? "https" : "http");
+	$protocol = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off") ? "https" : "http");
 	?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
+<html lang="<?php echo $LANG; ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
@@ -25,7 +25,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <link rel="stylesheet" type="text/css" href="adminer.css">
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?>" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
+<body onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>', '<?php echo $protocol; ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$protocol');"); ?>">
 <script type="text/javascript" src="../adminer/static/functions.js"></script>
 <script type="text/javascript" src="static/editing.js"></script>
 
@@ -63,7 +63,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 		echo "<div class='message'>" . implode("</div>\n<div class='message'>", $_SESSION["messages"]) . "</div>\n";
 		$_SESSION["messages"] = array();
 	}
-	$databases = &get_session("dbs");
+	$databases = &get_session("databases");
 	if (DB != "" && $databases && !in_array(DB, $databases, true)) {
 		$databases = null;
 	}
@@ -73,7 +73,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 }
 
 /** Print HTML footer
-* @param string "auth", "db", "ns"
+* @param string auth|db
 * @return null
 */
 function page_footer($missing = "") {
@@ -86,4 +86,8 @@ function page_footer($missing = "") {
 <?php $adminer->navigation($missing); ?>
 </div>
 <?php
+	// don't wait for code after footer
+	session_write_close();
+	ob_flush();
+	flush();
 }

adminer/include/editing.inc.php

@@ -5,73 +5,77 @@
 * @return null
 */
 function select($result, $connection2 = null) {
-	$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>
-	odd(''); // reset odd for each result
-	for ($i=0; $row = $result->fetch_row(); $i++) {
-		if (!$i) {
-			echo "<table cellspacing='0' class='nowrap'>\n";
-			echo "<thead><tr>";
-			for ($j=0; $j < count($row); $j++) {
-				$field = $result->fetch_field();
-				$orgtable = $field->orgtable;
-				$orgname = $field->orgname;
-				if ($orgtable != "") {
-					if (!isset($indexes[$orgtable])) {
-						// find primary key in each table
-						$indexes[$orgtable] = array();
-						foreach (indexes($orgtable, $connection2) as $index) {
-							if ($index["type"] == "PRIMARY") {
-								$indexes[$orgtable] = array_flip($index["columns"]);
-								break;
+	if (!$result->num_rows) {
+		echo "<p class='message'>" . lang('No rows.') . "\n";
+	} else {
+		echo "<table cellspacing='0' class='nowrap'>\n";
+		$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>
+		odd(''); // reset odd for each result
+		for ($i=0; $row = $result->fetch_row(); $i++) {
+			if (!$i) {
+				echo "<thead><tr>";
+				for ($j=0; $j < count($row); $j++) {
+					$field = $result->fetch_field();
+					$orgtable = $field->orgtable;
+					$orgname = $field->orgname;
+					if ($orgtable != "") {
+						if (!isset($indexes[$orgtable])) {
+							// find primary key in each table
+							$indexes[$orgtable] = array();
+							foreach (indexes($orgtable, $connection2) as $index) {
+								if ($index["type"] == "PRIMARY") {
+									$indexes[$orgtable] = array_flip($index["columns"]);
+									break;
+								}
 							}
+							$columns[$orgtable] = $indexes[$orgtable];
+						}
+						if (isset($columns[$orgtable][$orgname])) {
+							unset($columns[$orgtable][$orgname]);
+							$indexes[$orgtable][$orgname] = $j;
+							$links[$j] = $orgtable;
 						}
-						$columns[$orgtable] = $indexes[$orgtable];
 					}
-					if (isset($columns[$orgtable][$orgname])) {
-						unset($columns[$orgtable][$orgname]);
-						$indexes[$orgtable][$orgname] = $j;
-						$links[$j] = $orgtable;
+					if ($field->charsetnr == 63) { // 63 - binary
+						$blobs[$j] = true;
 					}
+					$types[$j] = $field->type;
+					echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($field->name);
 				}
-				if ($field->charsetnr == 63) { // 63 - binary
-					$blobs[$j] = true;
-				}
-				$types[$j] = $field->type;
-				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($field->name);
+				echo "</thead>\n";
 			}
-			echo "</thead>\n";
-		}
-		echo "<tr" . odd() . ">";
-		foreach ($row as $key => $val) {
-			if (!isset($val)) {
-				$val = "<i>NULL</i>";
-			} else {
-				if ($blobs[$key] && !is_utf8($val)) {
-					$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
-				} elseif (!strlen($val)) { // strlen - SQLite can return int
-					$val = "&nbsp;"; // some content to print a border
+			echo "<tr" . odd() . ">";
+			foreach ($row as $key => $val) {
+				if (!isset($val)) {
+					$val = "<i>NULL</i>";
 				} else {
-					$val = h($val);
-					if ($types[$key] == 254) { // 254 - char
-						$val = "<code>$val</code>";
+					if ($blobs[$key] && !is_utf8($val)) {
+						$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
+					} elseif (!strlen($val)) { // strlen - SQLite can return int
+						$val = "&nbsp;"; // some content to print a border
+					} else {
+						$val = h($val);
+						if ($types[$key] == 254) { // 254 - char
+							$val = "<code>$val</code>";
+						}
+					}
+					if (isset($links[$key]) && !$columns[$links[$key]]) {
+						$link = "edit=" . urlencode($links[$key]);
+						foreach ($indexes[$links[$key]] as $col => $j) {
+							$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
+						}
+						$val = "<a href='" . h(ME . $link) . "'>$val</a>";
 					}
 				}
-				if (isset($links[$key]) && !$columns[$links[$key]]) {
-					$link = "edit=" . urlencode($links[$key]);
-					foreach ($indexes[$links[$key]] as $col => $j) {
-						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
-					}
-					$val = "<a href='" . h(ME . $link) . "'>$val</a>";
-				}
+				echo "<td>$val";
 			}
-			echo "<td>$val";
 		}
+		echo "</table>\n";
 	}
-	echo ($i ? "</table>" : "<p class='message'>" . lang('No rows.')) . "\n";
 }
 
 /** Get referencable tables with single column primary key except self
@@ -96,17 +100,6 @@ function referencable_primary($self) {
 	return $return;
 }
 
-/** Print SQL <textarea> tag
-* @param string
-* @param int
-* @param int
-* @param string
-* @return null
-*/
-function textarea($name, $value, $rows = 10, $cols = 80) {
-	echo "<textarea name='$name' rows='$rows' cols='$cols' style='width: 98%;' spellcheck='false' onkeydown='return textareaKeydown(this, event, true);'>" . h($value) . "</textarea>"; // spellcheck - not valid before HTML5
-}
-
 /** Print table columns for type edit
 * @param string
 * @param array
@@ -115,9 +108,9 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 * @return null
 */
 function edit_type($key, $field, $collations, $foreign_keys = array()) {
-	global $structured_types, $types, $unsigned, $on_actions;
+	global $structured_types, $unsigned, $inout, $on_actions;
 	?>
-<td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist((!$field["type"] || isset($types[$field["type"]]) ? array() : array($field["type"])) + $structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
+<td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"><td><?php
 	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
 	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
@@ -139,11 +132,11 @@ function process_length($length) {
 * @return string
 */
 function process_type($field, $collate = "COLLATE") {
-	global $unsigned;
+	global $connection, $unsigned;
 	return " $field[type]"
-		. ($field["length"] != "" ? "(" . process_length($field["length"]) . ")" : "")
+		. ($field["length"] != "" && !ereg('^date|time$', $field["type"]) ? "(" . process_length($field["length"]) . ")" : "")
 		. (ereg('int|float|double|decimal', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
-		. (ereg('char|text|enum|set', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
+		. (ereg('char|text|enum|set', $field["type"]) && $field["collation"] ? " $collate " . $connection->quote($field["collation"]) : "")
 	;
 }
 
@@ -153,13 +146,14 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
+	global $connection;
 	return array(
 		idf_escape($field["field"]),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
-		(isset($field["default"]) ? " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP$", $field["default"]) ? $field["default"] : q($field["default"])) : ""),
+		(isset($field["default"]) ? " DEFAULT " . ($field["type"] == "timestamp" && eregi("^CURRENT_TIMESTAMP$", $field["default"]) ? $field["default"] : $connection->quote($field["default"])) : ""),
 		($field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
-		(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
+		(support("comment") && $field["comment"] != "" ? " COMMENT " . $connection->quote($field["comment"]) : ""),
 		($field["auto_increment"] ? auto_increment() : null),
 	);
 }
@@ -224,7 +218,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 <?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
 <?php if ($type == "TABLE") { ?>
 <td><?php echo checkbox("fields[$i][null]", 1, $field["null"]); ?>
-<td><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> onclick="var field = this.form['fields[' + this.value + '][field]']; if (!field.value) { field.value = 'id'; field.onchange(); }">
+<td><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?>>
 <td class="hidden"><?php echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
 <?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . "><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' maxlength='255'>" : ""); ?>
 <?php } ?>
@@ -333,18 +327,3 @@ function drop_create($drop, $create, $location, $message_drop, $message_alter, $
 	}
 	return $dropped;
 }
-
-/** Get string to add a file in TAR
-* @param string
-* @param string
-* @return string
-*/
-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});
-	}
-	$return .= sprintf("%06o", $checksum) . "\0 ";
-	return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
-}

adminer/include/export.inc.php

@@ -0,0 +1,174 @@
+<?php
+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});
+	}
+	$return .= sprintf("%06o", $checksum) . "\0 ";
+	return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
+}
+
+function dump_table($table, $style, $is_view = false) {
+	global $connection;
+	if ($_POST["format"] != "sql") {
+		echo "\xef\xbb\xbf"; // UTF-8 byte order mark
+		if ($style) {
+			dump_csv(array_keys(fields($table)));
+		}
+	} elseif ($style) {
+		$create = create_sql($table);
+		if ($create) {
+			if ($style == "DROP+CREATE") {
+				echo "DROP " . ($is_view ? "VIEW" : "TABLE") . " IF EXISTS " . idf_escape($table) . ";\n";
+			}
+			echo ($style != "CREATE+ALTER" ? $create : ($is_view ? substr_replace($create, " OR REPLACE", 6, 0) : substr_replace($create, " IF NOT EXISTS", 12, 0))) . ";\n\n";
+		}
+		if ($style == "CREATE+ALTER" && !$is_view) {
+			// create procedure which iterates over original columns and adds new and removes old
+			$query = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, COLLATION_NAME, COLUMN_TYPE, EXTRA, COLUMN_COMMENT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . $connection->quote($table) . " ORDER BY ORDINAL_POSITION";
+			echo "DELIMITER ;;
+CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
+	DECLARE _column_name, _collation_name, after varchar(64) DEFAULT '';
+	DECLARE _column_type, _column_default text;
+	DECLARE _is_nullable char(3);
+	DECLARE _extra varchar(30);
+	DECLARE _column_comment varchar(255);
+	DECLARE done, set_after bool DEFAULT 0;
+	DECLARE add_columns text DEFAULT '";
+			$fields = array();
+			$result = $connection->query($query);
+			$after = "";
+			while ($row = $result->fetch_assoc()) {
+				$default = $row["COLUMN_DEFAULT"];
+				$row["default"] = (isset($default) ? $connection->quote($default) : "NULL");
+				$row["after"] = $connection->quote($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"]) : "")
+					. ($row["IS_NULLABLE"] == "YES" ? "" : " NOT NULL")
+					. ($row["EXTRA"] ? " $row[EXTRA]" : "")
+					. ($row["COLUMN_COMMENT"] ? " COMMENT " . $connection->quote($row["COLUMN_COMMENT"]) : "")
+					. ($after ? " AFTER " . idf_escape($after) : " FIRST")
+				);
+				echo ", ADD $row[alter]";
+				$fields[] = $row;
+				$after = $row["COLUMN_NAME"];
+			}
+			echo "';
+	DECLARE columns CURSOR FOR $query;
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
+	SET @alter_table = '';
+	OPEN columns;
+	REPEAT
+		FETCH columns INTO _column_name, _column_default, _is_nullable, _collation_name, _column_type, _extra, _column_comment;
+		IF NOT done THEN
+			SET set_after = 1;
+			CASE _column_name";
+			foreach ($fields as $row) {
+				echo "
+				WHEN " . $connection->quote($row["COLUMN_NAME"]) . " THEN
+					SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', '');
+					IF NOT (_column_default <=> $row[default]) OR _is_nullable != '$row[IS_NULLABLE]' OR _collation_name != '$row[COLLATION_NAME]' OR _column_type != " . $connection->quote($row["COLUMN_TYPE"]) . " OR _extra != '$row[EXTRA]' OR _column_comment != " . $connection->quote($row["COLUMN_COMMENT"]) . " OR after != $row[after] THEN
+						SET @alter_table = CONCAT(@alter_table, ', MODIFY $row[alter]');
+					END IF;"; //! don't replace in comment
+			}
+			echo "
+				ELSE
+					SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
+					SET set_after = 0;
+			END CASE;
+			IF set_after THEN
+				SET after = _column_name;
+			END IF;
+		END IF;
+	UNTIL done END REPEAT;
+	CLOSE columns;
+	IF @alter_table != '' OR add_columns != '' THEN
+		SET alter_command = CONCAT(alter_command, 'ALTER TABLE " . idf_escape($table) . "', SUBSTR(CONCAT(add_columns, @alter_table), 2), ';\\n');
+	END IF;
+END;;
+DELIMITER ;
+CALL adminer_alter(@adminer_alter);
+DROP PROCEDURE adminer_alter;
+
+";
+			//! indexes
+		}
+	}
+}
+
+function dump_data($table, $style, $select = "") {
+	global $connection, $jush;
+	$max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
+	if ($style) {
+		if ($_POST["format"] == "sql" && $style == "TRUNCATE+INSERT") {
+			echo "TRUNCATE " . idf_escape($table) . ";\n";
+		}
+		$fields = fields($table);
+		$result = $connection->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers, microtime
+		if ($result) {
+			$insert = "";
+			$buffer = "";
+			while ($row = $result->fetch_assoc()) {
+				if ($_POST["format"] != "sql") {
+					dump_csv($row);
+				} else {
+					if (!$insert) {
+						$insert = "INSERT INTO " . idf_escape($table) . " (" . implode(", ", array_map('idf_escape', array_keys($row))) . ") VALUES";
+					}
+					foreach ($row as $key => $val) {
+						$row[$key] = (isset($val) ? (ereg('int|float|double|decimal', $fields[$key]["type"]) ? $val : $connection->quote($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";
+					} else {
+						$s = ($max_packet ? "\n" : " ") . "($s)";
+						if (!$buffer) {
+							$buffer = $insert . $s;
+						} elseif (strlen($buffer) + 2 + strlen($s) < $max_packet) { // 2 - separator and terminator length
+							$buffer .= ",$s";
+						} else {
+							$buffer .= ";\n";
+							echo $buffer;
+							$buffer = $insert . $s;
+						}
+					}
+				}
+			}
+			if ($_POST["format"] == "sql" && $style != "INSERT+UPDATE" && $buffer) {
+				$buffer .= ";\n";
+				echo $buffer;
+			}
+		}
+	}
+}
+
+function dump_headers($identifier, $multi_table = false) {
+	$filename = ($identifier != "" ? friendly_url($identifier) : "adminer");
+	$output = $_POST["output"];
+	$ext = ($_POST["format"] == "sql" ? "sql" : ($multi_table ? "tar" : "csv")); // multiple CSV packed to TAR
+	header("Content-Type: " .
+		($output == "bz2" ? "application/x-bzip" :
+		($output == "gz" ? "application/x-gzip" :
+		($ext == "tar" ? "application/x-tar" :
+		($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
+	))));
+	if ($output != "text") {
+		header("Content-Disposition: attachment; filename=$filename.$ext" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
+	}
+	session_write_close();
+	if ($_POST["output"] == "bz2") {
+		ob_start('bzcompress', 1e6);
+	}
+	if ($_POST["output"] == "gz") {
+		ob_start('gzencode', 1e6);
+	}
+	return $ext;
+}

adminer/include/functions.inc.php

@@ -22,27 +22,8 @@ function idf_unescape($idf) {
 * @return string
 */
 function escape_string($val) {
-	return substr(q($val), 1, -1);
-}
-
-/** Disable magic_quotes_gpc
-* @param array e.g. (&$_GET, &$_POST, &$_COOKIE)
-* @return null modified in place
-*/
-function remove_slashes($process) {
-	if (get_magic_quotes_gpc()) {
-		while (list($key, $val) = each($process)) {
-			foreach ($val as $k => $v) {
-				unset($process[$key][$k]);
-				if (is_array($v)) {
-					$process[$key][stripslashes($k)] = $v;
-					$process[] = &$process[$key][stripslashes($k)];
-				} else {
-					$process[$key][stripslashes($k)] = ($filter ? $v : stripslashes($v));
-				}
-			}
-		}
-	}
+	global $connection;
+	return substr($connection->quote($val), 1, -1);
 }
 
 /** Escape or unescape string to use inside form []
@@ -135,21 +116,20 @@ function html_select($name, $options, $value = "", $onchange = true) {
 	return $return;
 }
 
-/** Get onclick confirmation
-* @param string JavaScript expression
-* @return string
+/** Print SQL <textarea> tag
+* @param string
+* @param int
+* @param int
+* @param string
+* @return null
 */
-function confirm($count = "") {
-	return " onclick=\"return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
+function textarea($name, $value, $rows = 10, $cols = 80) {
+	echo "<textarea name='$name' rows='$rows' cols='$cols' style='width: 98%;' spellcheck='false'>" . h($value) . "</textarea>"; // spellcheck - not valid before HTML5
 }
 
-/** Escape string for JavaScript apostrophes
-* @param string
-* @return string
-*/
-function js_escape($string) {
-	return addcslashes($string, "\r\n'\\/"); // slash for <script>
-}
+
+
+// other functions
 
 /** Get INI boolean value
 * @param string
@@ -160,11 +140,6 @@ function ini_bool($ini) {
 	return (eregi('^(on|true|yes)$', $val) || (int) $val); // boolean values set by php_value are strings
 }
 
-function q($string) {
-	global $connection;
-	return $connection->quote($string);
-}
-
 /** Get list of values from database
 * @param string
 * @param mixed
@@ -200,27 +175,6 @@ function get_key_vals($query, $connection2 = null) {
 	return $return;
 }
 
-/** Get all rows of result
-* @param string
-* @return array associative
-*/
-function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
-	global $connection;
-	if (!is_object($connection2)) {
-		$connection2 = $connection;
-	}
-	$return = array();
-	$result = $connection2->query($query);
-	if (is_object($result)) { // can return true
-		while ($row = $result->fetch_assoc()) {
-			$return[] = $row;
-		}
-	} elseif (!$result && $error && (headers_sent() || ob_get_level())) {
-		echo $error . error() . "\n";
-	}
-	return $return;
-}
-
 /** Find unique identifier of a row
 * @param array
 * @param array result of indexes()
@@ -253,11 +207,10 @@ function unique_array($row, $indexes) {
 * @return string
 */
 function where($where) {
-	global $jush;
 	$return = array();
 	foreach ((array) $where["where"] as $key => $val) {
 		$return[] = idf_escape(bracket_escape($key, 1)) // 1 - back
-			. (ereg('\\.', $val) || $jush == "mssql" ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)) // LIKE because of floats, but slow with ints, in MS SQL because of text
+			. (ereg('\\.', $val) ? " LIKE " . exact_value(addcslashes($val, "%_")) : " = " . exact_value($val)) // LIKE because of floats, but slow with ints
 		; //! enum and set
 	}
 	foreach ((array) $where["null"] as $key) {
@@ -272,7 +225,6 @@ function where($where) {
 */
 function where_check($val) {
 	parse_str($val, $check);
-	remove_slashes(array(&$check));
 	return where($check);
 }
 
@@ -293,14 +245,13 @@ function where_link($i, $column, $value, $operator = "=") {
 * @return bool
 */
 function cookie($name, $value) {
-	global $HTTPS;
 	$params = array(
 		$name,
 		(ereg("\n", $value) ? "" : $value), // HTTP Response Splitting protection in PHP < 5.1.2
 		time() + 2592000, // 2592000 - 30 days
 		preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]),
 		"",
-		$HTTPS
+		$_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off")
 	);
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
 		$params[] = true; // HttpOnly
@@ -429,7 +380,6 @@ function apply_queries($query, $tables, $escape = 'table') {
 * @param string
 * @param string
 * @param bool
-* @return bool
 */
 function queries_redirect($location, $message, $redirect) {
 	return query_redirect(queries(), $location, $message, $redirect, false, !$redirect);
@@ -507,7 +457,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 	if (!preg_match("(^([\t\r\n -\x{FFFF}]{0,$length})($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
 		preg_match("(^([\t\r\n -~]{0,$length})($)?)", $string, $match);
 	}
-	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>...</i>");
+	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<em>...</em>");
 }
 
 /** Generate friendly URL
@@ -550,9 +500,8 @@ function hidden_fields_get() {
 * @return array array($col => array())
 */
 function column_foreign_keys($table) {
-	global $adminer;
 	$return = array();
-	foreach ($adminer->foreignKeys($table) as $foreign_key) {
+	foreach (foreign_keys($table) as $foreign_key) {
 		foreach ($foreign_key["source"] as $val) {
 			$return[$val][] = $foreign_key;
 		}
@@ -567,15 +516,13 @@ function column_foreign_keys($table) {
 * @param mixed int|string|array
 * @return null
 */
-function enum_input($type, $attrs, $field, $value) {
+function enum_input($type, $name, $field, $value) {
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
-	$return = "";
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $val));
 		$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
-		$return .= " <label><input type='$type'$attrs value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($val) . '</label>';
+		echo " <label><input type='$type' name='$name' value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($val) . '</label>';
 	}
-	return $return;
 }
 
 /** Print edit input field
@@ -589,9 +536,10 @@ function input($field, $value, $function) {
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
 	$functions = (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
-	$attrs = " name='fields[$name]'";
 	if ($field["type"] == "enum") {
-		echo nbsp($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
+		echo nbsp($functions[""]) . "<td>" . ($functions["orig"] ? "<label><input type='radio' name='fields[$name]' value='-1' checked><em>$functions[orig]</em></label> " : "");
+		echo $adminer->editInput($_GET["edit"], $field, " name='fields[$name]'", $value);
+		enum_input("radio", "fields[$name]", $field, $value);
 	} else {
 		$first = 0;
 		foreach ($functions as $key => $val) {
@@ -600,9 +548,9 @@ function input($field, $value, $function) {
 			}
 			$first++;
 		}
-		$onchange = ($first ? " onchange=\"var f = this.form['function[" . js_escape($name) . "]']; 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 : "") : nbsp(reset($functions))) . '<td>';
+		$onchange = ($first ? " onchange=\"var f = this.form['function[" . addcslashes($name, "\r\n'\\") . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
+		$attrs = " name='fields[$name]'$onchange";
+		echo (count($functions) > 1 ? html_select("function[$name]", $functions, !isset($function) || in_array($function, $functions) ? $function : "") : nbsp(reset($functions))) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
@@ -613,14 +561,14 @@ function input($field, $value, $function) {
 				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
 				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . "$onchange>" . h($val) . '</label>';
 			}
-		} elseif (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
+		} elseif (ereg('binary|blob|bytea', $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 onkeydown='return textareaKeydown(this, event);'>" . h($value) . '</textarea>'; // 1.2em - line-height
+		} elseif (ereg('text|blob', $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
 		} 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));
-			echo "<input value='" . h($value) . "'" . ($maxlength ? " maxlength='$maxlength'" : "") . (ereg('char|binary', $field["type"]) && $maxlength > 20 ? " size='40'" : "") . "$attrs>";
+			$maxlength = (!ereg('int', $field["type"]) && preg_match('~^([0-9]+)(,([0-9]+))?$~', $field["length"], $match) ? ($match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
+			echo "<input value='" . h($value) . "'" . ($maxlength ? " maxlength='$maxlength'" : "") . (ereg('char', $field["type"]) && $field["length"] > 20 ? " size='40'" : "") . "$attrs>";
 		}
 	}
 }
@@ -630,7 +578,7 @@ function input($field, $value, $function) {
 * @return string
 */
 function process_input($field) {
-	global $adminer;
+	global $connection, $adminer;
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
@@ -641,7 +589,7 @@ function process_input($field) {
 		if ($value == "") {
 			return "NULL";
 		}
-		return +$value;
+		return intval($value);
 	}
 	if ($field["auto_increment"] && $value == "") {
 		return null;
@@ -655,12 +603,12 @@ function process_input($field) {
 	if ($field["type"] == "set") {
 		return array_sum((array) $value);
 	}
-	if (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
+	if (ereg('binary|blob|bytea', $field["type"]) && ini_bool("file_uploads")) {
 		$file = get_file("fields-$idf");
 		if (!is_string($file)) {
 			return false; //! report errors
 		}
-		return q($file);
+		return $connection->quote($file);
 	}
 	return $adminer->processInput($field, $value, $function);
 }
@@ -672,14 +620,12 @@ function process_input($field) {
 */
 function search_tables() {
 	global $adminer, $connection;
-	$_GET["where"][0]["op"] = "LIKE %%";
-	$_GET["where"][0]["val"] = $_POST["query"];
 	$found = false;
 	foreach (table_status() as $table => $table_status) {
 		$name = $adminer->tableName($table_status);
 		if (isset($table_status["Engine"]) && $name != "" && (!$_POST["tables"] || in_array($table, $_POST["tables"]))) {
 			$result = $connection->query("SELECT" . limit("1 FROM " . table($table), " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())), 1));
-			if ($result->fetch_row()) {
+			if ($result->num_rows) {
 				if (!$found) {
 					echo "<ul>\n";
 					$found = true;
@@ -697,11 +643,11 @@ function search_tables() {
 */
 function dump_csv($row) {
 	foreach ($row as $key => $val) {
-		if (preg_match("~[\"\n,;\t]~", $val) || $val === "") {
+		if (preg_match("~[\"\n,;]~", $val) || $val === "") {
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
-	echo implode(($_POST["format"] == "csv" ? "," : ($_POST["format"] == "tsv" ? "\t" : ";")), $row) . "\n";
+	echo implode(($_POST["format"] == "csv" ? "," : ";"), $row) . "\n";
 }
 
 /** Apply SQL function
@@ -748,7 +694,7 @@ function password_file() {
 * @param string
 * @return bool
 */
-function is_mail($email) {
+function is_email($email) {
 	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
 	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
@@ -757,11 +703,11 @@ function is_mail($email) {
 
 /** Check whether the string is URL address
 * @param string
-* @return string "http", "https" or ""
+* @return bool
 */
 function is_url($string) {
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
-	return (preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string, $match) ? strtolower($match[1]) : ""); //! restrict path, query and fragment characters
+	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
+	return preg_match("~^https?://($domain?\\.)+$domain(:[0-9]+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
 }
 
 /** Print header for hidden fieldset (close by </div></fieldset>)

adminer/include/lang.inc.php

@@ -8,24 +8,20 @@ $langs = array(
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
 	'de' => 'Deutsch', // Klemens Häckel - http://clickdimension.wordpress.com
-	'fr' => 'Français', // Francis Gagné, Aurélien Royer
+	'fr' => 'Français', // Francis Gagné
 	'it' => 'Italiano', // Alessandro Fiorotto, Paolo Asperti
 	'et' => 'Eesti', // Priit Kallas
-	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
-	'ca' => 'Català', // Joan Llosas
 	'ru' => 'Русский язык', // Maksim Izmaylov
 	'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
-	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 );
 
 function lang($idf, $number = null) {
 	global $LANG, $translations;
 	$translation = $translations[$idf];
 	if (is_array($translation) && $translation) {
-		$pos = ($number == 1 || (!$number && $LANG == 'fr') ? 0 : ((!$number || $number >= 5) && ereg('cs|sk|ru', $LANG) ? 2 : 1)); // French treat zero as singular, Slavic languages use different form for 2, 3, 4
+		$pos = ($number == 1 ? 0 : ((!$number || $number >= 5) && ereg('cs|sk|ru', $LANG) ? 2 : 1)); // Slavic languages use different form for 2, 3, 4
 		$translation = $translation[$pos];
 	}
 	$args = func_get_args();

adminer/include/pdo.inc.php

@@ -1,7 +1,7 @@
 <?php
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	/*abstract*/ class Min_PDO extends PDO {
+	/*abstract */class Min_PDO extends PDO {
 		var $_result, $server_info, $affected_rows, $error;
 		
 		function __construct() {
@@ -79,4 +79,5 @@ if (extension_loaded('pdo')) {
 	}
 }
 
+$possible_drivers = array();
 $drivers = array();

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "3.1.0";
+$VERSION = "3.0.0-dev";

adminer/index.php

@@ -1,15 +1,14 @@
 <?php
 /** Adminer - Compact database management
 * @link http://www.adminer.org/
-* @author Jakub Vrana, http://www.vrana.cz/
+* @author Jakub Vrana, http://php.vrana.cz/
 * @copyright 2007 Jakub Vrana
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
 include "./include/bootstrap.inc.php";
 
-$enum_length = "'(?:''|[^'\\\\]|\\\\.)*+'";
+$enum_length = '\'(?:\'\'|[^\'\\\\]|\\\\.)*\'|"(?:""|[^"\\\\]|\\\\.)*"';
 $inout = array("IN", "OUT", "INOUT");
 
 if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {
@@ -55,8 +54,6 @@ if (isset($_GET["download"])) {
 	include "./procedure.inc.php";
 } elseif (isset($_GET["sequence"])) {
 	include "./sequence.inc.php";
-} elseif (isset($_GET["type"])) {
-	include "./type.inc.php";
 } elseif (isset($_GET["trigger"])) {
 	include "./trigger.inc.php";
 } elseif (isset($_GET["user"])) {
@@ -67,8 +64,6 @@ if (isset($_GET["download"])) {
 	include "./select.inc.php";
 } elseif (isset($_GET["variables"])) {
 	include "./variables.inc.php";
-} elseif (isset($_GET["script"])) {
-	include "./script.inc.php";
 } else {
 	include "./db.inc.php";
 }

adminer/indexes.inc.php

@@ -2,14 +2,10 @@
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE);
-if (eregi("MyISAM|M?aria", $table_status["Engine"])) {
+if (ereg("MyISAM|Maria", $table_status["Engine"])) {
 	$index_types[] = "FULLTEXT";
 }
 $indexes = indexes($TABLE);
-if ($jush == "sqlite") { // doesn't support primary key
-	unset($index_types[0]);
-	unset($indexes[""]);
-}
 if ($_POST && !$error && !$_POST["add"]) {
 	$alter = array();
 	foreach ($_POST["indexes"] as $index) {
@@ -21,7 +17,7 @@ if ($_POST && !$error && !$_POST["add"]) {
 			foreach ($index["columns"] as $key => $column) {
 				if ($column != "") {
 					$length = $index["lengths"][$key];
-					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "");
+					$set[] = idf_escape($column) . ($length ? "(" . intval($length) . ")" : "");
 					$columns[] = $column;
 					$lengths[] = ($length ? $length : null);
 				}
@@ -76,19 +72,18 @@ if ($_POST) {
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" class="nowrap">
+<table cellspacing="0">
 <thead><tr><th><?php echo lang('Index Type'); ?><th><?php echo lang('Column (length)'); ?></thead>
 <?php
-$j = 1;
+$j = 0;
 foreach ($row["indexes"] as $index) {
-	echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow(this);" : 1)) . "<td>";
+	echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) - 1 ? "indexesAddRow(this);" : 1)) . "<td>\n";
 	ksort($index["columns"]);
-	$i = 1;
-	foreach ($index["columns"] as $column) {
+	foreach ($index["columns"] as $i => $column) {
 		echo "<span>" . html_select("indexes[$j][columns][$i]", array(-1 => "") + $fields, $column, ($i == count($index["columns"]) ? "indexesAddColumn(this);" : 1));
-		echo "<input name='indexes[$j][lengths][$i]' size='2' value='" . h($index["lengths"][$i]) . "'> </span>"; //! hide for non-MySQL drivers, add ASC|DESC
-		$i++;
+		echo "<input name='indexes[$j][lengths][$i]' size='2' value='" . h($index["lengths"][$i]) . "'> </span>\n"; //! hide for non-MySQL drivers, add ASC|DESC
 	}
+	echo "\n";
 	$j++;
 }
 ?>

adminer/lang/ar.inc.php

@@ -1,269 +0,0 @@
-<?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 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.' => 'تم تعديل العنصر.',
-	'Edit' => 'تعديل',
-	'Insert' => 'إنشاء',
-	'Save and insert next' => 'جفظ و إنشاء التالي',
-	'Delete' => 'مسح',
-	'Database' => 'قاعدة بيانات',
-	'Routines' => 'الروتينات',
-	'Indexes have been altered.' => 'تم تعديل المؤشر.',
-	'Indexes' => 'المؤشرات',
-	'Alter indexes' => 'تعديل المؤشرات',
-	'Add next' => 'إضافة التالي',
-	'Language' => 'اللغة',
-	'Select' => 'إختيار',
-	'New item' => 'عنصر جديد',
-	'Search' => 'بحث',
-	'Sort' => 'ترتيب',
-	'descending' => 'تنازلي',
-	'Limit' => 'حد',
-	'No rows.' => 'لا توجد نتائج.',
-	'Action' => 'حركة',
-	'edit' => 'تعديل',
-	'Page' => 'صفحة',
-	'Query executed OK, %d row(s) affected.' => 'تم تنفسذ الإستعلام, %d عدد الأسطر المعدلة.',
-	'Error in query' => 'هناك خطأ في الإستعلام',
-	'Execute' => 'تنفيذ',
-	'Table' => 'جدول',
-	'Foreign keys' => 'مفاتيح أجنبية',
-	'Triggers' => 'الزنادات',
-	'View' => 'عرض',
-	'Unable to select the table' => 'من غير الممكن إختيار الجدول',
-	'Invalid CSRF token. Send the form again.' => 'CSRF Token خاطئ. من فضلك أعد إرسال الإستمارة.',
-	'Comment' => 'تعليق',
-	'Default values' => 'القيمة الإفتراضية',
-	'%d byte(s)' => '%d بايت',
-	'No commands to execute.' => 'لا توجد أوامر للتنفيذ.',
-	'Unable to upload a file.' => 'من غير الممكن رفع الملف.',
-	'File upload' => 'رفع ملف',
-	'File uploads are disabled.' => 'تم إلغاء رفع الملفات.',
-	'Routine has been called, %d row(s) affected.' => 'تم إستدعاء الروتين, عدد الأسطر المعدلة %d.',
-	'Call' => 'إستدعاء',
-	'No extension' => 'إمتداد غير موجود',
-	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php المدعومة غير موجودة.',
-	'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 DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => 'نوع المؤشر',
-	'Column (length)' => 'العمود (الطول)',
-	'View has been dropped.' => 'تم مسح العرض.',
-	'View has been altered.' => 'تم تعديل العرض.',
-	'View has been created.' => 'تم إنشاء العرض.',
-	'Alter view' => 'تعديل عرض',
-	'Create view' => 'إنشاء عرض',
-	'Name' => 'الإسم',
-	'Process list' => 'قائمة الإجراءات',
-	'%d process(es) have been killed.' => 'عدد الإجراءات التي تم إيقافها %d.',
-	'Kill' => 'إيقاف',
-	'Parameter name' => 'إسم المتغير',
-	'Database schema' => 'مخطط فاعدة البيانات',
-	'Create procedure' => 'إنشاء إجراء',
-	'Create function' => 'إنشاء دالة',
-	'Routine has been dropped.' => 'تم حذف الروتين.',
-	'Routine has been altered.' => 'تم تعديل الروتين.',
-	'Routine has been created.' => 'تم إنشاء الروتين.',
-	'Alter function' => 'تعديل الدالة',
-	'Alter procedure' => 'تعديل الإجراء',
-	'Return type' => 'نوع العودة',
-	'Add trigger' => 'إضافة زناد',
-	'Trigger has been dropped.' => 'تم حذف الزناد.',
-	'Trigger has been altered.' => 'تم تعديل الزناد.',
-	'Trigger has been created.' => 'تم إنشاء الزناد.',
-	'Alter trigger' => 'تعديل زناد',
-	'Create trigger' => 'إنشاء زناد',
-	'Time' => 'الوقت',
-	'Event' => 'الحدث',
-	'%d row(s)' => '%d أسطر',
-	'Remove' => 'مسح',
-	'Are you sure?' => 'هل أنت متأكد؟',
-	'Privileges' => 'الإمتيازات',
-	'Create user' => 'إنشاء مستخدم',
-	'User has been dropped.' => 'تم حذف المستخدم.',
-	'User has been altered.' => 'تم تعديل المستخدم.',
-	'User has been created.' => 'تم إنشاء المستخدم.',
-	'Hashed' => 'تلبيد',
-	'Column' => 'عمود',
-	'Routine' => 'روتين',
-	'Grant' => 'Grant',
-	'Revoke' => 'Revoke',
-	'%s version: %s through PHP extension %s' => 'النسخة %s : %s عن طريق إمتداد ال PHP %s',
-	'Logged as: %s' => 'تم تسجيل الدخول بإسم %s',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'معلومات POST كبيرة جدا. قم بتقليص حجم المعلومات أو قم بزيادة قيمة %s في خيارات ال PHP.',
-	'Move up' => 'نقل للأعلى',
-	'Move down' => 'نقل للأسفل',
-	'Export' => 'تصدير',
-	'Tables' => 'جداول',
-	'Data' => 'معلومات',
-	'Output' => 'إخراج',
-	'open' => 'فتح',
-	'save' => 'حفظ',
-	'Format' => 'الصيغة',
-	'Functions' => 'الدوال',
-	'Aggregation' => 'تجميع',
-	'Event has been dropped.' => 'تم مسح الحدث.',
-	'Event has been altered.' => 'تم تعديل الحدث.',
-	'Event has been created.' => 'تم إنشاء الحدث.',
-	'Alter event' => 'تعديل حدث',
-	'Create event' => 'إنشاء حدث',
-	'Start' => 'إبدأ',
-	'End' => 'إنهاء',
-	'Every' => 'كل',
-	'Status' => 'حالة',
-	'On completion preserve' => 'حفظ عند الإنتهاء',
-	'Events' => 'الأحداث',
-	'Schedule' => 'مواعيد',
-	'At given time' => 'في وقت محدد',
-	'Save and continue edit' => 'إحفظ و واصل التعديل',
-	'original' => 'الأصلي',
-	'Tables have been truncated.' => 'تم قطع الجداول.',
-	'Tables have been moved.' => 'تم نقل الجداول.',
-	'Tables have been dropped.' => 'تم حذف الجداول.',
-	'Tables and views' => 'الجداول و العروض',
-	'Engine' => 'المحرك',
-	'Collation' => 'ترتيب',
-	'Data Length' => 'طول المعطيات.',
-	'Index Length' => 'طول المؤشر.',
-	'Data Free' => 'المساحة الحرة',
-	'Rows' => 'الأسطر',
-	',' => ',',
-	'Analyze' => 'تحليل',
-	'Optimize' => 'تحسين',
-	'Check' => 'فحص',
-	'Repair' => 'إصلاح',
-	'Truncate' => 'قطع',
-	'Move to other database' => 'نقل إلى قاعدة بيانات أخرى',
-	'Move' => 'نقل',
-	'%d item(s) have been affected.' => 'عدد العناصر المعدلة هو %d.',
-	'whole result' => 'نتيجة كاملة',
-	'Clone' => 'نسخ',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s و %s.',
-	'Partition by' => 'مقسم بواسطة',
-	'Partitions' => 'التقسيمات',
-	'Partition name' => 'إسم التقسيم',
-	'Values' => 'القيم',
-	'%d row(s) have been imported.' => 'عدد الأسطر المستوردة هو %d.',
-	'anywhere' => 'في اي مكان',
-	'CSV Import' => 'إستيراد CSV',
-	'Import' => 'إستيراد',
-	'Stop on error' => 'أوقف في حالة حدوث خطأ',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$5/$3/$1',
-	'[yyyy]-mm-dd' => 'jj/mm/[aaaa]',
-	'History' => 'تاريخ',
-	'Variables' => 'متغيرات',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'أعمدة المصدر و الهدف يجب أن تكون بنفس النوع, يجب أن يكون هناك مؤشر في أعمدة الهدف و البيانات المرجعية يجب ان تكون موجودة.',
-	'Relations' => 'علاقات',
-	'Run file' => 'نفذ الملف',
-	'Clear' => 'مسح',
-	'Maximum allowed file size is %sB.' => 'حجم الملف الأقصى هو %sB.',
-	'Numbers' => 'أعداد',
-	'Date and time' => 'التاريخ و الوقت',
-	'Strings' => 'سلاسل',
-	'Binary' => 'ثنائية',
-	'Lists' => 'قوائم',
-	'Editor' => 'المحرر',
-	'E-mail' => 'البريد الإلكتروني',
-	'From' => 'من',
-	'Subject' => 'الموضوع',
-	'Send' => 'إرسال',
-	'%d e-mail(s) have been sent.' => 'تم إرسال %d رسالة.',
-	'Webserver file %s' => 'ملف %s من خادم الويب',
-	'File does not exist.' => 'الملف غير موجود.',
-	'%d in total' => '%d في المجموع',
-	'Permanent login' => 'تسجيل دخول دائم',
-	'Databases have been dropped.' => 'تم حذف قواعد البيانات.',
-	'Database has been dropped.' => 'تم حذف قاعدة البيانات.',
-	'Search data in tables' => 'بحث في الجداول',
-	'schema' => 'المخطط',
-	'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.' => 'أنقر نقرا مزدوجا على قيمة لتعديلها.',
-	'Increase Text length to modify this value.' => 'قم بزيادة طول النص لتعديل القيمة.',
-	'Use edit link to modify this value.' => 'إستعمل الرابط "تعديل" لتعديل هذه القيمة.',
-	'last' => 'الأخيرة',
-	'From server' => 'من الخادم',
-	'System' => 'النظام',
-	'Select data' => 'عرض البيانات',
-	'Show structure' => 'عرض التركيبة',
-	'empty' => 'فارغ',
-	'Network' => 'شبكة',
-	'Geometry' => 'هندسة',
-	'File exists.' => 'الملف موجود.',
-	'Attachments' => 'ملفات مرفقة.',
-	'Item%s has been inserted.' => 'تم إدراج العنصر.',
-	'now' => 'الآن',
-	'%d query(s) executed OK.' => array('تم تنفيذ الإستعلام %d بنجاح.', 'تم تنفيذ الإستعلامات %d بنجاح.'),
-	'Show only errors' => 'إعرض الأخطاء فقط',
-	'Last page' => 'الصفحة السابقة',
-	'Refresh' => 'تحديث',
-	'Invalid schema.' => 'مخطط خاطئ.',
-	'Please use one of the extensions %s.' => 'من فضلك إستعمل إحدى الغمتدادات: %s.',
-	'ltr' => 'rtl',
-);

adminer/lang/ca.inc.php

@@ -1,269 +0,0 @@
-<?php
-$translations = array(
-	'Login' => 'Inicia la sessió',
-	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlids.',
-	'Server' => 'Servidor',
-	'Username' => 'Nom d\'usuari',
-	'Password' => 'Contrasenya',
-	'Select database' => 'Selecciona base de dades',
-	'Invalid database.' => 'Base de dades invàlida.',
-	'Create new database' => 'Crea una nova base de dades',
-	'Table has been dropped.' => 'S\'ha suprimit la taula.',
-	'Table has been altered.' => 'S\'ha modificat la taula.',
-	'Table has been created.' => 'S\'ha creat la taula.',
-	'Alter table' => 'Modifica la taula',
-	'Create table' => 'Crea una taula',
-	'Table name' => 'Nom de la taula',
-	'engine' => 'motor',
-	'collation' => 'compaginació',
-	'Column name' => 'Nom de la columna',
-	'Type' => 'Tipus',
-	'Length' => 'Llargada',
-	'Auto Increment' => 'Increment automàtic',
-	'Options' => 'Opcions',
-	'Save' => 'Desa',
-	'Drop' => 'Suprimeix',
-	'Database has been dropped.' => 'S\'ha suprimit la base de dades.',
-	'Database has been created.' => 'S\'ha creat la base de dades.',
-	'Database has been renamed.' => 'S\'ha canviat el nom de la base de dades.',
-	'Database has been altered.' => 'S\'ha modificat la base de dades.',
-	'Alter database' => 'Modifica la base de dades',
-	'Create database' => 'Crea una base de dades',
-	'SQL command' => 'Ordre SQL',
-	'Dump' => 'Exporta',
-	'Logout' => 'Desconnecta',
-	'database' => 'base de dades',
-	'Use' => 'Utilitza',
-	'No tables.' => 'No hi ha cap taula.',
-	'select' => 'registres',
-	'Create new table' => 'Crea una nova taula',
-	'Item has been deleted.' => 'S\'ha suprmit l\'element.',
-	'Item has been updated.' => 'S\'ha actualitzat l\'element.',
-	'Item%s has been inserted.' => 'S\'ha insertat l\'element%s.',
-	'Edit' => 'Edita',
-	'Insert' => 'Insereix',
-	'Save and insert next' => 'Desa i insereix el següent',
-	'Delete' => 'Suprimeix',
-	'Database' => 'Base de dades',
-	'Routines' => 'Rutines',
-	'Indexes have been altered.' => 'S\'han modificat els índexs.',
-	'Indexes' => 'Índexs',
-	'Alter indexes' => 'Modifica els índexs',
-	'Add next' => 'Afegeix el següent',
-	'Language' => 'Idioma',
-	'Select' => 'Selecciona',
-	'New item' => 'Nou element',
-	'Search' => 'Cerca',
-	'Sort' => 'Ordena',
-	'descending' => 'descendent',
-	'Limit' => 'Límit',
-	'No rows.' => 'No hi ha cap fila.',
-	'Action' => 'Acció',
-	'edit' => 'edita',
-	'Page' => 'Plana',
-	'Query executed OK, %d row(s) affected.' => array('Consulta executada correctament, %d fila modificada.', 'Consulta executada correctament, %d files modificades.'),
-	'Error in query' => 'Error en la consulta',
-	'Execute' => 'Executa',
-	'Table' => 'Taula',
-	'Foreign keys' => 'Claus foranes',
-	'Triggers' => 'Activadors',
-	'View' => 'Vista',
-	'Unable to select the table' => 'Impossible seleccionar la taula',
-	'Invalid CSRF token. Send the form again.' => 'Token CSRF invàlid. Torna a enviar el formulari.',
-	'Comment' => 'Comentari',
-	'Default values' => 'Valors per defecte',
-	'%d byte(s)' => array('%d byte', '%d bytes'),
-	'No commands to execute.' => 'Cap comanda per executar.',
-	'Unable to upload a file.' => 'Impossible adjuntar el fitxer.',
-	'File upload' => 'Adjunta un fitxer',
-	'File uploads are disabled.' => 'L\'ddjunció de fitxers està desactivada.',
-	'Routine has been called, %d row(s) affected.' => array('S\'ha cridat la rutina, %d fila modificada.', 'S\'ha cridat la rutina, %d files modificades.'),
-	'Call' => 'Crida',
-	'No extension' => 'Cap extensió',
-	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP soporatades (%s) disponible.',
-	'Session support must be enabled.' => 'Cal que estigui permès l\'us de sessions.',
-	'Session expired, please login again.' => 'La sessió ha expirat, torna a iniciar-ne una.',
-	'Text length' => 'Longitud del text',
-	'Foreign key has been dropped.' => 'S\'ha suprimit la clau forana.',
-	'Foreign key has been altered.' => 'S\'ha modificat la clau forana.',
-	'Foreign key has been created.' => 'S\'ha creat la clau forana.',
-	'Foreign key' => 'Clau forana',
-	'Target table' => 'Taula de destí',
-	'Change' => 'Canvi',
-	'Source' => 'Font',
-	'Target' => 'Destí',
-	'Add column' => 'Afegeix una columna',
-	'Alter' => 'Modifica',
-	'Add foreign key' => 'Afegeix una clau forana',
-	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => 'Tipus d\'índex',
-	'Column (length)' => 'Columna (longitud)',
-	'View has been dropped.' => 'S\'ha suprimit la vista.',
-	'View has been altered.' => 'S\'ha modificat la vista.',
-	'View has been created.' => 'S\'ha creat la vista.',
-	'Alter view' => 'Modifica la vista',
-	'Create view' => 'Crea una vista',
-	'Name' => 'Nom',
-	'Process list' => 'Llista de processos',
-	'%d process(es) have been killed.' => array('S\'ha aturat %d procés.', 'S\'han aturat %d processos.'),
-	'Kill' => 'Atura',
-	'Parameter name' => 'Nom del paràmetre',
-	'Database schema' => 'Esquema de la base de dades',
-	'Create procedure' => 'Crea un procediment',
-	'Create function' => 'Crea una funció',
-	'Routine has been dropped.' => 'S\'ha suprimit la rutina.',
-	'Routine has been altered.' => 'S\'ha modificat la rutina.',
-	'Routine has been created.' => 'S\'ha creat la rutina.',
-	'Alter function' => 'Modifica la funció',
-	'Alter procedure' => 'Modifica el procediment',
-	'Return type' => 'Tipus retornat',
-	'Add trigger' => 'Afegeix un activador',
-	'Trigger has been dropped.' => 'S\'ha suprimit l\'activador.',
-	'Trigger has been altered.' => 'S\'ha modificat l\'activador.',
-	'Trigger has been created.' => 'S\'ha creat l\'activador.',
-	'Alter trigger' => 'Modifica l\'activador',
-	'Create trigger' => 'Crea un activador',
-	'Time' => 'Temps',
-	'Event' => 'Event',
-	'%s version: %s through PHP extension %s' => 'Versió %s: %s amb l\'extensió de PHP %s',
-	'%d row(s)' => array('%d fila', '%d files'),
-	'Remove' => 'Suprimeix',
-	'Are you sure?' => 'Estàs segur?',
-	'Privileges' => 'Privilegis',
-	'Create user' => 'Crea un usuari',
-	'User has been dropped.' => 'S\'ha suprimit l\'usuari.',
-	'User has been altered.' => 'S\'ha modificat l\'usuari.',
-	'User has been created.' => 'S\'ha creat l\'usuari.',
-	'Hashed' => 'Hashed',
-	'Column' => 'Columna',
-	'Routine' => 'Rutina',
-	'Grant' => 'Grant',
-	'Revoke' => 'Revoke',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Les dades POST són massa grans. Redueix les dades o incrementa la directiva de configuració %s.',
-	'Logged as: %s' => 'Connectat com: %s',
-	'Move up' => 'Mou a dalt',
-	'Move down' => 'Mou a baix',
-	'Functions' => 'Funcions',
-	'Aggregation' => 'Agregació',
-	'Export' => 'Exporta',
-	'Output' => 'Sortida',
-	'open' => 'obre',
-	'save' => 'desa',
-	'Format' => 'Format',
-	'Tables' => 'Taules',
-	'Data' => 'Data',
-	'Event has been dropped.' => 'S\'ha suprimit l\'event.',
-	'Event has been altered.' => 'S\'ha modificat l\'event.',
-	'Event has been created.' => 'S\'ha creat l\'event.',
-	'Alter event' => 'Modifica l\'event',
-	'Create event' => 'Crea un event',
-	'At given time' => 'A un moment donat',
-	'Every' => 'Cada',
-	'Events' => 'Events',
-	'Schedule' => 'Horari',
-	'Start' => 'Comença',
-	'End' => 'Acaba',
-	'Status' => 'Estat',
-	'On completion preserve' => 'Conservar en completar',
-	'Tables and views' => 'Taules i vistes',
-	'Data Length' => 'Longitud de les dades',
-	'Index Length' => 'L\'ongitud de l\'índex',
-	'Data Free' => 'Espai lliure',
-	'Collation' => 'Compaginació',
-	'Analyze' => 'Analitza',
-	'Optimize' => 'Optimitza',
-	'Check' => 'Verifica',
-	'Repair' => 'Repara',
-	'Truncate' => 'Escapça',
-	'Tables have been truncated.' => 'S\'han escapçat les taules.',
-	'Rows' => 'Files',
-	',' => ',',
-	'Tables have been moved.' => 'S\'han desplaçat les taules.',
-	'Move to other database' => 'Desplaça a una altra base de dades',
-	'Move' => 'Desplaça',
-	'Engine' => 'Motor',
-	'Save and continue edit' => 'Desa i segueix editant',
-	'original' => 'original',
-	'%d item(s) have been affected.' => array('S\'ha modificat %d element.', 'S\'han modificat %d elements.'),
-	'whole result' => 'tots els resultats',
-	'Tables have been dropped.' => 'S\'han suprimit les taules.',
-	'Clone' => 'Clona',
-	'Partition by' => 'Fes particions segons',
-	'Partitions' => 'Particions',
-	'Partition name' => 'Nom de la partició',
-	'Values' => 'Valors',
-	'%d row(s) have been imported.' => array('S\'ha importat %d fila.', 'S\'han importat %d files.'),
-	'CSV Import' => 'Importa CSV',
-	'Import' => 'Importa',
-	'Show structure' => 'Mostra l\'estructura',
-	'Select data' => 'Selecciona dades',
-	'Stop on error' => 'Atura en trobar un error',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'S\'ha assolit el nombre màxim de camps. Incrementa %s i %s.',
-	'anywhere' => 'a qualsevol lloc',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$5/$3/$1',
-	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
-	'History' => 'Història',
-	'Variables' => 'Variables',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les columnes origen i destí han de ser del mateix tipus, la columna destí ha d\'estar indexada i les dades referenciades han d\'existir.',
-	'E-mail' => 'Correu electrònic',
-	'From' => 'De',
-	'Subject' => 'Assumpte',
-	'Send' => 'Envia',
-	'%d e-mail(s) have been sent.' => array('S\'ha enviat %d correu electrònic.', 'S\'han enviat %d correus electrònics.'),
-	'Run file' => 'Executa el fitxer',
-	'Numbers' => 'Nombres',
-	'Date and time' => 'Data i hora',
-	'Strings' => 'Cadenes',
-	'Binary' => 'Binari',
-	'Lists' => 'Llistes',
-	'Relations' => 'Relacions',
-	'Maximum allowed file size is %sB.' => 'La mida màxima permesa del fitxer és de %sB.',
-	'Clear' => 'Suprimeix',
-	'Editor' => 'Editor',
-	'Webserver file %s' => 'Fitxer %s del servidor web',
-	'File does not exist.' => 'El fitxer no existeix.',
-	'Permanent login' => 'Sessió permanent',
-	'%d in total' => '%d en total',
-	'Attachments' => 'Adjuncions',
-	'System' => 'Sistema',
-	'last' => 'darrera',
-	'Network' => 'Xarxa',
-	'Geometry' => 'Geometria',
-	'Databases have been dropped.' => 'S\'han suprimit les bases de dades.',
-	'File exists.' => 'El fitxer ja existeix.',
-	'Double click on a value to modify it.' => 'Fes un doble clic a un valor per modificar-lo.',
-	'Increase Text length to modify this value.' => 'Incrementa la Longitud del text per modificar aquest valor.',
-	'Use edit link to modify this value.' => 'Utilitza l\'enllaç d\'edició per modificar aquest valor.',
-	'Alter schema' => 'Modifica l\'esquema',
-	'Create schema' => 'Crea un esquema',
-	'Schema has been dropped.' => 'S\'ha suprimit l\'esquema.',
-	'Schema has been created.' => 'S\'ha creat l\'esquema.',
-	'Schema has been altered.' => 'S\'ha modificat l\'esquema.',
-	'schema' => 'esquema',
-	'Schema' => 'Esquema',
-	'Sequences' => 'Seqüències',
-	'Create sequence' => 'Crea una seqüència',
-	'Sequence has been dropped.' => 'S\'ha suprimit la seqüència.',
-	'Sequence has been created.' => 'S\'ha creat la seqüència.',
-	'Sequence has been altered.' => 'S\'ha modificat la seqüència.',
-	'Alter sequence' => 'Modifica la seqüència',
-	'User types' => 'Tipus de l\'usuari',
-	'Create type' => 'Crea un tipus',
-	'Type has been dropped.' => 'S\'ha suprimit el tipus.',
-	'Type has been created.' => 'S\'ha creat el tipus.',
-	'Alter type' => 'Modifica el tipus',
-	'Search data in tables' => 'Cerca dades en les taules',
-	'From server' => 'En el servidor',
-	'empty' => 'buit',
-	'now' => 'ara',
-	'%d query(s) executed OK.' => array('%d consulta executada correctament.', '%d consultes executades correctament.'),
-	'Show only errors' => 'Mostra només els errors',
-	'Last page' => 'Darrera plana',
-	'Refresh' => 'Refresca',
-	'Invalid schema.' => 'Esquema invàlid.',
-	'Please use one of the extensions %s.' => 'Si us plau, utilitza una de les extensions %s.',
-	'ltr' => 'ltr',
-);

adminer/lang/cs.inc.php

@@ -1,28 +1,136 @@
 <?php
 $translations = array(
-	// label for database system selection (MySQL, SQLite, ...)
-	'System' => 'Systém',
+	'Login' => 'Přihlásit se',
+	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
+	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
 	'Server' => 'Server',
 	'Username' => 'Uživatel',
 	'Password' => 'Heslo',
-	'Permanent login' => 'Trvalé přihlášení',
-	'Login' => 'Přihlásit se',
+	'Select database' => 'Vybrat databázi',
+	'Invalid database.' => 'Nesprávná databáze.',
+	'Create new database' => 'Vytvořit novou databázi',
+	'Table has been dropped.' => 'Tabulka byla odstraněna.',
+	'Table has been altered.' => 'Tabulka byla změněna.',
+	'Table has been created.' => 'Tabulka byla vytvořena.',
+	'Alter table' => 'Pozměnit tabulku',
+	'Create table' => 'Vytvořit tabulku',
+	'Table name' => 'Název tabulky',
+	'engine' => 'úložiště',
+	'collation' => 'porovnávání',
+	'Column name' => 'Název sloupce',
+	'Type' => 'Typ',
+	'Length' => 'Délka',
+	'Auto Increment' => 'Auto Increment',
+	'Options' => 'Volby',
+	'Save' => 'Uložit',
+	'Drop' => 'Odstranit',
+	'Database has been dropped.' => 'Databáze byla odstraněna.',
+	'Database has been created.' => 'Databáze byla vytvořena.',
+	'Database has been renamed.' => 'Databáze byla přejmenována.',
+	'Database has been altered.' => 'Databáze byla změněna.',
+	'Alter database' => 'Pozměnit databázi',
+	'Create database' => 'Vytvořit databázi',
+	'SQL command' => 'SQL příkaz',
+	'Dump' => 'Export',
 	'Logout' => 'Odhlásit',
-	'Logged as: %s' => 'Přihlášen jako: %s',
-	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
-	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
+	'database' => 'databáze',
+	'Use' => 'Vybrat',
+	'No tables.' => 'Žádné tabulky.',
+	'select' => 'vypsat',
+	'Create new table' => 'Vytvořit novou tabulku',
+	'Item has been deleted.' => 'Položka byla smazána.',
+	'Item has been updated.' => 'Položka byla aktualizována.',
+	'Item%s has been inserted.' => 'Položka%s byla vložena.',
+	'Edit' => 'Upravit',
+	'Insert' => 'Vložit',
+	'Save and insert next' => 'Uložit a vložit další',
+	'Delete' => 'Smazat',
+	'Database' => 'Databáze',
+	'Routines' => 'Procedury a funkce',
+	'Indexes have been altered.' => 'Indexy byly změněny.',
+	'Indexes' => 'Indexy',
+	'Alter indexes' => 'Pozměnit indexy',
+	'Add next' => 'Přidat další',
 	'Language' => 'Jazyk',
+	'Select' => 'Vypsat',
+	'New item' => 'Nová položka',
+	'Search' => 'Vyhledat',
+	'Sort' => 'Seřadit',
+	'descending' => 'sestupně',
+	'Limit' => 'Limit',
+	'No rows.' => 'Žádné řádky.',
+	'Action' => 'Akce',
+	'edit' => 'upravit',
+	'Page' => 'Stránka',
+	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
+	'Error in query' => 'Chyba v dotazu',
+	'Execute' => 'Provést',
+	'Table' => 'Tabulka',
+	'Foreign keys' => 'Cizí klíče',
+	'Triggers' => 'Triggery',
+	'View' => 'Pohled',
+	'Unable to select the table' => 'Nepodařilo se vypsat tabulku',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
+	'Comment' => 'Komentář',
+	'Default values' => 'Výchozí hodnoty',
+	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
+	'No commands to execute.' => 'Žádné příkazy k vykonání.',
+	'Unable to upload a file.' => 'Nepodařilo se nahrát soubor.',
+	'File upload' => 'Nahrání souboru',
+	'File uploads are disabled.' => 'Nahrávání souborů není povoleno.',
+	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
+	'Call' => 'Zavolat',
 	'No extension' => 'Žádná extenze',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupná žádná z podporovaných PHP extenzí (%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.',
+	'Text length' => 'Délka textů',
+	'Foreign key has been dropped.' => 'Cizí klíč byl odstraněn.',
+	'Foreign key has been altered.' => 'Cizí klíč byl změněn.',
+	'Foreign key has been created.' => 'Cizí klíč byl vytvořen.',
+	'Foreign key' => 'Cizí klíč',
+	'Target table' => 'Cílová tabulka',
+	'Change' => 'Změnit',
+	'Source' => 'Zdroj',
+	'Target' => 'Cíl',
+	'Add column' => 'Přidat sloupec',
+	'Alter' => 'Změnit',
+	'Add foreign key' => 'Přidat cizí klíč',
+	'ON DELETE' => 'Při smazání',
+	'ON UPDATE' => 'Při změně',
+	'Index Type' => 'Typ indexu',
+	'Column (length)' => 'Sloupec (délka)',
+	'View has been dropped.' => 'Pohled byl odstraněn.',
+	'View has been altered.' => 'Pohled byl změněn.',
+	'View has been created.' => 'Pohled byl vytvořen.',
+	'Alter view' => 'Pozměnit pohled',
+	'Create view' => 'Vytvořit pohled',
+	'Name' => 'Název',
+	'Process list' => 'Seznam procesů',
+	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
+	'Kill' => 'Ukončit',
+	'Parameter name' => 'Název parametru',
+	'Database schema' => 'Schéma databáze',
+	'Create procedure' => 'Vytvořit proceduru',
+	'Create function' => 'Vytvořit funkci',
+	'Routine has been dropped.' => 'Procedura byla odstraněna.',
+	'Routine has been altered.' => 'Procedura byla změněna.',
+	'Routine has been created.' => 'Procedura byla vytvořena.',
+	'Alter function' => 'Změnit funkci',
+	'Alter procedure' => 'Změnit proceduru',
+	'Return type' => 'Návratový typ',
+	'Add trigger' => 'Přidat trigger',
+	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
+	'Trigger has been altered.' => 'Trigger byl změněn.',
+	'Trigger has been created.' => 'Trigger byl vytvořen.',
+	'Alter trigger' => 'Změnit trigger',
+	'Create trigger' => 'Vytvořit trigger',
+	'Time' => 'Čas',
+	'Event' => 'Událost',
 	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP extenzi %s',
-	'Refresh' => 'Obnovit',
-	
-	// text direction
-	'ltr' => 'ltr',
-	
+	'%d row(s)' => array('%d řádek', '%d řádky', '%d řádků'),
+	'Remove' => 'Odebrat',
+	'Are you sure?' => 'Opravdu?',
 	'Privileges' => 'Oprávnění',
 	'Create user' => 'Vytvořit uživatele',
 	'User has been dropped.' => 'Uživatel byl odstraněn.',
@@ -33,93 +141,19 @@ $translations = array(
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
-	
-	'Process list' => 'Seznam procesů',
-	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
-	'Kill' => 'Ukončit',
-	
-	'Variables' => 'Proměnné',
-	'Status' => 'Stav',
-	
-	'SQL command' => 'SQL příkaz',
-	'%d query(s) executed OK.' => array('%d příkaz proběhl v pořádku.', '%d příkazy proběhly v pořádku.', '%d příkazů proběhlo v pořádku.'),
-	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
-	'No commands to execute.' => 'Žádné příkazy k vykonání.',
-	'Error in query' => 'Chyba v dotazu',
-	'Execute' => 'Provést',
-	'Stop on error' => 'Zastavit při chybě',
-	'Show only errors' => 'Zobrazit pouze chyby',
-	// sprintf() format for time of the command
-	'%.3f s' => '%.3f s',
-	'History' => 'Historie',
-	'Clear' => 'Vyčistit',
-	
-	'File upload' => 'Nahrání souboru',
-	'From server' => 'Ze serveru',
-	'Webserver file %s' => 'Soubor %s na webovém serveru',
-	'Run file' => 'Spustit soubor',
-	'File does not exist.' => 'Soubor neexistuje.',
-	'File uploads are disabled.' => 'Nahrávání souborů není povoleno.',
-	'Unable to upload a file.' => 'Nepodařilo se nahrát soubor.',
-	'Maximum allowed file size is %sB.' => 'Maximální povolená velikost souboru je %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy %s.',
-	
+	'Logged as: %s' => 'Přihlášen jako: %s',
+	'Move up' => 'Přesunout nahoru',
+	'Move down' => 'Přesunout dolů',
+	'Functions' => 'Funkce',
+	'Aggregation' => 'Agregace',
 	'Export' => 'Export',
-	'Dump' => 'Export',
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
 	'Format' => 'Formát',
+	'Tables' => 'Tabulky',
 	'Data' => 'Data',
-	
-	'Database' => 'Databáze',
-	'database' => 'databáze',
-	'Use' => 'Vybrat',
-	'Select database' => 'Vybrat databázi',
-	'Invalid database.' => 'Nesprávná databáze.',
-	'Create new database' => 'Vytvořit novou databázi',
-	'Database has been dropped.' => 'Databáze byla odstraněna.',
-	'Databases have been dropped.' => 'Databáze byly odstraněny.',
-	'Database has been created.' => 'Databáze byla vytvořena.',
-	'Database has been renamed.' => 'Databáze byla přejmenována.',
-	'Database has been altered.' => 'Databáze byla změněna.',
-	'Alter database' => 'Pozměnit databázi',
-	'Create database' => 'Vytvořit databázi',
-	'Database schema' => 'Schéma databáze',
-	
-	// thousands separator - must contain single byte
-	',' => ' ',
-	'Engine' => 'Úložiště',
-	'Collation' => 'Porovnávání',
-	'Data Length' => 'Velikost dat',
-	'Index Length' => 'Velikost indexů',
-	'Data Free' => 'Volné místo',
-	'Rows' => 'Řádků',
-	'%d in total' => '%d celkem',
-	'Analyze' => 'Analyzovat',
-	'Optimize' => 'Optimalizovat',
-	'Check' => 'Zkontrolovat',
-	'Repair' => 'Opravit',
-	'Truncate' => 'Vyprázdnit',
-	'Tables have been truncated.' => 'Tabulky byly vyprázdněny.',
-	'Move to other database' => 'Přesunout do jiné databáze',
-	'Move' => 'Přesunout',
-	'Tables have been moved.' => 'Tabulky byly přesunuty.',
-	
-	'Routines' => 'Procedury a funkce',
-	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
-	'Call' => 'Zavolat',
-	'Parameter name' => 'Název parametru',
-	'Create procedure' => 'Vytvořit proceduru',
-	'Create function' => 'Vytvořit funkci',
-	'Routine has been dropped.' => 'Procedura byla odstraněna.',
-	'Routine has been altered.' => 'Procedura byla změněna.',
-	'Routine has been created.' => 'Procedura byla vytvořena.',
-	'Alter function' => 'Změnit funkci',
-	'Alter procedure' => 'Změnit proceduru',
-	'Return type' => 'Návratový typ',
-	
-	'Events' => 'Události',
 	'Event has been dropped.' => 'Událost byla odstraněna.',
 	'Event has been altered.' => 'Událost byla změněna.',
 	'Event has been created.' => 'Událost byla vytvořena.',
@@ -127,164 +161,82 @@ $translations = array(
 	'Create event' => 'Vytvořit událost',
 	'At given time' => 'V daný čas',
 	'Every' => 'Každých',
+	'Events' => 'Události',
 	'Schedule' => 'Plán',
 	'Start' => 'Začátek',
 	'End' => 'Konec',
+	'Status' => 'Stav',
 	'On completion preserve' => 'Po dokončení zachovat',
-	
-	'Tables' => 'Tabulky',
 	'Tables and views' => 'Tabulky a pohledy',
-	'Table' => 'Tabulka',
-	'No tables.' => 'Žádné tabulky.',
-	'Alter table' => 'Pozměnit tabulku',
-	'Create table' => 'Vytvořit tabulku',
-	'Create new table' => 'Vytvořit novou tabulku',
-	'Table has been dropped.' => 'Tabulka byla odstraněna.',
+	'Data Length' => 'Velikost dat',
+	'Index Length' => 'Velikost indexů',
+	'Data Free' => 'Volné místo',
+	'Collation' => 'Porovnávání',
+	'Analyze' => 'Analyzovat',
+	'Optimize' => 'Optimalizovat',
+	'Check' => 'Zkontrolovat',
+	'Repair' => 'Opravit',
+	'Truncate' => 'Vyprázdnit',
+	'Tables have been truncated.' => 'Tabulky byly vyprázdněny.',
+	'Rows' => 'Řádků',
+	',' => ' ',
+	'Tables have been moved.' => 'Tabulky byly přesunuty',
+	'Move to other database' => 'Přesunout do jiné databáze',
+	'Move' => 'Přesunout',
+	'Engine' => 'Úložiště',
+	'Save and continue edit' => 'Uložit a pokračovat v editaci',
+	'original' => 'původní',
+	'%d item(s) have been affected.' => array('Byl ovlivněn %d záznam.', 'Byly ovlivněny %d záznamy.', 'Bylo ovlivněno %d záznamů.'),
+	'whole result' => 'celý výsledek',
 	'Tables have been dropped.' => 'Tabulky byly odstraněny.',
-	'Table has been altered.' => 'Tabulka byla změněna.',
-	'Table has been created.' => 'Tabulka byla vytvořena.',
-	'Table name' => 'Název tabulky',
-	'Show structure' => 'Zobrazit strukturu',
-	'engine' => 'úložiště',
-	'collation' => 'porovnávání',
-	'Column name' => 'Název sloupce',
-	'Type' => 'Typ',
-	'Length' => 'Délka',
-	'Auto Increment' => 'Auto Increment',
-	'Options' => 'Volby',
-	'Comment' => 'Komentář',
-	'Default values' => 'Výchozí hodnoty',
-	'Drop' => 'Odstranit',
-	'Are you sure?' => 'Opravdu?',
-	'Move up' => 'Přesunout nahoru',
-	'Move down' => 'Přesunout dolů',
-	'Remove' => 'Odebrat',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s a %s.',
-	
+	'Clone' => 'Klonovat',
 	'Partition by' => 'Rozdělit podle',
 	'Partitions' => 'Oddíly',
 	'Partition name' => 'Název oddílu',
 	'Values' => 'Hodnoty',
-	
-	'View' => 'Pohled',
-	'View has been dropped.' => 'Pohled byl odstraněn.',
-	'View has been altered.' => 'Pohled byl změněn.',
-	'View has been created.' => 'Pohled byl vytvořen.',
-	'Alter view' => 'Pozměnit pohled',
-	'Create view' => 'Vytvořit pohled',
-	
-	'Indexes' => 'Indexy',
-	'Indexes have been altered.' => 'Indexy byly změněny.',
-	'Alter indexes' => 'Pozměnit indexy',
-	'Add next' => 'Přidat další',
-	'Index Type' => 'Typ indexu',
-	'Column (length)' => 'Sloupec (délka)',
-	
-	'Foreign keys' => 'Cizí klíče',
-	'Foreign key' => 'Cizí klíč',
-	'Foreign key has been dropped.' => 'Cizí klíč byl odstraněn.',
-	'Foreign key has been altered.' => 'Cizí klíč byl změněn.',
-	'Foreign key has been created.' => 'Cizí klíč byl vytvořen.',
-	'Target table' => 'Cílová tabulka',
-	'Change' => 'Změnit',
-	'Source' => 'Zdroj',
-	'Target' => 'Cíl',
-	'Add column' => 'Přidat sloupec',
-	'Alter' => 'Změnit',
-	'Add foreign key' => 'Přidat cizí klíč',
-	'ON DELETE' => 'Při smazání',
-	'ON UPDATE' => 'Při změně',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Zdrojové a cílové sloupce musí mít stejný datový typ, nad cílovými sloupci musí být definován index a odkazovaná data musí existovat.',
-	
-	'Triggers' => 'Triggery',
-	'Add trigger' => 'Přidat trigger',
-	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
-	'Trigger has been altered.' => 'Trigger byl změněn.',
-	'Trigger has been created.' => 'Trigger byl vytvořen.',
-	'Alter trigger' => 'Změnit trigger',
-	'Create trigger' => 'Vytvořit trigger',
-	'Time' => 'Čas',
-	'Event' => 'Událost',
-	'Name' => 'Název',
-	
-	'select' => 'vypsat',
-	'Select' => 'Vypsat',
-	'Select data' => 'Vypsat data',
-	'Functions' => 'Funkce',
-	'Aggregation' => 'Agregace',
-	'Search' => 'Vyhledat',
-	'anywhere' => 'kdekoliv',
-	'Search data in tables' => 'Vyhledat data v tabulkách',
-	'Sort' => 'Seřadit',
-	'descending' => 'sestupně',
-	'Limit' => 'Limit',
-	'Text length' => 'Délka textů',
-	'Action' => 'Akce',
-	'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',
-	'whole result' => 'celý výsledek',
-	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
-	
+	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
 	'CSV Import' => 'Import CSV',
 	'Import' => 'Import',
-	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
-	
-	// in-place editing in select
-	'Double click on a value to modify it.' => 'Dvojklikněte na políčko, které chcete změnit.',
-	'Increase Text length to modify this value.' => 'Ke změně této hodnoty zvyšte Délku textů.',
-	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
-	
-	// %s can contain auto-increment value
-	'Item%s has been inserted.' => 'Položka%s byla vložena.',
-	'Item has been deleted.' => 'Položka byla smazána.',
-	'Item has been updated.' => 'Položka byla aktualizována.',
-	'%d item(s) have been affected.' => array('Byl ovlivněn %d záznam.', 'Byly ovlivněny %d záznamy.', 'Bylo ovlivněno %d záznamů.'),
-	'New item' => 'Nová položka',
-	'original' => 'původní',
-	// label for value '' in enum data type
-	'empty' => 'prázdné',
-	'edit' => 'upravit',
-	'Edit' => 'Upravit',
-	'Insert' => 'Vložit',
-	'Save' => 'Uložit',
-	'Save and continue edit' => 'Uložit a pokračovat v editaci',
-	'Save and insert next' => 'Uložit a vložit další',
-	'Clone' => 'Klonovat',
-	'Delete' => 'Smazat',
-	
+	'Show structure' => 'Zobrazit strukturu',
+	'Select data' => 'Vypsat data',
+	'Stop on error' => 'Zastavit při chybě',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s a %s.',
+	'anywhere' => 'kdekoliv',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$6.$4.$1',
+	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
+	'History' => 'Historie',
+	'Variables' => 'Proměnné',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Zdrojové a cílové sloupce musí mít stejný datový typ, nad cílovými sloupci musí být definován index a odkazovaná data musí existovat.',
 	'E-mail' => 'E-mail',
 	'From' => 'Odesílatel',
 	'Subject' => 'Předmět',
-	'Attachments' => 'Přílohy',
 	'Send' => 'Odeslat',
 	'%d e-mail(s) have been sent.' => array('Byl odeslán %d e-mail.', 'Byly odeslány %d e-maily.', 'Bylo odesláno %d e-mailů.'),
-	
-	// data type descriptions
+	'Run file' => 'Spustit soubor',
 	'Numbers' => 'Čísla',
 	'Date and time' => 'Datum a čas',
 	'Strings' => 'Řetězce',
 	'Binary' => 'Binární',
 	'Lists' => 'Seznamy',
+	'Relations' => 'Vztahy',
+	'Maximum allowed file size is %sB.' => 'Maximální povolená velikost souboru je %sB.',
+	'Clear' => 'Vyčistit',
+	'Editor' => 'Editor',
+	'Webserver file %s' => 'Soubor %s na webovém serveru',
+	'File does not exist.' => 'Soubor neexistuje.',
+	'Permanent login' => 'Trvalé přihlášení',
+	'%d in total' => '%d celkem',
+	'Attachments' => 'Přílohy',
+	'System' => 'Systém',
+	'last' => 'poslední',
 	'Network' => 'Síť',
 	'Geometry' => 'Geometrie',
-	'Relations' => 'Vztahy',
-	
-	'Editor' => 'Editor',
-	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
-	'$1-$3-$5' => '$6.$4.$1',
-	// hint for date format - use language equivalents for day, month and year shortcuts
-	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
-	'now' => 'teď',
-	
-	// general SQLite error in create, drop or rename database
+	'Databases have been dropped.' => 'Databáze byly odstraněny.',
 	'File exists.' => 'Soubor existuje.',
-	'Please use one of the extensions %s.' => 'Prosím použijte jednu z koncovek %s.',
-	
-	// PostgreSQL and MS SQL schema support
+	'Double click on a value to modify it.' => 'Dvojklikněte na políčko, které chcete změnit.',
+	'Increase text length to modify this value.' => 'Ke změně této hodnoty zvyšte délku textů.',
+	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
 	'Alter schema' => 'Pozměnit schéma',
 	'Create schema' => 'Vytvořit schéma',
 	'Schema has been dropped.' => 'Schéma bylo odstraněno.',
@@ -292,20 +244,11 @@ $translations = array(
 	'Schema has been altered.' => 'Schéma bylo změněno.',
 	'schema' => 'schéma',
 	'Schema' => 'Schéma',
-	'Invalid schema.' => 'Nesprávné schéma.',
-	
-	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Vytvořit sekvenci',
 	'Sequence has been dropped.' => 'Sekvence byla odstraněna.',
 	'Sequence has been created.' => 'Sekvence byla vytvořena.',
 	'Sequence has been altered.' => 'Sekvence byla změněna.',
 	'Alter sequence' => 'Pozměnit sekvenci',
-	
-	// PostgreSQL user types support
-	'User types' => 'Uživatelské typy',
-	'Create type' => 'Vytvořit typ',
-	'Type has been dropped.' => 'Typ byl odstraněn.',
-	'Type has been created.' => 'Typ byl vytvořen.',
-	'Alter type' => 'Pozměnit typ',
+	'Search data in tables' => 'Vyhledat data v tabulkách',
 );

adminer/lang/de.inc.php

@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Neue Tabelle',
 	'Item has been deleted.' => 'Datensatz gelöscht.',
 	'Item has been updated.' => 'Datensatz geändert.',
-	'Item%s has been inserted.' => 'Datensatz%s hinzugefügt.',
+	'Item has been inserted.' => 'Datensatz hinzugefügt.',
 	'Edit' => 'Ändern',
 	'Insert' => 'Hinzufügen',
 	'Save and insert next' => 'Speichern und nächsten hinzufügen',
@@ -173,7 +173,7 @@ $translations = array(
 	'Data Free' => 'Freier Bereich',
 	'Collation' => 'Collation',
 	'Analyze' => 'Analysieren',
-	'Optimize' => 'Optimieren',
+	'Optimize' => 'Optimisieren',
 	'Check' => 'Prüfen',
 	'Repair' => 'Reparieren',
 	'Truncate' => 'Entleeren (truncate)',
@@ -199,7 +199,7 @@ $translations = array(
 	'anywhere' => 'beliebig',
 	'CSV Import' => 'Importiere CSV',
 	'Import' => 'Importieren',
-	'Stop on error' => 'Bei Fehler anhalten',
+	'Stop on error' => 'Bei Fehler anhaltan',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',
@@ -225,45 +225,4 @@ $translations = array(
 	'File does not exist.' => 'Datei existiert nicht.',
 	'%d in total' => '%d insgesamt',
 	'Permanent login' => 'Passwort speichern',
-	'Databases have been dropped.' => 'Datenbanken entfernt.',
-	'Search data in tables' => 'Suche in Tabellen',
-	'schema' => 'Schema',
-	'Schema' => 'Schema',
-	'Alter schema' => 'Schema ändern',
-	'Create schema' => 'Neues Schema',
-	'Schema has been dropped.' => 'Schema wurde gelöscht.',
-	'Schema has been created.' => 'Neues Schema erstellt.',
-	'Schema has been altered.' => 'Schema geändert.',
-	'Sequences' => 'Sequenz',
-	'Create sequence' => 'Neue Sequenz',
-	'Alter sequence' => 'Sequenz ändern',
-	'Sequence has been dropped.' => 'Sequenz gelöscht.',
-	'Sequence has been created.' => 'Neue Sequenz erstellt.',
-	'Sequence has been altered.' => 'Sequenz geändert.',
-	'User types' => 'Benutzer-definierte Typen',
-	'Create type' => 'Typ erstellen',
-	'Alter type' => 'Typ ändern',
-	'Type has been dropped.' => 'Typ gelöscht.',
-	'Type has been created.' => 'Typ erstellt.',
-	'Double click on a value to modify it.' => 'Doppelklick zum Bearbeiten des Wertes.',
-	'Increase Text length to modify this value.' => 'Vergrössern Sie die Textlänge um den Wert ändern zu können.',
-	'Use edit link to modify this value.' => 'Benutzen Sie den Link zum editieren dieses Wertes.',
-	'last' => 'letzte',
-	'From server' => 'Auf Server',
-	'System' => 'Datenbank System',
-	'Select data' => 'Daten auswählen',
-	'Show structure' => 'Struktur anzeigen',
-	'empty' => 'leer',
-	'Network' => 'Netzwerk',
-	'Geometry' => 'Geometrie',
-	'File exists.' => 'Datei existiert schon.',
-	'Attachments' => 'Anhänge',
-	'%d query(s) executed OK.' => array('SQL-Query erfolgreich ausgeführt.', '%d SQL-Queries erfolgreich ausgeführt.'),
-	'Show only errors' => 'Nur Fehler anzeigen',
-	'Last page' => 'Letzte Seite',
-	'Refresh' => 'Aktualisieren',
-	'Invalid schema.' => 'Schema nicht gültig.',
-	'Please use one of the extensions %s.' => 'Bitte einen der Dateitypen %s benutzen.',
-	'now' => 'jetzt',
-	'ltr' => 'ltr',
 );

adminer/lang/en.inc.php

@@ -9,5 +9,4 @@ $translations = array(
 	'%d row(s) have been imported.' => array('%d row has been imported.', '%d rows have been imported.'),
 	'%d e-mail(s) have been sent.' => array('%d e-mail has been sent.', '%d e-mails have been sent.'),
 	'%d in total' => '%d in total',
-	'%d query(s) executed OK.' => array('%d query executed OK.', '%d queries executed OK.'),
 );

adminer/lang/es.inc.php

@@ -2,25 +2,25 @@
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Salida exitosa.',
-	'Invalid credentials.' => 'Identificacion inválida.',
+	'Invalid credentials.' => 'Autenticación fallada.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
 	'Select database' => 'Seleccionar Base de datos',
 	'Invalid database.' => 'Base de datos inválida.',
-	'Create new database' => 'Ingrese nueva base de datos',
+	'Create new database' => 'Nueva Base de datos',
 	'Table has been dropped.' => 'Tabla eliminada.',
 	'Table has been altered.' => 'Tabla modificada.',
 	'Table has been created.' => 'Tabla creada.',
-	'Alter table' => 'Modifique estructura',
-	'Create table' => 'Cree tabla',
-	'Table name' => 'Nombre de la tabla',
+	'Alter table' => 'Modificar Estructura',
+	'Create table' => 'Crear tabla',
+	'Table name' => 'Nombre de tabla',
 	'engine' => 'motor',
 	'collation' => 'colación',
 	'Column name' => 'Nombre de columna',
 	'Type' => 'Tipo',
 	'Length' => 'Longitud',
-	'Auto Increment' => 'Incremento automático',
+	'Auto Increment' => 'Auto increment',
 	'Options' => 'Opciones',
 	'Save' => 'Guardar',
 	'Drop' => 'Eliminar',
@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Nueva tabla',
 	'Item has been deleted.' => 'Registro eliminado.',
 	'Item has been updated.' => 'Registro modificado.',
-	'Item%s has been inserted.' => 'Registro%s insertado.',
+	'Item has been inserted.' => 'Registro insertado.',
 	'Edit' => 'Modificar',
 	'Insert' => 'Agregar',
 	'Save and insert next' => 'Guardar e insertar otro',
@@ -69,13 +69,13 @@ $translations = array(
 	'Foreign keys' => 'Claves foráneas',
 	'Triggers' => 'Triggers',
 	'View' => 'Vistas',
-	'Unable to select the table' => 'No es posible seleccionar la tabla',
+	'Unable to select the table' => 'No posible seleccionar la tabla',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Vuelva a enviar los datos del formulario.',
 	'Comment' => 'Comentario',
 	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'No hay comando para ejecutar.',
-	'Unable to upload a file.' => 'No es posible importar archivo.',
+	'Unable to upload a file.' => 'No posible importar archivo.',
 	'File upload' => 'Importar archivo',
 	'File uploads are disabled.' => 'Importación de archivos deshablilitado.',
 	'Routine has been called, %d row(s) affected.' => array('Consulta ejecutada, %d registro afectado.', 'Consulta ejecutada, %d registros afectados.'),
@@ -83,13 +83,13 @@ $translations = array(
 	'No extension' => 'No hay extension',
 	'None of the supported PHP extensions (%s) are available.' => 'Ninguna de las extensiones PHP soportadas (%s) está disponible.',
 	'Session support must be enabled.' => 'Deben estar habilitadas las sesiones.',
-	'Session expired, please login again.' => 'Sesión expirada, por favor ingrese su clave de nuevo.',
+	'Session expired, please login again.' => 'Sesión expirada, favor loguéese de nuevo.',
 	'Text length' => 'Longitud de texto',
-	'Foreign key has been dropped.' => 'Clave externa eliminada.',
-	'Foreign key has been altered.' => 'Clave externa modificada.',
-	'Foreign key has been created.' => 'Clave externa creada.',
-	'Foreign key' => 'Clave externa',
-	'Target table' => 'Tabla de destino',
+	'Foreign key has been dropped.' => 'Clave foránea eliminada.',
+	'Foreign key has been altered.' => 'Clave foránea modificada.',
+	'Foreign key has been created.' => 'Clave foránea creada.',
+	'Foreign key' => 'Clave foránea',
+	'Target table' => 'Tabla destino',
 	'Change' => 'Modificar',
 	'Source' => 'Origen',
 	'Target' => 'Destino',
@@ -109,7 +109,7 @@ $translations = array(
 	'Process list' => 'Lista de procesos',
 	'%d process(es) have been killed.' => array('%d proceso detenido.', '%d procesos detenidos.'),
 	'Kill' => 'Detener',
-	'Parameter name' => 'Nombre de Parámetro',
+	'Parameter name' => 'Nombre de Parametro',
 	'Database schema' => 'Esquema de base de datos',
 	'Create procedure' => 'Crear procedimiento',
 	'Create function' => 'Crear función',
@@ -118,7 +118,7 @@ $translations = array(
 	'Routine has been created.' => 'Procedimiento creado.',
 	'Alter function' => 'Modificar Función',
 	'Alter procedure' => 'Modificar procedimiento',
-	'Return type' => 'Tipo de valor de regreso',
+	'Return type' => 'Tipo de valor retornado',
 	'Add trigger' => 'Agregar trigger',
 	'Trigger has been dropped.' => 'Trigger eliminado.',
 	'Trigger has been altered.' => 'Trigger modificado.',
@@ -162,7 +162,7 @@ $translations = array(
 	'At given time' => 'A hora determinada',
 	'Every' => 'Cada',
 	'Events' => 'Eventos',
-	'Schedule' => 'Agenda',
+	'Schedule' => 'Agendamiento',
 	'Start' => 'Inicio',
 	'End' => 'Fin',
 	'Status' => 'Estado',
@@ -190,7 +190,7 @@ $translations = array(
 	'%d item(s) have been affected.' => array('%d ítem afectado.', '%d itemes afectados.'),
 	'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.' => 'Cantida máxima de campos permitidos excedidos. Favor aumente %s y %s.',
 	'Partition by' => 'Particionar por',
 	'Partitions' => 'Particiones',
 	'Partition name' => 'Nombre de Partición',
@@ -225,45 +225,4 @@ $translations = array(
 	'File does not exist.' => 'Archivo no existe.',
 	'%d in total' => '%d en total',
 	'Permanent login' => 'Guardar contraseña',
-	'Databases have been dropped.' => 'Bases de datos eliminadas.',
-	'Search data in tables' => 'Buscar datos en tablas',
-	'schema' => 'esquema',
-	'Schema' => 'Esquema',
-	'Alter schema' => 'Modificar esquema',
-	'Create schema' => 'Crear esquema',
-	'Schema has been dropped.' => 'Esquema eliminado.',
-	'Schema has been created.' => 'Esquema creado.',
-	'Schema has been altered.' => 'Esquema modificado.',
-	'Sequences' => 'Secuencias',
-	'Create sequence' => 'Crear secuencias',
-	'Alter sequence' => 'Modificar secuencia',
-	'Sequence has been dropped.' => 'Secuencia eliminada.',
-	'Sequence has been created.' => 'Secuencia creada.',
-	'Sequence has been altered.' => 'Secuencia modificada.',
-	'User types' => 'Tipos definido por el usuario',
-	'Create type' => 'Crear tipo',
-	'Alter type' => 'Modificar tipo',
-	'Type has been dropped.' => 'Tipo eliminado.',
-	'Type has been created.' => 'Tipo creado.',
-	'Double click on a value to modify it.' => 'Doble-clic sobre el valor para editarlo.',
-	'Increase Text length to modify this value.' => 'Aumente el tamaño del campo de texto para modificar este valor.',
-	'Use edit link to modify this value.' => 'Utilice el enlace de modificar para realizar los cambios.',
-	'last' => 'último',
-	'From server' => 'Desde servidor',
-	'System' => 'Motor de base de datos',
-	'Select data' => 'Seleccionar datos',
-	'Show structure' => 'Mostrar estructura',
-	'empty' => 'ningúno',
-	'Network' => 'Red',
-	'Geometry' => 'Geometría',
-	'File exists.' => 'Archivo ya existe.',
-	'Attachments' => 'Adjuntos',
-	'%d query(s) executed OK.' => array('%d sentencia sql ejecutada correctamente.', '%d sentencias sql ejecutadas correctamente.'),
-	'Show only errors' => 'Mostrar solamente errores',
-	'Last page' => 'Ultima página',
-	'Refresh' => 'Refrescar',
-	'Invalid schema.' => 'Esquema inválido.',
-	'Please use one of the extensions %s.' => 'Por favor use una de las extensiones %s.',
-	'now' => 'ahora',
-	'ltr' => 'ltr',
 );

adminer/lang/et.inc.php

@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Loo uus tabel',
 	'Item has been deleted.' => 'Kustutamine õnnestus.',
 	'Item has been updated.' => 'Uuendamine õnnestus.',
-	'Item%s has been inserted.' => 'Kirje%s on edukalt lisatud.',
+	'Item has been inserted.' => 'Lisamine õnnestus.',
 	'Edit' => 'Muuda',
 	'Insert' => 'Sisesta',
 	'Save and insert next' => 'Salvesta ja lisa järgmine',
@@ -225,45 +225,4 @@ $translations = array(
 	'File does not exist.' => 'Faili ei leitud.',
 	'%d in total' => 'Kokku: %d',
 	'Permanent login' => 'Jäta mind meelde',
-	'Databases have been dropped.' => 'Andmebaasid on edukalt kustutatud.',
-	'Search data in tables' => 'Otsi kogu andmebaasist',
-	'schema' => 'struktuur',
-	'Schema' => 'Struktuur',
-	'Alter schema' => 'Muuda struktuuri',
-	'Create schema' => 'Loo struktuur',
-	'Schema has been dropped.' => 'Struktuur on edukalt kustutatud.',
-	'Schema has been created.' => 'Struktuur on edukalt loodud.',
-	'Schema has been altered.' => 'Struktuur on edukalt muudetud.',
-	'Sequences' => 'Jadad (sequences)',
-	'Create sequence' => 'Loo jada',
-	'Alter sequence' => 'Muuda jada',
-	'Sequence has been dropped.' => 'Jada on edukalt kustutatud.',
-	'Sequence has been created.' => 'Jada on edukalt loodud.',
-	'Sequence has been altered.' => 'Jada on edukalt muudetud.',
-	'User types' => 'Kasutajatüübid',
-	'Create type' => 'Loo tüüp',
-	'Alter type' => 'Muuda tüüpi',
-	'Type has been dropped.' => 'Tüüp on edukalt kustutatud.',
-	'Type has been created.' => 'Tüüp on edukalt loodud.',
-	'Double click on a value to modify it.' => 'Väärtuse muutmiseks topelt-kliki sellel.',
-	'Increase Text length to modify this value.' => 'Väärtuse muutmiseks suurenda Tekstiveeru pikkust.',
-	'Use edit link to modify this value.' => 'Väärtuse muutmiseks kasuta muutmislinki.',
-	'last' => 'viimane',
-	'From server' => 'Serverist',
-	'System' => 'Andmebaasimootor',
-	'Select data' => 'Vaata andmeid',
-	'Show structure' => 'Näita struktuuri',
-	'empty' => 'tühi',
-	'Network' => 'Võrk (network)',
-	'Geometry' => 'Geomeetria',
-	'File exists.' => 'Fail juba eksisteerib.',
-	'Attachments' => 'Manused',
-	'%d query(s) executed OK.' => array('%d päring edukalt käivitatud.', '%d päringut edukalt käivitatud.'),
-	'Show only errors' => 'Kuva vaid veateateid',
-	'Last page' => 'Viimane lehekülg',
-	'Refresh' => 'Uuenda',
-	'Invalid schema.' => 'Sobimatu skeema.',
-	'Please use one of the extensions %s.' => 'Palun kasuta üht laiendustest %s.',
-	'now' => 'nüüd',
-	'ltr' => 'ltr',
 );

adminer/lang/fr.inc.php

@@ -1,32 +1,33 @@
 <?php
 $translations = array(
 	'Login' => 'Authentification',
-	'Logout successful.' => 'Au revoir !',
+	'Logout successful.' => 'Aurevoir!',
 	'Invalid credentials.' => 'Authentification échouée.',
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
-	'Select database' => 'Sélectionner la base de données',
-	'Invalid database.' => 'Base de données invalide.',
-	'Create new database' => 'Créer une base de données',
-	'Table has been dropped.' => 'La table a été effacée.',
-	'Table has been altered.' => 'La table a été modifiée.',
-	'Table has been created.' => 'La table a été créée.',
+	'Select database' => 'Selectionner la base de donnée',
+	'Invalid database.' => 'Base de donnée invalide.',
+	'Create new database' => 'Créer une base de donnée',
+	'Table has been dropped.' => 'Table effacée.',
+	'Table has been altered.' => 'Table modifiée.',
+	'Table has been created.' => 'Table créée.',
 	'Alter table' => 'Modifier la table',
 	'Create table' => 'Créer une table',
 	'Table name' => 'Nom de la table',
 	'engine' => 'moteur',
-	'collation' => 'interclassement',
+	'collation' => 'collation',
 	'Column name' => 'Nom de la colonne',
 	'Type' => 'Type',
-	'Length' => 'Longueur',
+	'Length' => 'Longeur',
 	'Auto Increment' => 'Auto increment',
 	'Options' => 'Options',
 	'Save' => 'Sauvegarder',
-	'Drop' => 'Supprimer',
-	'Database has been created.' => 'La base de données a été créée.',
-	'Database has been renamed.' => 'La base de données a été renommée.',
-	'Database has been altered.' => 'La base de données a été modifiée.',
+	'Drop' => 'Effacer',
+	'Database has been dropped.' => 'Base de données effacée.',
+	'Database has been created.' => 'Base de données créée.',
+	'Database has been renamed.' => 'Base de données renommée.',
+	'Database has been altered.' => 'Base de données modifiée.',
 	'Alter database' => 'Modifier la base de données',
 	'Create database' => 'Créer une base de données',
 	'SQL command' => 'Requête SQL',
@@ -34,11 +35,12 @@ $translations = array(
 	'Logout' => 'Déconnexion',
 	'database' => 'base de données',
 	'Use' => 'Utiliser',
-	'No tables.' => 'Aucune table.',
+	'No tables.' => 'Aucunes tables.',
 	'select' => 'select',
-	'Create new table' => 'Créer une nouvelle table',
-	'Item has been deleted.' => 'L\'élément a été supprimé.',
-	'Item has been updated.' => 'L\'élément a été modifié.',
+	'Create new table' => 'Créer une table',
+	'Item has been deleted.' => 'Élément supprimé.',
+	'Item has been updated.' => 'Élément modifié.',
+	'Item has been inserted.' => 'Élément inseré.',
 	'Edit' => 'Modifier',
 	'Insert' => 'Insérer',
 	'Save and insert next' => 'Sauvegarder et insérer le prochain',
@@ -49,22 +51,22 @@ $translations = array(
 	'Indexes' => 'Index',
 	'Alter indexes' => 'Modifier les index',
 	'Add next' => 'Ajouter le prochain',
-	'Language' => 'Langue',
+	'Language' => 'Langues',
 	'Select' => 'Select',
 	'New item' => 'Nouvel élément',
 	'Search' => 'Rechercher',
-	'Sort' => 'Trier',
+	'Sort' => 'Ordonner',
 	'descending' => 'décroissant',
-	'Limit' => 'Limite',
+	'Limit' => 'Limit',
 	'No rows.' => 'Aucun résultat.',
 	'Action' => 'Action',
 	'edit' => 'modifier',
 	'Page' => 'Page',
-	'Query executed OK, %d row(s) affected.' => array('Requête exécutée avec succès, %d ligne modifiée.', 'Requête exécutée avec succès, %d lignes modifiées.'),
+	'Query executed OK, %d row(s) affected.' => array('Requête exécutée, %d ligne affectée.', 'Requête exécutée, %d lignes affectées.'),
 	'Error in query' => 'Erreur dans la requête',
 	'Execute' => 'Exécuter',
 	'Table' => 'Table',
-	'Foreign keys' => 'Clés étrangères',
+	'Foreign keys' => 'Clé éxterne',
 	'Triggers' => 'Triggers',
 	'View' => 'Vue',
 	'Unable to select the table' => 'Impossible de sélectionner la table',
@@ -75,81 +77,81 @@ $translations = array(
 	'No commands to execute.' => 'Aucune commande à exécuter.',
 	'Unable to upload a file.' => 'Impossible d\'importer le fichier.',
 	'File upload' => 'Importer un fichier',
-	'File uploads are disabled.' => 'L\'importation de fichier est désactivée.',
-	'Routine has been called, %d row(s) affected.' => array('La routine a été exécutée, %d ligne modifiée.', 'La routine a été exécutée, %d lignes modifiées.'),
+	'File uploads are disabled.' => 'Importation de fichier désactivé.',
+	'Routine has been called, %d row(s) affected.' => array('Routine exécutée, %d ligne modifiée.', 'Routine exécutée, %d lignes modifiées.'),
 	'Call' => 'Appeler',
 	'No extension' => 'Extension introuvable',
 	'None of the supported PHP extensions (%s) are available.' => 'Aucune des extensions PHP supportées (%s) n\'est disponible.',
 	'Session support must be enabled.' => 'Veuillez activer les sessions.',
 	'Session expired, please login again.' => 'Session expirée, veuillez vous authentifier à nouveau.',
 	'Text length' => 'Longueur du texte',
-	'Foreign key has been dropped.' => 'La clé étrangère a été effacée.',
-	'Foreign key has been altered.' => 'La clé étrangère a été modifiée.',
-	'Foreign key has been created.' => 'La clé étrangère a été créée.',
-	'Foreign key' => 'Clé étrangère',
+	'Foreign key has been dropped.' => 'Clé externe effacée.',
+	'Foreign key has been altered.' => 'Clé externe modifiée.',
+	'Foreign key has been created.' => 'Clé externe créée.',
+	'Foreign key' => 'Clé externe',
 	'Target table' => 'Table visée',
 	'Change' => 'Modifier',
 	'Source' => 'Source',
 	'Target' => 'Cible',
 	'Add column' => 'Ajouter une colonne',
 	'Alter' => 'Modifier',
-	'Add foreign key' => 'Ajouter une clé étrangère',
+	'Add foreign key' => 'Ajouter une clé externe',
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Type d\'index',
 	'Column (length)' => 'Colonne (longueur)',
-	'View has been dropped.' => 'La vue a été effacée.',
-	'View has been altered.' => 'La vue a été modifiée.',
-	'View has been created.' => 'La vue a été créée.',
+	'View has been dropped.' => 'Vue effacée.',
+	'View has been altered.' => 'Vue modifiée.',
+	'View has been created.' => 'Vue créée.',
 	'Alter view' => 'Modifier une vue',
 	'Create view' => 'Créer une vue',
 	'Name' => 'Nom',
-	'Process list' => 'Liste des processus',
-	'%d process(es) have been killed.' => array('%d processus a été arrêté.', '%d processus ont été arrêtés.'),
+	'Process list' => 'Liste de processus',
+	'%d process(es) have been killed.' => array('%d processus arrêté.', '%d processus arrêtés.'),
 	'Kill' => 'Arrêter',
-	'Parameter name' => 'Nom du paramètre',
+	'Parameter name' => 'Nom du Paramêtre',
 	'Database schema' => 'Schéma de la base de données',
 	'Create procedure' => 'Créer une procédure',
 	'Create function' => 'Créer une fonction',
-	'Routine has been dropped.' => 'La routine a été supprimée.',
-	'Routine has been altered.' => 'La routine a été modifiée.',
-	'Routine has been created.' => 'La routine a été créée.',
+	'Routine has been dropped.' => 'Procédure éliminée.',
+	'Routine has been altered.' => 'Procédure modifiée.',
+	'Routine has been created.' => 'Procédure créée.',
 	'Alter function' => 'Modifier la fonction',
 	'Alter procedure' => 'Modifier la procédure',
 	'Return type' => 'Type de retour',
 	'Add trigger' => 'Ajouter un trigger',
-	'Trigger has been dropped.' => 'Le trigger a été supprimé.',
-	'Trigger has been altered.' => 'Le trigger a été modifié.',
-	'Trigger has been created.' => 'Le trigger a été créé.',
+	'Trigger has been dropped.' => 'Trigger éliminé.',
+	'Trigger has been altered.' => 'Trigger modifié.',
+	'Trigger has been created.' => 'Trigger créé.',
 	'Alter trigger' => 'Modifier un trigger',
 	'Create trigger' => 'Ajouter un trigger',
 	'Time' => 'Temps',
 	'Event' => 'Évènement',
 	'%d row(s)' => array('%d ligne', '%d lignes'),
 	'Remove' => 'Effacer',
-	'Are you sure?' => 'Êtes-vous certain ?',
-	'Privileges' => 'Privilèges',
+	'Are you sure?' => 'Êtes-vous certain?',
+	'Privileges' => 'Privilège',
 	'Create user' => 'Créer un utilisateur',
-	'User has been dropped.' => 'L\'utilisateur a été effacé.',
-	'User has been altered.' => 'L\'utilisateur a été modifié.',
-	'User has been created.' => 'L\'utilisateur a été créé.',
+	'User has been dropped.' => 'Utilisateur éffacé.',
+	'User has been altered.' => 'Utilisateur modifié.',
+	'User has been created.' => 'Utilisateur créé.',
 	'Hashed' => 'Haché',
 	'Column' => 'Colonne',
 	'Routine' => 'Routine',
 	'Grant' => 'Grant',
 	'Revoke' => 'Revoke',
-	'%s version: %s through PHP extension %s' => 'Version de %s : %s via l\'extension PHP %s',
-	'Logged as: %s' => 'Authentifié en tant que : %s',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Données POST trop grandes. Réduisez la taille des données ou augmentez la valeur de %s dans la configuration de PHP.',
+	'%s version: %s through PHP extension %s' => 'Version de %s: %s utilisant l\'extension %s',
+	'Logged as: %s' => 'Authentifié en tant que %s',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Donnée POST trop grande . Réduire la taille des données ou modifier le %s dans la configuration de PHP.',
 	'Move up' => 'Déplacer vers le haut',
 	'Move down' => 'Déplacer vers le bas',
 	'Export' => 'Exporter',
 	'Tables' => 'Tables',
-	'Data' => 'Données',
+	'Data' => 'Donnée',
 	'Output' => 'Sortie',
 	'open' => 'ouvrir',
 	'save' => 'sauvegarder',
-	'Format' => 'Format',
+	'Format' => 'Formatter',
 	'Functions' => 'Fonctions',
 	'Aggregation' => 'Agrégation',
 	'Event has been dropped.' => 'L\'évènement a été supprimé.',
@@ -160,9 +162,9 @@ $translations = array(
 	'Start' => 'Démarrer',
 	'End' => 'Terminer',
 	'Every' => 'Chaque',
-	'Status' => 'Statut',
+	'Status' => 'Status',
 	'On completion preserve' => 'Conserver quand complété',
-	'Events' => 'Évènements',
+	'Events' => 'Évènement',
 	'Schedule' => 'Horaire',
 	'At given time' => 'À un moment précis',
 	'Save and continue edit' => 'Sauvegarder et continuer l\'édition',
@@ -172,42 +174,42 @@ $translations = array(
 	'Tables have been dropped.' => 'Les tables ont été effacées.',
 	'Tables and views' => 'Tables et vues',
 	'Engine' => 'Moteur',
-	'Collation' => 'Interclassement',
-	'Data Length' => 'Longueur des données',
-	'Index Length' => 'Longueur de l\'index',
-	'Data Free' => 'Espace inutilisé',
-	'Rows' => 'Lignes',
+	'Collation' => 'Collation',
+	'Data Length' => 'Longeur des données',
+	'Index Length' => 'Longeur de l\'index',
+	'Data Free' => 'Vide',
+	'Rows' => 'Rangés',
 	',' => ',',
 	'Analyze' => 'Analyser',
-	'Optimize' => 'Optimiser',
+	'Optimize' => 'Opitimiser',
 	'Check' => 'Vérifier',
 	'Repair' => 'Réparer',
 	'Truncate' => 'Tronquer',
-	'Move to other database' => 'Déplacer vers une autre base de données',
+	'Move to other database' => 'Déplacer dans une autre base de données',
 	'Move' => 'Déplacer',
-	'%d item(s) have been affected.' => array('%d élément a été modifié.', '%d éléments ont été modifiés.'),
+	'%d item(s) have been affected.' => array('%d élément ont été modifié.', '%d éléments ont été modifié.'),
 	'whole result' => 'résultat entier',
 	'Clone' => 'Cloner',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s et %s.',
-	'Partition by' => 'Partitionner par',
+	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre de champs maximum est dépassé. Veuillez augmenter %s et %s.',
+	'Partition by' => 'Partitionné par',
 	'Partitions' => 'Partitions',
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
-	'%d row(s) have been imported.' => array('%d ligne a été importée.','%d lignes ont été importées.'),
+	'%d row(s) have been imported.' => array('%d ligne a été importé.','%d lignes ont été importé.'),
 	'anywhere' => 'n\'importe où',
-	'CSV Import' => 'Importer CSV',
+	'CSV Import' => 'Importation CVS',
 	'Import' => 'Importer',
-	'Stop on error' => 'Arrêter en cas d\'erreur',
+	'Stop on error' => 'Arrêt sur erreur',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'jj/mm/[aaaa]',
 	'History' => 'Historique',
 	'Variables' => 'Variables',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les colonnes de source et de destination doivent être du même type, il doit y avoir un index sur les colonnes de destination et les données référencées doivent exister.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Les colonnes selectionnées et les colonnes de destination doivent être du même type, il doit y avoir un index sur les colonnes de destination et les données de référence doivent exister.',
 	'Relations' => 'Relations',
-	'Run file' => 'Exécuter le fichier',
+	'Run file' => 'Executer le fichier',
 	'Clear' => 'Effacer',
-	'Maximum allowed file size is %sB.' => 'La taille maximale des fichiers est de %sB.',
+	'Maximum allowed file size is %sB.' => 'Taille maximale des fichiers est de %sB.',
 	'Numbers' => 'Nombres',
 	'Date and time' => 'Date et heure',
 	'Strings' => 'Chaînes',
@@ -219,51 +221,8 @@ $translations = array(
 	'Subject' => 'Sujet',
 	'Send' => 'Envoyer',
 	'%d e-mail(s) have been sent.' => array('%d message a été envoyé.', '%d messages ont été envoyés.'),
-	'Webserver file %s' => 'Fichier %s du serveur Web',
+	'Webserver file %s' => '%s fichier du serveur Web',
 	'File does not exist.' => 'Le fichier est introuvable.',
 	'%d in total' => '%d au total',
 	'Permanent login' => 'Authentification permanente',
-	'Databases have been dropped.' => 'Les bases de données ont été supprimées.',
-	'Database has been dropped.' => 'La base de données a été supprimée.',
-	'Search data in tables' => 'Rechercher dans les tables',
-	'schema' => 'schéma',
-	'Schema' => 'Schéma',
-	'Alter schema' => 'Modifier le schéma',
-	'Create schema' => 'Créer un schéma',
-	'Schema has been dropped.' => 'Le schéma a été supprimé.',
-	'Schema has been created.' => 'Le schéma a été créé.',
-	'Schema has been altered.' => 'Le schéma a été modifié.',
-	'Sequences' => 'Séquences',
-	'Create sequence' => 'Créer une séquence',
-	'Alter sequence' => 'Modifier la séquence',
-	'Sequence has been dropped.' => 'La séquence a été supprimée.',
-	'Sequence has been created.' => 'La séquence a été créée.',
-	'Sequence has been altered.' => 'La séquence a été modifiée.',
-	'User types' => 'Types utilisateur',
-	'Create type' => 'Créer un type',
-	'Alter type' => 'Modifier le type',
-	'Type has been dropped.' => 'Le type a été supprimé.',
-	'Type has been created.' => 'Le type a été créé.',
-	'Double click on a value to modify it.' => 'Double-cliquez sur une valeur pour la modifier.',
-	'Increase Text length to modify this value.' => 'Augmentez la Longueur de texte affiché pour modifier cette valeur.',
-	'Use edit link to modify this value.' => 'Utilisez le lien "modifier" pour modifier cette valeur.',
-	'last' => 'dernière',
-	'From server' => 'Depuis le serveur',
-	'System' => 'Système',
-	'Select data' => 'Afficher les données',
-	'Show structure' => 'Afficher la structure',
-	'empty' => 'vide',
-	'Network' => 'Réseau',
-	'Geometry' => 'Géométrie',
-	'File exists.' => 'Le fichier existe.',
-	'Attachments' => 'Pièces jointes',
-	'Item%s has been inserted.' => 'L\'élément%s a été inséré.',
-	'now' => 'maintenant',
-	'%d query(s) executed OK.' => array('%d requête exécutée avec succès.', '%d requêtes exécutées avec succès.'),
-	'Show only errors' => 'Montrer seulement les erreurs',
-	'Last page' => 'Dernière page',
-	'Refresh' => 'Rafraîchir',
-	'Invalid schema.' => 'Schéma invalide.',
-	'Please use one of the extensions %s.' => 'Veuillez utiliser l\'une des extensions %s.',
-	'ltr' => 'ltr',
 );

adminer/lang/hu.inc.php

@@ -1,269 +0,0 @@
-<?php
-$translations = array(
-	'Login' => 'Belépés',
-	'Logout successful.' => 'Sikeres kilépés.',
-	'Invalid credentials.' => 'Érvénytelen adatok.',
-	'Server' => 'Szerver',
-	'Username' => 'Felhasználó',
-	'Password' => 'Jelszó',
-	'Select database' => 'Adatbázis kiválasztása',
-	'Invalid database.' => 'Érvénytelen adatbázis.',
-	'Create new database' => 'Új adatbázis',
-	'Table has been dropped.' => 'A tábla eldobva.',
-	'Table has been altered.' => 'A tábla módosult.',
-	'Table has been created.' => 'A tábla létrejött.',
-	'Alter table' => 'Tábla módosítása',
-	'Create table' => 'Tábla létrehozása',
-	'Table name' => 'Tábla név',
-	'engine' => 'motor',
-	'collation' => 'egybevetés',
-	'Column name' => 'Oszlop neve',
-	'Type' => 'Típus',
-	'Length' => 'Hossz',
-	'Auto Increment' => 'Automatikus növelés',
-	'Options' => 'Opciók',
-	'Save' => 'Mentés',
-	'Drop' => 'Eldob',
-	'Database has been dropped.' => 'Az adatbázis eldobva.',
-	'Database has been created.' => 'Az adatbázis létrejött.',
-	'Database has been renamed.' => 'Az adadtbázis átnevezve.',
-	'Database has been altered.' => 'Az adatbázis módosult.',
-	'Alter database' => 'Adatbázis módosítása',
-	'Create database' => 'Adatbázis létrehozása',
-	'SQL command' => 'SQL parancs',
-	'Dump' => 'Exportálás',
-	'Logout' => 'Kilépés',
-	'database' => 'adatbázis',
-	'Use' => 'Használ',
-	'No tables.' => 'Nincs tábla.',
-	'select' => 'kiválaszt',
-	'Create new table' => 'Új tábla',
-	'Item has been deleted.' => 'A tétel törölve.',
-	'Item has been updated.' => 'A tétel frissítve.',
-	'Item%s has been inserted.' => '%s tétel beszúrva.',
-	'Edit' => 'Szerkeszt',
-	'Insert' => 'Beszúr',
-	'Save and insert next' => 'Mentés és újat beszúr',
-	'Delete' => 'Törlés',
-	'Database' => 'Adatbázis',
-	'Routines' => 'Rutinok',
-	'Indexes have been altered.' => 'Az indexek megváltoztak.',
-	'Indexes' => 'Indexek',
-	'Alter indexes' => 'Index módosítása',
-	'Add next' => 'Következő hozzáadása',
-	'Language' => 'Nyelv',
-	'Select' => 'Kiválaszt',
-	'New item' => 'Új tétel',
-	'Search' => 'Keresés',
-	'Sort' => 'Sorba rendezés',
-	'descending' => 'csökkenő',
-	'Limit' => 'korlát',
-	'No rows.' => 'Nincs megjeleníthető eredmény.',
-	'Action' => 'Művelet',
-	'edit' => 'szerkeszt',
-	'Page' => 'oldal',
-	'Query executed OK, %d row(s) affected.' => array('Lekérdezés sikeresen végrehajtva, %d sor érintett.', 'Lekérdezés sikeresen végrehajtva, %d sor érintett.', 'Lekérdezés sikeresen végrehajtva, %d sor érintett.'),
-	'Error in query' => 'Hiba a lekérdezésben',
-	'Execute' => 'Végrehajt',
-	'Table' => 'Tábla',
-	'Foreign keys' => 'Idegen kulcs',
-	'Triggers' => 'Trigger',
-	'View' => 'Nézet',
-	'Unable to select the table' => 'Nem tudom kiválasztani a táblát',
-	'Invalid CSRF token. Send the form again.' => 'Érvénytelen CSRF azonosító. Küldd újra az űrlapot.',
-	'Comment' => 'Megjegyzés',
-	'Default values' => 'Alapértelmezett értékek',
-	'%d byte(s)' => array('%d bájt', '%d bájt', '%d bájt'),
-	'No commands to execute.' => 'Nincs végrehajtható parancs.',
-	'Unable to upload a file.' => 'Nem tudom feltölteni a fájlt.',
-	'File upload' => 'Fájl feltöltése',
-	'File uploads are disabled.' => 'A fájl feltöltés le van tiltva.',
-	'Routine has been called, %d row(s) affected.' => array('Rutin meghívva, %d sor érintett.', 'Rutin meghívva, %d sor érintett.', 'Rutin meghívva, %d sor érintett.'),
-	'Call' => 'Meghív',
-	'No extension' => 'Nincs kiterjesztés',
-	'None of the supported PHP extensions (%s) are available.' => 'Nincs egy elérhető támogatott PHP kiterjesztés (%s) sem.',
-	'Session support must be enabled.' => 'A munkameneteknek (session) engedélyezve kell lennie.',
-	'Session expired, please login again.' => 'Munkamenet lejárt, jelentkezz be újra.',
-	'Text length' => 'Szöveg hossz',
-	'Foreign key has been dropped.' => 'Idegen kulcs eldobva.',
-	'Foreign key has been altered.' => 'Idegen kulcs módosult.',
-	'Foreign key has been created.' => 'Idegen kulcs létrejött.',
-	'Foreign key' => 'Idegen kulcs',
-	'Target table' => 'Cél tábla',
-	'Change' => 'Változtat',
-	'Source' => 'Forrás',
-	'Target' => 'Cél',
-	'Add column' => 'Oszlop hozzáadása',
-	'Alter' => 'Módosítás',
-	'Add foreign key' => 'Idegen kulcs hozzadása',
-	'ON DELETE' => 'törléskor',
-	'ON UPDATE' => 'frissítéskor',
-	'Index Type' => 'Index típusa',
-	'Column (length)' => 'Oszop (méret)',
-	'View has been dropped.' => 'A nézet eldobva.',
-	'View has been altered.' => 'A nézet módosult.',
-	'View has been created.' => 'A nézet létrejött.',
-	'Alter view' => 'Nézet módosítása',
-	'Create view' => 'Nézet létrehozása',
-	'Name' => 'Név',
-	'Process list' => 'Folyamatok',
-	'%d process(es) have been killed.' => array('%d folyamat leállítva.', '%d folyamat leállítva.', '%d folyamat leállítva.'),
-	'Kill' => 'Leállít',
-	'Parameter name' => 'Paraméter neve',
-	'Database schema' => 'Adatbázis séma',
-	'Create procedure' => 'Eljárás létrehozása',
-	'Create function' => 'Funkció létrehozása',
-	'Routine has been dropped.' => 'A rutin eldobva.',
-	'Routine has been altered.' => 'A rutin módosult.',
-	'Routine has been created.' => 'A rutin létrejött.',
-	'Alter function' => 'Funkció módosítása',
-	'Alter procedure' => 'Eljárás módosítása',
-	'Return type' => 'Visszatérési érték',
-	'Add trigger' => 'Trigger hozzáadása',
-	'Trigger has been dropped.' => 'A trigger eldobva.',
-	'Trigger has been altered.' => 'A trigger módosult.',
-	'Trigger has been created.' => 'A trigger létrejött.',
-	'Alter trigger' => 'Trigger módosítása',
-	'Create trigger' => 'Trigger létrehozása',
-	'Time' => 'Idő',
-	'Event' => 'Esemény',
-	'%s version: %s through PHP extension %s' => '%s verzió: %s, PHP: %s',
-	'%d row(s)' => array('%d sor', '%d sor', '%d sor'),
-	'Remove' => 'Eltávolítás',
-	'Are you sure?' => 'Biztos benne?',
-	'Privileges' => 'Privilégiumok',
-	'Create user' => 'Felhasználó hozzáadása',
-	'User has been dropped.' => 'A felhasználó eldobva.',
-	'User has been altered.' => 'A felhasználó módosult.',
-	'User has been created.' => 'A felhasználó létrejött.',
-	'Hashed' => 'Hashed',
-	'Column' => 'Oszlop',
-	'Routine' => 'Rutin',
-	'Grant' => 'Engedélyezés',
-	'Revoke' => 'Visszavonás',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Túl sok a POST adat! Csökkentsd az adat méretét, vagy növeld a %s beállítást.',
-	'Logged as: %s' => 'Belépve: %s',
-	'Move up' => 'Felfelé',
-	'Move down' => 'Lefelé',
-	'Functions' => 'Funkciók',
-	'Aggregation' => 'Aggregálás',
-	'Export' => 'Export',
-	'Output' => 'Kimenet',
-	'open' => 'megnyit',
-	'save' => 'ment',
-	'Format' => 'Formátum',
-	'Tables' => 'Táblák',
-	'Data' => 'Adat',
-	'Event has been dropped.' => 'Az esemény eldobva.',
-	'Event has been altered.' => 'Az esemény módosult.',
-	'Event has been created.' => 'Az esemény létrejött.',
-	'Alter event' => 'Esemény módosítása',
-	'Create event' => 'Esemény létrehozása',
-	'At given time' => 'Megadott időben',
-	'Every' => 'Minden',
-	'Events' => 'Esemény',
-	'Schedule' => 'Ütemzés',
-	'Start' => 'Kezd',
-	'End' => 'Vége',
-	'Status' => 'Állapot',
-	'On completion preserve' => 'Befejezéskor megőrzi',
-	'Tables and views' => 'Táblák és nézetek',
-	'Data Length' => 'Méret',
-	'Index Length' => 'Index hossz',
-	'Data Free' => 'Adat szabad',
-	'Collation' => 'Egybevetés',
-	'Analyze' => 'Elemzés',
-	'Optimize' => 'Optimalizál',
-	'Check' => 'Ellenőrzés',
-	'Repair' => 'Javít',
-	'Truncate' => 'Felszabadít',
-	'Tables have been truncated.' => 'A tábla felszabadítva.',
-	'Rows' => 'Oszlop',
-	',' => ' ',
-	'Tables have been moved.' => 'Táblák áthelyezve.',
-	'Move to other database' => 'Áthelyezés másik adatbázisba',
-	'Move' => 'Áthelyez',
-	'Engine' => 'Motor',
-	'Save and continue edit' => 'Mentés és szerkesztés folytatása',
-	'original' => 'eredeti',
-	'%d item(s) have been affected.' => array('%d tétel érintett.', '%d tétel érintett.', '%d tétel érintett.'),
-	'whole result' => 'összes eredményt mutatása',
-	'Tables have been dropped.' => 'Táblák eldobva.',
-	'Clone' => 'Klónoz',
-	'Partition by' => 'Rozdělit podle',
-	'Partitions' => 'Particiók',
-	'Partition name' => 'Partició neve',
-	'Values' => 'Értékek',
-	'%d row(s) have been imported.' => array('%d sor importálva.', '%d sor importálva.', '%d sor importálva.'),
-	'CSV Import' => 'CSV importálása',
-	'Import' => 'Importálás',
-	'Show structure' => 'Struktúra',
-	'Select data' => 'Tartalom',
-	'Stop on error' => 'Hiba esetén megáll',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'A maximális mezőszámot elérted. Növeld meg ezeket: %s, %s.',
-	'anywhere' => 'bárhol',
-	'%.3f s' => '%.3f másodperc',
-	'$1-$3-$5' => '$6.$4.$1',
-	'[yyyy]-mm-dd' => '[yyyy].m.d',
-	'History' => 'Történet',
-	'Variables' => 'Változók',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'A forrás és cél oszlopoknak azonos típusúak legyenek, a cél oszlopok indexeltek legyenek, és a hivatkozott adatnak léteznie kell.',
-	'E-mail' => 'E-mail',
-	'From' => 'Feladó',
-	'Subject' => 'Tárgy',
-	'Send' => 'Küldés',
-	'%d e-mail(s) have been sent.' => array('%d e-mail elküldve.', '%d e-mail elküldve.', '%d e-mail elküldve.'),
-	'Run file' => 'Fájl futtatása',
-	'Numbers' => 'Szám',
-	'Date and time' => 'Dátum és idő',
-	'Strings' => 'Szöveg',
-	'Binary' => 'Bináris',
-	'Lists' => 'Lista',
-	'Relations' => 'Reláció',
-	'Maximum allowed file size is %sB.' => 'A maximális fájlméret %s B.',
-	'Clear' => 'Törlés',
-	'Editor' => 'Szerkesztő',
-	'Webserver file %s' => 'Webszerver fájl %s',
-	'File does not exist.' => 'A fájl nem létezik.',
-	'Permanent login' => 'Emlékezz rám',
-	'%d in total' => 'összesen %d',
-	'Attachments' => 'Csatolmány',
-	'System' => 'Adatbázis',
-	'last' => 'utoljára',
-	'Network' => 'Hálózat',
-	'Geometry' => 'Geometria',
-	'Databases have been dropped.' => 'Adatbázis eldobva.',
-	'File exists.' => 'A fájl létezik.',
-	'Double click on a value to modify it.' => 'Kattints kétszer az értékre a szerkesztéshez.',
-	'Increase Text length to modify this value.' => 'Növeld a Szöveg hosszát, hogy módosítani tudd ezt az értéket.',
-	'Use edit link to modify this value.' => 'Használd a szerkesztés hivatkozást ezen érték módosításához.',
-	'Alter schema' => 'Séma módosítása',
-	'Create schema' => 'Séma létrehozása',
-	'Schema has been dropped.' => 'Séma eldobva.',
-	'Schema has been created.' => 'Séma létrejött.',
-	'Schema has been altered.' => 'Séma módosult.',
-	'schema' => 'schéma',
-	'Schema' => 'Schéma',
-	'Sequences' => 'Sorozatok',
-	'Create sequence' => 'Sorozat létrehozása',
-	'Sequence has been dropped.' => 'Sorozat eldobva.',
-	'Sequence has been created.' => 'Sorozat létrejött.',
-	'Sequence has been altered.' => 'Sorozat módosult.',
-	'Alter sequence' => 'Sorozat módosítása',
-	'User types' => 'Felhasználói típus',
-	'Create type' => 'Típus létrehozása',
-	'Type has been dropped.' => 'Típus eldobva.',
-	'Type has been created.' => 'Típus létrehozva.',
-	'Alter type' => 'Típus módosítása',
-	'Search data in tables' => 'Keresés a táblákban',
-	'From server' => 'Szerverről',
-	'empty' => 'üres',
-	'now' => 'most',
-	'%d query(s) executed OK.' => '%d sikeres lekérdezés.',
-	'Show only errors' => 'Csak a hibák mutatása',
-	'Last page' => 'Utolsó oldal',
-	'Refresh' => 'Frissítés',
-	'Invalid schema.' => 'Érvénytelen séma.',
-	'Please use one of the extensions %s.' => 'Használja a(z) %s kiterjesztést.',
-	'ltr' => 'ltr',
-);

adminer/lang/it.inc.php

@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Crea nuova tabella',
 	'Item has been deleted.' => 'Elemento eliminato.',
 	'Item has been updated.' => 'Elemento aggiornato.',
-	'Item%s has been inserted.' => 'Elemento%s inserito.',
+	'Item has been inserted.' => 'Elemento inserito.',
 	'Edit' => 'Modifica',
 	'Insert' => 'Inserisci',
 	'Save and insert next' => 'Salva e inserisci un altro',
@@ -187,7 +187,7 @@ $translations = array(
 	'Truncate' => 'Svuota',
 	'Move to other database' => 'Sposta in altro database',
 	'Move' => 'Sposta',
-	'%d item(s) have been affected.' => array('Il risultato consiste in %d elemento.', 'Il risultato consiste in %d elementi.'),
+	'%d item(s) have been affected.' => array('Il risultato consiste in %d elemento', 'Il risultato consiste in %d elementi'),
 	'whole result' => 'intero risultato',
 	'Clone' => 'Clona',
 	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Troppi campi. Per favore aumentare %s e %s.',
@@ -195,7 +195,7 @@ $translations = array(
 	'Partitions' => 'Partizioni',
 	'Partition name' => 'Nome partizione',
 	'Values' => 'Valori',
-	'%d row(s) have been imported.' => array('%d riga importata.', '%d righe importate.'),
+	'%d row(s) have been imported.' => array('%d riga importata.','%d righe importate.'),
 	'anywhere' => 'ovunque',
 	'CSV Import' => 'Importa da CSV',
 	'Import' => 'Importa',
@@ -220,50 +220,9 @@ $translations = array(
 	'From' => 'Da',
 	'Subject' => 'Oggetto',
 	'Send' => 'Invia',
-	'%d e-mail(s) have been sent.' => array('%d e-mail inviata.', '%d e-mail inviate.'),
+	'%d e-mail(s) have been sent.' => array('%d e-mail inviata.','%d e-mail inviate.'),
 	'Webserver file %s' => 'Webserver file %s',
 	'File does not exist.' => 'Il file non esiste.',
 	'%d in total' => '%d in totale',
 	'Permanent login' => 'Login permanente',
-	'Databases have been dropped.' => 'Database eliminati.',
-	'Search data in tables' => 'Cerca nelle tabelle',
-	'schema' => 'schema',
-	'Schema' => 'Schema',
-	'Alter schema' => 'Modifica schema',
-	'Create schema' => 'Crea schema',
-	'Schema has been dropped.' => 'Schema eliminato.',
-	'Schema has been created.' => 'Schema creato.',
-	'Schema has been altered.' => 'Schema modificato.',
-	'Sequences' => 'Sequenza',
-	'Create sequence' => 'Crea sequenza',
-	'Alter sequence' => 'Modifica sequenza',
-	'Sequence has been dropped.' => 'Sequenza eliminata.',
-	'Sequence has been created.' => 'Sequenza creata.',
-	'Sequence has been altered.' => 'Sequenza modificata.',
-	'User types' => 'Tipi definiti dall\'utente',
-	'Create type' => 'Crea tipo definito dall\'utente',
-	'Alter type' => 'Modifica tipo definito dall\'utente',
-	'Type has been dropped.' => 'Tipo definito dall\'utente eliminato.',
-	'Type has been created.' => 'Tipo definito dall\'utente creato.',
-	'Double click on a value to modify it.' => 'Fai doppio click su un valore per modificarlo.',
-	'Increase Text length to modify this value.' => 'Aumenta la Lunghezza del testo per modificare questo valore.',
-	'Use edit link to modify this value.' => 'Usa il link modifica per modificare questo valore.',
-	'last' => 'ultima',
-	'From server' => 'Dal server',
-	'System' => 'Sistema',
-	'Select data' => 'Visualizza dati',
-	'Show structure' => 'Visualizza struttura',
-	'empty' => 'vuoto',
-	'Network' => 'Rete',
-	'Geometry' => 'Geometria',
-	'File exists.' => 'Il file esiste già.',
-	'Attachments' => 'Allegati',
-	'%d query(s) executed OK.' => array('%d query eseguita con successo.', '%d query eseguite con successo.'),
-	'Show only errors' => 'Mostra solo gli errori',
-	'Last page' => 'Ultima pagina',
-	'Refresh' => 'Aggiorna',
-	'Invalid schema.' => 'Schema non valido.',
-	'Please use one of the extensions %s.' => 'Usa una delle estensioni %s.',
-	'now' => 'adesso',
-	'ltr' => 'ltr',
 );

adminer/lang/ja.inc.php

@@ -35,11 +35,12 @@ $translations = array(
 	'Logout' => 'ログアウト',
 	'database' => 'データベース',
 	'Use' => '使用',
-	'No tables.' => 'テーブルがありません。',
+	'No tables.' => 'テーブルがありません没有表。',
 	'select' => '選択',
 	'Create new table' => 'テーブルを作成',
 	'Item has been deleted.' => '項目を削除しました',
 	'Item has been updated.' => '項目を更新しました',
+	'Item has been inserted.' => '項目を挿入しました',
 	'Edit' => '編集',
 	'Insert' => '挿入',
 	'Save and insert next' => '保存／追加',
@@ -72,6 +73,7 @@ $translations = array(
 	'Invalid CSRF token. Send the form again.' => '不正なCSRFトークン。再送信してください',
 	'Comment' => 'コメント',
 	'Default values' => '規定値',
+	'Show column comments' => '列コメントを表示',
 	'%d byte(s)' => '%d バイト',
 	'No commands to execute.' => '実行するコマンドがありません',
 	'Unable to upload a file.' => 'ファイルをアップロードできません',
@@ -109,7 +111,7 @@ $translations = array(
 	'%d process(es) have been killed.' => '%d プロセスを強制終了しました',
 	'Kill' => '強制終了',
 	'Parameter name' => '参数名',
-	'Database schema' => '構造',
+	'Database schema' => '数据?概要',
 	'Create procedure' => 'プロシージャの作成',
 	'Create function' => '関数の作成',
 	'Routine has been dropped.' => 'ルーチンを作成',
@@ -128,7 +130,7 @@ $translations = array(
 	'Event' => 'イベント',
 	'%s version: %s through PHP extension %s' => '%sバージョン：%s、 PHP拡張機能 %s',
 	'%d row(s)' => '%d 行',
-	'Remove' => '除外',
+	'Remove' => '移除',
 	'Are you sure?' => '実行しますか？',
 	'Privileges' => '権限',
 	'Create user' => 'ユーザを作成',
@@ -181,7 +183,7 @@ $translations = array(
 	'Check' => 'チェック',
 	'Repair' => '修復',
 	'Truncate' => 'Truncate',
-	'Move to other database' => '別のデータベースへ移動',
+	'Move to other database' => '別のデータベースへ移動?',
 	'Move' => '移動',
 	'Save and continue edit' => '保存して継続',
 	'original' => '元',
@@ -226,44 +228,4 @@ $translations = array(
 	'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.' => 'ダブルクリックして編集',
-	'Increase Text length to modify this value.' => '編集枠を広げる',
-	'Use edit link to modify this value.' => 'リンクを編集する',
-	'last' => '最終',
-	'From server' => 'サーバーから実行',
-	'System' => 'データベース種類',
-	'empty' => '空',
-	'Network' => 'ネットワーク型',
-	'Geometry' => 'ジオメトリ型',
-	'File exists.' => 'ファイルが既に存在します',
-	'Attachments' => '添付ファイル',
-	'Item%s has been inserted.' => '%s項目を挿入しました',
-	'now' => '現在の日時',
-	'%d query(s) executed OK.' => '%d クエリーを実行しました',
-	'Show only errors' => 'エラーのみ表示',
-	'Last page' => '最後のページ',
-	'Refresh' => 'リフレッシュ',
-	'Invalid schema.' => '無効なスキーマ',
-	'Please use one of the extensions %s.' => 'いずれかの拡張機能を使ってください %s',
-	'ltr' => 'ltr',
 );

adminer/lang/nl.inc.php

@@ -24,7 +24,6 @@ $translations = array(
 	'Options' => 'Opties',
 	'Save' => 'Opslaan',
 	'Drop' => 'Verwijderen',
-	'Databases have been dropped.' => 'Databases verwijderd.',
 	'Database has been dropped.' => 'Database verwijderd.',
 	'Database has been created.' => 'Database aangemaakt.',
 	'Database has been renamed.' => 'Database hernoemd.',
@@ -41,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Nieuwe tabel',
 	'Item has been deleted.' => 'Item verwijderd.',
 	'Item has been updated.' => 'Item aangepast.',
-	'Item%s has been inserted.' => 'Item%s toegevoegd.',
+	'Item has been inserted.' => 'Item toegevoegd.',
 	'Edit' => 'Bewerk',
 	'Insert' => 'Toevoegen',
 	'Save and insert next' => 'Opslaan, daarna toevoegen',
@@ -226,44 +225,4 @@ $translations = array(
 	'File does not exist.' => 'Bestand niet gevonden.',
 	'%d in total' => '%d in totaal',
 	'Permanent login' => 'Blijf aangemeld',
-	'Search data in tables' => 'Zoeken in database',
-	'schema' => 'schema',
-	'Schema' => 'Schema',
-	'Alter schema' => 'Schema wijzigen',
-	'Create schema' => 'Schema maken',
-	'Schema has been dropped.' => 'Schema verwijderd.',
-	'Schema has been created.' => 'Schema aangemaakt.',
-	'Schema has been altered.' => 'Schema gewijzigd.',
-	'Sequences' => 'Sequences',
-	'Create sequence' => 'Sequence maken',
-	'Alter sequence' => 'Sequence wijzigen',
-	'Sequence has been dropped.' => 'Sequence verwijderd.',
-	'Sequence has been created.' => 'Sequence aangemaakt.',
-	'Sequence has been altered.' => 'Sequence gewijzigd.',
-	'User types' => 'Gebruikersgedefiniëerde types',
-	'Create type' => 'Type maken',
-	'Alter type' => 'Type wijzigen',
-	'Type has been dropped.' => 'Type verwijderd.',
-	'Type has been created.' => 'Type aangemaakt.',
-	'Double click on a value to modify it.' => 'Dubbelklik op een waarde om deze te bewerken.',
-	'Increase Text length to modify this value.' => 'Verhoog de lengte om deze waarde te bewerken.',
-	'Use edit link to modify this value.' => 'Gebruik de link "bewerk" om deze waarde te wijzigen.',
-	'last' => 'laatste',
-	'From server' => 'Van server',
-	'System' => 'Databasesysteem',
-	'Select data' => 'Gegevens selecteren',
-	'Show structure' => 'Toon structuur',
-	'empty' => 'leeg',
-	'Network' => 'Netwerk',
-	'Geometry' => 'Geometrie',
-	'File exists.' => 'Bestand bestaat reeds.',
-	'Attachments' => 'Bijlagen',
-	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd'),
-	'Show only errors' => 'Enkel fouten tonen',
-	'Last page' => 'Laatste pagina',
-	'Refresh' => 'Vernieuwen',
-	'Invalid schema.' => 'Ongeldig schema.',
-	'Please use one of the extensions %s.' => 'Gebruik 1 van volgende extensies: %s.',
-	'now' => 'nu',
-	'ltr' => 'ltr',
 );

adminer/lang/pl.inc.php

@@ -1,279 +0,0 @@
-<?php
-$translations = array(
-	// hidden because of poor quality according to author Helmut von Ślask cieszyński
-	'Login' => 'Zalogować się',
-	'Logout successful.' => 'Wylogowanie pomyślne.',
-	'Invalid credentials.' => 'Nieprawidłowe dane.',
-	'Server' => 'Serwer',
-	'Username' => 'Użytkownik',
-	'Password' => 'Hasło',
-	'Select database' => 'Wybierz bazę danych',
-	'Invalid database.' => 'Nie znaleziono bazę danych.',
-	'Create new database' => 'Utwórz nową bazę danych',
-	'Table has been dropped.' => 'Tabela została usunięta.',
-	'Table has been altered.' => 'Tabela została zmieniona.',
-	'Table has been created.' => 'Tabela została utworzona.',
-	'Alter table' => 'Zmień tabelę',
-	'Create table' => 'Utwórz nową tabelę',
-	'Table name' => 'Nazwa tabeli',
-	'engine' => 'składowanie',
-	'collation' => 'porównywanie',
-	'Column name' => 'Nazwa kolumny',
-	'Type' => 'Typ',
-	'Length' => 'Długość',
-	'Auto Increment' => 'Auto Increment',
-	'Options' => 'Operacje',
-	'Save' => 'Zachowaj',
-	'Drop' => 'Usuń',
-	'Database has been dropped.' => 'Baza danych została usunięta.',
-	'Database has been created.' => 'Baza danych została utworzona.',
-	'Database has been renamed.' => 'Baza danych została przemianowana.',
-	'Database has been altered.' => 'Baza danych została zmieniona.',
-	'Alter database' => 'Zmień bazę danych',
-	'Create database' => 'Utwórz bazę danych',
-	'SQL command' => 'SQL zapytanie',
-	'Dump' => 'Eksport',
-	'Logout' => 'Wyjście',
-	'database' => 'baza danych',
-	'Use' => 'Vybrat',
-	'No tables.' => 'Nie znaleziono tabeli.',
-	'select' => 'pokaż',
-	'Create new table' => 'Utwórz nową tabelę',
-	'Item has been deleted.' => 'Rekord został usunięty.',
-	'Item has been updated.' => 'Rekord został aktualizowany.',
-	'Item%s has been inserted.' => 'Rekord%s został włożony.',
-	'Edit' => 'Edytuj',
-	'Insert' => 'Dodaj',
-	'Save and insert next' => 'Wykonaj i dodaj następny',
-	'Delete' => 'Usuń',
-	'Database' => 'Baza danych',
-	'Routines' => 'Procedury i funkcje',
-	'Indexes have been altered.' => 'Indeksy uległy zmianie.',
-	'Indexes' => 'Indeksy',
-	'Alter indexes' => 'Edytuj indeksy',
-	'Add next' => 'Dodaj następny',
-	'Language' => 'Język',
-	'Select' => 'Przeglądaj',
-	'New item' => 'Nowy rekord',
-	'Search' => 'Szukaj',
-	'Sort' => 'Sortuj',
-	'descending' => 'malejąco',
-	'Limit' => 'Limit',
-	'No rows.' => 'Pusty wynik.',
-	'Action' => 'Czynność',
-	'edit' => 'zmień',
-	'Page' => 'Strona',
-	'Query executed OK, %d row(s) affected.' => array('Wykonanie pomyślne, zmieniono %d rekord.',
-	 'Wykonanie pomyślne, zmieniono %d rekordy.',
-	 'Wykonanie pomyślne, zmieniono %d rekordów.'),
-	'Error in query' => 'Bląd w zapytaniu',
-	'Execute' => 'Wykonaj',
-	'Table' => 'Tabela',
-	'Foreign keys' => 'Klucze obce',
-	'Triggers' => 'Wyzwalacze',
-	'View' => 'Perspektywa',
-	'Unable to select the table' => 'Nie mozna było przeglądać tabel',
-	'Invalid CSRF token. Send the form again.' => 'Niepoprawny CSRF token. Odeślij ponownie.',
-	'Comment' => 'Komentarz',
-	'Default values' => 'Wartości domyślne',
-	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
-	'No commands to execute.' => 'Nic do wykonania.',
-	'Unable to upload a file.' => 'Nie było możliwe nagrać plik.',
-	'File upload' => 'Nagranie pliku',
-	'File uploads are disabled.' => 'Nagranie pliku nie jest dozwolone.',
-	'Routine has been called, %d row(s) affected.' => array('Procedura była uruchomiona, został zmieniony %d rekord.', 
-	 'Procedura była uruchomiona, zostały zmienione %d rekordy.', 
-	 'Procedura była uruchomiona, %d rekordów zostało zmienionych.'),
-	'Call' => 'Uruchomić',
-	'No extension' => 'Bez rozszerzenia',
-	'None of the supported PHP extensions (%s) are available.' => 'Nie jest dostępne żadne z PHP rozszerzeń (%s).',
-	'Session support must be enabled.' => 'Session zmienne muszą być dozwolone.',
-	'Session expired, please login again.' => 'Minął czas session, zaloguj się ponownie.',
-	'Text length' => 'Długość tekstu',
-	'Foreign key has been dropped.' => 'Klucz obcy został usunięty.',
-	'Foreign key has been altered.' => 'Klucz obcy został zmieniony.',
-	'Foreign key has been created.' => 'Klucz obcy został utworzony.',
-	'Foreign key' => 'Obcy klucz',
-	'Target table' => 'Tabela celowa',
-	'Change' => 'Zmienić',
-	'Source' => 'Źródło',
-	'Target' => 'Cel',
-	'Add column' => 'Dodaj kolumnę',
-	'Alter' => 'Zmień',
-	'Add foreign key' => 'Dodaj klucz obcy',
-	'ON DELETE' => 'W przypadku usunięcia',
-	'ON UPDATE' => 'W przypadku zmiany',
-	'Index Type' => 'Typ indeksu',
-	'Column (length)' => 'Kolumna (długość)',
-	'View has been dropped.' => 'Perspektywa została usunięta.',
-	'View has been altered.' => 'Perspektywa została zmieniona.',
-	'View has been created.' => 'Perspektywa została utworzona.',
-	'Alter view' => 'Zmień perspektywę',
-	'Create view' => 'Utwórz perspektywę',
-	'Name' => 'Nazwa',
-	'Process list' => 'Lista procesów',
-	'%d process(es) have been killed.' => array('Wątek %d został unicestwiony.', 
-		'Unicestwiono %d wątki.', 
-		'Unicestwiono %d wątków.'),
-	'Kill' => 'Unicestwij',
-	'Parameter name' => 'Nazwa parametru',
-	'Database schema' => 'Schemat bazy danych',
-	'Create procedure' => 'Utwórz procedurę',
-	'Create function' => 'Utwórz funkcję',
-	'Routine has been dropped.' => 'Procedura została usunięta.',
-	'Routine has been altered.' => 'Procedura została zmieniona.',
-	'Routine has been created.' => 'Procedura została utworzona.',
-	'Alter function' => 'Zmień funkcję',
-	'Alter procedure' => 'Zmień procedurę',
-	'Return type' => 'Typ zwracania',
-	'Add trigger' => 'Dodaj wyzwalacz',
-	'Trigger has been dropped.' => 'Wyzwalacz został usunięty.',
-	'Trigger has been altered.' => 'Wyzwalacz został zmieniony.',
-	'Trigger has been created.' => 'Wyzwalacz został utworzony.',
-	'Alter trigger' => 'Zmień wyzwalacz',
-	'Create trigger' => 'Utwórz wyzwalacz',
-	'Time' => 'Czas',
-	'Event' => 'Wydarzenie',
-	'%s version: %s through PHP extension %s' => 'Wersja %s: %s przez PHP rozszerzenie %s',
-	'%d row(s)' => array('%d linia', '%d linie ', '%d linii'),
-	'Remove' => 'Usunąć',
-	'Are you sure?' => 'Naprawdę?',
-	'Privileges' => 'Uprawnienia użytkowników',
-	'Create user' => 'Utwórz użytkownika',
-	'User has been dropped.' => 'Użytkownik został usunięty.',
-	'User has been altered.' => 'Użytkownik został zmieniony.',
-	'User has been created.' => 'Użytkownik został utworzony.',
-	'Hashed' => 'Hashed',
-	'Column' => 'Kolumna',
-	'Routine' => 'Procedura',
-	'Grant' => 'Udzielić',
-	'Revoke' => 'Odwołać',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 
-		'Zbyt duże POST data. Zmiejszyj data albo podwyższ wartość w konfiguracji %s.',
-	'Logged as: %s' => 'Zalogowany jako: %s',
-	'Move up' => 'Przesuń w górę',
-	'Move down' => 'Przesuń w dół',
-	'Functions' => 'Funkcje',
-	'Aggregation' => 'Agregacje',
-	'Export' => 'Eksport',
-	'Output' => 'Wyjście',
-	'open' => 'otworzyć',
-	'save' => 'uchować',
-	'Format' => 'Format',
-	'Tables' => 'Tabele',
-	'Data' => 'Data',
-	'Event has been dropped.' => 'Wydarzenie zostało usunięte.',
-	'Event has been altered.' => 'Wydarzenie zostało zmienione.',
-	'Event has been created.' => 'Wydarzenie zostało utworzone.',
-	'Alter event' => 'Zmień wydarzenie',
-	'Create event' => 'Utwórz wydarzenie',
-	'At given time' => 'O danym czasie',
-	'Every' => 'Każdych',
-	'Events' => 'Wydarzenie',
-	'Schedule' => 'Harmonogram',
-	'Start' => 'Początek',
-	'End' => 'Koniec',
-	'Status' => 'Status',
-	'On completion preserve' => 'Po zakończeniu zachować',
-	'Tables and views' => 'Tabele a perspektywy',
-	'Data Length' => 'Długość danych',
-	'Index Length' => 'Długość indeksów',
-	'Data Free' => 'Wolne miejsce',
-	'Collation' => 'Porównywanie',
-	'Analyze' => 'Analizuj',
-	'Optimize' => 'Optymalizacja',
-	'Check' => 'Sprawdź',
-	'Repair' => 'Napraw',
-	'Truncate' => 'Wypróźnij',
-	'Tables have been truncated.' => 'Tabele zostały wypróźnione.',
-	'Rows' => 'Linie',
-	',' => ' ',
-	'Tables have been moved.' => 'Tabele zostały przesunięte',
-	'Move to other database' => 'Przesunąć do innej bazy danych',
-	'Move' => 'Przesunąć',
-	'Engine' => 'Engine',
-	'Save and continue edit' => 'Zapisz i kontynuuj edycję',
-	'original' => 'oryginalny',
-	'%d item(s) have been affected.' => array('Został dotknięty %d rekord.', 
-	 'Zostały dotknięte %d rekordy.',
-	 'Zostało dotkniętych %d rekordów.'),
-	'whole result' => 'cały wynik',
-	'Tables have been dropped.' => 'Tabele zostały usunięte.',
-	'Clone' => 'Klonować',
-	'Partition by' => 'Rozdzielić przez',
-	'Partitions' => 'Rozdziały',
-	'Partition name' => 'Nazwa rozdziału',
-	'Values' => 'Wartości',
-	'%d row(s) have been imported.' => array('%d rekord został importowany.', 
-	 '%d rekordy zostały importowane.', 
-	 'Zostało importowanych %d rekordów.'),
-	'CSV Import' => 'Import CSV',
-	'Import' => 'Import',
-	'Show structure' => 'Pokaż całą strukturę',
-	'Select data' => 'Pokaż dane',
-	'Stop on error' => 'Stop w przypadku błędu',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 
-	  'Przekroczono maksymalną liczbę pól. Zwiększ %s i %s.',
-	'anywhere' => 'kdziekolwiek',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$6.$4.$1',
-	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
-	'History' => 'Historia',
-	'Variables' => 'Zmienne',
-	'Source and target columns must have the same data type, there must be an index on the target
-	 columns and referenced data must exist.' => 
-	 'Zdrojové a cílové sloupce musí mít stejný datový typ, nad cílovými sloupci 
-	 musí být definován index a odkazovaná data musí existovat.',
-	'E-mail' => 'E-mail',
-	'From' => 'Nadawca',
-	'Subject' => 'Temat',
-	'Send' => 'Wyślij',
-	'%d e-mail(s) have been sent.' => array('Został wysłany %d e-mail.', 
-	'Zostały wysłane %d e-maile.', 'Zostało wysłanych %d e-mailów.'),
-	'Run file' => 'Uruchomić plik',
-	'Numbers' => 'Numery',
-	'Date and time' => 'Datum i czas',
-	'Strings' => 'Typu string',
-	'Binary' => 'Binarny',
-	'Lists' => 'Listy',
-	'Relations' => 'Relacje',
-	'Maximum allowed file size is %sB.' => 'Maksymalna wielkość pliku to %sB.',
-	'Clear' => 'Wyczyścić',
-	'Editor' => 'Edytor',
-	'Webserver file %s' => 'Plik %s na serweru',
-	'File does not exist.' => 'Plik nieistnieje.',
-	'Permanent login' => 'Logowanie stałe',
-	'%d in total' => '%d w sumie',
-	'Attachments' => 'Załączniki',
-	'System' => 'System',
-	'last' => 'ostatni',
-	'Network' => 'Sieć',
-	'Geometry' => 'Geometria',
-	'Databases have been dropped.' => 'Baze danych zostały usunięte.',
-	'File exists.' => 'Plik istnieje.',
-	'Double click on a value to modify it.' => 'Kliknij podwójnie by zmienić wartość.',
-	'Increase text length to modify this value.' => 'Aby zmienić wartość to potrzeba powiększyć długość tekstu.',
-	'Use edit link to modify this value.' => 'Użyj linku zmienić by poprawić wartość.',
-	'Alter schema' => 'Zmienić schemat',
-	'Create schema' => 'Utwórz schemat',
-	'Schema has been dropped.' => 'Schemat został usunięty.',
-	'Schema has been created.' => 'Schemat został utworzony.',
-	'Schema has been altered.' => 'Schemat został zmieniony.',
-	'schema' => 'schemat',
-	'Schema' => 'Schemat',
-	'Sequences' => 'Sekwencje',
-	'Create sequence' => 'Utwórz sekwencję',
-	'Sequence has been dropped.' => 'Sekwencja została usunięta.',
-	'Sequence has been created.' => 'Sekwencja została utworzona.',
-	'Sequence has been altered.' => 'Sekwencja została zmieniona.',
-	'Alter sequence' => 'Zmień sekwencję',
-	'User types' => 'Typy definiowane użytkownikiem',
-	'Create type' => 'Utwórz definiowany typ',
-	'Type has been dropped.' => 'Typ został usunięty.',
-	'Type has been created.' => 'Typ został utworzony.',
-	'Alter type' => 'Zmień typ',
-	'Search data in tables' => 'Wyszukaj data w tabelach',
-	'From server' => 'Ze serweru',
-	'empty' => 'puste',
-	'now' => 'teraz',
-);

adminer/lang/ru.inc.php

@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Создать новую таблицу',
 	'Item has been deleted.' => 'Запись удалена.',
 	'Item has been updated.' => 'Запись обновлена.',
-	'Item%s has been inserted.' => 'Запись%s была вставлена.',
+	'Item has been inserted.' => 'Запись вставлена.',
 	'Edit' => 'Редактировать',
 	'Insert' => 'Вставить',
 	'Save and insert next' => 'Сохранить и вставить еще',
@@ -147,7 +147,7 @@ $translations = array(
 	'Move down' => 'Переместить вниз',
 	'Functions' => 'Функции',
 	'Aggregation' => 'Агрегация',
-	'Export' => 'Экспорт',
+	'Export' => 'Експорт',
 	'Output' => 'Выходные данные',
 	'open' => 'открыть',
 	'save' => 'сохранить',
@@ -225,45 +225,4 @@ $translations = array(
 	'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.' => 'Кликни два раза по значению, чтобы его изменить.',
-	'Increase Text length to modify this value.' => 'Увеличь Длину текста, чтобы изменить это значение.',
-	'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('%d запрос выполнен успешно.', '%d запроса выполнено успешно.', '%d запросов выполнено успешно.'),
-	'Show only errors' => 'Только ошибки',
-	'Last page' => 'Последняя страница',
-	'Refresh' => 'Обновить',
-	'Invalid schema.' => 'Неправильная схема.',
-	'Please use one of the extensions %s.' => 'Используйте одно из этих расширений %s.',
-	'now' => 'сейчас',
-	'ltr' => 'ltr',
 );

adminer/lang/sk.inc.php

@@ -24,7 +24,6 @@ $translations = array(
 	'Options' => 'Voľby',
 	'Save' => 'Uložiť',
 	'Drop' => 'Odstrániť',
-	'Databases have been dropped.' => 'Databázy boli odstránené.',
 	'Database has been dropped.' => 'Databáza bola odstránená.',
 	'Database has been created.' => 'Databáza bola vytvorená.',
 	'Database has been renamed.' => 'Databáza bola premenovaná.',
@@ -41,7 +40,7 @@ $translations = array(
 	'Create new table' => 'Vytvoriť novú tabuľku',
 	'Item has been deleted.' => 'Položka bola vymazaná.',
 	'Item has been updated.' => 'Položka bola aktualizovaná.',
-	'Item%s has been inserted.' => 'Položka%s bola vložená.',
+	'Item has been inserted.' => 'Položka bola vložená.',
 	'Edit' => 'Upraviť',
 	'Insert' => 'Vložiť',
 	'Save and insert next' => 'Uložiť a vložiť ďalší',
@@ -170,9 +169,9 @@ $translations = array(
 	'On completion preserve' => 'Po dokončení zachovat',
 	'Save and continue edit' => 'Uložiť a pokračovať v úpravách',
 	'original' => 'originál',
-	'Tables have been truncated.' => 'Tabuľka bola vyprázdnená.',
-	'Tables have been moved.' => 'Tabuľka bola presunutá.',
-	'Tables have been dropped.' => 'Tabuľka bola odstránená.',
+	'Tables have been truncated.' => 'Tabuľka bola vyprázdnená',
+	'Tables have been moved.' => 'Tabuľka bola presunutá',
+	'Tables have been dropped.' => 'Tabuľka bola odstránená',
 	'Tables and views' => 'Tabuľky a pohľady',
 	'Engine' => 'Typ',
 	'Collation' => 'Porovnávanie',
@@ -226,44 +225,4 @@ $translations = array(
 	'File does not exist.' => 'Súbor neexistuje.',
 	'Permanent login' => 'Trvalé prihlásenie',
 	'%d in total' => '%d celkom',
-	'Search data in tables' => 'Vyhľadať dáta v tabuľkách',
-	'Alter schema' => 'Pozmeniť schému',
-	'Create schema' => 'Vytvoriť schému',
-	'Schema has been dropped.' => 'Schéma bola odstránená.',
-	'Schema has been created.' => 'Schéma bola vytvorená.',
-	'Schema has been altered.' => 'Schéma bola zmenená.',
-	'schema' => 'schéma',
-	'Schema' => 'Schéma',
-	'Sequences' => 'Sekvencia',
-	'Create sequence' => 'Vytvoriť sekvenciu',
-	'Sequence has been dropped.' => 'Sekvencia bola odstránená.',
-	'Sequence has been created.' => 'Sekvencia bola vytvorená.',
-	'Sequence has been altered.' => 'Sekvencia bola zmenená.',
-	'Alter sequence' => 'Pozmeniť sekvenciu',
-	'User types' => 'Užívateľské typy',
-	'Create type' => 'Vytvoriť typ',
-	'Type has been dropped.' => 'Typ bol odstránený.',
-	'Type has been created.' => 'Typ bol vytvorený.',
-	'Alter type' => 'Pozmeniť typ',
-	'Double click on a value to modify it.' => 'Dvojkliknite na políčko, ktoré chcete zmeniť.',
-	'Increase Text length to modify this value.' => 'Pre zmenu tejto hodnoty zvýšte Dĺžku textov.',
-	'Use edit link to modify this value.' => 'Pre zmenu tejto hodnoty použite odkaz upraviť.',
-	'last' => 'posledný',
-	'From server' => 'Zo serveru',
-	'System' => 'Systém',
-	'Show structure' => 'Zobraziť štruktúru',
-	'Select data' => 'Vypísať dáta',
-	'empty' => 'prázdne',
-	'Network' => 'Sieť',
-	'Geometry' => 'Geometria',
-	'File exists.' => 'Súbor existuje.',
-	'Attachments' => 'Prílohy',
-	'%d query(s) executed OK.' => array('Bol vykonaný %d dotaz.', 'Boli vykonané %d dotazy.', 'Bolo vykonaných %d dotazov.'),
-	'Show only errors' => 'Zobraziť iba chyby',
-	'Last page' => 'Posledná stránka',
-	'Refresh' => 'Obnoviť',
-	'Invalid schema.' => 'Neplatné schéma.',
-	'Please use one of the extensions %s.' => 'Prosím vyberte jednu z koncoviek %s.',
-	'now' => 'teraz',
-	'ltr' => 'ltr',
 );

adminer/lang/ta.inc.php

@@ -1,269 +0,0 @@
-<?php
-$translations = array(
-	'Login' => 'நுழை',
-	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
-	'Invalid credentials.' => 'ச‌ரியான‌ விப‌ர‌ங்க‌ள் இல்லை.',
-	'Server' => 'வ‌ழ‌ங்கி (Server)',
-	'Username' => 'ப‌ய‌னாள‌ர் (User)',
-	'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' => 'Dump',
-	'Logout' => 'வெளியேறு',
-	'database' => 'த‌க‌வ‌ல்த‌ள‌ம்',
-	'Use' => 'உப‌யோகி',
-	'No tables.' => 'அட்ட‌வ‌ணை இல்லை.',
-	'select' => 'தேர்வு செய்',
-	'Create new table' => 'புதிய‌ அட்ட‌வ‌ணையை உருவாக்கு',
-	'Item has been deleted.' => 'உருப்படி நீக்க‌ப்ப‌ட்ட‌து.',
-	'Item has been updated.' => 'உருப்ப‌டி புதுப்பிக்க‌ப்ப‌ட்ட‌து.',
-	'Edit' => 'தொகு',
-	'Insert' => 'புகுத்து',
-	'Save and insert next' => 'சேமித்த‌ப் பின் அடுத்த‌தை புகுத்து',
-	'Delete' => 'நீக்கு',
-	'Database' => 'த‌க‌வ‌ல்த‌ள‌ம்',
-	'Routines' => 'ரொட்டீன் ',
-	'Indexes have been altered.' => 'அக‌வ‌ரிசைக‌ள் (Indexes) மாற்ற‌ப்பட்ட‌து.',
-	'Indexes' => 'அக‌வ‌ரிசைக‌ள் (Index) ',
-	'Alter indexes' => 'அக‌வ‌ரிசையை (Index) மாற்று',
-	'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' => 'உள்ளிருக்கும் (Default) ம‌திப்புக‌ள் ',
-	'%d byte(s)' => array('%d பைட்', '%d பைட்டுக‌ள்'),
-	'No commands to execute.' => 'செய‌ல் ப‌டுத்த‌ எந்த‌ க‌ட்ட‌ளைக‌ளும் இல்லை.',
-	'Unable to upload a file.' => 'கோப்பை மேலேற்ற‌ம் (upload) செய்ய‌ இயல‌வில்லை.',
-	'File upload' => 'கோப்பை மேலேற்று (upload) ',
-	'File uploads are disabled.' => 'கோப்புக‌ள் மேலேற்றம் (upload)முட‌க்க‌ப்ப‌ட்டுள்ள‌ன‌.',
-	'Routine has been called, %d row(s) affected.' => array('ரொட்டீன்க‌ள் அழைக்க‌ப்பட்டுள்ள‌ன‌, %d வ‌ரிசை மாற்ற‌ம் அடைந்த‌து.', 'ரொட்டீன்க‌ள் அழைக்க‌ப்ப‌ட்டுள்ள‌ன‌, %d வ‌ரிசைக‌ள் மாற்றம் அடைந்துள்ள‌ன‌.'),
-	'Call' => 'அழை',
-	'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 DELETE',
-	'ON UPDATE' => 'ON UPDATE',
-	'Index Type' => 'அக‌வ‌ரிசை வ‌கை (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' => 'அள‌புரு (Parameter) பெய‌ர்',
-	'Database schema' => 'த‌க‌வ‌ல்த‌ள‌ அமைப்பு முறைக‌ள்',
-	'Create procedure' => 'செய்முறையை உருவாக்கு',
-	'Create function' => 'Function உருவாக்கு',
-	'Routine has been dropped.' => 'ரொட்டீன் நீக்க‌ப்ப‌ட்ட‌து.',
-	'Routine has been altered.' => 'ரொட்டீன் மாற்ற‌ப்ப‌ட்டது.',
-	'Routine has been created.' => 'ரொட்டீன் உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Alter function' => 'Function மாற்று',
-	'Alter procedure' => 'செய‌ல்முறையை மாற்று',
-	'Return type' => 'திரும்பு வ‌கை',
-	'Add trigger' => 'தூண்டு விசையை சேர்',
-	'Trigger has been dropped.' => 'தூண்டு விசை நீக்க‌ப்ப‌ட்ட‌து.',
-	'Trigger has been altered.' => 'தூண்டு விசை மாற்ற‌ப்ப‌ட்ட‌து.',
-	'Trigger has been created.' => 'தூண்டு விசை உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Alter trigger' => 'தூண்டு விசையை மாற்று',
-	'Create trigger' => 'தூண்டு விசையை உருவாக்கு',
-	'Time' => 'நேர‌ம்',
-	'Event' => 'நிக‌ழ்ச்சி',
-	'%d row(s)' => array('%d வ‌ரிசை', '%d வ‌ரிசைக‌ள்'),
-	'Remove' => 'நீக்கு',
-	'Are you sure?' => 'நிச்ச‌ய‌மாக‌ ?',
-	'Privileges' => 'ச‌லுகைக‌ள் / சிற‌ப்புரிமைக‌ள்',
-	'Create user' => 'ப‌ய‌னாள‌ரை உருவாக்கு',
-	'User has been dropped.' => 'ப‌யனீட்டாள‌ர் நீக்க‌ப்ப‌ட்டார்.',
-	'User has been altered.' => 'ப‌யனீட்டாள‌ர் மாற்றப்ப‌ட்டார்.',
-	'User has been created.' => 'ப‌ய‌னீட்டாள‌ர் உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Hashed' => 'Hashed',
-	'Column' => 'நெடுவ‌ரிசை',
-	'Routine' => 'ரொட்டீன்',
-	'Grant' => 'அனும‌திய‌ளி',
-	'Revoke' => 'இர‌த்துச்செய்',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'மிக‌ அதிக‌மான‌ POST  த‌க‌வ‌ல். த‌க‌வ‌லை குறைக்க‌வும் அல்ல‌து %s வ‌டிவ‌மைப்பை (configuration directive) மாற்ற‌வும்.',
-	'Logged as: %s' => 'ப‌ய‌னாளர்: %s',
-	'Move up' => 'மேலே ந‌க‌ர்த்து',
-	'Move down' => 'கீழே நக‌ர்த்து',
-	'Functions' => 'Functions',
-	'Aggregation' => 'திர‌ள்வு (Aggregation)',
-	'Export' => 'ஏற்றும‌தி',
-	'Output' => 'வெளியீடு',
-	'open' => 'திற‌',
-	'save' => 'சேமி',
-	'Format' => 'ஃபார்ம‌ட் (Format)',
-	'Tables' => 'அட்ட‌வ‌ணை',
-	'Data' => 'த‌க‌வ‌ல்',
-	'Event has been dropped.' => 'நிக‌ழ்ச்சி (Event) நீக்க‌ப்ப‌ட்ட‌து.',
-	'Event has been altered.' => 'நிக‌ழ்ச்சி (Event) மாற்றப்ப‌ட்ட‌து.',
-	'Event has been created.' => 'நிக‌ழ்ச்சி (Event) உருவாக்க‌‌ப்ப‌ட்ட‌து.',
-	'Alter event' => 'நிக‌ழ்ச்சியை (Event) மாற்று',
-	'Create event' => 'நிக‌ழ்ச்சியை (Event) உருவாக்கு',
-	'At given time' => 'குறித்த‌ நேர‌த்தில்',
-	'Every' => 'ஒவ்வொரு',
-	'Events' => 'நிக‌ழ்ச்சிக‌ள்',
-	'Schedule' => 'கால‌ அட்ட‌வ‌ணை',
-	'Start' => 'தொட‌ங்கு',
-	'End' => 'முடி (வு)',
-	'Status' => 'நிக‌ழ்நிலை (Status)',
-	'On completion preserve' => 'முடிந்த‌தின் பின் பாதுகாக்க‌வும்',
-	'Tables and views' => 'அட்ட‌வ‌ணைக‌ளும் பார்வைக‌ளும்',
-	'Data Length' => 'த‌க‌வ‌ல் நீள‌ம்',
-	'Index Length' => 'Index நீள‌ம்',
-	'Data Free' => 'Data Free',
-	'Collation' => 'கொலேச‌ன்',
-	'Analyze' => 'நுணுகி ஆராய‌வும்',
-	'Optimize' => 'உக‌ப்பாக்கு (Optimize)',
-	'Check' => 'ப‌ரிசோதி',
-	'Repair' => 'ப‌ழுது பார்',
-	'Truncate' => 'குறை (Truncate)',
-	'Tables have been truncated.' => 'அட்ட‌வ‌ணை குறைக்க‌ப்ப‌ட்ட‌து (truncated).',
-	'Rows' => 'வ‌ரிசைக‌ள்',
-	',' => ',',
-	'Tables have been moved.' => 'அட்ட‌வ‌ணை ந‌க‌ர்த்த‌ப்ப‌ட்ட‌து.',
-	'Move to other database' => 'ம‌ற்ற‌ த‌க‌வ‌ல் தள‌த்திற்க்கு ந‌க‌ர்த்து',
-	'Move' => 'ந‌க‌ர்த்து',
-	'Engine' => 'எஞ்சின் (Engine)',
-	'Save and continue edit' => 'சேமித்த‌ பிற‌கு தொகுப்ப‌தை தொட‌ர‌வும்',
-	'original' => 'அச‌ல்',
-	'Tables have been dropped.' => 'அட்ட‌வ‌ணை நீக்க‌ப்ப‌ட்ட‌து.',
-	'%d item(s) have been affected.' => array('%d உருப்ப‌டி மாற்ற‌ம‌டைந்தது.', '%d உருப்ப‌டிக‌ள் மாற்ற‌ம‌டைந்த‌ன‌.'),
-	'whole result' => 'முழுமையான‌ முடிவு',
-	'Clone' => 'ந‌க‌லி (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 வ‌ரிசை இற‌க்கும‌தி (Import) செய்ய‌ப்ப‌ட்ட‌து.', '%d வ‌ரிசைக‌ள் இற‌க்கும‌தி (Import) செய்ய‌ப்ப‌ட்டன‌.'),
-	'Show structure' => 'க‌ட்ட‌மைப்பை காண்பிக்க‌வும்',
-	'CSV Import' => 'இம்போர்ட் CSV',
-	'Import' => 'இற‌க்கும‌தி (Import)',
-	'Stop on error' => 'பிழை ஏற்ப‌டின் நிற்க‌',
-	'Select data' => 'த‌க‌வ‌லை தேர்வு செய்',
-	'%.3f s' => '%.3f s',
-	'$1-$3-$5' => '$5/$3/$1',
-	'[yyyy]-mm-dd' => 'dd/mm/[yyyy]',
-	'History' => 'வ‌ர‌லாறு',
-	'Variables' => 'மாறிலிக‌ள் (Variables)',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'இல‌க்கு நெடுவ‌ரிசையில் அக‌வ‌ரிசை (Index) ம‌ற்றும் குறிக்க‌ப்ப‌ட்ட‌ த‌க‌வல் (Referenced DATA) க‌ண்டிப்பாக‌ இருத்த‌ல் வேண்டும். மூல‌ நெடுவ‌ரிசை ம‌ற்றும் இலக்கு நெடுவ‌ரிசையின் த‌க‌வ‌ல் வ‌டிவ‌ம் (DATA TYPE) ஒன்றாக‌ இருக்க‌ வேண்டும்.',
-	'Relations' => 'உற‌வுக‌ள் (Relations)',
-	'Run file' => 'கோப்பினை இய‌க்க‌வும்',
-	'Clear' => 'துடை (Clear)',
-	'Maximum allowed file size is %sB.' => 'கோப்பின் அதிக‌ப‌ட்ச‌ அள‌வு %sB.',
-	'Numbers' => 'எண்க‌ள்',
-	'Date and time' => 'தேதி ம‌ற்றும் நேர‌ம்',
-	'Strings' => 'ச‌ர‌ம் (String)',
-	'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' => 'நிர‌ந்த‌ர‌மாக‌ நுழைய‌வும்',
-	'Schema' => 'அமைப்புமுறை',
-	'Alter schema' => 'அமைப்புமுறையை மாற்று',
-	'Create schema' => 'அமைப்புமுறையை உருவாக்கு',
-	'Search data in tables' => 'த‌க‌வ‌லை அட்ட‌வ‌ணையில் தேடு',
-	'Sequences' => 'வ‌ரிசைமுறை',
-	'Create sequence' => 'வ‌ரிசைமுறையை உருவாக்கு',
-	'User types' => 'ப‌ய‌னாள‌ர் வ‌கைக‌ள்',
-	'Create type' => 'வ‌கையை உருவாக்கு',
-	'Item%s has been inserted.' => 'உருப்ப‌டி (Item) சேர்க்க‌ப்ப‌ட்ட‌து.',
-	'Schema has been dropped.' => 'அமைப்புமுறை நீக்க‌ப்ப‌ட்ட‌து.',
-	'Schema has been created.' => 'அமைப்புமுறை உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Schema has been altered.' => 'அமைப்புமுறை மாற்ற‌ப்ப‌ட்ட‌து.',
-	'Double click on a value to modify it.' => 'ம‌திப்பினை மாற்ற அத‌ன் மீது இருமுறை சொடுக்க‌வும் (Double click).',
-	'Increase Text length to modify this value.' => 'இந்த‌ ம‌திப்பினை மாற்ற, டெக்ஸ்ட் நீள‌த்தினை அதிக‌ரிக்க‌வும்.',
-	'Use edit link to modify this value.' => 'இந்த‌ ம‌திப்பினை மாற்ற‌, தொகுப்பு இணைப்பினை உப‌யோகிக்க‌வும்.',
-	'last' => 'க‌டைசி',
-	'Sequence has been dropped.' => 'வ‌ரிசைமுறை நீக்க‌ப்ப‌ட்ட‌து.',
-	'Sequence has been created.' => 'வ‌ரிசைமுறை உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Sequence has been altered.' => 'வ‌ரிசைமுறை மாற்ற‌ப்ப‌ட்ட‌து.',
-	'Alter sequence' => 'வ‌ரிசைமுறையை மாற்று',
-	'From server' => 'செர்வ‌ரில் இருந்து',
-	'Type has been dropped.' => 'வ‌கை (type) நீக்க‌ப்ப‌ட்ட‌து.',
-	'Type has been created.' => 'வ‌கை (type) உருவாக்க‌ப்ப‌ட்ட‌து.',
-	'Alter type' => 'வ‌கையினை (type) மாற்று',
-	'System' => 'சிஸ்ட‌ம் (System)',
-	'anywhere' => 'எங்காயினும்',
-	'empty' => 'வெறுமை (empty)',
-	'schema' => 'அமைப்புமுறை',
-	'No extension' => 'விரிவு (extensஇஒன்) இல்லை ',
-	'Databases have been dropped.' => 'த‌க‌வ‌ல் த‌ள‌ங்க‌ள் நீக்க‌ப்ப‌ட்டன‌.',
-	'%s version: %s through PHP extension %s' => '%s ப‌திப்பு: %s through PHP extension %s',
-	'Network' => 'நெட்வொர்க்',
-	'Geometry' => 'வ‌டிவ‌விய‌ல் (Geometry)',
-	'File exists.' => 'கோப்பு உள்ள‌து.',
-	'Attachments' => 'இணைப்புக‌ள்',
-	'now' => 'இப்பொழுது',
-	'%d query(s) executed OK.' => array('%d வின‌வ‌ல் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌து.', '%d வின‌வ‌ல்க‌ள் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌ன‌.'),
-	'Show only errors' => 'பிழைக‌ளை ம‌ட்டும் காண்பிக்க‌வும்',
-	'Last page' => 'க‌டைசி ப‌க்க‌ம்',
-	'Refresh' => 'புதுப்பி (Refresh)',
-	'Invalid schema.' => 'அமைப்புமுறை ச‌ரியான‌த‌ல்ல‌ (Invalid Schema).',
-	'Please use one of the extensions %s.' => 'த‌ய‌வு செய்து ஒரு விரிவினை %s (extension) உப‌யோகிக்க‌வும்.',
-	'ltr' => 'ltr',
-);

adminer/lang/zh-tw.inc.php

@@ -23,7 +23,7 @@ $translations = array(
 	'Options' => '選項',
 	'Save' => '儲存',
 	'Drop' => '丟棄',
-	'Database has been dropped.' => '資料庫已刪除。',
+	'Database has been dropped.' => '已丟棄資料庫。',
 	'Database has been created.' => '已建立資料庫。',
 	'Database has been renamed.' => '已重新命名資料庫。',
 	'Database has been altered.' => '已更改資料庫。',
@@ -38,7 +38,7 @@ $translations = array(
 	'select' => '選擇',
 	'Create new table' => '建立新資料表',
 	'Item has been updated.' => '已更新項目。',
-	'Item%s has been inserted.' => '已插入項目%s。',
+	'Item has been inserted.' => '已插入項目。',
 	'Edit' => '編輯',
 	'Insert' => '插入',
 	'Save and insert next' => '儲存並插入下一個',
@@ -225,45 +225,4 @@ $translations = array(
 	'%d in total' => '總共 %d 個',
 	'Permanent login' => '永久登入',
 	'Table has been dropped.' => '已經刪除資料表。',
-	'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' => 'Sequences',
-	'Create sequence' => '建立 sequence',
-	'Alter sequence' => '更改 sequence',
-	'Sequence has been dropped.' => '已刪除 sequence。',
-	'Sequence has been created.' => '已建立 sequence。',
-	'Sequence has been altered.' => '已更改 sequence。',
-	'User types' => '使用者類型',
-	'Create type' => '建立類型',
-	'Alter type' => '更改類型',
-	'Type has been dropped.' => '已刪除類型。',
-	'Type has been created.' => '已建立類型。',
-	'Double click on a value to modify it.' => '雙擊以進行修改。',
-	'Increase Text length to modify this value.' => '增加字串長度來修改。',
-	'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.' => '已順利執行 %d 個查詢。',
-	'Show only errors' => '僅顯示錯誤訊息',
-	'Last page' => '最後一頁',
-	'Refresh' => '重新載入',
-	'Invalid schema.' => '無效的資料表結構。',
-	'Please use one of the extensions %s.' => '請使用下列其中一個 extension %s。',
-	'now' => '現在',
-	'ltr' => 'ltr',
 );

adminer/lang/zh.inc.php

@@ -40,7 +40,7 @@ $translations = array(
 	'Create new table' => '创建新表',
 	'Item has been deleted.' => '已删除项目。',
 	'Item has been updated.' => '已更新项目。',
-	'Item%s has been inserted.' => '已插入项目%s。',
+	'Item has been inserted.' => '已插入项目。',
 	'Edit' => '编辑',
 	'Insert' => '插入',
 	'Save and insert next' => '保存并插入下一个',
@@ -62,7 +62,7 @@ $translations = array(
 	'Action' => '动作',
 	'edit' => '编辑',
 	'Page' => '页面',
-	'Query executed OK, %d row(s) affected.' => '执行查询OK，%d 行受影响。',
+	'Query executed OK, %d row(s) affected.' => '执行查询OK，%d 行受影响',
 	'Error in query' => '查询出错',
 	'Execute' => '执行',
 	'Table' => '表',
@@ -78,7 +78,7 @@ $translations = array(
 	'Unable to upload a file.' => '不能上传文件。',
 	'File upload' => '文件上传',
 	'File uploads are disabled.' => '文件上传被禁用。',
-	'Routine has been called, %d row(s) affected.' => '子程序被调用，%d 行被影响。',
+	'Routine has been called, %d row(s) affected.' => '子程序被调用，%d 行被影响',
 	'Call' => '调用',
 	'No extension' => '没有扩展',
 	'None of the supported PHP extensions (%s) are available.' => '没有支持的 PHP 扩展可用（%s）。',
@@ -222,48 +222,7 @@ $translations = array(
 	'Send' => '发送',
 	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
 	'Webserver file %s' => 'Web服务器文件 %s',
-	'File does not exist.' => '文件不存在。',
+	'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.' => '在值上双击类修改它。',
-	'Increase Text length to modify this value.' => '增加文本长度以修改该值。',
-	'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.' => '%d 条查询已成功执行。',
-	'Show only errors' => '仅显示错误',
-	'Last page' => '末页',
-	'Refresh' => '刷新',
-	'Invalid schema.' => '非法模式。',
-	'Please use one of the extensions %s.' => '请使用这些扩展中的一个：%s。',
-	'now' => '现在',
-	'ltr' => 'ltr',
 );

adminer/procedure.inc.php

@@ -39,7 +39,6 @@ if ($_POST) {
 ?>
 
 <form action="" method="post" id="form">
-<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
 <table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
@@ -53,6 +52,7 @@ if (isset($_GET["function"])) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
+<?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 </form>

adminer/processlist.inc.php

@@ -2,7 +2,7 @@
 if ($_POST && !$error) {
 	$killed = 0;
 	foreach ((array) $_POST["kill"] as $val) {
-		if (queries("KILL " . (+$val))) {
+		if (queries("KILL " . ereg_replace("[^0-9]+", "", $val))) {
 			$killed++;
 		}
 	}
@@ -13,17 +13,14 @@ page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" onclick="tableClick(event);" class="nowrap">
+<table cellspacing="0" onclick="tableClick(event);">
 <?php
-foreach (get_rows("SHOW FULL PROCESSLIST") as $i => $row) {
+$result = $connection->query("SHOW PROCESSLIST");
+for ($i=0; $row = $result->fetch_assoc(); $i++) {
 	if (!$i) {
 		echo "<thead><tr lang='en'><th>&nbsp;<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
 	}
-	echo "<tr" . odd() . "><td>" . checkbox("kill[]", $row["Id"], 0);
-	foreach ($row as $key => $val) {
-		echo "<td>" . ($key == "Info" && $val != "" ? "<code class='jush-$jush'>" . nbsp($val) . '</code> <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>' : nbsp($val));
-	}
-	echo "\n";
+	echo "<tr" . odd() . "><td>" . checkbox("kill[]", $row["Id"], 0) . "<td>" . implode("<td>", array_map('nbsp', $row)) . "\n";
 }
 ?>
 </table>

adminer/schema.inc.php

@@ -7,7 +7,7 @@ $table_pos_js = array();
 preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $_COOKIE["adminer_schema"], $matches, PREG_SET_ORDER); //! ':' in table name
 foreach ($matches as $i => $match) {
 	$table_pos[$match[1]] = array($match[2], $match[3]);
-	$table_pos_js[] = "\n\t'" . js_escape($match[1]) . "': [ $match[2], $match[3] ]";
+	$table_pos_js[] = "\n\t'" . addcslashes($match[1], "\r\n'\\/") . "': [ $match[2], $match[3] ]";
 }
 
 $top = 0;
@@ -27,21 +27,23 @@ foreach (table_status() as $row) {
 		$schema[$row["Name"]]["fields"][$name] = $field;
 	}
 	$schema[$row["Name"]]["pos"] = ($table_pos[$row["Name"]] ? $table_pos[$row["Name"]] : array($top, 0));
-	foreach ($adminer->foreignKeys($row["Name"]) as $val) {
-		if (!$val["db"]) {
-			$left = $base_left;
-			if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) {
-				$left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
-			} else {
-				$base_left -= .1;
+	if (fk_support($row)) {
+		foreach (foreign_keys($row["Name"]) as $val) {
+			if (!$val["db"]) {
+				$left = $base_left;
+				if ($table_pos[$row["Name"]][1] || $table_pos[$val["table"]][1]) {
+					$left = min(floatval($table_pos[$row["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
+				} else {
+					$base_left -= .1;
+				}
+				while ($lefts[(string) $left]) {
+					// find free $left
+					$left -= .0001;
+				}
+				$schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
+				$referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
+				$lefts[(string) $left] = true;
 			}
-			while ($lefts[(string) $left]) {
-				// find free $left
-				$left -= .0001;
-			}
-			$schema[$row["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
-			$referenced[$val["table"]][$row["Name"]][(string) $left] = $val["target"];
-			$lefts[(string) $left] = true;
 		}
 	}
 	$top = max($top, $schema[$row["Name"]]["pos"][0] + 2.5 + $pos);
@@ -58,10 +60,10 @@ document.onmouseup = schemaMouseup;
 <?php
 foreach ($schema as $name => $table) {
 	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schemaMousedown(this, event);'>";
-	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a><br>\n";
+	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><strong>' . h($name) . "</strong></a><br>\n";
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';
-		echo ($field["primary"] ? "<i>$val</i>" : $val) . "<br>\n";
+		echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br>\n";
 	}
 	foreach ((array) $table["references"] as $target_name => $refs) {
 		foreach ($refs as $left => $ref) {

adminer/scheme.inc.php

@@ -29,7 +29,7 @@ if ($_POST) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
 }
 ?>
 </form>

adminer/script.inc.php

@@ -1,38 +0,0 @@
-<?php
-header("Content-Type: text/javascript; charset=utf-8");
-if ($_GET["token"] != $token) { // CSRF protection
-	exit;
-}
-
-if ($_GET["script"] == "db") {
-	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
-	foreach (table_status() as $row) {
-		$id = js_escape($row["Name"]);
-		echo "setHtml('Comment-$id', '" . js_escape(nbsp($row["Comment"])) . "');\n";
-		if (!is_view($row)) {
-			foreach (array("Engine", "Collation") as $key) {
-				echo "setHtml('$key-$id', '" . js_escape(nbsp($row[$key])) . "');\n";
-			}
-			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
-				if ($row[$key] != "") {
-					$val = number_format($row[$key], 0, '.', lang(','));
-					echo "setHtml('$key-$id', '" . ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "');\n";
-					if (isset($sums[$key])) {
-						$sums[$key] += ($row["Engine"] != "InnoDB" || $key != "Data_free" ? $row[$key] : 0);
-					}
-				} elseif (array_key_exists($key, $row)) {
-					echo "setHtml('$key-$id');\n";
-				}
-			}
-		}
-	}
-	foreach ($sums as $key => $val) {
-		echo "setHtml('sum-$key', '" . number_format($val, 0, '.', lang(',')) . "');\n";
-	}
-} else { // connect
-	foreach (count_tables(get_databases()) as $db => $val) {
-		echo "setHtml('tables-" . js_escape($db) . "', '$val');\n";
-	}
-}
-
-exit; // don't print footer

adminer/select.inc.php

@@ -12,7 +12,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|blob', $field["type"])) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
@@ -28,24 +28,17 @@ $group_by = ($group && count($group) < count($select) ? "\nGROUP BY " . implode(
 
 if ($_POST && !$error) {
 	$where_check = "(" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . ")";
-	$primary = $unselected = null;
-	foreach ($indexes as $index) {
-		if ($index["type"] == "PRIMARY") {
-			$primary = array_flip($index["columns"]);
-			$unselected = ($select ? $primary : array());
-			break;
-		}
-	}
+	$primary = ($indexes["PRIMARY"] ? ($select ? array_flip($indexes["PRIMARY"]["columns"]) : array()) : null); // empty array means that all primary fields are selected
 	foreach ($select as $key => $val) {
 		$val = $_GET["columns"][$key];
 		if (!$val["fun"]) {
-			unset($unselected[$val["col"]]);
+			unset($primary[$val["col"]]);
 		}
 	}
 	if ($_POST["export"]) {
-		$adminer->dumpHeaders($TABLE);
-		$adminer->dumpTable($TABLE, "");
-		if (ereg("[ct]sv", $_POST["format"])) { // CSV or TSV
+		dump_headers($TABLE);
+		dump_table($TABLE, "");
+		if ($_POST["format"] != "sql") { // Editor doesn't send format
 			$row = array_keys($fields);
 			if ($select) {
 				$row = array();
@@ -55,19 +48,19 @@ if ($_POST && !$error) {
 			}
 			dump_csv($row);
 		}
-		if (!is_array($_POST["check"]) || $unselected === array()) {
+		if (!is_array($_POST["check"]) || $primary === array()) {
 			$where2 = $where;
 			if (is_array($_POST["check"])) {
 				$where2[] = "($where_check)";
 			}
-			$adminer->dumpData($TABLE, "INSERT", "SELECT $from" . ($where2 ? "\nWHERE " . implode(" AND ", $where2) : "") . $group_by);
+			dump_data($TABLE, "INSERT", "SELECT $from" . ($where2 ? "\nWHERE " . implode(" AND ", $where2) : "") . $group_by);
 		} else {
 			$union = array();
 			foreach ($_POST["check"] as $val) {
 				// where is not unique so OR can't be used
 				$union[] = "(SELECT" . limit($from, "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val) . $group_by, 1) . ")";
 			}
-			$adminer->dumpData($TABLE, "INSERT", implode(" UNION ALL ", $union));
+			dump_data($TABLE, "INSERT", implode(" UNION ALL ", $union));
 		}
 		exit;
 	}
@@ -100,7 +93,7 @@ if ($_POST && !$error) {
 					$command = "INSERT";
 					$query = "INTO $query";
 				}
-				if ($_POST["all"] || ($unselected === array() && $_POST["check"]) || count($group) < count($select)) {
+				if ($_POST["all"] || ($primary === array() && $_POST["check"]) || count($group) < count($select)) {
 					$result = queries($command . " $query" . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
 					$affected = $connection->affected_rows;
 				} else {
@@ -126,7 +119,7 @@ if ($_POST && !$error) {
 					$set = array();
 					foreach ($row as $key => $val) {
 						$key = bracket_escape($key, 1); // 1 - back
-						$set[] = idf_escape($key) . " = " . (ereg('char|text', $fields[$key]["type"]) || $val != "" ? $adminer->processInput($fields[$key], $val) : "NULL");
+						$set[] = idf_escape($key) . " = " . $adminer->processInput($fields[$key], $val);
 					}
 					$result = queries("UPDATE" . limit1(table($TABLE) . " SET " . implode(", ", $set), " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : ""))); // can change row on a different page without unique key
 					if (!$result) {
@@ -143,7 +136,7 @@ if ($_POST && !$error) {
 			preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
 			begin();
-			$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
+			$separator = ($_POST["separator"] == "csv" ? "," : ";");
 			foreach ($matches[0] as $key => $val) {
 				preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
 				if (!$key && !array_diff($matches2[1], $cols)) { //! doesn't work with column names containing ",\n
@@ -151,11 +144,12 @@ if ($_POST && !$error) {
 					$cols = $matches2[1];
 					$affected--;
 				} else {
-					$set = array();
+					$set = "";
 					foreach ($matches2[1] as $i => $col) {
-						$set[idf_escape($cols[$i])] = ($col == "" && $fields[$cols[$i]]["null"] ? "NULL" : q(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
+						$set .= ", " . idf_escape($cols[$i]) . " = " . ($col == "" && $fields[$cols[$i]]["null"] ? "NULL" : $connection->quote(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
 					}
-					$result = insert_update($TABLE, $set, $primary);
+					$set = substr($set, 1);
+					$result = queries("INSERT INTO " . table($TABLE) . " SET$set ON DUPLICATE KEY UPDATE$set");
 					if (!$result) {
 						break;
 					}
@@ -165,7 +159,7 @@ if ($_POST && !$error) {
 				queries("COMMIT");
 			}
 			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
-			queries("ROLLBACK"); // after queries_redirect() to not overwrite error
+			queries("ROLLBACK");
 		} else {
 			$error = upload_error($file);
 		}
@@ -209,10 +203,10 @@ if (!$columns) {
 	$page = $_GET["page"];
 	if ($page == "last") {
 		$found_rows = $connection->result("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : ""));
-		$page = floor(max(0, $found_rows - 1) / $limit);
+		$page = floor(($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 = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from, ($where ? "\nWHERE " . implode(" AND ", $where) : "") . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0), "\n");
 	echo $adminer->selectQuery($query);
 	
 	$result = $connection->query($query);
@@ -230,7 +224,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 = (intval($limit) && $group && count($group) < count($select)
 				? ($jush == "sql" ? $connection->result(" SELECT FOUND_ROWS()") : $connection->result("SELECT COUNT(*) FROM ($query) x")) // space to allow mysql.trace_mode
 				: count($rows)
 			);
@@ -242,20 +236,19 @@ if (!$columns) {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 			
 			echo "<table cellspacing='0' class='nowrap' onclick='tableClick(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>");
+			echo "<thead><tr><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;
+			$order = 1;
 			foreach ($rows[0] as $key => $val) {
 				$val = $_GET["columns"][key($select)];
 				$field = $fields[$select ? $val["col"] : $key];
-				$name = ($field ? $adminer->fieldName($field, $rank) : "*");
+				$name = ($field ? $adminer->fieldName($field, $order) : "*");
 				if ($name != "") {
-					$rank++;
+					$order++;
 					$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 && $group[0] == $column) ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; // $order[0] == $key - COUNT(*) //! columns looking like functions
+					echo '<th><a href="' . h(remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"][0] == $key && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
 				}
 				$functions[$key] = $val["fun"];
 				next($select);
@@ -275,40 +268,37 @@ if (!$columns) {
 				foreach ($unique_array as $key => $val) {
 					$unique_idf .= "&" . (isset($val) ? 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() . "><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($select) != count($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];
 						if ($val != "" && (!isset($email_fields[$key]) || $email_fields[$key] != "")) {
-							$email_fields[$key] = (is_mail($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
+							$email_fields[$key] = (is_email($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
 						}
 						$link = "";
 						$val = $adminer->editVal($val, $field);
 						if (!isset($val)) {
 							$val = "<i>NULL</i>";
 						} else {
-							if (ereg('blob|bytea|raw|file', $field["type"]) && $val != "") {
+							if (ereg('binary|blob|bytea', $field["type"]) && $val != "") {
 								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf);
 							}
 							if ($val == "") {
 								$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
+								$val = shorten_utf8($val, max(0, intval($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
 								foreach ((array) $foreign_keys[$key] as $foreign_key) {
-									if (count($foreign_keys[$key]) == 1 || end($foreign_key["source"]) == $key) {
-										$link = "";
+									if (count($foreign_keys[$key]) == 1 || count($foreign_key["source"]) == 1) {
 										foreach ($foreign_key["source"] as $i => $source) {
 											$link .= where_link($i, $foreign_key["target"][$i], $rows[$n][$source]);
 										}
 										$link = h(($foreign_key["db"] != "" ? preg_replace('~([?&]db=)[^&]+~', '\\1' . urlencode($foreign_key["db"]), ME) : ME) . 'select=' . urlencode($foreign_key["table"]) . $link); // InnoDB supports non-UNIQUE keys
-										if (count($foreign_key["source"]) == 1) {
-											break;
-										}
+										break;
 									}
 								}
 							}
@@ -325,26 +315,21 @@ if (!$columns) {
 								}
 							}
 						}
-						if (!$link) {
-							if (is_mail($val)) {
-								$link = "mailto:$val";
-							}
-							if ($protocol = is_url($row[$key])) {
-								$link = ($protocol == "http" && $HTTPS
-									? $row[$key] // HTTP links from HTTPS pages don't receive Referer automatically
-									: "$protocol://www.adminer.org/redirect/?url=" . urlencode($row[$key]) // intermediate page to hide Referer, may be changed to rel="noreferrer" in HTML5
-								);
-							}
+						if (!$link && is_email($val)) {
+							$link = "mailto:$val";
+						}
+						if (!$link && is_url($row[$key])) {
+							$link = "http://www.adminer.org/redirect/?url=" . urlencode($row[$key]); // intermediate page to hide Referer, may be changed to rel="noreferrer" in HTML5
 						}
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$h_value = h(isset($value) ? $value : $row[$key]);
-						$long = strpos($val, "<i>...</i>");
+						$long = strpos($val, "<em>...</em>");
 						$editable = is_utf8($val) && !$long && $rows[$n][$key] == $row[$key] && !$functions[$key];
-						$text = ereg('text|lob', $field["type"]);
+						$text = ereg('text|blob', $field["type"]);
 						echo (($_GET["modify"] && $editable) || isset($value)
-							? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "' onkeydown='return textareaKeydown(this, event);'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
-							: "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($text ? ", 1" : "") . ")" : "alert('" . h($long ? lang('Increase Text length to modify this value.') : lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
+							? "<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" . ($text ? ", 1" : "") . ")" : "alert('" . ($long ? lang('Increase text length to modify this value.') : lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
 						);
 					}
 				}
@@ -358,7 +343,7 @@ if (!$columns) {
 		
 		if ($rows || $page) {
 			$exact_count = true;
-			if ($_GET["page"] != "last" && +$limit && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
+			if ($_GET["page"] != "last" && intval($limit) && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
 				$found_rows = $table_status["Rows"];
 				if (!isset($found_rows) || $where || 2 * $page * $limit > $found_rows || ($table_status["Engine"] == "InnoDB" && $found_rows < 1e4)) {
 					// slow with big tables
@@ -370,10 +355,10 @@ if (!$columns) {
 				}
 			}
 			echo "<p class='pages'>";
-			if (+$limit && $found_rows > $limit) {
+			if (intval($limit) && $found_rows > $limit) {
 				// display first, previous 4, next 4 and last page
 				$max_page = floor(($found_rows - 1) / $limit);
-				echo '<a href="' . h(remove_from_uri("page")) . "\" onclick=\"var page = +prompt('" . lang('Page') . "', '" . ($page + 1) . "'); if (!isNaN(page) &amp;&amp; page) location.href = this.href + (page != 1 ? '&amp;page=' + (page - 1) : ''); return false;\">" . lang('Page') . "</a>:" . pagination(0, $page) . ($page > 5 ? " ..." : "");
+				echo lang('Page') . ":" . pagination(0, $page) . ($page > 5 ? " ..." : "");
 				for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
 					echo pagination($i, $page);
 				}
@@ -387,19 +372,18 @@ if (!$columns) {
 <input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>">
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
-<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"<?php echo confirm("(this.form['all'].checked ? $found_rows : formChecked(this, /check/))"); ?>>
+<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">
 </div></fieldset>
 <?php
 			}
 			print_fieldset("export", lang('Export'));
-			$output = $adminer->dumpOutput();
-			echo ($output ? html_select("output", $output, $adminer_export["output"]) . " " : "") . html_select("format", $adminer->dumpFormat(), $adminer_export["format"]);
+			echo $adminer->dumpOutput(1, $adminer_export["output"]) . " " . $adminer->dumpFormat(1, $adminer_export["format"]); // 1 - select
 			echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
 			echo "</div></fieldset>\n";
 		}
-		print_fieldset("import", lang('CSV Import'), !$rows);
+		print_fieldset("import", lang('CSV Import'), !$result->num_rows);
 		echo "<input type='hidden' name='token' value='$token'><input type='file' name='csv_file'> ";
-		echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_export["format"], 1); // 1 - select
+		echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;"), $adminer_export["format"], 1); // 1 - select
 		echo " <input type='submit' name='import' value='" . lang('Import') . "'>\n";
 		echo "</div></fieldset>\n";
 		

adminer/sequence.inc.php

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

adminer/sql.inc.php

@@ -1,6 +1,6 @@
 <?php
 restart_session();
-$history_all = &get_session("queries");
+$history_all = &get_session("history");
 $history = &$history_all[DB];
 if (!$error && $_POST["clear"]) {
 	$history = array();
@@ -18,7 +18,7 @@ if (!$error && $_POST) {
 			: "compress.bzip2://adminer.sql.bz2"
 		)), "rb");
 		$query = ($fp ? fread($fp, 1e6) : false);
-	} elseif ($_FILES && $_FILES["sql_file"]["error"] != 4) { // 4 - UPLOAD_ERR_NO_FILE
+	} elseif ($_POST["file"]) {
 		$query = get_file("sql_file", true);
 	}
 	if (is_string($query)) { // get_file() returns error as number, fread() as false
@@ -39,15 +39,14 @@ if (!$error && $_POST) {
 		if (is_object($connection2) && DB != "") {
 			$connection2->select_db(DB);
 		}
-		$commands = 0;
-		$errors = array();
-		$parse = '[\'`"]' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : ($jush == "mssql" || $jush == "sqlite" ? '|\\[' : '')) . '|/\\*|-- |#'; //! ` and # not everywhere
+		$queries = 0;
+		$errors = "";
 		while ($query != "") {
-			if (!$offset && $jush == "sql" && preg_match('~^\\s*DELIMITER\\s+(.+)~i', $query, $match)) {
+			if (!$offset && preg_match('~^\\s*DELIMITER\\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
+				preg_match('(' . preg_quote($delimiter) . '|[\'`"]|/\\*|-- |#|$)', $query, $match, PREG_OFFSET_CAPTURE, $offset); // should always match
 				$found = $match[0][0];
 				$offset = $match[0][1] + strlen($found);
 				if (!$found && $fp && !feof($fp)) {
@@ -56,32 +55,18 @@ if (!$error && $_POST) {
 					if (!$found && rtrim($query) == "") {
 						break;
 					}
-					if ($found && $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];
-							$offset = $match[0][1] + strlen($s);
-							if (!$s && $fp && !feof($fp)) {
-								$query .= fread($fp, 1e6);
-							} elseif ($s[0] != "\\") {
-								break;
-							}
-						}
-					} else { // end of a query
+					if (!$found || $found == $delimiter) { // end of a query
 						$empty = false;
 						$q = substr($query, 0, $match[0][1]);
-						$commands++;
-						$print = "<pre class='jush-$jush' id='sql-$commands'>" . shorten_utf8(trim($q), 1000) . "</pre>\n";
-						if (!$_POST["only_errors"]) {
-							echo $print;
-							ob_flush();
-							flush(); // can take a long time - show the running query
-						}
+						$queries++;
+						echo "<pre class='jush-$jush' id='sql-$queries'>" . shorten_utf8(trim($q), 1000) . "</pre>\n";
+						ob_flush();
+						flush(); // can take a long time - show the running query
 						$start = explode(" ", microtime()); // microtime(true) is available since PHP 5
 						//! don't allow changing of character_set_results, convert encoding of displayed query
 						if (!$connection->multi_query($q)) {
-							echo ($_POST["only_errors"] ? $print : "");
 							echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
-							$errors[] = " <a href='#sql-$commands'>$commands</a>";
+							$errors .= " <a href='#sql-$queries'>$queries</a>";
 							if ($_POST["error_stops"]) {
 								break;
 							}
@@ -92,46 +77,49 @@ if (!$error && $_POST) {
 							do {
 								$result = $connection->store_result();
 								$end = explode(" ", microtime());
-								$time = " <span class='time'>(" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . ")</span>" . (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : ""); // 1000 - maximum length of encoded URL in IE is 2083 characters
-								if (!is_object($result)) {
-									if (preg_match("~^$space*(CREATE|DROP|ALTER)$space+(DATABASE|SCHEMA)\\b~isU", $q)) {
-										restart_session();
-										set_session("dbs", null); // clear cache
-										session_write_close();
-									}
-									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";
-									}
-								} else {
-									if ($_POST["only_errors"]) {
-										echo $print;
-										$print = "";
-									}
+								$time = " <span class='time'>(" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . ")</span>";
+								if (is_object($result)) {
 									select($result, $connection2);
 									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $time;
 									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q)) {
-										$id = "explain-$commands";
+										$id = "explain-$queries";
 										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
 										echo "<div id='$id' class='hidden'>\n";
 										select(explain($connection2, $q));
 										echo "</div>\n";
 									}
+								} else {
+									if (preg_match("~^$space*(CREATE|DROP|ALTER)$space+(DATABASE|SCHEMA)\\b~isU", $q)) {
+										restart_session();
+										set_session("databases", null); // clear cache
+										session_write_close();
+									}
+									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
 								}
 								$start = $end;
 							} while ($connection->next_result());
 						}
 						$query = substr($query, $offset);
 						$offset = 0;
+					} else { // find matching quote or comment end
+						while (preg_match('~' . ($found == '/*' ? '\\*/' : (ereg('-- |#', $found) ? "\n" : "$found|\\\\.")) . '|$~s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
+							$s = $match[0][0];
+							$offset = $match[0][1] + strlen($s);
+							if (!$s && $fp && !feof($fp)) {
+								$query .= fread($fp, 1e6);
+							} elseif ($s[0] != "\\") {
+								break;
+							}
+						}
 					}
 				}
 			}
 		}
+		if ($errors && $queries > 1) {
+			echo "<p class='error'>" . lang('Error in query') . ": $errors\n";
+		}
 		if ($empty) {
 			echo "<p class='message'>" . lang('No commands to execute.') . "\n";
-		} elseif ($_POST["only_errors"]) {
-			echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors)) . "\n";
-		} elseif ($errors && $commands > 1) {
-			echo "<p class='error'>" . lang('Error in query') . ": " . implode("", $errors) . "\n";
 		}
 		//! MS SQL - SET SHOWPLAN_ALL OFF
 	} else {
@@ -149,18 +137,22 @@ if ($_POST) {
 	$q = $history[$_GET["history"]];
 }
 textarea("query", $q, 20);
-echo ($_POST ? "" : "<script type='text/javascript'>document.getElementsByTagName('textarea')[0].focus();</script>\n");
-echo "<p>" . (ini_bool("file_uploads") ? lang('File upload') . ': <input type="file" name="sql_file">' : lang('File uploads are disabled.'));
-
 ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
-<input type="submit" value="<?php echo lang('Execute'); ?>" title="Ctrl+Enter">
-<?php
-echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')) . "\n";
-echo checkbox("only_errors", 1, $_POST["only_errors"], lang('Show only errors')) . "\n";
+<input type="submit" value="<?php echo lang('Execute'); ?>">
+<?php echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')); ?>
 
-print_fieldset("webfile", lang('From server'), $_POST["webfile"]);
+<p>
+<?php
+if (!ini_bool("file_uploads")) {
+	echo lang('File uploads are disabled.');
+} else { ?>
+<?php echo lang('File upload'); ?>: <input type="file" name="sql_file">
+<input type="submit" name="file" value="<?php echo lang('Run file'); ?>">
+<?php } ?>
+
+<p><?php
 $compress = array();
 foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) {
 	if (extension_loaded($val)) {
@@ -168,9 +160,9 @@ foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) {
 	}
 }
 echo lang('Webserver file %s', "<code>adminer.sql" . ($compress ? "[" . implode("|", $compress) . "]" : "") . "</code>");
-echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
-echo "</div></fieldset>\n";
+?> <input type="submit" name="webfile" value="<?php echo lang('Run file'); ?>">
 
+<?php
 if ($history) {
 	print_fieldset("history", lang('History'), $_GET["history"] != "");
 	foreach ($history as $key => $val) {

adminer/static/default.css

@@ -18,6 +18,7 @@ td img { max-width: 200px; max-height: 200px; }
 code { background: #eee; }
 tr:hover td, tr:hover th { background: #ddf; }
 pre { margin: 1em 0 0; }
+ul { margin: 1em 0 0; }
 .version { color: #777; font-size: 67%; }
 .js .hidden { display: none; }
 .nowrap td, .nowrap th, td.nowrap { white-space: pre; }
@@ -38,6 +39,8 @@ pre { margin: 1em 0 0; }
 .type { width: 15ex; width: auto\9; }
 #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; }
 #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#tables { padding: 0 0 0 1em; }
+#tables li { list-style-type: none; }
 #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; }
@@ -47,12 +50,6 @@ pre { margin: 1em 0 0; }
 #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }
 
-.rtl h2 { margin: 0 -18px 20px 0; }
-.rtl p, .rtl table, .rtl .error, .rtl .message { margin: 1em 0 0 20px; }
-.rtl #content { margin: 2em 21em 0 0; padding: 10px 0 20px 20px; }
-.rtl #breadcrumb { left: auto; right: 21em; margin: 0 -18px 0 0; }
-.rtl #lang, .rtl #menu { left: auto; right: 0; }
-
 @media print {
 	#lang, #menu { display: none; }
 	#content { margin-left: 1em; }

adminer/static/editing.js

@@ -48,7 +48,6 @@ function selectValue(select) {
 * @return HTMLElement
 */
 function formField(form, name) {
-	// required in IE < 8, form.elements[name] doesn't work
 	for (var i=0; i < form.length; i++) {
 		if (form[i].name == name) {
 			return form[i];
@@ -139,7 +138,7 @@ function editingAddRow(button, allowed, focus) {
 	if (allowed && rowCount >= allowed) {
 		return false;
 	}
-	var match = /(\d+)(\.\d+)?/.exec(button.name);
+	var match = /([0-9]+)(\.[0-9]+)?/.exec(button.name);
 	var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
 	var row = button.parentNode.parentNode;
 	var row2 = row.cloneNode(true);
@@ -285,7 +284,6 @@ function partitionNameChange(el) {
 * @param HTMLSelectElement
 */
 function foreignAddRow(field) {
-	field.onchange = function () { };
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
@@ -293,6 +291,7 @@ function foreignAddRow(field) {
 		selects[i].selectedIndex = 0;
 	}
 	field.parentNode.parentNode.parentNode.appendChild(row);
+	field.onchange = function () { };
 }
 
 
@@ -301,7 +300,6 @@ function foreignAddRow(field) {
 * @param HTMLSelectElement
 */
 function indexesAddRow(field) {
-	field.onchange = function () { };
 	var row = field.parentNode.parentNode.cloneNode(true);
 	var spans = row.getElementsByTagName('span');
 	for (var i=0; i < spans.length - 1; i++) {
@@ -309,28 +307,29 @@ function indexesAddRow(field) {
 	}
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
-		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
+		selects[i].name = selects[i].name.replace(/indexes\[[0-9]+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
 	var input = row.getElementsByTagName('input')[0];
-	input.name = input.name.replace(/indexes\[\d+/, '$&1');
+	input.name = input.name.replace(/indexes\[[0-9]+/, '$&1');
 	input.value = '';
 	field.parentNode.parentNode.parentNode.appendChild(row);
+	field.onchange = function () { };
 }
 
 /** Add column for index
 * @param HTMLSelectElement
 */
 function indexesAddColumn(field) {
-	field.onchange = function () { };
 	var column = field.parentNode.cloneNode(true);
 	var select = column.getElementsByTagName('select')[0];
-	select.name = select.name.replace(/\]\[\d+/, '$&1');
+	select.name = select.name.replace(/\]\[[0-9]+/, '$&1');
 	select.selectedIndex = 0;
 	var input = column.getElementsByTagName('input')[0];
-	input.name = input.name.replace(/\]\[\d+/, '$&1');
+	input.name = input.name.replace(/\]\[[0-9]+/, '$&1');
 	input.value = '';
 	field.parentNode.parentNode.appendChild(column);
+	field.onchange = function () { };
 }
 
 
@@ -374,7 +373,7 @@ function schemaMousemove(ev) {
 					isTop = (div2.offsetTop + ref[0] * em > divs[i].offsetTop + top * em);
 				}
 				if (!lineSet[id]) {
-					var line = document.getElementById(divs[i].id.replace(/^....(.+)-\d+$/, 'refl$1'));
+					var line = document.getElementById(divs[i].id.replace(/^....(.+)-[0-9]+$/, 'refl$1'));
 					var shift = ev.clientY - y - that.offsetTop;
 					line.style.left = (left + left1) + 'em';
 					if (isTop) {

adminer/static/functions.js

@@ -1,5 +1,5 @@
 // to hide elements displayed by JavaScript
-document.body.className += ' js';
+document.body.className = 'js';
 
 /** Toggle visibility
 * @param string
@@ -105,76 +105,42 @@ function setHtml(id, html) {
 * @param HTMLSelectElement
 */
 function selectAddRow(field) {
-	field.onchange = function () { };
 	var row = field.parentNode.cloneNode(true);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
-		selects[i].name = selects[i].name.replace(/[a-z]\[\d+/, '$&1');
+		selects[i].name = selects[i].name.replace(/[a-z]\[[0-9]+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
 	var inputs = row.getElementsByTagName('input');
 	if (inputs.length) {
-		inputs[0].name = inputs[0].name.replace(/[a-z]\[\d+/, '$&1');
+		inputs[0].name = inputs[0].name.replace(/[a-z]\[[0-9]+/, '$&1');
 		inputs[0].value = '';
 		inputs[0].className = '';
 	}
 	field.parentNode.parentNode.appendChild(row);
+	field.onchange = function () { };
 }
 
 
 
-/** Handle Ctrl+Enter and optionally Tab in textarea
-* @param HTMLTextAreaElement
-* @param KeyboardEvent
-* @param boolean handle also Tab
-* @param HTMLInputElement submit button
-* @return boolean
-*/
-function textareaKeydown(target, event, tab, button) {
-	if (tab && event.keyCode == 9 && !event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
-		// inspired by http://pallieter.org/Projects/insertTab/
-		if (target.setSelectionRange) {
-			var start = target.selectionStart;
-			target.value = target.value.substr(0, start) + '\t' + target.value.substr(target.selectionEnd);
-			target.setSelectionRange(start + 1, start + 1);
-			return false; //! still loses focus in Opera, can be solved by handling onblur
-		} else if (target.createTextRange) {
-			document.selection.createRange().text = '\t';
-			return false;
-		}
-	}
-	if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey) { // shiftKey allowed
-		if (button) {
-			button.click();
-		} else {
-			target.form.submit();
-		}
-	}
-	return true;
-}
-
 /** Display edit field
 * @param HTMLElement
 * @param MouseEvent
 * @param boolean display textarea instead of input
 */
 function selectDblClick(td, event, text) {
-	td.ondblclick = function () { };
 	var pos = event.rangeOffset;
-	var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : (td.firstChild.alt ? td.firstChild.alt : td.firstChild.data));
+	var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : td.firstChild.data);
 	var input = document.createElement(text ? 'textarea' : 'input');
 	input.name = td.id;
 	input.value = (value == '\u00A0' || td.getElementsByTagName('i').length ? '' : value); // &nbsp; or i - NULL
-	input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
+	input.style.width = (td.clientWidth - 14) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
 	if (text) {
 		var rows = 1;
 		value.replace(/\n/g, function () {
 			rows++;
 		});
 		input.rows = rows;
-		input.onkeydown = function (event) {
-			return textareaKeydown(input, event || window.event);
-		};
 	}
 	if (document.selection) {
 		var range = document.selection.createRange();
@@ -194,4 +160,5 @@ function selectDblClick(td, event, text) {
 		range.moveStart('character', pos);
 		range.select();
 	}
+	td.ondblclick = function () { };
 }

adminer/table.inc.php

@@ -6,12 +6,8 @@ if (!$fields) {
 }
 $table_status = ($fields ? table_status($TABLE) : array());
 
-page_header(($fields && is_view($table_status) ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
+page_header(($fields && $table_status["Engine"] == "VIEW" ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
 $adminer->selectLinks($table_status);
-$comment = $table_status["Comment"];
-if ($comment != "") {
-	echo "<p>" . lang('Comment') . ": " . h($comment) . "\n";
-}
 
 if ($fields) {
 	echo "<table cellspacing='0'>\n";
@@ -24,7 +20,7 @@ if ($fields) {
 	}
 	echo "</table>\n";
 	
-	if (!is_view($table_status)) {
+	if ($table_status["Engine"] != "VIEW") {
 		echo "<h3>" . lang('Indexes') . "</h3>\n";
 		$indexes = indexes($TABLE);
 		if ($indexes) {
@@ -48,11 +44,11 @@ if ($fields) {
 				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . ($jush != "sqlite" ? "<td>&nbsp;" : "") . "</thead>\n";
 				foreach ($foreign_keys as $name => $foreign_key) {
-					$link = ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . h($foreign_key["table"]);
+					$link = ($foreign_key["db"] != "" ? "<strong>" . h($foreign_key["db"]) . "</strong>." : "") . h($foreign_key["table"]);
 					echo "<tr>";
 					echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
 					echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ME) . "table=" . urlencode($foreign_key["table"]) . "'>$link</a>";
-					echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
+					echo "(<em>" . implode("</em>, <em>", array_map('h', $foreign_key["target"])) . "</em>)";
 					echo "<td>$foreign_key[on_delete]\n";
 					echo "<td>$foreign_key[on_update]\n";
 					if ($jush != "sqlite") {

adminer/trigger.inc.php

@@ -30,15 +30,15 @@ if ($_POST) {
 
 <form action="" method="post" id="form">
 <table cellspacing="0">
-<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "if (/^" . h(preg_quote($TABLE, "/")) . "_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '" . h(js_escape($TABLE)) . "_' + selectValue(this).charAt(0).toLowerCase() + selectValue(this.form['Event']).charAt(0).toLowerCase();"); ?>
+<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "if (/^" . h(preg_quote($TABLE, "/")) . "_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '" . h(addcslashes($TABLE, "\r\n'\\")) . "_' + selectValue(this).charAt(0).toLowerCase() + selectValue(this.form['Event']).charAt(0).toLowerCase();"); ?>
 <tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_event, $row["Event"], "this.form['Timing'].onchange();"); ?>
 <tr><th><?php echo lang('Type'); ?><td><?php echo html_select("Type", $trigger_options["Type"], $row["Type"]); ?>
 </table>
-<p><?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64">
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
+<?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 </form>

adminer/type.inc.php

@@ -1,33 +0,0 @@
-<?php
-$TYPE = $_GET["type"];
-
-if ($_POST && !$error) {
-	$link = substr(ME, 0, -1);
-	if ($_POST["drop"]) {
-		query_redirect("DROP TYPE " . idf_escape($TYPE), $link, lang('Type has been dropped.'));
-	} else {
-		query_redirect("CREATE TYPE " . idf_escape($_POST["name"]) . " $_POST[as]", $link, lang('Type has been created.'));
-	}
-}
-
-page_header($TYPE != "" ? lang('Alter type') . ": " . h($TYPE) : lang('Create type'), $error);
-
-$row["as"] = "AS ";
-if ($_POST) {
-	$row = $_POST;
-}
-?>
-
-<form action="" method="post">
-<p>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-<?php
-if ($TYPE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
-} else {
-	echo "<input name='name' value='" . h($row['name']) . "'>\n";
-	textarea("as", $row["as"]);
-	echo "<p><input type='submit' value='" . lang('Save') . "'>\n";
-}
-?>
-</form>

adminer/user.inc.php

@@ -1,7 +1,8 @@
 <?php
 $USER = $_GET["user"];
 $privileges = array("" => array("All privileges" => ""));
-foreach (get_rows("SHOW PRIVILEGES") as $row) {
+$result = $connection->query("SHOW PRIVILEGES");
+while ($row = $result->fetch_assoc()) {
 	foreach (explode(",", ($row["Privilege"] == "Grant option" ? "" : $row["Context"])) as $context) {
 		$privileges[$context][$row["Privilege"]] = $row["Comment"];
 	}
@@ -26,7 +27,7 @@ if ($_POST) {
 }
 $grants = array();
 $old_pass = "";
-if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q($USER) . "@" . q($_GET["host"])))) { //! use information_schema for MySQL 5 - column names in column privileges are not escaped
+if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . $connection->quote($USER) . "@" . $connection->quote($_GET["host"])))) { //! use information_schema for MySQL 5 - column names in column privileges are not escaped
 	while ($row = $result->fetch_row()) {
 		if (preg_match('~GRANT (.*) ON (.*) TO ~', $row[0], $match) && preg_match_all('~ *([^(,]*[^ ,(])( *\\([^)]+\\))?~', $match[1], $matches, PREG_SET_ORDER)) { //! escape the part between ON and TO
 			foreach ($matches as $val) {
@@ -45,9 +46,9 @@ if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q
 }
 
 if ($_POST && !$error) {
-	$old_user = (isset($_GET["host"]) ? q($USER) . "@" . q($_GET["host"]) : "''");
-	$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
-	$pass = q($_POST["pass"]);
+	$old_user = (isset($_GET["host"]) ? $connection->quote($USER) . "@" . $connection->quote($_GET["host"]) : "''");
+	$new_user = $connection->quote($_POST["user"]) . "@" . $connection->quote($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
+	$pass = $connection->quote($_POST["pass"]);
 	if ($_POST["drop"]) {
 		query_redirect("DROP USER $old_user", ME . "privileges=", lang('User has been dropped.'));
 	} else {
@@ -164,5 +165,5 @@ echo "</table>\n";
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
 </form>

adminer/view.inc.php

@@ -25,10 +25,10 @@ if ($_POST) {
 ?>
 
 <form action="" method="post">
-<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
 <p><?php textarea("select", $row["select"]); ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php if ($dropped) { // old view was dropped but new wasn't created ?><input type="hidden" name="dropped" value="1"><?php } ?>
+<?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 </form>

changes.txt

@@ -1,51 +1,17 @@
-Adminer 3.1.0 (released 2010-11-16):
-TSV export and import
-Customizable export
-Option to show only errors in SQL command
-Link to bookmark SQL command
-Recognize $$ strings in SQL command (PostgreSQL)
-Highlight and edit SQL command in processlist
-Always display all drivers
-Timestamp at the end of export
-Link to refresh database cache (bug #3102451)
-Support for virtual foreign keys
-Disable XSS "protection" of IE8
-Immunity against zend.ze1_compatibility_mode (bug #3089645)
-Fix last page with empty result set
-Arabic translation and RTL support
-Dual licensing: Apache or GPL
-
-Adminer 3.0.1 (released 2010-10-18):
-Send the form by Ctrl+Enter in all textareas
-Disable creating SQLite databases with extension other than db, sdb, sqlite
-Ability to use Adminer in a frame through customization
-Catalan translation
-MS SQL 2005 compatibility
-PostgreSQL: connect if the eponymous database does not exist
-
-Adminer 3.0.0 (released 2010-10-15):
+Adminer 3.0.0-dev:
 Drivers for MS SQL, SQLite, PostgreSQL, Oracle
 Allow concurrent logins on the same server
 Allow permanent login without customization
 In-place editation in select
-Foreign key options in Table creation
-Treat binary type as hex
 Show number of tables in server overview
 Operator LIKE %%
 Remember export parameters in cookie
 Allow semicolon as CSV separator
-Schemas, sequences and types support (PostgreSQL)
 Autofocus username in login form
-Allow to insert Tab in SQL textareas and send the form by Ctrl+Enter
 Disable spellchecking in SQL textareas
 Display auto_increment value of inserted item
-Allow disabling auto_increment value export
-Prefill auto_increment column name
-Ability to jump to any page in select by JavaScript
-Display comment in table overview
-Link last page above data in select
 Link table names in SQL queries
-Hungarian, Japanese and Tamil translation
+Japanese translation
 Defer table information in database overview to JavaScript (performance)
 Big tables optimizations (performance)
 

compile.php

@@ -60,20 +60,20 @@ function put_file($match) {
 }
 
 function put_file_lang($match) {
-	global $lang_ids, $project, $langs;
+	global $lang_ids, $project;
 	if ($_SESSION["lang"]) {
 		return "";
 	}
 	$return = "";
-	foreach ($langs as $lang => $val) {
-		include dirname(__FILE__) . "/adminer/lang/$lang.inc.php"; // assign $translations
+	foreach (glob(dirname(__FILE__) . "/adminer/lang/*.inc.php") as $filename) {
+		include $filename; // assign $translations
 		$translation_ids = array_flip($lang_ids); // default translation
 		foreach ($translations as $key => $val) {
 			if (isset($val)) {
 				$translation_ids[$lang_ids[$key]] = $val;
 			}
 		}
-		$return .= "\tcase \"$lang\": \$translations = array(";
+		$return .= "\tcase \"" . basename($filename, '.inc.php') . '": $translations = array(';
 		foreach ($translation_ids as $val) {
 			$return .= (is_array($val) ? "array('" . implode("', '", array_map('add_apo_slashes', $val)) . "')" : "'" . add_apo_slashes($val) . "'") . ", ";
 		}
@@ -207,7 +207,6 @@ foreach (glob(dirname(__FILE__) . "/adminer/drivers/" . ($driver ? $driver : "*"
 }
 
 include dirname(__FILE__) . "/adminer/include/pdo.inc.php";
-$features = array("view", "event", "privileges", "user", "processlist", "variables", "trigger", "scheme", "sequence", "dump");
 foreach (array("adminer", "editor") as $project) {
 	$lang_ids = array(); // global variable simplifies usage in a callback function
 	$file = file_get_contents(dirname(__FILE__) . "/$project/index.php");
@@ -215,7 +214,7 @@ foreach (array("adminer", "editor") as $project) {
 		$connection = (object) array("server_info" => 5.1); // MySQL support is version specific
 		$_GET[$driver] = true; // to load the driver
 		include_once dirname(__FILE__) . "/adminer/drivers/$driver.inc.php";
-		foreach ($features as $feature) {
+		foreach (array("view", "event", "privileges", "user", "processlist", "variables", "trigger", "scheme", "sequence") as $feature) {
 			if (!support($feature)) {
 				$file = str_replace("} elseif (isset(\$_GET[\"$feature\"])) {\n\tinclude \"./$feature.inc.php\";\n", "", $file);
 			}
@@ -232,19 +231,8 @@ foreach (array("adminer", "editor") as $project) {
 		$file = preg_replace('(include "../adminer/drivers/(?!' . preg_quote($driver) . ').*\\s*)', '', $file);
 	}
 	$file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file); // bootstrap.inc.php
-	if ($driver) {
-		foreach ($features as $feature) {
-			if (!support($feature)) {
-				$file = preg_replace("((\t*)" . preg_quote('if (support("' . $feature . '")') . ".*\n\\1\\})sU", '', $file);
-			}
-		}
-		if (count($drivers) == 1) {
-			$file = str_replace('<?php echo html_select("driver", $drivers, DRIVER); ?>', "<input type='hidden' name='driver' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
-		}
-	}
 	$file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 	$file = preg_replace_callback('~\\b(include|require) "([^"]*\\$LANG.inc.php)";~', 'put_file_lang', $file);
-	$file = str_replace("\r", "", $file);
 	if ($_SESSION["lang"]) {
 		// single language version
 		$file = preg_replace_callback("~(<\\?php\\s*echo )?lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])(;\\s*\\?>)?~s", 'remove_lang', $file);

editor/db.inc.php

@@ -1,21 +1,14 @@
 <?php
 page_header(lang('Server'), "", false);
 
-echo "<form action='' method='post'>\n";
-echo "<p>" . lang('Search data in tables') . ": <input name='query' value='" . h($_POST["query"]) . "'> <input type='submit' value='" . lang('Search') . "'>\n";
-if ($_POST["query"] != "") {
+?>
+<form action=""><p>
+<?php echo lang('Search data in tables'); ?>:
+<?php hidden_fields_get(); ?>
+<input name="where[0][val]" value="<?php echo h($_GET["where"][0]["val"]); ?>">
+<input type="submit" value="<?php echo lang('Search'); ?>" />
+</form>
+<?php
+if ($_GET["where"][0]["val"] != "") {
 	search_tables();
 }
-echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
-echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^tables\[/);"><th>' . lang('Table') . '<td>' . lang('Rows') . "</thead>\n";
-foreach (table_status() as $table => $row) {
-	$name = $adminer->tableName($row);
-	if (isset($row["Engine"]) && $name != "") {
-		echo '<tr' . odd() . '><td>' . checkbox("tables[]", $table, in_array($table, (array) $_POST["tables"], true), "", "formUncheck('check-all');");
-		echo '<th><a href="' . h(ME) . 'select=' . urlencode($table) . '">' . h($name) . '</a>';
-		$val = number_format($row["Rows"], 0, '.', lang(','));
-		echo "<td align='right'><a href='" . h(ME . "edit=") . urlencode($table) . "'>" . ($row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "</a>";
-	}
-}
-echo "</table>\n";
-echo "</form>\n";

editor/example.php

@@ -29,11 +29,8 @@ function adminer_object() {
 		}
 		
 		function fieldName($field, $order = 0) {
-			if ($order && ereg('_(md5|sha1)$', $field["field"])) {
-				return ""; // hide hashes in select
-			}
 			// only columns with comments will be displayed and only the first five in select
-			return ($order <= 5 ? h($field["comment"]) : "");
+			return ($order <= 5 && !ereg('_(md5|sha1)$', $field["field"]) ? h($field["comment"]) : "");
 		}
 		
 	}

editor/include/adminer.inc.php

@@ -10,7 +10,7 @@ class Adminer {
 	//! driver, ns
 	
 	function credentials() {
-		return array(SERVER, $_GET["username"], get_session("pwds"));
+		return array(); // default INI settings
 	}
 	
 	function permanentLogin() {
@@ -19,18 +19,13 @@ class Adminer {
 	
 	function database() {
 		global $connection;
-		$databases = get_databases(false);
-		return (!$databases
+		$dbs = get_databases(false);
+		return (!$dbs
 			? $connection->result("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1)") // username without the database list
-			: $databases[(information_schema($databases[0]) ? 1 : 0)] // first available database
+			: $dbs[(information_schema($dbs[0]) ? 1 : 0)] // first available database
 		);
 	}
 	
-	function headers() {
-		header("X-Frame-Options: deny");
-		header("X-XSS-Protection: 0");
-	}
-	
 	function loginForm() {
 		?>
 <table cellspacing="0">
@@ -62,31 +57,30 @@ document.getElementById('username').focus();
 		if (isset($set)) {
 			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";
-	}
-	
-	function foreignKeys($table) {
-		return foreign_keys($table);
 	}
 	
 	function backwardKeys($table, $tableName) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_COLUMN_NAME
+		$result = $connection->query("SELECT TABLE_NAME, CONSTRAINT_NAME, COLUMN_NAME, REFERENCED_COLUMN_NAME
 FROM information_schema.KEY_COLUMN_USAGE
-WHERE TABLE_SCHEMA = " . q($this->database()) . "
-AND REFERENCED_TABLE_SCHEMA = " . q($this->database()) . "
-AND REFERENCED_TABLE_NAME = " . q($table) . "
-ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
-			$return[$row["TABLE_NAME"]]["keys"][$row["CONSTRAINT_NAME"]][$row["COLUMN_NAME"]] = $row["REFERENCED_COLUMN_NAME"];
-		}
-		foreach ($return as $key => $val) {
-			$name = $this->tableName(table_status($key));
-			if ($name != "") {
-				$search = preg_quote($tableName);
-				$separator = "(:|\\s*-)?\\s+";
-				$return[$key]["name"] = (preg_match("(^$search$separator(.+)|^(.+?)$separator$search\$)", $name, $match) ? $match[2] . $match[3] : $name);
-			} else {
-				unset($return[$key]);
+WHERE TABLE_SCHEMA = " . $connection->quote($this->database()) . "
+AND REFERENCED_TABLE_SCHEMA = " . $connection->quote($this->database()) . "
+AND REFERENCED_TABLE_NAME = " . $connection->quote($table) . "
+ORDER BY ORDINAL_POSITION");
+		if ($result) { //! requires MySQL 5
+			while ($row = $result->fetch_assoc()) {
+				$return[$row["TABLE_NAME"]]["keys"][$row["CONSTRAINT_NAME"]][$row["COLUMN_NAME"]] = $row["REFERENCED_COLUMN_NAME"];
+			}
+			foreach ($return as $key => $val) {
+				$name = $this->tableName(table_status($key));
+				if ($name != "") {
+					$search = preg_quote($tableName);
+					$separator = "(:|\\s*-)?\\s+";
+					$return[$key]["name"] = (preg_match("(^$search$separator(.+)|^(.+?)$separator$search\$)", $name, $match) ? $match[2] . $match[3] : $name);
+				} else {
+					unset($return[$key]);
+				}
 			}
 		}
 		return $return;
@@ -114,7 +108,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function selectQuery($query) {
-		return "<!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->\n";
+		return "<!--\n" . str_replace("--", "--><!--", $query) . "\n-->\n";
 	}
 	
 	function rowDescription($table) {
@@ -161,7 +155,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	
 	function selectVal($val, $link, $field) {
 		$return = ($val == "<i>NULL</i>" ? "&nbsp;" : $val);
-		if (ereg('blob|bytea', $field["type"]) && !is_utf8($val)) {
+		if (ereg('binary|blob|bytea', $field["type"]) && !is_utf8($val)) {
 			$return = lang('%d byte(s)', strlen($val));
 			if (ereg("^(GIF|\xFF\xD8\xFF|\x89\x50\x4E\x47\x0D\x0A\x1A\x0A)", $val)) { // GIF|JPG|PNG, getimagetype() works with filename
 				$return = "<img src='$link' alt='$return'>";
@@ -183,9 +177,9 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	
 	function editVal($val, $field) {
 		if (ereg('date|timestamp', $field["type"]) && isset($val)) {
-			return preg_replace('~^(\\d{2}(\\d+))-(0?(\\d+))-(0?(\\d+))~', lang('$1-$3-$5'), $val);
+			return preg_replace('~^([0-9]{2}([0-9]+))-(0?([0-9]+))-(0?([0-9]+))~', lang('$1-$3-$5'), $val);
 		}
-		return (ereg("binary", $field["type"]) ? reset(unpack("H*", $val)) : $val);
+		return $val;
 	}
 	
 	function selectColumnsPrint($select, $columns) {
@@ -206,7 +200,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 				$key = $keys[$name];
 				$i--;
 				echo "<div>" . h($desc) . "<input type='hidden' name='where[$i][col]' value='" . h($name) . "'>:";
-				echo enum_input("checkbox", " name='where[$i][val][]'", $field, (array) $where[$key]["val"]); //! impossible to search for NULL
+				enum_input("checkbox", "where[$i][val][]", $field, (array) $where[$key]["val"]); //! impossible to search for NULL
 				echo "</div>\n";
 				unset($columns[$name]);
 			}
@@ -222,7 +216,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		}
 		$i = 0;
 		foreach ($where as $val) {
-			if (($val["col"] == "" || $columns[$val["col"]]) && "$val[col]$val[val]" != "") {
+			if ($columns[$val["col"]] && "$val[col]$val[val]" != "") {
 				echo "<div><select name='where[$i][col]'><option value=''>(" . lang('anywhere') . ")" . optionlist($columns, $val["col"], true) . "</select>";
 				echo html_select("where[$i][op]", array(-1 => "") + $this->operators, $val["op"]);
 				echo "<input name='where[$i][val]' value='" . h($val["val"]) . "'></div>\n";
@@ -274,9 +268,9 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			echo '<fieldset><legend><a href="#fieldset-email" onclick="return !toggle(\'fieldset-email\');">' . lang('E-mail') . "</a></legend><div id='fieldset-email'" . ($_POST["email_append"] ? "" : " class='hidden'") . ">\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' onkeydown='return textareaKeydown(this, event, false, this.form.email);'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n";
+			echo "<p><textarea name='email_message' rows='15' cols='75'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n";
 			echo 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>" . lang('Attachments') . ": <input type='file' name='email_files[]' onchange=\"var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el); this.onchange = function () { };\">";
 			echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : html_select("email_field", $emailFields));
 			echo "<input type='submit' name='email' value='" . lang('Send') . "' onclick=\"return this.form['delete'].onclick();\">\n";
 			echo "</div></fieldset>\n";
@@ -345,6 +339,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function selectEmailProcess($where, $foreignKeys) {
+		global $connection;
 		if ($_POST["email_append"]) {
 			return true;
 		}
@@ -355,11 +350,15 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 				$subject = $_POST["email_subject"];
 				$message = $_POST["email_message"];
 				preg_match_all('~\\{\\$([a-z0-9_]+)\\}~i', "$subject.$message", $matches); // allows {$name} in subject or message
-				$rows = get_rows("SELECT DISTINCT $field" . ($matches[1] ? ", " . implode(", ", array_map('idf_escape', array_unique($matches[1]))) : "") . " FROM " . idf_escape($_GET["select"])
+				$result = $connection->query("SELECT DISTINCT $field" . ($matches[1] ? ", " . implode(", ", array_map('idf_escape', array_unique($matches[1]))) : "") . " FROM " . idf_escape($_GET["select"])
 					. " WHERE $field IS NOT NULL AND $field != ''"
 					. ($where ? " AND " . implode(" AND ", $where) : "")
 					. ($_POST["all"] ? "" : " AND ((" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . "))")
 				);
+				$rows = array();
+				while ($row = $result->fetch_assoc()) {
+					$rows[] = $row;
+				}
 				$fields = fields($_GET["select"]);
 				foreach ($this->rowDescriptions($rows, $foreignKeys) as $row) {
 					$replace = array('{\\' => '{'); // allow literal {$name}
@@ -367,7 +366,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 						$replace['{$' . "$val}"] = $this->editVal($row[$val], $fields[$val]);
 					}
 					$email = $row[$_POST["email_field"]];
-					if (is_mail($email) && send_mail($email, strtr($subject, $replace), strtr($message, $replace), $_POST["email_from"], $_FILES["email_files"])) {
+					if (is_email($email) && send_email($email, strtr($subject, $replace), strtr($message, $replace), $_POST["email_from"], $_FILES["email_files"])) {
 						$sent++;
 					}
 				}
@@ -379,14 +378,14 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function messageQuery($query) {
-		return "<!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->";
+		return "<!--\n" . str_replace("--", "--><!--", $query) . "\n-->";
 	}
 	
 	function editFunctions($field) {
 		$return = array("" => ($field["null"] || $field["auto_increment"] || $field["full_type"] == "tinyint(1)" ? "" : "*"));
 		//! respect driver
 		if (ereg('date|time', $field["type"])) {
-			$return["now"] = lang('now');
+			$return[] = "now";
 		}
 		if (eregi('_(md5|sha1)$', $field["field"], $match)) {
 			$return[] = strtolower($match[1]);
@@ -396,10 +395,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	
 	function editInput($table, $field, $attrs, $value) {
 		if ($field["type"] == "enum") {
-			return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
-				. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value || isset($_GET["select"]) ? "" : " checked") . "><i>" . lang('empty') . "</i></label>" : "")
-				. enum_input("radio", $attrs, $field, $value)
-			;
+			return ($field["null"] ? "<input type='radio'$attrs value=''" . ($value || isset($_GET["select"]) ? "" : " checked") . ">" : "");
 		}
 		$options = $this->_foreignKeyOptions($table, $field["field"]);
 		if ($options) {
@@ -415,54 +411,29 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function processInput($field, $value, $function = "") {
+		global $connection;
 		if ($function == "now") {
 			return "$function()";
 		}
 		$return = $value;
-		if (ereg('date|timestamp', $field["type"]) && preg_match('(^' . str_replace('\\$1', '(?P<p1>\\d*)', preg_replace('~(\\\\\\$([2-6]))~', '(?P<p\\2>\\d{1,2})', preg_quote(lang('$1-$3-$5')))) . '(.*))', $value, $match)) {
+		if (ereg('date|timestamp', $field["type"]) && preg_match('(^' . str_replace('\\$1', '(?P<p1>[0-9]*)', preg_replace('~(\\\\\\$([2-6]))~', '(?P<p\\2>[0-9]{1,2})', preg_quote(lang('$1-$3-$5')))) . '(.*))', $value, $match)) {
 			$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 = q($return);
-		if (!ereg('char|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && $value == "") {
+		$return = $connection->quote($return);
+		if (!ereg('varchar|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && $value == "") {
 			$return = "NULL";
 		} elseif (ereg('^(md5|sha1)$', $function)) {
 			$return = "$function($return)";
 		}
-		if (ereg("binary", $field["type"])) {
-			$return = "unhex($return)";
-		}
 		return $return;
 	}
 	
-	function dumpOutput() {
-		return array();
+	function dumpOutput($select, $value = "") {
+		return "";
 	}
 	
-	function dumpFormat() {
-		return array('csv' => 'CSV,', 'csv;' => 'CSV;', 'tsv' => 'TSV');
-	}
-	
-	function dumpTable() {
-		echo "\xef\xbb\xbf"; // UTF-8 byte order mark
-	}
-	
-	function dumpData($table, $style, $query) {
-		global $connection;
-		$result = $connection->query($query, 1); // 1 - MYSQLI_USE_RESULT
-		if ($result) {
-			while ($row = $result->fetch_assoc()) {
-				dump_csv($row);
-			}
-		}
-	}
-	
-	function dumpHeaders($identifier) {
-		$filename = ($identifier != "" ? friendly_url($identifier) : "dump");
-		$ext = "csv";
-		header("Content-Type: text/csv; charset=utf-8");
-		header("Content-Disposition: attachment; filename=$filename.$ext");
-		session_write_close();
-		return $ext;
+	function dumpFormat($select, $value = "") {
+		return html_select("format", array('csv' => 'CSV,', 'csv;' => 'CSV;'), $value, $select);
 	}
 	
 	function navigation($missing) {
@@ -476,13 +447,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 <?php
 		if ($missing == "auth") {
 			$first = true;
-			foreach ((array) $_SESSION["pwds"]["server"][""] as $username => $password) {
+			foreach ((array) $_SESSION["passwords"]["server"][""] as $username => $password) {
 				if (isset($password)) {
 					if ($first) {
 						echo "<p>\n";
 						$first = false;
 					}
-					echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . ($username != "" ? h($username) : "<i>" . lang('empty') . "</i>") . "</a><br>\n";
+					echo "<a href='" . h(auth_url("server", "", $username)) . "'>" . h($username) . "</a><br>\n";
 				}
 			}
 		} else {
@@ -494,7 +465,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 </p>
 </form>
 <?php
-			if ($missing != "db" && $missing != "ns") {
+			if ($missing != "db") {
 				$table_status = table_status();
 				if (!$table_status) {
 					echo "<p class='message'>" . lang('No tables.') . "\n";
@@ -516,6 +487,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function _foreignKeyOptions($table, $column) {
+		global $connection;
 		$foreignKeys = column_foreign_keys($table);
 		foreach ((array) $foreignKeys[$column] as $foreignKey) {
 			if (count($foreignKey["source"]) == 1) {

editor/include/editing.inc.php

@@ -16,7 +16,7 @@ function email_header($header) {
 * @param array
 * @return 
 */
-function send_mail($email, $subject, $message, $from = "", $files = array()) {
+function send_email($email, $subject, $message, $from = "", $files = array()) {
 	$eol = (strncasecmp(PHP_OS, "win", 3) ? "\n" : "\r\n"); // PHP_EOL available since PHP 4.3.10 and 5.0.2
 	$message = str_replace("\n", $eol, wordwrap(str_replace("\r", "", "$message\n")));
 	$boundary = uniqid("boundary");

editor/include/export.inc.php

@@ -0,0 +1,23 @@
+<?php
+function dump_table($table) {
+	echo "\xef\xbb\xbf"; // UTF-8 byte order mark
+}
+
+function dump_data($table, $style, $select = "") {
+	global $connection;
+	$result = $connection->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT
+	if ($result) {
+		while ($row = $result->fetch_assoc()) {
+			dump_csv($row);
+		}
+	}
+}
+
+function dump_headers($identifier) {
+	$filename = ($identifier != "" ? friendly_url($identifier) : "dump");
+	$ext = "csv";
+	header("Content-Type: text/csv; charset=utf-8");
+	header("Content-Disposition: attachment; filename=$filename.$ext");
+	session_write_close();
+	return $ext;
+}

editor/index.php

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

lang.php

@@ -27,8 +27,7 @@ foreach (array_merge(
 foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_SESSION["lang"] ? $_SESSION["lang"] : "*") . ".inc.php") as $filename) {
 	$messages = $messages_all;
 	$file = file_get_contents($filename);
-	$file = str_replace("\r", "", $file);
-	preg_match_all("~^(\\s*(?:// [^'].*\\s+)?)(?:// )?(('(?:[^\\\\']+|\\\\.)*') => .*[^,\n]),?~m", $file, $matches, PREG_SET_ORDER);
+	preg_match_all("~^(\\s*)(?:// )?(('(?:[^\\\\']+|\\\\.)*') => .*[^,\n]),?~m", $file, $matches, PREG_SET_ORDER);
 	$s = "";
 	foreach ($matches as $match) {
 		if (isset($messages[$match[3]])) {
@@ -40,15 +39,12 @@ foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_SESSION["lang"] ? $_SESS
 			$s .= "$match[1]// $match[2],\n";
 		}
 	}
-	if ($messages) {
-		$s .= "\n";
-		foreach ($messages as $idf => $val) {
-			// add new messages
-			if ($val == "," && strpos($idf, "%d")) {
-				$s .= "\t$idf => array(),\n";
-			} elseif (basename($filename) != "en.inc.php") {
-				$s .= "\t$idf => null,\n";
-			}
+	foreach($messages as $idf => $val) {
+		// add new messages
+		if ($val == "," && strpos($idf, "%d")) {
+			$s .= "\t$idf => array(),\n";
+		} elseif (basename($filename) != "en.inc.php") {
+			$s .= "\t$idf => null,\n";
 		}
 	}
 	$s = "<?php\n\$translations = array(\n$s);\n";

readme.txt

@@ -1,14 +0,0 @@
-Adminer - Database management in single PHP file
-Adminer Editor - Data manipulation for end-users
-
-http://www.adminer.org/
-Supports: MySQL, PostgreSQL, SQLite, MS SQL, Oracle
-Requirements: PHP 4.3.3+ or PHP 5+
-Apache License 2.0 or GPL 2
-
-adminer/index.php - Run development version of Adminer
-editor/index.php - Run development version of Adminer Editor
-editor/example.php - Example customization
-compile.php [driver] [lang] - Create a single file version
-lang.php [lang] - Update translations
-tests/selenium.html - Selenium test suite

tests/16-processlist.html

@@ -18,7 +18,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>SHOW FULL PROCESSLIST</td>
+	<td>SHOW PROCESSLIST</td>
 	<td></td>
 </tr>
 

tests/24-explain.html

@@ -18,7 +18,7 @@
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>link=Edit</td>
+	<td>//div[@id='content']/p[3]/a</td>
 	<td></td>
 </tr>
 <tr>

tests/3-create-index.html

@@ -23,12 +23,12 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>indexes[2][type]</td>
+	<td>indexes[1][type]</td>
 	<td>label=PRIMARY</td>
 </tr>
 <tr>
 	<td>select</td>
-	<td>indexes[2][columns][1]</td>
+	<td>indexes[1][columns][1]</td>
 	<td>label=name</td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
 	<td>select</td>
-	<td>indexes[2][type]</td>
+	<td>indexes[1][type]</td>
 	<td>label=INDEX</td>
 </tr>
 <tr>

tests/iexplore.bat

@@ -1 +1 @@
-java -jar "C:\Program Files\Selenium\selenium-server.jar" -htmlSuite "*iexplore" http://localhost/adminer/ "%CD%\selenium.html" results.html
+java -jar "C:\Program Files\Selenium\selenium-server.jar" -htmlSuite "*iexplore" http://localhost "%CD%\selenium.html" results.html

todo.txt

@@ -1,50 +1,49 @@
 Transactions in export
 Create view and routine options
-Variables editation, especially timezone (or set by PHP date.timezone)
-Highlight SQL textarea - may use external CodeMirror
+Variables editation, especially timezone
+Accept Tab in SQL textareas, Ctrl+Enter to send form
+Highlight SQL textarea, then display query inside textarea in select - may use external CodePress
 Blob download and image display in edit form (important for Editor with hidden fields in select)
 Add title to Logout, edit (in select) and select (in menu) in style "hever"
 Shift-click in checkboxes to select range
 Export by GET parameters
-Only first part of big BZ2 export is readable, files are missing in TAR
+Only first part of big BZ2 export is readable
 Auto-refresh processlist (thanks to Jan Garaj)
-Save schema layout to #hash in URL
-Double click in select - Esc to abort editation
+Show pagination above and under the table in select
 ? Filter by value in row under <thead> in select
 ? Column and table names auto-completition in SQL textarea
-? Aliasing of built-in functions can save 7 KB, function minification can save 7 KB, substitution of repetitive $a["a"] can save 4 KB, substitution of $_GET and friends can save 2 KB, aliasing of $connection->query can save 24 B, JS Closure compiler can save 2 KB, not enclosing HTML attribute values can save 1.2 KB, replacing \\n by \n can save .3 KB
+? Aliasing of built-in functions can save 7 KB, function minification can save 7 KB, substitution of repetitive $a["a"] can save 4 KB, substitution of $_GET and friends can save 2 KB, aliasing of $connection->query, $connection->result and $connection->quote can save ~ 3 KB, JS packer can save 1 KB, not enclosing HTML attribute values can save 1.2 KB, replacing \\n by \n can save .3 KB
 ? Branch binary_compile: LZW compression of translations can save 30 KB, LZW compression of all texts can save 11 KB, remove of base64_decode() + using chars 127-255 in minification can save 1 KB
 
 Editor:
-Checkbox for boolean searches
 JavaScript data validation - columns containing word email, url, ...
 Joining tables - PRIMARY KEY (table, joining)
 Rank, Tree structure
 Add whisperer to fields with foreign key to big table
-JS calendar for date fields
 
 MySQL:
 Saving of MySQL 5 BIT data type - don't use quote()
-Data longer than max_allowed_packet can be sent by mysqli_stmt_send_long_data()
 ? Geometry support
 
 SQLite:
-ASC and DESC instead of text length in index
+CSV import - ON DUPLICATE KEY UPDATE
+Export - CREATE DATABASE
 Delimiter in export and SQL command
 Backward keys in Editor
 
 PostgreSQL:
-Display number of schemas in databases overview
 Users - SELECT * FROM pg_user
 ORDER BY COUNT(*)
 Export - http://www.postgresql.org/docs/8.4/static/functions-info.html
 Column rights - http://www.postgresql.org/docs/8.4/static/functions-info.html
+Dollar terminated string in SQL command
 bool in Editor
 
 MS SQL:
 Non UTF-8 character sets
+Rename by sp_rename
 Detection of table collation
-PDO_MSSQL and PDO_SQLSRV driver with seek
+PDO driver with seek
 
 Oracle:
 clob comparable with string

version.js

@@ -0,0 +1,6 @@
+// downloaded from repository by verifyVersion() before Adminer 3.0.0
+(function () { // cookie function is not defined in older versions
+	var date = new Date();
+	date.setDate(date.getDate() + 7); // valid for 7 days
+	document.cookie = 'adminer_version=2.3.2; expires=' + date; // last released version
+})();