friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-11 10:58:48 +00:00
Code Issues Releases Wiki Activity

Move internal recursion-counter to the end of all cur/fetchUrl parameters

Browse source
This commit is contained in:
Philipp Holzer 2019-06-10 14:34:53 +02:00
parent f6c8476228
commit 8562422ee2
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mailstream/mailstream.php
View file

@ -157,9 +157,8 @@ function mailstream_do_images($a, &$item, &$attachments) {
preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
foreach (array_merge($matches1[3], $matches2[1]) as $url) {
$redirects = 0;
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
$curlResult = Network::fetchUrlFull($url, true, $redirects, 0, null, $cookiejar);
$curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
$attachments[$url] = [
'data' => $curlResult->getBody(),
'guid' => hash("crc32", $url),