Release 4.0.3

adminer/db.inc.php

@@ -123,7 +123,7 @@ if ($adminer->homepage()) {
 					. "<input type='submit' name='check' value='" . lang('Check') . "'" . on_help("'CHECK TABLE'") . "> "
 					. "<input type='submit' name='repair' value='" . lang('Repair') . "'" . on_help("'REPAIR TABLE'") . "> "
 				: "")))
-				. (support("table") ? "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> " : "")
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> "
 				. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . on_help("'DROP TABLE'") . ">\n";
 				$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
 				if (count($databases) != 1 && $jush != "sqlite") {

adminer/download.inc.php

@@ -3,5 +3,8 @@ $TABLE = $_GET["download"];
 $fields = fields($TABLE);
 header("Content-Type: application/octet-stream");
 header("Content-Disposition: attachment; filename=" . friendly_url("$TABLE-" . implode("_", $_GET["where"])) . "." . friendly_url($_GET["field"]));
-echo $connection->result("SELECT" . limit(idf_escape($_GET["field"]) . " FROM " . table($TABLE), " WHERE " . where($_GET, $fields), 1));
+$select = array(idf_escape($_GET["field"]));
+$result = $driver->select($TABLE, $select, array(where($_GET, $fields)), $select);
+$row = ($result ? $result->fetch_row() : array());
+echo $row[0];
 exit; // don't output footer

adminer/drivers/elastic.inc.php

@@ -9,9 +9,15 @@ if (isset($_GET["elastic"])) {
 		class Min_DB {
 			var $extension = "JSON", $server_info, $errno, $error, $_url;
 
-			function query($path, $content = array(), $method = 'GET') {
+			/** Performs query
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function rootQuery($path, $content = array(), $method = 'GET') {
 				@ini_set('track_errors', 1); // @ - may be disabled
-				$file = @file_get_contents($this->_url . ($this->_db != "" ? "$this->_db/" : "") . $path, false, stream_context_create(array('http' => array(
+				$file = @file_get_contents($this->_url  . '/' . ltrim($path, '/'), false, stream_context_create(array('http' => array(
 					'method' => $method,
 					'content' => json_encode($content),
 					'ignore_errors' => 1, // available since PHP 5.2.10
@@ -42,6 +48,16 @@ if (isset($_GET["elastic"])) {
 				return $return;
 			}
 
+			/** Performs query relative to actual selected DB
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function query($path, $content = array(), $method = 'GET') {
+				return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method);
+			}
+
 			function connect($server, $username, $password) {
 				$this->_url = "http://$username:$password@$server/";
 				$return = $this->query('');
@@ -89,7 +105,7 @@ if (isset($_GET["elastic"])) {
 
 	class Min_Driver extends Min_SQL {
 
-		function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 			global $adminer;
 			$data = array();
 			$query = "$table/_search";
@@ -174,7 +190,7 @@ if (isset($_GET["elastic"])) {
 
 	function get_databases() {
 		global $connection;
-		$return = $connection->query('_aliases');
+		$return = $connection->rootQuery('_aliases');
 		if ($return) {
 			$return = array_keys($return);
 		}
@@ -285,7 +301,7 @@ if (isset($_GET["elastic"])) {
 	*/
 	function create_database($db) {
 		global $connection;
-		return $connection->query(urlencode($db), array(), 'PUT');
+		return $connection->rootQuery(urlencode($db), array(), 'PUT');
 	}
 
 	/** Drop databases
@@ -294,7 +310,7 @@ if (isset($_GET["elastic"])) {
 	*/
 	function drop_databases($databases) {
 		global $connection;
-		return $connection->query(urlencode(implode(',', $databases)), array(), 'DELETE');
+		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
 	}
 
 	/** Drop tables

adminer/drivers/mongo.inc.php

@@ -7,7 +7,7 @@ if (isset($_GET["mongo"])) {
 
 	if (class_exists('MongoDB')) {
 		class Min_DB {
-			var $extension = "Mongo", $error, $_link, $_db;
+			var $extension = "Mongo", $error, $last_id, $_link, $_db;
 
 			function connect($server, $username, $password) {
 				global $adminer;
@@ -114,7 +114,13 @@ if (isset($_GET["mongo"])) {
 
 
 	class Min_Driver extends Min_SQL {
-		function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
+		public $primary = "_id";
+		
+		function quote($value) {
+			return ($value === null ? $value : parent::quote($value));
+		}
+		
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 			$select = ($select == array("*")
 				? array()
 				: array_fill_keys($select, true)
@@ -137,6 +143,7 @@ if (isset($_GET["mongo"])) {
 				$return = $this->_conn->_db->selectCollection($table)->insert($set);
 				$this->_conn->errno = $return['code'];
 				$this->_conn->error = $return['err'];
+				$this->_conn->last_id = $set['_id'];
 				return !$return['err'];
 			} catch (Exception $ex) {
 				$this->_conn->error = $ex->getMessage();
@@ -238,6 +245,7 @@ if (isset($_GET["mongo"])) {
 			$return[$index["name"]] = array(
 				"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
 				"columns" => array_keys($index["key"]),
+				"lengths" => array(),
 				"descs" => $descs,
 			);
 		}
@@ -245,7 +253,7 @@ if (isset($_GET["mongo"])) {
 	}
 
 	function fields($table) {
-		return array();
+		return fields_from_edit();
 	}
 
 	function convert_field($field) {
@@ -302,6 +310,37 @@ if (isset($_GET["mongo"])) {
 		return true;
 	}
 
+	function alter_indexes($table, $alter) {
+		global $connection;
+		foreach ($alter as $val) {
+			list($type, $name, $set) = $val;
+			if ($set == "DROP") {
+				$return = $connection->_db->command(array("deleteIndexes" => $table, "index" => $name));
+			} else {
+				$columns = array();
+				foreach ($set as $column) {
+					$column = preg_replace('~ DESC$~', '', $column, 1, $count);
+					$columns[$column] = ($count ? -1 : 1);
+				}
+				$return = $connection->_db->selectCollection($table)->ensureIndex($columns, array(
+					"unique" => ($type == "UNIQUE"),
+					"name" => $name,
+					//! "sparse"
+				));
+			}
+			if ($return['errmsg']) {
+				$connection->error = $return['errmsg'];
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	function last_id() {
+		global $connection;
+		return $connection->last_id;
+	}
+
 	function table($idf) {
 		return $idf;
 	}

adminer/drivers/mssql.inc.php

@@ -480,7 +480,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 			} elseif (!queries(($val[0] != "PRIMARY"
 				? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
 				: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
-			) . " $val[2]")) {
+			) . " (" . implode(", ", $val[2]) . ")")) {
 				return false;
 			}
 		}

adminer/drivers/mysql.inc.php

@@ -672,14 +672,14 @@ if (!defined("DRIVER")) {
 
 	/** Run commands to alter indexes
 	* @param string escaped table name
-	* @param array of array("index type", "name", "(columns definition)") or array("index type", "name", "DROP")
+	* @param array of array("index type", "name", array("column definition", ...)) or array("index type", "name", "DROP")
 	* @return bool
 	*/
 	function alter_indexes($table, $alter) {
 		foreach ($alter as $key => $val) {
 			$alter[$key] = ($val[2] == "DROP"
 				? "\nDROP INDEX " . idf_escape($val[1])
-				: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . ($val[1] != "" ? idf_escape($val[1]) . " " : "") . $val[2]
+				: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . ($val[1] != "" ? idf_escape($val[1]) . " " : "") . "(" . implode(", ", $val[2]) . ")"
 			);
 		}
 		return queries("ALTER TABLE " . table($table) . implode(",", $alter));

adminer/drivers/pgsql.inc.php

@@ -439,12 +439,12 @@ ORDER BY conkey, conname") as $row) {
 				//! descending UNIQUE indexes results in syntax error
 				$create[] = ($val[2] == "DROP"
 					? "\nDROP CONSTRAINT " . idf_escape($val[1])
-					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . $val[2]
+					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . "(" . implode(", ", $val[2]) . ")"
 				);
 			} elseif ($val[2] == "DROP") {
 				$drop[] = idf_escape($val[1]);
 			} else {
-				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $val[2]";
+				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
 			}
 		}
 		if ($create) {

adminer/drivers/simpledb.inc.php

@@ -118,6 +118,7 @@ if (isset($_GET["simpledb"])) {
 
 
 	class Min_Driver extends Min_SQL {
+		public $primary = "itemName()";
 
 		function _chunkRequest($ids, $action, $params, $expand = array()) {
 			global $connection;
@@ -149,7 +150,7 @@ if (isset($_GET["simpledb"])) {
 			return $return;
 		}
 
-		function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 			global $connection;
 			$connection->next = $_GET["next"];
 			$return = parent::select($table, $select, $where, $group, $order, $limit, $page, $print);
@@ -323,19 +324,7 @@ if (isset($_GET["simpledb"])) {
 	}
 
 	function fields($table) {
-		$return = array();
-		foreach ((array) $_POST["field_keys"] as $key => $val) {
-			if ($val != "") {
-				$val = bracket_escape($val);
-				$_POST["function"][$val] = $_POST["field_funs"][$key];
-				$_POST["fields"][$val] = $_POST["field_vals"][$key];
-			}
-		}
-		foreach ((array) $_POST["fields"] as $key => $val) {
-			$name = bracket_escape($key, 1); // 1 - back
-			$return[$name] = array("field" => $name, "privileges" => array("insert" => 1, "update" => 1), "null" => 1);
-		}
-		return $return;
+		return fields_from_edit();
 	}
 
 	function foreign_keys($table) {

adminer/drivers/sqlite.inc.php

@@ -497,7 +497,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function recreate_table($table, $name, $fields, $originals, $foreign, $indexes = array()) {
-		queries("BEGIN");
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
@@ -506,11 +505,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				}
 			}
 			$primary_key = false;
-			foreach ($fields as $key => $field) {
+			foreach ($fields as $field) {
 				if ($field[6]) {
 					$primary_key = true;
 				}
-				$fields[$key] = "  " . implode($field);
 			}
 			$drop_indexes = array();
 			foreach ($indexes as $key => $val) {
@@ -527,7 +525,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					}
 					$columns[] = $originals[$column] . ($index["descs"][$key] ? " DESC" : "");
 				}
-				$columns = "(" . implode(", ", $columns) . ")";
 				if (!$drop_indexes[$key_name]) {
 					if ($index["type"] != "PRIMARY" || !$primary_key) {
 						$indexes[] = array($index["type"], $key_name, $columns);
@@ -537,7 +534,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			foreach ($indexes as $key => $val) {
 				if ($val[0] == "PRIMARY") {
 					unset($indexes[$key]);
-					$foreign[] = "  PRIMARY KEY $val[2]";
+					$foreign[] = "  PRIMARY KEY (" . implode(", ", $val[2]) . ")";
 				}
 			}
 			foreach (foreign_keys($table) as $key_name => $foreign_key) {
@@ -551,6 +548,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					$foreign[] = " " . format_foreign_key($foreign_key);
 				}
 			}
+			queries("BEGIN");
+		}
+		foreach ($fields as $key => $field) {
+			$fields[$key] = "  " . implode($field);
 		}
 		$fields = array_merge($fields, array_filter($foreign));
 		if (!queries("CREATE TABLE " . table($table != "" ? "adminer_$name" : $name) . " (\n" . implode(",\n", $fields) . "\n)")) {
@@ -600,7 +601,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		foreach (array_reverse($alter) as $val) {
 			if (!queries($val[2] == "DROP"
 				? "DROP INDEX " . idf_escape($val[1])
-				: index_sql($table, $val[0], $val[1], $val[2])
+				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")")
 			)) {
 				return false;
 			}

adminer/edit.inc.php

@@ -89,8 +89,11 @@ if ($_POST["save"]) {
 		$select = array("*");
 	}
 	if ($select) {
-		$result = $driver->select($TABLE, $select, array($where), $select, array(), (isset($_GET["select"]) ? 2 : 1), 0);
+		$result = $driver->select($TABLE, $select, array($where), $select, array(), (isset($_GET["select"]) ? 2 : 1));
 		$row = $result->fetch_assoc();
+		if (!$row) { // MySQLi returns null
+			$row = false;
+		}
 		if (isset($_GET["select"]) && (!$row || $result->fetch_assoc())) { // $result->num_rows != 1 isn't available in all drivers
 			$row = null;
 		}
@@ -98,17 +101,19 @@ if ($_POST["save"]) {
 }
 
 if (!support("table") && !$fields) {
-	$id = ($jush == "mongo" ? "_id" : "itemName()"); // simpledb
 	if (!$where) { // insert
-		$row = $driver->select($TABLE, array("*"), $where, array("*"), array(), 1, 0);
-		$row = ($row ? $row->fetch_assoc() : array($id => ""));
+		$result = $driver->select($TABLE, array("*"), $where, array("*"));
+		$row = ($result ? $result->fetch_assoc() : false);
+		if (!$row) {
+			$row = array($driver->primary => "");
+		}
 	}
 	if ($row) {
 		foreach ($row as $key => $val) {
 			if (!$where) {
 				$row[$key] = null;
 			}
-			$fields[$key] = array("field" => $key, "null" => ($key != $id), "auto_increment" => ($key == $id));
+			$fields[$key] = array("field" => $key, "null" => ($key != $driver->primary), "auto_increment" => ($key == $driver->primary));
 		}
 	}
 }
@@ -160,9 +165,9 @@ if (!$fields) {
 
 	if (!support("table")) {
 		echo "<tr>"
-			. "<th><input name='field_keys[]' value='" . h($_POST["field_keys"][0]) . "'>"
-			. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array()), $_POST["field_funs"][0])
-			. "<td><input name='field_vals[]' value='" . h($_POST["field_vals"][0]) . "'>"
+			. "<th><input name='field_keys[]' onkeyup='keyupChange.call(this);' onchange='fieldChange(this);' value=''>" // needs empty value for keyupChange()
+			. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array("null" => isset($_GET["select"]))))
+			. "<td><input name='field_vals[]'>"
 			. "\n"
 		;
 	}

adminer/file.inc.php

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

adminer/include/adminer.inc.php

@@ -68,12 +68,8 @@ class Adminer {
 	* @return bool true to link adminer.css if exists
 	*/
 	function head() {
-		global $jush;
 		?>
 <link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
-<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
 <?php
 		return true;
 	}
@@ -765,7 +761,7 @@ username.form['auth[driver]'].onchange();
 	* @return null
 	*/
 	function navigation($missing) {
-		global $VERSION, $jush, $drivers;
+		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
 <?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
@@ -791,6 +787,33 @@ username.form['auth[driver]'].onchange();
 				}
 			}
 		} else {
+			if ($_GET["ns"] !== "" && !$missing && DB != "") {
+				$connection->select_db(DB);
+				$tables = table_status('', true);
+			}
+			if (support("sql")) {
+				?>
+<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
+<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
+<script type="text/javascript">
+<?php
+				if ($tables) {
+					$links = array();
+					foreach ($tables as $table => $type) {
+						$links[] = preg_quote($table, '/');
+					}
+					echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+					foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
+						echo "jushLinks.$val = jushLinks.$jush;\n";
+					}
+				}
+				?>
+bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');
+</script>
+<?php
+			}
 			$this->databasesPrint($missing);
 			if (DB == "" || !$missing) {
 				echo "<p class='links'>" . (support("sql") ? "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>\n<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>\n" : "") . "";
@@ -800,22 +823,10 @@ username.form['auth[driver]'].onchange();
 			}
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				echo '<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
-				$tables = table_status('', true);
 				if (!$tables) {
 					echo "<p class='message'>" . lang('No tables.') . "\n";
 				} else {
 					$this->tablesPrint($tables);
-					$links = array();
-					foreach ($tables as $table => $type) {
-						$links[] = preg_quote($table, '/');
-					}
-					echo "<script type='text/javascript'>\n";
-					echo "var jushLang = '$jush';\n";
-					echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\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";
 				}
 			}
 		}

adminer/include/auth.inc.php

@@ -109,7 +109,7 @@ function auth_error($exception = null) {
 }
 
 function set_password($vendor, $server, $username, $password) {
-	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"]
+	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
 		? array(encrypt_string($password, $_COOKIE["adminer_key"]))
 		: $password
 	);

adminer/include/design.inc.php

@@ -7,7 +7,7 @@
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-	global $LANG, $VERSION, $adminer, $connection, $drivers, $jush;
+	global $LANG, $VERSION, $adminer, $drivers, $jush;
 	page_headers();
 	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
@@ -29,7 +29,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <?php } ?>
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion('$VERSION');"); ?>">
+<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
 <script type="text/javascript">
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 </script>

adminer/include/driver.inc.php

@@ -10,6 +10,14 @@
 		$this->_conn = $connection;
 	}
 	
+	/** Quote a SQL string or null value
+	* @param string
+	* @return string
+	*/
+	function quote($value) {
+		return ($value === null ? "NULL" : $this->_conn->quote($value));
+	}
+	
 	/** Select data from table
 	* @param string
 	* @param array result of $adminer->selectColumnsProcess()[0]
@@ -21,7 +29,7 @@
 	* @param bool whether to print the query
 	* @return Min_Result
 	*/
-	function select($table, $select, $where, $group, $order, $limit, $page, $print = false) {
+	function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 		global $adminer, $jush;
 		$is_group = (count($group) < count($select));
 		$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);

adminer/include/functions.inc.php

@@ -159,7 +159,7 @@ function html_select($name, $options, $value = "", $onchange = true) {
 function select_input($attrs, $options, $value = "", $placeholder = "") {
 	return ($options
 		? "<select$attrs><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
-		: "<input$attrs value='" . h($value) . "' placeholder='$placeholder'>"
+		: "<input$attrs size='10' value='" . h($value) . "' placeholder='$placeholder'>"
 	);
 }
 
@@ -249,13 +249,13 @@ function sid() {
 	return $return;
 }
 
-/** Shortcut for $connection->quote($string)
+/** Shortcut for $driver->quote($string)
 * @param string
 * @return string
 */
 function q($string) {
-	global $connection;
-	return $connection->quote($string);
+	global $driver;
+	return $driver->quote($string);
 }
 
 /** Get list of values from database
@@ -880,7 +880,7 @@ function process_input($field) {
 		return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
 	}
 	if ($function == "NULL") {
-		return "NULL";
+		$value = null;
 	}
 	if ($field["type"] == "set") {
 		return array_sum((array) $value);
@@ -903,6 +903,31 @@ function process_input($field) {
 	return $adminer->processInput($field, $value, $function);
 }
 
+/** Compute fields() from $_POST edit data
+* @return array
+*/
+function fields_from_edit() {
+	global $driver;
+	$return = array();
+	foreach ((array) $_POST["field_keys"] as $key => $val) {
+		if ($val != "") {
+			$val = bracket_escape($val);
+			$_POST["function"][$val] = $_POST["field_funs"][$key];
+			$_POST["fields"][$val] = $_POST["field_vals"][$key];
+		}
+	}
+	foreach ((array) $_POST["fields"] as $key => $val) {
+		$name = bracket_escape($key, 1); // 1 - back
+		$return[$name] = array(
+			"field" => $name,
+			"privileges" => array("insert" => 1, "update" => 1),
+			"null" => 1,
+			"auto_increment" => ($key == $driver->primary),
+		);
+	}
+	return $return;
+}
+
 /** Print results of search in all tables
 * @uses $_GET["where"][0]
 * @uses $_POST["tables"]

adminer/include/lang.inc.php

@@ -33,6 +33,7 @@ $langs = array(
 	'uk' => 'Українська', // Valerii Kryzhov
 	'zh' => '简体中文', // Mr. Lodar, vea - urn2.net - vea.urn2@gmail.com
 	'zh-tw' => '繁體中文', // http://tzangms.com
+	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
 );
 
 /** Get current language

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.0.1";
+$VERSION = "4.0.3";

adminer/indexes.inc.php

@@ -51,7 +51,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 						continue;
 					}
 				}
-				$alter[] = array($index["type"], $name, "(" . implode(", ", $set) . ")");
+				$alter[] = array($index["type"], $name, $set);
 			}
 		}
 	}
@@ -102,7 +102,7 @@ if (!$row) {
 if ($primary) {
 	echo "<tr><td>PRIMARY<td>";
 	foreach ($primary["columns"] as $key => $column) {
-		echo "<select disabled>" . optionlist($fields, $column) . "</select>";
+		echo select_input(" disabled", $fields, $column);
 		echo "<label><input disabled type='checkbox'>" . lang('descending') . "</label> ";
 	}
 	echo "<td><td>\n";
@@ -116,7 +116,11 @@ foreach ($row["indexes"] as $index) {
 		ksort($index["columns"]);
 		$i = 1;
 		foreach ($index["columns"] as $key => $column) {
-			echo "<span>" . html_select("indexes[$j][columns][$i]", array(-1 => "") + $fields, $column, ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . "(this, '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "');");
+			echo "<span>" . select_input(
+				" name='indexes[$j][columns][$i]' onchange=\"" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . "(this, '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "');\"",
+				($fields ? array_combine($fields, $fields) : $fields),
+				$column
+			);
 			echo ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "'>" : "");
 			echo ($jush != "sql" ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
 			echo " </span>";

adminer/lang/no.inc.php

@@ -0,0 +1,284 @@
+<?php
+$translations = array(
+	'System' => 'System',
+	'Server' => 'Server',
+	'Username' => 'Brukernavn',
+	'Password' => 'Passord',
+	'Permanent login' => 'Permanent login',
+	'Login' => 'Logg inn',
+	'Logout' => 'Logg ut',
+	'Logged as: %s' => 'Logget inn som: %s',
+	'Logout successful.' => 'Utlogging vellykket.',
+	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
+	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="http://www.adminer.org/en/extension/" target="_blank">Implementer</a> en metode for %s for å gjøre det permanent.',
+	'Language' => 'Språk',
+	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
+	'No extension' => 'Ingen utvidelse',
+	'None of the supported PHP extensions (%s) are available.' => 'Ingen av de støttede PHP-utvidelsene (%s) er tilgjengelige.',
+	'Session support must be enabled.' => 'Økt-støtte må være skrudd på.',
+	'Session expired, please login again.' => 'Økt utløpt - vennligst logg inn på nytt.',
+	'%s version: %s through PHP extension %s' => '%s versjon: %s via PHP-utvidelse %s',
+	'Refresh' => 'Gjenoppfrisk',
+	'ltr' => 'venstre-til-høyre',
+	'Privileges' => 'Privilegier',
+	'Create user' => 'Lag bruker',
+	'User has been dropped.' => 'Bruker slettet.',
+	'User has been altered.' => 'Bruker endret.',
+	'User has been created.' => 'Bruker opprettet.',
+	'Hashed' => 'Hashet',
+	'Column' => 'Kolonne',
+	'Routine' => 'Rutine',
+	'Grant' => 'Gi privilegier',
+	'Revoke' => 'Trekk tilbake',
+	'Process list' => 'Prosessliste',
+	'%d process(es) have been killed.' => array('%d prosess avsluttet.', '%d prosesser avsluttet.'),
+	'Kill' => 'Avslutt',
+	'Variables' => 'Variabler',
+	'Status' => 'Status',
+	'SQL command' => 'SQL-kommando',
+	'%d query(s) executed OK.' => array('%d kall utført OK.', '%d kall utført OK.'),
+	'Query executed OK, %d row(s) affected.' => array('Kall utført OK, %d rad påvirket.', 'Kall utført OK, %d rader påvirket.'),
+	'No commands to execute.' => 'Ingen kommandoer å utføre.',
+	'Error in query' => 'Feil i forespørsel',
+	'Execute' => 'Kjør',
+	'Stop on error' => 'Stopp ved feil',
+	'Show only errors' => 'Vis bare feil',
+	'%.3f s' => '%.3f s',
+	'History' => 'Historie',
+	'Clear' => 'Tøm skjema',
+	'Edit all' => 'Rediger alle',
+	'File upload' => 'Filopplasting',
+	'From server' => 'Fra server',
+	'Webserver file %s' => 'Webserver-fil %s',
+	'Run file' => 'Kjør fil',
+	'File does not exist.' => 'Filen eksisterer ikke.',
+	'File uploads are disabled.' => 'Filopplastinger ikke tillatt.',
+	'Unable to upload a file.' => 'Kunne ikke laste opp fil.',
+	'Maximum allowed file size is %sB.' => 'Maksimum tillatte filstørrelse er %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'For stor datamengde i skjemaet. Reduser datamengden, eller øk størrelsen på %s-konfigurasjonsdirektivet.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Du kan laste opp en stor SQL-fil via FTP og importere den fra serveren.',
+	'Export' => 'Eksport',
+	'Dump' => 'Dump',
+	'Output' => 'Resultat',
+	'open' => 'åpne',
+	'save' => 'lagre',
+	'Format' => 'Format',
+	'Data' => 'Data',
+	'Database' => 'Database',
+	'database' => 'database',
+	'Use' => 'Bruk',
+	'Select database' => 'Velg database',
+	'Invalid database.' => 'Ugyldig database.',
+	'Create new database' => 'Lag ny database',
+	'Database has been dropped.' => 'Databasen har blitt slettet.',
+	'Databases have been dropped.' => 'Databasene har blitt slettet.',
+	'Database has been created.' => 'Databasen er opprettet.',
+	'Database has been renamed.' => 'Databasen har fått nytt navn.',
+	'Database has been altered.' => 'Databasen er endret.',
+	'Alter database' => 'Endre database',
+	'Create database' => 'Opprett database',
+	'Database schema' => 'Databaseskjema',
+	'Permanent link' => 'Permanent lenke',
+	',' => ' ',
+	'Engine' => 'Motor',
+	'Collation' => 'Tekstsortering',
+	'Data Length' => 'Datalengde',
+	'Index Length' => 'Indekslengde',
+	'Data Free' => 'Frie data',
+	'Rows' => 'Rader',
+	'%d in total' => '%d totalt',
+	'Analyze' => 'Analyser',
+	'Optimize' => 'Optimaliser',
+	'Vacuum' => 'Støvsug',
+	'Check' => 'Sjekk',
+	'Repair' => 'Reparer',
+	'Truncate' => 'Avkort',
+	'Tables have been truncated.' => 'Tabellene har blitt avkortet.',
+	'Move to other database' => 'Flytt til annen database',
+	'Move' => 'Flytt',
+	'Tables have been moved.' => 'Tabellene har blitt flyttet.',
+	'Copy' => 'Kopier',
+	'Tables have been copied.' => 'Tabellene har blitt kopiert.',
+	'Routines' => 'Rutiner',
+	'Routine has been called, %d row(s) affected.' => array('Rutinen er utført, %d rad påvirket.', 'Rutinen er utført, %d rader påvirket.'),
+	'Call' => 'Kall',
+	'Parameter name' => 'Parameternavn',
+	'Create procedure' => 'Opprett prosedyre',
+	'Create function' => 'Opprett funksjon',
+	'Routine has been dropped.' => 'Rutinen er slettet.',
+	'Routine has been altered.' => 'Rutinen er endret.',
+	'Routine has been created.' => 'Rutinen er opprettet.',
+	'Alter function' => 'Endre funksjon',
+	'Alter procedure' => 'Endre prosedyre',
+	'Return type' => 'Returtype',
+	'Events' => 'Eventer',
+	'Event has been dropped.' => 'Eventen er slettet.',
+	'Event has been altered.' => 'Eventen er endret.',
+	'Event has been created.' => 'Eventen er opprettet.',
+	'Alter event' => 'Endre event',
+	'Create event' => 'Opprett event',
+	'At given time' => 'På gitte tid',
+	'Every' => 'Hver',
+	'Schedule' => 'Tidsplan',
+	'Start' => 'Start',
+	'End' => 'Slutt',
+	'On completion preserve' => 'Ved fullførelse bevar',
+	'Tables' => 'Tabeller',
+	'Tables and views' => 'Tabeller og views',
+	'Table' => 'Tabell',
+	'No tables.' => 'Ingen tabeller.',
+	'Alter table' => 'Endre tabell',
+	'Create table' => 'Opprett tabell',
+	'Table has been dropped.' => 'Tabellen er slettet.',
+	'Tables have been dropped.' => 'Tabellene er slettet.',
+	'Tables have been optimized.' => 'Tabellene er blitt optimalisert.',
+	'Table has been altered.' => 'Tabellen er endret.',
+	'Table has been created.' => 'Tabellen er opprettet.',
+	'Table name' => 'Tabellnavn',
+	'Show structure' => 'Vis struktur',
+	'engine' => 'mottor',
+	'collation' => 'sortering',
+	'Column name' => 'Kolonnenavn',
+	'Type' => 'Type',
+	'Length' => 'Lengde',
+	'Auto Increment' => 'Autoinkrement',
+	'Options' => 'Valg',
+	'Comment' => 'Kommentarer',
+	'Default values' => 'Standardverdier',
+	'Drop' => 'Dropp',
+	'Are you sure?' => 'Er du sikker?',
+	'Move up' => 'Flytt opp',
+	'Move down' => 'Flytt ned',
+	'Remove' => 'Fjern',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antall feltnavn overskredet - venligst øk %s.',
+	'Partition by' => 'Partisjoner ved',
+	'Partitions' => 'Partisjoner',
+	'Partition name' => 'Partisjonsnavn',
+	'Values' => 'Verdier',
+	'View' => 'View',
+	'View has been dropped.' => 'Viewet er slettet.',
+	'View has been altered.' => 'Viewet er endret.',
+	'View has been created.' => 'Viewet er opprettet.',
+	'Alter view' => 'Endre view',
+	'Create view' => 'Lag nytt view',
+	'Indexes' => 'Indekser',
+	'Indexes have been altered.' => 'Indeksene er endret.',
+	'Alter indexes' => 'Endre indekser',
+	'Add next' => 'Legg til neste',
+	'Index Type' => 'Indekstype',
+	'Column (length)' => 'Kolonne (lengde)',
+	'Foreign keys' => 'Fremmednøkler',
+	'Foreign key' => 'Fremmednøkkel',
+	'Foreign key has been dropped.' => 'Fremmednøkkelen er slettet.',
+	'Foreign key has been altered.' => 'Fremmednøkkelen er endret.',
+	'Foreign key has been created.' => 'Fremmednøkkelen er opprettet.',
+	'Target table' => 'Måltabell',
+	'Change' => 'Endre',
+	'Source' => 'Kilde',
+	'Target' => 'Mål',
+	'Add column' => 'Legg til kolonne',
+	'Alter' => 'Endre',
+	'Add foreign key' => 'Legg til fremmednøkkel',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Kilde- og mål-kolonner må ha samme datatype, det må være en indeks på mål-kolonnen, og dataene som refereres til må eksistere.',
+	'Triggers' => 'Triggere',
+	'Add trigger' => 'Legg til trigger',
+	'Trigger has been dropped.' => 'Triggeren er slettet.',
+	'Trigger has been altered.' => 'Triggeren er endret.',
+	'Trigger has been created.' => 'Triggeren er opprettet.',
+	'Alter trigger' => 'Endre trigger',
+	'Create trigger' => 'Opprett trigger',
+	'Time' => 'Tid',
+	'Event' => 'Hendelse',
+	'Name' => 'Navn',
+	'select' => 'Vis',
+	'Select' => 'Velg',
+	'Select data' => 'Velg data',
+	'Functions' => 'Funksjoner',
+	'Aggregation' => 'Sammenfatning',
+	'Search' => 'Søk',
+	'anywhere' => 'hvorsomhelst',
+	'Search data in tables' => 'Søk data i tabeller',
+	'Sort' => 'Sorter',
+	'descending' => 'minkende',
+	'Limit' => 'Skranke',
+	'Text length' => 'Tekstlengde',
+	'Action' => 'Handling',
+	'Full table scan' => 'Full tabell-scan',
+	'Unable to select the table' => 'Kan ikke velge tabellen',
+	'No rows.' => 'Ingen rader.',
+	'%d row(s)' => array('%d rad', '%d rader'),
+	'Page' => 'Side',
+	'last' => 'siste',
+	'Load more data' => 'Last mer data',
+	'Loading' => 'Laster',
+	'whole result' => 'hele resultatet',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+	'Import' => 'Importer',
+	'%d row(s) have been imported.' => array('%d rad er importert.', '%d rader er importert.'),
+	'File must be in UTF-8 encoding.' => 'Filen må være i UTF8-tegnkoding.',
+	'Modify' => 'Endre',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klikk på en verdi for å endre den.',
+	'Use edit link to modify this value.' => 'Bruk rediger-lengde for å endre dennne verdien.',
+	'Item%s has been inserted.' => 'Rad%s er satt inn.',
+	'Item has been deleted.' => 'Raden er slettet.',
+	'Item has been updated.' => 'Raden er oppdatert.',
+	'%d item(s) have been affected.' => array('%d rad påvirket.', '%d rader påvirket.'),
+	'New item' => 'Ny rad',
+	'original' => 'original',
+	'empty' => 'tom',
+	'edit' => 'rediger',
+	'Edit' => 'Rediger',
+	'Insert' => 'Sett inn',
+	'Save' => 'Lagre',
+	'Save and continue edit' => 'Lagre og fortsett å redigere',
+	'Save and insert next' => 'Lagre og sett inn neste',
+	'Selected' => 'Valgt',
+	'Clone' => 'Klon',
+	'Delete' => 'Slett',
+	'You have no privileges to update this table.' => 'Du mangler rettighetene som trengs for å endre denne tabellen.',
+	'E-mail' => 'E-post',
+	'From' => 'Fra',
+	'Subject' => 'Tittel',
+	'Attachments' => 'Vedlegg',
+	'Send' => 'Send',
+	'%d e-mail(s) have been sent.' => array('%d epost sendt.', '%d eposter sendt.'),
+	'Numbers' => 'Nummer',
+	'Date and time' => 'Dato og tid',
+	'Strings' => 'Strenger',
+	'Binary' => 'Binære',
+	'Lists' => 'Lister',
+	'Network' => 'Nettverk',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relasjoner',
+	'Editor' => 'Redigering',
+	'$1-$3-$5' => '$6/$4 $1',
+	'[yyyy]-mm-dd' => 'd/m [åååå]',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nå',
+	'yes' => 'ja',
+	'no' => 'nei',
+	'File exists.' => 'Filen finnes.',
+	'Please use one of the extensions %s.' => 'Vennligst bruk en av filendelsene %s.',
+	'Alter schema' => 'Endre skjema',
+	'Create schema' => 'Opprett skjema',
+	'Schema has been dropped.' => 'Skjemaet er slettet.',
+	'Schema has been created.' => 'Skjemaet er opprettet.',
+	'Schema has been altered.' => 'Skjemaet er endret.',
+	'schema' => 'skjema',
+	'Schema' => 'Skjema',
+	'Invalid schema.' => 'Ugylding skjema.',
+	'Sequences' => 'Sekvenser',
+	'Create sequence' => 'Opprett sekvens',
+	'Sequence has been dropped.' => 'Sekvensen er slettet.',
+	'Sequence has been created.' => 'Sekvensen er opprettet.',
+	'Sequence has been altered.' => 'Sekvensen er endret.',
+	'Alter sequence' => 'Endre sekvens',
+	'User types' => 'Brukertyper',
+	'Create type' => 'Opprett type',
+	'Type has been dropped.' => 'Type er slettet.',
+	'Type has been created.' => 'Type er opprettet.',
+	'Alter type' => 'Endre type',
+	'Saving' => 'Lagrer',
+);

adminer/lang/zh-tw.inc.php

@@ -12,7 +12,7 @@ $translations = array(
 	'Table has been altered.' => '資料表已修改。',
 	'Table has been created.' => '資料表已修改。',
 	'Alter table' => '修改資料表',
-	'Create table' => '建立資料表表',
+	'Create table' => '建立資料表',
 	'Table name' => '資料表名稱',
 	'engine' => '引擎',
 	'collation' => '校對',
@@ -30,7 +30,7 @@ $translations = array(
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'SQL command' => 'SQL命令',
-	'Dump' => '匯入/匯出',
+	'Dump' => '匯出',
 	'Logout' => '登出',
 	'database' => '資料庫',
 	'Use' => '使用',

adminer/select.inc.php

@@ -41,7 +41,7 @@ if ($_GET["val"] && is_ajax()) {
 		$as = convert_field($fields[key($row)]);
 		$select = array($as ? $as : idf_escape(key($row)));
 		$where[] = where_check($unique_idf, $fields);
-		$return = $driver->select($TABLE, $select, $where, $select, array(), 1, 0);
+		$return = $driver->select($TABLE, $select, $where, $select);
 		if ($return) {
 			echo reset($return->fetch_row());
 		}

adminer/sql.inc.php

@@ -45,7 +45,7 @@ if (!$error && $_POST) {
 			}
 		}
 
-		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\n)";
+		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\r?\n)";
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
@@ -217,7 +217,7 @@ if (!isset($_GET["import"])) {
 }
 
 echo checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"])), lang('Stop on error')) . "\n";
-echo checkbox("only_errors", 1, $_POST["only_errors"], lang('Show only errors')) . "\n";
+echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"])), lang('Show only errors')) . "\n";
 echo "<input type='hidden' name='token' value='$token'>\n";
 
 if (!isset($_GET["import"]) && $history) {

adminer/static/editing.js

@@ -6,16 +6,18 @@
 function bodyLoad(version) {
 	if (window.jush) {
 		jush.create_links = ' target="_blank" rel="noreferrer"';
-		for (var key in jush.urls) {
-			var obj = jush.urls;
-			if (typeof obj[key] != 'string') {
-				obj = obj[key];
-				key = 0;
+		if (version) {
+			for (var key in jush.urls) {
+				var obj = jush.urls;
+				if (typeof obj[key] != 'string') {
+					obj = obj[key];
+					key = 0;
+				}
+				obj[key] = obj[key]
+					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
+					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
+				;
 			}
-			obj[key] = obj[key]
-				.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
-				.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
-			;
 		}
 		if (window.jushLinks) {
 			jush.custom_links = jushLinks;
@@ -433,12 +435,16 @@ function indexesAddRow(field) {
 * @param string name prefix
 */
 function indexesChangeColumn(field, prefix) {
-	var columns = parentTag(field, 'td').getElementsByTagName('select');
 	var names = [];
-	for (var i=0; i < columns.length; i++) {
-		var value = selectValue(columns[i]);
-		if (value) {
-			names.push(value);
+	for (var tag in { 'select': 1, 'input': 1 }) {
+		var columns = parentTag(field, 'td').getElementsByTagName(tag);
+		for (var i=0; i < columns.length; i++) {
+			if (/\[columns\]/.test(columns[i].name)) {
+				var value = selectValue(columns[i]);
+				if (value) {
+					names.push(value);
+				}
+			}
 		}
 	}
 	field.form[field.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
@@ -460,12 +466,20 @@ function indexesAddColumn(field, prefix) {
 		select.onchange();
 	}
 	var column = cloneNode(field.parentNode);
-	select = column.getElementsByTagName('select')[0];
-	select.name = select.name.replace(/\]\[\d+/, '$&1');
-	select.selectedIndex = 0;
-	var input = column.getElementsByTagName('input')[0];
-	input.name = input.name.replace(/\]\[\d+/, '$&1');
-	input.value = '';
+	var selects = column.getElementsByTagName('select');
+	for (var i = 0; i < selects.length; i++) {
+		select = selects[i];
+		select.name = select.name.replace(/\]\[\d+/, '$&1');
+		select.selectedIndex = 0;
+	}
+	var inputs = column.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		var input = inputs[i];
+		input.name = input.name.replace(/\]\[\d+/, '$&1');
+		if (input.type != 'checkbox') {
+			input.value = '';
+		}
+	}
 	parentTag(field, 'td').appendChild(column);
 	field.onchange();
 }

adminer/static/functions.js

@@ -95,7 +95,7 @@ function parentTag(el, tag) {
 function trCheck(el) {
 	var tr = parentTag(el, 'tr');
 	alterClass(tr, 'checked', el.checked);
-	if (el.form && el.form['all']) {
+	if (el.form && el.form['all'] && el.form['all'].onclick) { // Opera thinks that 'all' is who knows what
 		el.form['all'].onclick();
 	}
 }
@@ -478,6 +478,20 @@ function keyupChange() {
 	}
 }
 
+/** Add new field in schema-less edit
+* @param HTMLInputElement
+*/
+function fieldChange(field) {
+	var row = cloneNode(parentTag(field, 'tr'));
+	var inputs = row.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		inputs[i].value = '';
+	}
+	// keep value in <select> (function)
+	parentTag(field, 'table').appendChild(row);
+	field.onchange = function () { };
+}
+
 
 
 /** Create AJAX request

changes.txt

@@ -1,3 +1,14 @@
+Adminer 4.0.3 (released 2014-02-01)
+MongoDB: insert, truncate, indexes
+SimpleDB, MongoDB: insert more fields at once
+SQLite: Fix creating table and altering primary key, bug since Adminer 4.0.0
+Don't store invalid credentials to session, bug since Adminer 4.0.0
+Norweigan translation
+
+Adminer 4.0.2 (released 2014-01-11):
+Fix handling of long text in SQL textarea
+Support paste to SQL textarea in Opera
+
 Adminer 4.0.1 (released 2014-01-11):
 Don't use type=number if a SQL function is used
 Disable highlighting in textareas with long texts

compile.php

@@ -287,11 +287,14 @@ function minify_js($file) {
 function compile_file($match) {
 	global $project;
 	$file = "";
-	foreach (explode(";", $match[1]) as $filename) {
-		$file .= file_get_contents(dirname(__FILE__) . "/$project/$filename");
+	list(, $filenames, $callback) = $match;
+	if ($filenames != "") {
+		foreach (explode(";", $filenames) as $filename) {
+			$file .= file_get_contents(dirname(__FILE__) . "/$project/$filename");
+		}
 	}
-	if ($match[2]) {
-		$file = call_user_func($match[2], $file);
+	if ($callback) {
+		$file = call_user_func($callback, $file);
 	}
 	return '"' . add_quo_slashes($file) . '"';
 }
@@ -374,11 +377,11 @@ if ($driver) {
 	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('(;../externals/jush/modules/jush-(?!textarea\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 }
 if ($project == "editor") {
 	$file = preg_replace('~;../externals/jush/jush.css~', '', $file);
-	$file = preg_replace('~;../externals/jush/modules/jush[^.]*.js~', '', $file);
+	$file = preg_replace('~;?../externals/jush/modules/jush[^.]*.js~', '', $file);
 }
 $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 $file = preg_replace_callback('~\\b(include|require) "([^"]*\\$LANG.inc.php)";~', 'put_file_lang', $file);
@@ -390,14 +393,15 @@ if ($_SESSION["lang"]) {
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('<script type="text/javascript" src="static/editing.js"></script>' . "\n", "", $file);
-$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>' . "\n", "", $file);
 $file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>' . "\n", "", $file);
+$file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>' . "\n", "", $file);
 $file = str_replace('<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>' . "\n", "", $file);
 $file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 $replace = 'h(preg_replace("~\\\\\\\\?.*~", "", ME)) . "?file=\\1&amp;version=' . $VERSION . ($driver ? '&amp;driver=' . $driver : '');
 $file = preg_replace('~\\.\\./adminer/static/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
 $file = preg_replace('~\\.\\./adminer/static/([^\'"]*)~', '" . ' . $replace, $file);
+$file = preg_replace('~\\.\\./externals/jush/modules/(jush\\.js)~', '<?php echo ' . $replace . '"; ?>', $file);
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 

editor/static/editing.js

@@ -1,8 +1,5 @@
 // Editor specific functions
 
-function bodyLoad(version) {
-}
-
 function selectFieldChange(form) {
 }