wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoregister returns the new user on success (not just true)

Browse Source
This commit is contained in:
Craig Andrews 2009-11-13 12:54:27 -05:00
parent 21603f0225
commit b9562cbb18
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Authentication/AuthenticationPlugin.php
View File

@ -70,7 +70,7 @@ abstract class AuthenticationPlugin extends Plugin
* Automatically register a user when they attempt to login with valid credentials. * Automatically register a user when they attempt to login with valid credentials.
* User::register($data) is a very useful method for this implementation * User::register($data) is a very useful method for this implementation
* @param username * @param username
* @return boolean true if the user was created, false if not * @return mixed instance of User, or false (if user couldn't be created)
*/ */
function autoRegister($username) function autoRegister($username)
{ {
@ -134,8 +134,10 @@ abstract class AuthenticationPlugin extends Plugin
}else{ }else{
if($this->autoregistration){ if($this->autoregistration){
$authenticated = $this->checkPassword($nickname, $password); $authenticated = $this->checkPassword($nickname, $password);
if($authenticated && $this->autoregister($nickname)){ if($authenticated){
$authenticatedUser = User::staticGet('nickname', $nickname); $user = $this->autoregister($nickname);
if($user){
$authenticatedUser = $user;
$user_username = new User_username(); $user_username = new User_username();
$user_username->user_id = $authenticatedUser->id; $user_username->user_id = $authenticatedUser->id;
$user_username->provider_name = $this->provider_name; $user_username->provider_name = $this->provider_name;
@ -147,6 +149,7 @@ abstract class AuthenticationPlugin extends Plugin
} }
} }
} }
}
if($this->authoritative){ if($this->authoritative){
return false; return false;
}else{ }else{