summaryrefslogtreecommitdiff
path: root/plugins/OStatus/lib/salmon.php
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-09-03 01:35:04 +0200
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-09-03 01:35:04 +0200
commit1bfbe9badfbe3e79f82e7216d1401f05a2750677 (patch)
treebba78cb3dc884c27558c005e101da196afbc1245 /plugins/OStatus/lib/salmon.php
parente365e709c5bab7d593ee1cde26c8bcfdddcc6780 (diff)
* i18n/L10n updates and FIXMEs added
* whitespace fixes
Diffstat (limited to 'plugins/OStatus/lib/salmon.php')
-rw-r--r--plugins/OStatus/lib/salmon.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index ef7719a40..631ebc7d8 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -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);