X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgprobe.php;h=a6b46afc563d02cbf29550cc9a85d355dfff383a;hb=27af65918eeeb5334e24045da2dcdcd396196cf5;hp=7169aada3f7e38435d194f770c62f8186794b9da;hpb=cc16369b6f45eff2c0faa91bda96ae619f9f80e4;p=friendica.git

diff --git a/include/gprobe.php b/include/gprobe.php
index 7169aada3f..a6b46afc56 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,46 +1,31 @@
 <?php
-
-require_once("boot.php");
-require_once('include/Scrape.php');
-require_once('include/socgraph.php');
-
-function gprobe_run(&$argv, &$argc){
-	global $a, $db;
-
-	if(is_null($a)) {
-		$a = new App;
-	}
-
-	if(is_null($db)) {
-		@include(".htconfig.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);
-	};
-
-	require_once('include/session.php');
-	require_once('include/datetime.php');
-
-	load_config('config');
-	load_config('system');
-
-	$a->set_baseurl(get_config('system','url'));
-
-	load_hooks();
-
-	if($argc != 2)
+/**
+ * @file include/gprobe.php
+ */
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+use Friendica\Network\Probe;
+use Friendica\Protocol\PortableContact;
+
+require_once 'include/datetime.php';
+
+function gprobe_run(&$argv, &$argc)
+{
+	if ($argc != 2) {
 		return;
+	}
+	$url = $argv[1];
 
-	$url = hex2bin($argv[1]);
-
-	$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
+	$r = q(
+		"SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
 		dbesc(normalise_link($url))
 	);
 
 	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
 
-	if (!dbm::is_result($r)) {
-
+	if (!DBM::is_result($r)) {
 		// Is it a DDoS attempt?
 		$urlparts = parse_url($url);
 
@@ -52,29 +37,28 @@ function gprobe_run(&$argv, &$argc){
 			}
 		}
 
-		$arr = probe_url($url);
+		$arr = Probe::uri($url);
 
-		if (is_null($result))
+		if (is_null($result)) {
 			Cache::set("gprobe:".$urlparts["host"], $arr);
+		}
 
-		if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
-			update_gcontact($arr);
+		if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
+			GlobalContact::update($arr);
+		}
 
-		$r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
+		$r = q(
+			"SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
 			dbesc(normalise_link($url))
 		);
 	}
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// Check for accessibility and do a poco discovery
-		if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN))
-			poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
+		if (PortableContact::lastUpdated($r[0]['url'], true) && ($r[0]["network"] == NETWORK_DFRN)) {
+			PortableContact::loadWorker(0, 0, $r[0]['id'], str_replace('/profile/', '/poco/', $r[0]['url']));
+		}
 	}
 
 	logger("gprobe end for ".normalise_link($url), LOGGER_DEBUG);
 	return;
 }
-
-if (array_search(__file__,get_included_files())===0){
-	gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
-	killme();
-}