Merge pull request #25625 from nextcloud/enh/psalm/substr
Check substr results
This commit is contained in:
commit
5faa34abb1
|
@ -202,7 +202,7 @@ class EmailProvider extends AbstractProvider {
|
|||
|
||||
$organizerEMail = substr($organizer->getValue(), 7);
|
||||
|
||||
if (!$this->mailer->validateMailAddress($organizerEMail)) {
|
||||
if ($organizerEMail === false || !$this->mailer->validateMailAddress($organizerEMail)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -178,7 +178,7 @@ class IMipPlugin extends SabreIMipPlugin {
|
|||
// Strip off mailto:
|
||||
$sender = substr($iTipMessage->sender, 7);
|
||||
$recipient = substr($iTipMessage->recipient, 7);
|
||||
if (!$this->mailer->validateMailAddress($recipient)) {
|
||||
if ($recipient === false || !$this->mailer->validateMailAddress($recipient)) {
|
||||
// Nothing to send if the recipient doesn't have a valid email address
|
||||
$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
|
||||
return;
|
||||
|
@ -239,9 +239,12 @@ class IMipPlugin extends SabreIMipPlugin {
|
|||
|
||||
$message = $this->mailer->createMessage()
|
||||
->setFrom([$fromEMail => $fromName])
|
||||
->setReplyTo([$sender => $senderName])
|
||||
->setTo([$recipient => $recipientName]);
|
||||
|
||||
if ($sender !== false) {
|
||||
$message->setReplyTo([$sender => $senderName]);
|
||||
}
|
||||
|
||||
$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
|
||||
$template->addHeader();
|
||||
|
||||
|
|
Loading…
Reference in New Issue