allow Edit SQL on selects, results, views, etc.

diff --git a/BUGS b/BUGS
index 00e35cc9c5eee8f99c1462eac7a9db616f80f89b..b7597a01d57830a07d93c0cbe35f3311932454c4 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -17,7 +17,6 @@ Need to fix:
 * The getType function needs to be ported to 7.2 and 7.3 classes to add
   pretty type name and schema support
 * Report login errors
-* Edit Query
 * Don't offer owner change feature if user is not superuser
-* fix encoding in popup window
+* check use of apostrophes, etc. in tree menu
 

diff --git a/display.php b/display.php
index b3275092b567f59246809c7f05f9def086a3fc36..800a8022c8953ca4e8027f9066d500fe083d1e63 100644 (file)
--- a/display.php
+++ b/display.php
@@ -9,7 +9,7 @@
         * @param $return_desc The return link name
         * @param $page The current page
         *
-        * $Id: display.php,v 1.35 2003/12/21 02:03:15 chriskl Exp $
+        * $Id: display.php,v 1.36 2004/02/23 07:23:15 chriskl Exp $
         */
 
        // Include application functions
@@ -332,15 +332,24 @@
                        echo "<p>", $rs->recordCount(), " {$lang['strrows']}</p>\n";
                }
                else echo "<p>{$lang['strnodata']}</p>\n";
-       
+
+               // Navigation links     
+               echo "<p>";
                // Return
-               echo "<p><a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a>\n";
+               if (isset($_REQUEST['return_url']) && isset($_REQUEST['return_desc'])) {
+                       echo "<a class=\"navlink\" href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a> |\n";
+               }
+               // Edit SQL link
+               if (isset($_REQUEST['query'])) {
+                       echo "<a class=\"navlink\" href=\"database.php?{$misc->href}&amp;action=sql&amp;paginate=on&amp;query=" . urlencode($_REQUEST['query']), "\">{$lang['streditsql']}</a> |\n";
+               }
+               
                // Expand/Collapse
                if ($_REQUEST['strings'] == 'expanded')
-                       echo "| <a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=collapsed&amp;page=", 
+                       echo "<a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=collapsed&amp;page=", 
                                urlencode($_REQUEST['page']), "\">{$lang['strcollapse']}</a>\n";
                else
-                       echo "| <a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=expanded&amp;page=", 
+                       echo "<a class=\"navlink\" href=\"display.php?{$str}&amp;{$str2}&amp;strings=expanded&amp;page=", 
                                urlencode($_REQUEST['page']), "\">{$lang['strexpand']}</a>\n";
                // Create report
                if (isset($_REQUEST['query']) && $conf['show_reports'] && isset($rs) && is_object($rs) && $rs->recordCount() > 0) {

diff --git a/sql.php b/sql.php
index 3672225e437a59d26250f5bea6156984e7907758..d57ec188ce9f698bcb89cb6d71a3f5cb01ae5e6f 100644 (file)
--- a/sql.php
+++ b/sql.php
@@ -6,7 +6,7 @@
         * how many SQL statements have been strung together with semi-colons
         * @param $query The SQL query string to execute
         *
-        * $Id: sql.php,v 1.17 2004/02/14 11:13:13 chriskl Exp $
+        * $Id: sql.php,v 1.18 2004/02/23 07:23:15 chriskl Exp $
         */
 
        // Include application functions
@@ -25,8 +25,6 @@
        // Check to see if pagination has been specified.  In that case, send to display
        // script for pagination
        if (isset($_POST['paginate'])) {
-               $_REQUEST['return_url'] = "database.php?{$misc->href}&action=sql&paginate=on&query=" . urlencode($_POST['query']);
-               $_REQUEST['return_desc'] = $lang['streditsql'];
                include('./display.php');
                exit;
        }