GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-22 17:19:54 +01:00
commit 318b81c027
3 changed files with 188 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
actions/favoritesrss.php
View File

@ -1,5 +1,17 @@
<?php <?php
/*
/**
* RSS feed for user favorites action class.
*
* PHP version 5
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -17,22 +29,37 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/rssaction.php'); require_once INSTALLDIR.'/lib/rssaction.php';
// Formatting of RSS handled by Rss10Action
/**
* RSS feed for user favorites action class.
*
* Formatting of RSS handled by Rss10Action
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*/
class FavoritesrssAction extends Rss10Action class FavoritesrssAction extends Rss10Action
{ {
var $user = null; var $user = null;
/**
* Initialization.
*
* @return boolean false if user doesn't exist
*/
function init() function init()
{ {
$nickname = $this->trimmed('nickname'); $nickname = $this->trimmed('nickname');
$this->user = User::staticGet('nickname', $nickname); $this->user = User::staticGet('nickname', $nickname);
if (!$this->user) { if (!$this->user) {
$this->clientError(_('No such user.')); $this->clientError(_('No such user.'));
return false; return false;
@ -41,23 +68,30 @@ class FavoritesrssAction extends Rss10Action
} }
} }
function get_notices($limit=0) /**
* Get notices
*
* @param integer $limit max number of notices to return
*
* @return array notices
*/
function getNotices($limit=0)
{ {
$user = $this->user; $user = $this->user;
$notice = $user->favoriteNotices(0, $limit); $notice = $user->favoriteNotices(0, $limit);
$notices = array(); $notices = array();
while ($notice->fetch()) { while ($notice->fetch()) {
$notices[] = clone($notice); $notices[] = clone($notice);
} }
return $notices; return $notices;
} }
function get_channel() /**
* Get channel.
*
* @return array associative array on channel information
*/
function getChannel()
{ {
$user = $this->user; $user = $this->user;
$c = array('url' => common_local_url('favoritesrss', $c = array('url' => common_local_url('favoritesrss',
@ -71,8 +105,14 @@ class FavoritesrssAction extends Rss10Action
return $c; return $c;
} }
function get_image() /**
* Get image.
*
* @return voir
*/
function getImage()
{ {
return null; return null;
} }
} }

71
actions/publicxrds.php
View File

@ -1,5 +1,17 @@
<?php <?php
/*
/**
* Public XRDS for OpenID
*
* PHP version 5
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -17,48 +29,74 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/openid.php'); require_once INSTALLDIR.'/lib/openid.php';
# XXX: factor out similarities with XrdsAction
/**
* Public XRDS for OpenID
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* @todo factor out similarities with XrdsAction
*/
class PublicxrdsAction extends Action class PublicxrdsAction extends Action
{ {
/**
* Is read only?
*
* @return boolean true
*/
function isReadOnly() function isReadOnly()
{ {
return true; return true;
} }
/**
* Class handler.
*
* @param array $args array of arguments
*
* @return nothing
*/
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
header('Content-Type: application/xrds+xml'); header('Content-Type: application/xrds+xml');
common_start_xml(); common_start_xml();
$this->elementStart('XRDS', array('xmlns' => 'xri://$xrds')); $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
$this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
'version' => '2.0')); 'version' => '2.0'));
$this->element('Type', null, 'xri://$xrds*simple'); $this->element('Type', null, 'xri://$xrds*simple');
foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) { foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) {
$this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
common_local_url($finish)); common_local_url($finish));
} }
$this->elementEnd('XRD'); $this->elementEnd('XRD');
$this->elementEnd('XRDS'); $this->elementEnd('XRDS');
common_end_xml(); common_end_xml();
} }
function show_service($type, $uri, $params=null, $sigs=null, $localId=null) /**
* Show service.
*
* @param string $type XRDS type
* @param string $uri URI
* @param array $params type parameters, null by default
* @param array $sigs type signatures, null by default
* @param string $localId local ID, null by default
*
* @return void
*/
function showService($type, $uri, $params=null, $sigs=null, $localId=null)
{ {
$this->elementStart('Service'); $this->elementStart('Service');
if ($uri) { if ($uri) {
@ -81,3 +119,4 @@ class PublicxrdsAction extends Action
$this->elementEnd('Service'); $this->elementEnd('Service');
} }
} }

104
actions/xrds.php
View File

