From: Art4 <art4@wlabs.de>
Date: Mon, 18 Nov 2024 21:45:42 +0000 (+0000)
Subject: Merge branch 'develop' into phpstan-level-1
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c79f3cde225c863b56a1fb1c55b16a9618eba9a6;p=friendica.git

Merge branch 'develop' into phpstan-level-1
---

c79f3cde225c863b56a1fb1c55b16a9618eba9a6
diff --cc src/Module/Magic.php
index c3b9a2b4db,24e6374f5a..c06cbd6f4e
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@@ -76,15 -80,18 +78,15 @@@ class Magic extends BaseModul
  
  		$target = $dest ?: $addr;
  
 -		if ($addr ?: $dest) {
 -			$contact = Contact::getByURL($addr ?: $dest);
 +		$contact = Contact::getByURL($addr ?: $dest);
 +		if ($contact === [] && $owa === 0) {
 +			$this->logger->info('No contact record found, no oWA, redirecting to destination.', ['request' => $request, 'server' => $_SERVER, 'dest' => $dest]);
- 			$this->app->redirect($dest);
++			$this->appHelper->redirect($dest);
  		}
  
 -		if (empty($contact)) {
 -			if (!$owa) {
 -				$this->logger->info('No contact record found, no oWA, redirecting to destination.', ['request' => $request, 'server' => $_SERVER, 'dest' => $dest]);
 -				$this->appHelper->redirect($dest);
 -			}
 -		} else {
 +		if ($contact !== []) {
  			// Redirect if the contact is already authenticated on this site.
- 			if ($this->app->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
+ 			if ($this->appHelper->getContactId() && strpos($contact['nurl'], Strings::normaliseLink($this->baseUrl)) !== false) {
  				$this->logger->info('Contact is already authenticated, redirecting to destination.', ['dest' => $dest]);
  				System::externalRedirect($dest);
  			}
@@@ -92,9 -99,9 +94,9 @@@
  			$this->logger->debug('Contact found', ['url' => $contact['url']]);
  		}
  
 -		if (!$this->userSession->getLocalUserId() || !$owa) {
 +		if (!$this->userSession->getLocalUserId() || $owa === 0) {
  			$this->logger->notice('Not logged in or not OWA, redirecting to destination.', ['uid' => $this->userSession->getLocalUserId(), 'owa' => $owa, 'dest' => $dest]);
- 			$this->app->redirect($dest);
+ 			$this->appHelper->redirect($dest);
  		}
  
  		$dest = Network::removeUrlParameter($dest, 'zid');