X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fregister.php;h=f346e4b9c805ba9d89c7b9751ee240caac988cd2;hb=d3679822530e351894ca1f809c97638873832a74;hp=cad5c2ed708745df0f4daa2c65659fc73966e773;hpb=56de8727405ce4c08c38adec2f830d845e528190;p=quix0rs-gnu-social.git

diff --git a/actions/register.php b/actions/register.php
index cad5c2ed70..f346e4b9c8 100644
--- 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.'));
@@ -89,29 +95,58 @@ 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;
 	}
 
@@ -139,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',