change remote subscribe to link

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

diff --git a/actions/register.php b/actions/register.php
index 31c8fea70fad08b6df2cef19e1a0d8492841405a..f346e4b9c805ba9d89c7b9751ee240caac988cd2 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -49,7 +49,7 @@ class RegisterAction extends Action {
 
                if (!$this->boolean('license')) {
                        $this->show_form(_t('You can\'t register if you don\'t agree to the license.'));
-               } else if (!Validate::email($email, true)) {
+               } else if ($email && !Validate::email($email, true)) {
                        $this->show_form(_t('Not a valid email address.'));
                } else if (!Validate::string($nickname, array('min_length' => 1,
                                                                                                          'max_length' => 64,
@@ -57,6 +57,8 @@ class RegisterAction extends Action {
                        $this->show_form(_t('Nickname must have only lowercase letters and numbers and no spaces.'));
                } else if ($this->nickname_exists($nickname)) {
                        $this->show_form(_t('Nickname already exists.'));
+               } else if (!User::allowed_nickname($nickname)) {
+                       $this->show_form(_t('Not a valid nickname.'));
                } else if ($this->email_exists($email)) {
                        $this->show_form(_t('Email address already exists.'));
                } else if ($password != $confirm) {
@@ -67,6 +69,10 @@ class RegisterAction extends Action {
                                common_server_error(_t('Error setting user.'));
                                return;
                        }
+                       common_real_login(true);
+                       if ($this->boolean('rememberme')) {
+                               common_rememberme();
+                       }
                        common_redirect(common_local_url('profilesettings'));
                } else {
                        $this->show_form(_t('Invalid username or password.'));
@@ -168,6 +174,9 @@ class RegisterAction extends Action {
                                                _t('Same as password above'));
                common_input('email', _t('Email'), NULL,
                                         _t('Used only for updates, announcements, and password recovery'));
+               common_checkbox('rememberme', _t('Remember me'),
+                               _t('Automatically login in the future; ' . 
+                                  'not for shared computers!'));
                common_element_start('p');
                common_element('input', array('type' => 'checkbox',
                                                                          'id' => 'license',