wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

define a 'root' attribute for the channel or feed

Browse Source
This commit is contained in:
Evan Prodromou 2010-03-19 15:23:30 -05:00
parent f0c54243ba
commit 1e03968d91
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/OStatus/lib/feeddiscovery.php
View File

@ -73,6 +73,7 @@ class FeedDiscovery
public $uri; public $uri;
public $type; public $type;
public $feed; public $feed;
public $root;
/** Post-initialize query helper... */ /** Post-initialize query helper... */
public function getLink($rel, $type=null) public function getLink($rel, $type=null)
@ -83,7 +84,7 @@ class FeedDiscovery
public function getAtomLink($rel, $type=null) public function getAtomLink($rel, $type=null)
{ {
return ActivityUtils::getLink($this->feed->documentElement, $rel, $type); return ActivityUtils::getLink($this->root, $rel, $type);
} }
/** /**
@ -154,9 +155,27 @@ class FeedDiscovery
$this->uri = $sourceurl; $this->uri = $sourceurl;
$this->type = $type; $this->type = $type;
$this->feed = $feed; $this->feed = $feed;
$el = $this->feed->documentElement;
// Looking for the "root" element: RSS channel or Atom feed
if ($el->tagName == 'rss') {
$channels = $el->getElementsByTagName('channel');
if ($channels->length > 0) {
$this->root = $channels->item(0);
} else {
throw new FeedSubBadXmlException($sourceurl);
}
} else if ($el->tagName == 'feed') {
$this->root = $el;
} else {
throw new FeedSubBadXmlException($sourceurl);
}
return $this->uri; return $this->uri;
} else { } else {
throw new FeedSubBadXmlException($url); throw new FeedSubBadXmlException($sourceurl);
} }
} }