Update favorited for new layout and framework

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

diff --git a/actions/api.php b/actions/api.php
index 8ccd86f0bb1c9fa49c0503f959f3963a78b95cd8..47c1196052e25bd5a3ccf3dfe0a84b1ddcd55765 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;
@@ -102,10 +103,10 @@ 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);
         }
     }
 
@@ -116,7 +117,10 @@ class ApiAction extends Action {
                                 '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',
@@ -155,10 +159,10 @@ class ApiAction extends Action {
         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');
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
             common_end_xml();
         } else if ($this->content_type == 'json')  {
             header('Content-Type: application/json; charset=utf-8');
@@ -170,7 +174,7 @@ class ApiAction extends Action {
         }
     }
 
-    function is_readonly()
+    function isReadOnly()
     {
         # NOTE: before handle(), can't use $this->arg
         $apiaction = $_REQUEST['apiaction'];