X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftwitapifriendships.php;h=ae15d171e7c95e0233b2f26a0bc5484f477934b8;hb=e440b9cea02549032ba4f79c43964219dea23d82;hp=90e890e35c5096f64fa239ea468f4022897f6fe5;hpb=140689800b03ff704f6c70260c2b740ad41578c0;p=quix0rs-gnu-social.git

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 90e890e35c..ae15d171e7 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -23,6 +23,20 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 
 class TwitapifriendshipsAction extends TwitterapiAction {
 
+	function is_readonly() {
+		
+		static $write_methods = array(	'create',
+										'destroy');
+		
+		$cmdtext = explode('.', $this->arg('method'));		
+		
+		if (in_array($cmdtext[0], $write_methods)) {			
+			return false;
+		}
+				
+		return true;
+	}
+
 	function create($args, $apidata) {
 		parent::handle($args);
 
@@ -33,15 +47,14 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		if (!$other) {
 			$this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
 			exit();
-			return;
 		}
 		
 		$user = $apidata['user'];
 		
 		if ($user->isSubscribed($other)) {
-			$this->client_error("Could not follow user: $other->nickname is already on your list.", 403, $apidata['content-type']);
+			$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
+			$this->client_error($errmsg, 403, $apidata['content-type']);
 			exit();
-			return;
 		}
 		
 		$sub = new Subscription();
@@ -55,9 +68,9 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$result = $sub->insert();
 
 		if (!$result) {
-			$this->client_error("Could not follow user: $other->nickname.", 400, $apidata['content-type']);			
+			$errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
+			$this->client_error($errmsg, 400, $apidata['content-type']);			
 			exit();
-			return;
 		}
 		
 		$sub->query('COMMIT');
@@ -66,7 +79,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
 		$type = $apidata['content-type'];
 		$this->init_document($type);
-		$this->show_profile($other);
+		$this->show_profile($other, $type);
 		$this->end_document($type);
 		exit();
 	}
@@ -106,8 +119,8 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		}
 
 		$type = $apidata['content-type'];
-		$this->init_document($type);
-		$this->show_profile($other);
+		$this->init_document($type);	
+		$this->show_profile($other, $type);
 		$this->end_document($type);
 		exit();
 	}
@@ -132,12 +145,8 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$user_a_id = $this->trimmed('user_a');
 		$user_b_id = $this->trimmed('user_b');
 		
-		$user_a = $this->get_profile($user_a_id);
-		$user_b = $this->get_profile($user_b_id);
-		
-		if($user_a) { print "got user a profile";}
-		if($user_b) { print "got user b profile";}
-		
+		$user_a = $this->get_user($user_a_id);
+		$user_b = $this->get_user($user_b_id);
 		
 		if (!$user_a || !$user_b) {
 			$this->client_error(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
@@ -152,15 +161,17 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		
 		switch ($apidata['content-type']) {
 		 case 'xml':
-			common_start_xml();
+			$this->init_document('xml');
 			common_element('friends', NULL, $result);
-			common_end_xml();
+			$this->end_document('xml');
 			break;
 		 case 'json':
+			$this->init_document('json');
 			print json_encode($result);
+			$this->end_document('json');
 			break;
 		 default:
-			print $result;
+			print $result;  // Really? --Zach
 			break;
 		}