nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-03 14:09:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be pedantic about checking user is active before we let them in.

Browse Source
This commit is contained in:
Andrew McMillan 2010-11-27 16:42:22 +13:00
parent 97c04fab6f
commit 413618749c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inc/HTTPAuthSession.php
View File

@ -121,8 +121,14 @@ class HTTPAuthSession {
*/
if ( isset($_SERVER['PHP_AUTH_USER']) ) {
if ( $u = $this->CheckPassword( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ) ) {
$this->AssignSessionDetails($u);
return;
/**
* Maybe some external authentication didn't return false for an inactive
* user, so we'll be pedantic here.
*/
if ( $u->active ) {
$this->AssignSessionDetails($u);
return;
}
}
}
@ -227,7 +233,8 @@ class HTTPAuthSession {
*/
if (isset($c->authenticate_hook['optional']) && $c->authenticate_hook['optional']) {
if ($hook_response !== false) { return $hook_response; }
} else {
}
else {
return $hook_response;
}
}