From 2b1acfaf84e7c509afc17831379eaf062eb621ab Mon Sep 17 00:00:00 2001
From: xmujay <xmujay@gmail.com>
Date: Thu, 19 Sep 2013 17:56:14 +0800
Subject: [PATCH] refactor display_create_table

---
 libraries/display_create_table.lib.php | 64 ++++++++++++++++----------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
index fefdaa673a..8551c15bf8 100644
--- a/libraries/display_create_table.lib.php
+++ b/libraries/display_create_table.lib.php
@@ -35,29 +35,45 @@ require_once './libraries/check_user_privileges.lib.php';
 
 $is_create_table_priv = true;
 
-?>
-    <form id="create_table_form_minimal" method="post" action="tbl_create.php">
-<fieldset>
-    <legend>
-<?php
-if (PMA_Util::showIcons('ActionLinksMode')) {
-    echo PMA_Util::getImage('b_newtbl.png');
+/**
+ * Returns the html for create table.
+ *
+ * @param string $db database name
+ *
+ * @return string
+ */
+function PMA_getHtmlForCreateTable($db)
+{
+    $html  = '<form id="create_table_form_minimal" method="post" ' 
+        . 'action="tbl_create.php">';
+    $html .= '<fieldset>';
+    $html .= '<legend>';
+
+    if (PMA_Util::showIcons('ActionLinksMode')) {
+        $html .= PMA_Util::getImage('b_newtbl.png');
+    }
+    $html .= __('Create table');
+
+    $html .= ' </legend>';
+    $html .= PMA_URL_getHiddenInputs($db);
+    $html .= '<div class="formelement">';
+    $html .= __('Name') . ":";
+    $html .= '  <input type="text" name="table" maxlength="64" ' 
+        . 'size="30" required />';
+    $html .= ' </div>';
+    $html .= '  <div class="formelement">';
+    $html .= __('Number of columns') . ":";
+    $html .= '  <input type="number" min="1" name="num_fields" size="2" />';
+    $html .= ' </div>';
+    $html .= '  <div class="clearfloat"></div>';
+    $html .= '</fieldset>';
+    $html .= '<fieldset class="tblFooters">';
+    $html .= '   <input type="submit" value="' . __('Go') . '" />';
+    $html .= '</fieldset>';
+    $html .= '</form>';
+
+    return $html;
 }
-echo __('Create table');
+
+echo PMA_getHtmlForCreateTable($db);
 ?>
-    </legend>
-    <?php echo PMA_URL_getHiddenInputs($db); ?>
-    <div class="formelement">
-        <?php echo __('Name'); ?>:
-        <input type="text" name="table" maxlength="64" size="30" required />
-    </div>
-    <div class="formelement">
-        <?php echo __('Number of columns'); ?>:
-        <input type="number" min="1" name="num_fields" size="2" />
-    </div>
-    <div class="clearfloat"></div>
-</fieldset>
-<fieldset class="tblFooters">
-    <input type="submit" value="<?php echo __('Go'); ?>" />
-</fieldset>
-</form>