@ -1,5 +1,17 @@
<?php <?php
/*
/**
* XRDS for OpenID
*
* PHP version 5
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2008, Controlez-Vous, Inc.
* *
@ -17,18 +29,41 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) {
exit(1);
}
require_once(INSTALLDIR.'/lib/omb.php'); require_once INSTALLDIR.'/lib/omb.php';
/**
* XRDS for OpenID
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*/
class XrdsAction extends Action class XrdsAction extends Action
{ {
/**
* Is read only?
*
* @return boolean true
*/
function isReadOnly() function isReadOnly()
{ {
return true; return true;
} }
/**
* Class handler.
*
* @param array $args query arguments
*
* @return void
*/
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
@ -38,14 +73,19 @@ class XrdsAction extends Action
$this->clientError(_('No such user.')); $this->clientError(_('No such user.'));
return; return;
} }
$this->show_xrds($user); $this->showXrds($user);
} }
function show_xrds($user) /**
* Show XRDS for a user.
*
* @param class $user XRDS for this user.
*
* @return void
*/
function showXrds($user)
{ {
header('Content-Type: application/xrds+xml'); header('Content-Type: application/xrds+xml');
common_start_xml(); common_start_xml();
$this->elementStart('XRDS', array('xmlns' => 'xri://$xrds')); $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
@ -53,66 +93,61 @@ class XrdsAction extends Action
'xml:id' => 'oauth', 'xml:id' => 'oauth',
'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
'version' => '2.0')); 'version' => '2.0'));
$this->element('Type', null, 'xri://$xrds*simple'); $this->element('Type', null, 'xri://$xrds*simple');
$this->showService(OAUTH_ENDPOINT_REQUEST,
$this->show_service(OAUTH_ENDPOINT_REQUEST,
common_local_url('requesttoken'), common_local_url('requesttoken'),
array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
array(OAUTH_HMAC_SHA1), array(OAUTH_HMAC_SHA1),
$user->uri); $user->uri);
$this->showService(OAUTH_ENDPOINT_AUTHORIZE,
$this->show_service(OAUTH_ENDPOINT_AUTHORIZE,
common_local_url('userauthorization'), common_local_url('userauthorization'),
array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
array(OAUTH_HMAC_SHA1)); array(OAUTH_HMAC_SHA1));
$this->showService(OAUTH_ENDPOINT_ACCESS,
$this->show_service(OAUTH_ENDPOINT_ACCESS,
common_local_url('accesstoken'), common_local_url('accesstoken'),
array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
array(OAUTH_HMAC_SHA1)); array(OAUTH_HMAC_SHA1));
$this->showService(OAUTH_ENDPOINT_RESOURCE,
$this->show_service(OAUTH_ENDPOINT_RESOURCE,
null, null,
array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
array(OAUTH_HMAC_SHA1)); array(OAUTH_HMAC_SHA1));
$this->elementEnd('XRD'); $this->elementEnd('XRD');
# XXX: decide whether to include user's ID/nickname in postNotice URL // XXX: decide whether to include user's ID/nickname in postNotice URL
$this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
'xml:id' => 'omb', 'xml:id' => 'omb',
'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
'version' => '2.0')); 'version' => '2.0'));
$this->element('Type', null, 'xri://$xrds*simple'); $this->element('Type', null, 'xri://$xrds*simple');
$this->showService(OMB_ENDPOINT_POSTNOTICE,
$this->show_service(OMB_ENDPOINT_POSTNOTICE,
common_local_url('postnotice')); common_local_url('postnotice'));
$this->showService(OMB_ENDPOINT_UPDATEPROFILE,
$this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
common_local_url('updateprofile')); common_local_url('updateprofile'));
$this->elementEnd('XRD'); $this->elementEnd('XRD');
$this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
'version' => '2.0')); 'version' => '2.0'));
$this->element('Type', null, 'xri://$xrds*simple'); $this->element('Type', null, 'xri://$xrds*simple');
$this->showService(OAUTH_DISCOVERY,
$this->show_service(OAUTH_DISCOVERY,
'#oauth'); '#oauth');
$this->show_service(OMB_NAMESPACE, $this->showService(OMB_NAMESPACE,
'#omb'); '#omb');
$this->elementEnd('XRD'); $this->elementEnd('XRD');
$this->elementEnd('XRDS'); $this->elementEnd('XRDS');
common_end_xml(); common_end_xml();
} }
function show_service($type, $uri, $params=null, $sigs=null, $localId=null) /**
* Show service.
*
* @param string $type XRDS type
* @param string $uri URI
* @param array $params type parameters, null by default
* @param array $sigs type signatures, null by default
* @param string $localId local ID, null by default
*
* @return void
*/
function showService($type, $uri, $params=null, $sigs=null, $localId=null)
{ {
$this->elementStart('Service'); $this->elementStart('Service');
if ($uri) { if ($uri) {
@ -135,3 +170,4 @@ class XrdsAction extends Action
$this->elementEnd('Service'); $this->elementEnd('Service');
} }
} }