Fixed routing for direct messages and favorites in the API

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

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index e51a29a2d01af8580fad261e77c012a7c9419d7d..b7c09cc9dc7a3d8c3c7fbd9455e2f411613b673b 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -24,17 +24,20 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 class TwitapiaccountAction extends TwitterapiAction
 {
 
-    function verify_credentials($args, $apidata)
+       function verify_credentials($args, $apidata)
     {
-        parent::handle($args);
 
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
+               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);
+               }
 
-        $this->show_extended_profile($apidata['user'], $apidata);
-    }
+       }
 
     function end_session($args, $apidata)
     {
@@ -53,7 +56,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']);
@@ -99,4 +102,4 @@ class TwitapiaccountAction extends TwitterapiAction
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);
     }
-}
\ No newline at end of file
+}