Move post/curl/fetchUrl/fetchUrlFull to own class "Network\HTTPRequest"

diff --git a/blogger/blogger.php b/blogger/blogger.php
index e0b5f5352ea0102579bae05051f83fff58bc423d..f17f1b1e9df58e7d8b4675288ee3367f4f2cc35a 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -11,7 +11,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\XML;
 
 function blogger_install()
@@ -225,7 +225,7 @@ EOT;
                Logger::log('blogger: data: ' . $xml, Logger::DATA);
 
                if ($bl_blog !== 'test') {
-                       $x = Network::post($bl_blog, $xml)->getBody();
+                       $x = HTTPRequest::post($bl_blog, $xml)->getBody();
                }
 
                Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);

diff --git a/curweather/curweather.php b/curweather/curweather.php
index e4b6119f905b7ee2838ec66dc758cb118cf7b1b5..017a67fa9c9897a9d6c8c5329786ccf91de366a8 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -15,7 +15,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function curweather_install()
@@ -49,7 +49,7 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
        }
 
        try {
-               $res = new SimpleXMLElement(Network::fetchUrl($url));
+               $res = new SimpleXMLElement(HTTPRequest::fetchUrl($url));
        } catch (Exception $e) {
                if (empty($_SESSION['curweather_notice_shown'])) {
                        info(DI::l10n()->t('Error fetching weather data. Error was: '.$e->getMessage()));

diff --git a/discourse/discourse.php b/discourse/discourse.php
index f42cb04c1a868e00895004d31b93cb11ee1db6f7..06b8667763f517afb946cd68b0e1cbc4c37486a7 100644 (file)
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -7,18 +7,19 @@
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  *
  */
+
 use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Content\Text\Markdown;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
-Use Friendica\Util\DateTimeFormat;
 
 /* Todo:
  * - Obtaining API tokens to be able to read non public posts as well
@@ -114,7 +115,7 @@ function discourse_email_getmessage(App $a, &$message)
 function discourse_fetch_post($host, $topic, $pid)
 {
        $url = $host . '/t/' . $topic . '/' . $pid . '.json';
-       $curlResult = Network::curl($url);
+       $curlResult = HTTPRequest::curl($url);
        if (!$curlResult->isSuccess()) {
                Logger::info('No success', ['url' => $url]);
                return false;
@@ -151,7 +152,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host)
 {
        $hostaddr = 'https://' . $host;
        $url = $hostaddr . '/posts/' . $post . '.json';
-       $curlResult = Network::curl($url);
+       $curlResult = HTTPRequest::curl($url);
        if (!$curlResult->isSuccess()) {
                return false;
        }

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 3d4b42ad8ec706205c45b634e2ab5cb01e8e9bea..bb45dd14e46cf5ebfc1cc356c4ed0fbce94071da 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -15,8 +15,8 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Tag;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function dwpost_install()
@@ -231,7 +231,7 @@ EOT;
                Logger::log('dwpost: data: ' . $xml, Logger::DATA);
 
                if ($dw_blog !== 'test') {
-                       $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
+                       $x = HTTPRequest::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
                }
 
                Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 7a7a6d9ade1c4b8fa9f7059f81c6bf308cc73a14..a36cc1149ab5e64b6a24b18c39d3b47f5bc77505 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,11 +5,12 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\Strings;
 
 function geocoordinates_install()
@@ -52,7 +53,7 @@ function geocoordinates_resolve_item(&$item)
                return;
        }
 
-       $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+       $s = HTTPRequest::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language);
 
        if (!$s) {
                Logger::log("API could not be queried", Logger::DEBUG);

diff --git a/geonames/geonames.php b/geonames/geonames.php
index e6962d764efff4b52896fed5e4c6c7e8dfb701b0..9a01980e7f245ad4b58b7fabaec1869f8c8b0f2a 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -11,8 +11,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function geonames_install()
@@ -78,7 +78,7 @@ function geonames_post_hook(App $a, array &$item)
 
        /* OK, we're allowed to do our stuff. */
 
-       $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+       $s = HTTPRequest::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
        if (!$s) {
                return;

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 00479e3e0c2afdd4e87abab553806aa0dd7d7b13..1c6b9509f1623bcd3e8f22f259e7d0ddad166c84 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\Tag;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function ijpost_install()
@@ -229,7 +229,7 @@ EOT;
                Logger::log('ijpost: data: ' . $xml, Logger::DATA);
 
                if ($ij_blog !== 'test') {
-                       $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
+                       $x = HTTPRequest::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
                }
                Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
        }

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index ad4d4901432c38a70dc50ac5b4fb833864654362..908870bb0faf3ced862fbba9c697d9dad6de42ac 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -69,7 +69,7 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 
 function jappixmini_install()
 {
@@ -660,7 +660,7 @@ function jappixmini_cron(App $a, $d)
 
                        try {
                                // send request
-                               $answer_json = Network::fetchUrl($url);
+                               $answer_json = HTTPRequest::fetchUrl($url);
 
                                // parse answer
                                $answer = json_decode($answer_json);

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index 8bb6f526bd75d9c26df8e575a21c82fc7cde3bdf..142661a69989adfdf65b644fec7d477d1f423568 100644 (file)
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -5,10 +5,11 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 
 function leistungsschutzrecht_install() {
        Hook::register('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron');
@@ -79,7 +80,7 @@ function leistungsschutzrecht_fetchsites()
 {
        // This list works - but question is how current it is
        $url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt";
-       $sitelist = Network::fetchUrl($url);
+       $sitelist = HTTPRequest::fetchUrl($url);
        $siteurls = explode(',', $sitelist);
 
        $whitelist = ['tagesschau.de', 'heute.de', 'wdr.de'];

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 01a9d9420c6ed3cadd684727cb64008aa5a99a8e..23442da200ccaee3026e07b1e89a66639baf69dd 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -12,7 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 
 function libertree_install()
 {
@@ -243,7 +243,7 @@ function libertree_send(&$a,&$b) {
                //      'token' => $ltree_api_token
                ];
 
-               $result = Network::post($ltree_blog, $params)->getBody();
+               $result = HTTPRequest::post($ltree_blog, $params)->getBody();
                Logger::log('libertree: ' . $result);
        }
 }

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 5120612d094e112e23787fa1cc6346fd55908c4e..4420775a81ae5cac73e85b65b5575f181a061e60 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\Tag;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function ljpost_install() {
@@ -241,7 +241,7 @@ EOT;
                Logger::log('ljpost: data: ' . $xml, Logger::DATA);
 
                if ($lj_blog !== 'test') {
-                       $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
+                       $x = HTTPRequest::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
                }
                Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
        }

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 89e6cc0146aa81c0d0803d26a18ecd4da302760f..dbc9c4f08b75bf324349bce5e459a167c813d94c 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -12,9 +12,9 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Protocol\Activity;
-use Friendica\Util\Network;
 use Friendica\Model\Item;
+use Friendica\Network\HTTPRequest;
+use Friendica\Protocol\Activity;
 
 function mailstream_install() {
        Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
@@ -169,7 +169,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
                        continue;
                }
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-               $curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
+               $curlResult = HTTPRequest::fetchUrlFull($url, true, 0, '', $cookiejar);
                $attachments[$url] = [
                        'data' => $curlResult->getBody(),
                        'guid' => hash("crc32", $url),

diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index a6c95d340a42a7a049575674f7a37a6d1954a0e4..a0c06b97c56ab29eb82111bdc226e9bcf8fb9612 100644 (file)
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -15,7 +15,7 @@ use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function mastodoncustomemojis_install()
@@ -90,7 +90,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
        $api_url = $api_base_url . '/api/v1/custom_emojis';
 
-       $fetchResult = Network::fetchUrlFull($api_url);
+       $fetchResult = HTTPRequest::fetchUrlFull($api_url);
 
        if ($fetchResult->isSuccess()) {
                $emojis_array = json_decode($fetchResult->getBody(), true);

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 5df1c7d7d42db85428c9701d1c46e796dc08f2d0..370eb9104a15513f2e457c256c4049b006d1e3d9 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,13 +9,13 @@
  *
  */
 
-use Friendica\DI;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\ConfigFileLoader;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -132,7 +132,7 @@ function openstreetmap_get_coordinates($a, &$b)
        $j = DI::cache()->get($cachekey);
 
        if (is_null($j)) {
-               $curlResult = Network::curl($nomserver . $args);
+               $curlResult = HTTPRequest::curl($nomserver . $args);
                if ($curlResult->isSuccess()) {
                        $j = json_decode($curlResult->getBody(), true);
                        DI::cache()->set($cachekey, $j, Duration::MONTH);

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 567f64c8dedd2d291edd68ad379cd0c557304ac6..c58667b2e30da25dbc318010a4ad3470ebbec316 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -19,11 +19,11 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Network\HTTPRequest;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -1605,7 +1605,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 function pumpio_reachable($url)
 {
-       return Network::curl($url, false, ['timeout' => 10])->isSuccess();
+       return HTTPRequest::curl($url, false, ['timeout' => 10])->isSuccess();
 }
 
 /*

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 0fd1fd79fc1948dd7f5ba00e3268e8052f110921..49ba2e4524878a4591538b1fc547d04c8ae94483 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -55,6 +55,7 @@ use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Network\HTTPRequest;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -155,7 +156,7 @@ function statusnet_settings_post(App $a, $post)
                        foreach ($globalsn as $asn) {
                                if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
                                        $apibase = $asn['apiurl'];
-                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
+                                       $c = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
                                                DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
@@ -173,7 +174,7 @@ function statusnet_settings_post(App $a, $post)
                                //  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
                                //  resign quickly after this one try to fix the path ;-)
                                $apibase = $_POST['statusnet-baseapi'];
-                               $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
+                               $c = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml');
                                if (strlen($c) > 0) {
                                        //  ok the API path is correct, let's save the settings
                                        DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -183,7 +184,7 @@ function statusnet_settings_post(App $a, $post)
                                } else {
                                        //  the API path is not correct, maybe missing trailing / ?
                                        $apibase = $apibase . '/';
-                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
+                                       $c = HTTPRequest::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                //  ok the API path is now correct, let's save the settings
                                                DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -613,7 +614,7 @@ function statusnet_post_hook(App $a, &$b)
                }
 
                if ($image != "") {
-                       $img_str = Network::fetchUrl($image);
+                       $img_str = HTTPRequest::fetchUrl($image);
                        $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
                        $postdata = ["status" => $msg, "media[]" => $tempfile];
@@ -1474,7 +1475,7 @@ function statusnet_convertmsg(App $a, $body)
                        } elseif ($oembed_data->type != "link") {
                                $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
                        } else {
-                               $img_str = Network::fetchUrl($expanded_url, true, 4);
+                               $img_str = HTTPRequest::fetchUrl($expanded_url, true, 4);
 
                                $tempfile = tempnam(get_temppath(), "cache");
                                file_put_contents($tempfile, $img_str);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 948bb6be6275a577a0639e6b63d77b6a98eb4f78..85647dea667e294af0505d4cde1e93a5bf9947b0 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -85,6 +85,7 @@ use Friendica\Model\ItemContent;
 use Friendica\Model\ItemURI;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
+use Friendica\Network\HTTPRequest;
 use Friendica\Protocol\Activity;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
@@ -674,7 +675,7 @@ function twitter_post_hook(App $a, array &$b)
                                                continue;
                                        }
 
-                                       $img_str = Network::fetchUrl($image['url']);
+                                       $img_str = HTTPRequest::fetchUrl($image['url']);
 
                                        $tempfile = tempnam(get_temppath(), 'cache');
                                        file_put_contents($tempfile, $img_str);
@@ -1318,7 +1319,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
                        } elseif ($oembed_data->type != 'link') {
                                $replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
                        } else {
-                               $img_str = Network::fetchUrl($final_url, true, 4);
+                               $img_str = HTTPRequest::fetchUrl($final_url, true, 4);
 
                                $tempfile = tempnam(get_temppath(), 'cache');
                                file_put_contents($tempfile, $img_str);

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 4d32c7904bfdb49c57eaa28b5f9237034b64e670..0d860ef571290a9ef53ce0388b6d75f3e4480b6f 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -12,7 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Util\Network;
+use Friendica\Network\HTTPRequest;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -338,7 +338,7 @@ EOT;
                Logger::log('wppost: data: ' . $xml, Logger::DATA);
 
                if ($wp_blog !== 'test') {
-                       $x = Network::post($wp_blog, $xml)->getBody();
+                       $x = HTTPRequest::post($wp_blog, $xml)->getBody();
                }
                Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
        }