nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed last fix of fix

Browse Source
This commit is contained in:
Sebastian Mendel
2007-03-15 17:38:51 +00:00
parent 91093f0b25
commit 319947b3fb
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/auth/cookie.auth.lib.php
View File

@@ -290,15 +290,13 @@ function PMA_auth_check()
global $from_cookie; global $from_cookie;
// avoid an error in mcrypt // avoid an error in mcrypt
if (empty($GLOBALS['cfg']['blowfish_secret']) if (empty($GLOBALS['cfg']['blowfish_secret'])) {
|| empty($_SESSION['last_access_time'])) {
return false; return false;
} }
// Initialization // Initialization
$PHP_AUTH_USER = $PHP_AUTH_PW = ''; $PHP_AUTH_USER = $PHP_AUTH_PW = '';
$from_cookie = false; $from_cookie = false;
$from_form = false;
// The user wants to be logged out -> delete password cookie(s) // The user wants to be logged out -> delete password cookie(s)
if (!empty($old_usr)) { if (!empty($old_usr)) {
@@ -310,6 +308,8 @@ function PMA_auth_check()
} else { } else {
PMA_removeCookie('pma_cookie_password-' . $server); PMA_removeCookie('pma_cookie_password-' . $server);
} }
return false;
} }
// The user just logged in // The user just logged in
@@ -319,7 +319,7 @@ function PMA_auth_check()
if ($GLOBALS['cfg']['AllowArbitraryServer']) { if ($GLOBALS['cfg']['AllowArbitraryServer']) {
$pma_auth_server = $pma_servername; $pma_auth_server = $pma_servername;
} }
$from_form = true; return true;
} }
// At the end, try to set the $PHP_AUTH_USER & $PHP_AUTH_PW variables // At the end, try to set the $PHP_AUTH_USER & $PHP_AUTH_PW variables
@@ -345,10 +345,14 @@ function PMA_auth_check()
$PHP_AUTH_USER = PMA_blowfish_decrypt($PHP_AUTH_USER, $GLOBALS['cfg']['blowfish_secret']); $PHP_AUTH_USER = PMA_blowfish_decrypt($PHP_AUTH_USER, $GLOBALS['cfg']['blowfish_secret']);
// User inactive too long // User inactive too long
if ($_SESSION['last_access_time'] < time() - $GLOBALS['cfg']['LoginCookieValidity']) { if (! isset($_SESSION['last_access_time'])
$GLOBALS['no_activity'] = true; || $_SESSION['last_access_time'] < time() - $GLOBALS['cfg']['LoginCookieValidity']) {
PMA_auth_fails(); if ($_SESSION['last_access_time'] < time() - $GLOBALS['cfg']['LoginCookieValidity'] * 4) {
return false; $GLOBALS['no_activity'] = true;
PMA_auth_fails();
exit;
}
$from_cookie = false;
} }
// password // password
@@ -367,12 +371,7 @@ function PMA_auth_check()
} }
} }
// Returns whether we get authentication settings or not return $from_cookie;
if (! $from_cookie && ! $from_form) {
return false;
}
return true;
} // end of the 'PMA_auth_check()' function } // end of the 'PMA_auth_check()' function