beautify the code and the results of the patch #484112

db_details.php3

@@ -327,6 +327,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) {
         <input type="submit" name="submit_mult" value="<?php echo $strDrop; ?>" />
         &nbsp;<i><?php echo $strOr; ?></i>&nbsp;
         <input type="submit" name="submit_mult" value="<?php echo $strEmpty; ?>" />
+        &nbsp;<i><?php echo $strOr; ?></i>&nbsp;
+        <input type="submit" name="submit_mult" value="<?php echo $strPrintView; ?>" />
     </td>
 </tr>
 </table>
@@ -450,27 +452,6 @@ if ($num_tables > 0) {
     <!-- Printable view of a table -->
     <li>
         <div style="margin-bottom: 10px"><a href="db_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
-
-<?php // Add by Moosh 
-?> 
-    <FORM method="post" action="tbl_printview.php3?lang=<?php echo $lang; ?>&server=<?php echo $server; ?>&db=<?php echo $db; ?>&goto=db_details.php3" > 
-     <select name="tables[]" size="5" multiple="multiple"> 
-     <?php 
-         $i = 0; 
-         echo "\n"; 
-         while ($i < $num_tables) { 
-             $table = ((PMA_MYSQL_INT_VERSION >= 32300) ? 
-		$tables[$i]['Name'] : $tables[$i]); 
-             echo ' <option value="' . $table . '">' . $table . '</option>' . "\n"; 
-             $i++; 
-         } 
-     echo "</select>";
-     echo "<input type=\"submit\" value=\"" . $GLOBALS['strGo'] . "\" />";
-     echo "</FORM>"; 
-
-// end of Add by Moosh 
-
-   ?> 
     </li>
     <?php
 }
@@ -506,6 +487,7 @@ if ($is_upload) {
     ?>
             <div style="margin-bottom: 5px">
             <input type="file" name="sql_file" /><br />
+            </div>
     <?php
 } // end if
 echo "\n";

mult_submits.inc.php3

@@ -3,24 +3,29 @@
 
 
 /**
- * Confirmation form
+ * Confirmation form if required or include of other scripts
  */
 if (!empty($submit_mult)
     && (!empty($selected_db) || !empty($selected_tbl) || !empty($selected_fld))) {
 
     if (get_magic_quotes_gpc()) {
-        $submit_mult = stripslashes($submit_mult);
+        $submit_mult  = stripslashes($submit_mult);
     }
     if (!empty($selected_db)) {
-        $selected = $selected_db;
+        $selected     = $selected_db;
-        $what     = 'drop_db';
+        $what         = 'drop_db';
     } else if (!empty($selected_tbl)) {
-        $selected = $selected_tbl;
+    	if ($submit_mult == $strPrintView) {
-        $what     = (($submit_mult == $strDrop) ? 'drop_tbl' : 'empty_tbl');
+            include('./tbl_printview.php3');
+            exit();
+        } else {    
+            $selected = $selected_tbl;
+            $what     = (($submit_mult == $strDrop) ? 'drop_tbl' : 'empty_tbl');
+        }
     } else {
-        $selected = $selected_fld;
+        $selected     = $selected_fld;
         if ($submit_mult == $strDrop) {
-            $what = 'drop_fld';
+            $what     = 'drop_fld';
         } else {
             include('./tbl_alter.php3');
             exit();

tbl_printview.php3

@@ -5,18 +5,27 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require('./libraries/grab_globals.lib.php3');
+if (!isset($selected_tbl)) {
-require('./header.inc.php3');
+    include('./libraries/grab_globals.lib.php3');
+    include('./header.inc.php3');
+}
 
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties.php3'
+if (isset($table)) {
-         . '?lang=' . $lang
+    $err_url = 'tbl_properties.php3'
-         . '&server=' . $server
+             . '?lang=' . $lang
-         . '&db=' . urlencode($db)
+             . '&server=' . $server
-         . '&table=' . urlencode($table);
+             . '&db=' . urlencode($db)
+             . '&table=' . urlencode($table);
+} else {
+    $err_url = 'db_details.php3'
+             . '?lang=' . $lang
+             . '&server=' . $server
+             . '&db=' . urlencode($db);
+}
 
 
 /**
@@ -24,118 +33,116 @@ $err_url = 'tbl_properties.php3'
  */
 mysql_select_db($db);
 
-// add by Moosh 
-
-if (is_array($tables)) 
-{ $lesTables =$tables; 
-} else 
-    { if (isset($tables)) 
-      { $lesTables = explode("|",$tables); 
-       } 
-      if (isset($table)) 
-      { $lesTables[] = $table; 
-        } 
-} 
-
-$multiTable = 0; 
-if (sizeof($lesTables)> 1) 
-   { $multiTable = 1; 
-      while ( list( $key, $table ) = each($lesTables)) 
-            { echo '['.$table. ']'; 
-             } 
-      } 
-      reset($lesTables); 
-      while ( list( $key, $table ) = each($lesTables)) 
-          { 
-          if ($multiTable) echo '<div style="page-break-after: 
-                        always;"><H1>'.$table. '</H1>'; 
-
-          //end of add by Moosh 
 
 /**
- * Gets table informations
+ * Multi-tables printview thanks to Christophe Gesch<63> from the "MySQL Form
+ * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/)
  */
-// The 'show table' statement works correct since 3.23.03
+if (is_array($selected_tbl)) {
-if (PMA_MYSQL_INT_VERSION >= 32303) {
+    $the_tables   = $selected_tbl;
-    $local_query  = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'';
+} else if (isset($table)) {
+    $the_tables[] = $table; 
+}
+$multi_tables     = (count($the_tables) > 1);
+
+if ($multi_tables) {
+    while (list($key, $table) = each($the_tables)) {
+        echo '[' . $table . '] ';
+    }
+} // end if
+reset($the_tables);
+
+while (list($key, $table) = each($the_tables)) {
+    if ($multi_tables) {
+        echo '<div style="page-break-after: always;">' . "\n";
+        echo '<h1>' . $table . '</h1>' . "\n";
+    } // end if
+
+    /**
+     * Gets table informations
+     */
+    // The 'show table' statement works correct since 3.23.03
+    if (PMA_MYSQL_INT_VERSION >= 32303) {
+        $local_query  = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'';
+        $result       = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
+        $showtable    = mysql_fetch_array($result);
+        $num_rows     = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
+        $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
+    } else {
+        $local_query  = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table);
+        $result       = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
+        $showtable    = array();
+        $num_rows     = mysql_result($result, 0, 'count');
+        $show_comment = '';
+    } // end display comments
+    if ($result) {
+        mysql_free_result($result);
+    }
+
+
+    /**
+     * Gets table keys and retains them
+     */
+    $local_query  = 'SHOW KEYS FROM ' . PMA_backquote($table);
     $result       = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
-    $showtable    = mysql_fetch_array($result);
+    $primary      = '';
-    $num_rows     = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
+    $indexes      = array();
-    $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
+    $lastIndex    = '';
-} else {
+    $indexes_info = array();
-    $local_query  = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table);
+    $indexes_data = array();
-    $result       = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
+    $pk_array     = array(); // will be use to emphasis prim. keys in the table
-    $showtable    = array();
+                             // view
-    $num_rows     = mysql_result($result, 0, 'count');
+    while ($row = mysql_fetch_array($result)) {
-    $show_comment = '';
+        // Backups the list of primary keys
-} // end display comments
+        if ($row['Key_name'] == 'PRIMARY') {
-if ($result) {
+            $primary .= $row['Column_name'] . ', ';
-    mysql_free_result($result);
+            $pk_array[$row['Column_name']] = 1;
-}
+        }
+        // Retains keys informations
+        if ($row['Key_name'] != $lastIndex ){
+            $indexes[] = $row['Key_name'];
+            $lastIndex = $row['Key_name'];
+        }
+        $indexes_info[$row['Key_name']]['Sequences'][]     = $row['Seq_in_index'];
+        $indexes_info[$row['Key_name']]['Non_unique']      = $row['Non_unique'];
+        if (isset($row['Cardinality'])) {
+            $indexes_info[$row['Key_name']]['Cardinality'] = $row['Cardinality'];
+        }
+//      I don't know what does following column mean....
+//      $indexes_info[$row['Key_name']]['Packed']          = $row['Packed'];
+        $indexes_info[$row['Key_name']]['Comment']         = $row['Comment'];
 
+        $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name']  = $row['Column_name'];
+        if (isset($row['Sub_part'])) {
+            $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part'];
+        }
 
-/**
+    } // end while
- * Gets table keys and retains them
+    if ($result) {
- */
+        mysql_free_result($result);
-$local_query  = 'SHOW KEYS FROM ' . PMA_backquote($table);
-$result       = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
-$primary      = '';
-$indexes      = array();
-$lastIndex    = '';
-$indexes_info = array();
-$indexes_data = array();
-$pk_array     = array(); // will be use to emphasis prim. keys in the table view
-while ($row = mysql_fetch_array($result)) {
-    // Backups the list of primary keys
-    if ($row['Key_name'] == 'PRIMARY') {
-        $primary .= $row['Column_name'] . ', ';
-        $pk_array[$row['Column_name']] = 1;
-    }
-    // Retains keys informations
-    if ($row['Key_name'] != $lastIndex ){
-        $indexes[] = $row['Key_name'];
-        $lastIndex = $row['Key_name'];
-    }
-    $indexes_info[$row['Key_name']]['Sequences'][]     = $row['Seq_in_index'];
-    $indexes_info[$row['Key_name']]['Non_unique']      = $row['Non_unique'];
-    if (isset($row['Cardinality'])) {
-        $indexes_info[$row['Key_name']]['Cardinality'] = $row['Cardinality'];
-    }
-//    I don't know what does following column mean....
-//    $indexes_info[$row['Key_name']]['Packed']          = $row['Packed'];
-    $indexes_info[$row['Key_name']]['Comment']         = $row['Comment'];
-
-    $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name']  = $row['Column_name'];
-    if (isset($row['Sub_part'])) {
-        $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part'];
     }
 
-} // end while
+    /**
-if ($result) {
+     * Gets fields properties
-    mysql_free_result($result);
+     */
-}
+    $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table);
-
+    $result      = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
-/**
+    $fields_cnt  = mysql_num_rows($result);
- * Gets fields properties
- */
-$local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table);
-$result      = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
-$fields_cnt  = mysql_num_rows($result);
 
 
 
-/**
+    /**
- * Displays the comments of the table is MySQL >= 3.23
+     * Displays the comments of the table is MySQL >= 3.23
- */
+     */
-if (!empty($show_comment)) {
+    if (!empty($show_comment)) {
-    echo $strTableComments . '&nbsp;:&nbsp;' . $row['Comment'];
+        echo $strTableComments . '&nbsp;:&nbsp;' . $row['Comment'];
-}
+    }
 
 
-/**
+    /**
- * Displays the table structure
+     * Displays the table structure
- */
+     */
-?>
+    ?>
 
 <!-- TABLE INFORMATIONS -->
 <table border="<?php echo $cfgBorder; ?>">
@@ -148,56 +155,56 @@ if (!empty($show_comment)) {
     <th><?php echo ucfirst($strExtra); ?></th>
 </tr>
 
-<?php
+    <?php
-$i = 0;
+    $i = 0;
-while ($row = mysql_fetch_array($result)) {
+    while ($row = mysql_fetch_array($result)) {
-    $bgcolor = ($i % 2) ?$cfgBgcolorOne : $cfgBgcolorTwo;
+        $bgcolor = ($i % 2) ?$cfgBgcolorOne : $cfgBgcolorTwo;
-    $i++;
+        $i++;
 
-    $type             = $row['Type'];
+        $type             = $row['Type'];
-    // reformat mysql query output - staybyte - 9. June 2001
+        // reformat mysql query output - staybyte - 9. June 2001
-    $shorttype        = substr($type, 0, 3);
+        $shorttype        = substr($type, 0, 3);
-    if ($shorttype == 'set' || $shorttype == 'enu') {
+        if ($shorttype == 'set' || $shorttype == 'enu') {
-        $type         = eregi_replace(',', ', ', $type);
+            $type         = eregi_replace(',', ', ', $type);
-        // Removes automatic MySQL escape format
+            // Removes automatic MySQL escape format
-        $type         = str_replace('\'\'', '\\\'', $type);
+            $type         = str_replace('\'\'', '\\\'', $type);
-        $type_nowrap  = '';
+            $type_nowrap  = '';
-    } else {
+        } else {
-        $type_nowrap  = ' nowrap="nowrap"';
+            $type_nowrap  = ' nowrap="nowrap"';
-    }
-    $type             = eregi_replace('BINARY', '', $type);
-    $type             = eregi_replace('ZEROFILL', '', $type);
-    $type             = eregi_replace('UNSIGNED', '', $type);
-    if (empty($type)) {
-        $type         = '&nbsp;';
-    }
-
-    $binary           = eregi('BINARY', $row['Type'], $test);
-    $unsigned         = eregi('UNSIGNED', $row['Type'], $test);
-    $zerofill         = eregi('ZEROFILL', $row['Type'], $test);
-    $strAttribute     = '&nbsp;';
-    if ($binary) {
-        $strAttribute = 'BINARY';
-    }
-    if ($unsigned) {
-        $strAttribute = 'UNSIGNED';
-    }
-    if ($zerofill) {
-        $strAttribute = 'UNSIGNED ZEROFILL';
-    }
-    if (!isset($row['Default'])) {
-        if ($row['Null'] != '') {
-            $row['Default'] = '<i>NULL</i>';
         }
-    } else {
+        $type             = eregi_replace('BINARY', '', $type);
-        $row['Default'] = htmlspecialchars($row['Default']);
+        $type             = eregi_replace('ZEROFILL', '', $type);
-    }
+        $type             = eregi_replace('UNSIGNED', '', $type);
-    $field_name = htmlspecialchars($row['Field']);
+        if (empty($type)) {
-    if (isset($pk_array[$row['Field']])) {
+            $type         = '&nbsp;';
-        $field_name = '<u>' . $field_name . '</u>';
+        }
-    }
+
-    echo "\n";
+        $binary           = eregi('BINARY', $row['Type'], $test);
-    ?>
+        $unsigned         = eregi('UNSIGNED', $row['Type'], $test);
+        $zerofill         = eregi('ZEROFILL', $row['Type'], $test);
+        $strAttribute     = '&nbsp;';
+        if ($binary) {
+            $strAttribute = 'BINARY';
+        }
+        if ($unsigned) {
+            $strAttribute = 'UNSIGNED';
+        }
+        if ($zerofill) {
+            $strAttribute = 'UNSIGNED ZEROFILL';
+        }
+        if (!isset($row['Default'])) {
+            if ($row['Null'] != '') {
+                $row['Default'] = '<i>NULL</i>';
+            }
+        } else {
+            $row['Default'] = htmlspecialchars($row['Default']);
+        }
+        $field_name = htmlspecialchars($row['Field']);
+        if (isset($pk_array[$row['Field']])) {
+            $field_name = '<u>' . $field_name . '</u>';
+        }
+        echo "\n";
+        ?>
 <tr>
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $field_name; ?>&nbsp;</td>
     <td bgcolor="<?php echo $bgcolor; ?>"<?php echo $type_nowrap; ?>><?php echo $type; ?><bdo dir="ltr"></bdo></td>
@@ -206,24 +213,25 @@ while ($row = mysql_fetch_array($result)) {
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?>&nbsp;</td>
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td>
 </tr>
-    <?php
+        <?php
-} // end while
+    } // end while
-mysql_free_result($result);
+    mysql_free_result($result);
 
-echo "\n";
+    echo "\n";
-?>
+    ?>
 </table>
 
 
-<?php
+    <?php
-/**
+    /**
- * Displays indexes
+     * Displays indexes
- */
+     */
-$index_count = (isset($indexes))
+    $index_count = (isset($indexes))
-             ? count($indexes)
+                 ? count($indexes)
-             : 0;
+                 : 0;
-if ($index_count > 0) {
+    if ($index_count > 0) {
-    ?>
+    	echo "\n";
+        ?>
 <br /><br />
 
 <!-- Indexes -->
@@ -235,93 +243,94 @@ if ($index_count > 0) {
         <th><?php echo $strCardinality; ?></th>
         <th colspan="2"><?php echo $strField; ?></th>
     </tr>
-    <?php
+        <?php
-    echo "\n";
+        echo "\n";
-    while (list($index_no, $index_name) = each($indexes)) {
+        while (list($index_no, $index_name) = each($indexes)) {
-        $cell_bgd = (($index_no % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo);
+            $cell_bgd = (($index_no % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo);
-        $index_td = '            <td bgcolor="' . $cell_bgd . '" rowspan="' . count($indexes_info[$index_name]['Sequences']) . '">' . "\n";
+            $index_td = '            <td bgcolor="' . $cell_bgd . '" rowspan="' . count($indexes_info[$index_name]['Sequences']) . '">' . "\n";
-        echo '        <tr>' . "\n";
+            echo '        <tr>' . "\n";
-        echo $index_td
+            echo $index_td
-             . '                ' . htmlspecialchars($index_name) . "\n"
+                 . '                ' . htmlspecialchars($index_name) . "\n"
-             . '            </td>' . "\n";
+                 . '            </td>' . "\n";
 
-        if ($indexes_info[$index_name]['Comment'] == 'FULLTEXT') {
+            if ($indexes_info[$index_name]['Comment'] == 'FULLTEXT') {
-            $index_type = 'FULLTEXT';
+                $index_type = 'FULLTEXT';
-        } else if ($index_name == 'PRIMARY') {
+            } else if ($index_name == 'PRIMARY') {
-            $index_type = 'PRIMARY';
+                $index_type = 'PRIMARY';
-        } else if ($indexes_info[$index_name]['Non_unique'] == '0') {
+            } else if ($indexes_info[$index_name]['Non_unique'] == '0') {
-            $index_type = 'UNIQUE';
+                $index_type = 'UNIQUE';
-        } else {
-            $index_type = 'INDEX';
-        }
-        echo $index_td
-             . '                ' . $index_type . "\n"
-             . '            </td>' . "\n";
-
-        echo $index_td
-             . '                ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . "\n"
-             . '            </td>' . "\n";
-
-        while (list($row_no, $seq_index) = each($indexes_info[$index_name]['Sequences'])) {
-            if ($row_no > 0) {
-                echo '        <tr>' . "\n";
-            }
-            if (!empty($indexes_data[$index_name][$seq_index]['Sub_part'])) {
-                echo '            <td bgcolor="' . $cell_bgd . '">' . "\n"
-                     . '                ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n"
-                     . '            </td>' . "\n";
-                echo '            <td align="right" bgcolor="' . $cell_bgd . '">' . "\n"
-                     . '                ' . $indexes_data[$index_name][$seq_index]['Sub_part'] . "\n"
-                     . '            </td>' . "\n";
-                echo '        </tr>' . "\n";
             } else {
-                echo '            <td bgcolor="' . $cell_bgd . '" colspan="2">' . "\n"
+                $index_type = 'INDEX';
-                     . '                ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n"
-                     . '            </td>' . "\n";
-                echo '        </tr>' . "\n";
             }
+            echo $index_td
+                 . '                ' . $index_type . "\n"
+                 . '            </td>' . "\n";
+
+            echo $index_td
+                 . '                ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . "\n"
+                 . '            </td>' . "\n";
+
+            while (list($row_no, $seq_index) = each($indexes_info[$index_name]['Sequences'])) {
+                if ($row_no > 0) {
+                    echo '        <tr>' . "\n";
+                }
+                if (!empty($indexes_data[$index_name][$seq_index]['Sub_part'])) {
+                    echo '            <td bgcolor="' . $cell_bgd . '">' . "\n"
+                         . '                ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n"
+                         . '            </td>' . "\n";
+                    echo '            <td align="right" bgcolor="' . $cell_bgd . '">' . "\n"
+                         . '                ' . $indexes_data[$index_name][$seq_index]['Sub_part'] . "\n"
+                         . '            </td>' . "\n";
+                    echo '        </tr>' . "\n";
+                } else {
+                    echo '            <td bgcolor="' . $cell_bgd . '" colspan="2">' . "\n"
+                         . '                ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n"
+                         . '            </td>' . "\n";
+                    echo '        </tr>' . "\n";
+                }
+            } // end while
         } // end while
-    } // end while
+        echo "\n";
-    ?>
-</table>
-    <?php
-    echo "\n";
-} // end display indexes
-
-
-/**
- * Displays Space usage and row statistics
- *
- * staybyte - 9 June 2001
- */
-if ($cfgShowStats) {
-    $nonisam     = FALSE;
-    if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) {
-        $nonisam = TRUE;
-    }
-    if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE) {
-        // Gets some sizes
-        $mergetable     = FALSE;
-        if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') {
-            $mergetable = TRUE;
-        }
-        list($data_size, $data_unit)         = PMA_formatByteDown($showtable['Data_length']);
-        if ($mergetable == FALSE) {
-            list($index_size, $index_unit)   = PMA_formatByteDown($showtable['Index_length']);
-        }
-        if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) {
-            list($free_size, $free_unit)     = PMA_formatByteDown($showtable['Data_free']);
-            list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']);
-        } else {
-            list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
-        }
-        list($tot_size, $tot_unit)           = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
-        if ($num_rows > 0) {
-            list($avg_size, $avg_unit)       = PMA_formatByteDown(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1);
-        }
-
-        // Displays them
         ?>
+</table>
+        <?php
+        echo "\n";
+    } // end display indexes
+
+
+    /**
+     * Displays Space usage and row statistics
+     *
+     * staybyte - 9 June 2001
+     */
+    if ($cfgShowStats) {
+        $nonisam     = FALSE;
+        if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) {
+            $nonisam = TRUE;
+        }
+        if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE) {
+            // Gets some sizes
+            $mergetable     = FALSE;
+            if (isset($showtable['Type']) && $showtable['Type'] == 'MRG_MyISAM') {
+                $mergetable = TRUE;
+            }
+            list($data_size, $data_unit)         = PMA_formatByteDown($showtable['Data_length']);
+            if ($mergetable == FALSE) {
+                list($index_size, $index_unit)   = PMA_formatByteDown($showtable['Index_length']);
+            }
+            if (isset($showtable['Data_free']) && $showtable['Data_free'] > 0) {
+                list($free_size, $free_unit)     = PMA_formatByteDown($showtable['Data_free']);
+                list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length'] - $showtable['Data_free']);
+            } else {
+                list($effect_size, $effect_unit) = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
+            }
+            list($tot_size, $tot_unit)           = PMA_formatByteDown($showtable['Data_length'] + $showtable['Index_length']);
+            if ($num_rows > 0) {
+                list($avg_size, $avg_unit)       = PMA_formatByteDown(($showtable['Data_length'] + $showtable['Index_length']) / $showtable['Rows'], 6, 1);
+            }
+
+            // Displays them
+            ?>
 <br /><br />
 
 <table border="0" cellspacing="0" cellpadding="0">
@@ -340,20 +349,20 @@ if ($cfgShowStats) {
             <td align="right" bgcolor="<?php echo $cfgBgcolorTwo; ?>" nowrap="nowrap"><?php echo $data_size; ?></td>
             <td bgcolor="<?php echo $cfgBgcolorTwo; ?>"><?php echo $data_unit; ?></td>
         </tr>
-        <?php
+            <?php
-        if (isset($index_size)) {
+            if (isset($index_size)) {
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
             <tr>
                 <td bgcolor="<?php echo $cfgBgcolorTwo; ?>" style="padding-right: 10px"><?php echo ucfirst($strIndex); ?></td>
                 <td align="right" bgcolor="<?php echo $cfgBgcolorTwo; ?>" nowrap="nowrap"><?php echo $index_size; ?></td>
                 <td bgcolor="<?php echo $cfgBgcolorTwo; ?>"><?php echo $index_unit; ?></td>
             </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($free_size)) {
+            if (isset($free_size)) {
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr style="color: #bb0000">
             <td bgcolor="<?php echo $cfgBgcolorTwo; ?>" style="padding-right: 10px"><?php echo ucfirst($strOverhead); ?></td>
             <td align="right" bgcolor="<?php echo $cfgBgcolorTwo; ?>" nowrap="nowrap"><?php echo $free_size; ?></td>
@@ -364,20 +373,20 @@ if ($cfgShowStats) {
             <td align="right" bgcolor="<?php echo $cfgBgcolorOne; ?>" nowrap="nowrap"><?php echo $effect_size; ?></td>
             <td bgcolor="<?php echo $cfgBgcolorOne; ?>"><?php echo $effect_unit; ?></td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($tot_size) && $mergetable == FALSE) {
+            if (isset($tot_size) && $mergetable == FALSE) {
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr>
             <td bgcolor="<?php echo $cfgBgcolorOne; ?>" style="padding-right: 10px"><?php echo ucfirst($strTotal); ?></td>
             <td align="right" bgcolor="<?php echo $cfgBgcolorOne; ?>" nowrap="nowrap"><?php echo $tot_size; ?></td>
             <td bgcolor="<?php echo $cfgBgcolorOne; ?>"><?php echo $tot_unit; ?></td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        echo "\n";
+            echo "\n";
-        ?>
+            ?>
         </table>
     </td>
 
@@ -391,33 +400,33 @@ if ($cfgShowStats) {
             <th><?php echo $strStatement; ?></th>
             <th align="center"><?php echo $strValue; ?></th>
         </tr>
-        <?php
+            <?php
-        $i = 0;
+            $i = 0;
-        if (isset($showtable['Row_format'])) {
+            if (isset($showtable['Row_format'])) {
-            $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
+                $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr>
             <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ucfirst($strFormat); ?></td>
             <td align="<?php echo $cell_align_left; ?>" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
-            <?php
+                <?php
-            echo '                ';
+                echo '                ';
-            if ($showtable['Row_format'] == 'Fixed') {
+                if ($showtable['Row_format'] == 'Fixed') {
-                echo $strFixed;
+                    echo $strFixed;
-            } else if ($showtable['Row_format'] == 'Dynamic') {
+                } else if ($showtable['Row_format'] == 'Dynamic') {
-                echo $strDynamic;
+                    echo $strDynamic;
-            } else {
+                } else {
-                echo $showtable['Row_format'];
+                    echo $showtable['Row_format'];
-            }
+                }
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
             </td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($showtable['Rows'])) {
+            if (isset($showtable['Rows'])) {
-            $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
+                $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
-            echo "\n";
+                echo "\n";
             ?>
         <tr>
             <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ucfirst($strRows); ?></td>
@@ -425,69 +434,67 @@ if ($cfgShowStats) {
                 <?php echo number_format($showtable['Rows'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; ?>
             </td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) {
+            if (isset($showtable['Avg_row_length']) && $showtable['Avg_row_length'] > 0) {
-            $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
+                $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr>
             <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ucfirst($strRowLength); ?>&nbsp;&oslash;</td>
             <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
                 <?php echo number_format($showtable['Avg_row_length'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; ?>
             </td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) {
+            if (isset($showtable['Data_length']) && $showtable['Rows'] > 0 && $mergetable == FALSE) {
-            $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
+                $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr>
             <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ucfirst($strRowSize); ?>&nbsp;&oslash;</td>
             <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
                 <?php echo $avg_size . ' ' . $avg_unit . "\n"; ?>
             </td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        if (isset($showtable['Auto_increment'])) {
+            if (isset($showtable['Auto_increment'])) {
-            $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
+                $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne);
-            echo "\n";
+                echo "\n";
-            ?>
+                ?>
         <tr>
             <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ucfirst($strNext); ?>&nbsp;Autoindex</td>
             <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
                 <?php echo number_format($showtable['Auto_increment'], 0, $number_decimal_separator, $number_thousands_separator) . "\n"; ?>
             </td>
         </tr>
-            <?php
+                <?php
-        }
+            }
-        echo "\n";
+            echo "\n";
-        ?>
+            ?>
         </table>
     </td>
 </tr>
 </table>
 
-        <?php
+            <?php
-    } // end if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE)
+        } // end if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE)
-} // end if ($cfgShowStats)
+    } // end if ($cfgShowStats)
 
-//ajout Moosh 
+    echo "\n";
+    if ($multi_tables) {
+        unset($ret_keys);
+        unset($num_rows);
+        unset($show_comment);
+        echo '</div>' . "\n";
+        echo '<hr />' . "\n";
+    } // end if
+
+} // end while
 
 
- if ($multiTable) 
- { //nettoyer les valeurs 
-    unset($ret_keys); 
-    unset($num_rows); 
-    unset($show_comment); 
-
-    echo '</DIV><HR>'; 
- } 
-} 
-
-//fin ajout Moosh 
 
 /**
  * Displays the footer