don't override show() in SingleNoticeItem

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

diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index d691b5b4f85666714dd872929b5b643c29eb5673..993280981845331e8f95206f93272d33fc931737 100644 (file)
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.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 follow (subscribe) the user specified in
@@ -40,16 +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 ApiFriendshipsCreateAction extends ApiAuthAction
 {
-
-    var $format = null;
-    var $user   = null;
     var $other  = null;
 
     /**
@@ -60,20 +60,12 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
-        $this->format = $this->arg('format');
         $this->user   = $this->auth_user;
-        $this->other  = $this->getTargetUser($id);
+        $this->other  = $this->getTargetProfile($this->arg('id'));
 
         return true;
     }
@@ -87,13 +79,13 @@ class ApiFriendshipsCreateAction 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
@@ -101,9 +93,20 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
             return;
         }
 
+        if (!in_array($this->format, array('xml', 'json'))) {
+            $this->clientError(
+                // TRANS: Client error displayed when coming across a non-supported API method.
+                _('API method not found.'),
+                404,
+                $this->format
+            );
+            return;
+        }
+
         if (empty($this->other)) {
             $this->clientError(
-                _('Could not follow user: User not found.'),
+                // TRANS: Client error displayed when trying follow who's profile could not be found.
+                _('Could not follow user: profile not found.'),
                 403,
                 $this->format
             );
@@ -112,6 +115,8 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
 
         if ($this->user->isSubscribed($this->other)) {
             $errmsg = sprintf(
+                // TRANS: Client error displayed when trying to follow a user that's already being followed.
+                // TRANS: %s is the nickname of the user that is already being followed.
                 _('Could not follow user: %s is already on your list.'),
                 $this->other->nickname
             );
@@ -126,9 +131,8 @@ class ApiFriendshipsCreateAction extends ApiAuthAction
             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);
     }
-
 }