whitespace in deletenotice.php

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

diff --git a/actions/api.php b/actions/api.php
index e03961e21fcc52683c3c0250239020b42cec02d7..21fe4eea32004868e9a795422fcddb77ceaeaf73 100644 (file)
--- a/actions/api.php
+++ b/actions/api.php
@@ -19,7 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class ApiAction extends Action {
+class ApiAction extends Action
+{
 
     var $user;
     var $content_type;
@@ -27,7 +28,8 @@ class ApiAction extends Action {
     var $api_method;
     var $api_action;
 
-    function handle($args) {
+    function handle($args)
+    {
         parent::handle($args);
 
         $this->api_action = $this->arg('apiaction');
@@ -70,16 +72,21 @@ class ApiAction extends Action {
             }
         } else {
 
-            # Look for the user in the session
-            if (common_logged_in()) {
-                 $this->user = common_current_user();
-            }
+                       # Caller might give us a username even if not required
+                       if (isset($_SERVER['PHP_AUTH_USER'])) {
+                               $user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']);
+                               if ($user) {
+                                       $this->user = $user;
+                               }
+                               # Twitter doesn't throw an error if the user isn't found
+                       }
 
             $this->process_command();
         }
     }
 
-    function process_command() {
+    function process_command()
+    {
         $action = "twitapi$this->api_action";
         $actionfile = INSTALLDIR."/actions/$action.php";
 
@@ -100,20 +107,24 @@ class ApiAction extends Action {
 
                 call_user_func(array($action_obj, $this->api_method), $_REQUEST, $apidata);
             } else {
-                common_user_error("API method not found!", $code=404);
+                $this->clientError("API method not found!", $code=404);
             }
         } else {
-            common_user_error("API method not found!", $code=404);
+            $this->clientError("API method not found!", $code=404);
         }
     }
 
     # Whitelist of API methods that don't need authentication
-    function requires_auth() {
+    function requires_auth()
+    {
         static $noauth = array( 'statuses/public_timeline',
                                 'statuses/show',
                                 'users/show',
                                 'help/test',
-                                'help/downtime_schedule');
+                                'help/downtime_schedule',
+                                'laconica/version',
+                                'laconica/config',
+                                'laconica/wadl');
 
         static $bareauth = array('statuses/user_timeline',
                                  'statuses/friends',
@@ -144,18 +155,19 @@ class ApiAction extends Action {
         }
     }
 
-    function show_basic_auth_error() {
+    function show_basic_auth_error()
+    {
         header('HTTP/1.1 401 Unauthorized');
         $msg = 'Could not authenticate you.';
 
         if ($this->content_type == 'xml') {
             header('Content-Type: application/xml; charset=utf-8');
-            common_start_xml();
-            common_element_start('hash');
-            common_element('error', NULL, $msg);
-            common_element('request', NULL, $_SERVER['REQUEST_URI']);
-            common_element_end('hash');
-            common_end_xml();
+            $this->startXML();
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
+            $this->endXML();
         } else if ($this->content_type == 'json')  {
             header('Content-Type: application/json; charset=utf-8');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
@@ -166,7 +178,8 @@ class ApiAction extends Action {
         }
     }
 
-    function is_readonly() {
+    function isReadOnly()
+    {
         # NOTE: before handle(), can't use $this->arg
         $apiaction = $_REQUEST['apiaction'];
         $method = $_REQUEST['method'];