X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=b6f03f0f133c70ae2beba9384ab793680c9c4699;hb=bc15d027a804e60e76bdaf6fd47e69d41b395e7e;hp=8d04934b7d3fb8b6bd7be3b5d499a577d2f40439;hpb=9b741c4f9a211906f18b8aee7fe7cee58f911403;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8d04934b7d..b6f03f0f13 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -19,42 +19,62 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
-	
-	function handle($args) {
-		parent::handle($args);
-
-		if (!common_logged_in()) {
-			common_user_error(_('Not logged in.'));
-			return;
-		}
-
-		$user = common_current_user();
-
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-			return;
-		}
-
-		# CSRF protection
-
-		$token = $this->trimmed('token');
-		
-		if (!$token || $token != common_session_token()) {
-			$this->client_error(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
-
-		$other_nickname = $this->arg('subscribeto');
-
-		$result=subs_subscribe_user($user, $other_nickname);
-		if($result != true) {
-			common_user_error($result);
-			return;
-		}
-		
-		common_redirect(common_local_url('subscriptions', array('nickname' =>
-																$user->nickname)));
-	}
-
-}
\ No newline at end of file
+class SubscribeAction extends Action
+{
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return;
+        }
+
+        $user = common_current_user();
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+            return;
+        }
+
+        # CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
+
+        $other_id = $this->arg('subscribeto');
+
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+            $this->clientError(_('Not a local user.'));
+            return;
+        }
+
+        $result = subs_subscribe_to($user, $other);
+
+        if($result != true) {
+            $this->clientError($result);
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            common_start_html('text/xml;charset=utf-8', true);
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            common_unsubscribe_form($other->getProfile());
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                $user->nickname)));
+        }
+    }
+}