Renamed function

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index bf82e0427831fe37fc1da1fe320437793f9f0ce1..96b1450aedaceb282d3b8732c2482be04a4bc812 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -33,7 +33,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\Event;
-use Friendica\Model\GContact;
+use Friendica\Model\FContact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Mail;
@@ -755,7 +755,7 @@ class DFRN
        {
                $author = $doc->createElement($element);
 
-               $contact = Contact::getByURLForUser($contact_url, $item["uid"], ['url', 'name', 'addr', 'photo']);
+               $contact = Contact::getByURLForUser($contact_url, $item["uid"], false, ['url', 'name', 'addr', 'photo']);
                if (!empty($contact)) {
                        XML::addElement($doc, $author, "name", $contact["name"]);
                        XML::addElement($doc, $author, "uri", $contact["url"]);
@@ -1194,7 +1194,7 @@ class DFRN
 
                Logger::log('dfrn_deliver: ' . $url);
 
-               $curlResult = Network::curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if ($curlResult->isTimeout()) {
                        return -2; // timed out
@@ -1343,7 +1343,7 @@ class DFRN
 
                Logger::debug('dfrn_deliver', ['post' => $postvars]);
 
-               $postResult = Network::post($contact['notify'], $postvars);
+               $postResult = DI::httpRequest()->post($contact['notify'], $postvars);
 
                $xml = $postResult->getBody();
 
@@ -1410,7 +1410,7 @@ class DFRN
                                }
                        }
 
-                       $fcontact = Diaspora::personByHandle($contact['addr']);
+                       $fcontact = FContact::getByURL($contact['addr']);
                        if (empty($fcontact)) {
                                Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
                                return -22;
@@ -1440,7 +1440,7 @@ class DFRN
 
                $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
 
-               $postResult = Network::post($dest_url, $envelope, ["Content-Type: ".$content_type]);
+               $postResult = DI::httpRequest()->post($dest_url, $envelope, ["Content-Type: " . $content_type]);
                $xml = $postResult->getBody();
 
                $curl_stat = $postResult->getReturnCode();
@@ -1680,27 +1680,12 @@ class DFRN
                        $condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])];
                        DBA::update('contact', $fields, $condition, true);
 
-                       Contact::updateAvatar($author['avatar'], $importer['importer_uid'], $contact['id']);
+                       Contact::updateAvatar($contact['id'], $author['avatar']);
 
                        $pcid = Contact::getIdForURL($contact_old['url']);
                        if (!empty($pcid)) {
-                               Contact::updateAvatar($author['avatar'], 0, $pcid);
+                               Contact::updateAvatar($pcid, $author['avatar']);
                        }
-
-                       /*
-                        * The generation is a sign for the reliability of the provided data.
-                        * It is used in the socgraph.php to prevent that old contact data
-                        * that was relayed over several servers can overwrite contact
-                        * data that we received directly.
-                        */
-
-                       $poco["generation"] = 2;
-                       $poco["photo"] = $author["avatar"];
-                       $poco["hide"] = $hide;
-                       $poco["contact-type"] = $contact["contact-type"];
-                       $gcid = GContact::update($poco);
-
-                       GContact::link($gcid, $importer["importer_uid"], $contact["id"]);
                }
 
                return $author;
@@ -1943,15 +1928,6 @@ class DFRN
 
                $old = $r[0];
 
-               // Update the gcontact entry
-               $relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
-
-               $fields = ['name' => $relocate["name"], 'photo' => $relocate["avatar"],
-                       'url' => $relocate["url"], 'nurl' => Strings::normaliseLink($relocate["url"]),
-                       'addr' => $relocate["addr"], 'connect' => $relocate["addr"],
-                       'notify' => $relocate["notify"], 'server_url' => $relocate["server_url"]];
-               DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($old["url"])]);
-
                // Update the contact table. We try to find every entry.
                $fields = ['name' => $relocate["name"], 'avatar' => $relocate["avatar"],
                        'url' => $relocate["url"], 'nurl' => Strings::normaliseLink($relocate["url"]),
@@ -1962,7 +1938,7 @@ class DFRN
 
                DBA::update('contact', $fields, $condition);
 
-               Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
+               Contact::updateAvatar($importer["id"], $relocate["avatar"], true);
 
                Logger::log('Contacts are updated.');