Merge branch 'master' into 0.7.x

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

diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 5a35d84423d9cd874ce5412fbb74cb646f1c32de..db5892baf2979a5c5f8a3802973082d969afa063 100644 (file)
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -21,32 +21,35 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/twitterapi.php');
 
-class TwitapihelpAction extends TwitterapiAction {
-
-       /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
-        * URL:http://identi.ca/api/help/test.format
-        * Formats: xml, json
-        */
-       function test($args, $apidata) {
-               global $xw;
-               if ($apidata['content-type'] == 'xml') {
-                       header('Content-Type: application/xml; charset=utf-8');         
-                       common_start_xml();
-                       common_element('ok', NULL, 'true');
-                       common_end_xml();
-               } elseif ($apidata['content-type'] == 'json') {
-                       header('Content-Type: application/json; charset=utf-8');                
-                       print '"ok"';
-               } else {
-                       common_user_error("API method not found!", $code=404);
-               }
-               exit();
-       }
-
-       function downtime_schedule($args, $apidata) {
-               parent::handle($args);
-               common_server_error("API method under construction.", $code=501);
-               exit();
-       }
-       
+class TwitapihelpAction extends TwitterapiAction
+{
+
+    /* Returns the string "ok" in the requested format with a 200 OK HTTP status code.
+     * URL:http://identi.ca/api/help/test.format
+     * Formats: xml, json
+     */
+    function test($args, $apidata)
+    {
+        parent::handle($args);
+
+        if ($apidata['content-type'] == 'xml') {
+            $this->init_document('xml');
+            $this->element('ok', null, 'true');
+            $this->end_document('xml');
+        } elseif ($apidata['content-type'] == 'json') {
+            $this->init_document('json');
+            print '"ok"';
+            $this->end_document('json');
+        } else {
+            $this->clientError(_('API method not found!'), $code=404);
+        }
+
+    }
+
+    function downtime_schedule($args, $apidata)
+    {
+        parent::handle($args);
+        $this->serverError(_('API method under construction.'), $code=501);
+    }
+
 }
\ No newline at end of file