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

get email for code

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-17 19:29:55 -04:00
parent a564af4948
commit dbb9f66982
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/EmailRegistration/emailregister.php
View File

@ -253,14 +253,6 @@ class EmailregisterAction extends Action
function setPassword() function setPassword()
{ {
if (!$this->tos) {
$this->error = _('You must accept the terms of service and privacy policy to register.');
$nickname = $this->nicknameFromEmail($this->email);
$this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
$this->showPage();
return;
}
if (!empty($this->invitation)) { if (!empty($this->invitation)) {
$email = $this->invitation->address; $email = $this->invitation->address;
} else if (!empty($this->confirmation)) { } else if (!empty($this->confirmation)) {
@ -269,6 +261,14 @@ class EmailregisterAction extends Action
throw new Exception('No confirmation thing.'); 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); $nickname = $this->nicknameFromEmail($email);
$this->user = User::registerNew(array('nickname' => $nickname, $this->user = User::registerNew(array('nickname' => $nickname,
@ -360,7 +360,7 @@ class EmailregisterAction extends Action
$nickname = $parts[0]; $nickname = $parts[0];
$nickname = preg_replace('/[^A-Za-z0-9]/', '', $str); $nickname = preg_replace('/[^A-Za-z0-9]/', '', $nickname);
$nickname = Nickname::normalize($nickname); $nickname = Nickname::normalize($nickname);