X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FPortableContact.php;h=fb8b48d7cb39c8708371fe7646d0be8d7cfefd2d;hb=f2ca3e5be44192c486e8e3af2a993e065ad40a7d;hp=bb7ccd564aa166bf8b08f7405b6d60d56bc82299;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index bb7ccd564a..fb8b48d7cb 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -14,6 +14,7 @@ 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;
@@ -84,14 +85,14 @@ class PortableContact
 
 		$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') ;
 
-		logger('load: ' . $url, LOGGER_DEBUG);
+		Logger::log('load: ' . $url, Logger::DEBUG);
 
 		$fetchresult = Network::fetchUrlFull($url);
 		$s = $fetchresult->getBody();
 
-		logger('load: returns ' . $s, LOGGER_DATA);
+		Logger::log('load: returns ' . $s, Logger::DATA);
 
-		logger('load: return code: ' . $fetchresult->getReturnCode(), LOGGER_DEBUG);
+		Logger::log('load: return code: ' . $fetchresult->getReturnCode(), Logger::DEBUG);
 
 		if (($fetchresult->getReturnCode() > 299) || (! $s)) {
 			return;
@@ -99,7 +100,7 @@ class PortableContact
 
 		$j = json_decode($s, true);
 
-		logger('load: json: ' . print_r($j, true), LOGGER_DATA);
+		Logger::log('load: json: ' . print_r($j, true), Logger::DATA);
 
 		if (!isset($j['entry'])) {
 			return;
@@ -199,10 +200,10 @@ class PortableContact
 
 				GContact::link($gcid, $uid, $cid, $zcid);
 			} catch (Exception $e) {
-				logger($e->getMessage(), LOGGER_DEBUG);
+				Logger::log($e->getMessage(), Logger::DEBUG);
 			}
 		}
-		logger("load: loaded $total entries", LOGGER_DEBUG);
+		Logger::log("load: loaded $total entries", Logger::DEBUG);
 
 		$condition = ["`cid` = ? AND `uid` = ? AND `zcid` = ? AND `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", $cid, $uid, $zcid];
 		DBA::delete('glink', $condition);
@@ -335,7 +336,7 @@ class PortableContact
 		}
 
 		if (!in_array($gcontacts[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
-			logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
+			Logger::log("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", Logger::DEBUG);
 			return false;
 		}
 
@@ -346,7 +347,7 @@ class PortableContact
 					DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 				}
 
-				logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
+				Logger::log("Profile ".$profile.": Server ".$server_url." wasn't reachable.", Logger::DEBUG);
 				return false;
 			}
 			$contact['server_url'] = $server_url;
@@ -426,7 +427,7 @@ class PortableContact
 							$fields = ['last_contact' => DateTimeFormat::utcNow()];
 							DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
-							logger("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", LOGGER_DEBUG);
+							Logger::log("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", Logger::DEBUG);
 
 							return $noscrape["updated"];
 						}
@@ -437,7 +438,7 @@ class PortableContact
 
 		// If we only can poll the feed, then we only do this once a while
 		if (!$force && !self::updateNeeded($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) {
-			logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
+			Logger::log("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", Logger::DEBUG);
 
 			GContact::update($contact);
 			return $gcontacts[0]["updated"];
@@ -464,10 +465,10 @@ class PortableContact
 
 				self::lastUpdated($data["url"], $force);
 			} catch (Exception $e) {
-				logger($e->getMessage(), LOGGER_DEBUG);
+				Logger::log($e->getMessage(), Logger::DEBUG);
 			}
 
-			logger("Profile ".$profile." was deleted", LOGGER_DEBUG);
+			Logger::log("Profile ".$profile." was deleted", Logger::DEBUG);
 			return false;
 		}
 
@@ -475,7 +476,7 @@ class PortableContact
 			$fields = ['last_failure' => DateTimeFormat::utcNow()];
 			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
-			logger("Profile ".$profile." wasn't reachable (profile)", LOGGER_DEBUG);
+			Logger::log("Profile ".$profile." wasn't reachable (profile)", Logger::DEBUG);
 			return false;
 		}
 
@@ -491,7 +492,7 @@ class PortableContact
 			$fields = ['last_failure' => DateTimeFormat::utcNow()];
 			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
-			logger("Profile ".$profile." wasn't reachable (no feed)", LOGGER_DEBUG);
+			Logger::log("Profile ".$profile." wasn't reachable (no feed)", Logger::DEBUG);
 			return false;
 		}
 
@@ -539,7 +540,7 @@ class PortableContact
 			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 		}
 
-		logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);
+		Logger::log("Profile ".$profile." was last updated at ".$last_updated, Logger::DEBUG);
 
 		return $last_updated;
 	}
@@ -662,7 +663,7 @@ class PortableContact
 
 		foreach ($nodeinfo['links'] as $link) {
 			if (!is_array($link) || empty($link['rel'])) {
-				logger('Invalid nodeinfo format for ' . $server_url, LOGGER_DEBUG);
+				Logger::log('Invalid nodeinfo format for ' . $server_url, Logger::DEBUG);
 				continue;
 			}
 			if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
@@ -963,7 +964,7 @@ class PortableContact
 			}
 
 			if (!$force && !self::updateNeeded($gserver["created"], "", $last_failure, $last_contact)) {
-				logger("Use cached data for server ".$server_url, LOGGER_DEBUG);
+				Logger::log("Use cached data for server ".$server_url, Logger::DEBUG);
 				return ($last_contact >= $last_failure);
 			}
 		} else {
@@ -979,7 +980,7 @@ class PortableContact
 			$last_contact = DBA::NULL_DATETIME;
 			$last_failure = DBA::NULL_DATETIME;
 		}
-		logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$gserver["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
+		Logger::log("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$gserver["created"]." Failure: ".$last_failure." Contact: ".$last_contact, Logger::DEBUG);
 
 		$failure = false;
 		$possible_failure = false;
@@ -1004,7 +1005,7 @@ class PortableContact
 		// But we want to make sure to only quit if we are mostly sure that this server url fits.
 		if (DBA::isResult($gserver) && ($orig_server_url == $server_url) &&
 			($curlResult->isTimeout())) {
-			logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
+			Logger::log("Connection to server ".$server_url." timed out.", Logger::DEBUG);
 			DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
 			return false;
 		}
@@ -1019,7 +1020,7 @@ class PortableContact
 
 			// Quit if there is a timeout
 			if ($curlResult->isTimeout()) {
-				logger("Connection to server " . $server_url . " timed out.", LOGGER_DEBUG);
+				Logger::log("Connection to server " . $server_url . " timed out.", Logger::DEBUG);
 				DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
 				return false;
 			}
@@ -1398,9 +1399,9 @@ class PortableContact
 		}
 
 		if (($last_contact <= $last_failure) && !$failure) {
-			logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG);
+			Logger::log("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", Logger::DEBUG);
 		} elseif (($last_contact >= $last_failure) && $failure) {
-			logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG);
+			Logger::log("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", Logger::DEBUG);
 		}
 
 		// Check again if the server exists
@@ -1429,7 +1430,7 @@ class PortableContact
 			self::discoverRelay($server_url);
 		}
 
-		logger("End discovery for server " . $server_url, LOGGER_DEBUG);
+		Logger::log("End discovery for server " . $server_url, Logger::DEBUG);
 
 		return !$failure;
 	}
@@ -1441,7 +1442,7 @@ class PortableContact
 	 */
 	private static function discoverRelay($server_url)
 	{
-		logger("Discover relay data for server " . $server_url, LOGGER_DEBUG);
+		Logger::log("Discover relay data for server " . $server_url, Logger::DEBUG);
 
 		$curlResult = Network::curl($server_url . "/.well-known/x-social-relay");
 
@@ -1557,7 +1558,7 @@ class PortableContact
 			$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", DBA::escape(normalise_link($server_url)));
 
 			if (!DBA::isResult($r)) {
-				logger("Call server check for server ".$server_url, LOGGER_DEBUG);
+				Logger::log("Call server check for server ".$server_url, Logger::DEBUG);
 				Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server_url);
 			}
 		}
@@ -1642,7 +1643,7 @@ class PortableContact
 		// Fetch all users from the other server
 		$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-		logger("Fetch all users from the server " . $server["url"], LOGGER_DEBUG);
+		Logger::log("Fetch all users from the server " . $server["url"], Logger::DEBUG);
 
 		$curlResult = Network::curl($url);
 
@@ -1670,7 +1671,7 @@ class PortableContact
 				$curlResult = Network::curl($url);
 
 				if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
-					logger("Fetch all global contacts from the server " . $server["nurl"], LOGGER_DEBUG);
+					Logger::log("Fetch all global contacts from the server " . $server["nurl"], Logger::DEBUG);
 					$data = json_decode($curlResult->getBody(), true);
 
 					if (!empty($data)) {
@@ -1679,7 +1680,7 @@ class PortableContact
 				}
 
 				if (!$success && (Config::get('system', 'poco_discovery') > 2)) {
-					logger("Fetch contacts from users of the server " . $server["nurl"], LOGGER_DEBUG);
+					Logger::log("Fetch contacts from users of the server " . $server["nurl"], Logger::DEBUG);
 					self::discoverServerUsers($data, $server);
 				}
 			}
@@ -1732,7 +1733,7 @@ class PortableContact
 					continue;
 				}
 
-				logger('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], LOGGER_DEBUG);
+				Logger::log('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], Logger::DEBUG);
 				Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'update_server_directory', (int) $gserver['id']);
 
 				if (!$complete && ( --$no_of_queries == 0)) {
@@ -1762,7 +1763,7 @@ class PortableContact
 			}
 
 			if ($username != '') {
-				logger('Fetch contacts for the user ' . $username . ' from the server ' . $server['nurl'], LOGGER_DEBUG);
+				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';
@@ -1865,7 +1866,7 @@ class PortableContact
 			if ($generation > 0) {
 				$success = true;
 
-				logger("Store profile ".$profile_url, LOGGER_DEBUG);
+				Logger::log("Store profile ".$profile_url, Logger::DEBUG);
 
 				$gcontact = ["url" => $profile_url,
 						"name" => $name,
@@ -1884,10 +1885,10 @@ class PortableContact
 					$gcontact = GContact::sanitize($gcontact);
 					GContact::update($gcontact);
 				} catch (Exception $e) {
-					logger($e->getMessage(), LOGGER_DEBUG);
+					Logger::log($e->getMessage(), Logger::DEBUG);
 				}
 
-				logger("Done for profile ".$profile_url, LOGGER_DEBUG);
+				Logger::log("Done for profile ".$profile_url, Logger::DEBUG);
 			}
 		}
 		return $success;