Merge pull request #8156 from MrPetovan/task/7817-custom-fields-part-2

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

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 694af23208fb025d3b74266272def9ab560748bf..a95b7e6ba0de9203f2bb36393bc0a5f8be7975c9 100644 (file)
--- 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 = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
-               $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
-               $test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
-               $owa  = ((x($_REQUEST, 'owa'))  ? intval($_REQUEST['owa'])  : 0);
+               $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;
@@ -74,18 +73,18 @@ class Magic extends BaseModule
                                $basepath = $exp[0];
 
                                $headers = [];
-                               $headers['Accept'] = 'application/x-dfrn+json';
+                               $headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
                                $headers['X-Open-Web-Auth'] = Strings::getRandomHex();
 
                                // Create a header that is signed with the local users private key.
                                $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.
-                               $curlResult = Network::curl($basepath . '/owa', false, $redirects, ['headers' => $headers]);
+                               $curlResult = Network::curl($basepath . '/owa', false, ['headers' => $headers]);
 
                                if ($curlResult->isSuccess()) {
                                        $j = json_decode($curlResult->getBody(), true);
@@ -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);
                                        }
                                }