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 dc8e2e798b5d268f9f76529acbe7a5debb4ac1fd..68a18cb57b43c87d7a9e4e6090f5b5b1df019a9a 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,23 +23,24 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction
 {
-
-       function verify_credentials($args, $apidata)
+    function verify_credentials($args, $apidata)
     {
+        parent::handle($args);
 
-               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);
-               }
-
-       }
+        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)
+   function end_session($args, $apidata)
     {
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);
@@ -56,7 +57,7 @@ class TwitapiaccountAction extends TwitterapiAction
 
         $location = trim($this->arg('location'));
 
-        if (!is_null($location) && strlen($location) > 255) {
+        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']);