Merge remote branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3ad12156dd44ae8f278b6a5f4c49bdc2d0ed3a7d..a5dff08bab5759cdc8748a942f678e6378636c9c 100644 (file)
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -21,8 +21,10 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Dan Moore <dan@moore.cx>
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -31,7 +33,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/apiauth.php';
 
 /**
  * Allows the authenticating users to unfollow (unsubscribe) the user specified in
@@ -40,14 +42,14 @@ require_once INSTALLDIR.'/lib/apiauth.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Dan Moore <dan@moore.cx>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiFriendshipsDestroyAction extends ApiAuthAction
 {
-    var $user   = null;
     var $other  = null;
 
     /**
@@ -58,19 +60,12 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $this->user   = $this->auth_user;
-        $this->other  = $this->getTargetUser($id);
+        $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
     }
@@ -84,13 +79,13 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
             $this->clientError(
+                // TRANS: Client error. POST is a HTTP command. It should not be translated.
                 _('This method requires a POST.'),
                 400,
                 $this->format
@@ -100,7 +95,8 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
 
         if (!in_array($this->format, array('xml', 'json'))) {
             $this->clientError(
-                _('API method not found!'),
+                // TRANS: Client error displayed when trying to handle an unknown API method.
+                _('API method not found.'),
                 404,
                 $this->format
             );
@@ -109,6 +105,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
 
         if (empty($this->other)) {
             $this->clientError(
+                // TRANS: Client error displayed when trying to unfollow a user that cannot be found.
                 _('Could not unfollow user: User not found.'),
                 403,
                 $this->format
@@ -120,23 +117,19 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
 
         if ($this->user->id == $this->other->id) {
             $this->clientError(
-                _("You cannot unfollow yourself!"),
+                // TRANS: Client error displayed when trying to unfollow self.
+                _("You cannot unfollow yourself."),
                 403,
                 $this->format
             );
             return;
         }
 
-        $result = subs_unsubscribe_user($this->user, $this->other->nickname);
+        // throws an exception on error
+        Subscription::cancel($this->user->getProfile(), $this->other);
 
-        if (is_string($result)) {
-            $this->clientError($result, 403, $this->format);
-            return;
-        }
-
-        $this->init_document($this->format);
-        $this->show_profile($this->other, $this->format);
-        $this->end_document($this->format);
+        $this->initDocument($this->format);
+        $this->showProfile($this->other, $this->format);
+        $this->endDocument($this->format);
     }
-
 }