clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move salmonKey to Salmon class

Browse Source 
move the salmonKey function from Crypto to Salmon
This commit is contained in:
Adam Magness
2017-12-31 08:04:36 -05:00
parent 0131fd5745
commit db653e4451
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/hostxrd.php
+2 -1
View File
@@ -5,6 +5,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto;
function hostxrd_init(App $a)
@@ -25,7 +26,7 @@ function hostxrd_init(App $a)
'$zhost' => $a->get_hostname(),
'$zroot' => System::baseUrl(),
'$domain' => System::baseUrl(),
'$bigkey' => Crypto::salmonKey(Config::get('system', 'site_pubkey')))
'$bigkey' => Salmon::salmonKey(Config::get('system', 'site_pubkey')))
);
exit();
mod/xrd.php
+3 -3
View File
@@ -5,7 +5,7 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Util\Crypto;
use Friendica\Protocol\Salmon;
function xrd_init(App $a)
{
@@ -58,7 +58,7 @@ function xrd_init(App $a)
function xrd_json($a, $uri, $alias, $profile_url, $r)
{
$salmon_key = Crypto::salmonKey($r['spubkey']);
$salmon_key = Salmon::salmonKey($r['spubkey']);
header('Access-Control-Allow-Origin: *');
header("Content-type: application/json; charset=utf-8");
@@ -84,7 +84,7 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
function xrd_xml($a, $uri, $alias, $profile_url, $r)
{
$salmon_key = Crypto::salmonKey($r['spubkey']);
$salmon_key = Salmon::salmonKey($r['spubkey']);
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");