forked from friendica/friendica-addons
Move internal recursion-counter to the end of all cur/fetchUrl parameters
This commit is contained in:
parent
f6c8476228
commit
8562422ee2
|
@ -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\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
|
||||||
preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
|
preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
|
||||||
foreach (array_merge($matches1[3], $matches2[1]) as $url) {
|
foreach (array_merge($matches1[3], $matches2[1]) as $url) {
|
||||||
$redirects = 0;
|
|
||||||
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
|
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
|
||||||
$curlResult = Network::fetchUrlFull($url, true, $redirects, 0, null, $cookiejar);
|
$curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
|
||||||
$attachments[$url] = [
|
$attachments[$url] = [
|
||||||
'data' => $curlResult->getBody(),
|
'data' => $curlResult->getBody(),
|
||||||
'guid' => hash("crc32", $url),
|
'guid' => hash("crc32", $url),
|
||||||
|
|
|
@ -1629,7 +1629,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
|
||||||
|
|
||||||
function pumpio_reachable($url)
|
function pumpio_reachable($url)
|
||||||
{
|
{
|
||||||
return Network::curl($url, false, $redirects, ['timeout'=>10])->isSuccess();
|
return Network::curl($url, false, ['timeout' => 10])->isSuccess();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1483,7 +1483,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
|
||||||
} 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 = Network::fetchUrl($expanded_url, true, $redirects, 4);
|
$img_str = Network::fetchUrl($expanded_url, true, 4);
|
||||||
|
|
||||||
$tempfile = tempnam(get_temppath(), "cache");
|
$tempfile = tempnam(get_temppath(), "cache");
|
||||||
file_put_contents($tempfile, $img_str);
|
file_put_contents($tempfile, $img_str);
|
||||||
|
|
|
@ -1184,7 +1184,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
|
||||||
} elseif ($oembed_data->type != 'link') {
|
} elseif ($oembed_data->type != 'link') {
|
||||||
$body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
|
$body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
|
||||||
} else {
|
} else {
|
||||||
$img_str = Network::fetchUrl($final_url, true, $redirects, 4);
|
$img_str = Network::fetchUrl($final_url, true, 4);
|
||||||
|
|
||||||
$tempfile = tempnam(get_temppath(), 'cache');
|
$tempfile = tempnam(get_temppath(), 'cache');
|
||||||
file_put_contents($tempfile, $img_str);
|
file_put_contents($tempfile, $img_str);
|
||||||
|
|
Loading…
Reference in a new issue