X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffinishremotesubscribe.php;h=ae62fe4b32eabcff2d0463243ba075c379ce3855;hb=4f3d1e93e97365deac2366bfe422e8301d773a25;hp=d48ba0a62212050bb77c006a30dbe7e4f31892e2;hpb=87cf04255a0ccd9c0208dd2de00ab4bd161b5074;p=quix0rs-gnu-social.git

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index d48ba0a622..ae62fe4b32 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -20,74 +20,75 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
-require_once('Auth/Yadis/Yadis.php');
 
 class FinishremotesubscribeAction extends Action {
-	
+
 	function handle($args) {
-		
+
 		parent::handle($args);
 
 		if (common_logged_in()) {
-			common_user_error(_t('You can use the local subscription!'));
+			common_user_error(_('You can use the local subscription!'));
 		    return;
 		}
-		
+
 		$omb = $_SESSION['oauth_authorization_request'];
-		
+
 		if (!$omb) {
-			common_user_error(_t('Not expecting this response!'));
+			common_user_error(_('Not expecting this response!'));
 			return;
 		}
 
 		common_debug('stored request: '.print_r($omb,true), __FILE__);
-		
+
+
+		common_remove_magic_from_request();
 		$req = OAuthRequest::from_request();
 
 		$token = $req->get_parameter('oauth_token');
 
 		# I think this is the success metric
-		
+
 		if ($token != $omb['token']) {
-			common_user_error(_t('Not authorized.'));
+			common_user_error(_('Not authorized.'));
 			return;
 		}
-		
+
 		$version = $req->get_parameter('omb_version');
-		
+
 		if ($version != OMB_VERSION_01) {
-			common_user_error(_t('Unknown version of OMB protocol.'));
+			common_user_error(_('Unknown version of OMB protocol.'));
 			return;
 		}
-		
+
 		$nickname = $req->get_parameter('omb_listener_nickname');
-		
+
 		if (!$nickname) {
-			common_user_error(_t('No nickname provided by remote server.'));
+			common_user_error(_('No nickname provided by remote server.'));
 			return;
 		}
 
 		$profile_url = $req->get_parameter('omb_listener_profile');
-		
+
 		if (!$profile_url) {
-			common_user_error(_t('No profile URL returned by server.'));
+			common_user_error(_('No profile URL returned by server.'));
 			return;
 		}
 
 		if (!Validate::uri($profile_url, array('allowed_schemes' => array('http', 'https')))) {
-			common_user_error(_t('Invalid profile URL returned by server.'));
+			common_user_error(_('Invalid profile URL returned by server.'));
 			return;
 		}
 
 		common_debug('listenee: "'.$omb['listenee'].'"', __FILE__);
-		
-		$user = User::staticGet('uri', $omb['listenee']);
-		
+
+		$user = User::staticGet('nickname', $omb['listenee']);
+
 		if (!$user) {
-			common_user_error(_t('User being listened to doesn\'t exist.'));
+			common_user_error(_('User being listened to doesn\'t exist.'));
 			return;
 		}
-		
+
 		$fullname = $req->get_parameter('omb_listener_fullname');
 		$homepage = $req->get_parameter('omb_listener_homepage');
 		$bio = $req->get_parameter('omb_listener_bio');
@@ -95,16 +96,16 @@ class FinishremotesubscribeAction extends Action {
 		$avatar_url = $req->get_parameter('omb_listener_avatar');
 
 		list($newtok, $newsecret) = $this->access_token($omb);
-		
+
 		if (!$newtok || !$newsecret) {
-			common_user_error(_t('Couldn\'t convert request tokens to access tokens.'));
+			common_user_error(_('Couldn\'t convert request tokens to access tokens.'));
 			return;
 		}
-		
+
 		# XXX: possible attack point; subscribe and return someone else's profile URI
-		
+
 		$remote = Remote_profile::staticGet('uri', $omb['listener']);
-		
+
 		if ($remote) {
 			$exists = true;
 			$profile = Profile::staticGet($remote->id);
@@ -121,7 +122,7 @@ class FinishremotesubscribeAction extends Action {
 
 		$profile->nickname = $nickname;
 		$profile->profileurl = $profile_url;
-		
+
 		if ($fullname) {
 			$profile->fullname = $fullname;
 		}
@@ -134,91 +135,119 @@ class FinishremotesubscribeAction extends Action {
 		if ($location) {
 			$profile->location = $location;
 		}
-		
+
 		if ($exists) {
 			$profile->update($orig_profile);
 		} else {
 			$profile->created = DB_DataObject_Cast::dateTime(); # current time
 			$id = $profile->insert();
+			if (!$id) {
+				common_server_error(_('Error inserting new profile'));
+				return;
+			}
 			$remote->id = $id;
 		}
 
 		if ($avatar_url) {
-			$this->add_avatar($profile, $avatar_url);
+			if (!$this->add_avatar($profile, $avatar_url)) {
+				common_server_error(_('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(_('Error updating remote profile'));
+				return;
+			}
 		} else {
 			$remote->created = DB_DataObject_Cast::dateTime(); # current time
-			$remote->insert;
+			if (!$remote->insert()) {
+				common_server_error(_('Error inserting remote profile'));
+				return;
+			}
 		}
-		
+
 		$sub = new Subscription();
 		$sub->subscriber = $remote->id;
 		$sub->subscribed = $user->id;
 		$sub->token = $newtok;
 		$sub->secret = $newsecret;
 		$sub->created = DB_DataObject_Cast::dateTime(); # current time
-		
+
 		if (!$sub->insert()) {
-			common_user_error(_t('Couldn\'t insert new subscription.'));
+			common_user_error(_('Couldn\'t insert new subscription.'));
 			return;
 		}
 
+		# Notify user, if necessary
+		
+		mail_subscribe_notify_profile($user, $profile);
+		
 		# Clear the data
 		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_service_uri($omb[OAUTH_ENDPOINT_ACCESS]);
-		
+		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.
-		
+
 		$parsed = parse_url($url);
 		$params = array();
 		parse_str($parsed['query'], $params);
 
 		$req = OAuthRequest::from_consumer_and_token($con, $tok, "POST", $url, $params);
-		
+
 		$req->set_parameter('omb_version', OMB_VERSION_01);
-		
+
 		# 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;
 		}
 
 		parse_str($result->body, $return);
-		
+
 		return array($return['oauth_token'], $return['oauth_token_secret']);
 	}
-}
\ No newline at end of file
+}