Merge pull request #3246 from annando/1701-poco

Split poco discovery in smaller function calls

include/discover_poco.php

@@ -14,6 +14,8 @@ 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
 	*/
 
 	if (($argc > 2) && ($argv[1] == "dirsearch")) {
@@ -27,6 +29,10 @@ 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 == 1) {
 		$search = "";
 		$mode = 0;
@@ -36,7 +42,16 @@ function discover_poco_run(&$argv, &$argc) {
 
 	logger('start '.$search);
 
-	if ($mode == 5) {
+	if ($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]);

include/socgraph.php

@@ -14,8 +14,13 @@ require_once("include/html2bbcode.php");
 require_once("include/Contact.php");
 require_once("include/Photo.php");
 
-/*
+/**
- * poco_load
+ * @brief Fetch POCO data
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
  *
  * Given a contact-id (minimum), load the PortableContacts friend list for that contact,
  * and add the entries to the gcontact (Global Contact) table, or update existing entries
@@ -27,12 +32,21 @@ require_once("include/Photo.php");
  * pointing to the same global contact id.
  *
  */
-
-
-
-
 function poco_load($cid, $uid = 0, $zcid = 0, $url = null) {
+	// Call the function "poco_load_worker" via the worker
+	proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", $cid, $uid, $zcid, base64_encode($url));
+}
 
+/**
+ * @brief Fetch POCO data from the worker
+ *
+ * @param integer $cid Contact ID
+ * @param integer $uid User ID
+ * @param integer $zcid Global Contact ID
+ * @param integer $url POCO address that should be polled
+ *
+ */
+function poco_load_worker($cid, $uid, $zcid, $url) {
 	$a = get_app();
 
 	if($cid) {
@@ -1668,37 +1682,21 @@ function poco_discover_federation() {
 	set_config('poco','last_federation_discovery', time());
 }
 
-function poco_discover($complete = false) {
+function poco_discover_single_server($id) {
-
+	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
-	// Update the server list
+	if (!dbm::is_result($r)) {
-	poco_discover_federation();
+		return false;
-
-	$no_of_queries = 5;
-
-	$requery_days = intval(get_config("system", "poco_requery_days"));
-
-	if ($requery_days == 0)
-		$requery_days = 7;
-
-	$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
-
-	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
-	if ($r)
-		foreach ($r AS $server) {
-
-			if (!poco_check_server($server["url"], $server["network"])) {
-				// The server is not reachable? Okay, then we will try it later
-				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-				continue;
 	}
 
-			// Discover new servers out there
+	$server = $r[0];
+
+	// Discover new servers out there (Works from Friendica version 3.5.2)
 	poco_fetch_serverlist($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("Fetch all users from the server ".$server["nurl"], LOGGER_DEBUG);
+	logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG);
 
 	$retdata = z_fetch_url($url);
 	if ($retdata["success"]) {
@@ -1709,8 +1707,9 @@ function poco_discover($complete = false) {
 		if (get_config('system','poco_discovery') > 1) {
 
 			$timeframe = get_config('system','poco_discovery_since');
-					if ($timeframe == 0)
+			if ($timeframe == 0) {
 				$timeframe = 30;
+			}
 
 			$updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
 
@@ -1732,14 +1731,49 @@ function poco_discover($complete = false) {
 		}
 
 		q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-				if (!$complete AND (--$no_of_queries == 0))
+
-					break;
+		return true;
 	} else {
 		// If the server hadn't replied correctly, then force a sanity check
 		poco_check_server($server["url"], $server["network"], true);
 
 		// If we couldn't reach the server, we will try it some time later
 		q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+
+		return false;
+	}
+}
+
+function poco_discover($complete = false) {
+
+	// Update the server list
+	poco_discover_federation();
+
+	$no_of_queries = 5;
+
+	$requery_days = intval(get_config("system", "poco_requery_days"));
+
+	if ($requery_days == 0) {
+		$requery_days = 7;
+	}
+	$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
+
+	$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
+	if (dbm::is_result($r)) {
+		foreach ($r AS $server) {
+
+			if (!poco_check_server($server["url"], $server["network"])) {
+				// The server is not reachable? Okay, then we will try it later
+				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+				continue;
+			}
+
+			logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
+			proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", $server['id']);
+
+			if (!$complete AND (--$no_of_queries == 0)) {
+				break;
+			}
 		}
 	}
 }