New feature: Locking textarea in query window (EXPERIMENTAL, please comment)

ChangeLog

@@ -6,11 +6,23 @@ $Id$
 $Source$
 
 2003-06-03 Garvin Hicking <me@supergarv.de>
+    * lang/*, tbl_query_box.php3, Documentation.html, footer.inc.php3: 
+      (Experimental)
+      New feature - The automatic update of the query window seems to
+      cause some headache for users. They type in their query, want to
+      look in a different table for some fields, want to switch back to
+      their browser window and the changes are lost because the last table
+      is always filled in. Now we have a checkbox to preserve the edited
+      content from any update outside of the window. It is automatically
+      checked by editing the contents of the query textarea and can be
+      unchecked to restore previous behaviour. Thanks to Alexander Meis
+      for this suggestion. Optionally we could build in a config variable
+      to override this 'onChange' effect, but I guess it's not necessary.
     * libraries/display_tbl.lib.php3: Bug #748084 - Use preg_replace instead 
       of ereg_replace, because it interprets \0, \1 and so on not as strings
       but as regex-subpatterns and fails to convert those strings correctly.
-    We'll have to see if that can be the case on other usages of preg_replace
-    as well.
+      We'll have to see if that can be the case on other usages of 
+      preg_replace as well.
 
 2003-06-02 Alexander M. Turek  <rabus@users.sourceforge.net>
     * server_status.php3: RFE #723325 (Move total query statistics).

Documentation.html

@@ -1599,7 +1599,13 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
         as your window is opened they remain saved.<br /><br />
         When using the JavaScript based query window, it will always get updated when you
         click on a new table/db to browse and will focus if you click on "Edit SQL" after
-        using a query.<br /><br />
+        using a query. You can suppress updating the query window by checking the box
+        "Do not overwrite this query from outside the window" below the query textarea. Then
+        you can browse tables/databases in the background without losing the contents of the
+        textarea, so this is especially useful when composing a query with tables you first
+        have to look in. The checkbox will get automatically checked whenever you change the
+        contents of the textarea. Please uncheck the button whenever you definitely want the
+        query window to get updated even though you have made alterations.<br /><br />
         If $cfg['QueryHistoryDB'] is set to TRUE you can specify the amount of saved
         history items using $cfg['QueryHistoryMax'].<br /><br />
         The query window also has a custom tabbed look to group the features. Using the
@@ -3180,8 +3186,6 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 </pre>
 </p>
 
-
-
 <a name="faqproject"></a><br />
 <h3>[7. phpMyAdmin project]</h3>
 

footer.inc.php3

@@ -41,6 +41,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             <?php
             if (!isset($error_message) || $error_message == '') {
             ?>
+            if (!top.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) {
                 top.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
                 top.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
                 top.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
@@ -50,6 +51,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
         
                 <?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?>
                 top.frames.queryframe.querywindow.document.querywindow.submit();
+            }
             <?php
             } else {
             ?>

lang/afrikaans-iso-8859-1.inc.php3

@@ -655,4 +655,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/afrikaans-utf-8.inc.php3

@@ -656,4 +656,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/albanian-iso-8859-1.inc.php3

@@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/albanian-utf-8.inc.php3

@@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/arabic-utf-8.inc.php3

@@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/arabic-windows-1256.inc.php3

@@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/brazilian_portuguese-iso-8859-1.inc.php3

@@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php3

@@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/bulgarian-koi8-r.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php3

@@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/bulgarian-windows-1251.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/catalan-iso-8859-1.inc.php3

@@ -643,4 +643,5 @@ $strZip = '"comprimit amb zip"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/catalan-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strZip = '"comprimit amb zip"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/chinese_big5-utf-8.inc.php3

@@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/chinese_big5.inc.php3

@@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/chinese_gb-utf-8.inc.php3

@@ -645,4 +645,5 @@ $strZip = '"zipped"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/chinese_gb.inc.php3

@@ -645,4 +645,5 @@ $strZip = '"zipped"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/croatian-iso-8859-2.inc.php3

@@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/croatian-utf-8.inc.php3

@@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/croatian-windows-1250.inc.php3

@@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/czech-iso-8859-2.inc.php3

@@ -648,4 +648,5 @@ $strZeroRemovesTheLimit = 'Pozn
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/czech-utf-8.inc.php3

@@ -649,4 +649,5 @@ $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu)
 $strZip = '"zazipováno"';
 // To translate
 
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/czech-windows-1250.inc.php3

@@ -648,4 +648,5 @@ $strZeroRemovesTheLimit = 'Pozn
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/danish-iso-8859-1.inc.php3

@@ -663,4 +663,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/danish-utf-8.inc.php3

@@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/dutch-iso-8859-1.inc.php3

@@ -658,4 +658,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/dutch-utf-8.inc.php3

@@ -659,4 +659,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/english-iso-8859-1.inc.php3

@@ -641,4 +641,5 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';
 
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/english-utf-8.inc.php3

@@ -642,4 +642,5 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';
 
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/estonian-iso-8859-1.inc.php3

@@ -642,4 +642,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/estonian-utf-8.inc.php3

@@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/finnish-iso-8859-1.inc.php3

@@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/finnish-utf-8.inc.php3

@@ -666,4 +666,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/french-iso-8859-1.inc.php3

@@ -643,4 +643,5 @@ $strZip = '"zipp
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/french-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strZip = '"zippé"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/galician-iso-8859-1.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/galician-utf-8.inc.php3

@@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/georgian-utf-8.inc.php3

@@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/german-iso-8859-1.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'Die beste Methode zur Verarbeitung der hochgeladenen Date
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/german-utf-8.inc.php3

@@ -650,4 +650,5 @@ $strLoadExplanation = 'Die beste Methode zur Verarbeitung der hochgeladenen Date
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/greek-iso-8859-7.inc.php3

@@ -667,4 +667,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/greek-utf-8.inc.php3

@@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/hebrew-iso-8859-8-i.inc.php3

@@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/hindi-utf-8.inc.php3

@@ -679,4 +679,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/hungarian-iso-8859-2.inc.php3

@@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/hungarian-utf-8.inc.php3

@@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/indonesian-iso-8859-1.inc.php3

@@ -642,4 +642,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/indonesian-utf-8.inc.php3

@@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/italian-iso-8859-1.inc.php3

@@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/italian-utf-8.inc.php3

@@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/japanese-euc.inc.php3

@@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/japanese-sjis.inc.php3

@@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/japanese-utf-8.inc.php3

@@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/korean-ks_c_5601-1987.inc.php3

@@ -663,4 +663,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/latvian-utf-8.inc.php3

@@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/latvian-windows-1257.inc.php3

@@ -646,4 +646,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strLoadMethod = 'LOAD method'; //to translate
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/lithuanian-windows-1257.inc.php3

@@ -643,4 +643,5 @@ $strLoadMethod = 'LOAD method'; //to translate
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/malay-iso-8859-1.inc.php3

@@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/malay-utf-8.inc.php3

@@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/norwegian-iso-8859-1.inc.php3

@@ -646,4 +646,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/norwegian-utf-8.inc.php3

@@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/polish-iso-8859-2.inc.php3

@@ -642,4 +642,5 @@ $strZip = '".zip"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/polish-utf-8.inc.php3

@@ -643,4 +643,5 @@ $strZip = '".zip"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/portuguese-iso-8859-1.inc.php3

@@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/portuguese-utf-8.inc.php3

@@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/romanian-iso-8859-1.inc.php3

@@ -643,4 +643,5 @@ $strZip = '"arhivat"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/romanian-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strZip = '"arhivat"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/russian-dos-866.inc.php3

@@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/russian-koi8-r.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/russian-utf-8.inc.php3

@@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/russian-windows-1251.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/serbian-utf-8.inc.php3

@@ -671,4 +671,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/serbian-windows-1250.inc.php3

@@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovak-iso-8859-2.inc.php3

@@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovak-utf-8.inc.php3

@@ -652,4 +652,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovak-windows-1250.inc.php3

@@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovenian-iso-8859-2.inc.php3

@@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovenian-utf-8.inc.php3

@@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/slovenian-windows-1250.inc.php3

@@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/spanish-iso-8859-1.inc.php3

@@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/spanish-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/swedish-iso-8859-1.inc.php3

@@ -642,4 +642,5 @@ $strZip = '"zippad"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/swedish-utf-8.inc.php3

@@ -643,4 +643,5 @@ $strZip = '"zippad"';
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/thai-tis-620.inc.php3

@@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/thai-utf-8.inc.php3

@@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/turkish-iso-8859-9.inc.php3

@@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/turkish-utf-8.inc.php3

@@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php3

@@ -644,4 +644,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

lang/ukrainian-windows-1251.inc.php3

@@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change
 $strExecuteBookmarked = 'Execute bookmarked query';  //to translate
 $strExcelOptions = 'Excel options';  //to translate
 $strReplaceNULLBy = 'Replace NULL by';  //to translate
+$strQueryWindowLock = 'Do not overwrite this query from outside the window';  //to translate
 ?>

tbl_query_box.php3

@@ -45,12 +45,19 @@ else {
 // loic1: defines wether file upload is available or not
 // ($is_upload now defined in common.lib.php3)
 
+if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full')) {
+    $locking   = 'onKeyPress="this.form.elements[\'LockFromUpdate\'].checked = true;"';
+} else {
+    $locking   = '';
+}
+            
 $auto_sel  = ($cfg['TextareaAutoSelect']
                // 2003-02-05 rabus: This causes big trouble with Opera 7 for
                // Windows, so let's disable it there...
                && !(PMA_USR_OS == 'Win' && PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER >= 7))
            ? "\n" . '             onfocus="if (typeof(document.layers) == \'undefined\' || typeof(textarea_selected) == \'undefined\') {textarea_selected = 1; this.form.elements[\'sql_query\'].select();}"'
            : '';
+$auto_sel .= ' ' . $locking;
 
 // garvin: If non-JS query window is embedded, display a list of databases to choose from.
 //         Apart from that, a non-js query window sucks badly.
@@ -143,6 +150,16 @@ if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {
             </table>
             <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp;
                 <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br />
+            <?php
+            if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {
+            ?>
+            <script type="text/javascript">
+                document.writeln('<input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" />&nbsp;');
+                document.writeln('    <label for="checkbox_lock"><?php echo $strQueryWindowLock; ?></label><br />');
+            </script>
+            <?php
+            }
+            ?>
             </div>
 <?php
 } else {