move user registration to a single static method

darcs-hash:20080814002038-84dde-8505d4e083056b770db128129a95be639d8e7f0a.gz

1 files changed, 3 insertions, 83 deletions

diff --git a/actions/register.php b/actions/register.php
index c53910842..e6b1931ce 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -82,7 +82,9 @@ class RegisterAction extends Action {
 			return;
 		} else if ($password != $confirm) {
 			$this->show_form(_('Passwords don\'t match.'));
-		} else if ($user = $this->register_user($nickname, $password, $email, $fullname, $homepage, $bio, $location)) {
+		} else if ($user = User::register(array('nickname' => $nickname, 'password' => $password, 'email' => $email,
+												'fullname' => $fullname, 'homepage' => $homepage, 'bio' => $bio, 
+												'location' => $location))) {
 			if (!$user) {
 				$this->show_form(_('Invalid username or password.'));
 				return;
@@ -121,88 +123,6 @@ class RegisterAction extends Action {
 		return ($user !== false);
 	}
 
-	function register_user($nickname, $password, $email, $fullname, $homepage, $bio, $location) {
-
-		$profile = new Profile();
-
-		$profile->query('BEGIN');
-
-		$profile->nickname = $nickname;
-		$profile->profileurl = common_profile_url($nickname);
-		if ($fullname) {
-			$profile->fullname = $fullname;
-		}
-		if ($homepage) {
-			$profile->homepage = $homepage;
-		}
-		if ($bio) {
-			$profile->bio = $bio;
-		}
-		if ($location) {
-			$profile->location = $location;
-		}
-		$profile->created = DB_DataObject_Cast::dateTime(); # current time
-		
-		$id = $profile->insert();
-
-		if (!$id) {
-			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->created =  DB_DataObject_Cast::dateTime(); # current time
-		$user->uri = common_user_uri($user);
-
-		$result = $user->insert();
-
-		if (!$result) {
-			common_log_db_error($user, 'INSERT', __FILE__);
-			return FALSE;
-		}
-
-		# Everyone is subscribed to themself
-
-		$subscription = new Subscription();
-		$subscription->subscriber = $user->id;
-		$subscription->subscribed = $user->id;
-		$subscription->created = $user->created;
-		
-		$result = $subscription->insert();
-		
-		if (!$result) {
-			common_log_db_error($subscription, '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 $user;
-	}
-
 	function show_top($error=NULL) {
 		if ($error) {
 			common_element('p', 'error', $error);