X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=20c258923bb0b2b33fed38d1d156e27e8cbe155a;hb=85b9e58e535d44f5973fe14f888dc19f25bcaddd;hp=1ca57a43ba0ccdff6e5a0e1bd75a5ff939d98391;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 1ca57a43ba..20c258923b 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,50 +20,41 @@
 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.'));
-			return;
-		}
-
-		$other_nickname = $this->arg('subscribeto');
-
-		$other = User::staticGet('nickname', $other_nickname);
-
-		if (!$other) {
-			common_user_error(_t('No such user.'));
+			common_user_error(_('Not logged in.'));
 			return;
 		}
 
 		$user = common_current_user();
 
-		if ($user->isSubscribed($other)) {
-			common_user_error(_t('Already subscribed!.'));
+		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
 			return;
 		}
 
-		$sub = new Subscription();
-		$sub->subscriber = $user->id;
-		$sub->subscribed = $other->id;
+		# CSRF protection
 
-		$sub->created = DB_DataObject_Cast::dateTime(); # current time
-
-		$val = $sub->validate();
-
-		if ($val !== TRUE) {
-			# XXX: give some error notice
-			common_server_error(_t('Subscription did not validate.'));
+		$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 (!$sub->insert()) {
-			common_server_error(_t('Couldn\'t create subscription.'));
+		$other_nickname = $this->arg('subscribeto');
+
+		$result=subs_subscribe_user($user, $other_nickname);
+		
+		if($result != true) {
+			common_user_error($result);
 			return;
 		}
-
-		common_redirect(common_local_url('all', array('nickname' =>
-													  $user->nickname)));
+		
+		common_redirect(common_local_url('subscriptions', array('nickname' =>
+																$user->nickname)));
 	}
 }
\ No newline at end of file