Merge pull request #5780 from annando/fix-relocation

[friendica.git] / src / Module / Magic.php

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 0b6874069a68477ccbdd6493e785bda37c2c04e9..cf77482e5a8eec13d719bade0afdf9ada4bc2064 100644 (file)
--- 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) {
@@ -80,7 +79,7 @@ class Magic extends BaseModule
                                        '',
                                        $headers,
                                        $user['prvkey'],
-                                       'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''),
+                                       'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''),
                                        false,
                                        true,
                                        'sha512'