Commit 997b0933 authored by Evan Prodromou's avatar Evan Prodromou

Don't use bogus event in emailregistration

I was trying to be smart by calling the same registration event as 'register'
when doing EmailRegistration. However, that event is so low-bandwidth that plugins
go fingerpoken in all the attributes and call methods on the passed-in action and
things like that.

So, now we just fall back to using the low-level stuff, catch any
exceptions, and feel happy. Some stuff might not work, but it's
generally anti-spam stuff more suited to public sites.
parent 16195788
......@@ -141,9 +141,9 @@ class BlacklistPlugin extends Plugin
*
* @return boolean hook value
*/
function onStartRegistrationTry($action)
function onStartRegisterUser(&$user, &$profile)
{
$homepage = strtolower($action->trimmed('homepage'));
$homepage = strtolower($profile->homepage);
if (!empty($homepage)) {
if (!$this->_checkUrl($homepage)) {
......@@ -154,7 +154,7 @@ class BlacklistPlugin extends Plugin
}
}
$nickname = strtolower($action->trimmed('nickname'));
$nickname = strtolower($profile->nickname);
if (!empty($nickname)) {
if (!$this->_checkNickname($nickname)) {
......
......@@ -264,66 +264,70 @@ class EmailregisterAction extends Action
function setPassword()
{
if (Event::handle('StartRegistrationTry', array($this))) {
if (!empty($this->invitation)) {
$email = $this->invitation->address;
} else if (!empty($this->confirmation)) {
$email = $this->confirmation->address;
} else {
throw new Exception('No confirmation thing.');
}
if (!$this->tos) {
$this->error = _('You must accept the terms of service and privacy policy to register.');
return;
} else if (empty($this->password1)) {
$this->error = _('You must set a password');
} else if (strlen($this->password1) < 6) {
$this->error = _('Password must be 6 or more characters.');
} else if ($this->password1 != $this->password2) {
$this->error = _('Passwords do not match.');
}
if (!empty($this->invitation)) {
$email = $this->invitation->address;
} else if (!empty($this->confirmation)) {
$email = $this->confirmation->address;
} else {
throw new Exception('No confirmation thing.');
}
if (!empty($this->error)) {
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage();
return;
}
if (!$this->tos) {
$this->error = _('You must accept the terms of service and privacy policy to register.');
return;
} else if (empty($this->password1)) {
$this->error = _('You must set a password');
} else if (strlen($this->password1) < 6) {
$this->error = _('Password must be 6 or more characters.');
} else if ($this->password1 != $this->password2) {
$this->error = _('Passwords do not match.');
}
if (!empty($this->error)) {
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage();
return;
}
$nickname = $this->nicknameFromEmail($email);
try {
$this->user = User::register(array('nickname' => $nickname,
'email' => $email,
'password' => $this->password1,
'email_confirmed' => true));
} catch (ClientException $e) {
$this->error = $e->getMessage();
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage();
return;
}
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);
if (empty($this->user)) {
throw new Exception("Failed to register user.");
}
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
common_set_user($this->user);
// this is a real login
common_real_login(true);
if (!empty($this->invitation)) {
$inviter = User::staticGet('id', $this->invitation->user_id);
if (!empty($inviter)) {
Subscription::start($inviter->getProfile(),
$this->user->getProfile());
}
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
$this->invitation->delete();
} else if (!empty($this->confirmation)) {
$this->confirmation->delete();
} else {
throw new Exception('No confirmation thing.');
if (!empty($this->invitation)) {
$inviter = User::staticGet('id', $this->invitation->user_id);
if (!empty($inviter)) {
Subscription::start($inviter->getProfile(),
$this->user->getProfile());
}
Event::handle('EndRegistrationTry', array($this));
$this->invitation->delete();
} else if (!empty($this->confirmation)) {
$this->confirmation->delete();
} else {
throw new Exception('No confirmation thing.');
}
common_redirect(common_local_url('doc', array('title' => 'welcome')),
......
......@@ -147,6 +147,26 @@ class RequireValidatedEmailPlugin extends Plugin
return true;
}
/**
* Event handler for registration attempts; rejects the registration
* if email field is missing.
*
* @param Action $action Action being executed
*
* @return bool hook result code
*/
function onStartRegisterUser(&$user, &$profile)
{
$email = $user->email;
if (empty($email)) {
throw new ClientException(_m('You must provide an email address to register.'));
}
return true;
}
/**
* Check if a user has a validated email address or has been
* otherwise grandfathered in.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment