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

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 208c2d9d59..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 {
 	
@@ -140,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($profile, $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();
@@ -175,7 +187,7 @@ class FinishremotesubscribeAction extends Action {
 		# 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)));
 	}
 	
@@ -194,7 +206,7 @@ class FinishremotesubscribeAction extends Action {
 
 		common_debug('using request token "'.$tok.'"', __FILE__);
 		
-		$url = omb_service_uri($omb[OAUTH_ENDPOINT_ACCESS]);
+		$url = $omb['access_token_url'];
 
 		common_debug('using access token url "'.$url.'"', __FILE__);