X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapistatusnetconfig.php;h=ed1d151bfcfc5856a1f99832d91b3d79eaad6cef;hb=1e6aff69d69e09495638b60831c0548aae0b9773;hp=94bd5b4b3f1b5ce4f4833b944c89291b36f90973;hpb=62059fec832014411f604d9cc669b7d3201a60d5;p=quix0rs-gnu-social.git

diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 94bd5b4b3f..ed1d151bfc 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -21,6 +21,7 @@
  *
  * @category  API
  * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -31,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/twitterapi.php';
+require_once INSTALLDIR . '/lib/api.php';
 
 /**
  * Gives a full dump of configuration variables for this instance
@@ -42,15 +43,14 @@ require_once INSTALLDIR . '/lib/twitterapi.php';
  *
  * @category API
  * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
 
-class ApiStatusnetConfigAction extends TwitterApiAction
+class ApiStatusnetConfigAction extends ApiAction
 {
-    var $format = null;
-
     var $keys = array(
         'site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
                         'email', 'broughtby', 'broughtbyurl', 'closed',
@@ -73,7 +73,6 @@ class ApiStatusnetConfigAction extends TwitterApiAction
     function prepare($args)
     {
         parent::prepare($args);
-        $this->format = $this->arg('format');
         return true;
     }
 
@@ -91,7 +90,7 @@ class ApiStatusnetConfigAction extends TwitterApiAction
 
         switch ($this->format) {
         case 'xml':
-            $this->init_document('xml');
+            $this->initDocument('xml');
             $this->elementStart('config');
 
             // XXX: check that all sections and settings are legal XML elements
@@ -114,7 +113,7 @@ class ApiStatusnetConfigAction extends TwitterApiAction
                 $this->elementEnd($section);
             }
             $this->elementEnd('config');
-            $this->end_document('xml');
+            $this->endDocument('xml');
             break;
         case 'json':
             $result = array();
@@ -125,9 +124,9 @@ class ApiStatusnetConfigAction extends TwitterApiAction
                         = common_config($section, $setting);
                 }
             }
-            $this->init_document('json');
-            $this->show_json_objects($result);
-            $this->end_document('json');
+            $this->initDocument('json');
+            $this->showJsonObjects($result);
+            $this->endDocument('json');
             break;
         default:
             $this->clientError(