X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=95b742bb301b9ec3c7f1621779f4415aede7aaa1;hb=bb1517a74c6252a89812929e98910d9e293664a9;hp=0ac05ccdf8e8dc2a97470be0f4018012ca87f428;hpb=e944d7bed6b971494bff82396960d280e6a82cca;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 0ac05ccdf8..95b742bb30 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Module/Magic.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
@@ -11,7 +28,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\HTTPSignature;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
@@ -25,9 +41,9 @@ class Magic extends BaseModule
 	{
 		$a = DI::app();
 		$ret = ['success' => false, 'url' => '', 'message' => ''];
-		Logger::log('magic mdule: invoked', Logger::DEBUG);
+		Logger::info('magic mdule: invoked');
 
-		Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
+		Logger::debug('args', ['request' => $_REQUEST]);
 
 		$addr = $_REQUEST['addr'] ?? '';
 		$dest = $_REQUEST['dest'] ?? '';
@@ -56,7 +72,7 @@ class Magic extends BaseModule
 				return $ret;
 			}
 
-			Logger::log('Contact is already authenticated', Logger::DEBUG);
+			Logger::info('Contact is already authenticated');
 			System::externalRedirect($dest);
 		}
 
@@ -80,11 +96,11 @@ class Magic extends BaseModule
 				$headers = HTTPSignature::createSig(
 					$headers,
 					$user['prvkey'],
-					'acct:' . $user['nickname'] . '@' . DI::baseUrl()->getHostname()() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->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, ['headers' => $headers]);
+				$curlResult = DI::httpRequest()->get($basepath . '/owa', false, ['headers' => $headers]);
 
 				if ($curlResult->isSuccess()) {
 					$j = json_decode($curlResult->getBody(), true);