nextcloud / server

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Indentation +619 added lines, -619 removed lines

@@ -71,176 +71,176 @@ 
  * @license http://sabre.io/license/ Modified BSD License
  */
 class IMipPlugin extends SabreIMipPlugin {
-	/** @var string */
-	private $userId;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IMailer */
-	private $mailer;
-
-	private LoggerInterface $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var L10NFactory */
-	private $l10nFactory;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	public const MAX_DATE = '2038-01-01';
-
-	public const METHOD_REQUEST = 'request';
-	public const METHOD_REPLY = 'reply';
-	public const METHOD_CANCEL = 'cancel';
-	public const IMIP_INDENT = 15; // Enough for the length of all body bullet items, in all languages
-
-	public function __construct(IConfig $config, IMailer $mailer,
-								LoggerInterface $logger,
-								ITimeFactory $timeFactory, L10NFactory $l10nFactory,
-								IURLGenerator $urlGenerator, Defaults $defaults,
-								ISecureRandom $random, IDBConnection $db, IUserManager $userManager,
-								$userId) {
-		parent::__construct('');
-		$this->userId = $userId;
-		$this->config = $config;
-		$this->mailer = $mailer;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-		$this->l10nFactory = $l10nFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->random = $random;
-		$this->db = $db;
-		$this->defaults = $defaults;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * Event handler for the 'schedule' event.
-	 *
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	public function schedule(Message $iTipMessage) {
-		// Not sending any emails if the system considers the update
-		// insignificant.
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
-		$summary = $iTipMessage->message->VEVENT->SUMMARY;
-
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		// don't send out mails for events that already took place
-		$lastOccurrence = $this->getLastOccurrence($iTipMessage->message);
-		$currentTime = $this->timeFactory->getTime();
-		if ($lastOccurrence < $currentTime) {
-			return;
-		}
-
-		// Strip off mailto:
-		$sender = substr($iTipMessage->sender, 7);
-		$recipient = substr($iTipMessage->recipient, 7);
-		if (!$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;
-		}
-
-		$recipientName = $iTipMessage->recipientName ?: null;
-
-		/** @var Parameter|string|null $senderName */
-		$senderName = $iTipMessage->senderName ?: null;
-		if($senderName instanceof Parameter) {
-			$senderName = $senderName->getValue() ?? null;
-		}
-
-		if ($senderName === null || empty(trim($senderName))) {
-			$senderName = $this->userManager->getDisplayName($this->userId);
-		}
-
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-
-		$attendee = $this->getCurrentAttendee($iTipMessage);
-		$defaultLang = $this->l10nFactory->findGenericLanguage();
-		$lang = $this->getAttendeeLangOrDefault($defaultLang, $attendee);
-		$l10n = $this->l10nFactory->get('dav', $lang);
-
-		$meetingAttendeeName = $recipientName ?: $recipient;
-		$meetingInviteeName = $senderName ?: $sender;
-
-		$meetingTitle = $vevent->SUMMARY;
-		$meetingDescription = $vevent->DESCRIPTION;
-
-
-		$meetingUrl = $vevent->URL;
-		$meetingLocation = $vevent->LOCATION;
-
-		$defaultVal = '--';
-
-		$method = self::METHOD_REQUEST;
-		switch (strtolower($iTipMessage->method)) {
-			case self::METHOD_REPLY:
-				$method = self::METHOD_REPLY;
-				break;
-			case self::METHOD_CANCEL:
-				$method = self::METHOD_CANCEL;
-				break;
-		}
-
-		$data = [
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
-		];
-
-		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
-		$fromName = $l10n->t('%1$s via %2$s', [$senderName ?? $this->userId, $this->defaults->getName()]);
-
-		$message = $this->mailer->createMessage()
-			->setFrom([$fromEMail => $fromName])
-			->setTo([$recipient => $recipientName])
-			->setReplyTo([$sender => $senderName]);
-
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
-		$template->addHeader();
-
-		$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');
-
-		$this->addSubjectAndHeading($template, $l10n, $method, $summary);
-		$this->addBulletList($template, $l10n, $vevent);
-
-		// Only add response buttons to invitation requests: Fix Issue #11230
-		if (($method == self::METHOD_REQUEST) && $this->getAttendeeRsvpOrReqForParticipant($attendee)) {
-			/*
+    /** @var string */
+    private $userId;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IMailer */
+    private $mailer;
+
+    private LoggerInterface $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var L10NFactory */
+    private $l10nFactory;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    public const MAX_DATE = '2038-01-01';
+
+    public const METHOD_REQUEST = 'request';
+    public const METHOD_REPLY = 'reply';
+    public const METHOD_CANCEL = 'cancel';
+    public const IMIP_INDENT = 15; // Enough for the length of all body bullet items, in all languages
+
+    public function __construct(IConfig $config, IMailer $mailer,
+                                LoggerInterface $logger,
+                                ITimeFactory $timeFactory, L10NFactory $l10nFactory,
+                                IURLGenerator $urlGenerator, Defaults $defaults,
+                                ISecureRandom $random, IDBConnection $db, IUserManager $userManager,
+                                $userId) {
+        parent::__construct('');
+        $this->userId = $userId;
+        $this->config = $config;
+        $this->mailer = $mailer;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+        $this->l10nFactory = $l10nFactory;
+        $this->urlGenerator = $urlGenerator;
+        $this->random = $random;
+        $this->db = $db;
+        $this->defaults = $defaults;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * Event handler for the 'schedule' event.
+     *
+     * @param Message $iTipMessage
+     * @return void
+     */
+    public function schedule(Message $iTipMessage) {
+        // Not sending any emails if the system considers the update
+        // insignificant.
+        if (!$iTipMessage->significantChange) {
+            if (!$iTipMessage->scheduleStatus) {
+                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            }
+            return;
+        }
+
+        $summary = $iTipMessage->message->VEVENT->SUMMARY;
+
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        // don't send out mails for events that already took place
+        $lastOccurrence = $this->getLastOccurrence($iTipMessage->message);
+        $currentTime = $this->timeFactory->getTime();
+        if ($lastOccurrence < $currentTime) {
+            return;
+        }
+
+        // Strip off mailto:
+        $sender = substr($iTipMessage->sender, 7);
+        $recipient = substr($iTipMessage->recipient, 7);
+        if (!$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;
+        }
+
+        $recipientName = $iTipMessage->recipientName ?: null;
+
+        /** @var Parameter|string|null $senderName */
+        $senderName = $iTipMessage->senderName ?: null;
+        if($senderName instanceof Parameter) {
+            $senderName = $senderName->getValue() ?? null;
+        }
+
+        if ($senderName === null || empty(trim($senderName))) {
+            $senderName = $this->userManager->getDisplayName($this->userId);
+        }
+
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+
+        $attendee = $this->getCurrentAttendee($iTipMessage);
+        $defaultLang = $this->l10nFactory->findGenericLanguage();
+        $lang = $this->getAttendeeLangOrDefault($defaultLang, $attendee);
+        $l10n = $this->l10nFactory->get('dav', $lang);
+
+        $meetingAttendeeName = $recipientName ?: $recipient;
+        $meetingInviteeName = $senderName ?: $sender;
+
+        $meetingTitle = $vevent->SUMMARY;
+        $meetingDescription = $vevent->DESCRIPTION;
+
+
+        $meetingUrl = $vevent->URL;
+        $meetingLocation = $vevent->LOCATION;
+
+        $defaultVal = '--';
+
+        $method = self::METHOD_REQUEST;
+        switch (strtolower($iTipMessage->method)) {
+            case self::METHOD_REPLY:
+                $method = self::METHOD_REPLY;
+                break;
+            case self::METHOD_CANCEL:
+                $method = self::METHOD_CANCEL;
+                break;
+        }
+
+        $data = [
+            'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
+            'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
+            'meeting_title' => (string)$meetingTitle ?: $defaultVal,
+            'meeting_description' => (string)$meetingDescription ?: $defaultVal,
+            'meeting_url' => (string)$meetingUrl ?: $defaultVal,
+        ];
+
+        $fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
+        $fromName = $l10n->t('%1$s via %2$s', [$senderName ?? $this->userId, $this->defaults->getName()]);
+
+        $message = $this->mailer->createMessage()
+            ->setFrom([$fromEMail => $fromName])
+            ->setTo([$recipient => $recipientName])
+            ->setReplyTo([$sender => $senderName]);
+
+        $template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+        $template->addHeader();
+
+        $summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');
+
+        $this->addSubjectAndHeading($template, $l10n, $method, $summary);
+        $this->addBulletList($template, $l10n, $vevent);
+
+        // Only add response buttons to invitation requests: Fix Issue #11230
+        if (($method == self::METHOD_REQUEST) && $this->getAttendeeRsvpOrReqForParticipant($attendee)) {
+            /*
 			** Only offer invitation accept/reject buttons, which link back to the
 			** nextcloud server, to recipients who can access the nextcloud server via
 			** their internet/intranet.  Issue #12156
@@ -259,453 +259,453 @@ 
 			** To suppress URLs entirely, set invitation_link_recipients to boolean "no".
 			*/
 
-			$recipientDomain = substr(strrchr($recipient, "@"), 1);
-			$invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getAppValue('dav', 'invitation_link_recipients', 'yes'))));
-
-			if (strcmp('yes', $invitationLinkRecipients[0]) === 0
-				 || in_array(strtolower($recipient), $invitationLinkRecipients)
-				 || in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
-				$this->addResponseButtons($template, $l10n, $iTipMessage, $lastOccurrence);
-			}
-		}
-
-		$template->addFooter();
-
-		$message->useTemplate($template);
-
-		$attachment = $this->mailer->createAttachment(
-			$iTipMessage->message->serialize(),
-			'event.ics',// TODO(leon): Make file name unique, e.g. add event id
-			'text/calendar; method=' . $iTipMessage->method
-		);
-		$message->attach($attachment);
-
-		try {
-			$failed = $this->mailer->send($message);
-			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-			if ($failed) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
-		} catch (\Exception $ex) {
-			$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-		}
-	}
-
-	/**
-	 * check if event took place in the past already
-	 * @param VCalendar $vObject
-	 * @return int
-	 */
-	private function getLastOccurrence(VCalendar $vObject) {
-		/** @var VEvent $component */
-		$component = $vObject->VEVENT;
-
-		$firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
-		// Finding the last occurrence is a bit harder
-		if (!isset($component->RRULE)) {
-			if (isset($component->DTEND)) {
-				$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
-			} elseif (isset($component->DURATION)) {
-				/** @var \DateTime $endDate */
-				$endDate = clone $component->DTSTART->getDateTime();
-				// $component->DTEND->getDateTime() returns DateTimeImmutable
-				$endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-				$lastOccurrence = $endDate->getTimestamp();
-			} elseif (!$component->DTSTART->hasTime()) {
-				/** @var \DateTime $endDate */
-				$endDate = clone $component->DTSTART->getDateTime();
-				// $component->DTSTART->getDateTime() returns DateTimeImmutable
-				$endDate = $endDate->modify('+1 day');
-				$lastOccurrence = $endDate->getTimestamp();
-			} else {
-				$lastOccurrence = $firstOccurrence;
-			}
-		} else {
-			$it = new EventIterator($vObject, (string)$component->UID);
-			$maxDate = new \DateTime(self::MAX_DATE);
-			if ($it->isInfinite()) {
-				$lastOccurrence = $maxDate->getTimestamp();
-			} else {
-				$end = $it->getDtEnd();
-				while ($it->valid() && $end < $maxDate) {
-					$end = $it->getDtEnd();
-					$it->next();
-				}
-				$lastOccurrence = $end->getTimestamp();
-			}
-		}
-
-		return $lastOccurrence;
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @return null|Property
-	 */
-	private function getCurrentAttendee(Message $iTipMessage) {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			/** @var Property $attendee */
-			if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $default
-	 * @param Property|null $attendee
-	 * @return string
-	 */
-	private function getAttendeeLangOrDefault($default, Property $attendee = null) {
-		if ($attendee !== null) {
-			$lang = $attendee->offsetGet('LANGUAGE');
-			if ($lang instanceof Parameter) {
-				return $lang->getValue();
-			}
-		}
-		return $default;
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 * @return bool
-	 */
-	private function getAttendeeRsvpOrReqForParticipant(Property $attendee = null) {
-		if ($attendee !== null) {
-			$rsvp = $attendee->offsetGet('RSVP');
-			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
-				return true;
-			}
-			$role = $attendee->offsetGet('ROLE');
-			// @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
-			// Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
-			if ($role === null
-				|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
-				|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
-			) {
-				return true;
-			}
-		}
-		// RFC 5545 3.2.17: default RSVP is false
-		return false;
-	}
-
-	/**
-	 * @param IL10N $l10n
-	 * @param VEvent $vevent
-	 */
-	private function generateWhenString(IL10N $l10n, VEvent $vevent) {
-		$dtstart = $vevent->DTSTART;
-		if (isset($vevent->DTEND)) {
-			$dtend = $vevent->DTEND;
-		} elseif (isset($vevent->DURATION)) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			$dtend = clone $vevent->DTSTART;
-			$endDateTime = $dtend->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
-			$dtend->setDateTime($endDateTime, $isFloating);
-		} elseif (!$vevent->DTSTART->hasTime()) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			$dtend = clone $vevent->DTSTART;
-			$endDateTime = $dtend->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$dtend->setDateTime($endDateTime, $isFloating);
-		} else {
-			$dtend = clone $vevent->DTSTART;
-		}
-
-		$isAllDay = $dtstart instanceof Property\ICalendar\Date;
-
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
-		/** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
-		/** @var \DateTimeImmutable $dtstartDt */
-		$dtstartDt = $dtstart->getDateTime();
-		/** @var \DateTimeImmutable $dtendDt */
-		$dtendDt = $dtend->getDateTime();
-
-		$diff = $dtstartDt->diff($dtendDt);
-
-		$dtstartDt = new \DateTime($dtstartDt->format(\DateTimeInterface::ATOM));
-		$dtendDt = new \DateTime($dtendDt->format(\DateTimeInterface::ATOM));
-
-		if ($isAllDay) {
-			// One day event
-			if ($diff->days === 1) {
-				return $l10n->l('date', $dtstartDt, ['width' => 'medium']);
-			}
-
-			// DTEND is exclusive, so if the ics data says 2020-01-01 to 2020-01-05,
-			// the email should show 2020-01-01 to 2020-01-04.
-			$dtendDt->modify('-1 day');
-
-			//event that spans over multiple days
-			$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
-			$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
-
-			return $localeStart . ' - ' . $localeEnd;
-		}
-
-		/** @var Property\ICalendar\DateTime $dtstart */
-		/** @var Property\ICalendar\DateTime $dtend */
-		$isFloating = $dtstart->isFloating();
-		$startTimezone = $endTimezone = null;
-		if (!$isFloating) {
-			$prop = $dtstart->offsetGet('TZID');
-			if ($prop instanceof Parameter) {
-				$startTimezone = $prop->getValue();
-			}
-
-			$prop = $dtend->offsetGet('TZID');
-			if ($prop instanceof Parameter) {
-				$endTimezone = $prop->getValue();
-			}
-		}
-
-		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' .
-			$l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
-
-			return $localeStart . ' (' . $startTimezone . ') - ' .
-				$localeEnd . ' (' . $endTimezone . ')';
-		}
-
-		// show only end time if date is the same
-		if ($this->isDayEqual($dtstartDt, $dtendDt)) {
-			$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
-		} else {
-			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' .
-				$l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
-		}
-
-		return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
-	}
-
-	/**
-	 * @param \DateTime $dtStart
-	 * @param \DateTime $dtEnd
-	 * @return bool
-	 */
-	private function isDayEqual(\DateTime $dtStart, \DateTime $dtEnd) {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param string $method
-	 * @param string $summary
-	 */
-	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
-										  $method, $summary) {
-		if ($method === self::METHOD_CANCEL) {
-			// TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
-			$template->setSubject($l10n->t('Cancelled: %1$s', [$summary]));
-			$template->addHeading($l10n->t('Invitation canceled'));
-		} elseif ($method === self::METHOD_REPLY) {
-			// TRANSLATORS Subject for email, when an invitation is updated. Ex: "Re: {{Event Name}}"
-			$template->setSubject($l10n->t('Re: %1$s', [$summary]));
-			$template->addHeading($l10n->t('Invitation updated'));
-		} else {
-			// TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
-			$template->setSubject($l10n->t('Invitation: %1$s', [$summary]));
-			$template->addHeading($l10n->t('Invitation'));
-		}
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param VEVENT $vevent
-	 */
-	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
-		if ($vevent->SUMMARY) {
-			$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
-				$this->getAbsoluteImagePath('caldav/title.png'), '', '', self::IMIP_INDENT);
-		}
-		$meetingWhen = $this->generateWhenString($l10n, $vevent);
-		if ($meetingWhen) {
-			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.png'), '', '', self::IMIP_INDENT);
-		}
-		if ($vevent->LOCATION) {
-			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.png'), '', '', self::IMIP_INDENT);
-		}
-		if ($vevent->URL) {
-			$url = $vevent->URL->getValue();
-			$template->addBodyListItem(sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($url),
-				htmlspecialchars($url)),
-				$l10n->t('Link:'),
-				$this->getAbsoluteImagePath('caldav/link.png'),
-				$url, '', self::IMIP_INDENT);
-		}
-
-		$this->addAttendees($template, $l10n, $vevent);
-
-		/* Put description last, like an email body, since it can be arbitrarily long */
-		if ($vevent->DESCRIPTION) {
-			$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.png'), '', '', self::IMIP_INDENT);
-		}
-	}
-
-	/**
-	 * addAttendees: add organizer and attendee names/emails to iMip mail.
-	 *
-	 * Enable with DAV setting: invitation_list_attendees (default: no)
-	 *
-	 * The default is 'no', which matches old behavior, and is privacy preserving.
-	 *
-	 * To enable including attendees in invitation emails:
-	 *   % php occ config:app:set dav invitation_list_attendees --value yes
-	 *
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param Message $iTipMessage
-	 * @param int $lastOccurrence
-	 * @author brad2014 on github.com
-	 */
-
-	private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vevent) {
-		if ($this->config->getAppValue('dav', 'invitation_list_attendees', 'no') === 'no') {
-			return;
-		}
-
-		if (isset($vevent->ORGANIZER)) {
-			/** @var Property\ICalendar\CalAddress $organizer */
-			$organizer = $vevent->ORGANIZER;
-			$organizerURI = $organizer->getNormalizedValue();
-			[$scheme,$organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
-			/** @var string|null $organizerName */
-			$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
-			$organizerHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($organizerURI),
-				htmlspecialchars($organizerName ?: $organizerEmail));
-			$organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
-			if (isset($organizer['PARTSTAT'])) {
-				/** @var Parameter $partstat */
-				$partstat = $organizer['PARTSTAT'];
-				if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
-					$organizerHTML .= ' ✔︎';
-					$organizerText .= ' ✔︎';
-				}
-			}
-			$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
-				$this->getAbsoluteImagePath('caldav/organizer.png'),
-				$organizerText, '', self::IMIP_INDENT);
-		}
-
-		$attendees = $vevent->select('ATTENDEE');
-		if (count($attendees) === 0) {
-			return;
-		}
-
-		$attendeesHTML = [];
-		$attendeesText = [];
-		foreach ($attendees as $attendee) {
-			$attendeeURI = $attendee->getNormalizedValue();
-			[$scheme,$attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
-			$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
-			$attendeeHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($attendeeURI),
-				htmlspecialchars($attendeeName ?: $attendeeEmail));
-			$attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
-			if (isset($attendee['PARTSTAT'])
-				&& strcasecmp($attendee['PARTSTAT'], 'ACCEPTED') === 0) {
-				$attendeeHTML .= ' ✔︎';
-				$attendeeText .= ' ✔︎';
-			}
-			array_push($attendeesHTML, $attendeeHTML);
-			array_push($attendeesText, $attendeeText);
-		}
-
-		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $l10n->t('Attendees:'),
-			$this->getAbsoluteImagePath('caldav/attendees.png'),
-			implode("\n", $attendeesText), '', self::IMIP_INDENT);
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param Message $iTipMessage
-	 * @param int $lastOccurrence
-	 */
-	private function addResponseButtons(IEMailTemplate $template, IL10N $l10n,
-										Message $iTipMessage, $lastOccurrence) {
-		$token = $this->createInvitationToken($iTipMessage, $lastOccurrence);
-
-		$template->addBodyButtonGroup(
-			$l10n->t('Accept'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
-				'token' => $token,
-			]),
-			$l10n->t('Decline'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
-				'token' => $token,
-			])
-		);
-
-		$moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
-			'token' => $token,
-		]);
-		$html = vsprintf('<small><a href="%s">%s</a></small>', [
-			$moreOptionsURL, $l10n->t('More options …')
-		]);
-		$text = $l10n->t('More options at %s', [$moreOptionsURL]);
-
-		$template->addBodyText($html, $text);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function getAbsoluteImagePath($path) {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @param int $lastOccurrence
-	 * @return string
-	 */
-	private function createInvitationToken(Message $iTipMessage, $lastOccurrence):string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
-
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendee = $iTipMessage->recipient;
-		$organizer = $iTipMessage->sender;
-		$sequence = $iTipMessage->sequence;
-		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ?
-			$vevent->{'RECURRENCE-ID'}->serialize() : null;
-		$uid = $vevent->{'UID'};
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_invitations')
-			->values([
-				'token' => $query->createNamedParameter($token),
-				'attendee' => $query->createNamedParameter($attendee),
-				'organizer' => $query->createNamedParameter($organizer),
-				'sequence' => $query->createNamedParameter($sequence),
-				'recurrenceid' => $query->createNamedParameter($recurrenceId),
-				'expiration' => $query->createNamedParameter($lastOccurrence),
-				'uid' => $query->createNamedParameter($uid)
-			])
-			->execute();
-
-		return $token;
-	}
+            $recipientDomain = substr(strrchr($recipient, "@"), 1);
+            $invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getAppValue('dav', 'invitation_link_recipients', 'yes'))));
+
+            if (strcmp('yes', $invitationLinkRecipients[0]) === 0
+                 || in_array(strtolower($recipient), $invitationLinkRecipients)
+                 || in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
+                $this->addResponseButtons($template, $l10n, $iTipMessage, $lastOccurrence);
+            }
+        }
+
+        $template->addFooter();
+
+        $message->useTemplate($template);
+
+        $attachment = $this->mailer->createAttachment(
+            $iTipMessage->message->serialize(),
+            'event.ics',// TODO(leon): Make file name unique, e.g. add event id
+            'text/calendar; method=' . $iTipMessage->method
+        );
+        $message->attach($attachment);
+
+        try {
+            $failed = $this->mailer->send($message);
+            $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+            if ($failed) {
+                $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            }
+        } catch (\Exception $ex) {
+            $this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+        }
+    }
+
+    /**
+     * check if event took place in the past already
+     * @param VCalendar $vObject
+     * @return int
+     */
+    private function getLastOccurrence(VCalendar $vObject) {
+        /** @var VEvent $component */
+        $component = $vObject->VEVENT;
+
+        $firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
+        // Finding the last occurrence is a bit harder
+        if (!isset($component->RRULE)) {
+            if (isset($component->DTEND)) {
+                $lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
+            } elseif (isset($component->DURATION)) {
+                /** @var \DateTime $endDate */
+                $endDate = clone $component->DTSTART->getDateTime();
+                // $component->DTEND->getDateTime() returns DateTimeImmutable
+                $endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+                $lastOccurrence = $endDate->getTimestamp();
+            } elseif (!$component->DTSTART->hasTime()) {
+                /** @var \DateTime $endDate */
+                $endDate = clone $component->DTSTART->getDateTime();
+                // $component->DTSTART->getDateTime() returns DateTimeImmutable
+                $endDate = $endDate->modify('+1 day');
+                $lastOccurrence = $endDate->getTimestamp();
+            } else {
+                $lastOccurrence = $firstOccurrence;
+            }
+        } else {
+            $it = new EventIterator($vObject, (string)$component->UID);
+            $maxDate = new \DateTime(self::MAX_DATE);
+            if ($it->isInfinite()) {
+                $lastOccurrence = $maxDate->getTimestamp();
+            } else {
+                $end = $it->getDtEnd();
+                while ($it->valid() && $end < $maxDate) {
+                    $end = $it->getDtEnd();
+                    $it->next();
+                }
+                $lastOccurrence = $end->getTimestamp();
+            }
+        }
+
+        return $lastOccurrence;
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @return null|Property
+     */
+    private function getCurrentAttendee(Message $iTipMessage) {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            /** @var Property $attendee */
+            if (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param string $default
+     * @param Property|null $attendee
+     * @return string
+     */
+    private function getAttendeeLangOrDefault($default, Property $attendee = null) {
+        if ($attendee !== null) {
+            $lang = $attendee->offsetGet('LANGUAGE');
+            if ($lang instanceof Parameter) {
+                return $lang->getValue();
+            }
+        }
+        return $default;
+    }
+
+    /**
+     * @param Property|null $attendee
+     * @return bool
+     */
+    private function getAttendeeRsvpOrReqForParticipant(Property $attendee = null) {
+        if ($attendee !== null) {
+            $rsvp = $attendee->offsetGet('RSVP');
+            if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+                return true;
+            }
+            $role = $attendee->offsetGet('ROLE');
+            // @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
+            // Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
+            if ($role === null
+                || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
+                || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
+            ) {
+                return true;
+            }
+        }
+        // RFC 5545 3.2.17: default RSVP is false
+        return false;
+    }
+
+    /**
+     * @param IL10N $l10n
+     * @param VEvent $vevent
+     */
+    private function generateWhenString(IL10N $l10n, VEvent $vevent) {
+        $dtstart = $vevent->DTSTART;
+        if (isset($vevent->DTEND)) {
+            $dtend = $vevent->DTEND;
+        } elseif (isset($vevent->DURATION)) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            $dtend = clone $vevent->DTSTART;
+            $endDateTime = $dtend->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
+            $dtend->setDateTime($endDateTime, $isFloating);
+        } elseif (!$vevent->DTSTART->hasTime()) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            $dtend = clone $vevent->DTSTART;
+            $endDateTime = $dtend->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $dtend->setDateTime($endDateTime, $isFloating);
+        } else {
+            $dtend = clone $vevent->DTSTART;
+        }
+
+        $isAllDay = $dtstart instanceof Property\ICalendar\Date;
+
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtstart */
+        /** @var Property\ICalendar\Date | Property\ICalendar\DateTime $dtend */
+        /** @var \DateTimeImmutable $dtstartDt */
+        $dtstartDt = $dtstart->getDateTime();
+        /** @var \DateTimeImmutable $dtendDt */
+        $dtendDt = $dtend->getDateTime();
+
+        $diff = $dtstartDt->diff($dtendDt);
+
+        $dtstartDt = new \DateTime($dtstartDt->format(\DateTimeInterface::ATOM));
+        $dtendDt = new \DateTime($dtendDt->format(\DateTimeInterface::ATOM));
+
+        if ($isAllDay) {
+            // One day event
+            if ($diff->days === 1) {
+                return $l10n->l('date', $dtstartDt, ['width' => 'medium']);
+            }
+
+            // DTEND is exclusive, so if the ics data says 2020-01-01 to 2020-01-05,
+            // the email should show 2020-01-01 to 2020-01-04.
+            $dtendDt->modify('-1 day');
+
+            //event that spans over multiple days
+            $localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
+            $localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
+
+            return $localeStart . ' - ' . $localeEnd;
+        }
+
+        /** @var Property\ICalendar\DateTime $dtstart */
+        /** @var Property\ICalendar\DateTime $dtend */
+        $isFloating = $dtstart->isFloating();
+        $startTimezone = $endTimezone = null;
+        if (!$isFloating) {
+            $prop = $dtstart->offsetGet('TZID');
+            if ($prop instanceof Parameter) {
+                $startTimezone = $prop->getValue();
+            }
+
+            $prop = $dtend->offsetGet('TZID');
+            if ($prop instanceof Parameter) {
+                $endTimezone = $prop->getValue();
+            }
+        }
+
+        $localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' .
+            $l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
+
+            return $localeStart . ' (' . $startTimezone . ') - ' .
+                $localeEnd . ' (' . $endTimezone . ')';
+        }
+
+        // show only end time if date is the same
+        if ($this->isDayEqual($dtstartDt, $dtendDt)) {
+            $localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
+        } else {
+            $localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' .
+                $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
+        }
+
+        return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
+    }
+
+    /**
+     * @param \DateTime $dtStart
+     * @param \DateTime $dtEnd
+     * @return bool
+     */
+    private function isDayEqual(\DateTime $dtStart, \DateTime $dtEnd) {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param string $method
+     * @param string $summary
+     */
+    private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
+                                            $method, $summary) {
+        if ($method === self::METHOD_CANCEL) {
+            // TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
+            $template->setSubject($l10n->t('Cancelled: %1$s', [$summary]));
+            $template->addHeading($l10n->t('Invitation canceled'));
+        } elseif ($method === self::METHOD_REPLY) {
+            // TRANSLATORS Subject for email, when an invitation is updated. Ex: "Re: {{Event Name}}"
+            $template->setSubject($l10n->t('Re: %1$s', [$summary]));
+            $template->addHeading($l10n->t('Invitation updated'));
+        } else {
+            // TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
+            $template->setSubject($l10n->t('Invitation: %1$s', [$summary]));
+            $template->addHeading($l10n->t('Invitation'));
+        }
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param VEVENT $vevent
+     */
+    private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
+        if ($vevent->SUMMARY) {
+            $template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
+                $this->getAbsoluteImagePath('caldav/title.png'), '', '', self::IMIP_INDENT);
+        }
+        $meetingWhen = $this->generateWhenString($l10n, $vevent);
+        if ($meetingWhen) {
+            $template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
+                $this->getAbsoluteImagePath('caldav/time.png'), '', '', self::IMIP_INDENT);
+        }
+        if ($vevent->LOCATION) {
+            $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
+                $this->getAbsoluteImagePath('caldav/location.png'), '', '', self::IMIP_INDENT);
+        }
+        if ($vevent->URL) {
+            $url = $vevent->URL->getValue();
+            $template->addBodyListItem(sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($url),
+                htmlspecialchars($url)),
+                $l10n->t('Link:'),
+                $this->getAbsoluteImagePath('caldav/link.png'),
+                $url, '', self::IMIP_INDENT);
+        }
+
+        $this->addAttendees($template, $l10n, $vevent);
+
+        /* Put description last, like an email body, since it can be arbitrarily long */
+        if ($vevent->DESCRIPTION) {
+            $template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
+                $this->getAbsoluteImagePath('caldav/description.png'), '', '', self::IMIP_INDENT);
+        }
+    }
+
+    /**
+     * addAttendees: add organizer and attendee names/emails to iMip mail.
+     *
+     * Enable with DAV setting: invitation_list_attendees (default: no)
+     *
+     * The default is 'no', which matches old behavior, and is privacy preserving.
+     *
+     * To enable including attendees in invitation emails:
+     *   % php occ config:app:set dav invitation_list_attendees --value yes
+     *
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param Message $iTipMessage
+     * @param int $lastOccurrence
+     * @author brad2014 on github.com
+     */
+
+    private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vevent) {
+        if ($this->config->getAppValue('dav', 'invitation_list_attendees', 'no') === 'no') {
+            return;
+        }
+
+        if (isset($vevent->ORGANIZER)) {
+            /** @var Property\ICalendar\CalAddress $organizer */
+            $organizer = $vevent->ORGANIZER;
+            $organizerURI = $organizer->getNormalizedValue();
+            [$scheme,$organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
+            /** @var string|null $organizerName */
+            $organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
+            $organizerHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($organizerURI),
+                htmlspecialchars($organizerName ?: $organizerEmail));
+            $organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
+            if (isset($organizer['PARTSTAT'])) {
+                /** @var Parameter $partstat */
+                $partstat = $organizer['PARTSTAT'];
+                if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
+                    $organizerHTML .= ' ✔︎';
+                    $organizerText .= ' ✔︎';
+                }
+            }
+            $template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
+                $this->getAbsoluteImagePath('caldav/organizer.png'),
+                $organizerText, '', self::IMIP_INDENT);
+        }
+
+        $attendees = $vevent->select('ATTENDEE');
+        if (count($attendees) === 0) {
+            return;
+        }
+
+        $attendeesHTML = [];
+        $attendeesText = [];
+        foreach ($attendees as $attendee) {
+            $attendeeURI = $attendee->getNormalizedValue();
+            [$scheme,$attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
+            $attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
+            $attendeeHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($attendeeURI),
+                htmlspecialchars($attendeeName ?: $attendeeEmail));
+            $attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
+            if (isset($attendee['PARTSTAT'])
+                && strcasecmp($attendee['PARTSTAT'], 'ACCEPTED') === 0) {
+                $attendeeHTML .= ' ✔︎';
+                $attendeeText .= ' ✔︎';
+            }
+            array_push($attendeesHTML, $attendeeHTML);
+            array_push($attendeesText, $attendeeText);
+        }
+
+        $template->addBodyListItem(implode('<br/>', $attendeesHTML), $l10n->t('Attendees:'),
+            $this->getAbsoluteImagePath('caldav/attendees.png'),
+            implode("\n", $attendeesText), '', self::IMIP_INDENT);
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param Message $iTipMessage
+     * @param int $lastOccurrence
+     */
+    private function addResponseButtons(IEMailTemplate $template, IL10N $l10n,
+                                        Message $iTipMessage, $lastOccurrence) {
+        $token = $this->createInvitationToken($iTipMessage, $lastOccurrence);
+
+        $template->addBodyButtonGroup(
+            $l10n->t('Accept'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
+                'token' => $token,
+            ]),
+            $l10n->t('Decline'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
+                'token' => $token,
+            ])
+        );
+
+        $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
+            'token' => $token,
+        ]);
+        $html = vsprintf('<small><a href="%s">%s</a></small>', [
+            $moreOptionsURL, $l10n->t('More options …')
+        ]);
+        $text = $l10n->t('More options at %s', [$moreOptionsURL]);
+
+        $template->addBodyText($html, $text);
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function getAbsoluteImagePath($path) {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @param int $lastOccurrence
+     * @return string
+     */
+    private function createInvitationToken(Message $iTipMessage, $lastOccurrence):string {
+        $token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
+
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendee = $iTipMessage->recipient;
+        $organizer = $iTipMessage->sender;
+        $sequence = $iTipMessage->sequence;
+        $recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ?
+            $vevent->{'RECURRENCE-ID'}->serialize() : null;
+        $uid = $vevent->{'UID'};
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_invitations')
+            ->values([
+                'token' => $query->createNamedParameter($token),
+                'attendee' => $query->createNamedParameter($attendee),
+                'organizer' => $query->createNamedParameter($organizer),
+                'sequence' => $query->createNamedParameter($sequence),
+                'recurrenceid' => $query->createNamedParameter($recurrenceId),
+                'expiration' => $query->createNamedParameter($lastOccurrence),
+                'uid' => $query->createNamedParameter($uid)
+            ])
+            ->execute();
+
+        return $token;
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -176,7 +176,7 @@ 
 
 		/** @var Parameter|string|null $senderName */
 		$senderName = $iTipMessage->senderName ?: null;
-		if($senderName instanceof Parameter) {
+		if ($senderName instanceof Parameter) {
 			$senderName = $senderName->getValue() ?? null;
 		}
 
@@ -215,11 +215,11 @@ 
 		}
 
 		$data = [
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
+			'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal,
+			'invitee_name' => (string) $meetingInviteeName ?: $defaultVal,
+			'meeting_title' => (string) $meetingTitle ?: $defaultVal,
+			'meeting_description' => (string) $meetingDescription ?: $defaultVal,
+			'meeting_url' => (string) $meetingUrl ?: $defaultVal,
 		];
 
 		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
@@ -230,7 +230,7 @@ 
 			->setTo([$recipient => $recipientName])
 			->setReplyTo([$sender => $senderName]);
 
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data);
 		$template->addHeader();
 
 		$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');
@@ -275,8 +275,8 @@ 
 
 		$attachment = $this->mailer->createAttachment(
 			$iTipMessage->message->serialize(),
-			'event.ics',// TODO(leon): Make file name unique, e.g. add event id
-			'text/calendar; method=' . $iTipMessage->method
+			'event.ics', // TODO(leon): Make file name unique, e.g. add event id
+			'text/calendar; method='.$iTipMessage->method
 		);
 		$message->attach($attachment);
 
@@ -323,7 +323,7 @@ 
 				$lastOccurrence = $firstOccurrence;
 			}
 		} else {
-			$it = new EventIterator($vObject, (string)$component->UID);
+			$it = new EventIterator($vObject, (string) $component->UID);
 			$maxDate = new \DateTime(self::MAX_DATE);
 			if ($it->isInfinite()) {
 				$lastOccurrence = $maxDate->getTimestamp();
@@ -448,7 +448,7 @@ 
 			$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
 			$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
 
-			return $localeStart . ' - ' . $localeEnd;
+			return $localeStart.' - '.$localeEnd;
 		}
 
 		/** @var Property\ICalendar\DateTime $dtstart */
@@ -467,26 +467,26 @@ 
 			}
 		}
 
