check for valid email on invite
This commit is contained in:
parent
d3215adfa1
commit
122b38f354
@ -80,15 +80,28 @@ class InviteAction extends CurrentUserDesignAction
|
|||||||
$email = trim($email);
|
$email = trim($email);
|
||||||
$valid = null;
|
$valid = null;
|
||||||
|
|
||||||
if (Event::handle('StartValidateEmailInvite', array($user, $email, &$valid))) {
|
try {
|
||||||
$valid = Validate::email($email, common_config('email', 'check_domain'));
|
|
||||||
Event::handle('EndValidateEmailInvite', array($user, $email, &$valid));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$valid) {
|
if (Event::handle('StartValidateUserEmail', array(null, $email, &$valid))) {
|
||||||
// TRANS: Form validation message when providing an e-mail address that does not validate.
|
$valid = Validate::email($email, common_config('email', 'check_domain'));
|
||||||
// TRANS: %s is an invalid e-mail address.
|
Event::handle('EndValidateUserEmail', array(null, $email, &$valid));
|
||||||
$this->showForm(sprintf(_('Invalid email address: %s.'), $email));
|
}
|
||||||
|
|
||||||
|
if ($valid) {
|
||||||
|
if (Event::handle('StartValidateEmailInvite', array($user, $email, &$valid))) {
|
||||||
|
$valid = true;
|
||||||
|
Event::handle('EndValidateEmailInvite', array($user, $email, &$valid));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$valid) {
|
||||||
|
// TRANS: Form validation message when providing an e-mail address that does not validate.
|
||||||
|
// TRANS: %s is an invalid e-mail address.
|
||||||
|
$this->showForm(sprintf(_('Invalid email address: %s.'), $email));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (ClientException $e) {
|
||||||
|
$this->showForm($e->getMessage());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user