"FetchPoCo" added

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 655929f52987d2ef5c3a6714658c35d54cae50c0..60844df9f70f1dc8540856a6cf3667fe261686d0 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -57,7 +57,7 @@ class PortableContact
        public static function loadWorker($cid, $uid = 0, $zcid = 0, $url = null)
        {
                // Call the function "load" via the worker
-               Worker::add(PRIORITY_LOW, "DiscoverPoCo", "load", (int)$cid, (int)$uid, (int)$zcid, $url);
+               Worker::add(PRIORITY_LOW, 'FetchPoCo', (int)$cid, (int)$uid, (int)$zcid, $url);
        }
 
        /**

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index cd0968fd86985be7a4d699fc3d4e81954c01053d..af486a6440f53d181d79fda74bec5b31275d6719 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -13,10 +12,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
-use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 class DiscoverPoCo
@@ -26,9 +22,7 @@ class DiscoverPoCo
        {
                /*
                This function can be called in these ways:
-               - checkcontact: Updates gcontact entries
                - server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
-               - PortableContact::load: Load POCO data from a given POCO address
                */
 
                $search = "";
@@ -50,13 +44,6 @@ class DiscoverPoCo
                                $result .= "failed";
                        }
                        Logger::log($result, Logger::DEBUG);
-               } elseif ($command == "load") {
-                       if (!empty($param4)) {
-                               $url = $param4;
-                       } else {
-                               $url = '';
-                       }
-                       PortableContact::load(intval($param1), intval($param2), intval($param3), $url);
                } elseif ($command !== "") {
                        Logger::log("Unknown or missing parameter ".$command."\n");
                        return;

diff --git a/src/Worker/FetchPoCo.php b/src/Worker/FetchPoCo.php
new file mode 100644 (file)
index 0000000..372bd37
--- /dev/null
+++ b/src/Worker/FetchPoCo.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @file src/Worker/FetchPoCo.php
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Logger;
+use Friendica\Protocol\PortableContact;
+
+class FetchPoCo
+{
+       // Load POCO data from a given POCO address
+       public static function execute($cid, $uid, $zcid, $url)
+       {
+               PortableContact::load($cid, $uid, $zcid, $url);
+       }
+}