From 5cf3bceb5398539e60d96cb13dd13958eb9ab412 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:57:11 +0530
Subject: [PATCH] added method PMA_getHtmlForColumnIndexes

---
 libraries/tbl_columns_definition_form.inc.php | 40 ++-------------
 libraries/tbl_columns_definition_form.lib.php | 51 +++++++++++++++++++
 2 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 007a6ea087..fec7d6241c 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -318,43 +318,11 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column indexes
-    // See my other comment about removing this 'if'.
+    // See my other comment about  this 'if'.
     if (!$is_backup) {
-        $content_cells[$i][$ci] = '<select name="field_key[' . $i . ']"'
-            . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
-        $content_cells[$i][$ci] .= '<option value="none_' . $i . '">---</option>';
-
-        $content_cells[$i][$ci] .= '<option value="primary_' . $i . '" title="'
-            . __('Primary') . '"';
-        if (isset($row['Key']) && $row['Key'] == 'PRI') {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= '>PRIMARY</option>';
-
-        $content_cells[$i][$ci] .= '<option value="unique_' . $i . '" title="'
-            . __('Unique') . '"';
-        if (isset($row['Key']) && $row['Key'] == 'UNI') {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= '>UNIQUE</option>';
-
-        $content_cells[$i][$ci] .= '<option value="index_' . $i . '" title="'
-            . __('Index') . '"';
-        if (isset($row['Key']) && $row['Key'] == 'MUL') {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= '>INDEX</option>';
-
-        if (!PMA_DRIZZLE) {
-            $content_cells[$i][$ci] .= '<option value="fulltext_' . $i . '" title="'
-                . __('Fulltext') . '"';
-            if (isset($row['Key']) && $row['Key'] == 'FULLTEXT') {
-                $content_cells[$i][$ci] .= ' selected="selected"';
-            }
-            $content_cells[$i][$ci] .= '>FULLTEXT</option>';
-        }
-
-        $content_cells[$i][$ci] .= '</select>';
+        $content_cells[$i][$ci] = PMA_getHtmlForColumnIndexes(
+                $i, $ci, $ci_offset, $row
+        );
         $ci++;
     } // end if ($action ==...)
 
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index e6533f1f84..a3b4d80523 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -801,4 +801,55 @@ function PMA_getHtmlForColumnAutoIncrement($i, $ci, $ci_offset, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for the column indexes
+ * 
+ * @param int   $i         index
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnIndexes($i, $ci, $ci_offset, $row)
+{
+    $html = '<select name="field_key[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
+    $html .= '<option value="none_' . $i . '">---</option>';
+
+    $html .= '<option value="primary_' . $i . '" title="'
+        . __('Primary') . '"';
+    if (isset($row['Key']) && $row['Key'] == 'PRI') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>PRIMARY</option>';
+
+    $html .= '<option value="unique_' . $i . '" title="'
+        . __('Unique') . '"';
+    if (isset($row['Key']) && $row['Key'] == 'UNI') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>UNIQUE</option>';
+
+    $html .= '<option value="index_' . $i . '" title="'
+        . __('Index') . '"';
+    if (isset($row['Key']) && $row['Key'] == 'MUL') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>INDEX</option>';
+
+    if (!PMA_DRIZZLE) {
+        $html .= '<option value="fulltext_' . $i . '" title="'
+            . __('Fulltext') . '"';
+        if (isset($row['Key']) && $row['Key'] == 'FULLTEXT') {
+            $html .= ' selected="selected"';
+        }
+        $html .= '>FULLTEXT</option>';
+    }
+
+    $html .= '</select>';
+    
+    return $html;
+}
 ?>