clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #797 from MrPetovan/bug/6386-fix-fatal-errors 

[mailstream] Fix missing method App->get_curl_content_type()
This commit is contained in:
Tobias Diekershoff 2019-01-24 07:10:52 +01:00 committed by GitHub
parent 74f89673cb 47ab2d14e1
commit e2d4846fb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mailstream/mailstream.php
View File

@ -154,17 +154,19 @@ function mailstream_do_images($a, &$item, &$attachments) {
return; return;
} }
$attachments = []; $attachments = [];
$baseurl = $a->getBaseURL();
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; $redirects = 0;
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
$curlResult = Network::fetchUrlFull($url, true, $redirects, 0, null, $cookiejar);
$attachments[$url] = [ $attachments[$url] = [
'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar), 'data' => $curlResult->getBody(),
'guid' => hash("crc32", $url), 'guid' => hash("crc32", $url),
'filename' => basename($url), 'filename' => basename($url),
'type' => $a->get_curl_content_type()]; 'type' => $curlResult->getContentType()
];
if (strlen($attachments[$url]['data'])) { if (strlen($attachments[$url]['data'])) {
$item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']); $item['body'] = str_replace($url, 'cid:' . $attachments[$url]['guid'], $item['body']);
continue; continue;