From e5bf7bae7b2e2d670744e4b5ec6fa82b28ca59e2 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 26 Jul 2015 16:52:37 +0200
Subject: [PATCH] Just some improvements ...

---
 include/discover_poco.php | 21 +++++++++++++++++----
 include/socgraph.php      |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/include/discover_poco.php b/include/discover_poco.php
index bc5ee5d321..481bedcf92 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -83,19 +83,32 @@ function discover_poco_run(&$argv, &$argc){
 
 function discover_users() {
 	// To-Do: Maybe we should check old contact as well.
-	$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact` FROM `gcontact`
+	$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` FROM `gcontact`
 			WHERE `updated` = '0000-00-00 00:00:00' AND `last_contact` = '0000-00-00 00:00:00' AND
 				`last_failure` = '0000-00-00 00:00:00' AND `network` IN ('%s', '%s', '%s')
-				ORDER BY rand() LIMIT 100",
+				ORDER BY rand()",
 			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
 
 	if (!$users)
 		return;
 
+	$checked = 0;
+
 	foreach ($users AS $user) {
 		if (poco_do_update($user["created"], $user["updated"], $user["last_failure"], $user["last_contact"])) {
-			logger('Check user '.$user["url"]);
-			poco_last_updated($user["url"]);
+
+			if ($user[0]["server_url"] != "")
+                		$server_url = $user[0]["server_url"];
+        		else
+                		$server_url = poco_detect_server($user["url"]);
+
+			if (poco_check_server($server_url, $gcontacts[0]["network"])) {
+				logger('Check user '.$user["url"]);
+				poco_last_updated($user["url"]);
+
+				if (++$checked > 100)
+					return;
+			}
 		}
 	}
 }
diff --git a/include/socgraph.php b/include/socgraph.php
index 53763626d6..04374f3e54 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -440,7 +440,7 @@ function poco_last_updated($profile) {
 		$server_url = poco_detect_server($profile);
 
 	if ($server_url != "")
-		if (!poco_check_server($pserver_url, $gcontacts[0]["network"]))
+		if (!poco_check_server($server_url, $gcontacts[0]["network"]))
 			return false;
 
 	// noscrape is really fast so we don't cache the call.