From dba6f67a18118307cd6bd15aaa4a35ea12540788 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 19:55:43 +0530
Subject: [PATCH] added method PMA_getHtmlForTransformationOption

---
 libraries/tbl_columns_definition_form.inc.php | 16 ++++-------
 libraries/tbl_columns_definition_form.lib.php | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index db246fcd5d..fa4b11d968 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -477,17 +477,11 @@ for ($i = 0; $i < $num_fields; $i++) {
         $content_cells[$i][$ci] .= '</select>';
         $ci++;
 
-        $val = isset($row['Field'])
-            && isset($mime_map[$row['Field']]['transformation_options'])
-            ? htmlspecialchars($mime_map[$row['Field']]['transformation_options'])
-            : '';
-        $content_cells[$i][$ci] = '<input id="field_' . $i . '_'
-            . ($ci - $ci_offset) . '"' . ' type="text" '
-            . 'name="field_transformation_options[' . $i . ']"'
-            . ' size="16" class="textfield"'
-            . ' value="' . $val . '"'
-            . ' />';
-        //$ci++;
+        // column Transformation options
+        $content_cells[$i][$ci] = PMA_getHtmlForTransformationOption(
+                $i, $ci, $ci_offset, isset($row) ? $row : null,
+                isset($mime_map) ? $mime_map : null
+        );
     }
 } // end for
 
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 0bc7fa04cc..ff0fdd5a4e 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -588,4 +588,32 @@ function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
     
     return $html;
 }
+
+/**
+ * Function to get html for transhormation option
+ * 
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * @param array $mime_map  mime map
+ * 
+ * @return string
+ */
+function PMA_getHtmlForTransformationOption($i, $ci, $ci_offset, $row, $mime_map)
+{
+    $val = isset($row['Field'])
+            && isset($mime_map[$row['Field']]['transformation_options'])
+            ? htmlspecialchars($mime_map[$row['Field']]['transformation_options'])
+            : '';
+    
+    $html = '<input id="field_' . $i . '_'
+                . ($ci - $ci_offset) . '"' . ' type="text" '
+                . 'name="field_transformation_options[' . $i . ']"'
+                . ' size="16" class="textfield"'
+                . ' value="' . $val . '"'
+                . ' />';
+    
+    return $html;
+}
 ?>