Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[friendica.git] / include / gprobe.php

diff --git a/include/gprobe.php b/include/gprobe.php
index 91b9b16e3306077ba2f0c574e6c46e0ce5fe066a..719cfce48635ac4adb109964d9eed19a3f7a498b 100644 (file)
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,36 +1,15 @@
 <?php
 
-require_once("boot.php");
+use \Friendica\Core\Config;
+
 require_once('include/Scrape.php');
 require_once('include/socgraph.php');
+require_once('include/datetime.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)
+       if ($argc != 2) {
                return;
-
+       }
        $url = hex2bin($argv[1]);
 
        $r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
@@ -39,14 +18,13 @@ function gprobe_run(&$argv, &$argc){
 
        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 (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,7 +34,7 @@ function gprobe_run(&$argv, &$argc){
                $arr = probe_url($url);
 
                if (is_null($result))
-                       Cache::set("gprobe:".$urlparts["host"],serialize($arr));
+                       Cache::set("gprobe:".$urlparts["host"], $arr);
 
                if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))
                        update_gcontact($arr);
@@ -65,7 +43,7 @@ function gprobe_run(&$argv, &$argc){
                        dbesc(normalise_link($url))
                );
        }
-       if(count($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']));
@@ -74,8 +52,3 @@ function gprobe_run(&$argv, &$argc){
        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();
-}