Merge branch 'locshunt' into 0.9.x

[quix0rs-gnu-social.git] / actions / emailsettings.php

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index af528a892ef877556b02dc05b173a1171f612d2e..761aaa8f31f397bcd2dbb3fad24c4efa4bfefd83 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -71,6 +71,12 @@ class EmailsettingsAction extends AccountSettingsAction
         return _('Manage how you get email from %%site.name%%.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('email');
+    }
+
     /**
      * Content area of the page
      *
@@ -89,7 +95,7 @@ class EmailsettingsAction extends AccountSettingsAction
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-
+        $this->elementStart('fieldset');
         $this->elementStart('fieldset', array('id' => 'settings_email_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
@@ -188,6 +194,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
         $this->elementEnd('fieldset');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -320,7 +327,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) {