Merge pull request #5903 from nupplaphil/move_module_acctlink

[friendica.git] / src / Worker / OnePoll.php

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 21e3b44b3e7345ba98c79361c8f5e92902c6d567..a68ad1336d3aca7bdc5463b5c45d77a7bdc7a25e 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -185,18 +185,17 @@ class OnePoll
                                . '&type=data&last_update=' . $last_update
                                . '&perm=' . $perm ;
 
-                       $ret = Network::curl($url);
+                       $curlResult = Network::curl($url);
 
-                       if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
+                       if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
                                // set the last-update so we don't keep polling
                                DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
 
-                       $handshake_xml = $ret['body'];
-
-                       $html_code = Network::getCurl()->getCode();
+                       $handshake_xml = $curlResult->getBody();
+                       $html_code = $curlResult->getReturnCode();
 
                        logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
@@ -288,7 +287,7 @@ class OnePoll
                        $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
                        $postvars['perm'] = 'rw';
 
-                       $xml = Network::post($contact['poll'], $postvars);
+                       $xml = Network::post($contact['poll'], $postvars)->getBody();
 
                } elseif (($contact['network'] === Protocol::OSTATUS)
                        || ($contact['network'] === Protocol::DIASPORA)
@@ -319,17 +318,17 @@ class OnePoll
                        }
 
                        $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-                       $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
+                       $curlResult = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
                        unlink($cookiejar);
 
-                       if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
+                       if (!$curlResult->isTimeout()) {
                                // set the last-update so we don't keep polling
                                DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
                                return;
                        }
 
-                       $xml = $ret['body'];
+                       $xml = $curlResult->getBody();
 
                } elseif ($contact['network'] === Protocol::MAIL) {
                        logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);