1 files changed, 30 insertions, 42 deletions

diff --git a/lib/openid.php b/lib/openid.php
index 41102457a..11934138f 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -30,7 +30,7 @@ require_once('Auth/OpenID/MySQLStore.php');
 
 define('OPENID_COOKIE_EXPIRY', round(365.25 * 24 * 60 * 60));
 define('OPENID_COOKIE_KEY', 'lastusedopenid');
-	   
+
 function oid_store() {
     static $store = NULL;
 	if (!$store) {
@@ -53,21 +53,9 @@ function oid_clear_last() {
 }
 
 function oid_set_last($openid_url) {
-	
-	$path = common_config('site', 'path');
-	$server = common_config('site', 'server');
-
-	if ($path && ($path != '/')) {
-		$cookiepath = '/' . $path . '/';
-	} else {
-		$cookiepath = '/';
-	}
-	
-	setcookie(OPENID_COOKIE_KEY,
-			  $openid_url,
-			  time() + OPENID_COOKIE_EXPIRY,
-			  $cookiepath,
-			  $server);
+	common_set_cookie(OPENID_COOKIE_KEY,
+			         $openid_url,
+			         time() + OPENID_COOKIE_EXPIRY);
 }
 
 function oid_get_last() {
@@ -80,7 +68,7 @@ function oid_get_last() {
 }
 
 function oid_link_user($id, $canonical, $display) {
-	
+
 	$oid = new User_openid();
 	$oid->user_id = $id;
 	$oid->canonical = $canonical;
@@ -92,7 +80,7 @@ function oid_link_user($id, $canonical, $display) {
 		common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
 		return false;
 	}
-	
+
 	return true;
 }
 
@@ -113,13 +101,13 @@ function oid_check_immediate($openid_url, $backto=NULL) {
 		$backto = common_local_url($action, $args);
 	}
 	common_debug('going back to "' . $backto . '"', __FILE__);
-	
+
 	common_ensure_session();
-	
+
 	$_SESSION['openid_immediate_backto'] = $backto;
 	common_debug('passed-in variable is "' . $backto . '"', __FILE__);
 	common_debug('session variable is "' . $_SESSION['openid_immediate_backto'] . '"', __FILE__);
-	
+
 	oid_authenticate($openid_url,
 					 'finishimmediate',
 					 true);
@@ -128,23 +116,23 @@ function oid_check_immediate($openid_url, $backto=NULL) {
 function oid_authenticate($openid_url, $returnto, $immediate=false) {
 
 	$consumer = oid_consumer();
-	
+
 	if (!$consumer) {
 		common_server_error(_t('Cannot instantiate OpenID consumer object.'));
 		return false;
 	}
-	
+
 	common_ensure_session();
-	
+
 	$auth_request = $consumer->begin($openid_url);
-	
+
 	// Handle failure status return values.
 	if (!$auth_request) {
 		return _t('Not a valid OpenID.');
 	} else if (Auth_OpenID::isFailure($auth_request)) {
 		return _t('OpenID failure: ') . $auth_request->message;
 	}
-	
+
 	$sreg_request = Auth_OpenID_SRegRequest::build(// Required
 												   array(),
 												   // Optional
@@ -155,14 +143,14 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
 														 'timezone',
 														 'postcode',
 														 'country'));
-	
+
 	if ($sreg_request) {
 		$auth_request->addExtension($sreg_request);
 	}
-	
+
 	$trust_root = common_local_url('public');
 	$process_url = common_local_url($returnto);
-	
+
 	if ($auth_request->shouldSendRedirect()) {
 		$redirect_url = $auth_request->redirectURL($trust_root,
 												   $process_url,
@@ -178,12 +166,12 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
 		$form_id = 'openid_message';
 		$form_html = $auth_request->formMarkup($trust_root, $process_url,
 											   $immediate, array('id' => $form_id));
-		
+
 		# XXX: This is cheap, but things choke if we don't escape ampersands
 		# in the HTML attributes
-		
+
 		$form_html = preg_replace('/&/', '&', $form_html);
-		
+
 		// Display an error if the form markup couldn't be generated;
 		// otherwise, render the HTML.
 		if (Auth_OpenID::isFailure($form_html)) {
@@ -212,15 +200,15 @@ function _oid_print_instructions() {
 # 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
@@ -230,25 +218,25 @@ function oid_update_user(&$user, &$sreg) {
 			$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;
 }