notice_inbox.id -> notice_inbox.notice_id

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

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index a43d1edbada0f5927064a9af5756d9f8b7972161..bb59005a9594a57547851a99c688d7db155c58c1 100644 (file)
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,55 +23,53 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction {
 
-       function is_readonly() {
-               return false;
-       }
-
        function verify_credentials($args, $apidata) {
 
                if ($apidata['content-type'] == 'xml') {
-                       header('Content-Type: application/xml; charset=utf-8');         
+                       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');                
+                       header('Content-Type: application/json; charset=utf-8');
                        print '{"authorized":true}';
                } else {
-                       common_user_error("API method not found!", $code=404);
+                       common_user_error(_('API method not found!'), $code=404);
                }
-                       
-               exit();
+
        }
-       
+
        function end_session($args, $apidata) {
                parent::handle($args);
-               common_server_error("API method under construction.", $code=501);
-               exit();
+               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
-                       header('HTTP/1.1 406 Not Acceptable');                  
-                       print "That's too long. Max notice size is 255 chars.\n";
-                       exit();
+                       $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.'));
-                       exit();
+                       return;
                }
-               
+
                $orig_profile = clone($profile);
                $profile->location = $location;
-               
+
                common_debug('Old profile: ' . common_log_objstring($orig_profile), __FILE__);
                common_debug('New profile: ' . common_log_objstring($profile), __FILE__);
 
@@ -80,29 +78,25 @@ class TwitapiaccountAction extends TwitterapiAction {
                if (!$result) {
                        common_log_db_error($profile, 'UPDATE', __FILE__);
                        common_server_error(_('Couldn\'t save profile.'));
-                       exit();
+                       return;
                }
 
                common_broadcast_profile($profile);
                $type = $apidata['content-type'];
-               
+
                $this->init_document($type);
                $this->show_profile($profile, $type);
                $this->end_document($type);
-               
-               exit();
        }
 
 
        function update_delivery_device($args, $apidata) {
                parent::handle($args);
-               common_server_error("API method under construction.", $code=501);
-               exit();
+               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);
-               exit();
+               common_server_error(_('API method under construction.'), $code=501);
        }
 }
\ No newline at end of file