Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-11-22 09:33:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #699 from annando/issue-4814

Browse source 
Issue 4814: Unify the temp path location
This commit is contained in:
Tobias Diekershoff 2018-08-11 07:51:36 +02:00 committed by GitHub
commit 9a48452e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
diaspora/Diaspora_Connection.php
View file

@ -29,7 +29,7 @@ class Diaspora_Connection {
$this->setPassword($password); $this->setPassword($password);
} }
$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies'); $this->cookiejar = tempnam(get_temppath(), 'cookies');
return $this; return $this;
} }

2
diaspora/diasphp.php
View file

@ -11,7 +11,7 @@ class Diasphp {
$this->token_regex = '/content="(.*?)" name="csrf-token/'; $this->token_regex = '/content="(.*?)" name="csrf-token/';
$this->pod = $pod; $this->pod = $pod;
$this->cookiejar = tempnam(sys_get_temp_dir(), 'cookies'); $this->cookiejar = tempnam(get_temppath(), 'cookies');
} }
function __destruct() { function __destruct() {

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

@ -2350,11 +2350,11 @@ class PHPMailer
throw new phpmailerException($this->lang('extension_missing') . 'openssl'); 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 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
$file = tempnam(sys_get_temp_dir(), 'mail'); $file = tempnam(get_temppath(), 'mail');
if (false === file_put_contents($file, $body)) { if (false === file_put_contents($file, $body)) {
throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
} }
$signed = tempnam(sys_get_temp_dir(), 'signed'); $signed = tempnam(get_temppath(), 'signed');
//Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
if (empty($this->sign_extracerts_file)) { if (empty($this->sign_extracerts_file)) {
$sign = @openssl_pkcs7_sign( $sign = @openssl_pkcs7_sign(