X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribe.php;h=a032cf71769278b83da547d6766531306bc3ac33;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=aab6c4b1557d7cd5a599d3d12b14c694a6293f88;hpb=b6cfd2dffeeb733f07818db5f4ce11d4b3d51771;p=quix0rs-gnu-social.git

diff --git a/actions/subscribe.php b/actions/subscribe.php
index aab6c4b155..a032cf7176 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -1,61 +1,78 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1) }
+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;
 		}
-		
-		$other_nickname = $this->arg('subscribeto');
 
-		$other = User::staticGet('nickname', $other_nickname);
-		
-		if (!$other) {
-			common_user_error(_t('No such user.'));
+		$user = common_current_user();
+
+		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+			common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
 			return;
 		}
-		
-		$user = common_current_user();
 
-		if ($user->isSubscribed($other)) {
-			common_user_error(_t('Already subscribed!.'));
+		# 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;
 		}
-		
-		$sub = new Subscription();
-		$sub->subscriber = $user->id;
-		$sub->subscribed = $other->id;
-		
-		$sub->created = time();
-		
-		if (!$sub->insert()) {
-			common_server_error(_t('Couldn\'t create subscription.'));
+
+		$other_id = $this->arg('subscribeto');
+
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+			$this->client_error(_('Not a local user.'));
+			return;
+        }
+
+		$result = subs_subscribe_to($user, $other);
+
+		if($result != true) {
+			common_user_error($result);
 			return;
 		}
-		
-		common_redirect(common_local_url('all', array('nickname' =>
-													  $user->nickname)));
+
+		if ($this->boolean('ajax')) {
+			common_start_html('text/xml');
+			common_element_start('head');
+			common_element('title', null, _('Subscribed'));
+			common_element_end('head');
+			common_element_start('body');
+			common_unsubscribe_form($other->getProfile());
+			common_element_end('body');
+			common_element_end('html');
+		} else {
+		    common_redirect(common_local_url('subscriptions', array('nickname' =>
+																$user->nickname)));
+        }
 	}
-}
\ No newline at end of file
+}