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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 4de831990c..8d04934b7d 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,6 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
+	
 	function handle($args) {
 		parent::handle($args);
 
@@ -35,64 +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;
-		}
-
-		$sub = new Subscription();
-		$sub->subscriber = $user->id;
-		$sub->subscribed = $other->id;
-
-		$sub->created = DB_DataObject_Cast::dateTime(); # current time
+		$other_nickname = $this->arg('subscribeto');
 
-		if (!$sub->insert()) {
-			common_server_error(_('Couldn\'t create subscription.'));
+		$result=subs_subscribe_user($user, $other_nickname);
+		if($result != true) {
+			common_user_error($result);
 			return;
 		}
-
-		$this->notify($other, $user);
-
+		
 		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
-		$this->notify_email($listenee, $listener);
-	}
-
-	function notify_email($listenee, $listener) {
-		if ($listenee->email) {
-			$profile = $listenee->getProfile();
-			$other = $listener->getProfile();
-			$name = $profile->getBestName();
-			$long_name = ($other->fullname) ? ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
-			$recipients = $listenee->email;
-			$headers['From'] = mail_notify_from();
-			$headers['To'] = $name . ' <' . $listenee->email . '>';
-			$headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
-										  common_config('site', 'name'));
-			$body  = sprintf(_('%1$s is now listening to your notices on %2$s.'), $long_name, common_config('site', 'name'));
-			$body .= "\n\n";
-			$body .= "\t".$other->profileurl;
-			$body .= "\n\n";
-			$body .= _('Faithfully yours, ');
-			$body .= "\n";
-			$body .= $config['site']['name'];
-			$body .= "\n";
-
-			mail_send($recipients, $headers, $body);
-		}
-	}
 }
\ No newline at end of file