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

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Evan Prodromou 2009-11-19 12:35:19 -05:00
parent 2daa31f142 ee22b2ccf9
commit ea561b88d1
5 changed files with 96 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
actions/foaf.php
View File

@ -108,11 +108,29 @@ class FoafAction extends Action
if ($this->profile->bio) {
$this->element('bio:olb', null, $this->profile->bio);
}
// XXX: more structured location data
if ($this->profile->location) {
$location = $this->profile->getLocation();
if ($location) {
$attr = array();
if ($location->getRdfURL()) {
$attr['rdf:about'] = $location->getRdfURL();
}
$location_name = $location->getName();
$this->elementStart('based_near');
$this->elementStart('geo:SpatialThing');
$this->element('name', null, $this->profile->location);
$this->elementStart('geo:SpatialThing', $attr);
if ($location_name) {
$this->element('name', null, $location_name);
}
if ($location->lat) {
$this->element('geo:lat', null, $location->lat);
}
if ($location->lon) {
$this->element('geo:long', null, $location->lat);
}
if ($location->getURL()) {
$this->element('page', array('rdf:resource'=>$location->getURL()));
}
$this->elementEnd('geo:SpatialThing');
$this->elementEnd('based_near');
}

24
lib/location.php
View File

@ -52,6 +52,7 @@ class Location
public $location_id;
public $location_ns;
private $_url;
private $_rdfurl;
var $names = array();
@ -185,4 +186,27 @@ class Location
return $url;
}
/**
* Get an URL for this location, suitable for embedding in RDF
*
* @return string URL for this location or NULL
*/
function getRdfURL()
{
// Keep one cached
if (is_string($this->_rdfurl)) {
return $this->_rdfurl;
}
$url = null;
Event::handle('LocationRdfUrl', array($this, &$url));
$this->_rdfurl = $url;
return $url;
}
}

11
lib/noticelist.php
View File

@ -397,16 +397,21 @@ class NoticeListItem extends Widget
return;
}
$lat = $this->notice->lat;
$lon = $this->notice->lon;
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
$url = $location->getUrl();
// TODO: Output @title lat and lon on element @class geo
// e.g., class="geo" title="45.5088375;-73.587809"
$this->out->elementStart('span', array('class' => 'location'));
$this->out->text(_('at'));
if (empty($url)) {
$this->out->element('span', array('class' => 'geo'), $name);
$this->out->element('span', array('class' => 'geo',
'title' => $latlon),
$name);
} else {
$this->out->element('a', array('class' => 'geo',
'title' => $latlon,
'href' => $url),
$name);
}

29
lib/rssaction.php
View File

@ -244,6 +244,16 @@ class Rss10Action extends Action
$this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
$this->element('foaf:maker', array('rdf:resource' => $creator_uri));
$this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct'));
$location = $notice->getLocation();
if ($location && isset($location->lat) && isset($location->lon)) {
$location_uri = $location->getRdfURL();
$attrs = array('geo:lat' => $location->lat,
'geo:long' => $location->lon);
if (strlen($location_uri)) {
$attrs['rdf:resource'] = $location_uri;
}
$this->element('statusnet:origin', $attrs);
}
$this->element('statusnet:postIcon', array('rdf:resource' => $profile->avatarUrl()));
$this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
if ($notice->reply_to) {
@ -260,14 +270,7 @@ class Rss10Action extends Action
foreach($attachments as $attachment){
$enclosure=$attachment->getEnclosure();
if ($enclosure) {
// DO NOT move xmlns declaration to root element. Making it
// the default namespace here improves compatibility with
// real-world feed readers.
$attribs = array(
'rdf:resource' => $enclosure->url,
'url' => $enclosure->url,
'xmlns' => 'http://purl.oclc.org/net/rss_2.0/enc#'
);
$attribs = array('rdf:resource' => $enclosure->url);
if ($enclosure->title) {
$attribs['dc:title'] = $enclosure->title;
}
@ -275,12 +278,12 @@ class Rss10Action extends Action
$attribs['dc:date'] = common_date_w3dtf($enclosure->modified);
}
if ($enclosure->size) {
$attribs['length'] = $enclosure->size;
$attribs['enc:length'] = $enclosure->size;
}
if ($enclosure->mimetype) {
$attribs['type'] = $enclosure->mimetype;
$attribs['enc:type'] = $enclosure->mimetype;
}
$this->element('enclosure', $attribs);
$this->element('enc:enclosure', $attribs);
}
$this->element('sioc:links_to', array('rdf:resource'=>$attachment->url));
}
@ -348,12 +351,16 @@ class Rss10Action extends Action
'http://commontag.org/ns#',
'xmlns:foaf' =>
'http://xmlns.com/foaf/0.1/',
'xmlns:enc' =>
'http://purl.oclc.org/net/rss_2.0/enc#',
'xmlns:sioc' =>
'http://rdfs.org/sioc/ns#',
'xmlns:sioct' =>
'http://rdfs.org/sioc/types#',
'xmlns:rdfs' =>
'http://www.w3.org/2000/01/rdf-schema#',
'xmlns:geo' =>
'http://www.w3.org/2003/01/geo/wgs84_pos#',
'xmlns:statusnet' =>
'http://status.net/ont/',
'xmlns' => 'http://purl.org/rss/1.0/'));

24
plugins/GeonamesPlugin.php
View File

@ -302,4 +302,28 @@ class GeonamesPlugin extends Plugin
// it's been filled, so don't process further.
return false;
}
/**
* Machine-readable name for a location
*
* Given a location, we try to retrieve a geonames.org URL.
*
* @param Location $location Location to get the url for
* @param string &$url Place to put the url
*
* @return boolean whether to continue
*/
function onLocationRdfUrl($location, &$url)
{
if ($location->location_ns != self::LOCATION_NS) {
// It's not one of our IDs... keep processing
return true;
}
$url = 'http://sw.geonames.org/' . $location->location_id . '/';
// it's been filled, so don't process further.
return false;
}
}