From e636a19206c6a44e731773c4b296271987d0375e Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 11:41:32 +0530
Subject: [PATCH 01/27] added method PMA_getRowDataForFieldsMetaSet

---
 libraries/tbl_columns_definition_form.inc.php | 33 ++--------------
 libraries/tbl_columns_definition_form.lib.php | 39 +++++++++++++++++++
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 0fe95993b4..97308f8c14 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -89,35 +89,10 @@ for ($i = 0; $i < $num_fields; $i++) {
                     $comments_map, $mime_map
                 ); 
     } elseif (isset($fields_meta[$i])) {
-        $row = $fields_meta[$i];
-        switch ($row['Default']) {
-        case null:
-            if ($row['Null'] == 'YES') {
-                $row['DefaultType']  = 'NULL';
-                $row['DefaultValue'] = '';
-                // SHOW FULL COLUMNS does not report the case
-                // when there is a DEFAULT value which is empty so we need to use the
-                // results of SHOW CREATE TABLE
-            } elseif (isset($row)
-                && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]
-                    ['default_value'])
-            ) {
-                $row['DefaultType']  = 'USER_DEFINED';
-                $row['DefaultValue'] = $row['Default'];
-            } else {
-                $row['DefaultType']  = 'NONE';
-                $row['DefaultValue'] = '';
-            }
-            break;
-        case 'CURRENT_TIMESTAMP':
-            $row['DefaultType']  = 'CURRENT_TIMESTAMP';
-            $row['DefaultValue'] = '';
-            break;
-        default:
-            $row['DefaultType']  = 'USER_DEFINED';
-            $row['DefaultValue'] = $row['Default'];
-            break;
-        }
+        $row = PMA_getRowDataForFieldsMetaSet(
+            $fields_meta[$i], isset($analyzed_sql[0]['create_table_fields']
+            [$row['Field']]['default_value'])
+        );
     }
 
     if (isset($row['Type'])) {
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 71b2a91ba1..fa943cd201 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -507,4 +507,43 @@ function PMA_handleRegeneration($submit_fulltext, $comments_map, $mime_map)
         $comments_map, $mime_map
     );
 }
+
+/**
+ * Function to get row data for $fields_meta set
+ * 
+ * @param array $row       row
+ * @param bool  $isDefault whether the row value is default
+ * 
+ * @return array
+ */
+function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
+{
+    switch ($row['Default']) {
+        case null:
+            if ($row['Null'] == 'YES') {
+                $row['DefaultType']  = 'NULL';
+                $row['DefaultValue'] = '';
+                // SHOW FULL COLUMNS does not report the case
+                // when there is a DEFAULT value which is empty so we need to use the
+                // results of SHOW CREATE TABLE
+            } elseif ($isDefault) {
+                $row['DefaultType']  = 'USER_DEFINED';
+                $row['DefaultValue'] = $row['Default'];
+            } else {
+                $row['DefaultType']  = 'NONE';
+                $row['DefaultValue'] = '';
+            }
+            break;
+        case 'CURRENT_TIMESTAMP':
+            $row['DefaultType']  = 'CURRENT_TIMESTAMP';
+            $row['DefaultValue'] = '';
+            break;
+        default:
+            $row['DefaultType']  = 'USER_DEFINED';
+            $row['DefaultValue'] = $row['Default'];
+            break;
+    }
+    
+    return $row;
+}
 ?>

From 10d2c79e6118f1497a00099cbbc421a1799ef3e0 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 11:46:16 +0530
Subject: [PATCH 02/27] error corrected

---
 libraries/tbl_columns_definition_form.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 97308f8c14..7929de3f48 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -91,7 +91,7 @@ for ($i = 0; $i < $num_fields; $i++) {
     } elseif (isset($fields_meta[$i])) {
         $row = PMA_getRowDataForFieldsMetaSet(
             $fields_meta[$i], isset($analyzed_sql[0]['create_table_fields']
-            [$row['Field']]['default_value'])
+            [$fields_meta[$i]['Field']]['default_value'])
         );
     }
 
@@ -102,6 +102,7 @@ for ($i = 0; $i < $num_fields; $i++) {
                 = PMA_Util::convertBitDefaultValue($row['Default']);
         }
     }
+    
     // Cell index: If certain fields get left out, the counter shouldn't change.
     $ci = 0;
     // Everytime a cell shall be left out the STRG-jumping feature, $ci_offset

From f92b24d3b3dcae7bc88354c1b80e18a6b16fca42 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 12:21:49 +0530
Subject: [PATCH 03/27] added PMA_getHtmlForColumnType,
 PMA_getHtmlForColumnName

---
 libraries/tbl_columns_definition_form.inc.php | 25 +++++------
 libraries/tbl_columns_definition_form.lib.php | 42 +++++++++++++++++++
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 7929de3f48..db246fcd5d 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -119,19 +119,12 @@ for ($i = 0; $i < $num_fields; $i++) {
     }
 
     // column name
-    $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_name[' . $i . ']"'
-        . ' maxlength="64" class="textfield" title="' . __('Column') . '"'
-        . ' size="10"'
-        . ' value="' . (isset($row['Field']) ? htmlspecialchars($row['Field']) : '')
-        . '"' . ' />';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnName(
+        $i, $ci, $ci_offset, isset($row) ? $row : null
+    );
+    
     $ci++;
 
