X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=1012dc72baffdbb57fddcb6e69b2ae50e32b7e19;hb=8038c1b04ffa723ebd28610fb72927d8d21b3577;hp=8fa67ec97987431a2758aa01bdb9a8540b894a92;hpb=4faf08c0643d3e6bbe2a0a77be2ff8c1dbea4d5c;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 8fa67ec979..1012dc72ba 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -88,7 +88,7 @@ class Magic extends BaseModule
 		$contact = $this->dba->selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
 
 		// Redirect if the contact is already authenticated on this site.
-		if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl->get())) !== false) {
+		if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
 			$this->logger->info('Contact is already authenticated');
 			System::externalRedirect($dest);
 		}
@@ -113,7 +113,7 @@ class Magic extends BaseModule
 			$header = HTTPSignature::createSig(
 				$header,
 				$user['prvkey'],
-				'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHostname() . ($this->baseUrl->getUrlPath() ? '/' . $this->baseUrl->getUrlPath() : '')
+				'acct:' . $user['nickname'] . '@' . $this->baseUrl->getHost() . ($this->baseUrl->getPath() ? '/' . $this->baseUrl->getPath() : '')
 			);
 
 			// Try to get an authentication token from the other instance.