X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=0bc522867e39ca4a62ffd12a5ebf417a85441ba5;hb=b4e649fe906a793cd5e62d6390065ea5d41c40db;hp=c06057fb8ddca3e3630f060cd1f9046eaa7bc304;hpb=7b099a4c6b4b2e851aa9fa95c6c2c9b35c95bd65;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index c06057fb8d..0bc522867e 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -19,55 +19,64 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SubscribeAction extends Action {
-	
-	function handle($args) {
-		parent::handle($args);
+class SubscribeAction extends Action
+{
 
-		if (!common_logged_in()) {
-			common_user_error(_('Not logged in.'));
-			return;
-		}
+    function handle($args)
+    {
+        parent::handle($args);
 
-		$user = common_current_user();
+        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
 
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-			return;
-		}
+        $token = $this->trimmed('token');
 
-		# CSRF protection
+        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');
 
-		$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 = User::staticGet('id', $other_id);
 
-		$other_nickname = $this->arg('subscribeto');
+        if (!$other) {
+            $this->clientError(_('Not a local user.'));
+            return;
+        }
 
-		$result=subs_subscribe_user($user, $other_nickname);
-		
-		if($result != true) {
-			common_user_error($result);
-			return;
-		}
+        $result = subs_subscribe_to($user, $other);
+
+        if($result != true) {
+            $this->clientError($result);
+            return;
+        }
 
-		$cur = common_current_user();
-		$profile = Profile::staticGet('nickname', $other_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($profile);
-			common_element_end('body');
-			common_element_end('html');
-		} else {
-		    common_redirect(common_local_url('subscriptions', array('nickname' =>
-																$user->nickname)));
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new UnsubscribeForm($this, $other->getProfile());
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('subscriptions', array('nickname' =>
+                                                                $user->nickname)),
+                            303);
         }
-	}
+    }
 }