diff options
| -rw-r--r-- | _darcs/inventory | 4 | ||||
| -rw-r--r-- | _darcs/patches/20081230202513-84dde-47ab363eae62e1b9fc9280e579d348520c1233cc.gz | bin | 0 -> 227 bytes | |||
| -rw-r--r-- | _darcs/pristine/htaccess.sample | 3 | ||||
| -rw-r--r-- | _darcs/tentative_pristine | 117 | ||||
| -rw-r--r-- | htaccess.sample | 3 |
5 files changed, 13 insertions, 114 deletions
diff --git a/_darcs/inventory b/_darcs/inventory index 7ea43f345..edac816cf 100644 --- a/_darcs/inventory +++ b/_darcs/inventory @@ -98,4 +98,6 @@ Zach Copley <zach@controlyourself.ca>**20081225152207] [whitespace changes in actions/register.php after global search-and-replace Evan Prodromou <evan@prodromou.name>**20081223195722] [Laconica-specific extensions for Twitter API -Evan Prodromou <evan@prodromou.name>**20081230202019]
\ No newline at end of file +Evan Prodromou <evan@prodromou.name>**20081230202019] +[add laconica-specific methods to htaccess.sample +Evan Prodromou <evan@prodromou.name>**20081230202513]
\ No newline at end of file diff --git a/_darcs/patches/20081230202513-84dde-47ab363eae62e1b9fc9280e579d348520c1233cc.gz b/_darcs/patches/20081230202513-84dde-47ab363eae62e1b9fc9280e579d348520c1233cc.gz Binary files differnew file mode 100644 index 000000000..7ce4f582f --- /dev/null +++ b/_darcs/patches/20081230202513-84dde-47ab363eae62e1b9fc9280e579d348520c1233cc.gz diff --git a/_darcs/pristine/htaccess.sample b/_darcs/pristine/htaccess.sample index bd29d318f..e348635a8 100644 --- a/_darcs/pristine/htaccess.sample +++ b/_darcs/pristine/htaccess.sample @@ -143,6 +143,9 @@ RewriteRule ^api/notifications/leave/(.*)$ index.php?action=api&apiaction=notifi RewriteRule ^api/blocks/create/(.*)$ index.php?action=api&apiaction=blocks&method=create&argument=$1 [L,QSA] RewriteRule ^api/blocks/destroy/(.*)$ index.php?action=api&apiaction=blocks&method=destroy&argument=$1 [L,QSA] RewriteRule ^api/help/(.*)$ index.php?action=api&apiaction=help&method=$1 [L,QSA] +RewriteRule ^api/laconica/version(.*)$ index.php?action=api&apiaction=laconica&method=version$1 [L,QSA] +RewriteRule ^api/laconica/config(.*)$ index.php?action=api&apiaction=laconica&method=config$1 [L,QSA] +RewriteRule ^api/laconica/wadl\.xml$ index.php?action=api&apiaction=laconica&method=wadl.xml [L,QSA] <FilesMatch "\.(ini)"> Order allow,deny diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine index 2f7bfd6ba..cb9385eb9 100644 --- a/_darcs/tentative_pristine +++ b/_darcs/tentative_pristine @@ -1,113 +1,4 @@ -addfile ./actions/twitapilaconica.php -hunk ./actions/twitapilaconica.php 1 -+<?php -+/** -+ * Laconica, the distributed open-source microblogging tool -+ * -+ * Laconica-only extensions to the Twitter-like API -+ * -+ * PHP version 5 -+ * -+ * LICENCE: This program is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Affero General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Affero General Public License for more details. -+ * -+ * You should have received a copy of the GNU Affero General Public License -+ * along with this program. If not, see <http://www.gnu.org/licenses/>. -+ * -+ * @category Twitter -+ * @package Laconica -+ * @author Evan Prodromou <evan@controlyourself.ca> -+ * @copyright 2008 Control Yourself, Inc. -+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 -+ * @link http://laconi.ca/ -+ */ -+ -+if (!defined('LACONICA')) { -+ exit(1); -+} -+ -+require_once INSTALLDIR.'/lib/twitterapi.php'; -+ -+/** -+ * Laconica-specific API methods -+ * -+ * This class handles all /laconica/ API methods. -+ * -+ * @category Twitter -+ * @package Laconica -+ * @author Evan Prodromou <evan@controlyourself.ca> -+ * @copyright 2008 Control Yourself, Inc. -+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 -+ * @link http://laconi.ca/ -+ */ -+ -+class TwitapilaconicaAction extends TwitterapiAction -+{ -+ /** -+ * A version stamp for the API -+ * -+ * Returns a version number for this version of Laconica, which -+ * should make things a bit easier for upgrades. -+ * -+ * @param array $args Web arguments -+ * @param array $apidata Twitter API data -+ * -+ * @return void -+ * -+ * @see ApiAction::process_command() -+ */ -+ -+ function version($args, $apidata) -+ { -+ parent::handle($args); -+ common_server_error(_('API method under construction.'), 501); -+ } -+ -+ /** -+ * Dump of configuration variables -+ * -+ * Gives a full dump of configuration variables for this instance -+ * of Laconica, minus variables that may be security-sensitive (like -+ * passwords). -+ * -+ * @param array $args Web arguments -+ * @param array $apidata Twitter API data -+ * -+ * @return void -+ * -+ * @see ApiAction::process_command() -+ */ -+ -+ function config($args, $apidata) -+ { -+ parent::handle($args); -+ common_server_error(_('API method under construction.'), 501); -+ } -+ -+ /** -+ * WADL description of the API -+ * -+ * Gives a WADL description of the API provided by this version of the -+ * software. -+ * -+ * @param array $args Web arguments -+ * @param array $apidata Twitter API data -+ * -+ * @return void -+ * -+ * @see ApiAction::process_command() -+ */ -+ -+ function wadl($args, $apidata) -+ { -+ parent::handle($args); -+ common_server_error(_('API method under construction.'), 501); -+ } -+} +hunk ./htaccess.sample 146 ++RewriteRule ^api/laconica/version(.*)$ index.php?action=api&apiaction=laconica&method=version$1 [L,QSA] ++RewriteRule ^api/laconica/config(.*)$ index.php?action=api&apiaction=laconica&method=config$1 [L,QSA] ++RewriteRule ^api/laconica/wadl\.xml$ index.php?action=api&apiaction=laconica&method=wadl.xml [L,QSA] diff --git a/htaccess.sample b/htaccess.sample index bd29d318f..e348635a8 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -143,6 +143,9 @@ RewriteRule ^api/notifications/leave/(.*)$ index.php?action=api&apiaction=notifi RewriteRule ^api/blocks/create/(.*)$ index.php?action=api&apiaction=blocks&method=create&argument=$1 [L,QSA] RewriteRule ^api/blocks/destroy/(.*)$ index.php?action=api&apiaction=blocks&method=destroy&argument=$1 [L,QSA] RewriteRule ^api/help/(.*)$ index.php?action=api&apiaction=help&method=$1 [L,QSA] +RewriteRule ^api/laconica/version(.*)$ index.php?action=api&apiaction=laconica&method=version$1 [L,QSA] +RewriteRule ^api/laconica/config(.*)$ index.php?action=api&apiaction=laconica&method=config$1 [L,QSA] +RewriteRule ^api/laconica/wadl\.xml$ index.php?action=api&apiaction=laconica&method=wadl.xml [L,QSA] <FilesMatch "\.(ini)"> Order allow,deny |