From 6fffbbdd304853ae23e067721b373e35288886b7 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Mon, 26 Apr 2010 16:22:24 +0000
Subject: [PATCH] Disable spell checking in SQL textareas

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1498 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/event.inc.php             |  2 +-
 adminer/include/functions.inc.php | 15 +++++++++++++++
 adminer/procedure.inc.php         |  2 +-
 adminer/sql.inc.php               |  6 +++---
 adminer/trigger.inc.php           |  2 +-
 adminer/view.inc.php              |  2 +-
 changes.txt                       |  2 ++
 todo.txt                          |  3 ++-
 8 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/adminer/event.inc.php b/adminer/event.inc.php
index 3556b4c4..807adc5d 100644
--- a/adminer/event.inc.php
+++ b/adminer/event.inc.php
@@ -45,7 +45,7 @@ if ($_POST) {
 <tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" maxlength="64">
 <tr><th>&nbsp;<td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>
 </table>
-<p><textarea name="EVENT_DEFINITION" rows="10" cols="80" style="width: 98%;"><?php echo h($row["EVENT_DEFINITION"]); ?></textarea>
+<p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 0068c101..46482b01 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -116,6 +116,21 @@ function html_select($name, $options, $value = "", $onchange = true) {
 	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'>" . h($value) . "</textarea>"; // spellcheck - not valid before HTML5
+}
+
+
+
+// other functions
+
 /** Get INI boolean value
 * @param string
 * @return bool
diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index fa583c1b..bd03fd71 100644
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -48,7 +48,7 @@ if (isset($_GET["function"])) {
 }
 ?>
 </table>
-<p><textarea name="definition" rows="10" cols="80" style="width: 98%;"><?php echo h($row["definition"]); ?></textarea>
+<p><?php textarea("definition", $row["definition"]); ?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index d3abdeff..c8b1232c 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -129,15 +129,15 @@ if (!$error && $_POST) {
 ?>
 
 <form action="" method="post" enctype="multipart/form-data">
-<p><textarea name="query" rows="20" cols="80" style="width: 98%;"><?php
+<p><?php
 $q = $_GET["sql"]; // overwrite $q from if ($_POST) to save memory
 if ($_POST) {
 	$q = $_POST["query"];
 } elseif ($_GET["history"] != "") {
 	$q = $history[$_GET["history"]];
 }
-echo h($q);
-?></textarea>
+textarea("query", $q, 20);
+?>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Execute'); ?>">
diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index c2df0ab6..3855758a 100644
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -34,7 +34,7 @@ if ($_POST) {
 <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><textarea name="Statement" rows="10" cols="80" style="width: 98%;"><?php echo h($row["Statement"]); ?></textarea>
+<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 } ?>
diff --git a/adminer/view.inc.php b/adminer/view.inc.php
index 95c805fe..30f05320 100644
--- a/adminer/view.inc.php
+++ b/adminer/view.inc.php
@@ -25,7 +25,7 @@ if ($_POST) {
 ?>
 
 <form action="" method="post">
-<p><textarea name="select" rows="10" cols="80" style="width: 98%;"><?php echo h($row["select"]); ?></textarea>
+<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 } ?>
diff --git a/changes.txt b/changes.txt
index f0c71a35..4d0ef62f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -6,6 +6,8 @@ Show number of tables in server overview
 Operator LIKE %%
 Remember export parameters in cookie
 Allow semicolon as CSV separator
+Autofocus username in login form
+Disable spellchecking in SQL textareas
 Japanese translation
 Defer table information in database overview to JavaScript (performance)
 Big tables optimizations (performance)
diff --git a/todo.txt b/todo.txt
index 437140a2..b054f82a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,7 +1,6 @@
 Transactions in export
 Create view and routine options
 Variables editation, especially timezone
-Disable spell checking in SQL textareas - spellcheck="false"
 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)
@@ -11,6 +10,7 @@ Export by GET parameters
 Only first part of big BZ2 export is readable
 Auto-refresh processlist (thanks to Jan Garaj)
 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, $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
@@ -30,6 +30,7 @@ SQLite:
 CSV import - ON DUPLICATE KEY UPDATE
 Export - triggers, CREATE DATABASE
 Delimiter in export and SQL command
+Backward keys in Editor
 
 PostgreSQL:
 Users - SELECT * FROM pg_user