if (common_config('site', 'inviteonly') && empty($this->code)) {
// TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
$this->clientError(_('Sorry, only invited people can register.'));
- return false;
}
if (!empty($this->code)) {
- $this->invite = Invitation::staticGet('code', $this->code);
+ $this->invite = Invitation::getKV('code', $this->code);
if (empty($this->invite)) {
// TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
$this->clientError(_('Sorry, invalid invitation code.'));
- return false;
}
// Store this in case we need it
common_ensure_session();
if (Event::handle('StartRegistrationTry', array($this))) {
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ // TRANS: Client error displayed when the session token does not match or is not given.
$this->showForm(_('There was a problem with your session token. '.
'Try again, please.'));
return;
$code = $this->trimmed('code');
if ($code) {
- $invite = Invitation::staticGet($code);
+ $invite = Invitation::getKV($code);
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
// TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
$this->clientError(_('Sorry, only invited people can register.'));
- return;
}
// Input scrubbing
try {
- $nickname = Nickname::normalize($nickname);
+ $nickname = Nickname::normalize($nickname, true);
} catch (NicknameException $e) {
$this->showForm($e->getMessage());
+ return;
}
$email = common_canonical_email($email);
} else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) {
// TRANS: Form validation error displayed when trying to register without a valid e-mail address.
$this->showForm(_('Not a valid email address.'));
- } else if ($this->nicknameExists($nickname)) {
- // TRANS: Form validation error displayed when trying to register with an existing nickname.
- $this->showForm(_('Nickname already in use. Try another one.'));
- } else if (!User::allowed_nickname($nickname)) {
- // TRANS: Form validation error displayed when trying to register with an invalid nickname.
- $this->showForm(_('Not a valid nickname.'));
} else if ($this->emailExists($email)) {
+ // TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
$this->showForm(_('Email address already exists.'));
} else if (!is_null($homepage) && (strlen($homepage) > 0) &&
- !Validate::uri($homepage,
- array('allowed_schemes' =>
- array('http', 'https')))) {
+ !common_valid_http_url($homepage)) {
// TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
$this->showForm(_('Homepage is not a valid URL.'));
- return;
} else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long full name.
$this->showForm(_('Full name is too long (maximum 255 characters).'));
- return;
} else if (Profile::bioTooLong($bio)) {
// TRANS: Form validation error on registration page when providing too long a bio text.
// TRANS: %d is the maximum number of characters for bio; used for plural.
'Bio is too long (maximum %d characters).',
Profile::maxBio()),
Profile::maxBio()));
- return;
} else if (!is_null($location) && mb_strlen($location) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long location.
$this->showForm(_('Location is too long (maximum 255 characters).'));
- return;
} else if (strlen($password) < 6) {
// TRANS: Form validation error displayed when trying to register with too short a password.
$this->showForm(_('Password must be 6 or more characters.'));
- return;
} else if ($password != $confirm) {
// TRANS: Form validation error displayed when trying to register with non-matching passwords.
$this->showForm(_('Passwords do not match.'));
'bio' => $bio,
'location' => $location,
'code' => $code))) {
- if (!$user) {
+ if (!($user instanceof User)) {
// TRANS: Form validation error displayed when trying to register with an invalid username or password.
$this->showForm(_('Invalid username or password.'));
return;
if (!common_set_user($user)) {
// TRANS: Server error displayed when saving fails during user registration.
$this->serverError(_('Error setting user.'));
- return;
}
// this is a real login
common_real_login(true);
common_rememberme($user);
}
- Event::handle('EndRegistrationTry', array($this));
-
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
+ Event::handle('EndRegistrationTry', array($this));
+
$this->showSuccess();
} else {
// TRANS: Form validation error displayed when trying to register with an invalid username or password.
}
}
- /**
- * Does the given nickname already exist?
- *
- * Checks a canonical nickname against the database.
- *
- * @param string $nickname nickname to check
- *
- * @return boolean true if the nickname already exists
- */
- function nicknameExists($nickname)
- {
- $user = User::staticGet('nickname', $nickname);
- return is_object($user);
- }
-
/**
* Does the given email address already exist?
*
if (!$email || strlen($email) == 0) {
return false;
}
- $user = User::staticGet('email', $email);
+ $user = User::getKV('email', $email);
return is_object($user);
}
}
}
- // overrided to add hentry, and content-inner class
+ // overrided to add h-entry, and content-inner class
function showContentBlock()
{
- $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+ $this->elementStart('div', array('id' => 'content', 'class' => 'h-entry'));
$this->showPageTitle();
$this->showPageNoticeBlock();
$this->elementStart('div', array('id' => 'content_inner',
- 'class' => 'entry-content'));
+ 'class' => 'e-content'));
// show the actual content (forms, lists, whatever)
$this->showContent();
$this->elementEnd('div');
$invite = null;
if ($code) {
- $invite = Invitation::staticGet($code);
+ $invite = Invitation::getKV($code);
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
// TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
$this->clientError(_('Sorry, only invited people can register.'));
- return;
}
$this->elementStart('form', array('method' => 'post',
*/
function showSuccessContent()
{
- $nickname = $this->arg('nickname');
-
- $profileurl = common_local_url('showstream',
- array('nickname' => $nickname));
-
- $this->elementStart('div', 'success');
- // TRANS: Text displayed after successful account registration.
- // TRANS: %1$s is the registered nickname, %2$s is the profile URL.
- // TRANS: This message contains Markdown links in the form [link text](link)
- // TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
- $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
- 'From here, you may want to...'. "\n\n" .
- '* Go to [your profile](%2$s) '.
- 'and post your first message.' . "\n" .
- '* Add a [Jabber/GTalk address]'.
- '(%%%%action.imsettings%%%%) '.
- 'so you can send notices '.
- 'through instant messages.' . "\n" .
- '* [Search for people](%%%%action.peoplesearch%%%%) '.
- 'that you may know or '.
- 'that share your interests. ' . "\n" .
- '* Update your [profile settings]'.
- '(%%%%action.profilesettings%%%%)'.
- ' to tell others more about you. ' . "\n" .
- '* Read over the [online docs](%%%%doc.help%%%%)'.
- ' for features you may have missed. ' . "\n\n" .
- 'Thanks for signing up and we hope '.
- 'you enjoy using this service.'),
- $nickname, $profileurl);
-
- $this->raw(common_markup_to_html($instr));
-
- $have_email = $this->trimmed('email');
- if ($have_email) {
- // TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
- $emailinstr = _('(You should receive a message by email '.
- 'momentarily, with ' .
- 'instructions on how to confirm '.
- 'your email address.)');
- $this->raw(common_markup_to_html($emailinstr));
+ if (Event::handle('StartRegisterSuccess', array($this))) {
+ $nickname = $this->arg('nickname');
+
+ $profileurl = common_local_url('showstream',
+ array('nickname' => $nickname));
+
+ $this->elementStart('div', 'success');
+ // TRANS: Text displayed after successful account registration.
+ // TRANS: %1$s is the registered nickname, %2$s is the profile URL.
+ // TRANS: This message contains Markdown links in the form [link text](link)
+ // TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
+ $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
+ 'From here, you may want to...'. "\n\n" .
+ '* Go to [your profile](%2$s) '.
+ 'and post your first message.' . "\n" .
+ '* Add a [Jabber/GTalk address]'.
+ '(%%%%action.imsettings%%%%) '.
+ 'so you can send notices '.
+ 'through instant messages.' . "\n" .
+ '* [Search for people](%%%%action.peoplesearch%%%%) '.
+ 'that you may know or '.
+ 'that share your interests. ' . "\n" .
+ '* Update your [profile settings]'.
+ '(%%%%action.profilesettings%%%%)'.
+ ' to tell others more about you. ' . "\n" .
+ '* Read over the [online docs](%%%%doc.help%%%%)'.
+ ' for features you may have missed. ' . "\n\n" .
+ 'Thanks for signing up and we hope '.
+ 'you enjoy using this service.'),
+ $nickname, $profileurl);
+
+ $this->raw(common_markup_to_html($instr));
+
+ $have_email = $this->trimmed('email');
+ if ($have_email) {
+ // TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
+ $emailinstr = _('(You should receive a message by email '.
+ 'momentarily, with ' .
+ 'instructions on how to confirm '.
+ 'your email address.)');
+ $this->raw(common_markup_to_html($emailinstr));
+ }
+ $this->elementEnd('div');
+
+ Event::handle('EndRegisterSuccess', array($this));
}
- $this->elementEnd('div');
}
/**
*/
function showLocalNav()
{
- $nav = new LoginGroupNav($this);
- $nav->show();
- }
-
- function showNoticeForm()
- {
+ if (common_logged_in()) {
+ parent::showLocalNav();
+ } else {
+ $nav = new LoginGroupNav($this);
+ $nav->show();
+ }
}
+ /**
+ * Show a bit of login context
+ *
+ * @return nothing
+ */
function showProfileBlock()
{
+ if (common_logged_in()) {
+ parent::showProfileBlock();
+ }
}
}