Merge pull request #3914 from MrPetovan/issue/#3878-move-itemplateengine-to-src

[friendica.git] / include / gprobe.php

diff --git a/include/gprobe.php b/include/gprobe.php
index e79cc64764a3265211bf4f4458cbaeb39e77aff8..a6b46afc563d02cbf29550cc9a85d355dfff383a 100644 (file)
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,25 +1,31 @@
 <?php
+/**
+ * @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;
 
-use \Friendica\Core\Config;
+require_once 'include/datetime.php';
 
-require_once('include/Scrape.php');
-require_once('include/socgraph.php');
-require_once('include/datetime.php');
-
-function gprobe_run(&$argv, &$argc){
+function gprobe_run(&$argv, &$argc)
+{
        if ($argc != 2) {
                return;
        }
-       $url = hex2bin($argv[1]);
+       $url = $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);
 
@@ -31,24 +37,26 @@ function gprobe_run(&$argv, &$argc){
                        }
                }
 
-               $arr = probe_url($url);
+               $arr = Probe::uri($url);
 
                if (is_null($result)) {
                        Cache::set("gprobe:".$urlparts["host"], $arr);
                }
 
                if (!in_array($arr["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
-                       update_gcontact($arr);
+                       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);