summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions/salmon.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-19 17:01:38 -0800
committerBrion Vibber <brion@pobox.com>2010-02-19 17:01:38 -0800
commit50db2d5d69a8769dc2ddcc937afb130bcce0971d (patch)
treea680dd1c57b7ca56c281eb682eb5d1f3065888b6 /plugins/OStatus/actions/salmon.php
parent557df3d3f78dbfce656c4c8e3ddf82ee0e34da0a (diff)
OStatus: Salmon notifications now being generated moderately correctly. :) Needs to be an <entry> not a <feed>.
Diffstat (limited to 'plugins/OStatus/actions/salmon.php')
-rw-r--r--plugins/OStatus/actions/salmon.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/OStatus/actions/salmon.php b/plugins/OStatus/actions/salmon.php
index 43d79cf4a..f7c86dc0c 100644
--- a/plugins/OStatus/actions/salmon.php
+++ b/plugins/OStatus/actions/salmon.php
@@ -62,15 +62,13 @@ class SalmonAction extends Action
$dom = DOMDocument::loadXML($xml);
- // XXX: check that document element is Atom entry
+ if ($dom->documentElement->namespaceURI != Activity::ATOM ||
+ $dom->documentElement->localName != 'entry') {
+ $this->clientError(_m('Salmon post must be an Atom entry.'));
+ }
// XXX: check the signature
- // We need to run an entry into Activity, so get the first one
- $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
- if ($entries && $entries->length) {
- // @fixme is it legit to have multiple entries?
- $this->act = new Activity($entries->item(0), $dom->documentElement);
- }
+ $this->act = new Activity($dom->documentElement);
return true;
}