Profile block base style

[quix0rs-gnu-social.git] / actions / unsubscribe.php

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 562dd00fc489c2d40bd3668f39726bbcc91afbd7..08b3ae57d8210e8f822f48a9ab00b2280b6662de 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -18,7 +18,7 @@
  */
 
 class UnsubscribeAction extends Action {
-       
+
        function handle($args) {
                parent::handle($args);
                if (!common_logged_in()) {
@@ -36,15 +36,29 @@ class UnsubscribeAction extends Action {
                # 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;
                }
 
-               $other_nickname = $this->arg('unsubscribeto');
-               $result=subs_unsubscribe_user($user,$other_nickname);
-               if($result!=true) {
+               $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;
+        }
+
+               $result = subs_unsubscribe_to($user, $other);
+
+               if ($result != true) {
                        common_user_error($result);
                        return;
                }
@@ -55,7 +69,7 @@ class UnsubscribeAction extends Action {
                        common_element('title', null, _('Unsubscribed'));
                        common_element_end('head');
                        common_element_start('body');
-                       common_unsubscribe_response();
+                       common_subscribe_form($other);
                        common_element_end('body');
                        common_element_end('html');
                } else {