X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=f761992de40f6fd7401f77ebae0a5b024642a20d;hb=28ef2ccf427683837dde29f8b89ea8d5378f287b;hp=e292fdd6be94cfb2725ce7c84af0549f9d1530a1;hpb=7e6870db914d4e905fc7ae833b69404fd3ea0d3d;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index e292fdd6be..f761992de4 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -19,64 +19,63 @@
 
 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;
+        }
 
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
-			return;
-		}
+        $user = common_current_user();
 
-		$other_nickname = $this->arg('subscribeto');
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+            return;
+        }
 
-		$other = User::staticGet('nickname', $other_nickname);
+        # CSRF protection
 
-		if (!$other) {
-			common_user_error(_('No such user.'));
-			return;
-		}
+        $token = $this->trimmed('token');
 
-		if ($user->isSubscribed($other)) {
-			common_user_error(_('Already subscribed!.'));
-			return;
-		}
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
 
-		if (!$user->subscribeTo($other)) {
-			$this->server_error(_('Could not subscribe.'));
-			return;
-		}
+        $other_id = $this->arg('subscribeto');
 
-		$this->notify($other, $user);
+        $other = User::staticGet('id', $other_id);
 
-		if ($other->autosubscribe && !$other->isSubscribed($user)) {
-			if (!$other->subscribeTo($user)) {
-				$this->server_error(_('Could not subscribe other to you.'));
-				return;
-			}
-			$this->notify($user, $other);
-		}
-		
-		common_redirect(common_local_url('subscriptions', array('nickname' =>
-																$user->nickname)));
-	}
+        if (!$other) {
+            $this->clientError(_('Not a local user.'));
+            return;
+        }
 
-	function notify($listenee, $listener) {
-		# XXX: add other notifications (Jabber, SMS) here
-		# XXX: queue this and handle it offline
-		# XXX: Whatever happens, do it in Twitter-like API, too
-		$this->notify_email($listenee, $listener);
-	}
+        $result = subs_subscribe_to($user, $other);
 
-	function notify_email($listenee, $listener) {
-		mail_subscribe_notify($listenee, $listener);
-	}
-}
\ No newline at end of file
+        if($result != true) {
+            $this->clientError($result);
+            return;
+        }
+
+        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)));
+        }
+    }
+}