james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't log in when creating a new user unless event->login is set

Browse Source
This commit is contained in:
Shish 2021-06-11 23:47:59 +01:00
parent c4ae68fb47
commit 1e0c248710
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/user/main.php
View File

@ -355,9 +355,9 @@ class UserPage extends Extension
public function onUserCreation(UserCreationEvent $event) public function onUserCreation(UserCreationEvent $event)
{ {
$this->check_user_creation($event); $this->check_user_creation($event);
$user = $this->create_user($event); $new_user = $this->create_user($event);
if ($event->login) { if ($event->login) {
send_event(new UserLoginEvent($user)); send_event(new UserLoginEvent($new_user));
} }
} }
@ -529,7 +529,7 @@ class UserPage extends Extension
private function create_user(UserCreationEvent $event): User private function create_user(UserCreationEvent $event): User
{ {
global $database, $user; global $database;
$email = (!empty($event->email)) ? $event->email : null; $email = (!empty($event->email)) ? $event->email : null;
@ -542,12 +542,12 @@ class UserPage extends Extension
["username"=>$event->username, "hash"=>'', "email"=>$email, "class"=>$class] ["username"=>$event->username, "hash"=>'', "email"=>$email, "class"=>$class]
); );
$uid = $database->get_last_insert_id('users_id_seq'); $uid = $database->get_last_insert_id('users_id_seq');
$user = User::by_name($event->username); $new_user = User::by_name($event->username);
$user->set_password($event->password); $new_user->set_password($event->password);
log_info("user", "Created User #$uid ({$event->username})"); log_info("user", "Created User #$uid ({$event->username})");
return $user; return $new_user;
} }
private function set_login_cookie(string $name, string $pass): void private function set_login_cookie(string $name, string $pass): void