correct field name

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

diff --git a/actions/register.php b/actions/register.php
index 8ed5706f99d9c02ae7e05df8f4951ecff7450b99..f346e4b9c805ba9d89c7b9751ee240caac988cd2 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -49,14 +49,16 @@ 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,
                                                                                                          'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-                       $this->show_form(_t('Nickname must have only letters and numbers and no spaces.'));
+                       $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.'));
@@ -89,54 +95,97 @@ class RegisterAction extends Action {
        }
 
        function register_user($nickname, $password, $email) {
-               # TODO: wrap this in a transaction!
+               
                $profile = new Profile();
+               
+               $profile->query('BEGIN');
+               
                $profile->nickname = $nickname;
                $profile->profileurl = common_profile_url($nickname);
                $profile->created = DB_DataObject_Cast::dateTime(); # current time
 
                $id = $profile->insert();
+               
                if (!$id) {
-                       return FALSE;
+                       common_log_db_error($profile, 'INSERT', __FILE__);
+                   return FALSE;
                }
                $user = new User();
                $user->id = $id;
                $user->nickname = $nickname;
                $user->password = common_munge_password($password, $id);
-               $user->email = $email;
                $user->created =  DB_DataObject_Cast::dateTime(); # current time
-               $user->uri = common_mint_tag('user:'.$id);
+               $user->uri = common_user_uri($user);
                
                $result = $user->insert();
+               
                if (!$result) {
-                       # Try to clean up...
-                       $profile->delete();
+                       common_log_db_error($user, 'INSERT', __FILE__);
+                       return FALSE;
+               }
+
+               if ($email) {
+                       
+                       $confirm = new Confirm_address();
+                       $confirm->code = common_confirmation_code(128);
+                       $confirm->user_id = $user->id;
+                       $confirm->address = $email;
+                       $confirm->address_type = 'email';
+                       
+                       $result = $confirm->insert();
+                       if (!$result) {
+                               common_log_db_error($confirm, 'INSERT', __FILE__);
+                               return FALSE;
+                       }
                }
+               
+               $profile->query('COMMIT');
+
+               if ($email) {
+                       mail_confirm_address($confirm->code,
+                                                                $profile->nickname,
+                                                                $email);
+               }
+               
                return $result;
        }
 
+       function show_top($error=NULL) {
+               if ($error) {
+                       common_element('p', 'error', $error);
+               } else {
+                       common_element('p', 'instructions', 
+                                                  _t('You can create a new account to start posting notices.'));
+               }
+       }
+       
        function show_form($error=NULL) {
                global $config;
-               
-               common_show_header(_t('Register'));
+
+               common_show_header(_t('Register'), NULL, $error, array($this, 'show_top'));
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('register')));
-               common_input('nickname', _t('Nickname'));
-               common_password('password', _t('Password'));
-               common_password('confirm', _t('Confirm'));
-               common_input('email', _t('Email'));
+               common_input('nickname', _t('Nickname'), NULL,
+                                        _t('1-64 lowercase letters or numbers, no punctuation or spaces'));
+               common_password('password', _t('Password'),                                             
+                                               _t('6 or more characters'));
+               common_password('confirm', _t('Confirm'),
+                                               _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',
                                                                          'name' => 'license',
                                                                          'value' => 'true'));
-               common_element_start('label', array('for' => 'license'));
                common_text(_t('My text and files are available under '));
                common_element('a', array(href => $config['license']['url']),
                                           $config['license']['title']);
                common_text(_t(' except this private data: password, email address, IM address, phone number.'));
-               common_element_end('label');
                common_element_end('p');
                common_submit('submit', _t('Register'));
                common_element_end('form');