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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index e292fdd6be..8d04934b7d 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -36,47 +36,25 @@ class SubscribeAction extends Action {
 			return;
 		}
 
-		$other_nickname = $this->arg('subscribeto');
-
-		$other = User::staticGet('nickname', $other_nickname);
+		# CSRF protection
 
-		if (!$other) {
-			common_user_error(_('No such user.'));
+		$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;
 		}
 
-		if ($user->isSubscribed($other)) {
-			common_user_error(_('Already subscribed!.'));
-			return;
-		}
+		$other_nickname = $this->arg('subscribeto');
 
-		if (!$user->subscribeTo($other)) {
-			$this->server_error(_('Could not subscribe.'));
+		$result=subs_subscribe_user($user, $other_nickname);
+		if($result != true) {
+			common_user_error($result);
 			return;
 		}
-
-		$this->notify($other, $user);
-
-		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)));
 	}
 
-	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);
-	}
-
-	function notify_email($listenee, $listener) {
-		mail_subscribe_notify($listenee, $listener);
-	}
 }
\ No newline at end of file