Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

further fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-09-30 00:16:58 +02:00
parent 152f2a39ea
commit 4b03cd91f5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Message/Mail/Smtp.php
View File

@ -172,7 +172,7 @@ class Smtp
if ($streamok) {
$socketContext = \stream_context_create($options);
$connection = \stream_socket_client($host . ':' . $port, $errno, $errstr, $timeout, \STREAM_CLIENT_CONNECT, $socketContext);
$connection = @\stream_socket_client($host . ':' . $port, $errno, $errstr, $timeout, \STREAM_CLIENT_CONNECT, $socketContext);
} else {
//Fall back to fsockopen which should work in more places, but is missing some features
$connection = \fsockopen($host, $port, $errno, $errstr, $timeout);
@ -313,11 +313,11 @@ class Smtp
return $this->sendCommand('Username', \base64_encode($response), 235);
case 'XOAUTH2':
//The OAuth instance must be set up prior to requesting auth.
if ($OAuth === null) {
if ($oauth === null) {
return false;
}
$oauth = $OAuth->getOauth64();
$oauth = $oauth->getOauth64();
if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
return false;
}

6
System/File/Ftp/Directory.php
View File

@ -419,7 +419,11 @@ class Directory extends FileAbstract implements DirectoryInterface
}
$tempName = \tempnam(\sys_get_temp_dir(), 'omsftp_');
$status = @\mkdir($tempName);
if ($tempName === false) {
return false;
}
$status = @\mkdir($tempName);
if ($status === false) {
return false;
}