X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FPortableContact.php;h=b9c1533e6601365a53af1045fa66355895d998cd;hb=f78c1480135b9445d94a815fbfcc138f1a4dea58;hp=4b8b6fff63f1446bb12cd818e9c53b07dddbc4bd;hpb=4a95ca280d665eda09529f91eb28b517a471e683;p=friendica.git

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 4b8b6fff63..b9c1533e66 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -20,6 +20,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Module\Register;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -28,6 +29,11 @@ use Friendica\Util\XML;
 
 class PortableContact
 {
+	const DISABLED = 0;
+	const USERS = 1;
+	const USERS_GCONTACTS = 2;
+	const USERS_GCONTACTS_FALLBACK = 3;
+
 	/**
 	 * @brief Fetch POCO data
 	 *
@@ -499,8 +505,15 @@ class PortableContact
 		$last_updated = "";
 
 		foreach ($entries as $entry) {
-			$published = DateTimeFormat::utc($xpath->query('atom:published/text()', $entry)->item(0)->nodeValue);
-			$updated   = DateTimeFormat::utc($xpath->query('atom:updated/text()'  , $entry)->item(0)->nodeValue);
+			$published_item = $xpath->query('atom:published/text()', $entry)->item(0);
+			$updated_item   = $xpath->query('atom:updated/text()'  , $entry)->item(0);
+			$published      = isset($published_item->nodeValue) ? DateTimeFormat::utc($published_item->nodeValue) : null;
+			$updated        = isset($updated_item->nodeValue) ? DateTimeFormat::utc($updated_item->nodeValue) : null;
+
+			if (!isset($published) || !isset($updated)) {
+				Logger::notice('Invalid entry for XPath.', ['entry' => $entry, 'profile' => $profile]);
+				continue;
+			}
 
 			if ($last_updated < $published) {
 				$last_updated = $published;
@@ -705,10 +718,10 @@ class PortableContact
 
 		$server = [];
 
-		$server['register_policy'] = REGISTER_CLOSED;
+		$server['register_policy'] = Register::CLOSED;
 
 		if (is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
-			$server['register_policy'] = REGISTER_OPEN;
+			$server['register_policy'] = Register::OPEN;
 		}
 
 		if (is_array($nodeinfo['software'])) {
@@ -789,10 +802,10 @@ class PortableContact
 
 		$server = [];
 
-		$server['register_policy'] = REGISTER_CLOSED;
+		$server['register_policy'] = Register::CLOSED;
 
 		if (is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
-			$server['register_policy'] = REGISTER_OPEN;
+			$server['register_policy'] = Register::OPEN;
 		}
 
 		if (is_array($nodeinfo['software'])) {
@@ -1192,16 +1205,16 @@ class PortableContact
 				if (!empty($data['register_policy'])) {
 					switch ($data['register_policy']) {
 						case "REGISTER_OPEN":
-							$register_policy = REGISTER_OPEN;
+							$register_policy = Register::OPEN;
 							break;
 
 						case "REGISTER_APPROVE":
-							$register_policy = REGISTER_APPROVE;
+							$register_policy = Register::APPROVE;
 							break;
 
 						case "REGISTER_CLOSED":
 						default:
-							$register_policy = REGISTER_CLOSED;
+							$register_policy = Register::CLOSED;
 							break;
 					}
 				}
@@ -1267,11 +1280,11 @@ class PortableContact
 						}
 
 						if (!$closed && !$private and $inviteonly) {
-							$register_policy = REGISTER_APPROVE;
+							$register_policy = Register::APPROVE;
 						} elseif (!$closed && !$private) {
-							$register_policy = REGISTER_OPEN;
+							$register_policy = Register::OPEN;
 						} else {
-							$register_policy = REGISTER_CLOSED;
+							$register_policy = Register::CLOSED;
 						}
 					}
 				}
@@ -1305,9 +1318,9 @@ class PortableContact
 				}
 
 				if (!empty($data['registrations_open']) && $data['registrations_open']) {
-					$register_policy = REGISTER_OPEN;
+					$register_policy = Register::OPEN;
 				} else {
-					$register_policy = REGISTER_CLOSED;
+					$register_policy = Register::CLOSED;
 				}
 			}
 		}
@@ -1367,13 +1380,27 @@ class PortableContact
 					}
 
 					$info = defaults($data, 'info', '');
-					$register_policy = defaults($data, 'register_policy', REGISTER_CLOSED);
-					if (in_array($register_policy, ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'])) {
-						$register_policy = constant($register_policy);
-					} else {
-						Logger::log("Register policy '$register_policy' from $server_url is invalid.");
-						$register_policy = REGISTER_CLOSED; // set a default value
+
+					$register_policy = defaults($data, 'register_policy', 'REGISTER_CLOSED');
+					switch ($register_policy) {
+						case 'REGISTER_OPEN':
+							$register_policy = Register::OPEN;
+							break;
+
+						case 'REGISTER_APPROVE':
+							$register_policy = Register::APPROVE;
+							break;
+
+						default:
+							Logger::log("Register policy '$register_policy' from $server_url is invalid.");
+							// Defaulting to closed
+
+						case 'REGISTER_CLOSED':
+						case 'REGISTER_INVITATION':
+							$register_policy = Register::CLOSED;
+							break;
 					}
+
 					$platform = defaults($data, 'platform', '');
 				}
 			}
@@ -1630,21 +1657,19 @@ class PortableContact
 
 	public static function discoverSingleServer($id)
 	{
-		$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
+		$server = DBA::selectFirst('gserver', ['poco', 'nurl', 'url', 'network'], ['id' => $id]);
 
-		if (!DBA::isResult($r)) {
+		if (!DBA::isResult($server)) {
 			return false;
 		}
 
-		$server = $r[0];
-
 		// Discover new servers out there (Works from Friendica version 3.5.2)
 		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";
 
-		Logger::log("Fetch all users from the server " . $server["url"], Logger::DEBUG);
+		Logger::info("Fetch all users from the server " . $server["url"]);
 
 		$curlResult = Network::curl($url);
 
@@ -1655,7 +1680,7 @@ class PortableContact
 				self::discoverServer($data, 2);
 			}
 
-			if (Config::get('system', 'poco_discovery') > 1) {
+			if (Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS) {
 				$timeframe = Config::get('system', 'poco_discovery_since');
 
 				if ($timeframe == 0) {
@@ -1672,7 +1697,7 @@ class PortableContact
 				$curlResult = Network::curl($url);
 
 				if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
-					Logger::log("Fetch all global contacts from the server " . $server["nurl"], Logger::DEBUG);
+					Logger::info("Fetch all global contacts from the server " . $server["nurl"]);
 					$data = json_decode($curlResult->getBody(), true);
 
 					if (!empty($data)) {
@@ -1680,8 +1705,8 @@ class PortableContact
 					}
 				}
 
-				if (!$success && (Config::get('system', 'poco_discovery') > 2)) {
-					Logger::log("Fetch contacts from users of the server " . $server["nurl"], Logger::DEBUG);
+				if (!$success && !empty($data) && Config::get('system', 'poco_discovery') >= self::USERS_GCONTACTS_FALLBACK) {
+					Logger::info("Fetch contacts from users of the server " . $server["nurl"]);
 					self::discoverServerUsers($data, $server);
 				}
 			}