From e1545065f04d2ae6962fde824066e2a84a81887a Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 26 Mar 2013 10:11:35 -0700
Subject: [PATCH] Display select SQL edit form inline

---
 adminer/include/adminer.inc.php |  8 ++++++--
 adminer/static/editing.js       | 20 ++++++++++++++++++++
 changes.txt                     |  1 +
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 57952107..f29990ba 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -164,8 +164,12 @@ username.form['auth[driver]'].onchange();
 	* @return string
 	*/
 	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></p>\n"; // </p> - required for IE9 inline edit
+		global $jush, $token;
+		return "<form action='" . h(ME) . "sql=' method='post'><p>"
+			. "<a href='" . h(remove_from_uri("page")) . "&amp;page=last' title='" . lang('Last page') . "'>&gt;&gt;</a> <span>"
+			. "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>"
+			. " <a href='" . h(ME) . "sql=" . urlencode($query) . "' onclick=\"return !selectEditSql(this.parentNode, '" . lang('Execute') . "');\">" . lang('Edit') . "</a>"
+			. "</span><input type='hidden' name='token' value='$token'></p></form>\n"; // </p> - required for IE9 inline edit
 	}
 	
 	/** Description of a row in a table
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index e5d1271a..e2abeb47 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -168,6 +168,26 @@ function selectFieldChange(form) {
 	setHtml('noindex', (ok ? '' : '!'));
 }
 
+/** Create edit query form
+* @param HTMLSpanElement
+* @param string
+* @return boolean
+*/
+function selectEditSql(el, label) {
+	var sql = el.firstChild;
+	var input = document.createElement('input');
+	input.name = 'query';
+	input.value = sql.textContent || sql.innerText;
+	input.style.width = sql.offsetWidth + 'px';
+	el.innerHTML = '';
+	el.appendChild(input);
+	var submit = document.createElement('input');
+	submit.type = 'submit';
+	submit.value = label;
+	el.appendChild(submit);
+	return true;
+}
+
 
 
 var added = '.', rowCount;
diff --git a/changes.txt b/changes.txt
index 551c0845..570da9eb 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 3.6.4-dev:
+Display select SQL edit form inline
 Compatibility with MySQL 5.6
 Recover original view, trigger, routine if creating fails
 Disable autocapitalize in identifiers