commit
17b963a701
|
@ -66,10 +66,13 @@ function ldapauth_uninstall() {
|
|||
|
||||
|
||||
function ldapauth_hook_authenticate($a,&$b) {
|
||||
if(ldapauth_authenticate($b['username'],$b['password']) && is_existing_account($b['username'])) {
|
||||
if(ldapauth_authenticate($b['username'],$b['password'])) {
|
||||
$results = get_existing_account($b['username']);
|
||||
if(! empty($results)){
|
||||
$b['user_record'] = $results[0];
|
||||
$b['authenticated'] = 1;
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -85,11 +88,6 @@ function ldapauth_authenticate($username,$password) {
|
|||
$ldap_autocreateaccount_emailattribute = get_config('ldapauth','ldap_autocreateaccount_emailattribute');
|
||||
$ldap_autocreateaccount_nameattribute = get_config('ldapauth','ldap_autocreateaccount_nameattribute');
|
||||
|
||||
if(! strlen($ldap_autocreateaccount_emailattribute))
|
||||
$ldap_autocreateaccount_emailattribute = "mail";
|
||||
if(! strlen($ldap_autocreateaccount_nameattribute))
|
||||
$ldap_autocreateaccount_nameattribute = "givenName";
|
||||
|
||||
if(! ((strlen($password))
|
||||
&& (function_exists('ldap_connect'))
|
||||
&& (strlen($ldap_server))))
|
||||
|
@ -123,8 +121,16 @@ function ldapauth_authenticate($username,$password) {
|
|||
if(! @ldap_bind($connect,$dn,$password))
|
||||
return false;
|
||||
|
||||
$emailarray = [];
|
||||
$namearray = [];
|
||||
if($ldap_autocreateaccount == "true"){
|
||||
if(! strlen($ldap_autocreateaccount_emailattribute))
|
||||
$ldap_autocreateaccount_emailattribute = "mail";
|
||||
if(! strlen($ldap_autocreateaccount_nameattribute))
|
||||
$ldap_autocreateaccount_nameattribute = "givenName";
|
||||
$emailarray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute);
|
||||
$namearray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute);
|
||||
}
|
||||
|
||||
if(! strlen($ldap_group)){
|
||||
ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$emailarray[0],$namearray[0]);
|
||||
|
@ -160,7 +166,9 @@ function ldapauth_authenticate($username,$password) {
|
|||
}
|
||||
|
||||
function ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$email,$name) {
|
||||
if($ldap_autocreateaccount == "true" && !is_existing_account($username)){
|
||||
if($ldap_autocreateaccount == "true"){
|
||||
$results = get_existing_account($username);
|
||||
if(empty($results)){
|
||||
if (strlen($email) > 0 && strlen($name) > 0){
|
||||
$arr = array('username'=>$name,'nickname'=>$username,'email'=>$email,'password'=>$password,'verified'=>1);
|
||||
$result = create_user($arr);
|
||||
|
@ -174,11 +182,8 @@ function ldap_autocreateaccount($ldap_autocreateaccount,$username,$password,$ema
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function is_existing_account($username){
|
||||
$results = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",$username);
|
||||
if(count($results)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
function get_existing_account($username){
|
||||
return q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",$username);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue