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

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index ceafffa832..cfc140d66d 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -1,34 +1,44 @@
 <?php
 /**
- * @file src/Protocol/PortableContact.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/>.
  *
- * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
- * @todo Fetch profile data from profile page for Redmatrix users
- * @todo Detect if it is a forum
  */
 
 namespace Friendica\Protocol;
 
-use DOMDocument;
-use DOMXPath;
 use Exception;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
+use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
-use Friendica\Model\Profile;
-use Friendica\Module\Register;
-use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
 
+/**
+ *
+ * @todo Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
+ * @todo Fetch profile data from profile page for Redmatrix users
+ * @todo Detect if it is a forum
+ */
 class PortableContact
 {
 	const DISABLED = 0;
@@ -88,11 +98,11 @@ class PortableContact
 			return;
 		}
 
-		$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation');
+		$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation');
 
 		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);
@@ -105,7 +115,7 @@ class PortableContact
 
 		$j = json_decode($s, true);
 
-		Logger::log('load: json: ' . print_r($j, true), Logger::DATA);
+		Logger::debug('load', ['json'  => $j]);
 
 		if (!isset($j['entry'])) {
 			return;
@@ -123,7 +133,6 @@ class PortableContact
 			$location = '';
 			$about = '';
 			$keywords = '';
-			$gender = '';
 			$contact_type = -1;
 			$generation = 0;
 
@@ -168,10 +177,6 @@ class PortableContact
 				$about = HTML::toBBCode($entry['aboutMe']);
 			}
 
-			if (isset($entry['gender'])) {
-				$gender = $entry['gender'];
-			}
-
 			if (isset($entry['generation']) && ($entry['generation'] > 0)) {
 				$generation = ++$entry['generation'];
 			}
@@ -192,7 +197,6 @@ class PortableContact
 					"photo" => $profile_photo,
 					"about" => $about,
 					"location" => $location,
-					"gender" => $gender,
 					"keywords" => $keywords,
 					"connect" => $connect_url,
 					"updated" => $updated,
@@ -223,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),
@@ -246,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;
@@ -282,11 +286,11 @@ class PortableContact
 		self::fetchServerlist($server["poco"]);
 
 		// Fetch all users from the other server
-		$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+		$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
 
 		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);
@@ -295,8 +299,8 @@ class PortableContact
 				self::discoverServer($data, 2);
 			}
 
-			if (Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
-				$timeframe = Config::get('system', 'poco_discovery_since');
+			if (DI::config()->get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
+				$timeframe = DI::config()->get('system', 'poco_discovery_since');
 
 				if ($timeframe == 0) {
 					$timeframe = 30;
@@ -305,11 +309,11 @@ class PortableContact
 				$updatedSince = date(DateTimeFormat::MYSQL, time() - $timeframe * 86400);
 
 				// Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
-				$url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+				$url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation";
 
 				$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"]);
@@ -320,7 +324,7 @@ class PortableContact
 					}
 				}
 
-				if (!$success && !empty($data) && Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS_FALLBACK) {
+				if (!$success && !empty($data) && DI::config()->get('system', 'poco_discovery') >= self::USERS_GCONTACTS_FALLBACK) {
 					Logger::info("Fetch contacts from users of the server " . $server["nurl"]);
 					self::discoverServerUsers($data, $server);
 				}
@@ -365,9 +369,9 @@ class PortableContact
 				Logger::log('Fetch contacts for the user ' . $username . ' from the server ' . $server['nurl'], Logger::DEBUG);
 
 				// Fetch all contacts from a given user from the other server
-				$url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation';
+				$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);
@@ -398,7 +402,6 @@ class PortableContact
 			$location = '';
 			$about = '';
 			$keywords = '';
-			$gender = '';
 			$contact_type = -1;
 			$generation = $default_generation;
 
@@ -444,10 +447,6 @@ class PortableContact
 				$about = HTML::toBBCode($entry['aboutMe']);
 			}
 
-			if (isset($entry['gender'])) {
-				$gender = $entry['gender'];
-			}
-
 			if (isset($entry['generation']) && ($entry['generation'] > 0)) {
 				$generation = ++$entry['generation'];
 			}
@@ -473,7 +472,6 @@ class PortableContact
 						"photo" => $profile_photo,
 						"about" => $about,
 						"location" => $location,
-						"gender" => $gender,
 						"keywords" => $keywords,
 						"connect" => $connect_url,
 						"updated" => $updated,