nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beautify the code and the results of the patch #484112

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-12-06 19:35:14 +00:00
parent d5b7987aaa
commit e817bfe6f2
3 changed files with 350 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
db_details.php3
View File

@@ -327,6 +327,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) {
<input type="submit" name="submit_mult" value="<?php echo $strDrop; ?>" /> <input type="submit" name="submit_mult" value="<?php echo $strDrop; ?>" />
&nbsp;<i><?php echo $strOr; ?></i>&nbsp; &nbsp;<i><?php echo $strOr; ?></i>&nbsp;
<input type="submit" name="submit_mult" value="<?php echo $strEmpty; ?>" /> <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> </td>
</tr> </tr>
</table> </table>
@@ -450,27 +452,6 @@ if ($num_tables > 0) {
<!-- Printable view of a table --> <!-- Printable view of a table -->
<li> <li>
<div style="margin-bottom: 10px"><a href="db_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div> <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> </li>
<?php <?php
} }
@@ -506,6 +487,7 @@ if ($is_upload) {
?> ?>
<div style="margin-bottom: 5px"> <div style="margin-bottom: 5px">
<input type="file" name="sql_file" /><br /> <input type="file" name="sql_file" /><br />
</div>
<?php <?php
} // end if } // end if
echo "\n"; echo "\n";

7
mult_submits.inc.php3
View File

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

171
tbl_printview.php3
View File

@@ -5,18 +5,27 @@
/** /**
* Gets the variables sent or posted to this script, then displays headers * 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 * Defines the url to return to in case of error in a sql statement
*/ */
$err_url = 'tbl_properties.php3' if (isset($table)) {
$err_url = 'tbl_properties.php3'
. '?lang=' . $lang . '?lang=' . $lang
. '&amp;server=' . $server . '&amp;server=' . $server
. '&amp;db=' . urlencode($db) . '&amp;db=' . urlencode($db)
. '&amp;table=' . urlencode($table); . '&amp;table=' . urlencode($table);
} else {
$err_url = 'db_details.php3'
. '?lang=' . $lang
. '&amp;server=' . $server
. '&amp;db=' . urlencode($db);
}
/** /**
@@ -24,68 +33,66 @@ $err_url = 'tbl_properties.php3'
*/ */
mysql_select_db($db); 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
/** /**
* Multi-tables printview thanks to Christophe Gesch<63> from the "MySQL Form
* Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/)
*/
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 '<div style="page-break-after: always;">' . "\n";
echo '<h1>' . $table . '</h1>' . "\n";
} // end if
/**
* Gets table informations * Gets table informations
*/ */
// The 'show table' statement works correct since 3.23.03 // The 'show table' statement works correct since 3.23.03
if (PMA_MYSQL_INT_VERSION >= 32303) { if (PMA_MYSQL_INT_VERSION >= 32303) {
$local_query = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\''; $local_query = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'';
$result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url); $result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
$showtable = mysql_fetch_array($result); $showtable = mysql_fetch_array($result);
$num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); $num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
$show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
} else { } else {
$local_query = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table); $local_query = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table);
$result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url); $result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
$showtable = array(); $showtable = array();
$num_rows = mysql_result($result, 0, 'count'); $num_rows = mysql_result($result, 0, 'count');
$show_comment = ''; $show_comment = '';
} // end display comments } // end display comments
if ($result) { if ($result) {
mysql_free_result($result); mysql_free_result($result);
} }
/** /**
* Gets table keys and retains them * Gets table keys and retains them
*/ */
$local_query = 'SHOW KEYS FROM ' . PMA_backquote($table); $local_query = 'SHOW KEYS FROM ' . PMA_backquote($table);
$result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url); $result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
$primary = ''; $primary = '';
$indexes = array(); $indexes = array();
$lastIndex = ''; $lastIndex = '';
$indexes_info = array(); $indexes_info = array();
$indexes_data = array(); $indexes_data = array();
$pk_array = array(); // will be use to emphasis prim. keys in the table view $pk_array = array(); // will be use to emphasis prim. keys in the table
while ($row = mysql_fetch_array($result)) { // view
while ($row = mysql_fetch_array($result)) {
// Backups the list of primary keys // Backups the list of primary keys
if ($row['Key_name'] == 'PRIMARY') { if ($row['Key_name'] == 'PRIMARY') {
$primary .= $row['Column_name'] . ', '; $primary .= $row['Column_name'] . ', ';
@@ -110,32 +117,32 @@ while ($row = mysql_fetch_array($result)) {
$indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part']; $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part'];
} }
} // end while } // end while
if ($result) { if ($result) {
mysql_free_result($result); mysql_free_result($result);
} }
/** /**
* Gets fields properties * Gets fields properties
*/ */
$local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table); $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($table);
$result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url); $result = mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url);
$fields_cnt = mysql_num_rows($result); $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 INFORMATIONS -->
<table border="<?php echo $cfgBorder; ?>"> <table border="<?php echo $cfgBorder; ?>">
@@ -148,9 +155,9 @@ if (!empty($show_comment)) {
<th><?php echo ucfirst($strExtra); ?></th> <th><?php echo ucfirst($strExtra); ?></th>
</tr> </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++;
@@ -207,22 +214,23 @@ while ($row = mysql_fetch_array($result)) {
<td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td> <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td>
</tr> </tr>
<?php <?php
} // end while } // end while
mysql_free_result($result); mysql_free_result($result);
echo "\n"; echo "\n";
?> ?>
</table> </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 /> <br /><br />
@@ -282,19 +290,20 @@ if ($index_count > 0) {
} }
} // end while } // end while
} // end while } // end while
echo "\n";
?> ?>
</table> </table>
<?php <?php
echo "\n"; echo "\n";
} // end display indexes } // end display indexes
/** /**
* Displays Space usage and row statistics * Displays Space usage and row statistics
* *
* staybyte - 9 June 2001 * staybyte - 9 June 2001
*/ */
if ($cfgShowStats) { if ($cfgShowStats) {
$nonisam = FALSE; $nonisam = FALSE;
if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) { if (isset($showtable['Type']) && !eregi('ISAM|HEAP', $showtable['Type'])) {
$nonisam = TRUE; $nonisam = TRUE;
@@ -472,22 +481,20 @@ if ($cfgShowStats) {
<?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) {
if ($multiTable)
{ //nettoyer les valeurs
unset($ret_keys); unset($ret_keys);
unset($num_rows); unset($num_rows);
unset($show_comment); unset($show_comment);
echo '</div>' . "\n";
echo '<hr />' . "\n";
} // end if
} // end while
echo '</DIV><HR>';
}
}
//fin ajout Moosh
/** /**
* Displays the footer * Displays the footer