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.
This commit is contained in:
parent
3371e24316
commit
0b4390e7f2
|
@ -326,7 +326,7 @@ class EmailsettingsAction extends AccountSettingsAction
|
||||||
$this->showForm(_('Cannot normalize that email address'));
|
$this->showForm(_('Cannot normalize that email address'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!Validate::email($email, true)) {
|
if (!Validate::email($email, common_config('email', 'check_domain'))) {
|
||||||
$this->showForm(_('Not a valid email address'));
|
$this->showForm(_('Not a valid email address'));
|
||||||
return;
|
return;
|
||||||
} else if ($user->email == $email) {
|
} else if ($user->email == $email) {
|
||||||
|
|
|
@ -68,7 +68,7 @@ class InviteAction extends CurrentUserDesignAction
|
||||||
|
|
||||||
foreach ($addresses as $email) {
|
foreach ($addresses as $email) {
|
||||||
$email = trim($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));
|
$this->showForm(sprintf(_('Invalid email address: %s'), $email));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,7 +191,7 @@ class RegisterAction extends Action
|
||||||
if (!$this->boolean('license')) {
|
if (!$this->boolean('license')) {
|
||||||
$this->showForm(_('You can\'t register if you don\'t '.
|
$this->showForm(_('You can\'t register if you don\'t '.
|
||||||
'agree to the license.'));
|
'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.'));
|
$this->showForm(_('Not a valid email address.'));
|
||||||
} else if (!Validate::string($nickname, array('min_length' => 1,
|
} else if (!Validate::string($nickname, array('min_length' => 1,
|
||||||
'max_length' => 64,
|
'max_length' => 64,
|
||||||
|
|
|
@ -104,6 +104,10 @@ $config['sphinx']['port'] = 3312;
|
||||||
// $config['site']['timezone'] = 'Pacific/Auckland';
|
// $config['site']['timezone'] = 'Pacific/Auckland';
|
||||||
// $config['site']['language'] = 'en_NZ';
|
// $config['site']['language'] = 'en_NZ';
|
||||||
|
|
||||||
|
// When validating user supplied email addresses, validate if the domain
|
||||||
|
// is running an SMTP server.
|
||||||
|
// $config['mail']['check_domain'] = true;
|
||||||
|
|
||||||
// Email info, used for all outbound email
|
// Email info, used for all outbound email
|
||||||
// $config['mail']['notifyfrom'] = 'microblog@example.net';
|
// $config['mail']['notifyfrom'] = 'microblog@example.net';
|
||||||
// $config['mail']['domain'] = 'microblog.example.net';
|
// $config['mail']['domain'] = 'microblog.example.net';
|
||||||
|
|
|
@ -84,7 +84,8 @@ $default =
|
||||||
'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
|
'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
|
||||||
'mail' =>
|
'mail' =>
|
||||||
array('backend' => 'mail',
|
array('backend' => 'mail',
|
||||||
'params' => null),
|
'params' => null,
|
||||||
|
'domain_check' => true),
|
||||||
'nickname' =>
|
'nickname' =>
|
||||||
array('blacklist' => array(),
|
array('blacklist' => array(),
|
||||||
'featured' => array()),
|
'featured' => array()),
|
||||||
|
|
|
@ -265,7 +265,7 @@ class FinishopenidloginAction extends Action
|
||||||
$fullname = '';
|
$fullname = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($sreg['email']) && Validate::email($sreg['email'], true)) {
|
if (!empty($sreg['email']) && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
|
||||||
$email = $sreg['email'];
|
$email = $sreg['email'];
|
||||||
} else {
|
} else {
|
||||||
$email = '';
|
$email = '';
|
||||||
|
|
|
@ -241,7 +241,7 @@ function oid_update_user(&$user, &$sreg)
|
||||||
|
|
||||||
$orig_user = clone($user);
|
$orig_user = clone($user);
|
||||||
|
|
||||||
if ($sreg['email'] && Validate::email($sreg['email'], true)) {
|
if ($sreg['email'] && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
|
||||||
$user->email = $sreg['email'];
|
$user->email = $sreg['email'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user