eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Diaspora plugin is almost there (for remote salmon slaps at least)

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-10-04 12:06:48 +02:00
parent 9b461db4da
commit 2aed59a02a
5 changed files with 190 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/OStatus/lib/magicenvelope.php
View File

@@ -205,10 +205,10 @@ class MagicEnvelope
*
* @return string representation of XML document
*/
public function toXML($flavour=null) {
public function toXML(Profile $target=null, $flavour=null) {
$xs = new XMLStringer();
$xs->startXML(); // header, to point out it's not HTML or anything...
if (Event::handle('StartMagicEnvelopeToXML', array($this, $xs, $flavour))) {
if (Event::handle('StartMagicEnvelopeToXML', array($this, $xs, $flavour, $target))) {
// fall back to our default, normal Magic Envelope XML.
// the $xs element _may_ have had elements added, or could get in the end event
$xs->elementStart('me:env', array('xmlns:me' => self::NS));
@@ -218,7 +218,7 @@ class MagicEnvelope
$xs->element('me:sig', null, $this->getSignature());
$xs->elementEnd('me:env');
Event::handle('EndMagicEnvelopeToXML', array($this, $xs, $flavour));
Event::handle('EndMagicEnvelopeToXML', array($this, $xs, $flavour, $target));
}
return $xs->getString();
}
@@ -266,6 +266,9 @@ class MagicEnvelope
public function getSignature()
{
if (empty($this->sig)) {
throw new ServerException('You must first call signMessage before getSignature');
}
return $this->sig;
}
@@ -274,6 +277,11 @@ class MagicEnvelope
return $this->alg;
}
public function getData()
{
return $this->data;
}
public function getDataType()
{
return $this->data_type;