diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-28 15:25:02 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-28 15:25:02 -0400 |
| commit | f0d905112ede6e45594b6ceceea3a6af4d9954f9 (patch) | |
| tree | 4f10a268f5ea5f93ac3cb558972fed8360ce7993 /plugins/OStatus/lib/magicenvelope.php | |
| parent | 5b7b38ab661c9556800db1e822748b2d0c16d225 (diff) | |
| parent | 482faf661451b499240eb41234234607355e3aa8 (diff) | |
Merge branch 'master' into 0.9.x
Conflicts:
lib/attachmentlist.php
Diffstat (limited to 'plugins/OStatus/lib/magicenvelope.php')
| -rw-r--r-- | plugins/OStatus/lib/magicenvelope.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index 799b5e307..f39686b71 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -83,7 +83,7 @@ class MagicEnvelope public function signMessage($text, $mimetype, $keypair) { $signature_alg = Magicsig::fromString($keypair); - $armored_text = base64_url_encode($text); + $armored_text = Magicsig::base64_url_encode($text); return array( 'data' => $armored_text, @@ -121,7 +121,7 @@ class MagicEnvelope public function unfold($env) { $dom = new DOMDocument(); - $dom->loadXML(base64_url_decode($env['data'])); + $dom->loadXML(Magicsig::base64_url_decode($env['data'])); if ($dom->documentElement->tagName != 'entry') { return false; @@ -178,7 +178,7 @@ class MagicEnvelope return false; } - $text = base64_url_decode($env['data']); + $text = Magicsig::base64_url_decode($env['data']); $signer_uri = $this->getAuthor($text); try { |