GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

use Start/EndRegistrationTry events for email registration

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-18 06:46:16 -04:00
parent 6267ea2e8d
commit 206376cf10
1 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
plugins/EmailRegistration/emailregister.php
View File

@ -252,44 +252,55 @@ class EmailregisterAction extends Action
function setPassword() function setPassword()
{ {
if (!empty($this->invitation)) { if (Event::handle('StartRegistrationTry', array($this))) {
$email = $this->invitation->address; if (!empty($this->invitation)) {
} else if (!empty($this->confirmation)) { $email = $this->invitation->address;
$email = $this->confirmation->address; } else if (!empty($this->confirmation)) {
} else { $email = $this->confirmation->address;
throw new Exception('No confirmation thing.'); } else {
} throw new Exception('No confirmation thing.');
if (!$this->tos) {
$this->error = _('You must accept the terms of service and privacy policy to register.');
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage();
return;
}
$nickname = $this->nicknameFromEmail($email);
$this->user = User::register(array('nickname' => $nickname,
'email' => $email,
'email_confirmed' => true));
if (empty($this->user)) {
throw new Exception("Failed to register user.");
}
if (!empty($this->invitation)) {
$inviter = User::staticGet('id', $this->invitation->user_id);
if (!empty($inviter)) {
Subscription::start($inviter->getProfile(),
$user->getProfile());
} }
$this->invitation->delete(); if (!$this->tos) {
} else if (!empty($this->confirmation)) { $this->error = _('You must accept the terms of service and privacy policy to register.');
$this->confirmation->delete(); $nickname = $this->nicknameFromEmail($email);
} else { $this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
throw new Exception('No confirmation thing.'); $this->showPage();
return;
}
$nickname = $this->nicknameFromEmail($email);
$this->user = User::register(array('nickname' => $nickname,
'email' => $email,
'email_confirmed' => true));
if (empty($this->user)) {
throw new Exception("Failed to register user.");
}
common_set_user($this->user);
// this is a real login
common_real_login(true);
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
if (!empty($this->invitation)) {
$inviter = User::staticGet('id', $this->invitation->user_id);
if (!empty($inviter)) {
Subscription::start($inviter->getProfile(),
$user->getProfile());
}
$this->invitation->delete();
} else if (!empty($this->confirmation)) {
$this->confirmation->delete();
} else {
throw new Exception('No confirmation thing.');
}
Event::handle('EndRegistrationTry', array($this));
} }
common_redirect(common_local_url('doc', array('title' => 'welcome')), common_redirect(common_local_url('doc', array('title' => 'welcome')),