X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiscover_poco.php;h=79958a8849a4235b7a53156cc5c2fdddd26de046;hb=b52bc71c6cdc3ee328604d9b68b730137c6df92d;hp=68f483dab51f3a5eee603d3ef95e4c7443b60f42;hpb=166519fc4db8eec57ce17c4ab7b094d2252b65e1;p=friendica.git

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 68f483dab5..79958a8849 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -13,10 +13,10 @@ function discover_poco_run(&$argv, &$argc){
 
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("include/dba.php");
+	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    	unset($db_host, $db_user, $db_pass, $db_data);
-  	};
+	unset($db_host, $db_user, $db_pass, $db_data);
+	};
 
 	require_once('include/session.php');
 	require_once('include/datetime.php');
@@ -53,12 +53,12 @@ function discover_poco_run(&$argv, &$argc){
 		if($pidfile->is_already_running()) {
 			logger("discover_poco: Already running");
 			if ($pidfile->running_time() > 19*60) {
-                                $pidfile->kill();
-                                logger("discover_poco: killed stale process");
+				$pidfile->kill();
+				logger("discover_poco: killed stale process");
 				// Calling a new instance
 				if ($mode == 0)
 					proc_run('php','include/discover_poco.php');
-                        }
+			}
 			exit;
 		}
 	}
@@ -82,17 +82,56 @@ function discover_poco_run(&$argv, &$argc){
 }
 
 function discover_users() {
-	$users = q("SELECT `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 50",
-			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+	logger("Discover users", LOGGER_DEBUG);
+
+	$users = q("SELECT `url`, `created`, `updated`, `last_failure`, `last_contact`, `server_url` 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()",
+			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA),
+			dbesc(NETWORK_OSTATUS), dbesc(NETWORK_FEED));
 
 	if (!$users)
 		return;
 
+	$checked = 0;
+
 	foreach ($users AS $user) {
-		logger('Check user '.$user["url"]);
-		poco_last_updated($user["url"]);
+
+		$urlparts = parse_url($user["url"]);
+		if (!isset($urlparts["scheme"])) {
+			q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+				dbesc(NETWORK_PHANTOM), dbesc(normalise_link($user["url"])));
+			continue;
+		 }
+
+		if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
+							"identi.ca", "alpha.app.net"))) {
+			$networks = array("www.facebook.com" => NETWORK_FACEBOOK,
+					"facebook.com" => NETWORK_FACEBOOK,
+					"twitter.com" => NETWORK_TWITTER,
+					"identi.ca" => NETWORK_PUMPIO,
+					"alpha.app.net" => NETWORK_APPNET);
+
+			q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+				dbesc($networks[$urlparts["host"]]), dbesc(normalise_link($user["url"])));
+			continue;
+		}
+
+		if ($user["server_url"] != "")
+			$server_url = $user["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"], true);
+
+			if (++$checked > 100)
+				return;
+		} else
+			q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
+				dbesc(datetime_convert()), dbesc(normalise_link($user["url"])));
 	}
 }
 
@@ -107,7 +146,7 @@ function discover_directory($search) {
 		}
 	}
 
-	$x = fetch_url("http://dir.friendica.com/lsearch?p=1&n=500&search=".urlencode($search));
+	$x = fetch_url(get_server()."/lsearch?p=1&n=500&search=".urlencode($search));
 	$j = json_decode($x);
 
 	if(count($j->results))
@@ -144,7 +183,7 @@ function discover_directory($search) {
 				poco_check($data["url"], $data["name"], $data["network"], $data["photo"], "", "", "", $jj->tags, $data["addr"], "", 0);
 			}
 		}
-	Cache::set("dirsearch:".$search, time());
+	Cache::set("dirsearch:".$search, time(), CACHE_DAY);
 }
 
 if (array_search(__file__,get_included_files())===0){