X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=a95b7e6ba0de9203f2bb36393bc0a5f8be7975c9;hb=09de4a5b47439542d5e73d5452e1d30da26c3ae6;hp=441fe7f157a33c61609744422dd94385a2cbb3ae;hpb=cc7444d84db2bc729c40be2190dbfbe3ca7725ba;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 441fe7f157..a95b7e6ba0 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -8,6 +8,7 @@ use Friendica\BaseModule;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
@@ -20,37 +21,35 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 		$ret = ['success' => false, 'url' => '', 'message' => ''];
 		Logger::log('magic mdule: invoked', Logger::DEBUG);
 
 		Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
 
-		$addr = defaults($_REQUEST, 'addr', '');
-		$dest = defaults($_REQUEST, 'dest', '');
+		$addr = $_REQUEST['addr'] ?? '';
+		$dest = $_REQUEST['dest'] ?? '';
 		$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
 		$owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
+		$cid  = 0;
 
-		// NOTE: I guess $dest isn't just the profile url (could be also
-		// other profile pages e.g. photo). We need to find a solution
-		// to be able to redirct to other pages than the contact profile.
-		$cid = Contact::getIdForURL($dest);
-
-		if (!$cid && !empty($addr)) {
+		if (!empty($addr)) {
 			$cid = Contact::getIdForURL($addr);
+		} elseif (!empty($dest)) {
+			$cid = Contact::getIdForURL($dest);
 		}
 
 		if (!$cid) {
-			Logger::log('No contact record found: ' . json_encode($_REQUEST), Logger::DEBUG);
+			Logger::info('No contact record found', $_REQUEST);
 			// @TODO Finding a more elegant possibility to redirect to either internal or external URL
 			$a->redirect($dest);
 		}
 		$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'], Strings::normaliseLink(self::getApp()->getBaseURL())) !== false) {
+		if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
 			if ($test) {
 				$ret['success'] = true;
 				$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
@@ -81,7 +80,7 @@ class Magic extends BaseModule
 				$headers = HTTPSignature::createSig(
 					$headers,
 					$user['prvkey'],
-					'acct:' . $user['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : '')
+					'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')
 				);
 
 				// Try to get an authentication token from the other instance.
@@ -99,9 +98,9 @@ class Magic extends BaseModule
 						} else {
 							$token = $j['token'];
 						}
-						$x = strpbrk($dest, '?&');
-						$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
+						$args = (strpbrk($dest, '?&') ? '&' : '?') . 'owt=' . $token;
 
+						Logger::info('Redirecting', ['path' => $dest . $args]);
 						System::externalRedirect($dest . $args);
 					}
 				}