X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FPortableContact.php;h=cfc140d66d9a45e03993010e1e29a6b2972ae3bf;hb=f4e1acedfcd86c81403c14747ecfd3b11583506e;hp=f255347c1284e62e87ad963771dabec48c55c6fa;hpb=390f6be42ea9f71be3e1abd7eeb4b32b0c674c37;p=friendica.git

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index f255347c12..cfc140d66d 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -31,7 +31,6 @@ use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
@@ -103,7 +102,7 @@ class PortableContact
 
 		Logger::log('load: ' . $url, Logger::DEBUG);
 
-		$fetchresult = Network::fetchUrlFull($url);
+		$fetchresult = DI::httpRequest()->fetchFull($url);
 		$s = $fetchresult->getBody();
 
 		Logger::log('load: returns ' . $s, Logger::DATA);
@@ -228,7 +227,7 @@ class PortableContact
 	{
 		$r = q(
 			"SELECT `url`, `site_name` AS `displayName`, `network`, `platform`, `version` FROM `gserver`
-			WHERE `network` IN ('%s', '%s', '%s') AND `last_contact` > `last_failure`
+			WHERE `network` IN ('%s', '%s', '%s') AND NOT `failed`
 			ORDER BY `last_contact`
 			LIMIT 1000",
 			DBA::escape(Protocol::DFRN),
@@ -251,7 +250,7 @@ class PortableContact
 	 */
 	private static function fetchServerlist($poco)
 	{
-		$curlResult = Network::curl($poco . "/@server");
+		$curlResult = DI::httpRequest()->get($poco . "/@server");
 
 		if (!$curlResult->isSuccess()) {
 			return;
@@ -291,7 +290,7 @@ class PortableContact
 
 		Logger::info("Fetch all users from the server " . $server["url"]);
 
-		$curlResult = Network::curl($url);
+		$curlResult = DI::httpRequest()->get($url);
 
 		if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
 			$data = json_decode($curlResult->getBody(), true);
@@ -314,7 +313,7 @@ class PortableContact
 
 				$success = false;
 
-				$curlResult = Network::curl($url);
+				$curlResult = DI::httpRequest()->get($url);
 
 				if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
 					Logger::info("Fetch all global contacts from the server " . $server["nurl"]);
@@ -372,7 +371,7 @@ class PortableContact
 				// Fetch all contacts from a given user from the other server
 				$url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation';
 
-				$curlResult = Network::curl($url);
+				$curlResult = DI::httpRequest()->get($url);
 
 				if ($curlResult->isSuccess()) {
 					$data = json_decode($curlResult->getBody(), true);