nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-18 04:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try and read dav_principal since the remote usr record no longer suffices.

Browse Source
This commit is contained in:
Andrew McMillan 2010-06-23 14:15:57 +12:00
parent b296151724
commit 4e1852aee2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/auth-functions.php
View File

@ -143,7 +143,7 @@ function UpdateUserFromExternal( &$usr ) {
* 'call' => 'AuthExternalAwl',
* 'config' => array(
* // A PgSQL database connection string for the database containing user records
* 'connection' => 'dbname=wrms host=otherhost port=5433 user=general',
* 'connection[]' => 'dbname=wrms host=otherhost port=5433 user=general',
* // Which columns should be fetched from the database
* 'columns' => "user_no, active, email_ok, joined, last_update AS updated, last_used, username, password, fullname, email",
* // a WHERE clause to limit the records returned.
@ -184,7 +184,18 @@ EOERRMSG;
$usr = $qry->Fetch();
if ( session_validate_password( $password, $usr->password ) ) {
UpdateUserFromExternal($usr);
return $usr;
/**
* We disallow login by inactive users _after_ we have updated the local copy
*/
if ( isset($usr->active) && $usr->active == 'f' ) return false;
$qry = new AwlQuery('SELECT * FROM dav_principal WHERE username = :username', array(':username' => $usr->username) );
if ( $qry->Exec() && $qry->rows() == 1 ) {
$principal = $qry->Fetch();
return $principal;
}
return $usr; // Somewhat optimistically
}
}