X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftwitapiaccount.php;h=dc8e2e798b5d268f9f76529acbe7a5debb4ac1fd;hb=89a668344fc2ef07f1f86ee98bb8e10852212123;hp=3a9b8ba3e2f60db4abc96211c6b6821dc3233a20;hpb=0b87bf6c54f0ce4870683e976996be1a8c7c0fec;p=quix0rs-gnu-social.git

diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 3a9b8ba3e2..dc8e2e798b 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -21,102 +21,85 @@ if (!defined('LACONICA')) { exit(1); }
 
 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;
-	}
+class TwitapiaccountAction extends TwitterapiAction
+{
 
-	function verify_credentials($args, $apidata) {
+	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);
 		}
-			
-		exit();
-	}
-	
-	function end_session($args, $apidata) {
-		parent::handle($args);
-		common_server_error(_('API method under construction.'), $code=501);
-		exit();
+
 	}
-	
-	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']);
-			exit();
-		}
+    function end_session($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
 
-		$location = trim($this->arg('location'));
+    function update_location($args, $apidata)
+    {
+        parent::handle($args);
 
-		if (!is_null($location) && 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']);
-			exit();
-		}
-		
-		$user = $apidata['user'];
-		$profile = $user->getProfile();
-		
-		if (!$profile) {
-			common_server_error(_('User has no profile.'));
-			exit();
-		}
-		
-		$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__);
-
-		$result = $profile->update($orig_profile);
-
-		if (!$result) {
-			common_log_db_error($profile, 'UPDATE', __FILE__);
-			common_server_error(_('Couldn\'t save profile.'));
-			exit();
-		}
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
+            return;
+        }
 
-		common_broadcast_profile($profile);
-		$type = $apidata['content-type'];
-		
-		$this->init_document($type);
-		$this->show_profile($profile, $type);
-		$this->end_document($type);
-		
-		exit();
-	}
+        $location = trim($this->arg('location'));
 
+        if (!is_null($location) && strlen($location) > 255) {
 
-	function update_delivery_device($args, $apidata) {
-		parent::handle($args);
-		common_server_error(_('API method under construction.'), $code=501);
-		exit();
-	}
-	
-	function rate_limit_status($args, $apidata) {
-		parent::handle($args);
-		common_server_error(_('API method under construction.'), $code=501);
-		exit();
-	}
-}
\ No newline at end of file
+            // 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']);
+            return;
+        }
+
+        $user = $apidata['user'];
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            $this->serverError(_('User has no profile.'));
+            return;
+        }
+
+        $orig_profile = clone($profile);
+        $profile->location = $location;
+
+        $result = $profile->update($orig_profile);
+
+        if (!$result) {
+            common_log_db_error($profile, 'UPDATE', __FILE__);
+            $this->serverError(_('Couldn\'t save profile.'));
+            return;
+        }
+
+        common_broadcast_profile($profile);
+        $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);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+
+    function rate_limit_status($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+}