fixed display of timeout message

This commit is contained in:
Sebastian Mendel
2007-03-19 13:06:23 +00:00
parent 03f2245312
commit 3ab281b786

View File

@@ -34,6 +34,8 @@ if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) {
/**
* Displays authentication form
*
* this function MUST exit/quit the application
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['PHP_AUTH_USER']
* @uses $GLOBALS['pma_auth_server']
@@ -390,12 +392,9 @@ function PMA_auth_check()
// User inactive too long
if ($_SESSION['last_access_time'] < time() - $GLOBALS['cfg']['LoginCookieValidity']) {
if ($_SESSION['last_access_time'] < time() - $GLOBALS['cfg']['LoginCookieValidity'] * 4) {
$GLOBALS['no_activity'] = true;
PMA_auth_fails();
exit;
}
return false;
$GLOBALS['no_activity'] = true;
PMA_auth_fails();
exit;
}
// password
@@ -539,6 +538,9 @@ function PMA_auth_set_user()
* prepares error message and switches to PMA_auth() which display the error
* and the login form
*
* this function MUST exit/quit the application,
* currently doen by call to PMA_auth()
*
* @todo $php_errormsg is invalid here!? it will never be set in this scope
* @uses $GLOBALS['server']
* @uses $GLOBALS['allowDeny_forbidden']