Merge pull request #5862 from nupplaphil/rename_App_Methods

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

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 0b6874069a68477ccbdd6493e785bda37c2c04e9..042a9581dfb27d4466d9c4df0d5d6c0ad6cf6fa3 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,10 +44,10 @@ 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) {
+               if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->getBaseURL())) !== false) {
                        if ($test) {
                                $ret['success'] = true;
                                $ret['message'] .= 'Local site - you are already authenticated.' . EOL;
@@ -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->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : '')
                                );
 
                                // Try to get an authentication token from the other instance.