X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ffinishremotesubscribe.php;h=0325f6adbb512ab78085d25fd4123581d405b956;hb=b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1;hp=13f367823536a3dee0105b4fe9934059bf67af77;hpb=4b2aa517501037e86e4a3c3bad3f363dcf8a26c6;p=quix0rs-gnu-social.git

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 13f3678235..0325f6adbb 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -5,14 +5,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -28,9 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-if (!defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
 require_once INSTALLDIR.'/lib/omb.php';
@@ -39,11 +37,11 @@ require_once INSTALLDIR.'/lib/omb.php';
  * Handler for remote subscription finish callback
  *
  * When a remote user subscribes a local user, a redirect to this action is
- * issued after the remote user authorized his service to subscribe.
+ * issued after the remote user authorized their service to subscribe.
  *
  * @category Action
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
@@ -76,11 +74,10 @@ class FinishremotesubscribeAction extends Action
 
         /* Create user objects for both users. Do it early for request
            validation. */
-        $listenee = $service->getListeneeURI();
-        $user = User::staticGet('uri', $listenee);
+        $user = User::staticGet('uri', $service->getListeneeURI());
 
         if (!$user) {
-            $this->clientError(_('User being listened to doesn\'t exist.'));
+            $this->clientError(_('User being listened to does not exist.'));
             return;
         }
 
@@ -91,21 +88,35 @@ class FinishremotesubscribeAction extends Action
             return;
         }
 
+        $remote = Remote_profile::staticGet('uri', $service->getListenerURI());
+        if ($remote) {
+            // Note remote profile may not have been saved yet.
+            // @fixme not convinced this is correct at all!
+
+            $profile = Profile::staticGet($remote->id);
+
+            if ($user->hasBlocked($profile)) {
+                $this->clientError(_('That user has blocked you from subscribing.'));
+                return;
+            }
+        }
+
         /* Perform the handling itself via libomb. */
         try {
-            $service->finishAuthorization($listenee);
+            $service->finishAuthorization();
         } catch (OAuthException $e) {
             if ($e->getMessage() == 'The authorized token does not equal the ' .
                                     'submitted token.') {
-                $this->clientError(_('Not authorized.'));
+                $this->clientError(_('You are not authorized.'));
                 return;
             } else {
-                $this->clientError(_('Couldn\'t convert request token to ' .
+                $this->clientError(_('Could not convert request token to ' .
                                      'access token.'));
                 return;
             }
         } catch (OMB_RemoteServiceException $e) {
-            $this->clientError(_('Unknown version of OMB protocol.'));
+            $this->clientError(_('Remote service uses unknown version of ' .
+                                 'OMB protocol.'));
             return;
         } catch (Exception $e) {
             common_debug('Got exception ' . print_r($e, true), __FILE__);
@@ -116,7 +127,6 @@ class FinishremotesubscribeAction extends Action
         /* The service URLs are not accessible from datastore, so setting them
            after insertion of the profile. */
         $remote = Remote_profile::staticGet('uri', $service->getListenerURI());
-
         $orig_remote = clone($remote);
 
         $remote->postnoticeurl    =
@@ -125,7 +135,7 @@ class FinishremotesubscribeAction extends Action
                             $service->getServiceURI(OMB_ENDPOINT_UPDATEPROFILE);
 
         if (!$remote->update($orig_remote)) {
-                $this->serverError(_('Error updating remote profile'));
+                $this->serverError(_('Error updating remote profile.'));
                 return;
         }