X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapi.php;h=c4cfd569d61c66a1c90c56ce6c92088d2666c34a;hb=bfb22a99329c61f4b117ca6151fb461fec3ac192;hp=a525703208e43465a491f676034b680cb872d0ca;hpb=2d47b3ad643a450c7c85f0c5165a156036283040;p=quix0rs-gnu-social.git

diff --git a/actions/api.php b/actions/api.php
index a525703208..c4cfd569d6 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -45,9 +45,7 @@ class ApiAction extends Action {
 			$this->api_method = $cmdext[0];
 			$this->content_type = strtolower($cmdext[1]);
 		}
-		
-		# common_debug("apiaction = $this->api_action, method = $this->api_method, argument = $this->api_arg, ctype = $this->content_type");
-						
+								
 		# XXX Maybe check to see if the command actually exists first?
 		if($this->requires_auth()) {
 			if (!isset($_SERVER['PHP_AUTH_USER'])) {
@@ -56,7 +54,7 @@ class ApiAction extends Action {
 				header('WWW-Authenticate: Basic realm="Laconica API"');
 				
 				# if the user hits cancel -- bam!
-				common_show_basic_auth_error();		
+				$this->show_basic_auth_error();		
 			} else {
 				$nickname = $_SERVER['PHP_AUTH_USER'];
 				$password = $_SERVER['PHP_AUTH_PW'];
@@ -67,7 +65,7 @@ class ApiAction extends Action {
 					$this->process_command();
 				} else {
 					# basic authentication failed
-					common_show_basic_auth_error();		
+					$this->show_basic_auth_error();		
 				}			
 			}
 		} else {
@@ -102,9 +100,13 @@ class ApiAction extends Action {
 	function requires_auth() {
 		static $noauth = array(	'statuses/public_timeline',
 								'statuses/show',
+								'users/show',
 								'help/test', 
 								'help/downtime_schedule');
-		static $bareauth = array('statuses/user_timeline', 'statuses/friends');
+		
+		static $bareauth = array('statuses/user_timeline',
+								 'statuses/friends', 
+								 'statuses/followers');
 
 		$fullname = "$this->api_action/$this->api_method";
 		
@@ -123,5 +125,12 @@ class ApiAction extends Action {
 			return true;
 		}
 	}
+	
+	function show_basic_auth_error() {
+	  	header('HTTP/1.1 401 Unauthorized');
+		header('Content-type: text/plain');
+	   	print("Could not authenticate you."); # exactly what Twitter says - no \n
+		exit();
+	}
 		
 }