From e817bfe6f2ac8e02a229b283d8282130f86f20ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Thu, 6 Dec 2001 19:35:14 +0000 Subject: [PATCH] beautify the code and the results of the patch #484112 --- db_details.php3 | 24 +- mult_submits.inc.php3 | 21 +- tbl_printview.php3 | 661 +++++++++++++++++++++--------------------- 3 files changed, 350 insertions(+), 356 deletions(-) diff --git a/db_details.php3 b/db_details.php3 index c6f3b9466..1e250337e 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -327,6 +327,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) {    +    + @@ -450,27 +452,6 @@ if ($num_tables > 0) {
  • - - -
    - "; - echo ""; - echo "
    "; - -// end of Add by Moosh - - ?>

    • +
    1) - { $multiTable = 1; - while ( list( $key, $table ) = each($lesTables)) - { echo '['.$table. ']'; - } - } - reset($lesTables); - while ( list( $key, $table ) = each($lesTables)) - { - if ($multiTable) echo '

    '.$table. '

    '; - - //end of add by Moosh /** - * Gets table informations + * Multi-tables printview thanks to Christophe Gesché from the "MySQL Form + * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/) */ -// 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) . '\''; +if (is_array($selected_tbl)) { + $the_tables = $selected_tbl; +} 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 '
    ' . "\n"; + echo '

    ' . $table . '

    ' . "\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); - $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); -} + $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']; + } -/** - * 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); -$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) { + mysql_free_result($result); } -} // end while -if ($result) { - mysql_free_result($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); + /** + * 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 - */ -if (!empty($show_comment)) { - echo $strTableComments . ' : ' . $row['Comment']; -} + /** + * Displays the comments of the table is MySQL >= 3.23 + */ + if (!empty($show_comment)) { + echo $strTableComments . ' : ' . $row['Comment']; + } -/** - * Displays the table structure - */ -?> + /** + * Displays the table structure + */ + ?> @@ -148,56 +155,56 @@ if (!empty($show_comment)) { -NULL'; + $type = $row['Type']; + // reformat mysql query output - staybyte - 9. June 2001 + $shorttype = substr($type, 0, 3); + if ($shorttype == 'set' || $shorttype == 'enu') { + $type = eregi_replace(',', ', ', $type); + // Removes automatic MySQL escape format + $type = str_replace('\'\'', '\\\'', $type); + $type_nowrap = ''; + } else { + $type_nowrap = ' nowrap="nowrap"'; } - } else { - $row['Default'] = htmlspecialchars($row['Default']); - } - $field_name = htmlspecialchars($row['Field']); - if (isset($pk_array[$row['Field']])) { - $field_name = '' . $field_name . ''; - } - echo "\n"; - ?> + $type = eregi_replace('BINARY', '', $type); + $type = eregi_replace('ZEROFILL', '', $type); + $type = eregi_replace('UNSIGNED', '', $type); + if (empty($type)) { + $type = ' '; + } + + $binary = eregi('BINARY', $row['Type'], $test); + $unsigned = eregi('UNSIGNED', $row['Type'], $test); + $zerofill = eregi('ZEROFILL', $row['Type'], $test); + $strAttribute = ' '; + if ($binary) { + $strAttribute = 'BINARY'; + } + if ($unsigned) { + $strAttribute = 'UNSIGNED'; + } + if ($zerofill) { + $strAttribute = 'UNSIGNED ZEROFILL'; + } + if (!isset($row['Default'])) { + if ($row['Null'] != '') { + $row['Default'] = 'NULL'; + } + } else { + $row['Default'] = htmlspecialchars($row['Default']); + } + $field_name = htmlspecialchars($row['Field']); + if (isset($pk_array[$row['Field']])) { + $field_name = '' . $field_name . ''; + } + echo "\n"; + ?> @@ -206,24 +213,25 @@ while ($row = mysql_fetch_array($result)) { - + echo "\n"; + ?>
      >   
    - 0) { - ?> + 0) { + echo "\n"; + ?>

    @@ -235,93 +243,94 @@ if ($index_count > 0) { - ' . "\n"; - echo ' ' . "\n"; - echo $index_td - . ' ' . htmlspecialchars($index_name) . "\n" - . ' ' . "\n"; + ' . "\n"; + echo ' ' . "\n"; + echo $index_td + . ' ' . htmlspecialchars($index_name) . "\n" + . ' ' . "\n"; - if ($indexes_info[$index_name]['Comment'] == 'FULLTEXT') { - $index_type = 'FULLTEXT'; - } else if ($index_name == 'PRIMARY') { - $index_type = 'PRIMARY'; - } else if ($indexes_info[$index_name]['Non_unique'] == '0') { - $index_type = 'UNIQUE'; - } else { - $index_type = 'INDEX'; - } - echo $index_td - . ' ' . $index_type . "\n" - . ' ' . "\n"; - - echo $index_td - . ' ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . "\n" - . ' ' . "\n"; - - while (list($row_no, $seq_index) = each($indexes_info[$index_name]['Sequences'])) { - if ($row_no > 0) { - echo ' ' . "\n"; - } - if (!empty($indexes_data[$index_name][$seq_index]['Sub_part'])) { - echo ' ' . "\n" - . ' ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n" - . ' ' . "\n"; - echo ' ' . "\n" - . ' ' . $indexes_data[$index_name][$seq_index]['Sub_part'] . "\n" - . ' ' . "\n"; - echo ' ' . "\n"; + if ($indexes_info[$index_name]['Comment'] == 'FULLTEXT') { + $index_type = 'FULLTEXT'; + } else if ($index_name == 'PRIMARY') { + $index_type = 'PRIMARY'; + } else if ($indexes_info[$index_name]['Non_unique'] == '0') { + $index_type = 'UNIQUE'; } else { - echo ' ' . "\n" - . ' ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n" - . ' ' . "\n"; - echo ' ' . "\n"; + $index_type = 'INDEX'; } + echo $index_td + . ' ' . $index_type . "\n" + . ' ' . "\n"; + + echo $index_td + . ' ' . (isset($indexes_info[$index_name]['Cardinality']) ? $indexes_info[$index_name]['Cardinality'] : $strNone) . "\n" + . ' ' . "\n"; + + while (list($row_no, $seq_index) = each($indexes_info[$index_name]['Sequences'])) { + if ($row_no > 0) { + echo ' ' . "\n"; + } + if (!empty($indexes_data[$index_name][$seq_index]['Sub_part'])) { + echo ' ' . "\n" + . ' ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n" + . ' ' . "\n"; + echo ' ' . "\n" + . ' ' . $indexes_data[$index_name][$seq_index]['Sub_part'] . "\n" + . ' ' . "\n"; + echo ' ' . "\n"; + } else { + echo ' ' . "\n" + . ' ' . $indexes_data[$index_name][$seq_index]['Column_name'] . "\n" + . ' ' . "\n"; + echo ' ' . "\n"; + } + } // end while } // end while - } // end while - ?> - - = 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 + echo "\n"; ?> + + = 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 + ?>

    @@ -340,20 +349,20 @@ if ($cfgShowStats) { - + - + @@ -364,20 +373,20 @@ if ($cfgShowStats) { - + - +
    @@ -391,33 +400,33 @@ if ($cfgShowStats) { - + - + - @@ -425,69 +434,67 @@ if ($cfgShowStats) { - 0) { - $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); - echo "\n"; - ?> + 0) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); + echo "\n"; + ?>  ø - 0 && $mergetable == FALSE) { - $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); - echo "\n"; - ?> + 0 && $mergetable == FALSE) { + $bgcolor = ((++$i%2) ? $cfgBgcolorTwo : $cfgBgcolorOne); + echo "\n"; + ?>  ø - +  Autoindex - + - = 32303 && $nonisam == FALSE) -} // end if ($cfgShowStats) + = 32303 && $nonisam == FALSE) + } // end if ($cfgShowStats) -//ajout Moosh + echo "\n"; + if ($multi_tables) { + unset($ret_keys); + unset($num_rows); + unset($show_comment); + echo '
    ' . "\n"; + echo '
    ' . "\n"; + } // end if + +} // end while - if ($multiTable) - { //nettoyer les valeurs - unset($ret_keys); - unset($num_rows); - unset($show_comment); - - echo '
    '; - } -} - -//fin ajout Moosh /** * Displays the footer