userrss action didn't call parent preparation method

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

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 46fbcf6571e81d4a7f454c531b9b6e3a904c833a..4b85ba427ca1b18d611434865ffb0dfce1dcbff3 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -5,14 +5,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, 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
@@ -28,7 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -36,29 +36,25 @@ if (!defined('LACONICA')) {
  * Unsubscribe handler
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 class UnsubscribeAction extends Action
 {
-
     function handle($args)
     {
         parent::handle($args);
         if (!common_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. */
@@ -66,46 +62,44 @@ class UnsubscribeAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // 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');
 
         if (!$other_id) {
-            $this->clientError(_('No profile id in request.'));
-            return;
+            // TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+            $this->clientError(_('No profile ID in request.'));
         }
 
-        $other = Profile::staticGet('id', $other_id);
+        $other = Profile::getKV('id', $other_id);
 
-        if (!$other) {
-            $this->clientError(_('No profile with that id.'));
-            return;
+        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.'));
         }
 
-        $result = subs_unsubscribe_to($user, $other);
-
-        if ($result != true) {
-            $this->clientError($result);
-            return;
+        try {
+            Subscription::cancel($this->scoped, $other);
+        } catch (Exception $e) {
+            $this->clientError($e->getMessage());
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for page to unsubscribe.
             $this->element('title', null, _('Unsubscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $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);
         }
     }
 }