From 0ba99486039b10686a520e22ef50385625e5b9ae Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Thu, 19 Jun 2008 09:51:48 -0400
Subject: [PATCH] move update_user function to openid.php

darcs-hash:20080619135148-84dde-6caaa7f97d2405bc318bfa818c4ac9cbc31cab33.gz
---
 actions/finishaddopenid.php   | 55 ++---------------------------------
 actions/finishopenidlogin.php | 44 ++--------------------------
 lib/openid.php                | 42 ++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 95 deletions(-)

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 78aa67d89e..8a721aa27f 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -57,7 +57,7 @@ class FinishaddopenidAction extends Action {
 			}
 
 			$cur =& common_current_user();
-			$other = $this->get_user($canonical);
+			$other = oid_get_user($canonical);
 			
 			if ($other) {
 				if ($other->id == $cur->id) {
@@ -79,7 +79,7 @@ class FinishaddopenidAction extends Action {
 				return;
 			}
 			if ($sreg) {
-				if (!$this->update_user($cur, $sreg)) {
+				if (!oid_update_user($cur, $sreg)) {
 					$this->message(_t('Error updating profile'));
 					return;
 				}
@@ -100,55 +100,4 @@ class FinishaddopenidAction extends Action {
 		common_element('p', NULL, $msg);
 		common_show_footer();
 	}
-
-	function get_user($canonical) {
-		$user = NULL;
-		$oid = User_openid::staticGet('canonical', $canonical);
-		if ($oid) {
-			$user = User::staticGet('id', $oid->user_id);
-		}
-		return $user;
-	}
-
-	function update_user(&$user, $sreg) {
-
-		$profile =& $user->getProfile();
-
-		$orig_profile = clone($profile);
-
-		if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
-			$profile->fullname = $sreg['fullname'];
-		}
-
-		if ($sreg['country']) {
-			if ($sreg['postcode']) {
-				# XXX: use postcode to get city and region
-				# XXX: also, store postcode somewhere -- it's valuable!
-				$profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
-			} else {
-				$profile->location = $sreg['country'];
-			}
-		}
-
-		# XXX save language if it's passed
-		# XXX save timezone if it's passed
-
-		if (!$profile->update($orig_profile)) {
-			common_server_error(_t('Error saving the profile.'));
-			return false;
-		}
-
-		$orig_user = clone($user);
-
-		if ($sreg['email'] && Validate::email($sreg['email'], true)) {
-			$user->email = $sreg['email'];
-		}
-
-		if (!$user->update($orig_user)) {
-			common_server_error(_t('Error saving the user.'));
-			return false;
-		}
-		
-		return true;
-	}
 }
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 3a7f9f250b..2db9412757 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -108,7 +108,7 @@ class FinishopenidloginAction extends Action {
 			
 			if ($user) {
 				oid_set_last($display);
-				$this->update_user($user, $sreg);
+				oid_update_user($user, $sreg);
 				common_set_user($user->nickname);
 				$this->go_home($user->nickname);
 			} else {
@@ -124,46 +124,6 @@ class FinishopenidloginAction extends Action {
 		common_show_footer();
 	}
 	
-	function update_user($user, $sreg) {
-		
-		$profile = $user->getProfile();
-
-		$orig_profile = clone($profile);
-		
-		if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
-			$profile->fullname = $sreg['fullname'];
-		}
-		
-		if ($sreg['country']) {
-			if ($sreg['postcode']) {
-				# XXX: use postcode to get city and region
-				# XXX: also, store postcode somewhere -- it's valuable!
-				$profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
-			} else {
-				$profile->location = $sreg['country'];
-			}
-		}
-
-		# XXX save language if it's passed
-		# XXX save timezone if it's passed
-		
-		if (!$profile->update($orig_profile)) {
-			common_server_error(_t('Error saving the profile.'));
-			return;
-		}
-
-		$orig_user = clone($user);
-		
-		if ($sreg['email'] && Validate::email($sreg['email'], true)) {
-			$user->email = $sreg['email'];
-		}
-		
-		if (!$user->update($orig_user)) {
-			common_server_error(_t('Error saving the user.'));
-			return;
-		}
-	}
-	
 	function save_values($display, $canonical, $sreg) {
 		common_ensure_session();
 		$_SESSION['openid_display'] = $display;
@@ -297,7 +257,7 @@ class FinishopenidloginAction extends Action {
 			return;
 		}
 		
-		$this->update_user($user, $sreg);
+		oid_update_user($user, $sreg);
 		oid_set_last($display);
 		common_set_user($user->nickname);
 		$this->go_home($user->nickname);
diff --git a/lib/openid.php b/lib/openid.php
index 6dbeebd2bd..111cc4a0cb 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -181,3 +181,45 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
 		}
 	}
 }
+
+# update a user from sreg parameters
+
+function oid_update_user(&$user, &$sreg) {
+		
+	$profile = $user->getProfile();
+	
+	$orig_profile = clone($profile);
+	
+	if ($sreg['fullname'] && strlen($sreg['fullname']) <= 255) {
+		$profile->fullname = $sreg['fullname'];
+	}
+	
+	if ($sreg['country']) {
+		if ($sreg['postcode']) {
+			# XXX: use postcode to get city and region
+			# XXX: also, store postcode somewhere -- it's valuable!
+			$profile->location = $sreg['postcode'] . ', ' . $sreg['country'];
+		} else {
+			$profile->location = $sreg['country'];
+		}
+	}
+	
+	# XXX save language if it's passed
+	# XXX save timezone if it's passed
+	
+	if (!$profile->update($orig_profile)) {
+		common_server_error(_t('Error saving the profile.'));
+		return;
+	}
+	
+	$orig_user = clone($user);
+	
+	if ($sreg['email'] && Validate::email($sreg['email'], true)) {
+		$user->email = $sreg['email'];
+	}
+	
+	if (!$user->update($orig_user)) {
+		common_server_error(_t('Error saving the user.'));
+		return;
+	}
+}