From 7dd2e62d3de9d724902a39f04e019fee991a90d4 Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Thu, 13 Oct 2005 09:34:56 +0000 Subject: [PATCH] XHTML compl. --- ChangeLog | 2 + css/phpmyadmin.css.php | 2 +- libraries/display_import.lib.php | 73 ++++++++++++++++----------- server_processlist.php | 86 +++++++++++++++----------------- 4 files changed, 87 insertions(+), 76 deletions(-) diff --git a/ChangeLog b/ChangeLog index 538df31bd..2185c27d9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ $Source$ * left.php: preselect db if only one db * server_privileges.php: XHTML compl., NOTICE, Icons for Edit/Revoke Links + * server_processlist.php, libraries/display_import.lib.php, + css/phpmyadmin.css.php: XHTML compl. 2005-10-12 Sebastian Mendel * css/phpmyadmin.css.php, libraries/common.lib.php, diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index 7b83308c2..fc611fecf 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -182,7 +182,7 @@ div#queryboxcontainer div#bookmarkoptions { } fieldset .formelement { - line-height: 2.3em; + line-height: 2.4em; float: left; margin-right: 0.5em; /* IE */ diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 311f8b775..e729b46ab 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -72,7 +72,7 @@ echo '

- - - + +
- +' . "\n"; echo PMA_displayMaximumUploadSize($max_upload_size); +echo '
' . "\n"; // some browsers should respect this :) echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n"; @@ -145,7 +147,7 @@ if (!empty($cfg['UploadDir'])) { $matcher = '@\.(' . $extensions . ')(\.(' . PMA_supportedDecompressions() . '))?$@'; $files = PMA_getFileSelectOptions($cfg['UploadDir'], $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : ''); - + echo '
' . "\n"; if ($files === FALSE) { echo '
' . "\n"; echo ' ' . $strError . '
' . "\n"; @@ -159,34 +161,34 @@ if (!empty($cfg['UploadDir'])) { echo $files; echo ' ' . "\n"; } + echo '
' . "\n"; } // end if (web-server upload directory) // charset of file +echo '
' . "\n"; if (PMA_MYSQL_INT_VERSION < 40100 && $cfg['AllowAnywhereRecoding'] && $allow_recoding) { - echo '

'; - echo "\n"; + echo '' . "\n"; $temp_charset = reset($cfg['AvailableCharsets']); - echo ' ' . $strCharsetOfFile . "\n" - . '
' . "\n" . ' '; } elseif (PMA_MYSQL_INT_VERSION >= 40100) { - echo '

'; - echo "\n"; - echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', NULL, 'utf8', FALSE); + echo '' . "\n"; + echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', 'charset_of_file', 'utf8', FALSE); } // end if (recoding) -echo "\n"; +echo '
' . "\n"; // zip, gzip and bzip2 encode features $compressions = $strNone; @@ -197,25 +199,34 @@ if ($cfg['ZipDump'] && @function_exists('gzinflate')) $compressions .= ', zip'; // We don't have show anything about compression, when no supported if ($compressions != $strNone) { - printf('
' . $strCompressionWillBeDetected, $compressions); + echo '
' . "\n"; + printf( $strCompressionWillBeDetected, $compressions); + echo '
' . "\n"; } echo "\n"; ?>
- - - + + ' . "\n"; echo ''; - echo sprintf($strTimeoutInfo, $offset) . '
'; + echo sprintf($strTimeoutInfo, $offset) . ''; + echo '' . "\n"; } ?> - />
- - +
+ /> +
+
+ +
+ +
@@ -271,10 +282,12 @@ if (function_exists('PMA_set_enc_form')) { } echo "\n"; ?> - +
+ +
diff --git a/server_processlist.php b/server_processlist.php index 4eecdc767..22f63de48 100644 --- a/server_processlist.php +++ b/server_processlist.php @@ -31,71 +31,67 @@ require('./server_links.inc.php'); * Displays the sub-page heading */ echo '

' . "\n" - . ($cfg['MainPageIconic'] ? '' : '' ) - . ' ' . $strProcesslist . "\n" + . ($cfg['MainPageIconic'] ? '' : '' ) + . $strProcesslist . "\n" . '

' . "\n"; /** * Sends the query and buffers the result */ -$serverProcesses = array(); -$sql_query = 'SHOW' . (empty($full) ? '' : ' FULL') . ' PROCESSLIST'; -$res = PMA_DBI_query($sql_query); -while ($row = PMA_DBI_fetch_assoc($res)) { - $serverProcesses[] = $row; -} -@PMA_DBI_free_result($res); -unset($res); -unset($row); +$sql_query = 'SHOW' . ( empty( $full ) ? '' : ' FULL' ) . ' PROCESSLIST'; +$serverProcesses = PMA_DBI_fetch_result( $sql_query ); -PMA_showMessage($GLOBALS['strSuccess']); +PMA_showMessage( $GLOBALS['strSuccess'] ); /** * Displays the page */ ?> - - - - - - - - - - - - +
<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>                
+ + + + + + + + + + + + + $value) { -?> - - - - - - - - - - - - + + + + + + + + + + + + - +
+ <?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?> +
         ' . $strNone . '' : $value['db']); ?>         
' . $strNone . '' : $process['db']); ?>
+?> \ No newline at end of file