diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-10-26 10:31:12 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-10-26 10:31:12 -0400 |
| commit | 0b4390e7f2322a15f16919425de039d555b3e516 (patch) | |
| tree | 93c6d436161e42c93df2c089ef1000024ef74d89 /actions | |
| parent | 3371e243165df54f41febcb1a8ab578ca5950a18 (diff) | |
Make email domain checking optional, as some statusnet installations (such as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail
systems, and this check will always fail.
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/emailsettings.php | 2 | ||||
| -rw-r--r-- | actions/invite.php | 2 | ||||
| -rw-r--r-- | actions/register.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 6eff06c0d..67b991cdc 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -326,7 +326,7 @@ class EmailsettingsAction extends AccountSettingsAction $this->showForm(_('Cannot normalize that email address')); return; } - if (!Validate::email($email, true)) { + if (!Validate::email($email, common_config('email', 'check_domain'))) { $this->showForm(_('Not a valid email address')); return; } else if ($user->email == $email) { diff --git a/actions/invite.php b/actions/invite.php index 788130c58..3015202e9 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -68,7 +68,7 @@ class InviteAction extends CurrentUserDesignAction foreach ($addresses as $email) { $email = trim($email); - if (!Validate::email($email, true)) { + if (!Validate::email($email, common_config('email', 'check_domain'))) { $this->showForm(sprintf(_('Invalid email address: %s'), $email)); return; } diff --git a/actions/register.php b/actions/register.php index 100ab7424..a6c1a903a 100644 --- a/actions/register.php +++ b/actions/register.php @@ -191,7 +191,7 @@ class RegisterAction extends Action if (!$this->boolean('license')) { $this->showForm(_('You can\'t register if you don\'t '. 'agree to the license.')); - } else if ($email && !Validate::email($email, true)) { + } else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) { $this->showForm(_('Not a valid email address.')); } else if (!Validate::string($nickname, array('min_length' => 1, 'max_length' => 64, |