Rename "fetchUrl" and "fetchUrlFull" to "fetch" and "fetchFull"

This commit is contained in:
nupplaPhil 2020-03-04 22:35:39 +01:00 committed by Hypolite Petovan
parent 72c24efe5b
commit 19b2c8d833
9 changed files with 14 additions and 16 deletions

View file

@ -154,7 +154,7 @@ function statusnet_settings_post(App $a, $post)
foreach ($globalsn as $asn) {
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
$apibase = $asn['apiurl'];
$c = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml');
$c = DI::httpRequest()->fetch($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']);
@ -172,7 +172,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 = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml');
$c = DI::httpRequest()->fetch($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']);
@ -182,7 +182,7 @@ function statusnet_settings_post(App $a, $post)
} else {
// the API path is not correct, maybe missing trailing / ?
$apibase = $apibase . '/';
$c = DI::httpRequest()->fetchUrl($apibase . 'statusnet/version.xml');
$c = DI::httpRequest()->fetch($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']);
@ -612,7 +612,7 @@ function statusnet_post_hook(App $a, &$b)
}
if ($image != "") {
$img_str = DI::httpRequest()->fetchUrl($image);
$img_str = DI::httpRequest()->fetch($image);
$tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);
$postdata = ["status" => $msg, "media[]" => $tempfile];
@ -1473,7 +1473,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 = DI::httpRequest()->fetchUrl($expanded_url, true, 4);
$img_str = DI::httpRequest()->fetch($expanded_url, true, 4);
$tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);