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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 6499705ec8..b93c06f120 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,6 +36,15 @@ 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');
 
 		$other = User::staticGet('nickname', $other_nickname);
@@ -49,19 +59,21 @@ class SubscribeAction extends Action {
 			return;
 		}
 
-		$sub = new Subscription();
-		$sub->subscriber = $user->id;
-		$sub->subscribed = $other->id;
-
-		$sub->created = DB_DataObject_Cast::dateTime(); # current time
-
-		if (!$sub->insert()) {
-			common_server_error(_('Couldn\'t create subscription.'));
+		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)));
 	}
@@ -69,28 +81,11 @@ class SubscribeAction extends Action {
 	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) {
-		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.'."\n\n".
-							   "\t".'%3$s'."\n\n".
-							   'Faithfully yours,'."\n".'%4$s.'."\n"),
-							 $long_name,
-							 common_config('site', 'name'), 
-							 $other->profileurl,
-							 common_config('site', 'name'));
-			mail_send($recipients, $headers, $body);
-		}
+		mail_subscribe_notify($listenee, $listener);
 	}
 }
\ No newline at end of file