X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiscover_poco.php;h=bb53efb5ccc125b37097c0d1112338d4b7269b1e;hb=94f3f0887b6962e54758ffae6829cf40dfed2d79;hp=f0bfb646bddc53d83cde92c994962042a9dded51;hpb=0060e2449e4f225436964a8203b706ddd3e0d01f;p=friendica.git

diff --git a/include/discover_poco.php b/include/discover_poco.php
index f0bfb646bd..bb53efb5cc 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -14,6 +14,9 @@ function discover_poco_run(&$argv, &$argc) {
 	- suggestions: Discover other servers for their contacts.
 	- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
 	- update_server: Frequently check the first 250 servers for vitality.
+	- update_server_directory: Discover the given server id for their contacts
+	- poco_load: Load POCO data from a given POCO address
+	- check_profile: Update remote profile data
 	*/
 
 	if (($argc > 2) && ($argv[1] == "dirsearch")) {
@@ -27,6 +30,12 @@ function discover_poco_run(&$argv, &$argc) {
 		$mode = 4;
 	} elseif (($argc == 2) && ($argv[1] == "update_server")) {
 		$mode = 5;
+	} elseif (($argc == 3) && ($argv[1] == "update_server_directory")) {
+		$mode = 6;
+	} elseif (($argc > 5) && ($argv[1] == "poco_load")) {
+		$mode = 7;
+	} elseif (($argc == 3) && ($argv[1] == "check_profile")) {
+		$mode = 8;
 	} elseif ($argc == 1) {
 		$search = "";
 		$mode = 0;
@@ -36,7 +45,21 @@ function discover_poco_run(&$argv, &$argc) {
 
 	logger('start '.$search);
 
-	if ($mode == 5) {
+	if ($mode == 8) {
+		$profile_url = base64_decode($argv[2]);
+		if ($profile_url != "") {
+			poco_last_updated($profile_url, true);
+		}
+	} elseif ($mode == 7) {
+		if ($argc == 6) {
+			$url = base64_decode($argv[5]);
+		} else {
+			$url = '';
+		}
+		poco_load_worker(intval($argv[2]), intval($argv[3]), intval($argv[4]), $url);
+	} elseif ($mode == 6) {
+		poco_discover_single_server(intval($argv[2]));
+	} elseif ($mode == 5) {
 		update_server();
 	} elseif ($mode == 4) {
 		$server_url = base64_decode($argv[2]);
@@ -106,7 +129,9 @@ function update_server() {
 function discover_users() {
 	logger("Discover users", LOGGER_DEBUG);
 
-	$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` FROM `gcontact`
+	$starttime = time();
+
+	$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url`, `network` FROM `gcontact`
 			WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
 				`last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
 				`network` IN ('%s', '%s', '%s', '%s', '') ORDER BY rand()",
@@ -140,14 +165,19 @@ function discover_users() {
 			continue;
 		}
 
+		$server_url = poco_detect_server($user["url"]);
+		$force_update = false;
+
 		if ($user["server_url"] != "") {
+
+			$force_update = (normalise_link($user["server_url"]) != normalise_link($server_url));
+
 			$server_url = $user["server_url"];
-		} else {
-			$server_url = poco_detect_server($user["url"]);
 		}
-		if (($server_url == "") OR poco_check_server($server_url, $gcontacts[0]["network"])) {
-			logger('Check user '.$user["url"]);
-			poco_last_updated($user["url"], true);
+
+		if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) {
+			logger('Check profile '.$user["url"]);
+			proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"]));
 
 			if (++$checked > 100) {
 				return;
@@ -156,6 +186,11 @@ function discover_users() {
 			q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
 				dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
 		}
+
+		// Quit the loop after 3 minutes
+		if (time() > ($starttime + 180)) {
+			return;
+		}
 	}
 }
 
@@ -202,7 +237,14 @@ function discover_directory($search) {
 			if ($data["network"] == NETWORK_DFRN) {
 				logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
 				logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
-				poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
+
+				if ($jj->tags != "") {
+					$data["keywords"] = $jj->tags;
+				}
+
+				$data["server_url"] = $data["baseurl"];
+
+				update_gcontact($data);
 			} else {
 				logger("Profile ".$jj->url." is not responding or no Friendica contact - but network ".$data["network"], LOGGER_DEBUG);
 			}