X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=b93c06f120f0f50b084584acaa8d5688606275c0;hb=bf14709fe2ed18f5a2641f841cb000a4856290fd;hp=71452e46ccda236bc06058c4daaabf29b2ee34b0;hpb=92645bbc578fafeb6816a44b8cf9cd594ffb5bd7;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 71452e46cc..b93c06f120 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -36,16 +36,56 @@ class SubscribeAction extends Action {
 			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);
+		$other = User::staticGet('nickname', $other_nickname);
+
+		if (!$other) {
+			common_user_error(_('No such user.'));
+			return;
+		}
+
+		if ($user->isSubscribed($other)) {
+			common_user_error(_('Already subscribed!.'));
 			return;
 		}
+
+		if (!$user->subscribeTo($other)) {
+			$this->server_error(_('Could not subscribe.'));
+			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