X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Funsubscribe.php;h=ddc222923b8264c844613b29d96c602283b7dae1;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=73661a4f169795cf46e24521c222e8e90e9c4aaf;hpb=894ef352591fe581909c01c46047bf530e59a984;p=quix0rs-gnu-social.git

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 73661a4f16..ddc222923b 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -44,21 +44,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class UnsubscribeAction extends Action
 {
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            // TRANS: Client error displayed when trying to unsubscribe while not logged in.
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return;
         }
 
-        $user = common_current_user();
-
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $user->nickname)));
-            return;
+                                             array('nickname' => $this->scoped->nickname)));
         }
 
         /* Use a session token for CSRF protection. */
@@ -69,7 +65,6 @@ class UnsubscribeAction extends Action
             // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. ' .
                                  'Try again, please.'));
-            return;
         }
 
         $other_id = $this->arg('unsubscribeto');
@@ -77,22 +72,19 @@ class UnsubscribeAction extends Action
         if (!$other_id) {
             // TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
             $this->clientError(_('No profile ID in request.'));
-            return;
         }
 
-        $other = Profile::staticGet('id', $other_id);
+        $other = Profile::getKV('id', $other_id);
 
-        if (!$other) {
+        if (!($other instanceof Profile)) {
             // TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
             $this->clientError(_('No profile with that ID.'));
-            return;
         }
 
-        $result = subs_unsubscribe_to($user, $other);
-
-        if (is_string($result)) {
-            $this->clientError($result);
-            return;
+        try {
+            Subscription::cancel($this->scoped, $other);
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage());
         }
 
         if ($this->boolean('ajax')) {
@@ -105,11 +97,9 @@ class UnsubscribeAction extends Action
             $subscribe = new SubscribeForm($this, $other);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
-            common_redirect(common_local_url('subscriptions',
-                                             array('nickname' => $user->nickname)),
-                            303);
+            common_redirect(common_local_url('subscriptions', array('nickname' => $this->scoped->nickname)), 303);
         }
     }
 }