X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=0b4126e0e965528fba0c9170a725c2b2dec262c9;hb=de8787dd5bb9fadd6388c050bad35ec4c0332e08;hp=0b6874069a68477ccbdd6493e785bda37c2c04e9;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git diff --git a/src/Module/Magic.php b/src/Module/Magic.php index 0b6874069a..0b4126e0e9 100644 --- a/src/Module/Magic.php +++ b/src/Module/Magic.php @@ -5,12 +5,11 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Util\HTTPSignature; use Friendica\Util\Network; -use dba; - /** * Magic Auth (remote authentication) module. * @@ -45,7 +44,7 @@ class Magic extends BaseModule goaway($dest); } - $contact = dba::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]); + $contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]); // Redirect if the contact is already authenticated on this site. if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->get_baseurl())) !== false) { @@ -77,13 +76,9 @@ class Magic extends BaseModule // Create a header that is signed with the local users private key. $headers = HTTPSignature::createSig( - '', $headers, $user['prvkey'], - 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''), - false, - true, - 'sha512' + 'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : '') ); // Try to get an authentication token from the other instance.