From 0ebf022426654a557397a57f045802e7d212e134 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Wed, 11 Apr 2012 16:50:10 -0400
Subject: [PATCH] Refactoring challenge

---
 tbl_structure.php | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/tbl_structure.php b/tbl_structure.php
index 30c937e15a..3c19da67db 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -259,34 +259,22 @@ foreach ($fields as $row) {
     }
     // for the case ENUM('&#8211;','&ldquo;')
     $type         = htmlspecialchars($type);
-    // in case it is too long
-    $start = 0;
-    if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
-        $start = 13;
-        $type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>';
+
+    $field_charset = '';
+    if (
+        $extracted_fieldspec['binary'] == false
+        &&
+        preg_match("@^(char|varchar|text|tinytext|mediumtext|longtext|set|enum)@", $type)) {
+        if (! empty($row['Collation'])) {
+            $field_charset = $row['Collation'];
+        }
     }
 
-    unset($field_charset);
-    if ((substr($type, $start, 4) == 'char'
-        || substr($type, $start, 7) == 'varchar'
-        || substr($type, $start, 4) == 'text'
-        || substr($type, $start, 8) == 'tinytext'
-        || substr($type, $start, 10) == 'mediumtext'
-        || substr($type, $start, 8) == 'longtext'
-        || substr($type, $start, 3) == 'set'
-        || substr($type, $start, 4) == 'enum')
-        && !$extracted_fieldspec['binary']
-    ) {
-        if (strpos($type, ' character set ')) {
-            $type = substr($type, 0, strpos($type, ' character set '));
-        }
-        if (!empty($row['Collation'])) {
-            $field_charset = $row['Collation'];
-        } else {
-            $field_charset = '';
-        }
-    } else {
-        $field_charset = '';
+    $displayed_type = $type;
+    if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
+        $displayed_type  = "<abbr title='$type'>";
+        $displayed_type .= substr($type, 0, $GLOBALS['cfg']['LimitChars']);
+        $displayed_type .= "</abbr>";
     }
 
     // Display basic mimetype [MIME]
@@ -343,7 +331,7 @@ foreach ($fields as $row) {
         <?php echo $rownum; ?>
     </td>
     <th class="nowrap"><label for="checkbox_row_<?php echo $rownum; ?>"><?php echo $displayed_field_name; ?></label></th>
-    <td<?php echo $type_nowrap; ?>><bdo dir="ltr" lang="en"><?php echo $type; echo $type_mime; ?></bdo></td>
+    <td<?php echo $type_nowrap; ?>><bdo dir="ltr" lang="en"><?php echo $displayed_type; echo $type_mime; ?></bdo></td>
     <td><?php echo (empty($field_charset) ? '' : '<dfn title="' . PMA_getCollationDescr($field_charset) . '">' . $field_charset . '</dfn>'); ?></td>
     <td class="column_attribute nowrap"><?php echo $attribute; ?></td>
     <td><?php echo (($row['Null'] == 'YES') ? __('Yes') : __('No')); ?></td>