Continued with #3010:

[friendica.git] / include / gprobe.php

diff --git a/include/gprobe.php b/include/gprobe.php
index 03cdbd072ba6debb9e5e03ef3b5468d2e58a3d10..7169aada3f7e38435d194f770c62f8186794b9da 100644 (file)
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -12,11 +12,11 @@ function gprobe_run(&$argv, &$argc){
        }
 
        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);
-       };
+               @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');
@@ -33,21 +33,20 @@ function gprobe_run(&$argv, &$argc){
 
        $url = hex2bin($argv[1]);
 
-       $r = q("select * from gcontact where nurl = '%s' 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(! count($r)) {
+       if (!dbm::is_result($r)) {
 
                // Is it a DDoS attempt?
                $urlparts = parse_url($url);
 
                $result = Cache::get("gprobe:".$urlparts["host"]);
                if (!is_null($result)) {
-                       $result = unserialize($result);
-                       if ($result["network"] == NETWORK_FEED) {
+                       if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
                                logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
                                return;
                        }
@@ -56,29 +55,26 @@ function gprobe_run(&$argv, &$argc){
                $arr = probe_url($url);
 
                if (is_null($result))
-                       Cache::set("gprobe:".$urlparts["host"],serialize($arr));
-
-               if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
-                       q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
-                               values ( '%s', '%s', '%s', '%s') ",
-                               dbesc($arr['name']),
-                               dbesc($arr['url']),
-                               dbesc(normalise_link($arr['url'])),
-                               dbesc($arr['photo'])
-                       );
-               }
-               $r = q("select * from gcontact where nurl = '%s' limit 1",
+                       Cache::set("gprobe:".$urlparts["host"], $arr);
+
+               if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
+                       update_gcontact($arr);
+
+               $r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
                        dbesc(normalise_link($url))
                );
        }
-       if(count($r))
-               poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
+       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']));
+       }
 
        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();
+       gprobe_run($_SERVER["argv"],$_SERVER["argc"]);
+       killme();
 }