Rename "HTTPRequest::curl()" to HTTPRequest::get()

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 5a3a625cec481167a72ddee9d011763b3c7f5efe..459e9e2c926cc923930898ded66808a10d81e876 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -54,7 +54,7 @@ function ostatus_subscribe_content(App $a)
                $api = $contact['baseurl'] . '/api/';
 
                // Fetching friends
-               $curlResult = DI::httpRequest()->curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+               $curlResult = DI::httpRequest()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
                if (!$curlResult->isSuccess()) {
                        DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 0e80d971a66ecd3ca55660e451c1c076caddacf6..a1faab6efb6d07c82bc5e49d5f3bdc8bfbfbc910 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -28,6 +28,7 @@ use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
 
@@ -84,7 +85,7 @@ function parse_url_content(App $a)
        // Check if the URL is an image, video or audio file. If so format
        // the URL with the corresponding BBCode media tag
        // Fetch the header of the URL
-       $curlResponse = DI::httpRequest()->curl($url, false, ['novalidate' => true, 'nobody' => true]);
+       $curlResponse = DI::httpRequest()->get($url, false, ['novalidate' => true, 'nobody' => true]);
 
        if ($curlResponse->isSuccess()) {
                // Convert the header fields into an array

diff --git a/mod/redir.php b/mod/redir.php
index 4069518cddb5ad8163a2cb00e315271f3b981104..b2f76738bee74f020673e9a2a4bd69db960e83bd 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -170,7 +170,7 @@ function redir_magic($a, $cid, $url)
        }
 
        // Test for magic auth on the target system
-       $serverret = DI::httpRequest()->curl($basepath . '/magic');
+       $serverret = DI::httpRequest()->get($basepath . '/magic');
        if ($serverret->isSuccess()) {
                $separator = strpos($target_url, '?') ? '&' : '?';
                $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 036bc4a2706a4d39f12c6dff763eb4a0082b7e67..bf208a103608a95ed44e59ef8f299e59c9739c0a 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -485,7 +485,7 @@ class BBCode
                                        continue;
                                }
 
-                               $curlResult = DI::httpRequest()->curl($mtch[1], true);
+                               $curlResult = DI::httpRequest()->get($mtch[1], true);
                                if (!$curlResult->isSuccess()) {
                                        continue;
                                }

diff --git a/src/Core/Search.php b/src/Core/Search.php
index 768a0bf27570366298a750e2d865cb9a2fd54510..c5c6ca08c24aac01726fede4f7468e1af4d6ce95 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -284,7 +284,7 @@ class Search
                        $return = GContact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpRequest()->curl(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
+                       $curlResult = DI::httpRequest()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), false, ['accept_content' => 'application/json']);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index dabc907f89ce84895094e1f50a667576e9f90490..109f5d54b3b41a519f9954b595ad3c92261fe1da 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -844,7 +844,7 @@ class GContact
                        return false;
                }
 
-               $curlResult = DI::httpRequest()->curl($gserver['noscrape'] . '/' . $data['nick']);
+               $curlResult = DI::httpRequest()->get($gserver['noscrape'] . '/' . $data['nick']);
 
                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                        $noscrape = json_decode($curlResult->getBody(), true);
