X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=a032cf71769278b83da547d6766531306bc3ac33;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=8bb723799c3f37a311f84639c19ae5cf7b3910d7;hpb=4272da4e9e2ab9c99b4b9897f04c92cd7987cb8b;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 8bb723799c..a032cf7176 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,7 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
-	
+
 	function handle($args) {
 		parent::handle($args);
 
@@ -39,22 +39,40 @@ class SubscribeAction extends Action {
 		# CSRF protection
 
 		$token = $this->trimmed('token');
-		
+
 		if (!$token || $token != common_session_token()) {
-			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+			$this->client_error(_('There was a problem with your session token. Try again, please.'));
 			return;
 		}
 
-		$other_nickname = $this->arg('subscribeto');
+		$other_id = $this->arg('subscribeto');
+
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+			$this->client_error(_('Not a local user.'));
+			return;
+        }
+
+		$result = subs_subscribe_to($user, $other);
 
-		$result=subs_subscribe_user($user, $other_nickname);
 		if($result != true) {
 			common_user_error($result);
 			return;
 		}
-		
-		common_redirect(common_local_url('subscriptions', array('nickname' =>
+
+		if ($this->boolean('ajax')) {
+			common_start_html('text/xml');
+			common_element_start('head');
+			common_element('title', null, _('Subscribed'));
+			common_element_end('head');
+			common_element_start('body');
+			common_unsubscribe_form($other->getProfile());
+			common_element_end('body');
+			common_element_end('html');
+		} else {
+		    common_redirect(common_local_url('subscriptions', array('nickname' =>
 																$user->nickname)));
+        }
 	}
-
-}
\ No newline at end of file
+}