friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-09 18:08:49 +00:00
Code Issues Releases Wiki Activity

Support for cleared boot.php

Browse source
This commit is contained in:
Michael 2021-11-04 20:32:16 +00:00
parent 95622a0f0d
commit 6a349e7fd9
15 changed files with 38 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mailstream/mailstream.php
View file

@ -10,6 +10,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
@ -204,7 +205,7 @@ function mailstream_do_images(&$item, &$attachments)
if (!$components) {
continue;
}
$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
$curlResult = DI::httpClient()->fetchFull($url, 0, '', $cookiejar);
$attachments[$url] = [
'data' => $curlResult->getBody(),

6
mailstream/phpmailer/class.phpmailer.php
View file

@ -17,6 +17,8 @@
* FITNESS FOR A PARTICULAR PURPOSE.
*/
use Friendica\Core\System;
/**
* PHPMailer - PHP email creation and transport class.
* @package PHPMailer
@ -2350,11 +2352,11 @@ class PHPMailer
throw new phpmailerException($this->lang('extension_missing') . 'openssl');
}
// @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
$file = tempnam(get_temppath(), 'mail');
$file = tempnam(System::getTempPath(), 'mail');
if (false === file_put_contents($file, $body)) {
throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
}
$signed = tempnam(get_temppath(), 'signed');
$signed = tempnam(System::getTempPath(), 'signed');
//Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
if (empty($this->sign_extracerts_file)) {
$sign = @openssl_pkcs7_sign(