Add support for LogoutURL.

This commit is contained in:
Michal Čihař
2006-08-24 12:39:16 +00:00
parent 862bc35be7
commit 554b4a00e4
3 changed files with 14 additions and 0 deletions

View File

@@ -10,6 +10,8 @@ $Source$
libraries/auth/signon.auth.lib.php, scripts/signon.php, libraries/auth/signon.auth.lib.php, scripts/signon.php,
scripts/setup.php: Add single signon authentication method (patch scripts/setup.php: Add single signon authentication method (patch
#1545366, patch #1541379, patch #1531302 and RFE #1031391). #1545366, patch #1541379, patch #1531302 and RFE #1031391).
* libraries/auth/cookie.auth.lib.php, libraries/auth/http.auth.lib.php:
Add support for LogoutURL.
2006-08-22 Marc Delisle <lem9@users.sourceforge.net> 2006-08-22 Marc Delisle <lem9@users.sourceforge.net>
* scripts/setup.php: bug #1536112, better fix (in case of * scripts/setup.php: bug #1536112, better fix (in case of

View File

@@ -47,6 +47,12 @@ function PMA_auth()
{ {
global $cfg, $lang, $server, $convcharset, $conn_error; global $cfg, $lang, $server, $convcharset, $conn_error;
/* Perform logout to custom URL */
if (!empty($_REQUEST['old_usr']) && !empty($GLOBALS['cfg']['Server']['LogoutURL'])) {
PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['LogoutURL']);
exit;
}
// Tries to get the username from cookie whatever are the values of the // Tries to get the username from cookie whatever are the values of the
// 'register_globals' and the 'variables_order' directives if last login // 'register_globals' and the 'variables_order' directives if last login
// should be recalled, else skip the IE autocomplete feature. // should be recalled, else skip the IE autocomplete feature.

View File

@@ -21,6 +21,12 @@
*/ */
function PMA_auth() { function PMA_auth() {
/* Perform logout to custom URL */
if (!empty($_REQUEST['old_usr']) && !empty($GLOBALS['cfg']['Server']['LogoutURL'])) {
PMA_sendHeaderLocation($GLOBALS['cfg']['Server']['LogoutURL']);
exit;
}
header('WWW-Authenticate: Basic realm="phpMyAdmin ' . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfg']['Server']['verbose']) ? str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['verbose']))) . '"'); header('WWW-Authenticate: Basic realm="phpMyAdmin ' . sprintf($GLOBALS['strRunning'], (empty($GLOBALS['cfg']['Server']['verbose']) ? str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['host']) : str_replace('\'', '\\\'', $GLOBALS['cfg']['Server']['verbose']))) . '"');
header('HTTP/1.0 401 Unauthorized'); header('HTTP/1.0 401 Unauthorized');
header('status: 401 Unauthorized'); header('status: 401 Unauthorized');