Lots of tiny message changes.

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

diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index 2f975b121bee1109f47e98ded2bb041163581443..73ecc9249a1d437c43aa5f74cefe6ed46f865294 100644 (file)
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -21,6 +21,8 @@
  *
  * @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.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,13 +33,15 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
  * Outputs detailed information about the relationship between two users
  *
  * @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/
@@ -45,7 +49,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
 
 class ApiFriendshipsShowAction extends ApiBareAuthAction
 {
-    var $user   = null;
     var $source = null;
     var $target = null;
 
@@ -62,17 +65,11 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
     {
         parent::prepare($args);
 
-        if ($this->requiresAuth()) {
-            if ($this->checkBasicAuthUser() == false) {
-                return;
-            }
-        }
-
         $source_id          = (int)$this->trimmed('source_id');
         $source_screen_name = $this->trimmed('source_screen_name');
         $target_id          = (int)$this->trimmed('target_id');
         $target_screen_name = $this->trimmed('target_screen_name');
-    
+
         if (!empty($source_id)) {
             $this->source = User::staticGet($source_id);
         } elseif (!empty($source_screen_name)) {
@@ -97,7 +94,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
      *
      * @return boolean true or false
      */
-       
+
     function requiresAuth()
     {
         if (common_config('site', 'private')) {
@@ -129,10 +126,10 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), 404);
+            $this->clientError(_('API method not found.'), 404);
             return;
         }
-        
+
         if (empty($this->source)) {
             $this->clientError(
                 _('Could not determine source user.'),
@@ -140,7 +137,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
              );
             return;
         }
-              
+
         if (empty($this->target)) {
             $this->clientError(
                 _('Could not find target user.'),
@@ -148,24 +145,24 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction
             );
             return;
         }
-        
-        $result = $this->twitter_relationship_array($this->source, $this->target);
+
+        $result = $this->twitterRelationshipArray($this->source, $this->target);
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
-            $this->show_twitter_xml_relationship($result[relationship]);
-            $this->end_document('xml');
+            $this->initDocument('xml');
+            $this->showTwitterXmlRelationship($result[relationship]);
+            $this->endDocument('xml');
             break;
         case 'json':
-            $this->init_document('json');
+            $this->initDocument('json');
             print json_encode($result);
-            $this->end_document('json');
+            $this->endDocument('json');
             break;
         default:
             break;
         }
-        
+
     }
 
 }