X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Ftwitapiaccount.php;h=4ce61f35369fe79564adf0ed4bb52e81d670fec0;hb=3a246c17266d562e0510e5a332009dcfda43c1c7;hp=3a66e888505147ba58839dd242c8f5d7ce01fd22;hpb=93ac0bcae3a600733045ad7a5bafabcdfd49d9e5;p=quix0rs-gnu-social.git

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 3a66e88850..4ce61f3536 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -23,51 +23,67 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapiaccountAction extends TwitterapiAction {
 
+	function is_readonly() {
+
+		static $write_methods = array(	'update_location',
+										'update_delivery_device');
+
+		$cmdtext = explode('.', $this->arg('method'));
+
+		if (in_array($cmdtext[0], $write_methods)) {
+			return false;
+		}
+
+		return true;
+	}
+
 	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__);
 
@@ -76,27 +92,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);
-		
-		$apidata['api_arg'] = $user->id;
-		$this->show($args, $apidata);
-		
-		exit();
+		$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);
-		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