Patch #522671 - Add charset when asking for auth

This commit is contained in:
Loïc Chapeaux
2002-02-25 22:08:09 +00:00
parent d8b27ce41c
commit e7f9a03309
4 changed files with 12 additions and 0 deletions

View File

@@ -10,6 +10,8 @@ $Source$
<kawada at den.fujifilm.co.jp>.
* main.php3: tried a fix against bug #510223 (Create Database link) thanks
to Purodha B Blissenbach <purodha at sourceforge.net>.
* libraries/auth/*: patch #522671 - Add charset when asking for auth,
thanks to "nijel".
2002-02-24 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* lang/german.inc.php3: updated thanks to Alexander M. Turek.

View File

@@ -82,6 +82,9 @@ if (!defined('PMA_CONFIG_AUTH_INCLUDED')) {
. $cfgServer['host'] . $server_port . $server_socket . ', '
. $cfgServer['user'] . ', '
. $cfgServer['password'] . ')';
// Defines the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

View File

@@ -77,6 +77,10 @@ if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
}
$cell_align = ($GLOBALS['text_dir'] == 'ltr') ? 'left' : 'right';
// Defines the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
// Title
?>
<!DOCTYPE html

View File

@@ -28,6 +28,9 @@ if (!defined('PMA_HTTP_AUTH_INCLUDED')) {
header('WWW-Authenticate: Basic realm="phpMyAdmin ' . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfgServer']['verbose']) ? str_replace('\'', '\\\'',$GLOBALS['cfgServer']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfgServer']['verbose']))) . '"');
header('HTTP/1.0 401 Unauthorized');
header('status: 401 Unauthorized');
// Defines the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"