From a375c17ea422318c3c7e9602f417d9126641533b Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Fri, 28 Sep 2007 07:18:23 +0000
Subject: [PATCH] better handling for 'view distinct' from table structure page

---
 libraries/mult_submits.inc.php | 15 +--------------
 tbl_structure.php              | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index d5591a401..bf4678808 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -102,20 +102,7 @@ if (! empty($submit_mult)
                 require './tbl_alter.php';
                 break;
             case $strBrowse:
-                $sql_query = '';
-                foreach ($selected AS $idx => $sval) {
-                    if ($sql_query == '') {
-                        $sql_query .= 'SELECT ' . PMA_backquote(urldecode($sval));
-                    } else {
-                        $sql_query .=  ', ' . PMA_backquote(urldecode($sval));
-                    }
-                }
-
-                // what is this htmlspecialchars() for??
-                //$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
-                $sql_query .= ' FROM ' . PMA_backquote($table);
-                require './sql.php';
-                break;
+                // this should already be handled by tbl_structure.php
         }
     } else {
         $what = 'row_delete';
diff --git a/tbl_structure.php b/tbl_structure.php
index c9707f0f5..455a0194a 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -35,15 +35,34 @@ if (isset($submit_mult_change_x)) {
     $submit_mult = $strUnique;
 } elseif (isset($submit_mult_fulltext_x)) {
     $submit_mult = $strIdxFulltext;
+} elseif (isset($submit_mult_browse_x)) {
+    $submit_mult = $strBrowse;
 }
 
-if ((!empty($submit_mult) && isset($selected_fld))
-    || isset($mult_btn)) {
-    $action = 'tbl_structure.php';
+if ((!empty($submit_mult) && isset($selected_fld)) || isset($mult_btn)) {
     $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
-    require_once('./libraries/header.inc.php');
-    require_once './libraries/tbl_links.inc.php';
-    require './libraries/mult_submits.inc.php';
+    if ($submit_mult == $strBrowse) {
+        $GLOBALS['active_page'] = 'sql.php';
+        $sql_query = '';
+        foreach ($_REQUEST['selected_fld'] as $idx => $sval) {
+            if ($sql_query == '') {
+                $sql_query .= 'SELECT ' . PMA_backquote($sval);
+            } else {
+                $sql_query .=  ', ' . PMA_backquote($sval);
+            }
+        }
+
+        // what is this htmlspecialchars() for??
+        //$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
+        $sql_query .= ' FROM ' . PMA_backquote($table);
+        require './sql.php';
+    } else {
+        $action = 'tbl_structure.php';
+        require_once './libraries/header.inc.php';
+        require_once './libraries/tbl_links.inc.php';
+        require './libraries/mult_submits.inc.php';
+    }
+    exit;
 }
 
 /**