X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=aa163f6a9e28c52488a222c42fdb42b81f5f3427;hb=37c7a18d00402df8cdc4233fb3be73377220a5f4;hp=1ab5341a816efb86cf2f5bef01066d5080a0695d;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 1ab5341a81..aa163f6a9e 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -37,11 +37,8 @@ namespace Friendica\Util;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\User;
 
-require_once 'include/dba.php';
-
 class ExAuth
 {
 	private $bDebug;
@@ -142,7 +139,7 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->get_hostname() == $aCommand[2]) {
+		if ($a->getHostName() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
 			$found = DBA::exists('user', ['nickname' => $sUser]);
 		} else {
@@ -180,17 +177,17 @@ class ExAuth
 
 		$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-		$data = Network::curl($url);
+		$curlResult = Network::curl($url);
 
-		if (!is_array($data)) {
+		if (!$curlResult->isSuccess()) {
 			return false;
 		}
 
-		if ($data['return_code'] != '200') {
+		if ($curlResult->getReturnCode() != 200) {
 			return false;
 		}
 
-		$json = @json_decode($data['body']);
+		$json = @json_decode($curlResult->getBody());
 		if (!is_object($json)) {
 			return false;
 		}
@@ -222,11 +219,11 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->get_hostname() == $aCommand[2]) {
+		if ($a->getHostName() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
 
 			$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
-			if (DBM::is_result($aUser)) {
+			if (DBA::isResult($aUser)) {
 				$uid = $aUser['uid'];
 				$success = User::authenticate($aUser, $aCommand[3]);
 				$Error = $success === false;