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

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 9a1d43fa5d..b93c06f120 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,11 +20,28 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
+	
 	function handle($args) {
 		parent::handle($args);
 
 		if (!common_logged_in()) {
-			common_user_error(_t('Not logged in.'));
+			common_user_error(_('Not logged in.'));
+			return;
+		}
+
+		$user = common_current_user();
+
+		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
+			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;
 		}
 
@@ -33,66 +50,42 @@ class SubscribeAction extends Action {
 		$other = User::staticGet('nickname', $other_nickname);
 
 		if (!$other) {
-			common_user_error(_t('No such user.'));
+			common_user_error(_('No such user.'));
 			return;
 		}
 
-		$user = common_current_user();
-
 		if ($user->isSubscribed($other)) {
-			common_user_error(_t('Already subscribed!.'));
+			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
-
-		if (!$sub->insert()) {
-			common_server_error(_t('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)));
 	}
-	
+
 	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) {
-			global $config;
-			$profile = $listenee->getProfile();
-			$other = $listener->getProfile();
-			$name = $profile->getBestName();
-			$other_name = $other->getBestName();
-			$recipients = $listenee->email;
-			$headers['From'] = mail_notify_from();
-			$headers['To'] = $name . ' <' . $listenee->email . '>';
-			$headers['Subject'] = $other_name . _t(' is now listening to your notices on ') . $config['site']['name'];
-
-			$body = 
-			  ($other->fullname) ? 
-			  ($other->fullname . ' (' . $other->nickname . ')') : $other->nickname;
-
-			$body .= _t(' is now listening to your notices on ') . $config['site']['name'] . '.';
-			$body .= "\n\n";
-			$body .= "\t".$other->profileurl;
-			$body .= "\n\n";
-			$body .= _t('Faithfully yours, ');
-			$body .= "\n";
-			$body .= $config['site']['name'];
-			$body .= "\n";
-
-			mail_send($recipients, $headers, $body);
-		}
+		mail_subscribe_notify($listenee, $listener);
 	}
 }
\ No newline at end of file