-    // column type
-    $select_id = 'field_' . $i . '_' . ($ci - $ci_offset);
-    $content_cells[$i][$ci] = '<select class="column_type" name="field_type[' .
-        $i . ']"' .' id="' . $select_id . '">';
-
     if (empty($row['Type'])) {
         // creating a column
         $row['Type'] = '';
@@ -157,10 +150,12 @@ for ($i = 0; $i < $num_fields; $i++) {
     // rtrim the type, for cases like "float unsigned"
     $type = rtrim($type);
     $type_upper = strtoupper($type);
-
-    $content_cells[$i][$ci]
-        .= PMA_Util::getSupportedDatatypes(true, $type_upper);
-    $content_cells[$i][$ci] .= '    </select>';
+    
+    // column type    
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnType(
+        $i, $ci, $ci_offset, $type_upper
+    );
+    
     $ci++;
 
     // old column length
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index fa943cd201..0bc7fa04cc 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -546,4 +546,46 @@ function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
     
     return $row;
 }
+
+/**
+ * Function to get html for the column name
+ * 
+ * @param int $i         field number
+ * @param int $ci        cell index
+ * @param int $ci_offset cell index offset
+ * @param array $row     row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnName($i, $ci, $ci_offset, $row)
+{
+    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_name[' . $i . ']"'
+        . ' maxlength="64" class="textfield" title="' . __('Column') . '"'
+        . ' size="10"'
+        . ' value="' . (isset($row['Field']) ? htmlspecialchars($row['Field']) : '')
+        . '"' . ' />';
+    
+    return $html;
+}
+
+/**
+ * Function to get html for the column type
+ * 
+ * @param int $i         field number
+ * @param int $ci        cell index
+ * @param int $ci_offset cell index offset
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
+{
+    $select_id = 'field_' . $i . '_' . ($ci - $ci_offset);
+    $html = '<select class="column_type" name="field_type[' .
+        $i . ']"' .' id="' . $select_id . '">';
+    $html .= PMA_Util::getSupportedDatatypes(true, $type_upper);
+    $html .= '    </select>';
+    
+    return $html;
+}
 ?>

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 04/27] 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;
+}
 ?>

From ff0de8e52b97fff3cc172a240e0e019fab19cb70 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 20:51:18 +0530
Subject: [PATCH 05/27] added method PMA_getHtmlForMimeType

---
 libraries/tbl_columns_definition_form.inc.php | 24 ++---------
 libraries/tbl_columns_definition_form.lib.php | 40 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index fa4b11d968..8242116f25 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -421,30 +421,14 @@ for ($i = 0; $i < $num_fields; $i++) {
         $ci++;
     }
 
-    // column MIME-types
     if ($cfgRelation['mimework']
         && $GLOBALS['cfg']['BrowseMIME']
         && $cfgRelation['commwork']
     ) {
-        $content_cells[$i][$ci] = '<select id="field_' . $i . '_'
-            . ($ci - $ci_offset) . '" size="1" name="field_mimetype[' . $i . ']">';
-        $content_cells[$i][$ci] .= '    <option value="">&nbsp;</option>';
-
-        if (is_array($available_mime['mimetype'])) {
-            foreach ($available_mime['mimetype'] as $mimekey => $mimetype) {
-                $checked = (isset($row['Field'])
-                    && isset($mime_map[$row['Field']]['mimetype'])
-                    && ($mime_map[$row['Field']]['mimetype']
-                        == str_replace('/', '_', $mimetype))
-                    ? 'selected '
-                    : '');
-                $content_cells[$i][$ci] .= '    <option value="'
-                    . str_replace('/', '_', $mimetype) . '" ' . $checked . '>'
-                    . htmlspecialchars($mimetype) . '</option>';
-            }
-        }
-
-        $content_cells[$i][$ci] .= '</select>';
+        // Column Mime-type
+        $content_cells[$i][$ci] = PMA_getHtmlForMimeType(
+            $i, $ci, $ci_offset, $available_mime, $row, $mime_map
+        );
         $ci++;
 
         $content_cells[$i][$ci] = '<select id="field_' . $i . '_'
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ff0fdd5a4e..3a675acd8c 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -590,7 +590,7 @@ function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
 }
 
 /**
- * Function to get html for transhormation option
+ * Function to get html for transformation option
  * 
  * @param int   $i         field number
  * @param int   $ci        cell index
@@ -616,4 +616,42 @@ function PMA_getHtmlForTransformationOption($i, $ci, $ci_offset, $row, $mime_map
     
     return $html;
 }
+
+/**
+ * Function to get html for browser transformation
+ * 
+ * @param int   $i              field number
+ * @param int   $ci             cell index
+ * @param int   $ci_offset      cell index offset
+ * @param array $available_mime available mime
+ * @param array $row            row
+ * @param array $mime_map       mime map
+ * 
+ * @return string
+ */
+function PMA_getHtmlForMimeType($i, $ci, $ci_offset,
+    $available_mime, $row, $mime_map
+) {
+    $html = '<select id="field_' . $i . '_'
+            . ($ci - $ci_offset) . '" size="1" name="field_mimetype[' . $i . ']">';
+    $html .= '    <option value="">&nbsp;</option>';
+    
+    if (is_array($available_mime['mimetype'])) {
+        foreach ($available_mime['mimetype'] as $mimetype) {
+            $checked = (isset($row['Field'])
+                && isset($mime_map[$row['Field']]['mimetype'])
+                && ($mime_map[$row['Field']]['mimetype']
+                    == str_replace('/', '_', $mimetype))
+                ? 'selected '
+                : '');
+            $html .= '    <option value="'
+                . str_replace('/', '_', $mimetype) . '" ' . $checked . '>'
+                . htmlspecialchars($mimetype) . '</option>';
+        }
+    }
+    
+    $html .= '</select>';
+    
+    return $html;
+}
 ?>

From 9b9d67d370cf8c5d8ffc6ae91cda47b199017a9e Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:05:47 +0530
Subject: [PATCH 06/27] added PMA_getHtmlForBrowserTransformation

---
 libraries/tbl_columns_definition_form.inc.php | 32 ++-----------
 libraries/tbl_columns_definition_form.lib.php | 47 +++++++++++++++++++
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 8242116f25..24054c1130 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -431,34 +431,10 @@ for ($i = 0; $i < $num_fields; $i++) {
         );
         $ci++;
 
-        $content_cells[$i][$ci] = '<select id="field_' . $i . '_'
-            . ($ci - $ci_offset) . '" size="1" name="field_transformation['
-            . $i . ']">';
-        $content_cells[$i][$ci] .= '    <option value="" title="' . __('None')
-            . '"></option>';
-        if (is_array($available_mime['transformation'])) {
-            foreach ($available_mime['transformation'] as $mimekey => $transform) {
-                $checked = isset($row['Field'])
-                    && isset($mime_map[$row['Field']]['transformation'])
-                    && preg_match(
-                        '@' . preg_quote(
-                            $available_mime['transformation_file'][$mimekey]
-                        ) . '3?@i',
-                        $mime_map[$row['Field']]['transformation']
-                    )
-                    ? 'selected '
-                    : '';
-                $tooltip = PMA_getTransformationDescription(
-                    $available_mime['transformation_file'][$mimekey], false
-                );
-                $content_cells[$i][$ci] .= '<option value="'
-                    . $available_mime['transformation_file'][$mimekey] . '" '
-                    . $checked . ' title="' . htmlspecialchars($tooltip) . '">'
-                    . htmlspecialchars($transform) . '</option>';
-            }
-        }
-
-        $content_cells[$i][$ci] .= '</select>';
+        // Column Browser transformation
+        $content_cells[$i][$ci] = PMA_getHtmlForBrowserTransformation(
+            $i, $ci, $mi, $available_mime, $row, $mime_map
+        );
         $ci++;
 
         // column Transformation options
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 3a675acd8c..9d3174e676 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -654,4 +654,51 @@ function PMA_getHtmlForMimeType($i, $ci, $ci_offset,
     
     return $html;
 }
+
+/**
+ * Function to get html for browser transformation
+ * 
+ * @param int   $i              field number
+ * @param int   $ci             cell index
+ * @param int   $ci_offset      cell index offset
+ * @param array $available_mime available mime
+ * @param array $row            row
+ * @param array $mime_map       mime map
+ * 
+ * @return string
+ */
+function PMA_getHtmlForBrowserTransformation($i, $ci, $ci_offset,
+    $available_mime, $row, $mime_map
+) {
+    $html = '<select id="field_' . $i . '_'
+            . ($ci - $ci_offset) . '" size="1" name="field_transformation['
+            . $i . ']">';
+    $html .= '    <option value="" title="' . __('None')
+            . '"></option>';
+    if (is_array($available_mime['transformation'])) {
+        foreach ($available_mime['transformation'] as $mimekey => $transform) {
+            $checked = isset($row['Field'])
+                && isset($mime_map[$row['Field']]['transformation'])
+                && preg_match(
+                    '@' . preg_quote(
+                        $available_mime['transformation_file'][$mimekey]
+                    ) . '3?@i',
+                    $mime_map[$row['Field']]['transformation']
+                )
+                ? 'selected '
+                : '';
+            $tooltip = PMA_getTransformationDescription(
+                $available_mime['transformation_file'][$mimekey], false
+            );
+            $html .= '<option value="'
+                . $available_mime['transformation_file'][$mimekey] . '" '
+                . $checked . ' title="' . htmlspecialchars($tooltip) . '">'
+                . htmlspecialchars($transform) . '</option>';
+        }
+    }
+    
+    $html .= '</select>';
+
+    return $html;
+}
 ?>

From 3d10342c87f5b5512726f9c401499531531495b2 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:06:17 +0530
Subject: [PATCH 07/27] comment error corrected

---
 libraries/tbl_columns_definition_form.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 9d3174e676..88da272804 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -618,7 +618,7 @@ function PMA_getHtmlForTransformationOption($i, $ci, $ci_offset, $row, $mime_map
 }
 
 /**
- * Function to get html for browser transformation
+ * Function to get html for mime type
  * 
  * @param int   $i              field number
  * @param int   $ci             cell index

From 90c16952b09e4533c71fb4eb49239291711ec78b Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:17:20 +0530
Subject: [PATCH 08/27] added PMA_getHtmlForMoveColumn

---
 libraries/tbl_columns_definition_form.inc.php | 39 ++------------
 libraries/tbl_columns_definition_form.lib.php | 52 +++++++++++++++++++
 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 24054c1130..98fb6e2b10 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -382,42 +382,9 @@ for ($i = 0; $i < $num_fields; $i++) {
 
     // move column
     if (isset($fields_meta)) {
-        $content_cells[$i][$ci] = '<select id="field_' . $i . '_'
-            . ($ci - $ci_offset) . '"' . ' name="field_move_to[' . $i
-            . ']" size="1" width="5em">'
-            . '<option value="" selected="selected">&nbsp;</option>';
-
-        // find index of current column
-        $current_index = 0;
-        for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
-            if ($move_columns[$mi]->name == $row['Field']) {
-                $current_index = $mi;
-                break;
-            }
-        }
-        $content_cells[$i][$ci] .= '<option value="-first"'
-            . ($current_index == 0 ? ' disabled="disabled"' : '')
-            . '>' . __('first') . '</option>';
-
-        for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
-            $content_cells[$i][$ci] .=
-                '<option value="' . htmlspecialchars($move_columns[$mi]->name) . '"'
-                . (($current_index == $mi || $current_index == $mi + 1)
-                    ? ' disabled="disabled"'
-                    : '')
-                .'>'
-                . sprintf(
-                    __('after %s'),
-                    PMA_Util::backquote(
-                        htmlspecialchars(
-                            $move_columns[$mi]->name
-                        )
-                    )
-                )
-                . '</option>';
-        }
-
-        $content_cells[$i][$ci] .= '</select>';
+        $content_cells[$i][$ci] = PMA_getHtmlForMoveColumn(
+            $i, $ci, $ci_offset, $move_columns, $row
+        );
         $ci++;
     }
 
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 88da272804..ad65035181 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -701,4 +701,56 @@ function PMA_getHtmlForBrowserTransformation($i, $ci, $ci_offset,
 
     return $html;
 }
+
+/**
+ * Function to get html for move column
+ * 
+ * @param int   $i            field number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $move_columns move columns
+ * @param array $row          row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForMoveColumn($i, $ci, $ci_offset, $move_columns, $row)
+{
+    $html = '<select id="field_' . $i . '_'
+        . ($ci - $ci_offset) . '"' . ' name="field_move_to[' . $i
+        . ']" size="1" width="5em">'
+        . '<option value="" selected="selected">&nbsp;</option>';
+    // find index of current column
+    $current_index = 0;
+    for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
+        if ($move_columns[$mi]->name == $row['Field']) {
+            $current_index = $mi;
+            break;
+        }
+    }
+    
+    $html .= '<option value="-first"'
+            . ($current_index == 0 ? ' disabled="disabled"' : '')
+            . '>' . __('first') . '</option>';
+    for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
+        $html .=
+            '<option value="' . htmlspecialchars($move_columns[$mi]->name) . '"'
+            . (($current_index == $mi || $current_index == $mi + 1)
+                ? ' disabled="disabled"'
+                : '')
+            .'>'
+            . sprintf(
+                __('after %s'),
+                PMA_Util::backquote(
+                    htmlspecialchars(
+                        $move_columns[$mi]->name
+                    )
+                )
+            )
+            . '</option>';
+    }
+    
+    $html .= '</select>';
+    
+    return $html;
+}
 ?>

From 08e3b43e0eba98f88a14fe3753a7a29d5046c451 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:32:17 +0530
Subject: [PATCH 09/27] added method PMA_getHtmlForBrowserTransformation

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

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 98fb6e2b10..f1b20df924 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -370,14 +370,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column comments
-    $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_comments[' . $i . ']" size="12"'
-        . ' value="' . (isset($row['Field'])
-                && is_array($comments_map)
-                && isset($comments_map[$row['Field']])
-            ?  htmlspecialchars($comments_map[$row['Field']])
-            : '') . '"'
-        . ' class="textfield" />';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnComment(
+        $i, $ci, $ci_offset, isset($row) ? $row : null, $comments_map
+    );
     $ci++;
 
     // move column
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ad65035181..673234d99d 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -753,4 +753,29 @@ function PMA_getHtmlForMoveColumn($i, $ci, $ci_offset, $move_columns, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for column comment
+ * 
+ * @param int   $i            field number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $row          row
+ * @param array $comments_map comments map
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnComment($i, $ci, $ci_offset, $row, $comments_map)
+{
+    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_comments[' . $i . ']" size="12"'
+        . ' value="' . (isset($row['Field'])
+                && is_array($comments_map)
+                && isset($comments_map[$row['Field']])
+            ?  htmlspecialchars($comments_map[$row['Field']])
+            : '') . '"'
+        . ' class="textfield" />';
+    
+    return $html;
+}
 ?>

From 1f4373112d44347264f04d717257613b6bed3cdf Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:32:52 +0530
Subject: [PATCH 10/27] error corrected

---
 libraries/tbl_columns_definition_form.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index f1b20df924..dbdd3e59e9 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -395,7 +395,7 @@ for ($i = 0; $i < $num_fields; $i++) {
 
         // Column Browser transformation
         $content_cells[$i][$ci] = PMA_getHtmlForBrowserTransformation(
-            $i, $ci, $mi, $available_mime, $row, $mime_map
+            $i, $ci, $ci_offset, $available_mime, $row, $mime_map
         );
         $ci++;
 

From 1294d34a01e53bf4181b913750ef3434e1385c64 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 21:46:28 +0530
Subject: [PATCH 11/27] added method PMA_getHtmlForColumnAutoIncrement

---
 libraries/tbl_columns_definition_form.inc.php | 11 +++------
 libraries/tbl_columns_definition_form.lib.php | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index dbdd3e59e9..007a6ea087 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -359,14 +359,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     } // end if ($action ==...)
 
     // column auto_increment
-    $content_cells[$i][$ci] = '<input name="field_extra[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
-
-    if (isset($row['Extra']) && strtolower($row['Extra']) == 'auto_increment') {
-        $content_cells[$i][$ci] .= ' checked="checked"';
-    }
-
-    $content_cells[$i][$ci] .= ' type="checkbox" value="AUTO_INCREMENT" />';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnAutoIncrement(
+            $i, $ci, $ci_offset, $row
+    );
     $ci++;
 
     // column comments
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 673234d99d..e6533f1f84 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -778,4 +778,27 @@ function PMA_getHtmlForColumnComment($i, $ci, $ci_offset, $row, $comments_map)
     
     return $html;
 }
+
+/**
+ * Function get html for column auto increment
+ * 
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnAutoIncrement($i, $ci, $ci_offset, $row)
+{
+    $html = '<input name="field_extra[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
+    if (isset($row['Extra']) && strtolower($row['Extra']) == 'auto_increment') {
+        $html .= ' checked="checked"';
+    }
+
+    $html .= ' type="checkbox" value="AUTO_INCREMENT" />';
+    
+    return $html;
+}
 ?>

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 12/27] 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;
+}
 ?>

From f859dfac9d71aa7fd163f368dd8686721a9389cf Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 22:41:02 +0530
Subject: [PATCH 13/27] added  method PMA_getHtmlForColumnNull

---
 libraries/tbl_columns_definition_form.inc.php | 14 +++-------
 libraries/tbl_columns_definition_form.lib.php | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index fec7d6241c..cc40973e64 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -304,17 +304,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column NULL
-    $content_cells[$i][$ci] = '<input name="field_null[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
-
-    if (! empty($row['Null'])
-        && $row['Null'] != 'NO'
-        && $row['Null'] != 'NOT NULL'
-    ) {
-        $content_cells[$i][$ci] .= ' checked="checked"';
-    }
-
-    $content_cells[$i][$ci] .= ' type="checkbox" value="NULL" class="allow_null"/>';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnNull(
+        $i, $ci, $ci_offset, isset($row) ? $row : null
+    );
     $ci++;
 
     // column indexes
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index a3b4d80523..16e956e9b9 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -852,4 +852,30 @@ function PMA_getHtmlForColumnIndexes($i, $ci, $ci_offset, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for column null
+ * 
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
+{
+    $html = '<input name="field_null[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
+    if (! empty($row['Null'])
+        && $row['Null'] != 'NO'
+        && $row['Null'] != 'NOT NULL'
+    ) {
+        $html .= ' checked="checked"';
+    }
+
+    $html .= ' type="checkbox" value="NULL" class="allow_null"/>';
+    
+    return $html;
+}
 ?>

From d8afc1f544bf237118533f4f8900a3c88a2343c2 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 22:53:17 +0530
Subject: [PATCH 14/27] added method PMA_getHtmlForColumnAttribute

---
 libraries/tbl_columns_definition_form.inc.php | 66 ++--------------
 libraries/tbl_columns_definition_form.lib.php | 79 +++++++++++++++++++
 2 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index cc40973e64..7127f7f7ea 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -243,64 +243,14 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column attribute
-    $content_cells[$i][$ci] = '<select style="font-size: 70%;"'
-        . ' name="field_attribute[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
-
-    $attribute     = '';
-    if (isset($extracted_columnspec)) {
-        $attribute = $extracted_columnspec['attribute'];
-    }
-
-    if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
-        $attribute = 'on update CURRENT_TIMESTAMP';
-    }
-
-    if (isset($submit_attribute) && $submit_attribute != false) {
-        $attribute = $submit_attribute;
-    }
-
-    // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
-    // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
-    // the latter.
-    if (PMA_MYSQL_INT_VERSION < 50025
-        && isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
-    ) {
-        $row['Null'] = '';
-    }
-
-    // MySQL 4.1.2+ TIMESTAMP options
-    // (if on_update_current_timestamp is set, then it's TRUE)
-    if (isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
-    ) {
-        $attribute = 'on update CURRENT_TIMESTAMP';
-    }
-    if ((isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
-        || (isset($submit_default_current_timestamp)
-        && $submit_default_current_timestamp)
-    ) {
-        $default_current_timestamp = true;
-    } else {
-        $default_current_timestamp = false;
-    }
-
-    $attribute_types = $GLOBALS['PMA_Types']->getAttributes();
-    $cnt_attribute_types = count($attribute_types);
-    for ($j = 0; $j < $cnt_attribute_types; $j++) {
-        $content_cells[$i][$ci]
-            .= '                <option value="' . $attribute_types[$j] . '"';
-        if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= '>' . $attribute_types[$j] . '</option>';
-    }
-
-    $content_cells[$i][$ci] .= '</select>';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset,
+        isset($extracted_columnspec) ? $extracted_columnspec : null,
+        isset($row) ? $row : null,
+        isset($submit_attribute) ? $submit_attribute : null,
+        isset($analyzed_sql) ? $analyzed_sql : null,
+        isset($submit_default_current_timestamp)
+            ? $submit_default_current_timestamp : null
+    );
     $ci++;
 
     // column NULL
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 16e956e9b9..56ce350ebe 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -878,4 +878,83 @@ function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
     
     return $html;
 }
+
+/**
+ * Function to get html for column attribute
+ * 
+ * @param int   $i                                field number
+ * @param int   $ci                               cell index
+ * @param int   $ci_offset                        cell index offset
+ * @param array $extracted_columnspec             extracted column
+ * @param array $row                              row
+ * @param bool  $submit_attribute                 submit attribute
+ * @param array $analyzed_sql                     analyzed sql
+ * @param bool  $submit_default_current_timestamp submit default current time stamp
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspec,
+    $row, $submit_attribute, $analyzed_sql, $submit_default_current_timestamp
+) {
+    $html = '<select style="font-size: 70%;"'
+        . ' name="field_attribute[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
+
+    $attribute     = '';
+    if (isset($extracted_columnspec)) {
+        $attribute = $extracted_columnspec['attribute'];
+    }
+
+    if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
+        $attribute = 'on update CURRENT_TIMESTAMP';
+    }
+
+    if (isset($submit_attribute) && $submit_attribute != false) {
+        $attribute = $submit_attribute;
+    }
+
+    // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
+    // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
+    // the latter.
+    if (PMA_MYSQL_INT_VERSION < 50025
+        && isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
+        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
+        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
+    ) {
+        $row['Null'] = '';
+    }
+
+    // MySQL 4.1.2+ TIMESTAMP options
+    // (if on_update_current_timestamp is set, then it's TRUE)
+    if (isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
+    ) {
+        $attribute = 'on update CURRENT_TIMESTAMP';
+    }
+    if ((isset($row['Field'])
+        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
+        || (isset($submit_default_current_timestamp)
+        && $submit_default_current_timestamp)
+    ) {
+        $default_current_timestamp = true;
+    } else {
+        $default_current_timestamp = false;
+    }
+
+    $attribute_types = $GLOBALS['PMA_Types']->getAttributes();
+    $cnt_attribute_types = count($attribute_types);
+    for ($j = 0; $j < $cnt_attribute_types; $j++) {
+        $html
+            .= '                <option value="' . $attribute_types[$j] . '"';
+        if (strtoupper($attribute) == strtoupper($attribute_types[$j])) {
+            $html .= ' selected="selected"';
+        }
+        $html .= '>' . $attribute_types[$j] . '</option>';
+    }
+
+    $html .= '</select>';
+    
+    return $html;
+}
 ?>

From 507ca058a456999929a5561639088a53ad270241 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 23:08:51 +0530
Subject: [PATCH 15/27] added method PMA_getHtmlForColumnCollation

---
 libraries/tbl_columns_definition_form.inc.php |  7 ++-----
 libraries/tbl_columns_definition_form.lib.php | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 7127f7f7ea..382ce156a2 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -234,12 +234,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column collation
-    $tmp_collation          = empty($row['Collation']) ? null : $row['Collation'];
-    $content_cells[$i][$ci] = PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
-        'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnCollation(
+        $i, $ci, $ci_offset, $row
     );
-    unset($tmp_collation);
     $ci++;
 
     // column attribute
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 56ce350ebe..ea565ff4b8 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -957,4 +957,25 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
     
     return $html;
 }
+
+/**
+ * Function to get html for column collation
+ * 
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
+{
+    $tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
+    $html = PMA_generateCharsetDropdownBox(
+        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
+        'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
+    );
+    
+    return $html;
+}
 ?>

From adec74d49f53106cf69f5f938f1583d6e2dab2f8 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 23:15:25 +0530
Subject: [PATCH 16/27] added method PMA_getHtmlForColumnLength

---
 libraries/tbl_columns_definition_form.inc.php | 18 ++---------
 libraries/tbl_columns_definition_form.lib.php | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 382ce156a2..58bbbee33e 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -164,21 +164,9 @@ for ($i = 0; $i < $num_fields; $i++) {
     }
 
     // column length
-    $length_to_display = $length;
-
-    $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_length[' . $i . ']" size="'
-        . $length_values_input_size . '"' . ' value="' . htmlspecialchars(
-            $length_to_display
-        )
-        . '"'
-        . ' class="textfield" />'
-        . '<p class="enum_notice" id="enum_notice_' . $i . '_' . ($ci - $ci_offset)
-        . '">';
-    $content_cells[$i][$ci] .= __('ENUM or SET data too long?')
-        . '<a href="#" class="open_enum_editor"> '
-        . __('Get more editing space') . '</a>'
-        . '</p>';
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnLength(
+        $i, $ci, $ci_offset, $length_values_input_size, $length
+    );
     $ci++;
 
     // column default
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ea565ff4b8..ea25cda3f6 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -978,4 +978,35 @@ function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
     
     return $html;
 }
+
+/**
+ * Function get html for column length
+ * 
+ * @param int $i                        field number
+ * @param int $ci                       cell index
+ * @param int $ci_offset                cell index offset
+ * @param int $length_values_input_size length values input size
+ * @param int $length_to_display        length to disply
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnLength($i, $ci, $ci_offset, $length_values_input_size,
+    $length_to_display
+) {
+    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_length[' . $i . ']" size="'
+        . $length_values_input_size . '"' . ' value="' . htmlspecialchars(
+            $length_to_display
+        )
+        . '"'
+        . ' class="textfield" />'
+        . '<p class="enum_notice" id="enum_notice_' . $i . '_' . ($ci - $ci_offset)
+        . '">';
+    $html .= __('ENUM or SET data too long?')
+        . '<a href="#" class="open_enum_editor"> '
+        . __('Get more editing space') . '</a>'
+        . '</p>';
+    
+    return $html;
+}
 ?>

From b629d5c6dde7b00f4e2487ea654c1116ede79b7c Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 23:31:49 +0530
Subject: [PATCH 17/27] added method PMA_getHtmlForColumnDefault

---
 libraries/tbl_columns_definition_form.inc.php | 50 ++-------------
 libraries/tbl_columns_definition_form.lib.php | 61 +++++++++++++++++++
 2 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 58bbbee33e..3a075fbabd 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -121,8 +121,7 @@ for ($i = 0; $i < $num_fields; $i++) {
     // column name
     $content_cells[$i][$ci] = PMA_getHtmlForColumnName(
         $i, $ci, $ci_offset, isset($row) ? $row : null
-    );
-    
+    );    
     $ci++;
 
     if (empty($row['Type'])) {
@@ -170,55 +169,16 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column default
-
     // old column default
     if ($is_backup) {
         $_form_params['field_default_orig[' . $i . ']']
             = (isset($row['Default']) ? $row['Default'] : '');
     }
-
-    // here we put 'NONE' as the default value of drop-down; otherwise
-    // users would have problems if they forget to enter the default
-    // value (example, for an INT)
-    $default_options = array(
-        'NONE'              =>  _pgettext('for default', 'None'),
-        'USER_DEFINED'      =>  __('As defined:'),
-        'NULL'              => 'NULL',
-        'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP',
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnDefault($i, $ci, $ci_offset,
+        isset($type_upper) ? $type_upper : null,
+        isset($default_current_timestamp) ? $default_current_timestamp : null,
+        isset($row) ? $row : null
     );
-
-    // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value
-    if ($type_upper == 'TIMESTAMP'
-        && ! empty($default_current_timestamp)
-        && isset($row['Default'])
-    ) {
-        $row['Default'] = '';
-    }
-
-    if ($type_upper == 'BIT') {
-        $row['DefaultValue']
-            = PMA_Util::convertBitDefaultValue($row['DefaultValue']);
-    }
-
-    $content_cells[$i][$ci] = '<select name="field_default_type[' . $i
-        . ']" id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '" class="default_type">';
-    foreach ($default_options as $key => $value) {
-        $content_cells[$i][$ci] .= '<option value="' . $key . '"';
-        // is only set when we go back to edit a field's structure
-        if (isset($row['DefaultType']) && $row['DefaultType'] == $key) {
-            $content_cells[$i][$ci] .= ' selected="selected"';
-        }
-        $content_cells[$i][$ci] .= ' >' . $value . '</option>';
-    }
-    $content_cells[$i][$ci] .= '</select>';
-    $content_cells[$i][$ci] .= '<br />';
-    $content_cells[$i][$ci] .= '<input type="text"'
-        . ' name="field_default_value[' . $i . ']" size="12"'
-        . ' value="' . (isset($row['DefaultValue'])
-            ? htmlspecialchars($row['DefaultValue'])
-            : '') . '"'
-        . ' class="textfield default_value" />';
     $ci++;
 
     // column collation
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ea25cda3f6..d1ca2c2818 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -1009,4 +1009,65 @@ function PMA_getHtmlForColumnLength($i, $ci, $ci_offset, $length_values_input_si
     
     return $html;
 }
+
+/**
+ * Function to get html for the default column
+ * 
+ * @param int    $i                         field number
+ * @param int    $ci                        cell index
+ * @param int    $ci_offset                 cell index offset
+ * @param string $type_upper                type upper
+ * @param string $default_current_timestamp default current timestamp
+ * @param array  $row                       row
+ * 
+ * @return string
+ */
+function PMA_getHtmlForColumnDefault($i, $ci, $ci_offset, $type_upper,
+    $default_current_timestamp, $row
+) {
+    // here we put 'NONE' as the default value of drop-down; otherwise
+    // users would have problems if they forget to enter the default
+    // value (example, for an INT)
+    $default_options = array(
+        'NONE'              =>  _pgettext('for default', 'None'),
+        'USER_DEFINED'      =>  __('As defined:'),
+        'NULL'              => 'NULL',
+        'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP',
+    );
+
+    // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value
+    if ($type_upper == 'TIMESTAMP'
+        && ! empty($default_current_timestamp)
+        && isset($row['Default'])
+    ) {
+        $row['Default'] = '';
+    }
+
+    if ($type_upper == 'BIT') {
+        $row['DefaultValue']
+            = PMA_Util::convertBitDefaultValue($row['DefaultValue']);
+    }
+
+    $html = '<select name="field_default_type[' . $i
+        . ']" id="field_' . $i . '_' . ($ci - $ci_offset)
+        . '" class="default_type">';
+    foreach ($default_options as $key => $value) {
+        $html .= '<option value="' . $key . '"';
+        // is only set when we go back to edit a field's structure
+        if (isset($row['DefaultType']) && $row['DefaultType'] == $key) {
+            $html .= ' selected="selected"';
+        }
+        $html .= ' >' . $value . '</option>';
+    }
+    $html .= '</select>';
+    $html .= '<br />';
+    $html .= '<input type="text"'
+        . ' name="field_default_value[' . $i . ']" size="12"'
+        . ' value="' . (isset($row['DefaultValue'])
+            ? htmlspecialchars($row['DefaultValue'])
+            : '') . '"'
+        . ' class="textfield default_value" />';
+    
+    return $html;
+}
 ?>

From f9a43b7ddc5b2edea05463d86d11858744d20452 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Mon, 5 Aug 2013 23:43:00 +0530
Subject: [PATCH 18/27] phpcs errors corrected

---
 libraries/tbl_columns_definition_form.inc.php | 16 +++--
 libraries/tbl_columns_definition_form.lib.php | 68 ++++++++++---------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 3a075fbabd..529b27ab9f 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -174,7 +174,8 @@ for ($i = 0; $i < $num_fields; $i++) {
         $_form_params['field_default_orig[' . $i . ']']
             = (isset($row['Default']) ? $row['Default'] : '');
     }
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnDefault($i, $ci, $ci_offset,
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnDefault(
+        $i, $ci, $ci_offset,
         isset($type_upper) ? $type_upper : null,
         isset($default_current_timestamp) ? $default_current_timestamp : null,
         isset($row) ? $row : null
@@ -188,13 +189,14 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column attribute
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset,
+    $content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute(
+        $i, $ci, $ci_offset,
         isset($extracted_columnspec) ? $extracted_columnspec : null,
         isset($row) ? $row : null,
         isset($submit_attribute) ? $submit_attribute : null,
         isset($analyzed_sql) ? $analyzed_sql : null,
         isset($submit_default_current_timestamp)
-            ? $submit_default_current_timestamp : null
+        ? $submit_default_current_timestamp : null
     );
     $ci++;
 
@@ -208,14 +210,14 @@ for ($i = 0; $i < $num_fields; $i++) {
     // See my other comment about  this 'if'.
     if (!$is_backup) {
         $content_cells[$i][$ci] = PMA_getHtmlForColumnIndexes(
-                $i, $ci, $ci_offset, $row
+            $i, $ci, $ci_offset, $row
         );
         $ci++;
     } // end if ($action ==...)
 
     // column auto_increment
     $content_cells[$i][$ci] = PMA_getHtmlForColumnAutoIncrement(
-            $i, $ci, $ci_offset, $row
+        $i, $ci, $ci_offset, $row
     );
     $ci++;
 
@@ -251,8 +253,8 @@ for ($i = 0; $i < $num_fields; $i++) {
 
         // column Transformation options
         $content_cells[$i][$ci] = PMA_getHtmlForTransformationOption(
-                $i, $ci, $ci_offset, isset($row) ? $row : null,
-                isset($mime_map) ? $mime_map : null
+            $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 d1ca2c2818..1ca3bf27ba 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -519,29 +519,29 @@ function PMA_handleRegeneration($submit_fulltext, $comments_map, $mime_map)
 function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
 {
     switch ($row['Default']) {
-        case null:
-            if ($row['Null'] == 'YES') {
-                $row['DefaultType']  = 'NULL';
-                $row['DefaultValue'] = '';
-                // SHOW FULL COLUMNS does not report the case
-                // when there is a DEFAULT value which is empty so we need to use the
-                // results of SHOW CREATE TABLE
-            } elseif ($isDefault) {
-                $row['DefaultType']  = 'USER_DEFINED';
-                $row['DefaultValue'] = $row['Default'];
-            } else {
-                $row['DefaultType']  = 'NONE';
-                $row['DefaultValue'] = '';
-            }
-            break;
-        case 'CURRENT_TIMESTAMP':
-            $row['DefaultType']  = 'CURRENT_TIMESTAMP';
+    case null:
+        if ($row['Null'] == 'YES') {
+            $row['DefaultType']  = 'NULL';
             $row['DefaultValue'] = '';
-            break;
-        default:
+            // SHOW FULL COLUMNS does not report the case
+            // when there is a DEFAULT value which is empty so we need to use the
+            // results of SHOW CREATE TABLE
+        } elseif ($isDefault) {
             $row['DefaultType']  = 'USER_DEFINED';
             $row['DefaultValue'] = $row['Default'];
-            break;
+        } else {
+            $row['DefaultType']  = 'NONE';
+            $row['DefaultValue'] = '';
+        }
+        break;
+    case 'CURRENT_TIMESTAMP':
+        $row['DefaultType']  = 'CURRENT_TIMESTAMP';
+        $row['DefaultValue'] = '';
+        break;
+    default:
+        $row['DefaultType']  = 'USER_DEFINED';
+        $row['DefaultValue'] = $row['Default'];
+        break;
     }
     
     return $row;
@@ -550,10 +550,10 @@ function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
 /**
  * Function to get html for the column name
  * 
- * @param int $i         field number
- * @param int $ci        cell index
- * @param int $ci_offset cell index offset
- * @param array $row     row
+ * @param int   $i         field number
+ * @param int   $ci        cell index
+ * @param int   $ci_offset cell index offset
+ * @param array $row       row
  * 
  * @return string
  */
@@ -572,10 +572,11 @@ function PMA_getHtmlForColumnName($i, $ci, $ci_offset, $row)
 /**
  * Function to get html for the column type
  * 
- * @param int $i         field number
- * @param int $ci        cell index
- * @param int $ci_offset cell index offset
- * 
+ * @param int    $i          field number
+ * @param int    $ci         cell index
+ * @param int    $ci_offset  cell index offset
+ * @param string $type_upper type inuppercase
+ *  
  * @return string
  */
 function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
@@ -916,11 +917,12 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
     // here, we have a TIMESTAMP that SHOW FULL COLUMNS reports as having the
     // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
     // the latter.
+    $create_table_fields = $analyzed_sql[0]['create_table_fields'];
     if (PMA_MYSQL_INT_VERSION < 50025
         && isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['type'])
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['type'] == 'TIMESTAMP'
-        && $analyzed_sql[0]['create_table_fields'][$row['Field']]['timestamp_not_null'] == true
+        && isset($create_table_fields[$row['Field']]['type'])
+        && $create_table_fields[$row['Field']]['type'] == 'TIMESTAMP'
+        && $create_table_fields[$row['Field']]['timestamp_not_null'] == true
     ) {
         $row['Null'] = '';
     }
@@ -928,12 +930,12 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
     // MySQL 4.1.2+ TIMESTAMP options
     // (if on_update_current_timestamp is set, then it's TRUE)
     if (isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['on_update_current_timestamp'])
+        && isset($create_table_fields[$row['Field']]['on_update_current_timestamp'])
     ) {
         $attribute = 'on update CURRENT_TIMESTAMP';
     }
     if ((isset($row['Field'])
-        && isset($analyzed_sql[0]['create_table_fields'][$row['Field']]['default_current_timestamp']))
+        && isset($create_table_fields[$row['Field']]['default_current_timestamp']))
         || (isset($submit_default_current_timestamp)
         && $submit_default_current_timestamp)
     ) {

From 6d1788e455e2ddfcc9ab6be2fcc300df7270da54 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 10:05:34 +0530
Subject: [PATCH 19/27] added missing parameter

---
 libraries/tbl_columns_definition_form.lib.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 1ca3bf27ba..c8c07c7797 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -366,11 +366,12 @@ function PMA_getMoveColumns($db, $table)
 /**
  * Function to get row data for regenerating previous when error occured.
  *
+ * @param int   $i               coulmn number
  * @param array $submit_fulltext submit full text
  *
  * @return array
  */
-function PMA_getRowDataForRegeneration($submit_fulltext)
+function PMA_getRowDataForRegeneration($i, $submit_fulltext)
 {
     $row['Field'] = isset($_REQUEST['field_name'][$i])
         ? $_REQUEST['field_name'][$i]
@@ -442,9 +443,11 @@ function PMA_getRowDataForRegeneration($submit_fulltext)
 /**
  * Function to get submit properties for regenerating previous when error occured.
  *
+ * @param int $i coulmn number
+ *
  * @return array
  */
-function PMA_getSubmitPropertiesForRegeneration()
+function PMA_getSubmitPropertiesForRegeneration($i)
 {
     $submit_length
         = (isset($_REQUEST['field_length'][$i])
@@ -469,13 +472,14 @@ function PMA_getSubmitPropertiesForRegeneration()
  * An error happened with previous inputs, so we will restore the data
  * to embed it once again in this form.
  *
+ * @param int   $i               coulmn number
  * @param array $submit_fulltext submit full text
  * @param array $comments_map    comments map
  * @param array $mime_map        mime map
  *
  * @return array
  */
-function PMA_handleRegeneration($submit_fulltext, $comments_map, $mime_map)
+function PMA_handleRegeneration($i, $submit_fulltext, $comments_map, $mime_map)
 {
     $row = PMA_getRowDataForRegeneration(
         isset($submit_fulltext) ? $submit_fulltext : null

From da87506972c1ec69389e7c2db7bba9281608a7eb Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 11:07:44 +0530
Subject: [PATCH 20/27] renamed variables to better reflect their purpose.

---
 libraries/tbl_columns_definition_form.inc.php |  96 ++--
 libraries/tbl_columns_definition_form.lib.php | 440 +++++++++---------
 2 files changed, 273 insertions(+), 263 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 529b27ab9f..7c9a150464 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -80,26 +80,26 @@ if (isset($field_fulltext) && is_array($field_fulltext)) {
     }
 }
 
-for ($i = 0; $i < $num_fields; $i++) {
+for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
     if (! empty($regenerate)) {
-        list($row, $submit_length, $submit_attribute,
+        list($columnMeta, $submit_length, $submit_attribute,
             $submit_default_current_timestamp, $comments_map, $mime_map)
                 = PMA_handleRegeneration(
                     isset($available_mime) ? $mime_map : null,
                     $comments_map, $mime_map
                 ); 
-    } elseif (isset($fields_meta[$i])) {
-        $row = PMA_getRowDataForFieldsMetaSet(
-            $fields_meta[$i], isset($analyzed_sql[0]['create_table_fields']
-            [$fields_meta[$i]['Field']]['default_value'])
+    } elseif (isset($fields_meta[$columnNumber])) {
+        $columnMeta = PMA_getRowDataForFieldsMetaSet(
+            $fields_meta[$columnNumber], isset($analyzed_sql[0]['create_table_fields']
+            [$fields_meta[$columnNumber]['Field']]['default_value'])
         );
     }
 
-    if (isset($row['Type'])) {
-        $extracted_columnspec = PMA_Util::extractColumnSpec($row['Type']);
+    if (isset($columnMeta['Type'])) {
+        $extracted_columnspec = PMA_Util::extractColumnSpec($columnMeta['Type']);
         if ($extracted_columnspec['type'] == 'bit') {
-            $row['Default']
-                = PMA_Util::convertBitDefaultValue($row['Default']);
+            $columnMeta['Default']
+                = PMA_Util::convertBitDefaultValue($columnMeta['Default']);
         }
     }
     
@@ -111,22 +111,22 @@ for ($i = 0; $i < $num_fields; $i++) {
 
     // old column name
     if ($is_backup) {
-        if (isset($row['Field'])) {
-            $_form_params['field_orig[' . $i . ']'] = $row['Field'];
+        if (isset($columnMeta['Field'])) {
+            $_form_params['field_orig[' . $columnNumber . ']'] = $columnMeta['Field'];
         } else {
-            $_form_params['field_orig[' . $i . ']'] = '';
+            $_form_params['field_orig[' . $columnNumber . ']'] = '';
         }
     }
 
     // column name
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnName(
-        $i, $ci, $ci_offset, isset($row) ? $row : null
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnName(
+        $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null
     );    
     $ci++;
 
-    if (empty($row['Type'])) {
+    if (empty($columnMeta['Type'])) {
         // creating a column
-        $row['Type'] = '';
+        $columnMeta['Type'] = '';
         $type        = '';
         $length = '';
     } else {
@@ -151,48 +151,48 @@ for ($i = 0; $i < $num_fields; $i++) {
     $type_upper = strtoupper($type);
     
     // column type    
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnType(
-        $i, $ci, $ci_offset, $type_upper
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnType(
+        $columnNumber, $ci, $ci_offset, $type_upper
     );
     
     $ci++;
 
     // old column length
     if ($is_backup) {
-        $_form_params['field_length_orig[' . $i . ']'] = $length;
+        $_form_params['field_length_orig[' . $columnNumber . ']'] = $length;
     }
 
     // column length
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnLength(
-        $i, $ci, $ci_offset, $length_values_input_size, $length
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnLength(
+        $columnNumber, $ci, $ci_offset, $length_values_input_size, $length
     );
     $ci++;
 
     // column default
     // old column default
     if ($is_backup) {
-        $_form_params['field_default_orig[' . $i . ']']
-            = (isset($row['Default']) ? $row['Default'] : '');
+        $_form_params['field_default_orig[' . $columnNumber . ']']
+            = (isset($columnMeta['Default']) ? $columnMeta['Default'] : '');
     }
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnDefault(
-        $i, $ci, $ci_offset,
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnDefault(
+        $columnNumber, $ci, $ci_offset,
         isset($type_upper) ? $type_upper : null,
         isset($default_current_timestamp) ? $default_current_timestamp : null,
-        isset($row) ? $row : null
+        isset($columnMeta) ? $columnMeta : null
     );
     $ci++;
 
     // column collation
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnCollation(
-        $i, $ci, $ci_offset, $row
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnCollation(
+        $columnNumber, $ci, $ci_offset, $columnMeta
     );
     $ci++;
 
     // column attribute
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnAttribute(
-        $i, $ci, $ci_offset,
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnAttribute(
+        $columnNumber, $ci, $ci_offset,
         isset($extracted_columnspec) ? $extracted_columnspec : null,
-        isset($row) ? $row : null,
+        isset($columnMeta) ? $columnMeta : null,
         isset($submit_attribute) ? $submit_attribute : null,
         isset($analyzed_sql) ? $analyzed_sql : null,
         isset($submit_default_current_timestamp)
@@ -201,36 +201,36 @@ for ($i = 0; $i < $num_fields; $i++) {
     $ci++;
 
     // column NULL
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnNull(
-        $i, $ci, $ci_offset, isset($row) ? $row : null
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnNull(
+        $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null
     );
     $ci++;
 
     // column indexes
     // See my other comment about  this 'if'.
     if (!$is_backup) {
-        $content_cells[$i][$ci] = PMA_getHtmlForColumnIndexes(
-            $i, $ci, $ci_offset, $row
+        $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnIndexes(
+            $columnNumber, $ci, $ci_offset, $columnMeta
         );
         $ci++;
     } // end if ($action ==...)
 
     // column auto_increment
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnAutoIncrement(
-        $i, $ci, $ci_offset, $row
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnAutoIncrement(
+        $columnNumber, $ci, $ci_offset, $columnMeta
     );
     $ci++;
 
     // column comments
-    $content_cells[$i][$ci] = PMA_getHtmlForColumnComment(
-        $i, $ci, $ci_offset, isset($row) ? $row : null, $comments_map
+    $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnComment(
+        $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null, $comments_map
     );
     $ci++;
 
     // move column
     if (isset($fields_meta)) {
-        $content_cells[$i][$ci] = PMA_getHtmlForMoveColumn(
-            $i, $ci, $ci_offset, $move_columns, $row
+        $content_cells[$columnNumber][$ci] = PMA_getHtmlForMoveColumn(
+            $columnNumber, $ci, $ci_offset, $move_columns, $columnMeta
         );
         $ci++;
     }
@@ -240,20 +240,20 @@ for ($i = 0; $i < $num_fields; $i++) {
         && $cfgRelation['commwork']
     ) {
         // Column Mime-type
-        $content_cells[$i][$ci] = PMA_getHtmlForMimeType(
-            $i, $ci, $ci_offset, $available_mime, $row, $mime_map
+        $content_cells[$columnNumber][$ci] = PMA_getHtmlForMimeType(
+            $columnNumber, $ci, $ci_offset, $available_mime, $columnMeta, $mime_map
         );
         $ci++;
 
         // Column Browser transformation
-        $content_cells[$i][$ci] = PMA_getHtmlForBrowserTransformation(
-            $i, $ci, $ci_offset, $available_mime, $row, $mime_map
+        $content_cells[$columnNumber][$ci] = PMA_getHtmlForBrowserTransformation(
+            $columnNumber, $ci, $ci_offset, $available_mime, $columnMeta, $mime_map
         );
         $ci++;
 
         // column Transformation options
-        $content_cells[$i][$ci] = PMA_getHtmlForTransformationOption(
-            $i, $ci, $ci_offset, isset($row) ? $row : null,
+        $content_cells[$columnNumber][$ci] = PMA_getHtmlForTransformationOption(
+            $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null,
             isset($mime_map) ? $mime_map : null
         );
     }
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index c8c07c7797..db5e757dae 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -366,100 +366,100 @@ function PMA_getMoveColumns($db, $table)
 /**
  * Function to get row data for regenerating previous when error occured.
  *
- * @param int   $i               coulmn number
+ * @param int   $columnNumber    coulmn number
  * @param array $submit_fulltext submit full text
  *
  * @return array
  */
-function PMA_getRowDataForRegeneration($i, $submit_fulltext)
+function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
 {
-    $row['Field'] = isset($_REQUEST['field_name'][$i])
-        ? $_REQUEST['field_name'][$i]
+    $columnMeta['Field'] = isset($_REQUEST['field_name'][$columnNumber])
+        ? $_REQUEST['field_name'][$columnNumber]
         : false;
-    $row['Type'] = isset($_REQUEST['field_type'][$i])
-        ? $_REQUEST['field_type'][$i]
+    $columnMeta['Type'] = isset($_REQUEST['field_type'][$columnNumber])
+        ? $_REQUEST['field_type'][$columnNumber]
         : false;
-    $row['Collation'] = isset($_REQUEST['field_collation'][$i])
-        ? $_REQUEST['field_collation'][$i]
+    $columnMeta['Collation'] = isset($_REQUEST['field_collation'][$columnNumber])
+        ? $_REQUEST['field_collation'][$columnNumber]
         : '';
-    $row['Null'] = isset($_REQUEST['field_null'][$i])
-        ? $_REQUEST['field_null'][$i]
+    $columnMeta['Null'] = isset($_REQUEST['field_null'][$columnNumber])
+        ? $_REQUEST['field_null'][$columnNumber]
         : '';
 
-    if (isset($_REQUEST['field_key'][$i])
-        && $_REQUEST['field_key'][$i] == 'primary_' . $i
+    if (isset($_REQUEST['field_key'][$columnNumber])
+        && $_REQUEST['field_key'][$columnNumber] == 'primary_' . $columnNumber
     ) {
-        $row['Key'] = 'PRI';
-    } elseif (isset($_REQUEST['field_key'][$i])
-        && $_REQUEST['field_key'][$i] == 'index_' . $i
+        $columnMeta['Key'] = 'PRI';
+    } elseif (isset($_REQUEST['field_key'][$columnNumber])
+        && $_REQUEST['field_key'][$columnNumber] == 'index_' . $columnNumber
     ) {
-        $row['Key'] = 'MUL';
-    } elseif (isset($_REQUEST['field_key'][$i])
-        && $_REQUEST['field_key'][$i] == 'unique_' . $i
+        $columnMeta['Key'] = 'MUL';
+    } elseif (isset($_REQUEST['field_key'][$columnNumber])
+        && $_REQUEST['field_key'][$columnNumber] == 'unique_' . $columnNumber
     ) {
-        $row['Key'] = 'UNI';
-    } elseif (isset($_REQUEST['field_key'][$i])
-        && $_REQUEST['field_key'][$i] == 'fulltext_' . $i
+        $columnMeta['Key'] = 'UNI';
+    } elseif (isset($_REQUEST['field_key'][$columnNumber])
+        && $_REQUEST['field_key'][$columnNumber] == 'fulltext_' . $columnNumber
     ) {
-        $row['Key'] = 'FULLTEXT';
+        $columnMeta['Key'] = 'FULLTEXT';
     } else {
-        $row['Key'] = '';
+        $columnMeta['Key'] = '';
     }
 
     // put None in the drop-down for Default, when someone adds a field
-    $row['DefaultType'] = isset($_REQUEST['field_default_type'][$i])
-        ? $_REQUEST['field_default_type'][$i]
+    $columnMeta['DefaultType'] = isset($_REQUEST['field_default_type'][$columnNumber])
+        ? $_REQUEST['field_default_type'][$columnNumber]
         : 'NONE';
-    $row['DefaultValue'] = isset($_REQUEST['field_default_value'][$i])
-        ? $_REQUEST['field_default_value'][$i]
+    $columnMeta['DefaultValue'] = isset($_REQUEST['field_default_value'][$columnNumber])
+        ? $_REQUEST['field_default_value'][$columnNumber]
         : '';
 
-    switch ($row['DefaultType']) {
+    switch ($columnMeta['DefaultType']) {
     case 'NONE' :
-        $row['Default'] = null;
+        $columnMeta['Default'] = null;
         break;
     case 'USER_DEFINED' :
-        $row['Default'] = $row['DefaultValue'];
+        $columnMeta['Default'] = $columnMeta['DefaultValue'];
         break;
     case 'NULL' :
     case 'CURRENT_TIMESTAMP' :
-        $row['Default'] = $row['DefaultType'];
+        $columnMeta['Default'] = $columnMeta['DefaultType'];
         break;
     }
 
-    $row['Extra']
-        = (isset($_REQUEST['field_extra'][$i])
-        ? $_REQUEST['field_extra'][$i]
+    $columnMeta['Extra']
+        = (isset($_REQUEST['field_extra'][$columnNumber])
+        ? $_REQUEST['field_extra'][$columnNumber]
         : false);
-    $row['Comment']
-        = (isset($submit_fulltext[$i])
-            && ($submit_fulltext[$i] == $i)
+    $columnMeta['Comment']
+        = (isset($submit_fulltext[$columnNumber])
+            && ($submit_fulltext[$columnNumber] == $columnNumber)
         ? 'FULLTEXT'
         : false);
 
-    return $row;
+    return $columnMeta;
 }
 
 /**
  * Function to get submit properties for regenerating previous when error occured.
  *
- * @param int $i coulmn number
+ * @param int $columnNumber coulmn number
  *
  * @return array
  */
-function PMA_getSubmitPropertiesForRegeneration($i)
+function PMA_getSubmitPropertiesForRegeneration($columnNumber)
 {
     $submit_length
-        = (isset($_REQUEST['field_length'][$i])
-        ? $_REQUEST['field_length'][$i]
+        = (isset($_REQUEST['field_length'][$columnNumber])
+        ? $_REQUEST['field_length'][$columnNumber]
         : false);
     $submit_attribute
-        = (isset($_REQUEST['field_attribute'][$i])
-        ? $_REQUEST['field_attribute'][$i]
+        = (isset($_REQUEST['field_attribute'][$columnNumber])
+        ? $_REQUEST['field_attribute'][$columnNumber]
         : false);
 
     $submit_default_current_timestamp
-        = (isset($_REQUEST['field_default_current_timestamp'][$i])
+        = (isset($_REQUEST['field_default_current_timestamp'][$columnNumber])
         ? true
         : false);
 
@@ -472,42 +472,44 @@ function PMA_getSubmitPropertiesForRegeneration($i)
  * An error happened with previous inputs, so we will restore the data
  * to embed it once again in this form.
  *
- * @param int   $i               coulmn number
+ * @param int   $columnNumber    coulmn number
  * @param array $submit_fulltext submit full text
  * @param array $comments_map    comments map
  * @param array $mime_map        mime map
  *
  * @return array
  */
-function PMA_handleRegeneration($i, $submit_fulltext, $comments_map, $mime_map)
-{
-    $row = PMA_getRowDataForRegeneration(
+function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
+    $mime_map
+) {
+    $columnMeta = PMA_getRowDataForRegeneration(
         isset($submit_fulltext) ? $submit_fulltext : null
     );
 
     list($submit_length, $submit_attribute, $submit_default_current_timestamp)
         = PMA_getSubmitPropertiesForRegeneration();
 
-    if (isset($_REQUEST['field_comments'][$i])) {
-        $comments_map[$row['Field']] = $_REQUEST['field_comments'][$i];
+    if (isset($_REQUEST['field_comments'][$columnNumber])) {
+        $comments_map[$columnMeta['Field']] = $_REQUEST['field_comments'][$columnNumber];
     }
 
-    if (isset($_REQUEST['field_mimetype'][$i])) {
-        $mime_map[$row['Field']]['mimetype'] = $_REQUEST['field_mimetype'][$i];
+    if (isset($_REQUEST['field_mimetype'][$columnNumber])) {
+        $mime_map[$columnMeta['Field']]['mimetype']
+            = $_REQUEST['field_mimetype'][$columnNumber];
     }
 
-    if (isset($_REQUEST['field_transformation'][$i])) {
-        $mime_map[$row['Field']]['transformation']
-            = $_REQUEST['field_transformation'][$i];
+    if (isset($_REQUEST['field_transformation'][$columnNumber])) {
+        $mime_map[$columnMeta['Field']]['transformation']
+            = $_REQUEST['field_transformation'][$columnNumber];
     }
 
-    if (isset($_REQUEST['field_transformation_options'][$i])) {
-        $mime_map[$row['Field']]['transformation_options']
-            = $_REQUEST['field_transformation_options'][$i];
+    if (isset($_REQUEST['field_transformation_options'][$columnNumber])) {
+        $mime_map[$columnMeta['Field']]['transformation_options']
+            = $_REQUEST['field_transformation_options'][$columnNumber];
     }
 
     return array(
-        $row, $submit_length, $submit_attribute, $submit_default_current_timestamp,
+        $columnMeta, $submit_length, $submit_attribute, $submit_default_current_timestamp,
         $comments_map, $mime_map
     );
 }
@@ -515,59 +517,60 @@ function PMA_handleRegeneration($i, $submit_fulltext, $comments_map, $mime_map)
 /**
  * Function to get row data for $fields_meta set
  * 
- * @param array $row       row
- * @param bool  $isDefault whether the row value is default
+ * @param array $columnMeta column meta
+ * @param bool  $isDefault  whether the row value is default
  * 
  * @return array
  */
-function PMA_getRowDataForFieldsMetaSet($row, $isDefault)
+function PMA_getRowDataForFieldsMetaSet($columnMeta, $isDefault)
 {
-    switch ($row['Default']) {
+    switch ($columnMeta['Default']) {
     case null:
-        if ($row['Null'] == 'YES') {
-            $row['DefaultType']  = 'NULL';
-            $row['DefaultValue'] = '';
+        if ($columnMeta['Null'] == 'YES') {
+            $columnMeta['DefaultType']  = 'NULL';
+            $columnMeta['DefaultValue'] = '';
             // SHOW FULL COLUMNS does not report the case
             // when there is a DEFAULT value which is empty so we need to use the
             // results of SHOW CREATE TABLE
         } elseif ($isDefault) {
-            $row['DefaultType']  = 'USER_DEFINED';
-            $row['DefaultValue'] = $row['Default'];
+            $columnMeta['DefaultType']  = 'USER_DEFINED';
+            $columnMeta['DefaultValue'] = $columnMeta['Default'];
         } else {
-            $row['DefaultType']  = 'NONE';
-            $row['DefaultValue'] = '';
+            $columnMeta['DefaultType']  = 'NONE';
+            $columnMeta['DefaultValue'] = '';
         }
         break;
     case 'CURRENT_TIMESTAMP':
-        $row['DefaultType']  = 'CURRENT_TIMESTAMP';
-        $row['DefaultValue'] = '';
+        $columnMeta['DefaultType']  = 'CURRENT_TIMESTAMP';
+        $columnMeta['DefaultValue'] = '';
         break;
     default:
-        $row['DefaultType']  = 'USER_DEFINED';
-        $row['DefaultValue'] = $row['Default'];
+        $columnMeta['DefaultType']  = 'USER_DEFINED';
+        $columnMeta['DefaultValue'] = $columnMeta['Default'];
         break;
     }
     
-    return $row;
+    return $columnMeta;
 }
 
 /**
  * Function to get html for the column name
  * 
- * @param int   $i         field number
- * @param int   $ci        cell index
- * @param int   $ci_offset cell index offset
- * @param array $row       row
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnName($i, $ci, $ci_offset, $row)
+function PMA_getHtmlForColumnName($columnNumber, $ci, $ci_offset, $columnMeta)
 {
-    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_name[' . $i . ']"'
+    $html = '<input id="field_' . $columnNumber . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_name[' . $columnNumber . ']"'
         . ' maxlength="64" class="textfield" title="' . __('Column') . '"'
         . ' size="10"'
-        . ' value="' . (isset($row['Field']) ? htmlspecialchars($row['Field']) : '')
+        . ' value="' 
+        . (isset($columnMeta['Field']) ? htmlspecialchars($columnMeta['Field']) : '')
         . '"' . ' />';
     
     return $html;
@@ -576,18 +579,18 @@ function PMA_getHtmlForColumnName($i, $ci, $ci_offset, $row)
 /**
  * Function to get html for the column type
  * 
- * @param int    $i          field number
- * @param int    $ci         cell index
- * @param int    $ci_offset  cell index offset
- * @param string $type_upper type inuppercase
+ * @param int    $columnNumber column number
+ * @param int    $ci           cell index
+ * @param int    $ci_offset    cell index offset
+ * @param string $type_upper   type inuppercase
  *  
  * @return string
  */
-function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
+function PMA_getHtmlForColumnType($columnNumber, $ci, $ci_offset, $type_upper)
 {
-    $select_id = 'field_' . $i . '_' . ($ci - $ci_offset);
+    $select_id = 'field_' . $columnNumber . '_' . ($ci - $ci_offset);
     $html = '<select class="column_type" name="field_type[' .
-        $i . ']"' .' id="' . $select_id . '">';
+        $columnNumber . ']"' .' id="' . $select_id . '">';
     $html .= PMA_Util::getSupportedDatatypes(true, $type_upper);
     $html .= '    </select>';
     
@@ -597,24 +600,25 @@ function PMA_getHtmlForColumnType($i, $ci, $ci_offset, $type_upper)
 /**
  * Function to get html for transformation 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
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
+ * @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'])
+function PMA_getHtmlForTransformationOption($columnNumber, $ci, $ci_offset, $columnMeta,
+    $mime_map
+) {
+    $val = isset($columnMeta['Field'])
+            && isset($mime_map[$columnMeta['Field']]['transformation_options'])
+            ? htmlspecialchars($mime_map[$columnMeta['Field']]['transformation_options'])
             : '';
     
-    $html = '<input id="field_' . $i . '_'
+    $html = '<input id="field_' . $columnNumber . '_'
                 . ($ci - $ci_offset) . '"' . ' type="text" '
-                . 'name="field_transformation_options[' . $i . ']"'
+                . 'name="field_transformation_options[' . $columnNumber . ']"'
                 . ' size="16" class="textfield"'
                 . ' value="' . $val . '"'
                 . ' />';
@@ -625,27 +629,28 @@ function PMA_getHtmlForTransformationOption($i, $ci, $ci_offset, $row, $mime_map
 /**
  * Function to get html for mime type
  * 
- * @param int   $i              field number
+ * @param int   $columnNumber   column number
  * @param int   $ci             cell index
  * @param int   $ci_offset      cell index offset
  * @param array $available_mime available mime
- * @param array $row            row
+ * @param array $columnMeta     column meta
  * @param array $mime_map       mime map
  * 
  * @return string
  */
-function PMA_getHtmlForMimeType($i, $ci, $ci_offset,
-    $available_mime, $row, $mime_map
+function PMA_getHtmlForMimeType($columnNumber, $ci, $ci_offset,
+    $available_mime, $columnMeta, $mime_map
 ) {
-    $html = '<select id="field_' . $i . '_'
-            . ($ci - $ci_offset) . '" size="1" name="field_mimetype[' . $i . ']">';
+    $html = '<select id="field_' . $columnNumber . '_'
+            . ($ci - $ci_offset)
+            . '" size="1" name="field_mimetype[' . $columnNumber . ']">';
     $html .= '    <option value="">&nbsp;</option>';
     
     if (is_array($available_mime['mimetype'])) {
         foreach ($available_mime['mimetype'] as $mimetype) {
-            $checked = (isset($row['Field'])
-                && isset($mime_map[$row['Field']]['mimetype'])
-                && ($mime_map[$row['Field']]['mimetype']
+            $checked = (isset($columnMeta['Field'])
+                && isset($mime_map[$columnMetaw['Field']]['mimetype'])
+                && ($mime_map[$columnMeta['Field']]['mimetype']
                     == str_replace('/', '_', $mimetype))
                 ? 'selected '
                 : '');
@@ -663,32 +668,32 @@ function PMA_getHtmlForMimeType($i, $ci, $ci_offset,
 /**
  * Function to get html for browser transformation
  * 
- * @param int   $i              field number
+ * @param int   $columnNumber   column number
  * @param int   $ci             cell index
  * @param int   $ci_offset      cell index offset
  * @param array $available_mime available mime
- * @param array $row            row
+ * @param array $columnMeta     column meta
  * @param array $mime_map       mime map
  * 
  * @return string
  */
-function PMA_getHtmlForBrowserTransformation($i, $ci, $ci_offset,
-    $available_mime, $row, $mime_map
+function PMA_getHtmlForBrowserTransformation($columnNumber, $ci, $ci_offset,
+    $available_mime, $columnMeta, $mime_map
 ) {
-    $html = '<select id="field_' . $i . '_'
+    $html = '<select id="field_' . $columnNumber . '_'
             . ($ci - $ci_offset) . '" size="1" name="field_transformation['
-            . $i . ']">';
+            . $columnNumber . ']">';
     $html .= '    <option value="" title="' . __('None')
             . '"></option>';
     if (is_array($available_mime['transformation'])) {
         foreach ($available_mime['transformation'] as $mimekey => $transform) {
-            $checked = isset($row['Field'])
-                && isset($mime_map[$row['Field']]['transformation'])
+            $checked = isset($columnMeta['Field'])
+                && isset($mime_map[$columnMeta['Field']]['transformation'])
                 && preg_match(
                     '@' . preg_quote(
                         $available_mime['transformation_file'][$mimekey]
                     ) . '3?@i',
-                    $mime_map[$row['Field']]['transformation']
+                    $mime_map[$columnMeta['Field']]['transformation']
                 )
                 ? 'selected '
                 : '';
@@ -710,24 +715,25 @@ function PMA_getHtmlForBrowserTransformation($i, $ci, $ci_offset,
 /**
  * Function to get html for move column
  * 
- * @param int   $i            field number
+ * @param int   $columnNumber column number
  * @param int   $ci           cell index
  * @param int   $ci_offset    cell index offset
  * @param array $move_columns move columns
- * @param array $row          row
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForMoveColumn($i, $ci, $ci_offset, $move_columns, $row)
-{
-    $html = '<select id="field_' . $i . '_'
-        . ($ci - $ci_offset) . '"' . ' name="field_move_to[' . $i
+function PMA_getHtmlForMoveColumn($columnNumber, $ci, $ci_offset, $move_columns,
+    $columnMeta
+) {
+    $html = '<select id="field_' . $columnNumber . '_'
+        . ($ci - $ci_offset) . '"' . ' name="field_move_to[' . $columnNumber
         . ']" size="1" width="5em">'
         . '<option value="" selected="selected">&nbsp;</option>';
     // find index of current column
     $current_index = 0;
     for ($mi = 0, $cols = count($move_columns); $mi < $cols; $mi++) {
-        if ($move_columns[$mi]->name == $row['Field']) {
+        if ($move_columns[$mi]->name == $columnMeta['Field']) {
             $current_index = $mi;
             break;
         }
@@ -762,22 +768,24 @@ function PMA_getHtmlForMoveColumn($i, $ci, $ci_offset, $move_columns, $row)
 /**
  * Function to get html for column comment
  * 
- * @param int   $i            field number
+ * @param int   $columnNumber column number
  * @param int   $ci           cell index
  * @param int   $ci_offset    cell index offset
- * @param array $row          row
+ * @param array $columnMeta   column meta
  * @param array $comments_map comments map
  * 
  * @return string
  */
-function PMA_getHtmlForColumnComment($i, $ci, $ci_offset, $row, $comments_map)
-{
-    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_comments[' . $i . ']" size="12"'
-        . ' value="' . (isset($row['Field'])
+function PMA_getHtmlForColumnComment($columnNumber, $ci, $ci_offset, $columnMeta,
+    $comments_map
+) {
+    $html = '<input id="field_' . $columnNumber . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_comments[' . $columnNumber
+        . ']" size="12"'
+        . ' value="' . (isset($columnMeta['Field'])
                 && is_array($comments_map)
-                && isset($comments_map[$row['Field']])
-            ?  htmlspecialchars($comments_map[$row['Field']])
+                && isset($comments_map[$columnMeta['Field']])
+            ?  htmlspecialchars($comments_map[$columnMeta['Field']])
             : '') . '"'
         . ' class="textfield" />';
     
@@ -787,18 +795,18 @@ function PMA_getHtmlForColumnComment($i, $ci, $ci_offset, $row, $comments_map)
 /**
  * Function get html for column auto increment
  * 
- * @param int   $i         field number
- * @param int   $ci        cell index
- * @param int   $ci_offset cell index offset
- * @param array $row       row
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnAutoIncrement($i, $ci, $ci_offset, $row)
+function PMA_getHtmlForColumnAutoIncrement($columnNumber, $ci, $ci_offset, $columnMeta)
 {
-    $html = '<input name="field_extra[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
-    if (isset($row['Extra']) && strtolower($row['Extra']) == 'auto_increment') {
+    $html = '<input name="field_extra[' . $columnNumber . ']"'
+        . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '"';
+    if (isset($columnMeta['Extra']) && strtolower($columnMeta['Extra']) == 'auto_increment') {
         $html .= ' checked="checked"';
     }
 
@@ -810,44 +818,44 @@ function PMA_getHtmlForColumnAutoIncrement($i, $ci, $ci_offset, $row)
 /**
  * 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
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnIndexes($i, $ci, $ci_offset, $row)
+function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta)
 {
-    $html = '<select name="field_key[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
-    $html .= '<option value="none_' . $i . '">---</option>';
+    $html = '<select name="field_key[' . $columnNumber . ']"'
+        . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '">';
+    $html .= '<option value="none_' . $columnNumber . '">---</option>';
 
-    $html .= '<option value="primary_' . $i . '" title="'
+    $html .= '<option value="primary_' . $columnNumber . '" title="'
         . __('Primary') . '"';
-    if (isset($row['Key']) && $row['Key'] == 'PRI') {
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') {
         $html .= ' selected="selected"';
     }
     $html .= '>PRIMARY</option>';
 
-    $html .= '<option value="unique_' . $i . '" title="'
+    $html .= '<option value="unique_' . $columnNumber . '" title="'
         . __('Unique') . '"';
-    if (isset($row['Key']) && $row['Key'] == 'UNI') {
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') {
         $html .= ' selected="selected"';
     }
     $html .= '>UNIQUE</option>';
 
-    $html .= '<option value="index_' . $i . '" title="'
+    $html .= '<option value="index_' . $columnNumber . '" title="'
         . __('Index') . '"';
-    if (isset($row['Key']) && $row['Key'] == 'MUL') {
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') {
         $html .= ' selected="selected"';
     }
     $html .= '>INDEX</option>';
 
     if (!PMA_DRIZZLE) {
-        $html .= '<option value="fulltext_' . $i . '" title="'
+        $html .= '<option value="fulltext_' . $columnNumber . '" title="'
             . __('Fulltext') . '"';
-        if (isset($row['Key']) && $row['Key'] == 'FULLTEXT') {
+        if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') {
             $html .= ' selected="selected"';
         }
         $html .= '>FULLTEXT</option>';
@@ -861,20 +869,20 @@ function PMA_getHtmlForColumnIndexes($i, $ci, $ci_offset, $row)
 /**
  * Function to get html for column null
  * 
- * @param int   $i         field number
- * @param int   $ci        cell index
- * @param int   $ci_offset cell index offset
- * @param array $row       row
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
+function PMA_getHtmlForColumnNull($columnNumber, $ci, $ci_offset, $columnMeta)
 {
-    $html = '<input name="field_null[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
-    if (! empty($row['Null'])
-        && $row['Null'] != 'NO'
-        && $row['Null'] != 'NOT NULL'
+    $html = '<input name="field_null[' . $columnNumber . ']"'
+        . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '"';
+    if (! empty($columnMeta['Null'])
+        && $columnMeta['Null'] != 'NO'
+        && $columnMeta['Null'] != 'NOT NULL'
     ) {
         $html .= ' checked="checked"';
     }
@@ -887,30 +895,31 @@ function PMA_getHtmlForColumnNull($i, $ci, $ci_offset, $row)
 /**
  * Function to get html for column attribute
  * 
- * @param int   $i                                field number
+ * @param int   $columnNumber                     column number
  * @param int   $ci                               cell index
  * @param int   $ci_offset                        cell index offset
  * @param array $extracted_columnspec             extracted column
- * @param array $row                              row
+ * @param array $columnMeta                       column meta
  * @param bool  $submit_attribute                 submit attribute
  * @param array $analyzed_sql                     analyzed sql
  * @param bool  $submit_default_current_timestamp submit default current time stamp
  * 
  * @return string
  */
-function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspec,
-    $row, $submit_attribute, $analyzed_sql, $submit_default_current_timestamp
+function PMA_getHtmlForColumnAttribute($columnNumber, $ci, $ci_offset,
+    $extracted_columnspec, $columnMeta, $submit_attribute, $analyzed_sql,
+    $submit_default_current_timestamp
 ) {
     $html = '<select style="font-size: 70%;"'
-        . ' name="field_attribute[' . $i . ']"'
-        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
+        . ' name="field_attribute[' . $columnNumber . ']"'
+        . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '">';
 
     $attribute     = '';
     if (isset($extracted_columnspec)) {
         $attribute = $extracted_columnspec['attribute'];
     }
 
-    if (isset($row['Extra']) && $row['Extra'] == 'on update CURRENT_TIMESTAMP') {
+    if (isset($columnMeta['Extra']) && $columnMeta['Extra'] == 'on update CURRENT_TIMESTAMP') {
         $attribute = 'on update CURRENT_TIMESTAMP';
     }
 
@@ -923,23 +932,23 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
     // the latter.
     $create_table_fields = $analyzed_sql[0]['create_table_fields'];
     if (PMA_MYSQL_INT_VERSION < 50025
-        && isset($row['Field'])
-        && isset($create_table_fields[$row['Field']]['type'])
-        && $create_table_fields[$row['Field']]['type'] == 'TIMESTAMP'
-        && $create_table_fields[$row['Field']]['timestamp_not_null'] == true
+        && isset($columnMeta['Field'])
+        && isset($create_table_fields[$columnMeta['Field']]['type'])
+        && $create_table_fields[$columnMeta['Field']]['type'] == 'TIMESTAMP'
+        && $create_table_fields[$columnMeta['Field']]['timestamp_not_null'] == true
     ) {
-        $row['Null'] = '';
+        $columnMeta['Null'] = '';
     }
 
     // MySQL 4.1.2+ TIMESTAMP options
     // (if on_update_current_timestamp is set, then it's TRUE)
-    if (isset($row['Field'])
-        && isset($create_table_fields[$row['Field']]['on_update_current_timestamp'])
+    if (isset($columnMeta['Field'])
+        && isset($create_table_fields[$columnMeta['Field']]['on_update_current_timestamp'])
     ) {
         $attribute = 'on update CURRENT_TIMESTAMP';
     }
-    if ((isset($row['Field'])
-        && isset($create_table_fields[$row['Field']]['default_current_timestamp']))
+    if ((isset($columnMeta['Field'])
+        && isset($create_table_fields[$columnMeta['Field']]['default_current_timestamp']))
         || (isset($submit_default_current_timestamp)
         && $submit_default_current_timestamp)
     ) {
@@ -967,19 +976,20 @@ function PMA_getHtmlForColumnAttribute($i, $ci, $ci_offset, $extracted_columnspe
 /**
  * Function to get html for column collation
  * 
- * @param int   $i         field number
- * @param int   $ci        cell index
- * @param int   $ci_offset cell index offset
- * @param array $row       row
+ * @param int   $columnNumber column number
+ * @param int   $ci           cell index
+ * @param int   $ci_offset    cell index offset
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
+function PMA_getHtmlForColumnCollation($columnNumber, $ci, $ci_offset, $columnMeta)
 {
-    $tmp_collation = empty($row['Collation']) ? null : $row['Collation'];
+    $tmp_collation
+        = empty($columnMeta['Collation']) ? null : $columnMeta['Collation'];
     $html = PMA_generateCharsetDropdownBox(
-        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $i . ']',
-        'field_' . $i . '_' . ($ci - $ci_offset), $tmp_collation, false
+        PMA_CSDROPDOWN_COLLATION, 'field_collation[' . $columnNumber . ']',
+        'field_' . $columnNumber . '_' . ($ci - $ci_offset), $tmp_collation, false
     );
     
     return $html;
@@ -988,7 +998,7 @@ function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
 /**
  * Function get html for column length
  * 
- * @param int $i                        field number
+ * @param int $columnNumber             column number
  * @param int $ci                       cell index
  * @param int $ci_offset                cell index offset
  * @param int $length_values_input_size length values input size
@@ -996,17 +1006,17 @@ function PMA_getHtmlForColumnCollation($i, $ci, $ci_offset, $row)
  * 
  * @return string
  */
-function PMA_getHtmlForColumnLength($i, $ci, $ci_offset, $length_values_input_size,
-    $length_to_display
+function PMA_getHtmlForColumnLength($columnNumber, $ci, $ci_offset,
+    $length_values_input_size, $length_to_display
 ) {
-    $html = '<input id="field_' . $i . '_' . ($ci - $ci_offset)
-        . '"' . ' type="text" name="field_length[' . $i . ']" size="'
+    $html = '<input id="field_' . $columnNumber . '_' . ($ci - $ci_offset)
+        . '"' . ' type="text" name="field_length[' . $columnNumber . ']" size="'
         . $length_values_input_size . '"' . ' value="' . htmlspecialchars(
             $length_to_display
         )
         . '"'
         . ' class="textfield" />'
-        . '<p class="enum_notice" id="enum_notice_' . $i . '_' . ($ci - $ci_offset)
+        . '<p class="enum_notice" id="enum_notice_' . $columnNumber . '_' . ($ci - $ci_offset)
         . '">';
     $html .= __('ENUM or SET data too long?')
         . '<a href="#" class="open_enum_editor"> '
@@ -1019,17 +1029,17 @@ function PMA_getHtmlForColumnLength($i, $ci, $ci_offset, $length_values_input_si
 /**
  * Function to get html for the default column
  * 
- * @param int    $i                         field number
+ * @param int    $columnNumber              column number
  * @param int    $ci                        cell index
  * @param int    $ci_offset                 cell index offset
  * @param string $type_upper                type upper
  * @param string $default_current_timestamp default current timestamp
- * @param array  $row                       row
+ * @param array  $columnMeta                column meta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnDefault($i, $ci, $ci_offset, $type_upper,
-    $default_current_timestamp, $row
+function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper,
+    $default_current_timestamp, $columnMeta
 ) {
     // here we put 'NONE' as the default value of drop-down; otherwise
     // users would have problems if they forget to enter the default
@@ -1044,23 +1054,23 @@ function PMA_getHtmlForColumnDefault($i, $ci, $ci_offset, $type_upper,
     // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value
     if ($type_upper == 'TIMESTAMP'
         && ! empty($default_current_timestamp)
-        && isset($row['Default'])
+        && isset($columnMeta['Default'])
     ) {
-        $row['Default'] = '';
+        $columnMeta['Default'] = '';
     }
 
     if ($type_upper == 'BIT') {
-        $row['DefaultValue']
-            = PMA_Util::convertBitDefaultValue($row['DefaultValue']);
+        $columnMeta['DefaultValue']
+            = PMA_Util::convertBitDefaultValue($columnMeta['DefaultValue']);
     }
 
-    $html = '<select name="field_default_type[' . $i
-        . ']" id="field_' . $i . '_' . ($ci - $ci_offset)
+    $html = '<select name="field_default_type[' . $columnNumber
+        . ']" id="field_' . $columnNumber . '_' . ($ci - $ci_offset)
         . '" class="default_type">';
     foreach ($default_options as $key => $value) {
         $html .= '<option value="' . $key . '"';
         // is only set when we go back to edit a field's structure
-        if (isset($row['DefaultType']) && $row['DefaultType'] == $key) {
+        if (isset($columnMeta['DefaultType']) && $columnMeta['DefaultType'] == $key) {
             $html .= ' selected="selected"';
         }
         $html .= ' >' . $value . '</option>';
@@ -1068,9 +1078,9 @@ function PMA_getHtmlForColumnDefault($i, $ci, $ci_offset, $type_upper,
     $html .= '</select>';
     $html .= '<br />';
     $html .= '<input type="text"'
-        . ' name="field_default_value[' . $i . ']" size="12"'
-        . ' value="' . (isset($row['DefaultValue'])
-            ? htmlspecialchars($row['DefaultValue'])
+        . ' name="field_default_value[' . $columnNumber . ']" size="12"'
+        . ' value="' . (isset($columnMeta['DefaultValue'])
+            ? htmlspecialchars($columnMeta['DefaultValue'])
             : '') . '"'
         . ' class="textfield default_value" />';
     

From c89d2b394254b107259b670ce8c56faf0d9dd01c Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 11:08:30 +0530
Subject: [PATCH 21/27] renamed function

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

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 7c9a150464..520ae1a39b 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -89,7 +89,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
                     $comments_map, $mime_map
                 ); 
     } elseif (isset($fields_meta[$columnNumber])) {
-        $columnMeta = PMA_getRowDataForFieldsMetaSet(
+        $columnMeta = PMA_getColumnMetaForDefault(
             $fields_meta[$columnNumber], isset($analyzed_sql[0]['create_table_fields']
             [$fields_meta[$columnNumber]['Field']]['default_value'])
         );
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index db5e757dae..b6e271c743 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -522,7 +522,7 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
  * 
  * @return array
  */
-function PMA_getRowDataForFieldsMetaSet($columnMeta, $isDefault)
+function PMA_getColumnMetaForDefault($columnMeta, $isDefault)
 {
     switch ($columnMeta['Default']) {
     case null:

From 632689f7390cf8baa759a4013aac9b4089aca70c Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 23:45:48 +0530
Subject: [PATCH 22/27] extracted more smaller methods

---
 libraries/tbl_columns_definition_form.lib.php | 114 +++++++++++++-----
 1 file changed, 86 insertions(+), 28 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index b6e271c743..1e51a8678e 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -830,35 +830,13 @@ function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta
     $html = '<select name="field_key[' . $columnNumber . ']"'
         . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '">';
     $html .= '<option value="none_' . $columnNumber . '">---</option>';
-
-    $html .= '<option value="primary_' . $columnNumber . '" title="'
-        . __('Primary') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>PRIMARY</option>';
-
-    $html .= '<option value="unique_' . $columnNumber . '" title="'
-        . __('Unique') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>UNIQUE</option>';
-
-    $html .= '<option value="index_' . $columnNumber . '" title="'
-        . __('Index') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>INDEX</option>';
-
+    
+    $html .= PMA_getHtmlForPrimaryIndexOption($columnNumber, $columnMeta);
+    $html .= PMA_getHtmlForUniqueIndexOption($columnNumber, $columnMeta);
+    $html .= PMA_getHtmlForIndexOption($columnNumber, $columnMeta);
+    
     if (!PMA_DRIZZLE) {
-        $html .= '<option value="fulltext_' . $columnNumber . '" title="'
-            . __('Fulltext') . '"';
-        if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') {
-            $html .= ' selected="selected"';
-        }
-        $html .= '>FULLTEXT</option>';
+        $html .= PMA_getHtmlForFulltextOption($columnNumber, $columnMeta);
     }
 
     $html .= '</select>';
@@ -866,6 +844,86 @@ function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta
     return $html;
 }
 
+/**
+ * Function to get html for the primary index option
+ * 
+ * @param int   $columnNumber column number
+ * @param array $columnMeta   column meta
+ * 
+ * @return string
+ */
+function PMA_getHtmlForPrimaryIndexOption($columnNumber, $columnMeta)
+{
+    $html = '<option value="primary_' . $columnNumber . '" title="'
+        . __('Primary') . '"';
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>PRIMARY</option>';
+    
+    return $html;
+}
+
+/**
+ * Function to get html for the unique index option
+ * 
+ * @param int   $columnNumber column number
+ * @param array $columnMeta   column meta
+ * 
+ * @return string
+ */
+function PMA_getHtmlForUniqueIndexOption($columnNumber, $columnMeta)
+{
+    $html = '<option value="unique_' . $columnNumber . '" title="'
+        . __('Unique') . '"';
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>UNIQUE</option>';
+    
+    return $html;
+}
+
+/**
+ * Function to get html for the index option
+ * 
+ * @param int   $columnNumber  column number
+ * @param array $columnMeta    column meta
+ * 
+ * @return string
+ */
+function PMA_getHtmlForIndexOption($columnNumber, $columnMeta)
+{
+    $html = '<option value="index_' . $columnNumber . '" title="'
+        . __('Index') . '"';
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>INDEX</option>';
+    
+    return $html;
+}
+
+/**
+ * Function to get html for the fulltext option
+ * 
+ * @param int   $columnNumber column number
+ * @param array $columnMeta   column meta
+ * 
+ * @return string
+ */
+function PMA_getHtmlForFulltextOption($columnNumber, $columnMeta)
+{
+    $html = '<option value="fulltext_' . $columnNumber . '" title="'
+            . __('Fulltext') . '"';
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') {
+        $html .= ' selected="selected"';
+    }
+    $html .= '>FULLTEXT</option>';
+    
+    return $html;
+}
+        
 /**
  * Function to get html for column null
  * 

From c2f50d456589e28b89723c281e5cd56fc608eca3 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 23:50:34 +0530
Subject: [PATCH 23/27] renamed $field_meta to $columnMeta in
 libraries/tbl_column_definition_form.lib.php

---
 libraries/tbl_columns_definition_form.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 1e51a8678e..11e5ce1d3c 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -262,14 +262,14 @@ function PMA_getHtmlForTableCreateOrAddField($action, $form_params, $content_cel
  * Function to get header cells
  *
  * @param bool   $is_backup   whether backup or not
- * @param array  $fields_meta fields meta data
+ * @param array  $columnMeta  column meta data
  * @param bool   $mimework    whether mimework or not
  * @param string $db          current database
  * @param string $table       current table
  *
  * @return array
  */
-function PMA_getHeaderCells($is_backup, $fields_meta, $mimework, $db, $table)
+function PMA_getHeaderCells($is_backup, $columnMeta, $mimework, $db, $table)
 {
     $header_cells = array();
     $header_cells[] = __('Name');
@@ -306,7 +306,7 @@ function PMA_getHeaderCells($is_backup, $fields_meta, $mimework, $db, $table)
     $header_cells[] = '<abbr title="AUTO_INCREMENT">A_I</abbr>';
     $header_cells[] = __('Comments');
 
-    if (isset($fields_meta)) {
+    if (isset($columnMeta)) {
         $header_cells[] = __('Move column');
     }
 
@@ -515,7 +515,7 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
 }
 
 /**
- * Function to get row data for $fields_meta set
+ * Function to get row data for $columnMeta set
  * 
  * @param array $columnMeta column meta
  * @param bool  $isDefault  whether the row value is default

From 1c3d0febf400c3b5cf4c0f1286547631e413db4e Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Wed, 7 Aug 2013 23:50:58 +0530
Subject: [PATCH 24/27] typo corrected

---
 libraries/tbl_columns_definition_form.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 11e5ce1d3c..22feab4405 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -649,7 +649,7 @@ function PMA_getHtmlForMimeType($columnNumber, $ci, $ci_offset,
     if (is_array($available_mime['mimetype'])) {
         foreach ($available_mime['mimetype'] as $mimetype) {
             $checked = (isset($columnMeta['Field'])
-                && isset($mime_map[$columnMetaw['Field']]['mimetype'])
+                && isset($mime_map[$columnMeta['Field']]['mimetype'])
                 && ($mime_map[$columnMeta['Field']]['mimetype']
                     == str_replace('/', '_', $mimetype))
                 ? 'selected '

From e7b4530cf04564df01e24295b1eab508e62ac6e0 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Thu, 8 Aug 2013 00:23:57 +0530
Subject: [PATCH 25/27] phpcs errors corrected

---
 libraries/tbl_columns_definition_form.inc.php |  9 +-
 libraries/tbl_columns_definition_form.lib.php | 87 +++++++++++--------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 520ae1a39b..ff55f3bf43 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -90,7 +90,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
                 ); 
     } elseif (isset($fields_meta[$columnNumber])) {
         $columnMeta = PMA_getColumnMetaForDefault(
-            $fields_meta[$columnNumber], isset($analyzed_sql[0]['create_table_fields']
+            $fields_meta[$columnNumber],
+            isset($analyzed_sql[0]['create_table_fields']
             [$fields_meta[$columnNumber]['Field']]['default_value'])
         );
     }
@@ -112,7 +113,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
     // old column name
     if ($is_backup) {
         if (isset($columnMeta['Field'])) {
-            $_form_params['field_orig[' . $columnNumber . ']'] = $columnMeta['Field'];
+            $_form_params['field_orig[' . $columnNumber . ']']
+                = $columnMeta['Field'];
         } else {
             $_form_params['field_orig[' . $columnNumber . ']'] = '';
         }
@@ -223,7 +225,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
 
     // column comments
     $content_cells[$columnNumber][$ci] = PMA_getHtmlForColumnComment(
-        $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null, $comments_map
+        $columnNumber, $ci, $ci_offset, isset($columnMeta) ? $columnMeta : null,
+        $comments_map
     );
     $ci++;
 
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 22feab4405..51f7df6b30 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -12,11 +12,11 @@ if (!defined('PHPMYADMIN')) {
 /**
  * Function to get form parameters
  *
- * @param string $db            database
- * @param string $table         table
- * @param string $action        action
- * @param int    $num_fields    number of fields
- * @param bool   $selected      selected
+ * @param string $db         database
+ * @param string $table      table
+ * @param string $action     action
+ * @param int    $num_fields number of fields
+ * @param bool   $selected   selected
  *
  * @return array $form_params form parameters
  */
@@ -261,11 +261,11 @@ function PMA_getHtmlForTableCreateOrAddField($action, $form_params, $content_cel
 /**
  * Function to get header cells
  *
- * @param bool   $is_backup   whether backup or not
- * @param array  $columnMeta  column meta data
- * @param bool   $mimework    whether mimework or not
- * @param string $db          current database
- * @param string $table       current table
+ * @param bool   $is_backup  whether backup or not
+ * @param array  $columnMeta column meta data
+ * @param bool   $mimework   whether mimework or not
+ * @param string $db         current database
+ * @param string $table      current table
  *
  * @return array
  */
@@ -407,12 +407,14 @@ function PMA_getRowDataForRegeneration($columnNumber, $submit_fulltext)
     }
 
     // put None in the drop-down for Default, when someone adds a field
-    $columnMeta['DefaultType'] = isset($_REQUEST['field_default_type'][$columnNumber])
-        ? $_REQUEST['field_default_type'][$columnNumber]
-        : 'NONE';
-    $columnMeta['DefaultValue'] = isset($_REQUEST['field_default_value'][$columnNumber])
-        ? $_REQUEST['field_default_value'][$columnNumber]
-        : '';
+    $columnMeta['DefaultType']
+        = isset($_REQUEST['field_default_type'][$columnNumber])
+            ? $_REQUEST['field_default_type'][$columnNumber]
+            : 'NONE';
+    $columnMeta['DefaultValue']
+        = isset($_REQUEST['field_default_value'][$columnNumber])
+            ? $_REQUEST['field_default_value'][$columnNumber]
+            : '';
 
     switch ($columnMeta['DefaultType']) {
     case 'NONE' :
@@ -490,7 +492,8 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
         = PMA_getSubmitPropertiesForRegeneration();
 
     if (isset($_REQUEST['field_comments'][$columnNumber])) {
-        $comments_map[$columnMeta['Field']] = $_REQUEST['field_comments'][$columnNumber];
+        $comments_map[$columnMeta['Field']]
+            = $_REQUEST['field_comments'][$columnNumber];
     }
 
     if (isset($_REQUEST['field_mimetype'][$columnNumber])) {
@@ -509,8 +512,8 @@ function PMA_handleRegeneration($columnNumber, $submit_fulltext, $comments_map,
     }
 
     return array(
-        $columnMeta, $submit_length, $submit_attribute, $submit_default_current_timestamp,
-        $comments_map, $mime_map
+        $columnMeta, $submit_length, $submit_attribute,
+        $submit_default_current_timestamp, $comments_map, $mime_map
     );
 }
 
@@ -570,7 +573,8 @@ function PMA_getHtmlForColumnName($columnNumber, $ci, $ci_offset, $columnMeta)
         . ' maxlength="64" class="textfield" title="' . __('Column') . '"'
         . ' size="10"'
         . ' value="' 
-        . (isset($columnMeta['Field']) ? htmlspecialchars($columnMeta['Field']) : '')
+        . (isset($columnMeta['Field'])
+            ? htmlspecialchars($columnMeta['Field']) : '')
         . '"' . ' />';
     
     return $html;
@@ -608,13 +612,16 @@ function PMA_getHtmlForColumnType($columnNumber, $ci, $ci_offset, $type_upper)
  * 
  * @return string
  */
-function PMA_getHtmlForTransformationOption($columnNumber, $ci, $ci_offset, $columnMeta,
-    $mime_map
+function PMA_getHtmlForTransformationOption($columnNumber, $ci, $ci_offset,
+    $columnMeta, $mime_map
 ) {
     $val = isset($columnMeta['Field'])
             && isset($mime_map[$columnMeta['Field']]['transformation_options'])
-            ? htmlspecialchars($mime_map[$columnMeta['Field']]['transformation_options'])
-            : '';
+                ? htmlspecialchars(
+                    $mime_map[$columnMeta['Field']]
+                    ['transformation_options']
+                )
+                : '';
     
     $html = '<input id="field_' . $columnNumber . '_'
                 . ($ci - $ci_offset) . '"' . ' type="text" '
@@ -802,11 +809,14 @@ function PMA_getHtmlForColumnComment($columnNumber, $ci, $ci_offset, $columnMeta
  * 
  * @return string
  */
-function PMA_getHtmlForColumnAutoIncrement($columnNumber, $ci, $ci_offset, $columnMeta)
-{
+function PMA_getHtmlForColumnAutoIncrement($columnNumber, $ci, $ci_offset,
+    $columnMeta
+) {
     $html = '<input name="field_extra[' . $columnNumber . ']"'
         . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '"';
-    if (isset($columnMeta['Extra']) && strtolower($columnMeta['Extra']) == 'auto_increment') {
+    if (isset($columnMeta['Extra'])
+        && strtolower($columnMeta['Extra']) == 'auto_increment'
+    ) {
         $html .= ' checked="checked"';
     }
 
@@ -887,8 +897,8 @@ function PMA_getHtmlForUniqueIndexOption($columnNumber, $columnMeta)
 /**
  * Function to get html for the index option
  * 
- * @param int   $columnNumber  column number
- * @param array $columnMeta    column meta
+ * @param int   $columnNumber column number
+ * @param array $columnMeta   column meta
  * 
  * @return string
  */
@@ -977,7 +987,9 @@ function PMA_getHtmlForColumnAttribute($columnNumber, $ci, $ci_offset,
         $attribute = $extracted_columnspec['attribute'];
     }
 
-    if (isset($columnMeta['Extra']) && $columnMeta['Extra'] == 'on update CURRENT_TIMESTAMP') {
+    if (isset($columnMeta['Extra'])
+        && $columnMeta['Extra'] == 'on update CURRENT_TIMESTAMP'
+    ) {
         $attribute = 'on update CURRENT_TIMESTAMP';
     }
 
@@ -1000,13 +1012,14 @@ function PMA_getHtmlForColumnAttribute($columnNumber, $ci, $ci_offset,
 
     // MySQL 4.1.2+ TIMESTAMP options
     // (if on_update_current_timestamp is set, then it's TRUE)
+    $field = $create_table_fields[$columnMeta['Field']];
     if (isset($columnMeta['Field'])
-        && isset($create_table_fields[$columnMeta['Field']]['on_update_current_timestamp'])
+        && isset($field['on_update_current_timestamp'])
     ) {
         $attribute = 'on update CURRENT_TIMESTAMP';
     }
     if ((isset($columnMeta['Field'])
-        && isset($create_table_fields[$columnMeta['Field']]['default_current_timestamp']))
+        && isset($field['default_current_timestamp']))
         || (isset($submit_default_current_timestamp)
         && $submit_default_current_timestamp)
     ) {
@@ -1074,7 +1087,8 @@ function PMA_getHtmlForColumnLength($columnNumber, $ci, $ci_offset,
         )
         . '"'
         . ' class="textfield" />'
-        . '<p class="enum_notice" id="enum_notice_' . $columnNumber . '_' . ($ci - $ci_offset)
+        . '<p class="enum_notice" id="enum_notice_' . $columnNumber . '_'
+        . ($ci - $ci_offset)
         . '">';
     $html .= __('ENUM or SET data too long?')
         . '<a href="#" class="open_enum_editor"> '
@@ -1109,7 +1123,8 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper
         'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP',
     );
 
-    // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default value
+    // for a TIMESTAMP, do not show the string "CURRENT_TIMESTAMP" as a default
+    // value
     if ($type_upper == 'TIMESTAMP'
         && ! empty($default_current_timestamp)
         && isset($columnMeta['Default'])
@@ -1128,7 +1143,9 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper
     foreach ($default_options as $key => $value) {
         $html .= '<option value="' . $key . '"';
         // is only set when we go back to edit a field's structure
-        if (isset($columnMeta['DefaultType']) && $columnMeta['DefaultType'] == $key) {
+        if (isset($columnMeta['DefaultType'])
+            && $columnMeta['DefaultType'] == $key
+        ) {
             $html .= ' selected="selected"';
         }
         $html .= ' >' . $value . '</option>';

From ffab25619d675bc49123473af84f14994425f6fc Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Thu, 8 Aug 2013 09:08:22 +0530
Subject: [PATCH 26/27] removed redundant methods

---
 libraries/tbl_columns_definition_form.lib.php | 96 +++++--------------
 1 file changed, 24 insertions(+), 72 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 51f7df6b30..aa07f3e54b 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -841,12 +841,19 @@ function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta
         . ' id="field_' . $columnNumber . '_' . ($ci - $ci_offset) . '">';
     $html .= '<option value="none_' . $columnNumber . '">---</option>';
     
-    $html .= PMA_getHtmlForPrimaryIndexOption($columnNumber, $columnMeta);
-    $html .= PMA_getHtmlForUniqueIndexOption($columnNumber, $columnMeta);
-    $html .= PMA_getHtmlForIndexOption($columnNumber, $columnMeta);
-    
+    $html .= PMA_getHtmlForIndexTypeOption(
+        $columnNumber, $columnMeta, 'Primary', 'PRI'
+    );
+    $html .= PMA_getHtmlForIndexTypeOption(
+        $columnNumber, $columnMeta, 'Unique', 'UNI'
+    );
+    $html .= PMA_getHtmlForIndexTypeOption(
+        $columnNumber, $columnMeta, 'Index', 'MUL'
+    );
     if (!PMA_DRIZZLE) {
-        $html .= PMA_getHtmlForFulltextOption($columnNumber, $columnMeta);
+        $html .= PMA_getHtmlForIndexTypeOption(
+            $columnNumber, $columnMeta, 'Fulltext', 'FULLTEXT'
+        );
     }
 
     $html .= '</select>';
@@ -855,84 +862,29 @@ function PMA_getHtmlForColumnIndexes($columnNumber, $ci, $ci_offset, $columnMeta
 }
 
 /**
- * Function to get html for the primary index option
+ * Function to get html for the index options
  * 
- * @param int   $columnNumber column number
- * @param array $columnMeta   column meta
+ * @param int    $columnNumber column number
+ * @param array  $columnMeta   column meta
+ * @param string $type         index type
+ * @param string $key          column meta key
  * 
  * @return string
  */
-function PMA_getHtmlForPrimaryIndexOption($columnNumber, $columnMeta)
+
+function PMA_getHtmlForIndexTypeOption($columnNumber, $columnMeta, $type, $key)
 {
-    $html = '<option value="primary_' . $columnNumber . '" title="'
-        . __('Primary') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') {
+    $html = '<option value="' . strtolower($type) . '_' . $columnNumber
+        . '" title="'
+        . __($type) . '"';
+    if (isset($columnMeta['Key']) && $columnMeta['Key'] == $key) {
         $html .= ' selected="selected"';
     }
-    $html .= '>PRIMARY</option>';
+    $html .= '>' . strtoupper($type) . '</option>';
     
     return $html;
 }
 
-/**
- * Function to get html for the unique index option
- * 
- * @param int   $columnNumber column number
- * @param array $columnMeta   column meta
- * 
- * @return string
- */
-function PMA_getHtmlForUniqueIndexOption($columnNumber, $columnMeta)
-{
-    $html = '<option value="unique_' . $columnNumber . '" title="'
-        . __('Unique') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>UNIQUE</option>';
-    
-    return $html;
-}
-
-/**
- * Function to get html for the index option
- * 
- * @param int   $columnNumber column number
- * @param array $columnMeta   column meta
- * 
- * @return string
- */
-function PMA_getHtmlForIndexOption($columnNumber, $columnMeta)
-{
-    $html = '<option value="index_' . $columnNumber . '" title="'
-        . __('Index') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>INDEX</option>';
-    
-    return $html;
-}
-
-/**
- * Function to get html for the fulltext option
- * 
- * @param int   $columnNumber column number
- * @param array $columnMeta   column meta
- * 
- * @return string
- */
-function PMA_getHtmlForFulltextOption($columnNumber, $columnMeta)
-{
-    $html = '<option value="fulltext_' . $columnNumber . '" title="'
-            . __('Fulltext') . '"';
-    if (isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') {
-        $html .= ' selected="selected"';
-    }
-    $html .= '>FULLTEXT</option>';
-    
-    return $html;
-}
         
 /**
  * Function to get html for column null

From 8e6d2f867cbac2746e546e6510acd4bac6fe9b86 Mon Sep 17 00:00:00 2001
From: Spun Nakandala <supun.nakandala@gmail.com>
Date: Thu, 8 Aug 2013 14:04:21 +0530
Subject: [PATCH 27/27] corrected undefined variable error

---
 libraries/tbl_columns_definition_form.lib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index aa07f3e54b..16d087958d 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -964,8 +964,11 @@ function PMA_getHtmlForColumnAttribute($columnNumber, $ci, $ci_offset,
 
     // MySQL 4.1.2+ TIMESTAMP options
     // (if on_update_current_timestamp is set, then it's TRUE)
-    $field = $create_table_fields[$columnMeta['Field']];
-    if (isset($columnMeta['Field'])
+    if(isset($columnMeta['Field'])){
+        $field = $create_table_fields[$columnMeta['Field']];
+    }
+    
+    if (isset($field)
         && isset($field['on_update_current_timestamp'])
     ) {
         $attribute = 'on update CURRENT_TIMESTAMP';