summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/api.php10
-rw-r--r--actions/twitapigroups.php8
-rw-r--r--actions/twitapisearchatom.php2
-rw-r--r--actions/twitapistatusnet.php8
-rw-r--r--actions/twitapitags.php4
5 files changed, 16 insertions, 16 deletions
diff --git a/actions/api.php b/actions/api.php
index 897e848c1..91f30e87a 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -125,9 +125,9 @@ class ApiAction extends Action
'users/show',
'help/test',
'help/downtime_schedule',
- 'laconica/version',
- 'laconica/config',
- 'laconica/wadl',
+ 'statusnet/version',
+ 'statusnet/config',
+ 'statusnet/wadl',
'tags/timeline',
'oembed/oembed',
'groups/show',
@@ -147,11 +147,11 @@ class ApiAction extends Action
$fullname = "$this->api_action/$this->api_method";
- // If the site is "private", all API methods except laconica/config
+ // If the site is "private", all API methods except statusnet/config
// need authentication
if (common_config('site', 'private')) {
- return $fullname != 'laconica/config' || false;
+ return $fullname != 'statusnet/config' || false;
}
// bareauth: only needs auth if without an argument or query param specifying user
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 4d2388919..c3e028c17 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -88,7 +88,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
$this->show_rss_groups($group, $title, $link, $subtitle);
break;
case 'atom':
- $selfuri = common_root_url() . 'api/laconica/groups/list/' . $user->id . '.atom';
+ $selfuri = common_root_url() . 'api/statusnet/groups/list/' . $user->id . '.atom';
$this->show_atom_groups($group, $title, $id, $link,
$subtitle, $selfuri);
break;
@@ -135,7 +135,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
$this->show_rss_groups($group, $title, $link, $subtitle);
break;
case 'atom':
- $selfuri = common_root_url() . 'api/laconica/groups/list_all.atom';
+ $selfuri = common_root_url() . 'api/statusnet/groups/list_all.atom';
$this->show_atom_groups($group, $title, $id, $link,
$subtitle, $selfuri);
break;
@@ -216,11 +216,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
case 'atom':
if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() .
- 'api/laconica/groups/timeline/' .
+ 'api/statusnet/groups/timeline/' .
$apidata['api_arg'] . '.atom';
} else {
$selfuri = common_root_url() .
- 'api/laconica/groups/timeline.atom';
+ 'api/statusnet/groups/timeline.atom';
}
$this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, null, $selfuri);
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index d3e17650d..3ccd8c5b6 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -227,7 +227,7 @@ class TwitapisearchatomAction extends TwitterapiAction
$server = common_config('site', 'server');
$sitename = common_config('site', 'name');
- // XXX: Use xmlns:laconica instead?
+ // XXX: Use xmlns:statusnet instead?
$this->elementStart('feed',
array('xmlns' => 'http://www.w3.org/2005/Atom',
diff --git a/actions/twitapistatusnet.php b/actions/twitapistatusnet.php
index a36c162d9..c75e5e858 100644
--- a/actions/twitapistatusnet.php
+++ b/actions/twitapistatusnet.php
@@ -36,7 +36,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
/**
* StatusNet-specific API methods
*
- * This class handles all /laconica/ API methods.
+ * This class handles all /statusnet/ API methods.
*
* @category Twitter
* @package StatusNet
@@ -46,14 +46,14 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
* @link http://status.net/
*/
-class TwitapilaconicaAction extends TwitterapiAction
+class TwitapistatusnetAction extends TwitterapiAction
{
/**
* A version stamp for the API
*
* Returns a version number for this version of StatusNet, which
* should make things a bit easier for upgrades.
- * URL: http://identi.ca/api/laconica/version.(xml|json)
+ * URL: http://identi.ca/api/statusnet/version.(xml|json)
* Formats: xml, json
*
* @param array $args Web arguments
@@ -89,7 +89,7 @@ class TwitapilaconicaAction extends TwitterapiAction
* Gives a full dump of configuration variables for this instance
* of StatusNet, minus variables that may be security-sensitive (like
* passwords).
- * URL: http://identi.ca/api/laconica/config.(xml|json)
+ * URL: http://identi.ca/api/statusnet/config.(xml|json)
* Formats: xml, json
*
* @param array $args Web arguments
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
index f889ae8c0..0f2b571c6 100644
--- a/actions/twitapitags.php
+++ b/actions/twitapitags.php
@@ -93,11 +93,11 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
case 'atom':
if (isset($apidata['api_arg'])) {
$selfuri = common_root_url() .
- 'api/laconica/tags/timeline/' .
+ 'api/statusnet/tags/timeline/' .
$apidata['api_arg'] . '.atom';
} else {
$selfuri = common_root_url() .
- 'api/laconica/tags/timeline.atom';
+ 'api/statusnet/tags/timeline.atom';
}
$this->show_atom_timeline($notice, $title, $id, $link,
$subtitle, null, $selfuri);