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

Should not normalize Salmon author URIs. 

It's normalized in Discovery->lookup later anyway.
This commit is contained in:
Mikael Nordfeldth 2014-05-26 14:18:25 +02:00
parent 8c348c96e7
commit ba10da27da
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,21 +32,6 @@ class MagicEnvelope
const NS = 'http://salmon-protocol.org/ns/magic-env'; const NS = 'http://salmon-protocol.org/ns/magic-env';
private function normalizeUser($user_id)
{
if (substr($user_id, 0, 5) == 'http:' ||
substr($user_id, 0, 6) == 'https:' ||
substr($user_id, 0, 5) == 'acct:') {
return $user_id;
}
if (strpos($user_id, '@') !== FALSE) {
return 'acct:' . $user_id;
}
return 'http://' . $user_id;
}
/** /**
* Get the Salmon keypair from a URI, uses XRD Discovery etc. * Get the Salmon keypair from a URI, uses XRD Discovery etc.
* *
@ -211,7 +196,7 @@ class MagicEnvelope
foreach ($authors as $author) { foreach ($authors as $author) {
$uris = $author->getElementsByTagName('uri'); $uris = $author->getElementsByTagName('uri');
foreach ($uris as $uri) { foreach ($uris as $uri) {
return $this->normalizeUser($uri->nodeValue); return $uri->nodeValue;
} }
} }
} }