mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25625 from nextcloud/enh/psalm/substr 

Check substr results
This commit is contained in:
Christoph Wurst 2021-02-15 12:17:57 +01:00 committed by GitHub
parent 65465b5abc 507d5cf8ad
commit 5faa34abb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
View File

@ -202,7 +202,7 @@ class EmailProvider extends AbstractProvider {
$organizerEMail = substr($organizer->getValue(), 7); $organizerEMail = substr($organizer->getValue(), 7);
if (!$this->mailer->validateMailAddress($organizerEMail)) { if ($organizerEMail === false || !$this->mailer->validateMailAddress($organizerEMail)) {
return null; return null;
} }

7
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View File

@ -178,7 +178,7 @@ class IMipPlugin extends SabreIMipPlugin {
// Strip off mailto: // Strip off mailto:
$sender = substr($iTipMessage->sender, 7); $sender = substr($iTipMessage->sender, 7);
$recipient = substr($iTipMessage->recipient, 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 // Nothing to send if the recipient doesn't have a valid email address
$iTipMessage->scheduleStatus = '5.0; EMail delivery failed'; $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
return; return;
@ -239,9 +239,12 @@ class IMipPlugin extends SabreIMipPlugin {
$message = $this->mailer->createMessage() $message = $this->mailer->createMessage()
->setFrom([$fromEMail => $fromName]) ->setFrom([$fromEMail => $fromName])
->setReplyTo([$sender => $senderName])
->setTo([$recipient => $recipientName]); ->setTo([$recipient => $recipientName]);
if ($sender !== false) {
$message->setReplyTo([$sender => $senderName]);
}
$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data); $template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
$template->addHeader(); $template->addHeader();