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

Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present.

Browse Source 
Since Twitter doesn't provide email address back to us here, we only prefill the field if we have an invite.
This commit is contained in:
Brion Vibber 2011-01-20 17:02:34 -08:00
parent 06d895ee67
commit 1f4b63d533
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/TwitterBridge/twitterauthorization.php
View File

@ -391,6 +391,11 @@ class TwitterauthorizationAction extends Action
($this->username) ? $this->username : '',
_m('1-64 lowercase letters or numbers, no punctuation or spaces'));
$this->elementEnd('li');
$this->elementStart('li');
$this->input('email', _('Email'), $this->getEmail(),
_('Used only for updates, announcements, '.
'and password recovery'));
$this->elementEnd('li');
// Hook point for captcha etc
Event::handle('EndRegistrationFormData', array($this));
@ -419,6 +424,32 @@ class TwitterauthorizationAction extends Action
$this->elementEnd('form');
}
/**
* Get specified e-mail from the form, or the invite code.
*
* @return string
*/
function getEmail()
{
$email = $this->trimmed('email');
if (!empty($email)) {
return $email;
}
// Terrible hack for invites...
if (common_config('site', 'inviteonly')) {
$code = $_SESSION['invitecode'];
if ($code) {
$invite = Invitation::staticGet($code);
if ($invite && $invite->address_type == 'email') {
return $invite->address;
}
}
}
return '';
}
function message($msg)
{
$this->message_text = $msg;
@ -478,6 +509,11 @@ class TwitterauthorizationAction extends Action
$args['code'] = $invite->code;
}
$email = $this->getEmail();
if (!empty($email)) {
$args['email'] = $email;
}
$user = User::register($args);
if (empty($user)) {