X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funsubscribe.php;h=08b3ae57d8210e8f822f48a9ab00b2280b6662de;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=fabb7148e1404a27a65b60740afced403d58bf0c;hpb=b791a835929c659d8dcf174553f7786fb45cf978;p=quix0rs-gnu-social.git

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index fabb7148e1..08b3ae57d8 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -18,40 +18,63 @@
  */
 
 class UnsubscribeAction 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('unsubscribeto');
-		$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();
+		# CSRF protection
 
-		if (!$user->isSubscribed($other)) {
-			common_server_error(_t('Not 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 = DB_DataObject::factory('subscription');
-		
-		$sub->subscriber = $user->id;
-		$sub->subscribed = $other->id;
+		$other_id = $this->arg('unsubscribeto');
+
+        if (!$other_id) {
+            $this->client_error(_('No profile id in request.'));
+            return;
+        }
+
+        $other = Profile::staticGet('id', $other_id);
+
+        if (!$other_id) {
+            $this->client_error(_('No profile with that id.'));
+            return;
+        }
 
-		$sub->find(true);
+		$result = subs_unsubscribe_to($user, $other);
 
-		// note we checked for existence above
-		
-		if (!$sub->delete()) {
-			common_server_error(_t('Couldn\'t delete subscription.'));
+		if ($result != true) {
+			common_user_error($result);
 			return;
 		}
 
-		common_redirect(common_local_url('subscriptions', array('nickname' =>
-																$user->nickname)));
+		if ($this->boolean('ajax')) {
+			common_start_html('text/xml');
+			common_element_start('head');
+			common_element('title', null, _('Unsubscribed'));
+			common_element_end('head');
+			common_element_start('body');
+			common_subscribe_form($other);
+			common_element_end('body');
+			common_element_end('html');
+		} else {
+    		common_redirect(common_local_url('subscriptions', array('nickname' =>
+	    															$user->nickname)));
+        }
 	}
 }