a few sql editor tweaks. make some more strings translatable

diff --git a/lang/english.php b/lang/english.php
index 145a5c7316562c0e3db180704f5dd0ac199a5bac..c1ed2974e064defa8301704430533a8e6ff3e3f2 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.95 2003/08/11 05:48:04 chriskl Exp $
+        * $Id: english.php,v 1.96 2003/08/12 01:57:21 chriskl Exp $
         */
 
        // Language and character set
@@ -105,6 +105,8 @@
        $lang['strfind'] = 'Find';
        $lang['stroptions'] = 'Options';
        $lang['strrefresh'] = 'Refresh';
+       $lang['strtaller'] = 'Taller';
+       $lang['strshorter'] = 'Shorter';
 
        // Error handling
        $lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index 41ae778ee64b22e1e840440dac72b7af7d4cae58..7dfb7eed28626a93cd6261cae51215a12e8a35aa 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * English language file for phpPgAdmin.  Use this as a basis
         * for new translations.
         *
-        * $Id: english.php,v 1.47 2003/08/11 05:48:04 chriskl Exp $
+        * $Id: english.php,v 1.48 2003/08/12 01:57:21 chriskl Exp $
         */
 
        // Language and character set
@@ -105,6 +105,8 @@
        $lang['strfind'] = 'Find';
        $lang['stroptions'] = 'Options';
        $lang['strrefresh'] = 'Refresh';
+       $lang['strtaller'] = 'Taller';
+       $lang['strshorter'] = 'Shorter';
 
        // Error handling
        $lang['strnoframes'] = 'You need a frames-enabled browser to use this application.';

diff --git a/sqledit.php b/sqledit.php
index 19e483b1a873643dd3f3caa44fbb58b948bf78af..442ad660ca380ef66e00ed14492a8bacb85ff873 100644 (file)
--- a/sqledit.php
+++ b/sqledit.php
@@ -3,7 +3,7 @@
        /**\r
         * Alternative SQL editing window\r
         *\r
-        * $Id: sqledit.php,v 1.1 2003/07/31 08:39:03 chriskl Exp $\r
+        * $Id: sqledit.php,v 1.2 2003/08/12 01:57:21 chriskl Exp $\r
         */\r
 \r
        // Include application functions\r
@@ -18,33 +18,41 @@
         */\r
        function doDefault() {\r
                global $PHP_SELF, $data, $localData, $misc;\r
-               global $lang;\r
+               global $lang, $conf;\r
 \r
                if (!isset($_POST['query'])) $_POST['query'] = '';\r
 \r
+               // Get the list of all databases\r
+               $databases = &$data->getDatabases();\r
+\r
                echo "<h2>{$lang['strsql']}</h2>\n";\r
 \r
                echo "<form action=\"sql.php\" method=\"post\" target=\"detail\">\n";\r
 \r
-               echo "<p>{$lang['strdatabase']}: <select name=\"database\">\n";\r
-               $databases = &$data->getDatabases();\r
-               while (!$databases->EOF) {\r
-                       $dbname = $databases->f[$data->dbFields['dbname']];\r
-                       echo "<option value=\"", htmlspecialchars($dbname), "\"",\r
-                       (isset($_REQUEST['database']) && $dbname == $_REQUEST['database']) ? ' selected' : '', ">",\r
-                               htmlspecialchars($dbname), "</option>\n";\r
-                       $databases->moveNext();\r
+               if ($databases->recordCount() > 0) {\r
+                       echo "<p>{$lang['strdatabase']}: <select name=\"database\">\n";\r
+                       while (!$databases->EOF) {\r
+                               $dbname = $databases->f[$data->dbFields['dbname']];\r
+                               echo "<option value=\"", htmlspecialchars($dbname), "\"",\r
+                               (isset($_REQUEST['database']) && $dbname == $_REQUEST['database']) ? ' selected="selected"' : '', ">",\r
+                                       htmlspecialchars($dbname), "</option>\n";\r
+                               $databases->moveNext();\r
+                       }\r
+                       echo "</select>\n";\r
+               }\r
+               else {\r
+                       echo "<input type=\"hidden\" name=\"database\" value=\"", \r
+                               htmlspecialchars($conf['servers'][$_SESSION['webdbServerID']]['defaultdb']), "\" />\n";\r
                }\r
-               echo "</select>\n";\r
                echo "<input type=\"submit\" value=\"{$lang['strgo']}\" />\n";\r
                echo "<input type=\"submit\" name=\"explain\" value=\"{$lang['strexplain']}\" />\n";\r
                echo "<input type=\"reset\" value=\"{$lang['strreset']}\" />\n";\r
-               echo "<input type=\"button\" value=\"Taller\" onclick=\"document.forms[0].query.rows += 2;\" />\n";\r
-               echo "<input type=\"button\" value=\"Shorter\" onclick=\"document.forms[0].query.rows -= 2;\" />\n";\r
+               echo "<input type=\"button\" value=\"{$lang['strtaller']}\" onclick=\"document.forms[0].query.rows += 2;\" />\n";\r
+               echo "<input type=\"button\" value=\"{$lang['strshorter']}\" onclick=\"document.forms[0].query.rows -= 2;\" />\n";\r
 \r
                $rows = isset($_REQUEST['rows']) ? $_REQUEST['rows'] : 20;\r
 \r
-               echo "<textarea style=\"width:100%; height:auto;\" rows=\"{$rows}\" cols=\"50\" name=\"query\" id=\"query\">",\r
+               echo "<textarea style=\"width:100%; height:100%;\" rows=\"{$rows}\" cols=\"50\" name=\"query\" id=\"query\">",\r
                        htmlspecialchars($_POST['query']), "</textarea></p>\n";\r
 \r
                echo $misc->form;\r
@@ -58,6 +66,7 @@
        }\r
 \r
        $misc->printHeader($lang['strsql']);\r
+\r
        // Bring to the front always\r
        echo "<body onLoad=\"window.focus();\">\n";\r
        \r