Allow unauthenticated users to view /api/statuses/replies/id.format

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

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index c1960561e21d7a0db77edb9b93f7c97d57c12e39..68a18cb57b43c87d7a9e4e6090f5b5b1df019a9a 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -21,79 +21,86 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiaccountAction extends TwitterapiAction {
-
-       function verify_credentials($args, $apidata) {
-
-               if ($apidata['content-type'] == 'xml') {
-                       header('Content-Type: application/xml; charset=utf-8');
-                       print '<authorized>true</authorized>';
-               } elseif ($apidata['content-type'] == 'json') {
-                       header('Content-Type: application/json; charset=utf-8');
-                       print '{"authorized":true}';
-               } else {
-                       common_user_error(_('API method not found!'), $code=404);
-               }
-
-       }
-
-       function end_session($args, $apidata) {
-               parent::handle($args);
-               common_server_error(_('API method under construction.'), $code=501);
-       }
-
-       function update_location($args, $apidata) {
-               parent::handle($args);
-
-               if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-                       $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
-                       return;
-               }
-
-               $location = trim($this->arg('location'));
-
-               if (!is_null($location) && strlen($location) > 255) {
-
-                       // XXX: But Twitter just truncates and runs with it. -- Zach
-                       $this->client_error(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
-                       return;
-               }
-
-               $user = $apidata['user'];
-               $profile = $user->getProfile();
-
-               if (!$profile) {
-                       common_server_error(_('User has no profile.'));
-                       return;
-               }
-
-               $orig_profile = clone($profile);
-               $profile->location = $location;
-
-               $result = $profile->update($orig_profile);
-
-               if (!$result) {
-                       common_log_db_error($profile, 'UPDATE', __FILE__);
-                       common_server_error(_('Couldn\'t save profile.'));
-                       return;
-               }
-
-               common_broadcast_profile($profile);
-               $type = $apidata['content-type'];
-
-               $this->init_document($type);
-               $this->show_profile($profile, $type);
-               $this->end_document($type);
-       }
-
-
-       function update_delivery_device($args, $apidata) {
-               parent::handle($args);
-               common_server_error(_('API method under construction.'), $code=501);
-       }
-
-       function rate_limit_status($args, $apidata) {
-               parent::handle($args);
-               common_server_error(_('API method under construction.'), $code=501);
-       }
-}
\ No newline at end of file
+class TwitapiaccountAction extends TwitterapiAction
+{
+    function verify_credentials($args, $apidata)
+    {
+        parent::handle($args);
+
+        switch ($apidata['content-type']) {
+        case 'xml':
+        case 'json':
+            $action_obj = new TwitapiusersAction();
+            $action_obj->prepare($args);
+            call_user_func(array($action_obj, 'show'), $args, $apidata);
+            break;
+        default:
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
+        }
+    }
+
+   function end_session($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+
+    function update_location($args, $apidata)
+    {
+        parent::handle($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
+            return;
+        }
+
+        $location = trim($this->arg('location'));
+
+        if (!is_null($location) && mb_strlen($location) > 255) {
+
+            // XXX: But Twitter just truncates and runs with it. -- Zach
+            $this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
+            return;
+        }
+
+        $user = $apidata['user'];
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            $this->serverError(_('User has no profile.'));
+            return;
+        }
+
+        $orig_profile = clone($profile);
+        $profile->location = $location;
+
+        $result = $profile->update($orig_profile);
+
+        if (!$result) {
+            common_log_db_error($profile, 'UPDATE', __FILE__);
+            $this->serverError(_('Couldn\'t save profile.'));
+            return;
+        }
+
+        common_broadcast_profile($profile);
+        $type = $apidata['content-type'];
+
+        $this->init_document($type);
+        $this->show_profile($profile, $type);
+        $this->end_document($type);
+    }
+
+
+    function update_delivery_device($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+
+    function rate_limit_status($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+}