X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffinishremotesubscribe.php;h=06fd3f52c43b519fb1f01fc4a3ba571890fa8426;hb=4aedce6864eb27a0c37b3dcae22fee0aa16ae537;hp=b5093263e101eef123e8ff96792b53fb0a055348;hpb=90b4873a00b0d8b4249a323fc84a7460024f491b;p=quix0rs-gnu-social.git

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index b5093263e1..06fd3f52c4 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -20,7 +20,6 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
-require_once('Auth/Yadis/Yadis.php');
 
 class FinishremotesubscribeAction extends Action {
 	
@@ -33,20 +32,15 @@ class FinishremotesubscribeAction extends Action {
 		    return;
 		}
 		
-		$nonce = $this->trimmed('nonce');
-		
-		if (!$omb) {
-			common_user_error(_t('No nonce returned!'));
-			return;
-		}
-		
-		$omb = $_SESSION[$nonce];
+		$omb = $_SESSION['oauth_authorization_request'];
 		
 		if (!$omb) {
 			common_user_error(_t('Not expecting this response!'));
 			return;
 		}
 
+		common_debug('stored request: '.print_r($omb,true), __FILE__);
+		
 		$req = OAuthRequest::from_request();
 
 		$token = $req->get_parameter('oauth_token');
@@ -84,7 +78,9 @@ class FinishremotesubscribeAction extends Action {
 			return;
 		}
 
-		$user = User::staticGet('uri', $omb['listenee']);
+		common_debug('listenee: "'.$omb['listenee'].'"', __FILE__);
+		
+		$user = User::staticGet('nickname', $omb['listenee']);
 		
 		if (!$user) {
 			common_user_error(_t('User being listened to doesn\'t exist.'));
@@ -143,21 +139,34 @@ class FinishremotesubscribeAction extends Action {
 		} else {
 			$profile->created = DB_DataObject_Cast::dateTime(); # current time
 			$id = $profile->insert();
+			if (!$id) {
+				common_server_error(_t('Error inserting new profile'));
+				return;
+			}
 			$remote->id = $id;
 		}
 
 		if ($avatar_url) {
-			$this->add_avatar($avatar_url);
+			if (!$this->add_avatar($profile, $avatar_url)) {
+				common_server_error(_t('Error inserting avatar'));
+				return;
+			}
 		}
 
-		$remote->postnoticeurl = $omb[OMB_ENDPOINT_POSTNOTICE];
-		$remote->updateprofileurl = $omb[OMB_ENDPOINT_UPDATEPROFILE];
+		$remote->postnoticeurl = $omb['post_notice_url'];
+		$remote->updateprofileurl = $omb['update_profile_url'];
 
 		if ($exists) {
-			$remote->update($orig_remote);
+			if (!$remote->update($orig_remote)) {
+				common_server_error(_t('Error updating remote profile'));
+				return;
+			}
 		} else {
 			$remote->created = DB_DataObject_Cast::dateTime(); # current time
-			$remote->insert;
+			if (!$remote->insert()) {
+				common_server_error(_t('Error inserting remote profile'));
+				return;
+			}
 		}
 		
 		$sub = new Subscription();
@@ -173,21 +182,33 @@ class FinishremotesubscribeAction extends Action {
 		}
 
 		# Clear the data
-		unset($_SESSION[$nonce]);
+		unset($_SESSION['oauth_authorization_request']);
 		
 		# If we show subscriptions in reverse chron order, this should
 		# show up close to the top of the page
 		
-		common_redirect(common_local_url('subscribed', array('nickname' =>
+		common_redirect(common_local_url('subscribers', array('nickname' =>
 															 $user->nickname)));
 	}
 	
+	function add_avatar($profile, $url) {
+		$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
+		copy($url, $temp_filename);
+		return $profile->setOriginal($temp_filename);
+	}
+	
 	function access_token($omb) {
+
+		common_debug('starting request for access token', __FILE__);
 		
 		$con = omb_oauth_consumer();
 		$tok = new OAuthToken($omb['token'], $omb['secret']);
 
-		$url = $omb[OAUTH_ENDPOINT_ACCESS][0];
+		common_debug('using request token "'.$tok.'"', __FILE__);
+		
+		$url = $omb['access_token_url'];
+
+		common_debug('using access token url "'.$url.'"', __FILE__);
 		
 		# XXX: Is this the right thing to do? Strip off GET params and make them
 		# POST params? Seems wrong to me.
@@ -202,13 +223,18 @@ class FinishremotesubscribeAction extends Action {
 		
 		# XXX: test to see if endpoint accepts this signature method
 
-		$req->sign_request(omb_hmac_sha1(), $con, NULL);
+		$req->sign_request(omb_hmac_sha1(), $con, $tok);
 		
 		# We re-use this tool's fetcher, since it's pretty good
+
+		common_debug('posting to access token url "'.$req->get_normalized_http_url().'"', __FILE__);
+		common_debug('posting request data "'.$req->to_postdata().'"', __FILE__);
 		
 		$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
 		$result = $fetcher->post($req->get_normalized_http_url(),
 								 $req->to_postdata());
+
+		common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__);
 		
 		if ($result->status != 200) {
 			return NULL;