From d5ff49acbf447b26824f27a1d4d8cbb052db70a8 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 14 Aug 2013 22:12:06 +0530
Subject: [PATCH] added method PMA_getMultipleFieldCommandType

---
 libraries/structure.lib.php | 37 +++++++++++++++++++++++++++++++++++++
 tbl_structure.php           | 26 ++------------------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 719fd390b0..319bc2e6a2 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -2577,4 +2577,41 @@ function PMA_getReservedWordColumnNameMessages($db ,$table)
     }
     return $messages;
 }
+
+/**
+ * Function to get the type of command for multiple field handling
+ * 
+ * @return string
+ */
+function PMA_getMultipleFieldCommandType()
+{
+    $submit_mult = null;
+    
+    if (isset($_REQUEST['submit_mult_change_x'])) {
+        $submit_mult = 'change';
+    } elseif (isset($_REQUEST['submit_mult_drop_x'])) {
+        $submit_mult = 'drop';
+    } elseif (isset($_REQUEST['submit_mult_primary_x'])) {
+        $submit_mult = 'primary';
+    } elseif (isset($_REQUEST['submit_mult_index_x'])) {
+        $submit_mult = 'index';
+    } elseif (isset($_REQUEST['submit_mult_unique_x'])) {
+        $submit_mult = 'unique';
+    } elseif (isset($_REQUEST['submit_mult_spatial_x'])) {
+        $submit_mult = 'spatial';
+    } elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
+        $submit_mult = 'ftext';
+    } elseif (isset($_REQUEST['submit_mult_browse_x'])) {
+        $submit_mult = 'browse';
+    } elseif (isset($_REQUEST['submit_mult'])) {
+        $submit_mult = $_REQUEST['submit_mult'];
+    } elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) {
+        $submit_mult = 'row_delete';
+        if (isset($_REQUEST['selected'])) {
+            $_REQUEST['selected_fld'] = $_REQUEST['selected'];
+        }
+    }
+    
+    return $submit_mult;
+}
 ?>
diff --git a/tbl_structure.php b/tbl_structure.php
index 1f18dedaa0..3147ff8cd4 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -64,30 +64,8 @@ if (isset($_REQUEST['do_save_data'])) {
  *
  * submit_mult_*_x comes from IE if <input type="img" ...> is used
  */
-if (isset($_REQUEST['submit_mult_change_x'])) {
-    $submit_mult = 'change';
-} elseif (isset($_REQUEST['submit_mult_drop_x'])) {
-    $submit_mult = 'drop';
-} elseif (isset($_REQUEST['submit_mult_primary_x'])) {
-    $submit_mult = 'primary';
-} elseif (isset($_REQUEST['submit_mult_index_x'])) {
-    $submit_mult = 'index';
-} elseif (isset($_REQUEST['submit_mult_unique_x'])) {
-    $submit_mult = 'unique';
-} elseif (isset($_REQUEST['submit_mult_spatial_x'])) {
-    $submit_mult = 'spatial';
-} elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
-    $submit_mult = 'ftext';
-} elseif (isset($_REQUEST['submit_mult_browse_x'])) {
-    $submit_mult = 'browse';
-} elseif (isset($_REQUEST['submit_mult'])) {
-    $submit_mult = $_REQUEST['submit_mult'];
-} elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) {
-    $submit_mult = 'row_delete';
-    if (isset($_REQUEST['selected'])) {
-        $_REQUEST['selected_fld'] = $_REQUEST['selected'];
-    }
-}
+$submit_mult = PMA_getMultipleFieldCommandType();
+
 if (! empty($submit_mult)) {
     if (isset($_REQUEST['selected_fld'])) {
         $err_url = 'tbl_structure.php?' . PMA_URL_getCommon($db, $table);