friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1032 from nupplaphil/task/psr7_remove_binary 

[various] Remove $binary flag for HTTPRequest
pull/1039/head
Michael Vogel 2020-10-18 21:19:32 +02:00 committed by GitHub
parent 2dc294df18 94b41e0859
commit 29586d3498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailstream/mailstream.php
View File

@ -155,7 +155,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
continue; continue;
} }
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
$curlResult = DI::httpRequest()->fetchFull($url, true, 0, '', $cookiejar); $curlResult = DI::httpRequest()->fetchFull($url, 0, '', $cookiejar);
$attachments[$url] = [ $attachments[$url] = [
'data' => $curlResult->getBody(), 'data' => $curlResult->getBody(),
'guid' => hash("crc32", $url), 'guid' => hash("crc32", $url),

2
pumpio/pumpio.php
View File

@ -1590,7 +1590,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
function pumpio_reachable($url) function pumpio_reachable($url)
{ {
return DI::httpRequest()->get($url, false, ['timeout' => 10])->isSuccess(); return DI::httpRequest()->get($url, ['timeout' => 10])->isSuccess();
} }
/* /*

2
statusnet/statusnet.php
View File

@ -1453,7 +1453,7 @@ function statusnet_convertmsg(App $a, $body)
} elseif ($oembed_data->type != "link") { } elseif ($oembed_data->type != "link") {
$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body); $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
} else { } else {
$img_str = DI::httpRequest()->fetch($expanded_url, true, 4); $img_str = DI::httpRequest()->fetch($expanded_url, 4);
$tempfile = tempnam(get_temppath(), "cache"); $tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);

2
twitter/twitter.php
View File

@ -1326,7 +1326,7 @@ function twitter_expand_entities($body, stdClass $status, $picture)
} elseif ($oembed_data->type != 'link') { } elseif ($oembed_data->type != 'link') {
$replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]'; $replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
} else { } else {
$img_str = DI::httpRequest()->fetch($final_url, true, 4); $img_str = DI::httpRequest()->fetch($final_url, 4);
$tempfile = tempnam(get_temppath(), 'cache'); $tempfile = tempnam(get_temppath(), 'cache');
file_put_contents($tempfile, $img_str); file_put_contents($tempfile, $img_str);