Issue 6675: Improved check for follower, removed global setting

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

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 51f501b853dbf4ceaf2fa45f153b17b5b32abe0a..441fe7f157a33c61609744422dd94385a2cbb3ae 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -43,7 +43,7 @@ class Magic extends BaseModule
                }
 
                if (!$cid) {
-                       Logger::log('No contact record found: ' . print_r($_REQUEST, true), Logger::DEBUG);
+                       Logger::log('No contact record found: ' . json_encode($_REQUEST), Logger::DEBUG);
                        // @TODO Finding a more elegant possibility to redirect to either internal or external URL
                        $a->redirect($dest);
                }
@@ -74,7 +74,7 @@ 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.
@@ -85,7 +85,7 @@ class Magic extends BaseModule
                                );
 
                                // 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);