X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=20c258923bb0b2b33fed38d1d156e27e8cbe155a;hb=31d5b61ca7daf72a847aed50eb65b672b52766f5;hp=fe683828a7623911d3046af8a6b0797f471ecd93;hpb=293ad758f76143cf0e23c8d4a65f66d8a1ba7bab;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index fe683828a7..20c258923b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,11 +20,12 @@
 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;
 		}
 
@@ -34,70 +35,26 @@ class SubscribeAction extends Action {
 			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
 			return;
 		}
-		
-		$other_nickname = $this->arg('subscribeto');
 
-		$other = User::staticGet('nickname', $other_nickname);
-
-		if (!$other) {
-			common_user_error(_t('No such user.'));
-			return;
-		}
+		# CSRF protection
 
-		if ($user->isSubscribed($other)) {
-			common_user_error(_t('Already subscribed!.'));
+		$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;
 		}
 
-		$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(_t('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) {
-			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);
-		}
-	}
 }
\ No newline at end of file