Completely refactored noticesearch list, now using subclassing for highlighting....

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

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index b1caa34814d81ba5f03f2699c9b364fb7e410554..c19cd370d927f2b2bb6e8f5bf044f328f5e12926 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -21,38 +21,44 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapiaccountAction extends TwitterapiAction {
-
-    function verify_credentials($args, $apidata) {
-        parent::handle($args);
-
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
-            return;
+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 {
+            header('Content-Type: text/html; charset=utf-8');
+            print 'Authorized';
         }
-
-        $this->show_extended_profile($apidata['user'], $apidata);
     }
 
-    function end_session($args, $apidata) {
+    function end_session($args, $apidata)
+    {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
-    function update_location($args, $apidata) {
+    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']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
         $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->client_error(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
+            $this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
             return;
         }
 
@@ -60,7 +66,7 @@ class TwitapiaccountAction extends TwitterapiAction {
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -71,7 +77,7 @@ class TwitapiaccountAction extends TwitterapiAction {
 
         if (!$result) {
             common_log_db_error($profile, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t save profile.'));
+            $this->serverError(_('Couldn\'t save profile.'));
             return;
         }
 
@@ -84,13 +90,15 @@ class TwitapiaccountAction extends TwitterapiAction {
     }
 
 
-    function update_delivery_device($args, $apidata) {
+    function update_delivery_device($args, $apidata)
+    {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
-    function rate_limit_status($args, $apidata) {
+    function rate_limit_status($args, $apidata)
+    {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
-}
\ No newline at end of file
+}