-		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' .
+		$localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']).', '.
 			$l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']);
 
 		// always show full date with timezone if timezones are different
 		if ($startTimezone !== $endTimezone) {
 			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 
-			return $localeStart . ' (' . $startTimezone . ') - ' .
-				$localeEnd . ' (' . $endTimezone . ')';
+			return $localeStart.' ('.$startTimezone.') - '.
+				$localeEnd.' ('.$endTimezone.')';
 		}
 
 		// show only end time if date is the same
 		if ($this->isDayEqual($dtstartDt, $dtendDt)) {
 			$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']);
 		} else {
-			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' .
+			$localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']).', '.
 				$l10n->l('datetime', $dtendDt, ['width' => 'medium|short']);
 		}
 
-		return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
+		return  $localeStart.' - '.$localeEnd.' ('.$startTimezone.')';
 	}
 
 	/**
@@ -585,7 +585,7 @@ 
 			/** @var Property\ICalendar\CalAddress $organizer */
 			$organizer = $vevent->ORGANIZER;
 			$organizerURI = $organizer->getNormalizedValue();
-			[$scheme,$organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
+			[$scheme, $organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
 			/** @var string|null $organizerName */
 			$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
 			$organizerHTML = sprintf('<a href="%s">%s</a>',
@@ -614,7 +614,7 @@ 
 		$attendeesText = [];
 		foreach ($attendees as $attendee) {
 			$attendeeURI = $attendee->getNormalizedValue();
-			[$scheme,$attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
+			[$scheme, $attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
 			$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
 			$attendeeHTML = sprintf('<a href="%s">%s</a>',
 				htmlspecialchars($attendeeURI),

apps/settings/templates/settings/admin/additional-mail.php

Indentation +23 added lines, -23 removed lines

@@ -25,23 +25,23 @@ 
 /** @var array $_ */
 
 $mail_smtpsecure = [
-	'' => $l->t('None'),
-	'ssl' => $l->t('SSL/TLS')
+    '' => $l->t('None'),
+    'ssl' => $l->t('SSL/TLS')
 ];
 
 $mail_smtpmode = [
-	['smtp', 'SMTP'],
+    ['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
+    $mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] === 'qmail') {
-	$mail_smtpmode[] = ['qmail', 'qmail'];
+    $mail_smtpmode[] = ['qmail', 'qmail'];
 }
 
 $mail_sendmailmode = [
-	'smtp' => 'smtp (-bs)',
-	'pipe' => 'pipe (-t)'
+    'smtp' => 'smtp (-bs)',
+    'pipe' => 'pipe (-t)'
 ];
 
 ?>
@@ -59,29 +59,29 @@ 
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name="mail_smtpmode" id="mail_smtpmode">
 				<?php foreach ($mail_smtpmode as $smtpmode):
-					$selected = '';
-					if ($smtpmode[0] == $_['mail_smtpmode']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($smtpmode[0] == $_['mail_smtpmode']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 				<?php p($l->t('Encryption')); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
-					$selected = '';
-					if ($secure == $_['mail_smtpsecure']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($secure == $_['mail_smtpsecure']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -107,8 +107,8 @@ 
 <!--lo-->
 
 		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
 			<input type="text" name="mail_smtphost" id="mail_smtphost" placeholder="smtp.example.com"
 				   value="<?php p($_['mail_smtphost']) ?>" />
@@ -119,8 +119,8 @@ 
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
 		<p id="mail_credentials" <?php if ($_['mail_smtpmode'] !== 'smtp') {
-						print_unescaped(' class="hidden"');
-					} ?>>
+                        print_unescaped(' class="hidden"');
+                    } ?>>
 			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
 			<input type="text" name="mail_smtpname" id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value="<?php p($_['mail_smtpname']) ?>" />

Spacing +5 added lines, -5 removed lines

@@ -48,9 +48,9 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer noopener" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -64,7 +64,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_sendmailmode_label" for="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
@@ -92,7 +92,7 @@ 
 			<select name="mail_sendmailmode" id="mail_sendmailmode" class="<?= $_['mail_smtpmode'] !== 'sendmail' ? 'hidden' : '' ?>">
 				<?php foreach ($mail_sendmailmode as $sendmailmodeValue => $sendmailmodeLabel): ?>
 					<option value="<?php p($sendmailmodeValue)?>" <?= $sendmailmodeValue === $_['mail_sendmailmode'] ? 'selected="selected"' : '' ?>><?php p($sendmailmodeLabel) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 

apps/settings/lib/Settings/Admin/Mail.php

Indentation +60 added lines, -60 removed lines

@@ -33,74 +33,74 @@
 use OCP\Settings\IDelegatedSettings;
 
 class Mail implements IDelegatedSettings {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IL10N $l */
-	private $l;
+    /** @var IL10N $l */
+    private $l;
 
-	/**
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 */
-	public function __construct(IConfig $config, IL10N $l) {
-		$this->config = $config;
-		$this->l = $l;
-	}
+    /**
+     * @param IConfig $config
+     * @param IL10N $l
+     */
+    public function __construct(IConfig $config, IL10N $l) {
+        $this->config = $config;
+        $this->l = $l;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			// Mail
-			'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
-			'mail_domain' => $this->config->getSystemValue('mail_domain', ''),
-			'mail_from_address' => $this->config->getSystemValue('mail_from_address', ''),
-			'mail_smtpmode' => $this->config->getSystemValue('mail_smtpmode', ''),
-			'mail_smtpsecure' => $this->config->getSystemValue('mail_smtpsecure', ''),
-			'mail_smtphost' => $this->config->getSystemValue('mail_smtphost', ''),
-			'mail_smtpport' => $this->config->getSystemValue('mail_smtpport', ''),
-			'mail_smtpauth' => $this->config->getSystemValue('mail_smtpauth', false),
-			'mail_smtpname' => $this->config->getSystemValue('mail_smtpname', ''),
-			'mail_smtppassword' => $this->config->getSystemValue('mail_smtppassword', ''),
-			'mail_sendmailmode' => $this->config->getSystemValue('mail_sendmailmode', 'smtp'),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            // Mail
+            'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
+            'mail_domain' => $this->config->getSystemValue('mail_domain', ''),
+            'mail_from_address' => $this->config->getSystemValue('mail_from_address', ''),
+            'mail_smtpmode' => $this->config->getSystemValue('mail_smtpmode', ''),
+            'mail_smtpsecure' => $this->config->getSystemValue('mail_smtpsecure', ''),
+            'mail_smtphost' => $this->config->getSystemValue('mail_smtphost', ''),
+            'mail_smtpport' => $this->config->getSystemValue('mail_smtpport', ''),
+            'mail_smtpauth' => $this->config->getSystemValue('mail_smtpauth', false),
+            'mail_smtpname' => $this->config->getSystemValue('mail_smtpname', ''),
+            'mail_smtppassword' => $this->config->getSystemValue('mail_smtppassword', ''),
+            'mail_sendmailmode' => $this->config->getSystemValue('mail_sendmailmode', 'smtp'),
+        ];
 
-		if ($parameters['mail_smtppassword'] !== '') {
-			$parameters['mail_smtppassword'] = '********';
-		}
+        if ($parameters['mail_smtppassword'] !== '') {
+            $parameters['mail_smtppassword'] = '********';
+        }
 
-		if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
-			$parameters['mail_smtpmode'] = 'smtp';
-		}
+        if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
+            $parameters['mail_smtpmode'] = 'smtp';
+        }
 
-		return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	public function getName(): ?string {
-		return $this->l->t('Email server');
-	}
+    public function getName(): ?string {
+        return $this->l->t('Email server');
+    }
 
-	public function getAuthorizedAppConfig(): array {
-		return [];
-	}
+    public function getAuthorizedAppConfig(): array {
+        return [];
+    }
 }

apps/settings/lib/Controller/MailSettingsController.php

Indentation +143 added lines, -143 removed lines

@@ -39,147 +39,147 @@
 
 class MailSettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l10n;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IMailer */
-	private $mailer;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IURLGenerator $urlGenerator,
-	 * @param IMailer $mailer
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IL10N $l10n,
-								IConfig $config,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								IMailer $mailer) {
-		parent::__construct($appName, $request);
-		$this->l10n = $l10n;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-	}
-
-	/**
-	 * Sets the email settings
-	 *
-	 * @PasswordConfirmationRequired
-	 * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
-	 *
-	 * @param string $mail_domain
-	 * @param string $mail_from_address
-	 * @param string $mail_smtpmode
-	 * @param string $mail_smtpsecure
-	 * @param string $mail_smtphost
-	 * @param int $mail_smtpauth
-	 * @param string $mail_smtpport
-	 * @return DataResponse
-	 */
-	public function setMailSettings($mail_domain,
-									$mail_from_address,
-									$mail_smtpmode,
-									$mail_smtpsecure,
-									$mail_smtphost,
-									$mail_smtpauth,
-									$mail_smtpport,
-									$mail_sendmailmode) {
-		$params = get_defined_vars();
-		$configs = [];
-		foreach ($params as $key => $value) {
-			$configs[$key] = empty($value) ? null : $value;
-		}
-
-		// Delete passwords from config in case no auth is specified
-		if ($params['mail_smtpauth'] !== 1) {
-			$configs['mail_smtpname'] = null;
-			$configs['mail_smtppassword'] = null;
-		}
-
-		$this->config->setSystemValues($configs);
-
-		$this->config->setAppValue('core', 'emailTestSuccessful', '0');
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Store the credentials used for SMTP in the config
-	 *
-	 * @PasswordConfirmationRequired
-	 * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
-	 *
-	 * @param string $mail_smtpname
-	 * @param string $mail_smtppassword
-	 * @return DataResponse
-	 */
-	public function storeCredentials($mail_smtpname, $mail_smtppassword) {
-		if ($mail_smtppassword === '********') {
-			return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
-		}
-
-		$this->config->setSystemValues([
-			'mail_smtpname' => $mail_smtpname,
-			'mail_smtppassword' => $mail_smtppassword,
-		]);
-
-		$this->config->setAppValue('core', 'emailTestSuccessful', '0');
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Send a mail to test the settings
-	 * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
-	 * @return DataResponse
-	 */
-	public function sendTestMail() {
-		$email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
-		if (!empty($email)) {
-			try {
-				$displayName = $this->userSession->getUser()->getDisplayName();
-
-				$template = $this->mailer->createEMailTemplate('settings.TestEmail', [
-					'displayname' => $displayName,
-				]);
-
-				$template->setSubject($this->l10n->t('Email setting test'));
-				$template->addHeader();
-				$template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
-				$template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
-				$template->addFooter();
-
-				$message = $this->mailer->createMessage();
-				$message->setTo([$email => $displayName]);
-				$message->useTemplate($template);
-				$errors = $this->mailer->send($message);
-				if (!empty($errors)) {
-					$this->config->setAppValue('core', 'emailTestSuccessful', '0');
-					throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));
-				}
-				// Store the successful config in the app config
-				$this->config->setAppValue('core', 'emailTestSuccessful', '1');
-				return new DataResponse();
-			} catch (\Exception $e) {
-				$this->config->setAppValue('core', 'emailTestSuccessful', '0');
-				return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
-			}
-		}
-
-		$this->config->setAppValue('core', 'emailTestSuccessful', '0');
-		return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST);
-	}
+    /** @var IL10N */
+    private $l10n;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IMailer */
+    private $mailer;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IURLGenerator $urlGenerator,
+     * @param IMailer $mailer
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                IMailer $mailer) {
+        parent::__construct($appName, $request);
+        $this->l10n = $l10n;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Sets the email settings
+     *
+     * @PasswordConfirmationRequired
+     * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
+     *
+     * @param string $mail_domain
+     * @param string $mail_from_address
+     * @param string $mail_smtpmode
+     * @param string $mail_smtpsecure
+     * @param string $mail_smtphost
+     * @param int $mail_smtpauth
+     * @param string $mail_smtpport
+     * @return DataResponse
+     */
+    public function setMailSettings($mail_domain,
+                                    $mail_from_address,
+                                    $mail_smtpmode,
+                                    $mail_smtpsecure,
+                                    $mail_smtphost,
+                                    $mail_smtpauth,
+                                    $mail_smtpport,
+                                    $mail_sendmailmode) {
+        $params = get_defined_vars();
+        $configs = [];
+        foreach ($params as $key => $value) {
+            $configs[$key] = empty($value) ? null : $value;
+        }
+
+        // Delete passwords from config in case no auth is specified
+        if ($params['mail_smtpauth'] !== 1) {
+            $configs['mail_smtpname'] = null;
+            $configs['mail_smtppassword'] = null;
+        }
+
+        $this->config->setSystemValues($configs);
+
+        $this->config->setAppValue('core', 'emailTestSuccessful', '0');
+
+        return new DataResponse();
+    }
+
+    /**
+     * Store the credentials used for SMTP in the config
+     *
+     * @PasswordConfirmationRequired
+     * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
+     *
+     * @param string $mail_smtpname
+     * @param string $mail_smtppassword
+     * @return DataResponse
+     */
+    public function storeCredentials($mail_smtpname, $mail_smtppassword) {
+        if ($mail_smtppassword === '********') {
+            return new DataResponse($this->l10n->t('Invalid SMTP password.'), Http::STATUS_BAD_REQUEST);
+        }
+
+        $this->config->setSystemValues([
+            'mail_smtpname' => $mail_smtpname,
+            'mail_smtppassword' => $mail_smtppassword,
+        ]);
+
+        $this->config->setAppValue('core', 'emailTestSuccessful', '0');
+
+        return new DataResponse();
+    }
+
+    /**
+     * Send a mail to test the settings
+     * @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\Overview)
+     * @return DataResponse
+     */
+    public function sendTestMail() {
+        $email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
+        if (!empty($email)) {
+            try {
+                $displayName = $this->userSession->getUser()->getDisplayName();
+
+                $template = $this->mailer->createEMailTemplate('settings.TestEmail', [
+                    'displayname' => $displayName,
+                ]);
+
+                $template->setSubject($this->l10n->t('Email setting test'));
+                $template->addHeader();
+                $template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
+                $template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
+                $template->addFooter();
+
+                $message = $this->mailer->createMessage();
+                $message->setTo([$email => $displayName]);
+                $message->useTemplate($template);
+                $errors = $this->mailer->send($message);
+                if (!empty($errors)) {
+                    $this->config->setAppValue('core', 'emailTestSuccessful', '0');
+                    throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));
+                }
+                // Store the successful config in the app config
+                $this->config->setAppValue('core', 'emailTestSuccessful', '1');
+                return new DataResponse();
+            } catch (\Exception $e) {
+                $this->config->setAppValue('core', 'emailTestSuccessful', '0');
+                return new DataResponse($this->l10n->t('A problem occurred while sending the email. Please revise your settings. (Error: %s)', [$e->getMessage()]), Http::STATUS_BAD_REQUEST);
+            }
+        }
+
+        $this->config->setAppValue('core', 'emailTestSuccessful', '0');
+        return new DataResponse($this->l10n->t('You need to set your user email before being able to send test emails. Go to %s for that.', [$this->urlGenerator->linkToRouteAbsolute('settings.PersonalSettings.index')]), Http::STATUS_BAD_REQUEST);
+    }
 }

lib/public/Mail/IMailer.php

Indentation +49 added lines, -49 removed lines

@@ -47,58 +47,58 @@
  * @since 8.1.0
  */
 interface IMailer {
-	/**
-	 * Creates a new message object that can be passed to send()
-	 *
-	 * @return IMessage
-	 * @since 8.1.0
-	 */
-	public function createMessage(): IMessage;
+    /**
+     * Creates a new message object that can be passed to send()
+     *
+     * @return IMessage
+     * @since 8.1.0
+     */
+    public function createMessage(): IMessage;
 
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment;
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment;
 
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath(string $path, $contentType = null): IAttachment;
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath(string $path, $contentType = null): IAttachment;
 
-	/**
-	 * Creates a new email template object
-	 *
-	 * @param string $emailId
-	 * @param array $data
-	 * @return IEMailTemplate
-	 * @since 12.0.0 Parameters added in 12.0.3
-	 */
-	public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate;
+    /**
+     * Creates a new email template object
+     *
+     * @param string $emailId
+     * @param array $data
+     * @return IEMailTemplate
+     * @since 12.0.0 Parameters added in 12.0.3
+     */
+    public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate;
 
-	/**
-	 * Send the specified message. Also sets the from address to the value defined in config.php
-	 * if no-one has been passed.
-	 *
-	 * @param IMessage $message Message to send
-	 * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
-	 * therefore should be considered
-	 * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
-	 * has been supplied.)
-	 * @since 8.1.0
-	 */
-	public function send(IMessage $message): array;
+    /**
+     * Send the specified message. Also sets the from address to the value defined in config.php
+     * if no-one has been passed.
+     *
+     * @param IMessage $message Message to send
+     * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
+     * therefore should be considered
+     * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
+     * has been supplied.)
+     * @since 8.1.0
+     */
+    public function send(IMessage $message): array;
 
-	/**
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 * @since 8.1.0
-	 */
-	public function validateMailAddress(string $email): bool;
+    /**
+     * @param string $email Email address to be validated
+     * @return bool True if the mail address is valid, false otherwise
+     * @since 8.1.0
+     */
+    public function validateMailAddress(string $email): bool;
 }

lib/private/Mail/Attachment.php

Indentation +49 added lines, -49 removed lines

@@ -36,58 +36,58 @@
  * @since 13.0.0
  */
 class Attachment implements IAttachment {
-	private ?string $body;
-	private ?string $name;
-	private ?string $contentType;
-	private ?string $path;
+    private ?string $body;
+    private ?string $name;
+    private ?string $contentType;
+    private ?string $path;
 
-	public function __construct(
-		?string $body,
-		?string $name,
-		?string $contentType,
-		?string $path = null
-	) {
-		$this->body = $body;
-		$this->name = $name;
-		$this->contentType = $contentType;
-		$this->path = $path;
-	}
+    public function __construct(
+        ?string $body,
+        ?string $name,
+        ?string $contentType,
+        ?string $path = null
+    ) {
+        $this->body = $body;
+        $this->name = $name;
+        $this->contentType = $contentType;
+        $this->path = $path;
+    }
 
-	/**
-	 * @param string $filename
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setFilename(string $filename): IAttachment {
-		$this->name = $filename;
-		return $this;
-	}
+    /**
+     * @param string $filename
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setFilename(string $filename): IAttachment {
+        $this->name = $filename;
+        return $this;
+    }
 
-	/**
-	 * @param string $contentType
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setContentType(string $contentType): IAttachment {
-		$this->contentType = $contentType;
-		return $this;
-	}
+    /**
+     * @param string $contentType
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setContentType(string $contentType): IAttachment {
+        $this->contentType = $contentType;
+        return $this;
+    }
 
-	/**
-	 * @param string $body
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function setBody(string $body): IAttachment {
-		$this->body = $body;
-		return $this;
-	}
+    /**
+     * @param string $body
+     * @return $this
+     * @since 13.0.0
+     */
+    public function setBody(string $body): IAttachment {
+        $this->body = $body;
+        return $this;
+    }
 
-	public function attach(Email $symfonyEmail): void {
-		if ($this->path !== null) {
-			$symfonyEmail->attachFromPath($this->path, $this->name, $this->contentType);
-		} else {
-			$symfonyEmail->attach($this->body, $this->name, $this->contentType);
-		}
-	}
+    public function attach(Email $symfonyEmail): void {
+        if ($this->path !== null) {
+            $symfonyEmail->attachFromPath($this->path, $this->name, $this->contentType);
+        } else {
+            $symfonyEmail->attach($this->body, $this->name, $this->contentType);
+        }
+    }
 }

lib/private/Mail/Mailer.php

Indentation +283 added lines, -283 removed lines

@@ -79,287 +79,287 @@
  * @package OC\Mail
  */
 class Mailer implements IMailer {
-	private ?MailerInterface $instance = null;
-	private IConfig $config;
-	private LoggerInterface $logger;
-	private Defaults $defaults;
-	private IURLGenerator $urlGenerator;
-	private IL10N $l10n;
-	private IEventDispatcher $dispatcher;
-	private IFactory $l10nFactory;
-
-	public function __construct(IConfig $config,
-						 LoggerInterface $logger,
-						 Defaults $defaults,
-						 IURLGenerator $urlGenerator,
-						 IL10N $l10n,
-						 IEventDispatcher $dispatcher,
-						 IFactory $l10nFactory) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->defaults = $defaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->dispatcher = $dispatcher;
-		$this->l10nFactory = $l10nFactory;
-	}
-
-	/**
-	 * Creates a new message object that can be passed to send()
-	 *
-	 * @return Message
-	 */
-	public function createMessage(): Message {
-		$plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
-		return new Message(new Email(), $plainTextOnly);
-	}
-
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
-		return new Attachment($data, $filename, $contentType);
-	}
-
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
-		return new Attachment(null, null, $contentType, $path);
-	}
-
-	/**
-	 * Creates a new email template object
-	 *
-	 * @param string $emailId
-	 * @param array $data
-	 * @return IEMailTemplate
-	 * @since 12.0.0
-	 */
-	public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
-		$class = $this->config->getSystemValue('mail_template_class', '');
-
-		if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
-			return new $class(
-				$this->defaults,
-				$this->urlGenerator,
-				$this->l10nFactory,
-				$emailId,
-				$data
-			);
-		}
-
-		return new EMailTemplate(
-			$this->defaults,
-			$this->urlGenerator,
-			$this->l10nFactory,
-			$emailId,
-			$data
-		);
-	}
-
-	/**
-	 * Send the specified message. Also sets the from address to the value defined in config.php
-	 * if no-one has been passed.
-	 *
-	 * If sending failed, the recipients that failed will be returned (to, cc and bcc).
-	 * Will output additional debug info if 'mail_smtpdebug' => 'true' is set in config.php
-	 *
-	 * @param IMessage $message Message to send
-	 * @return string[] $failedRecipients
-	 */
-	public function send(IMessage $message): array {
-		$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
-
-		if (!($message instanceof Message)) {
-			throw new InvalidArgumentException('Object not of type ' . Message::class);
-		}
-
-		if (empty($message->getFrom())) {
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]);
-		}
-
-		$mailer = $this->getInstance();
-
-		$this->dispatcher->dispatchTyped(new BeforeMessageSent($message));
-
-		try {
-			$message->setRecipients();
-		} catch (InvalidArgumentException|RfcComplianceException $e) {
-			$logMessage = sprintf(
-				'Could not send mail to "%s" with subject "%s" as validation for address failed',
-				print_r(array_merge($message->getTo(), $message->getCc(), $message->getBcc()), true),
-				$message->getSubject()
-			);
-			$this->logger->debug($logMessage, ['app' => 'core', 'exception' => $e]);
-			$recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
-			$failedRecipients = [];
-
-			array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
-				if (is_numeric($key)) {
-					$failedRecipients[] = $value;
-				} else {
-					$failedRecipients[] = $key;
-				}
-			});
-
-			return $failedRecipients;
-		}
-
-		try {
-			$mailer->send($message->getSymfonyEmail());
-		} catch (TransportExceptionInterface $e) {
-			$logMessage = sprintf('Sending mail to "%s" with subject "%s" failed', print_r($message->getTo(), true), $message->getSubject());
-			$this->logger->debug($logMessage, ['app' => 'core', 'exception' => $e]);
-			if ($debugMode) {
-				$this->logger->debug($e->getDebug(), ['app' => 'core']);
-			}
-			$recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
-			$failedRecipients = [];
-
-			array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
-				if (is_numeric($key)) {
-					$failedRecipients[] = $value;
-				} else {
-					$failedRecipients[] = $key;
-				}
-			});
-
-			return $failedRecipients;
-		}
-
-		// Debugging logging
-		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
-		$this->logger->debug($logMessage, ['app' => 'core']);
-
-		return [];
-	}
-
-	/**
-	 * @deprecated 26.0.0 Implicit validation is done in \OC\Mail\Message::setRecipients
-	 *                    via \Symfony\Component\Mime\Address::__construct
-	 *
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 */
-	public function validateMailAddress(string $email): bool {
-		if ($email === '') {
-			// Shortcut: empty addresses are never valid
-			return false;
-		}
-		$validator = new EmailValidator();
-		$validation = new RFCValidation();
-
-		return $validator->isValid($email, $validation);
-	}
-
-	protected function getInstance(): MailerInterface {
-		if (!is_null($this->instance)) {
-			return $this->instance;
-		}
-
-		$transport = null;
-
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'sendmail':
-				$transport = $this->getSendMailInstance();
-				break;
-			case 'smtp':
-			default:
-				$transport = $this->getSmtpInstance();
-				break;
-		}
-
-		return new SymfonyMailer($transport);
-	}
-
-	/**
-	 * Returns the SMTP transport
-	 *
-	 * Only supports ssl/tls
-	 * starttls is not enforcable with Symfony Mailer but might be available
-	 * via the automatic config (Symfony Mailer internal)
-	 *
-	 * @return EsmtpTransport
-	 */
-	protected function getSmtpInstance(): EsmtpTransport {
-		// either null or true - if nothing is passed, let the symfony mailer figure out the configuration by itself
-		$mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null;
-		$transport = new EsmtpTransport(
-			$this->config->getSystemValue('mail_smtphost', '127.0.0.1'),
-			(int)$this->config->getSystemValue('mail_smtpport', 25),
-			$mailSmtpsecure,
-			null,
-			$this->logger
-		);
-		/** @var SocketStream $stream */
-		$stream = $transport->getStream();
-		/** @psalm-suppress InternalMethod */
-		$stream->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
-
-		if ($this->config->getSystemValue('mail_smtpauth', false)) {
-			$transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
-			$transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
-		}
-
-		$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
-		if (is_array($streamingOptions) && !empty($streamingOptions)) {
-			/** @psalm-suppress InternalMethod */
-			$currentStreamingOptions = $stream->getStreamOptions();
-
-			$currentStreamingOptions = array_merge_recursive($currentStreamingOptions, $streamingOptions);
-
-			/** @psalm-suppress InternalMethod */
-			$stream->setStreamOptions($currentStreamingOptions);
-		}
-
-		$overwriteCliUrl = parse_url(
-			$this->config->getSystemValueString('overwrite.cli.url', ''),
-			PHP_URL_HOST
-		);
-
-		if (!empty($overwriteCliUrl)) {
-			$transport->setLocalDomain($overwriteCliUrl);
-		}
-
-		return $transport;
-	}
-
-	/**
-	 * Returns the sendmail transport
-	 *
-	 * @return SendmailTransport
-	 */
-	protected function getSendMailInstance(): SendmailTransport {
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'qmail':
-				$binaryPath = '/var/qmail/bin/sendmail';
-				break;
-			default:
-				$sendmail = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail');
-				if ($sendmail === null) {
-					$sendmail = '/usr/sbin/sendmail';
-				}
-				$binaryPath = $sendmail;
-				break;
-		}
-
-		switch ($this->config->getSystemValue('mail_sendmailmode', 'smtp')) {
-			case 'pipe':
-				$binaryParam = ' -t';
-				break;
-			default:
-				$binaryParam = ' -bs';
-				break;
-		}
-
-		return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger);
-	}
+    private ?MailerInterface $instance = null;
+    private IConfig $config;
+    private LoggerInterface $logger;
+    private Defaults $defaults;
+    private IURLGenerator $urlGenerator;
+    private IL10N $l10n;
+    private IEventDispatcher $dispatcher;
+    private IFactory $l10nFactory;
+
+    public function __construct(IConfig $config,
+                            LoggerInterface $logger,
+                            Defaults $defaults,
+                            IURLGenerator $urlGenerator,
+                            IL10N $l10n,
+                            IEventDispatcher $dispatcher,
+                            IFactory $l10nFactory) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->defaults = $defaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->dispatcher = $dispatcher;
+        $this->l10nFactory = $l10nFactory;
+    }
+
+    /**
+     * Creates a new message object that can be passed to send()
+     *
+     * @return Message
+     */
+    public function createMessage(): Message {
+        $plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
+        return new Message(new Email(), $plainTextOnly);
+    }
+
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
+        return new Attachment($data, $filename, $contentType);
+    }
+
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
+        return new Attachment(null, null, $contentType, $path);
+    }
+
+    /**
+     * Creates a new email template object
+     *
+     * @param string $emailId
+     * @param array $data
+     * @return IEMailTemplate
+     * @since 12.0.0
+     */
+    public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
+        $class = $this->config->getSystemValue('mail_template_class', '');
+
+        if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
+            return new $class(
+                $this->defaults,
+                $this->urlGenerator,
+                $this->l10nFactory,
+                $emailId,
+                $data
+            );
+        }
+
+        return new EMailTemplate(
+            $this->defaults,
+            $this->urlGenerator,
+            $this->l10nFactory,
+            $emailId,
+            $data
+        );
+    }
+
+    /**
+     * Send the specified message. Also sets the from address to the value defined in config.php
+     * if no-one has been passed.
+     *
+     * If sending failed, the recipients that failed will be returned (to, cc and bcc).
+     * Will output additional debug info if 'mail_smtpdebug' => 'true' is set in config.php
+     *
+     * @param IMessage $message Message to send
+     * @return string[] $failedRecipients
+     */
+    public function send(IMessage $message): array {
+        $debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
+
+        if (!($message instanceof Message)) {
+            throw new InvalidArgumentException('Object not of type ' . Message::class);
+        }
+
+        if (empty($message->getFrom())) {
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]);
+        }
+
+        $mailer = $this->getInstance();
+
+        $this->dispatcher->dispatchTyped(new BeforeMessageSent($message));
+
+        try {
+            $message->setRecipients();
+        } catch (InvalidArgumentException|RfcComplianceException $e) {
+            $logMessage = sprintf(
+                'Could not send mail to "%s" with subject "%s" as validation for address failed',
+                print_r(array_merge($message->getTo(), $message->getCc(), $message->getBcc()), true),
+                $message->getSubject()
+            );
+            $this->logger->debug($logMessage, ['app' => 'core', 'exception' => $e]);
+            $recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
+            $failedRecipients = [];
+
+            array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
+                if (is_numeric($key)) {
+                    $failedRecipients[] = $value;
+                } else {
+                    $failedRecipients[] = $key;
+                }
+            });
+
+            return $failedRecipients;
+        }
+
+        try {
+            $mailer->send($message->getSymfonyEmail());
+        } catch (TransportExceptionInterface $e) {
+            $logMessage = sprintf('Sending mail to "%s" with subject "%s" failed', print_r($message->getTo(), true), $message->getSubject());
+            $this->logger->debug($logMessage, ['app' => 'core', 'exception' => $e]);
+            if ($debugMode) {
+                $this->logger->debug($e->getDebug(), ['app' => 'core']);
+            }
+            $recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
+            $failedRecipients = [];
+
+            array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
+                if (is_numeric($key)) {
+                    $failedRecipients[] = $value;
+                } else {
+                    $failedRecipients[] = $key;
+                }
+            });
+
+            return $failedRecipients;
+        }
+
+        // Debugging logging
+        $logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
+        $this->logger->debug($logMessage, ['app' => 'core']);
+
+        return [];
+    }
+
+    /**
+     * @deprecated 26.0.0 Implicit validation is done in \OC\Mail\Message::setRecipients
+     *                    via \Symfony\Component\Mime\Address::__construct
+     *
+     * @param string $email Email address to be validated
+     * @return bool True if the mail address is valid, false otherwise
+     */
+    public function validateMailAddress(string $email): bool {
+        if ($email === '') {
+            // Shortcut: empty addresses are never valid
+            return false;
+        }
+        $validator = new EmailValidator();
+        $validation = new RFCValidation();
+
+        return $validator->isValid($email, $validation);
+    }
+
+    protected function getInstance(): MailerInterface {
+        if (!is_null($this->instance)) {
+            return $this->instance;
+        }
+
+        $transport = null;
+
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'sendmail':
+                $transport = $this->getSendMailInstance();
+                break;
+            case 'smtp':
+            default:
+                $transport = $this->getSmtpInstance();
+                break;
+        }
+
+        return new SymfonyMailer($transport);
+    }
+
+    /**
+     * Returns the SMTP transport
+     *
+     * Only supports ssl/tls
+     * starttls is not enforcable with Symfony Mailer but might be available
+     * via the automatic config (Symfony Mailer internal)
+     *
+     * @return EsmtpTransport
+     */
+    protected function getSmtpInstance(): EsmtpTransport {
+        // either null or true - if nothing is passed, let the symfony mailer figure out the configuration by itself
+        $mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null;
+        $transport = new EsmtpTransport(
+            $this->config->getSystemValue('mail_smtphost', '127.0.0.1'),
+            (int)$this->config->getSystemValue('mail_smtpport', 25),
+            $mailSmtpsecure,
+            null,
+            $this->logger
+        );
+        /** @var SocketStream $stream */
+        $stream = $transport->getStream();
+        /** @psalm-suppress InternalMethod */
+        $stream->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
+
+        if ($this->config->getSystemValue('mail_smtpauth', false)) {
+            $transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
+            $transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
+        }
+
+        $streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
+        if (is_array($streamingOptions) && !empty($streamingOptions)) {
+            /** @psalm-suppress InternalMethod */
+            $currentStreamingOptions = $stream->getStreamOptions();
+
+            $currentStreamingOptions = array_merge_recursive($currentStreamingOptions, $streamingOptions);
+
+            /** @psalm-suppress InternalMethod */
+            $stream->setStreamOptions($currentStreamingOptions);
+        }
+
+        $overwriteCliUrl = parse_url(
+            $this->config->getSystemValueString('overwrite.cli.url', ''),
+            PHP_URL_HOST
+        );
+
+        if (!empty($overwriteCliUrl)) {
+            $transport->setLocalDomain($overwriteCliUrl);
+        }
+
+        return $transport;
+    }
+
+    /**
+     * Returns the sendmail transport
+     *
+     * @return SendmailTransport
+     */
+    protected function getSendMailInstance(): SendmailTransport {
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'qmail':
+                $binaryPath = '/var/qmail/bin/sendmail';
+                break;
+            default:
+                $sendmail = \OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail');
+                if ($sendmail === null) {
+                    $sendmail = '/usr/sbin/sendmail';
+                }
+                $binaryPath = $sendmail;
+                break;
+        }
+
+        switch ($this->config->getSystemValue('mail_sendmailmode', 'smtp')) {
+            case 'pipe':
+                $binaryParam = ' -t';
+                break;
+            default:
+                $binaryParam = ' -bs';
+                break;
+        }
+
+        return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger);
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -179,7 +179,7 @@ 
 		$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
 
 		if (!($message instanceof Message)) {
-			throw new InvalidArgumentException('Object not of type ' . Message::class);
+			throw new InvalidArgumentException('Object not of type '.Message::class);
 		}
 
 		if (empty($message->getFrom())) {
@@ -192,7 +192,7 @@ 
 
 		try {
 			$message->setRecipients();
-		} catch (InvalidArgumentException|RfcComplianceException $e) {
+		} catch (InvalidArgumentException | RfcComplianceException $e) {
 			$logMessage = sprintf(
 				'Could not send mail to "%s" with subject "%s" as validation for address failed',
 				print_r(array_merge($message->getTo(), $message->getCc(), $message->getBcc()), true),
@@ -202,7 +202,7 @@ 
 			$recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 			$failedRecipients = [];
 
-			array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
+			array_walk($recipients, function($value, $key) use (&$failedRecipients) {
 				if (is_numeric($key)) {
 					$failedRecipients[] = $value;
 				} else {
@@ -224,7 +224,7 @@ 
 			$recipients = array_merge($message->getTo(), $message->getCc(), $message->getBcc());
 			$failedRecipients = [];
 
-			array_walk($recipients, function ($value, $key) use (&$failedRecipients) {
+			array_walk($recipients, function($value, $key) use (&$failedRecipients) {
 				if (is_numeric($key)) {
 					$failedRecipients[] = $value;
 				} else {
@@ -294,7 +294,7 @@ 
 		$mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null;
 		$transport = new EsmtpTransport(
 			$this->config->getSystemValue('mail_smtphost', '127.0.0.1'),
-			(int)$this->config->getSystemValue('mail_smtpport', 25),
+			(int) $this->config->getSystemValue('mail_smtpport', 25),
 			$mailSmtpsecure,
 			null,
 			$this->logger
@@ -360,6 +360,6 @@ 
 				break;
 		}
 
-		return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger);
+		return new SendmailTransport($binaryPath.$binaryParam, null, $this->logger);
 	}
 }

lib/private/Mail/Message.php

Indentation +295 added lines, -295 removed lines

@@ -46,299 +46,299 @@
  * @package OC\Mail
  */
 class Message implements IMessage {
-	private Email $symfonyEmail;
-	private bool $plainTextOnly;
-
-	private array $to;
-	private array $from;
-	private array $replyTo;
-	private array $cc;
-	private array $bcc;
-
-	public function __construct(Email $symfonyEmail, bool $plainTextOnly) {
-		$this->symfonyEmail = $symfonyEmail;
-		$this->plainTextOnly = $plainTextOnly;
-		$this->to = [];
-		$this->from = [];
-		$this->replyTo = [];
-		$this->cc = [];
-		$this->bcc = [];
-	}
-
-	/**
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment): IMessage {
-		/** @var Attachment $attachment */
-		$attachment->attach($this->symfonyEmail);
-		return $this;
-	}
-
-	/**
-	 * Converts the [['displayName' => 'email'], ['displayName2' => 'email2']] arrays to valid Adresses
-	 *
-	 * @param array $addresses Array of mail addresses
-	 * @return Address[]
-	 * @throws RfcComplianceException|InvalidArgumentException
-	 */
-	protected function convertAddresses(array $addresses): array {
-		$convertedAddresses = [];
-
-		if (empty($addresses)) {
-			return [];
-		}
-
-		array_walk($addresses, function ($readableName, $email) use (&$convertedAddresses) {
-			if (is_numeric($email)) {
-				$convertedAddresses[] = new Address($readableName);
-			} else {
-				$convertedAddresses[] = new Address($email, $readableName);
-			}
-		});
-
-		return $convertedAddresses;
-	}
-
-	/**
-	 * Set the from address of this message.
-	 *
-	 * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
-	 *
-	 * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setFrom(array $addresses): IMessage {
-		$this->from = $addresses;
-		return $this;
-	}
-
-	/**
-	 * Get the from address of this message.
-	 */
-	public function getFrom(): array {
-		return $this->from;
-	}
-
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @return $this
-	 */
-	public function setReplyTo(array $addresses): IMessage {
-		$this->replyTo = $addresses;
-		return $this;
-	}
-
-	/**
-	 * Returns the Reply-To address of this message
-	 */
-	public function getReplyTo(): array {
-		return $this->replyTo;
-	}
-
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setTo(array $recipients): IMessage {
-		$this->to = $recipients;
-		return $this;
-	}
-
-	/**
-	 * Get the to address of this message.
-	 */
-	public function getTo(): array {
-		return $this->to;
-	}
-
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setCc(array $recipients): IMessage {
-		$this->cc = $recipients;
-		return $this;
-	}
-
-	/**
-	 * Get the cc address of this message.
-	 */
-	public function getCc(): array {
-		return $this->cc;
-	}
-
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setBcc(array $recipients): IMessage {
-		$this->bcc = $recipients;
-		return $this;
-	}
-
-	/**
-	 * Get the Bcc address of this message.
-	 */
-	public function getBcc(): array {
-		return $this->bcc;
-	}
-
-	/**
-	 * Set the subject of this message.
-	 *
-	 * @return $this
-	 */
-	public function setSubject(string $subject): IMessage {
-		$this->symfonyEmail->subject($subject);
-		return $this;
-	}
-
-	/**
-	 * Get the from subject of this message.
-	 */
-	public function getSubject(): string {
-		return $this->symfonyEmail->getSubject() ?? '';
-	}
-
-	/**
-	 * Set the plain-text body of this message.
-	 * @return $this
-	 */
-	public function setPlainBody(string $body): IMessage {
-		$this->symfonyEmail->text($body);
-		return $this;
-	}
-
-	/**
-	 * Get the plain body of this message.
-	 */
-	public function getPlainBody(): string {
-		/** @var string $body */
-		$body = $this->symfonyEmail->getTextBody() ?? '';
-		return $body;
-	}
-
-	/**
-	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
-	 * @return $this
-	 */
-	public function setHtmlBody(string $body): IMessage {
-		if (!$this->plainTextOnly) {
-			$this->symfonyEmail->html($body);
-		}
-		return $this;
-	}
-
-	/**
-	 * Set the underlying Email intance
-	 */
-	public function setSymfonyEmail(Email $symfonyEmail): void {
-		$this->symfonyEmail = $symfonyEmail;
-	}
-
-	/**
-	 * Get the underlying Email instance
-	 */
-	public function getSymfonyEmail(): Email {
-		return $this->symfonyEmail;
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function setBody(string $body, string $contentType): IMessage {
-		if (!$this->plainTextOnly || $contentType !== 'text/html') {
-			if ($contentType === 'text/html') {
-				$this->symfonyEmail->html($body);
-			} else {
-				$this->symfonyEmail->text($body);
-			}
-		}
-		return $this;
-	}
-
-	/**
-	 * Set the recipients on the symphony email
-	 *
-	 * Since
-	 *
-	 * setTo
-	 * setFrom
-	 * setReplyTo
-	 * setCc
-	 * setBcc
-	 *
-	 * could throw a \Symfony\Component\Mime\Exception\RfcComplianceException
-	 * or a \Symfony\Component\Mime\Exception\InvalidArgumentException
-	 * we wrap the calls here. We then have the validation errors all in one place and can
-	 * throw shortly before \OC\Mail\Mailer::send
-	 *
-	 * @return void
-	 * @throws InvalidArgumentException|RfcComplianceException
-	 */
-	public function setRecipients() {
-		$this->symfonyEmail->to(...$this->convertAddresses($this->getTo()));
-		$this->symfonyEmail->from(...$this->convertAddresses($this->getFrom()));
-		$this->symfonyEmail->replyTo(...$this->convertAddresses($this->getReplyTo()));
-		$this->symfonyEmail->cc(...$this->convertAddresses($this->getCc()));
-		$this->symfonyEmail->bcc(...$this->convertAddresses($this->getBcc()));
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate): IMessage {
-		$this->setSubject($emailTemplate->renderSubject());
-		$this->setPlainBody($emailTemplate->renderText());
-		if (!$this->plainTextOnly) {
-			$this->setHtmlBody($emailTemplate->renderHtml());
-		}
-		return $this;
-	}
-
-	/**
-	 * Add the Auto-Submitted header to the email, preventing most automated
-	 * responses to automated messages.
-	 *
-	 * @param AutoSubmitted::VALUE_* $value (one of AutoSubmitted::VALUE_NO, AutoSubmitted::VALUE_AUTO_GENERATED, AutoSubmitted::VALUE_AUTO_REPLIED)
-	 * @return $this
-	 */
-	public function setAutoSubmitted(string $value): IMessage {
-		$headers = $this->symfonyEmail->getHeaders();
-
-		if ($headers->has(AutoSubmitted::HEADER)) {
-			// if the header already exsists, remove it.
-			// the value can be modified with some implementations
-			// of the interface \Swift_Mime_Header, however the
-			// interface doesn't, and this makes the static-code
-			// analysis unhappy.
-			// @todo check if symfony mailer can modify the autosubmitted header
-			$headers->remove(AutoSubmitted::HEADER);
-		}
-
-		$headers->addTextHeader(AutoSubmitted::HEADER, $value);
-
-		return $this;
-	}
-
-	/**
-	 * Get the current value of the Auto-Submitted header. Defaults to "no"
-	 * which is equivalent to the header not existing at all
-	 *
-	 * @return string
-	 */
-	public function getAutoSubmitted(): string {
-		$headers = $this->symfonyEmail->getHeaders();
-
-		return $headers->has(AutoSubmitted::HEADER) ?
-			$headers->get(AutoSubmitted::HEADER)->getBodyAsString() : AutoSubmitted::VALUE_NO;
-	}
+    private Email $symfonyEmail;
+    private bool $plainTextOnly;
+
+    private array $to;
+    private array $from;
+    private array $replyTo;
+    private array $cc;
+    private array $bcc;
+
+    public function __construct(Email $symfonyEmail, bool $plainTextOnly) {
+        $this->symfonyEmail = $symfonyEmail;
+        $this->plainTextOnly = $plainTextOnly;
+        $this->to = [];
+        $this->from = [];
+        $this->replyTo = [];
+        $this->cc = [];
+        $this->bcc = [];
+    }
+
+    /**
+     * @return $this
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment): IMessage {
+        /** @var Attachment $attachment */
+        $attachment->attach($this->symfonyEmail);
+        return $this;
+    }
+
+    /**
+     * Converts the [['displayName' => 'email'], ['displayName2' => 'email2']] arrays to valid Adresses
+     *
+     * @param array $addresses Array of mail addresses
+     * @return Address[]
+     * @throws RfcComplianceException|InvalidArgumentException
+     */
+    protected function convertAddresses(array $addresses): array {
+        $convertedAddresses = [];
+
+        if (empty($addresses)) {
+            return [];
+        }
+
+        array_walk($addresses, function ($readableName, $email) use (&$convertedAddresses) {
+            if (is_numeric($email)) {
+                $convertedAddresses[] = new Address($readableName);
+            } else {
+                $convertedAddresses[] = new Address($email, $readableName);
+            }
+        });
+
+        return $convertedAddresses;
+    }
+
+    /**
+     * Set the from address of this message.
+     *
+     * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
+     *
+     * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setFrom(array $addresses): IMessage {
+        $this->from = $addresses;
+        return $this;
+    }
+
+    /**
+     * Get the from address of this message.
+     */
+    public function getFrom(): array {
+        return $this->from;
+    }
+
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @return $this
+     */
+    public function setReplyTo(array $addresses): IMessage {
+        $this->replyTo = $addresses;
+        return $this;
+    }
+
+    /**
+     * Returns the Reply-To address of this message
+     */
+    public function getReplyTo(): array {
+        return $this->replyTo;
+    }
+
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setTo(array $recipients): IMessage {
+        $this->to = $recipients;
+        return $this;
+    }
+
+    /**
+     * Get the to address of this message.
+     */
+    public function getTo(): array {
+        return $this->to;
+    }
+
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setCc(array $recipients): IMessage {
+        $this->cc = $recipients;
+        return $this;
+    }
+
+    /**
+     * Get the cc address of this message.
+     */
+    public function getCc(): array {
+        return $this->cc;
+    }
+
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setBcc(array $recipients): IMessage {
+        $this->bcc = $recipients;
+        return $this;
+    }
+
+    /**
+     * Get the Bcc address of this message.
+     */
+    public function getBcc(): array {
+        return $this->bcc;
+    }
+
+    /**
+     * Set the subject of this message.
+     *
+     * @return $this
+     */
+    public function setSubject(string $subject): IMessage {
+        $this->symfonyEmail->subject($subject);
+        return $this;
+    }
+
+    /**
+     * Get the from subject of this message.
+     */
+    public function getSubject(): string {
+        return $this->symfonyEmail->getSubject() ?? '';
+    }
+
+    /**
+     * Set the plain-text body of this message.
+     * @return $this
+     */
+    public function setPlainBody(string $body): IMessage {
+        $this->symfonyEmail->text($body);
+        return $this;
+    }
+
+    /**
+     * Get the plain body of this message.
+     */
+    public function getPlainBody(): string {
+        /** @var string $body */
+        $body = $this->symfonyEmail->getTextBody() ?? '';
+        return $body;
+    }
+
+    /**
+     * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
+     * @return $this
+     */
+    public function setHtmlBody(string $body): IMessage {
+        if (!$this->plainTextOnly) {
+            $this->symfonyEmail->html($body);
+        }
+        return $this;
+    }
+
+    /**
+     * Set the underlying Email intance
+     */
+    public function setSymfonyEmail(Email $symfonyEmail): void {
+        $this->symfonyEmail = $symfonyEmail;
+    }
+
+    /**
+     * Get the underlying Email instance
+     */
+    public function getSymfonyEmail(): Email {
+        return $this->symfonyEmail;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setBody(string $body, string $contentType): IMessage {
+        if (!$this->plainTextOnly || $contentType !== 'text/html') {
+            if ($contentType === 'text/html') {
+                $this->symfonyEmail->html($body);
+            } else {
+                $this->symfonyEmail->text($body);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set the recipients on the symphony email
+     *
+     * Since
+     *
+     * setTo
+     * setFrom
+     * setReplyTo
+     * setCc
+     * setBcc
+     *
+     * could throw a \Symfony\Component\Mime\Exception\RfcComplianceException
+     * or a \Symfony\Component\Mime\Exception\InvalidArgumentException
+     * we wrap the calls here. We then have the validation errors all in one place and can
+     * throw shortly before \OC\Mail\Mailer::send
+     *
+     * @return void
+     * @throws InvalidArgumentException|RfcComplianceException
+     */
+    public function setRecipients() {
+        $this->symfonyEmail->to(...$this->convertAddresses($this->getTo()));
+        $this->symfonyEmail->from(...$this->convertAddresses($this->getFrom()));
+        $this->symfonyEmail->replyTo(...$this->convertAddresses($this->getReplyTo()));
+        $this->symfonyEmail->cc(...$this->convertAddresses($this->getCc()));
+        $this->symfonyEmail->bcc(...$this->convertAddresses($this->getBcc()));
+    }
+
+    /**
+     * @return $this
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate): IMessage {
+        $this->setSubject($emailTemplate->renderSubject());
+        $this->setPlainBody($emailTemplate->renderText());
+        if (!$this->plainTextOnly) {
+            $this->setHtmlBody($emailTemplate->renderHtml());
+        }
+        return $this;
+    }
+
+    /**
+     * Add the Auto-Submitted header to the email, preventing most automated
+     * responses to automated messages.
+     *
+     * @param AutoSubmitted::VALUE_* $value (one of AutoSubmitted::VALUE_NO, AutoSubmitted::VALUE_AUTO_GENERATED, AutoSubmitted::VALUE_AUTO_REPLIED)
+     * @return $this
+     */
+    public function setAutoSubmitted(string $value): IMessage {
+        $headers = $this->symfonyEmail->getHeaders();
+
+        if ($headers->has(AutoSubmitted::HEADER)) {
+            // if the header already exsists, remove it.
+            // the value can be modified with some implementations
+            // of the interface \Swift_Mime_Header, however the
+            // interface doesn't, and this makes the static-code
+            // analysis unhappy.
+            // @todo check if symfony mailer can modify the autosubmitted header
+            $headers->remove(AutoSubmitted::HEADER);
+        }
+
+        $headers->addTextHeader(AutoSubmitted::HEADER, $value);
+
+        return $this;
+    }
+
+    /**
+     * Get the current value of the Auto-Submitted header. Defaults to "no"
+     * which is equivalent to the header not existing at all
+     *
+     * @return string
+     */
+    public function getAutoSubmitted(): string {
+        $headers = $this->symfonyEmail->getHeaders();
+
+        return $headers->has(AutoSubmitted::HEADER) ?
+            $headers->get(AutoSubmitted::HEADER)->getBodyAsString() : AutoSubmitted::VALUE_NO;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 			return [];
 		}
 
-		array_walk($addresses, function ($readableName, $email) use (&$convertedAddresses) {
+		array_walk($addresses, function($readableName, $email) use (&$convertedAddresses) {
 			if (is_numeric($email)) {
 				$convertedAddresses[] = new Address($readableName);
 			} else {