diff options
author | Marc Delisle <marc@infomarc.info> | 2007-09-04 20:59:39 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2007-09-04 20:59:39 +0400 |
commit | 3e460af6cf620160178569da1c6aef112052019a (patch) | |
tree | 5b3eaad6089e0fb00c5f7aac0b2d32454f9cabf0 /main.php | |
parent | 86e8de428552a5a31646da4695bfb6128d1cad93 (diff) |
remove non-UTF-8
Diffstat (limited to 'main.php')
-rw-r--r-- | main.php | 65 |
1 files changed, 19 insertions, 46 deletions
@@ -95,52 +95,25 @@ if ($server > 0) { PMA_printListItem($strServer . ': ' . $server_info, 'li_server_info'); } - if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && PMA_MYSQL_INT_VERSION < 40100) { - echo '<li id="li_select_mysql_charset">'; - ?> - <form method="post" action="index.php" target="_parent"> - <input type="hidden" name="server" value="<?php echo $server; ?>" /> - <input type="hidden" name="lang" value="<?php echo $lang; ?>" /> - <?php echo $strMySQLCharset;?>: - <select name="convcharset" xml:lang="en" dir="ltr" - onchange="this.form.submit();"> - <?php - foreach ($cfg['AvailableCharsets'] as $tmpcharset) { - if ($convcharset == $tmpcharset) { - $selected = ' selected="selected"'; - } else { - $selected = ''; - } - echo ' ' - . '<option value="' . $tmpcharset . '"' . $selected . '>' . $tmpcharset . '</option>' . "\n"; - } - ?> - </select> - <noscript><input type="submit" value="<?php echo $strGo;?>" /></noscript> - </form> - </li> - <?php - } elseif (PMA_MYSQL_INT_VERSION >= 40100) { - echo ' <li id="li_select_mysql_charset">'; - echo ' ' . $strMySQLCharset . ': ' - . ' <strong xml:lang="en" dir="ltr">' - . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" - . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" - . ' </strong>' . "\n" - . ' </li>' . "\n" - . ' <li id="li_select_mysql_collation">'; - echo ' <form method="post" action="index.php" target="_parent">' . "\n" - . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') - . ' <label for="select_collation_connection">' . "\n" - . ' ' . $strMySQLConnectionCollation . ': ' . "\n" - . ' </label>' . "\n" - . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true) - . ' <noscript><input type="submit" value="' . $strGo . '" /></noscript>' . "\n" - // put the doc link in the form so that it appears on the same line - . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" - . ' </form>' . "\n" - . ' </li>' . "\n"; - } + echo ' <li id="li_select_mysql_charset">'; + echo ' ' . $strMySQLCharset . ': ' + . ' <strong xml:lang="en" dir="ltr">' + . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" + . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" + . ' </strong>' . "\n" + . ' </li>' . "\n" + . ' <li id="li_select_mysql_collation">'; + echo ' <form method="post" action="index.php" target="_parent">' . "\n" + . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') + . ' <label for="select_collation_connection">' . "\n" + . ' ' . $strMySQLConnectionCollation . ': ' . "\n" + . ' </label>' . "\n" + . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true) + . ' <noscript><input type="submit" value="' . $strGo . '" /></noscript>' . "\n" + // put the doc link in the form so that it appears on the same line + . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . "\n" + . ' </form>' . "\n" + . ' </li>' . "\n"; if ($cfg['ShowCreateDb']) { echo '<li id="li_create_database">'; |