clear both for footer

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

diff --git a/actions/register.php b/actions/register.php
index 2b41b6a77a7451d64105090124a5e6fd8237dc6c..5da867b0f9e8d0b0d4ae6b642a1fde5f935e7614 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -20,10 +20,10 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class RegisterAction extends Action {
-       
+
        function handle($args) {
                parent::handle($args);
-               
+
                if (common_logged_in()) {
                        common_user_error(_t('Already logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -40,10 +40,10 @@ class RegisterAction extends Action {
                $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.'));
                } else if ($this->email_exists($email)) {
@@ -51,22 +51,26 @@ class RegisterAction extends Action {
                } else if ($password != $confirm) {
                        $this->show_form(_t('Passwords don\'t match.'));
                } else if ($this->register_user($nickname, $password, $email)) {
-                       common_set_user($nickname);
-                       common_redirect(common_local_url('settings'));
+                       # success!
+                       if (!common_set_user($nickname)) {
+                               common_server_error(_t('Error setting user.'));
+                               return;
+                       }
+                       common_redirect(common_local_url('profilesettings'));
                } else {
                        $this->show_form(_t('Invalid username or password.'));
                }
        }
 
        # checks if *CANONICAL* nickname exists
-       
+
        function nickname_exists($nickname) {
                $user = User::staticGet('nickname', $nickname);
                return ($user !== false);
        }
 
        # checks if *CANONICAL* email exists
-       
+
        function email_exists($email) {
                $email = common_canonical_email($email);
                $user = User::staticGet('email', $email);
@@ -77,7 +81,14 @@ class RegisterAction extends Action {
                # TODO: wrap this in a transaction!
                $profile = new Profile();
                $profile->nickname = $nickname;
-               $profile->created = time();
+               $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;
@@ -87,7 +98,16 @@ class RegisterAction extends Action {
                $user->nickname = $nickname;
                $user->password = common_munge_password($password, $id);
                $user->email = $email;
-               $user->created = time();
+               $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;
+               }
+
                $result = $user->insert();
                if (!$result) {
                        # Try to clean up...
@@ -95,41 +115,19 @@ class RegisterAction extends Action {
                }
                return $result;
        }
-       
+
        function show_form($error=NULL) {
-               
+
                common_show_header(_t('Register'));
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('register')));
-               common_element('label', array('for' => 'nickname'),
-                                          _t('Name'));
-               common_element('input', array('name' => 'nickname',
-                                                                         'type' => 'text',
-                                                                         'id' => 'nickname'));
-               common_element('label', array('for' => 'password'),
-                                          _t('Password'));
-               common_element('input', array('name' => 'password',
-                                                                         'type' => 'password',                                                                   
-                                                                         'id' => 'password'));
-               common_element('label', array('for' => 'confirm'),
-                                          _t('Confirm'));
-               common_element('input', array('name' => 'confirm',
-                                                                         'type' => 'password',                                                                   
-                                                                         'id' => 'confirm'));
-               common_element('label', array('for' => 'email'),
-                                          _t('Email'));
-               common_element('input', array('name' => 'email',
-                                                                         'type' => 'text',                                                                       
-                                                                         'id' => 'email'));
-               common_element('input', array('name' => 'submit',
-                                                                         'type' => 'submit',
-                                                                         'id' => 'submit',
-                                                                         'value' => _t('Login')));
-               common_element('input', array('name' => 'cancel',
-                                                                         'type' => 'button',
-                                                                         'id' => 'cancel',
-                                                                         'value' => _t('Cancel')));
+               common_input('nickname', _t('Nickname'));
+               common_password('password', _t('Password'));
+               common_password('confirm', _t('Confirm'));
+               common_input('email', _t('Email'));
+               common_submit('submit', _t('Register'));
                common_element_end('form');
+               common_show_footer();
        }
 }