summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_darcs/inventory4
-rw-r--r--_darcs/patches/20081230211444-84dde-d36ece807afedfa6f918923ba9074f774cbcb5ec.gzbin0 -> 725 bytes
-rw-r--r--_darcs/pristine/actions/twitapilaconica.php40
-rw-r--r--_darcs/tentative_pristine43
-rw-r--r--actions/twitapilaconica.php40
5 files changed, 122 insertions, 5 deletions
diff --git a/_darcs/inventory b/_darcs/inventory
index da728be6f..895091d01 100644
--- a/_darcs/inventory
+++ b/_darcs/inventory
@@ -106,4 +106,6 @@ Evan Prodromou <evan@prodromou.name>**20081230203747]
[implement api/laconica/version method
Evan Prodromou <evan@prodromou.name>**20081230205939]
[add some breaks so that switch statement works
-Evan Prodromou <evan@prodromou.name>**20081230210114] \ No newline at end of file
+Evan Prodromou <evan@prodromou.name>**20081230210114]
+[implement the api/laconica/config method
+Evan Prodromou <evan@prodromou.name>**20081230211444] \ No newline at end of file
diff --git a/_darcs/patches/20081230211444-84dde-d36ece807afedfa6f918923ba9074f774cbcb5ec.gz b/_darcs/patches/20081230211444-84dde-d36ece807afedfa6f918923ba9074f774cbcb5ec.gz
new file mode 100644
index 000000000..3a9d1d17d
--- /dev/null
+++ b/_darcs/patches/20081230211444-84dde-d36ece807afedfa6f918923ba9074f774cbcb5ec.gz
Binary files differ
diff --git a/_darcs/pristine/actions/twitapilaconica.php b/_darcs/pristine/actions/twitapilaconica.php
index 6d3490abd..9d9fcef6f 100644
--- a/_darcs/pristine/actions/twitapilaconica.php
+++ b/_darcs/pristine/actions/twitapilaconica.php
@@ -89,6 +89,8 @@ class TwitapilaconicaAction extends TwitterapiAction
* Gives a full dump of configuration variables for this instance
* of Laconica, minus variables that may be security-sensitive (like
* passwords).
+ * URL: http://identi.ca/api/laconica/config.(xml|json)
+ * Formats: xml, json
*
* @param array $args Web arguments
* @param array $apidata Twitter API data
@@ -100,8 +102,44 @@ class TwitapilaconicaAction extends TwitterapiAction
function config($args, $apidata)
{
+ static $keys = array('site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
+ 'email', 'broughtby', 'broughtbyurl', 'closed',
+ 'inviteonly', 'private'),
+ 'license' => array('url', 'title', 'image'),
+ 'nickname' => array('featured'),
+ 'throttle' => array('enabled', 'count', 'timespan'),
+ 'xmpp' => array('enabled', 'server', 'user'));
+
parent::handle($args);
- common_server_error(_('API method under construction.'), 501);
+
+ switch ($apidata['content-type']) {
+ case 'xml':
+ $this->init_document('xml');
+ // XXX: check that all sections and settings are legal XML elements
+ foreach ($keys as $section => $settings) {
+ common_element_start($section);
+ foreach ($settings as $setting) {
+ common_element($setting, null, common_config($section, $setting));
+ }
+ common_element_end($section);
+ }
+ $this->end_document('xml');
+ break;
+ case 'json':
+ $result = array();
+ foreach ($keys as $section => $settings) {
+ $result[$section] = array();
+ foreach ($settings as $setting) {
+ $result[$section][$setting] = common_config($section, $setting);
+ }
+ }
+ $this->init_document('json');
+ $this->show_json_objects($result);
+ $this->end_document('json');
+ break;
+ default:
+ $this->client_error(_('API method not found!'), $code=404);
+ }
}
/**
diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine
index 8dfaf737a..404e42f98 100644
--- a/_darcs/tentative_pristine
+++ b/_darcs/tentative_pristine
@@ -1,4 +1,43 @@
-hunk ./actions/twitapilaconica.php 75
+hunk ./actions/twitapilaconica.php 92
++ * URL: http://identi.ca/api/laconica/config.(xml|json)
++ * Formats: xml, json
+hunk ./actions/twitapilaconica.php 105
++ static $keys = array('site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
++ 'email', 'broughtby', 'broughtbyurl', 'closed',
++ 'inviteonly', 'private'),
++ 'license' => array('url', 'title', 'image'),
++ 'nickname' => array('featured'),
++ 'throttle' => array('enabled', 'count', 'timespan'),
++ 'xmpp' => array('enabled', 'server', 'user'));
++
+hunk ./actions/twitapilaconica.php 114
+- common_server_error(_('API method under construction.'), 501);
++
++ switch ($apidata['content-type']) {
++ case 'xml':
++ $this->init_document('xml');
++ // XXX: check that all sections and settings are legal XML elements
++ foreach ($keys as $section => $settings) {
++ common_element_start($section);
++ foreach ($settings as $setting) {
++ common_element($setting, null, common_config($section, $setting));
++ }
++ common_element_end($section);
++ }
++ $this->end_document('xml');
+ break;
-hunk ./actions/twitapilaconica.php 80
++ case 'json':
++ $result = array();
++ foreach ($keys as $section => $settings) {
++ $result[$section] = array();
++ foreach ($settings as $setting) {
++ $result[$section][$setting] = common_config($section, $setting);
++ }
++ }
++ $this->init_document('json');
++ $this->show_json_objects($result);
++ $this->end_document('json');
+ break;
++ default:
++ $this->client_error(_('API method not found!'), $code=404);
++ }
diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php
index 6d3490abd..9d9fcef6f 100644
--- a/actions/twitapilaconica.php
+++ b/actions/twitapilaconica.php
@@ -89,6 +89,8 @@ class TwitapilaconicaAction extends TwitterapiAction
* Gives a full dump of configuration variables for this instance
* of Laconica, minus variables that may be security-sensitive (like
* passwords).
+ * URL: http://identi.ca/api/laconica/config.(xml|json)
+ * Formats: xml, json
*
* @param array $args Web arguments
* @param array $apidata Twitter API data
@@ -100,8 +102,44 @@ class TwitapilaconicaAction extends TwitterapiAction
function config($args, $apidata)
{
+ static $keys = array('site' => array('name', 'server', 'theme', 'path', 'fancy', 'language',
+ 'email', 'broughtby', 'broughtbyurl', 'closed',
+ 'inviteonly', 'private'),
+ 'license' => array('url', 'title', 'image'),
+ 'nickname' => array('featured'),
+ 'throttle' => array('enabled', 'count', 'timespan'),
+ 'xmpp' => array('enabled', 'server', 'user'));
+
parent::handle($args);
- common_server_error(_('API method under construction.'), 501);
+
+ switch ($apidata['content-type']) {
+ case 'xml':
+ $this->init_document('xml');
+ // XXX: check that all sections and settings are legal XML elements
+ foreach ($keys as $section => $settings) {
+ common_element_start($section);
+ foreach ($settings as $setting) {
+ common_element($setting, null, common_config($section, $setting));
+ }
+ common_element_end($section);
+ }
+ $this->end_document('xml');
+ break;
+ case 'json':
+ $result = array();
+ foreach ($keys as $section => $settings) {
+ $result[$section] = array();
+ foreach ($settings as $setting) {
+ $result[$section][$setting] = common_config($section, $setting);
+ }
+ }
+ $this->init_document('json');
+ $this->show_json_objects($result);
+ $this->end_document('json');
+ break;
+ default:
+ $this->client_error(_('API method not found!'), $code=404);
+ }
}
/**