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

* i18n/L10n updates and FIXMEs added

Browse Source 
* whitespace fixes
This commit is contained in:
Siebrand Mazeland
2010-09-03 01:35:04 +02:00
parent e365e709c5
commit 1bfbe9badf
26 changed files with 147 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/OStatus/lib/salmon.php
View File

@@ -31,10 +31,10 @@ class Salmon
const REL_SALMON = 'salmon';
const REL_MENTIONED = 'mentioned';
// XXX: these are deprecated
// XXX: these are deprecated
const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
/**
* Sign and post the given Atom entry as a Salmon message.
*
@@ -87,9 +87,10 @@ class Salmon
// No keypair yet, let's generate one.
$magickey = new Magicsig();
$magickey->generate($user->id);
}
}
} else {
throw new Exception("Salmon invalid actor for signing");
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new Exception("Salmon invalid actor for signing.");
}
try {
@@ -104,7 +105,7 @@ class Salmon
public function verifyMagicEnv($text)
{
$magic_env = new MagicEnvelope();
$env = $magic_env->parse($text);
return $magic_env->verify($env);