do some commits

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

diff --git a/actions/register.php b/actions/register.php
index 5da867b0f9e8d0b0d4ae6b642a1fde5f935e7614..cad5c2ed708745df0f4daa2c65659fc73966e773 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -34,18 +34,29 @@ class RegisterAction extends Action {
        }
 
        function try_register() {
-               $nickname = $this->arg('nickname');
+               $nickname = $this->trimmed('nickname');
+               $email = $this->trimmed('email');
+               
+               # We don't trim these... whitespace is OK in a password!
+               
                $password = $this->arg('password');
                $confirm = $this->arg('confirm');
-               $email = $this->arg('email');
 
                # Input scrubbing
 
                $nickname = common_canonical_nickname($nickname);
                $email = common_canonical_email($email);
 
-               if ($this->nickname_exists($nickname)) {
-                       $this->show_form(_t('Username already exists.'));
+               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)) {
+                       $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 lowercase letters and numbers and no spaces.'));
+               } else if ($this->nickname_exists($nickname)) {
+                       $this->show_form(_t('Nickname already exists.'));
                } else if ($this->email_exists($email)) {
                        $this->show_form(_t('Email address already exists.'));
                } else if ($password != $confirm) {
@@ -84,11 +95,6 @@ class RegisterAction extends Action {
                $profile->profileurl = common_profile_url($nickname);
                $profile->created = DB_DataObject_Cast::dateTime(); # current time
 
-               $val = $profile->validate();
-               if ($val !== TRUE) {
-                       # XXX: some feedback here, please!
-                       return FALSE;
-               }
                $id = $profile->insert();
                if (!$id) {
                        return FALSE;
@@ -99,15 +105,8 @@ class RegisterAction extends Action {
                $user->password = common_munge_password($password, $id);
                $user->email = $email;
                $user->created =  DB_DataObject_Cast::dateTime(); # current time
-
-               $val = $user->validate();
-               if ($val !== TRUE) {
-                       # XXX: some feedback here, please!
-                       # Try to clean up...
-                       $profile->delete();
-                       return FALSE;
-               }
-
+               $user->uri = common_mint_tag('user:'.$id);
+               
                $result = $user->insert();
                if (!$result) {
                        # Try to clean up...
@@ -116,16 +115,40 @@ class RegisterAction extends Action {
                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_element_start('p');
+               common_element('input', array('type' => 'checkbox',
+                                                                         'id' => 'license',
+                                                                         'name' => 'license',
+                                                                         'value' => 'true'));
+               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('p');
                common_submit('submit', _t('Register'));
                common_element_end('form');
                common_show_footer();