@@ -926,7 +926,7 @@ class GContact
        private static function updateFromFeed(array $data)
        {
                // Search for the newest entry in the feed
-               $curlResult = DI::httpRequest()->curl($data['poll']);
+               $curlResult = DI::httpRequest()->get($data['poll']);
                if (!$curlResult->isSuccess()) {
                        $fields = ['failed' => true, 'last_failure' => DateTimeFormat::utcNow()];
                        DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
@@ -1204,7 +1204,7 @@ class GContact
 
                $url = $server . '/main/statistics';
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
                if (!$curlResult->isSuccess()) {
                        return false;
                }

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 76082fe1ff9754a73ecc599e54dd47d758781f3f..ae4332511d50ff00debbe9eb8104f57890d3f2ea 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -309,7 +309,7 @@ class GServer
 
                // When a nodeinfo is present, we don't need to dig further
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->curl($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
+               $curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', false, ['timeout' => $xrd_timeout]);
                if ($curlResult->isTimeout()) {
                        self::setFailure($url);
                        return false;
@@ -342,7 +342,7 @@ class GServer
                                        $basedata = ['detection-method' => self::DETECT_MANUAL];
                                }
 
-                               $curlResult = DI::httpRequest()->curl($baseurl, false, ['timeout' => $xrd_timeout]);
+                               $curlResult = DI::httpRequest()->get($baseurl, false, ['timeout' => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
                                        $basedata = self::analyseRootHeader($curlResult, $basedata);
                                        $basedata = self::analyseRootBody($curlResult, $basedata, $baseurl);
@@ -498,7 +498,7 @@ class GServer
        {
                Logger::info('Discover relay data', ['server' => $server_url]);
 
-               $curlResult = DI::httpRequest()->curl($server_url . '/.well-known/x-social-relay');
+               $curlResult = DI::httpRequest()->get($server_url . '/.well-known/x-social-relay');
                if (!$curlResult->isSuccess()) {
                        return;
                }
@@ -579,7 +579,7 @@ class GServer
         */
        private static function fetchStatistics(string $url)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/statistics.json');
+               $curlResult = DI::httpRequest()->get($url . '/statistics.json');
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -689,7 +689,7 @@ class GServer
         */
        private static function parseNodeinfo1(string $nodeinfo_url)
        {
-               $curlResult = DI::httpRequest()->curl($nodeinfo_url);
+               $curlResult = DI::httpRequest()->get($nodeinfo_url);
 
                if (!$curlResult->isSuccess()) {
                        return [];
@@ -766,7 +766,7 @@ class GServer
         */
        private static function parseNodeinfo2(string $nodeinfo_url)
        {
-               $curlResult = DI::httpRequest()->curl($nodeinfo_url);
+               $curlResult = DI::httpRequest()->get($nodeinfo_url);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -843,7 +843,7 @@ class GServer
         */
        private static function fetchSiteinfo(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/siteinfo.json');
+               $curlResult = DI::httpRequest()->get($url . '/siteinfo.json');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -912,7 +912,7 @@ class GServer
        private static function validHostMeta(string $url)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->curl($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
+               $curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', false, ['timeout' => $xrd_timeout]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -1008,7 +1008,7 @@ class GServer
        {
                $serverdata['poco'] = '';
 
-               $curlResult = DI::httpRequest()->curl($url . '/poco');
+               $curlResult = DI::httpRequest()->get($url . '/poco');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1038,7 +1038,7 @@ class GServer
         */
        public static function checkMastodonDirectory(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/api/v1/directory?limit=1');
+               $curlResult = DI::httpRequest()->get($url . '/api/v1/directory?limit=1');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1065,7 +1065,7 @@ class GServer
         */
        private static function detectNextcloud(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/status.php');
+               $curlResult = DI::httpRequest()->get($url . '/status.php');
 
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
@@ -1099,7 +1099,7 @@ class GServer
         */
        private static function detectMastodonAlikes(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/api/v1/instance');
+               $curlResult = DI::httpRequest()->get($url . '/api/v1/instance');
 
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
@@ -1165,7 +1165,7 @@ class GServer
         */
        private static function detectHubzilla(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/api/statusnet/config.json');
+               $curlResult = DI::httpRequest()->get($url . '/api/statusnet/config.json');
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -1263,7 +1263,7 @@ class GServer
        private static function detectGNUSocial(string $url, array $serverdata)
        {
                // Test for GNU Social
-               $curlResult = DI::httpRequest()->curl($url . '/api/gnusocial/version.json');
+               $curlResult = DI::httpRequest()->get($url . '/api/gnusocial/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
                        $serverdata['platform'] = 'gnusocial';
@@ -1281,7 +1281,7 @@ class GServer
                }
 
                // Test for Statusnet
-               $curlResult = DI::httpRequest()->curl($url . '/api/statusnet/version.json');
+               $curlResult = DI::httpRequest()->get($url . '/api/statusnet/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
 
@@ -1317,9 +1317,9 @@ class GServer
         */
        private static function detectFriendica(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->curl($url . '/friendica/json');
+               $curlResult = DI::httpRequest()->get($url . '/friendica/json');
                if (!$curlResult->isSuccess()) {
-                       $curlResult = DI::httpRequest()->curl($url . '/friendika/json');
+                       $curlResult = DI::httpRequest()->get($url . '/friendika/json');
                        $friendika = true;
                        $platform = 'Friendika';
                } else {
@@ -1652,7 +1652,7 @@ class GServer
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
                        $header = ['Authorization: Bearer '.$accesstoken];
-                       $curlResult = DI::httpRequest()->curl($api, false, ['headers' => $header]);
+                       $curlResult = DI::httpRequest()->get($api, false, ['headers' => $header]);
 
                        if ($curlResult->isSuccess()) {
                                $servers = json_decode($curlResult->getBody(), true);

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a10711db2a1c58c044f8e089214828dda00d876d..7d984a8ce68e3ee7050025bd3cb808b9f6235627 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -420,7 +420,7 @@ class Photo
 
                $filename = basename($image_url);
                if (!empty($image_url)) {
-                       $ret = DI::httpRequest()->curl($image_url, true);
+                       $ret = DI::httpRequest()->get($image_url, true);
                        $img_str = $ret->getBody();
                        $type = $ret->getContentType();
                } else {

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index d32940ae67670d88845ca5c739a5a0f935f8ad2a..0cff8ba287f0923f56657ccb3ef39a0c6d9d0fd5 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -737,7 +737,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = DI::httpRequest()->curl($basepath . '/magic');
+                       $serverret = DI::httpRequest()->get($basepath . '/magic');
                        if ($serverret->isSuccess()) {
                                Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
                                System::externalRedirect($magic_path);

diff --git a/src/Model/User.php b/src/Model/User.php
index 9980c48d5aeeaaa2af4d5455da6305e343b2763d..78ae95804122d062a1263163936ca6a362314c1d 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -823,7 +823,7 @@ class User
                        $photo_failure = false;
 
                        $filename = basename($photo);
-                       $curlResult = DI::httpRequest()->curl($photo, true);
+                       $curlResult = DI::httpRequest()->get($photo, true);
                        if ($curlResult->isSuccess()) {
                                $img_str = $curlResult->getBody();
                                $type = $curlResult->getContentType();

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index ad84bb6ab62fa67105125d077a8c96eac837cc0b..a130c483939c30814fbb048198207c407b337fe0 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -246,7 +246,7 @@ class Summary extends BaseAdmin
        private static function checkSelfHostMeta()
        {
                // Fetch the host-meta to check if this really is a vital server
-               return DI::httpRequest()->curl(DI::baseUrl()->get() . '/.well-known/host-meta')->isSuccess();
+               return DI::httpRequest()->get(DI::baseUrl()->get() . '/.well-known/host-meta')->isSuccess();
        }
 
 }

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index a025617d8d8c4534304ac762b0955f7907b26efd..95b742bb301b9ec3c7f1621779f4415aede7aaa1 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -100,7 +100,7 @@ class Magic extends BaseModule
                                );
 
                                // Try to get an authentication token from the other instance.
-                               $curlResult = DI::httpRequest()->curl($basepath . '/owa', false, ['headers' => $headers]);
+                               $curlResult = DI::httpRequest()->get($basepath . '/owa', false, ['headers' => $headers]);
 
                                if ($curlResult->isSuccess()) {
                                        $j = json_decode($curlResult->getBody(), true);

diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php
index 3e5091e076f07be7a9afb82a13d5ee2fc2123968..f9279fa6028473711a543e4c12ead24cab0e484b 100644 (file)
--- a/src/Network/HTTPRequest.php
+++ b/src/Network/HTTPRequest.php
@@ -71,7 +71,7 @@ class HTTPRequest
         * @return CurlResult
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function curl(string $url, bool $binary = false, array $opts = [], int &$redirects = 0)
+       public function get(string $url, bool $binary = false, array $opts = [], int &$redirects = 0)
        {
                $stamp1 = microtime(true);
 
@@ -206,7 +206,7 @@ class HTTPRequest
                        $redirects++;
                        $this->logger->notice('Curl redirect.', ['url' => $url, 'to' => $curlResponse->getRedirectUrl()]);
                        @curl_close($ch);
-                       return $this->curl($curlResponse->getRedirectUrl(), $binary, $opts, $redirects);
+                       return $this->get($curlResponse->getRedirectUrl(), $binary, $opts, $redirects);
                }
 
                @curl_close($ch);
@@ -486,7 +486,7 @@ class HTTPRequest
         */
        public function fetchUrlFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
        {
-               return $this->curl(
+               return $this->get(
                        $url,
                        $binary,
                        [

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 01dc284081acc3440dcf323de37db739cfc2e85c..c41006b1289bc35f98f208f8a0cec90a9ebcdafb 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -166,7 +166,7 @@ class Probe
                Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
                $xrd = null;
 
-               $curlResult = DI::httpRequest()->curl($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+               $curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
                $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                if ($curlResult->isSuccess()) {
                        $xml = $curlResult->getBody();
@@ -183,7 +183,7 @@ class Probe
                }
 
                if (!is_object($xrd) && !empty($url)) {
-                       $curlResult = DI::httpRequest()->curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+                       $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
                        $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                        if ($curlResult->isTimeout()) {
                                Logger::info('Probing timeout', ['url' => $url]);
@@ -427,7 +427,7 @@ class Probe
         */
        private static function getHideStatus($url)
        {
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -841,7 +841,7 @@ class Probe
 
        public static function pollZot($url, $data)
        {
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
                if ($curlResult->isTimeout()) {
                        return $data;
                }
@@ -938,7 +938,7 @@ class Probe
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-               $curlResult = DI::httpRequest()->curl($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+               $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1007,7 +1007,7 @@ class Probe
         */
        private static function pollNoscrape($noscrape_url, $data)
        {
-               $curlResult = DI::httpRequest()->curl($noscrape_url);
+               $curlResult = DI::httpRequest()->get($noscrape_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1265,7 +1265,7 @@ class Probe
         */
        private static function pollHcard($hcard_url, $data, $dfrn = false)
        {
-               $curlResult = DI::httpRequest()->curl($hcard_url);
+               $curlResult = DI::httpRequest()->get($hcard_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1519,7 +1519,7 @@ class Probe
                                                        $pubkey = substr($pubkey, 5);
                                                }
                                        } elseif (Strings::normaliseLink($pubkey) == 'http://') {
-                                               $curlResult = DI::httpRequest()->curl($pubkey);
+                                               $curlResult = DI::httpRequest()->get($pubkey);
                                                if ($curlResult->isTimeout()) {
                                                        self::$istimeout = true;
                                                        return $short ? false : [];
@@ -1552,7 +1552,7 @@ class Probe
                }
 
                // Fetch all additional data from the feed
-               $curlResult = DI::httpRequest()->curl($data["poll"]);
+               $curlResult = DI::httpRequest()->get($data["poll"]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1604,7 +1604,7 @@ class Probe
         */
        private static function pumpioProfileData($profile_link)
        {
-               $curlResult = DI::httpRequest()->curl($profile_link);
+               $curlResult = DI::httpRequest()->get($profile_link);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -1835,7 +1835,7 @@ class Probe
         */
        private static function feed($url, $probe = true)
        {
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index f417080114af4de4dc35c9001d4211035ac56124..6b29eabce513f0f0f5092e5c7f6a7a1bdf8b71bb 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -22,6 +22,7 @@
 namespace Friendica\Protocol;
 
 use Friendica\Core\Protocol;
+use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
 use Friendica\Util\HTTPSignature;
@@ -92,7 +93,7 @@ class ActivityPub
                        return HTTPSignature::fetch($url, $uid);
                }
 
-               $curlResult = DI::httpRequest()->curl($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
+               $curlResult = DI::httpRequest()->get($url, false, ['accept_content' => 'application/activity+json, application/ld+json']);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return false;
                }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7c87ee0b258e2422d878b031ad5331cbc4bbfc0a..8190806a044b109d9c613971ff32d0b8e020a075 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1194,7 +1194,7 @@ class DFRN
 
                Logger::log('dfrn_deliver: ' . $url);
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if ($curlResult->isTimeout()) {
                        return -2; // timed out

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index a9ee2277e33a158a7bdd8668dae5e2435329bff9..9c87f367adb7a559a656d3a81d1a447fccc7e804 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -755,7 +755,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = DI::httpRequest()->curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -784,7 +784,7 @@ class OStatus
                                        }
                                }
                                if ($file != '') {
-                                       $conversation_atom = DI::httpRequest()->curl($attribute['href']);
+                                       $conversation_atom = DI::httpRequest()->get($attribute['href']);
 
                                        if ($conversation_atom->isSuccess()) {
                                                $xml = $conversation_atom->getBody();
@@ -901,7 +901,7 @@ class OStatus
                        return;
                }
 
-               $curlResult = DI::httpRequest()->curl($self);
+               $curlResult = DI::httpRequest()->get($self);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -948,7 +948,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = DI::httpRequest()->curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
+               $curlResult = DI::httpRequest()->get($related, false, ['accept_content' => 'application/atom+xml, text/html']);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -979,7 +979,7 @@ class OStatus
                                        }
                                }
                                if ($atom_file != '') {
-                                       $curlResult = DI::httpRequest()->curl($atom_file);
+                                       $curlResult = DI::httpRequest()->get($atom_file);
 
                                        if ($curlResult->isSuccess()) {
                                                Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
@@ -991,7 +991,7 @@ class OStatus
 
                // Workaround for older GNU Social servers
                if (($xml == '') && strstr($related, '/notice/')) {
-                       $curlResult = DI::httpRequest()->curl(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
+                       $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
 
                        if ($curlResult->isSuccess()) {
                                Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
@@ -1002,7 +1002,7 @@ class OStatus
                // Even more worse workaround for GNU Social ;-)
                if ($xml == '') {
                        $related_guess = self::convertHref($related_uri);
-                       $curlResult = DI::httpRequest()->curl(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
+                       $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
 
                        if ($curlResult->isSuccess()) {
                                Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index f118ffa9490c9145ccc856820517640041d58f6e..5216e39370c626e616363dcfd3957484c2ffcdf0 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -30,7 +30,6 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
-use Friendica\Network\HTTPRequest;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -251,7 +250,7 @@ class PortableContact
         */
        private static function fetchServerlist($poco)
        {
-               $curlResult = DI::httpRequest()->curl($poco . "/@server");
+               $curlResult = DI::httpRequest()->get($poco . "/@server");
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -291,7 +290,7 @@ class PortableContact
 
                Logger::info("Fetch all users from the server " . $server["url"]);
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                        $data = json_decode($curlResult->getBody(), true);
@@ -314,7 +313,7 @@ class PortableContact
 
                                $success = false;
 
-                               $curlResult = DI::httpRequest()->curl($url);
+                               $curlResult = DI::httpRequest()->get($url);
 
                                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                                        Logger::info("Fetch all global contacts from the server " . $server["nurl"]);
@@ -372,7 +371,7 @@ class PortableContact
                                // Fetch all contacts from a given user from the other server
                                $url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,contactType,generation';
 
-                               $curlResult = DI::httpRequest()->curl($url);
+                               $curlResult = DI::httpRequest()->get($url);
 
                                if ($curlResult->isSuccess()) {
                                        $data = json_decode($curlResult->getBody(), true);

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 59338608274f693179abd92385e0706d89231dd7..25eb3cc62e41ca449dde8f222d73ce7dfab89145 100644 (file)
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -181,7 +181,7 @@ class ExAuth
 
                $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if (!$curlResult->isSuccess()) {
                        return false;

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 84a11b8ec0c82069bf48561e1c855233b1f862b7..89da59ba26012911842589abe1e8768a4130a63a 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -442,7 +442,7 @@ class HTTPSignature
                $curl_opts = $opts;
                $curl_opts['header'] = $headers;
 
-               $curlResult = DI::httpRequest()->curl($request, false, $curl_opts);
+               $curlResult = DI::httpRequest()->get($request, false, $curl_opts);
                $return_code = $curlResult->getReturnCode();
 
                Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG);

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index cf38ffd7bec5172989efb9f6c523a328765d05bb..01ad79d4f114128d092c1eaec32d3853d2a59427 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -27,6 +27,7 @@ use Friendica\Content\OEmbed;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
  * Get information about a given URL
@@ -159,7 +160,7 @@ class ParseUrl
                        return $siteinfo;
                }
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
                if (!$curlResult->isSuccess()) {
                        return $siteinfo;
                }

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index ed6bfacb35d7a0414d9129ea26c2198c69bce336..fbd1ab4e59f9fd608f2b2330ac087459ec13c3f5 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -290,7 +290,7 @@ class OnePoll
                        . '&type=data&last_update=' . $last_update
                        . '&perm=' . $perm;
 
-               $curlResult = DI::httpRequest()->curl($url);
+               $curlResult = DI::httpRequest()->get($url);
 
                if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
                        // set the last-update so we don't keep polling
@@ -443,7 +443,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
+               $curlResult = DI::httpRequest()->get($contact['poll'], false, ['cookiejar' => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {