nextcloud / server

lib/public/Mail/Headers/AutoSubmitted.php

Indentation +32 added lines, -32 removed lines

@@ -37,39 +37,39 @@
  */
 final class AutoSubmitted {
 
-	/**
-	 * Name of the Header as used in the final message later
-	 *
-	 * @var string
-	 * @since 26.0.0
-	 */
-	public const HEADER = 'Auto-Submitted';
+    /**
+     * Name of the Header as used in the final message later
+     *
+     * @var string
+     * @since 26.0.0
+     */
+    public const HEADER = 'Auto-Submitted';
 
-	/**
-	 * Indicates that a message was NOT automatically generated, but was
-	 * created by a human (or following human interaction). It is the equivalent
-	 * to the absence of an Auto-Submitted header altogether.
-	 *
-	 * @var string
-	 * @since 26.0.0
-	 */
-	public const VALUE_NO = 'no';
+    /**
+     * Indicates that a message was NOT automatically generated, but was
+     * created by a human (or following human interaction). It is the equivalent
+     * to the absence of an Auto-Submitted header altogether.
+     *
+     * @var string
+     * @since 26.0.0
+     */
+    public const VALUE_NO = 'no';
 
-	/**
-	 * Indicates that a message was generated by an automatic process, and is
-	 * not a direct response to another message
-	 *
-	 * @var string
-	 * @since 26.0.0
-	 */
-	public const VALUE_AUTO_GENERATED = 'auto-generated';
+    /**
+     * Indicates that a message was generated by an automatic process, and is
+     * not a direct response to another message
+     *
+     * @var string
+     * @since 26.0.0
+     */
+    public const VALUE_AUTO_GENERATED = 'auto-generated';
 
-	/**
-	 * Indicates that a message was automatically generated as a direct response
-	 * to another message.
-	 *
-	 * @var string
-	 * @since 26.0.0
-	 */
-	public const VALUE_AUTO_REPLIED = 'auto-replied';
+    /**
+     * Indicates that a message was automatically generated as a direct response
+     * to another message.
+     *
+     * @var string
+     * @since 26.0.0
+     */
+    public const VALUE_AUTO_REPLIED = 'auto-replied';
 }

lib/public/Mail/IMessage.php

Indentation +63 added lines, -63 removed lines

@@ -33,74 +33,74 @@
  */
 interface IMessage {
 
-	/**
-	 * @param IAttachment $attachment
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment): IMessage;
+    /**
+     * @param IAttachment $attachment
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment): IMessage;
 
-	/**
-	 * 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 IMessage
-	 * @since 13.0.0
-	 */
-	public function setFrom(array $addresses): IMessage;
+    /**
+     * 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 IMessage
+     * @since 13.0.0
+     */
+    public function setFrom(array $addresses): IMessage;
 
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setReplyTo(array $addresses): IMessage;
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setReplyTo(array $addresses): IMessage;
 
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setTo(array $recipients): IMessage;
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setTo(array $recipients): IMessage;
 
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setCc(array $recipients): IMessage;
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setCc(array $recipients): IMessage;
 
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function setBcc(array $recipients): IMessage;
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function setBcc(array $recipients): IMessage;
 
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @return IMessage
-	 * @since 13.0.0
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate): IMessage;
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @return IMessage
+     * @since 13.0.0
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate): IMessage;
 
-	/**
-	 * Add the Auto-Submitted header to the email, preventing most automated
-	 * responses to automated messages.
-	 *
-	 * @param Headers\AutoSubmitted::VALUE_* $value (one of AutoSubmitted::VALUE_NO, AutoSubmitted::VALUE_AUTO_GENERATED, AutoSubmitted::VALUE_AUTO_REPLIED)
-	 * @return IMessage
-	 * @since 26.0.0
-	 */
-	public function setAutoSubmitted(string $value): IMessage;
+    /**
+     * Add the Auto-Submitted header to the email, preventing most automated
+     * responses to automated messages.
+     *
+     * @param Headers\AutoSubmitted::VALUE_* $value (one of AutoSubmitted::VALUE_NO, AutoSubmitted::VALUE_AUTO_GENERATED, AutoSubmitted::VALUE_AUTO_REPLIED)
+     * @return IMessage
+     * @since 26.0.0
+     */
+    public function setAutoSubmitted(string $value): IMessage;
 }

lib/private/Mail/Message.php

Indentation +296 added lines, -296 removed lines

@@ -43,300 +43,300 @@
  * @package OC\Mail
  */
 class Message implements IMessage {
-	/** @var Swift_Message */
-	private $swiftMessage;
-	/** @var bool */
-	private $plainTextOnly;
-
-	public function __construct(Swift_Message $swiftMessage, bool $plainTextOnly) {
-		$this->swiftMessage = $swiftMessage;
-		$this->plainTextOnly = $plainTextOnly;
-	}
-
-	/**
-	 * @param IAttachment $attachment
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment): IMessage {
-		/** @var Attachment $attachment */
-		$this->swiftMessage->attach($attachment->getSwiftAttachment());
-		return $this;
-	}
-
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param array $addresses Array of mail addresses, key will get converted
-	 * @return array Converted addresses if `idn_to_ascii` exists
-	 */
-	protected function convertAddresses(array $addresses): array {
-		if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) {
-			return $addresses;
-		}
-
-		$convertedAddresses = [];
-
-		foreach ($addresses as $email => $readableName) {
-			$parsableEmail = is_numeric($email) ? $readableName : $email;
-			if (strpos($parsableEmail, '@') === false) {
-				$convertedAddresses[$parsableEmail] = $readableName;
-				continue;
-			}
-
-			[$name, $domain] = explode('@', $parsableEmail, 2);
-			$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
-			if (is_numeric($email)) {
-				$convertedAddresses[] = $name . '@' . $domain;
-			} else {
-				$convertedAddresses[$name . '@' . $domain] = $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 {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setFrom($addresses);
-		return $this;
-	}
-
-	/**
-	 * Get the from address of this message.
-	 *
-	 * @return array
-	 */
-	public function getFrom(): array {
-		return $this->swiftMessage->getFrom() ?? [];
-	}
-
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return $this
-	 */
-	public function setReplyTo(array $addresses): IMessage {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setReplyTo($addresses);
-		return $this;
-	}
-
-	/**
-	 * Returns the Reply-To address of this message
-	 *
-	 * @return string
-	 */
-	public function getReplyTo(): string {
-		return $this->swiftMessage->getReplyTo();
-	}
-
-	/**
-	 * 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 {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setTo($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the to address of this message.
-	 *
-	 * @return array
-	 */
-	public function getTo(): array {
-		return $this->swiftMessage->getTo() ?? [];
-	}
-
-	/**
-	 * 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 {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setCc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the cc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getCc(): array {
-		return $this->swiftMessage->getCc() ?? [];
-	}
-
-	/**
-	 * 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 {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setBcc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the Bcc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getBcc(): array {
-		return $this->swiftMessage->getBcc() ?? [];
-	}
-
-	/**
-	 * Set the subject of this message.
-	 *
-	 * @param string $subject
-	 * @return IMessage
-	 */
-	public function setSubject(string $subject): IMessage {
-		$this->swiftMessage->setSubject($subject);
-		return $this;
-	}
-
-	/**
-	 * Get the from subject of this message.
-	 *
-	 * @return string
-	 */
-	public function getSubject(): string {
-		return $this->swiftMessage->getSubject();
-	}
-
-	/**
-	 * Set the plain-text body of this message.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setPlainBody(string $body): IMessage {
-		$this->swiftMessage->setBody($body);
-		return $this;
-	}
-
-	/**
-	 * Get the plain body of this message.
-	 *
-	 * @return string
-	 */
-	public function getPlainBody(): string {
-		return $this->swiftMessage->getBody();
-	}
-
-	/**
-	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setHtmlBody($body) {
-		if (!$this->plainTextOnly) {
-			$this->swiftMessage->addPart($body, 'text/html');
-		}
-		return $this;
-	}
-
-	/**
-	 * Get's the underlying SwiftMessage
-	 * @param Swift_Message $swiftMessage
-	 */
-	public function setSwiftMessage(Swift_Message $swiftMessage): void {
-		$this->swiftMessage = $swiftMessage;
-	}
-
-	/**
-	 * Get's the underlying SwiftMessage
-	 * @return Swift_Message
-	 */
-	public function getSwiftMessage(): Swift_Message {
-		return $this->swiftMessage;
-	}
-
-	/**
-	 * @param string $body
-	 * @param string $contentType
-	 * @return $this
-	 */
-	public function setBody($body, $contentType) {
-		if (!$this->plainTextOnly || $contentType !== 'text/html') {
-			$this->swiftMessage->setBody($body, $contentType);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @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->swiftMessage->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.
-			$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->swiftMessage->getHeaders();
-
-		return $headers->has(AutoSubmitted::HEADER) ?
-			$headers->get(AutoSubmitted::HEADER)->toString() : AutoSubmitted::VALUE_NO;
-	}
+    /** @var Swift_Message */
+    private $swiftMessage;
+    /** @var bool */
+    private $plainTextOnly;
+
+    public function __construct(Swift_Message $swiftMessage, bool $plainTextOnly) {
+        $this->swiftMessage = $swiftMessage;
+        $this->plainTextOnly = $plainTextOnly;
+    }
+
+    /**
+     * @param IAttachment $attachment
+     * @return $this
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment): IMessage {
+        /** @var Attachment $attachment */
+        $this->swiftMessage->attach($attachment->getSwiftAttachment());
+        return $this;
+    }
+
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param array $addresses Array of mail addresses, key will get converted
+     * @return array Converted addresses if `idn_to_ascii` exists
+     */
+    protected function convertAddresses(array $addresses): array {
+        if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) {
+            return $addresses;
+        }
+
+        $convertedAddresses = [];
+
+        foreach ($addresses as $email => $readableName) {
+            $parsableEmail = is_numeric($email) ? $readableName : $email;
+            if (strpos($parsableEmail, '@') === false) {
+                $convertedAddresses[$parsableEmail] = $readableName;
+                continue;
+            }
+
+            [$name, $domain] = explode('@', $parsableEmail, 2);
+            $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+            if (is_numeric($email)) {
+                $convertedAddresses[] = $name . '@' . $domain;
+            } else {
+                $convertedAddresses[$name . '@' . $domain] = $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 {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setFrom($addresses);
+        return $this;
+    }
+
+    /**
+     * Get the from address of this message.
+     *
+     * @return array
+     */
+    public function getFrom(): array {
+        return $this->swiftMessage->getFrom() ?? [];
+    }
+
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return $this
+     */
+    public function setReplyTo(array $addresses): IMessage {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setReplyTo($addresses);
+        return $this;
+    }
+
+    /**
+     * Returns the Reply-To address of this message
+     *
+     * @return string
+     */
+    public function getReplyTo(): string {
+        return $this->swiftMessage->getReplyTo();
+    }
+
+    /**
+     * 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 {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setTo($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the to address of this message.
+     *
+     * @return array
+     */
+    public function getTo(): array {
+        return $this->swiftMessage->getTo() ?? [];
+    }
+
+    /**
+     * 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 {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setCc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the cc address of this message.
+     *
+     * @return array
+     */
+    public function getCc(): array {
+        return $this->swiftMessage->getCc() ?? [];
+    }
+
+    /**
+     * 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 {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setBcc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the Bcc address of this message.
+     *
+     * @return array
+     */
+    public function getBcc(): array {
+        return $this->swiftMessage->getBcc() ?? [];
+    }
+
+    /**
+     * Set the subject of this message.
+     *
+     * @param string $subject
+     * @return IMessage
+     */
+    public function setSubject(string $subject): IMessage {
+        $this->swiftMessage->setSubject($subject);
+        return $this;
+    }
+
+    /**
+     * Get the from subject of this message.
+     *
+     * @return string
+     */
+    public function getSubject(): string {
+        return $this->swiftMessage->getSubject();
+    }
+
+    /**
+     * Set the plain-text body of this message.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setPlainBody(string $body): IMessage {
+        $this->swiftMessage->setBody($body);
+        return $this;
+    }
+
+    /**
+     * Get the plain body of this message.
+     *
+     * @return string
+     */
+    public function getPlainBody(): string {
+        return $this->swiftMessage->getBody();
+    }
+
+    /**
+     * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setHtmlBody($body) {
+        if (!$this->plainTextOnly) {
+            $this->swiftMessage->addPart($body, 'text/html');
+        }
+        return $this;
+    }
+
+    /**
+     * Get's the underlying SwiftMessage
+     * @param Swift_Message $swiftMessage
+     */
+    public function setSwiftMessage(Swift_Message $swiftMessage): void {
+        $this->swiftMessage = $swiftMessage;
+    }
+
+    /**
+     * Get's the underlying SwiftMessage
+     * @return Swift_Message
+     */
+    public function getSwiftMessage(): Swift_Message {
+        return $this->swiftMessage;
+    }
+
+    /**
+     * @param string $body
+     * @param string $contentType
+     * @return $this
+     */
+    public function setBody($body, $contentType) {
+        if (!$this->plainTextOnly || $contentType !== 'text/html') {
+            $this->swiftMessage->setBody($body, $contentType);
+        }
+        return $this;
+    }
+
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @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->swiftMessage->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.
+            $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->swiftMessage->getHeaders();
+
+        return $headers->has(AutoSubmitted::HEADER) ?
+            $headers->get(AutoSubmitted::HEADER)->toString() : AutoSubmitted::VALUE_NO;
+    }
 }

apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php

Indentation +410 added lines, -410 removed lines

@@ -52,414 +52,414 @@
  * @package OCA\DAV\CalDAV\Reminder\NotificationProvider
  */
 class EmailProvider extends AbstractProvider {
-	/** @var string */
-	public const NOTIFICATION_TYPE = 'EMAIL';
-
-	private IMailer $mailer;
-
-	public function __construct(IConfig $config,
-								IMailer $mailer,
-								LoggerInterface $logger,
-								L10NFactory $l10nFactory,
-								IURLGenerator $urlGenerator) {
-		parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
-		$this->mailer = $mailer;
-	}
-
-	/**
-	 * Send out notification via email
-	 *
-	 * @param VEvent $vevent
-	 * @param string $calendarDisplayName
-	 * @param string[] $principalEmailAddresses
-	 * @param array $users
-	 * @throws \Exception
-	 */
-	public function send(VEvent $vevent,
-						 string $calendarDisplayName,
-						 array $principalEmailAddresses,
-						 array $users = []):void {
-		$fallbackLanguage = $this->getFallbackLanguage();
-
-		$organizerEmailAddress = null;
-		if (isset($vevent->ORGANIZER)) {
-			$organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
-		}
-
-		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
-		$emailAddressesOfAttendees = [];
-		if (count($principalEmailAddresses) === 0
-			|| ($organizerEmailAddress && in_array($organizerEmailAddress, $principalEmailAddresses, true))
-		) {
-			$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
-		}
-
-		// Quote from php.net:
-		// If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
-		// => if there are duplicate email addresses, it will always take the system value
-		$emailAddresses = array_merge(
-			$emailAddressesOfAttendees,
-			$emailAddressesOfSharees
-		);
-
-		$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
-		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
-
-		foreach ($sortedByLanguage as $lang => $emailAddresses) {
-			if (!$this->hasL10NForLang($lang)) {
-				$lang = $fallbackLanguage;
-			}
-			$l10n = $this->getL10NForLang($lang);
-			$fromEMail = \OCP\Util::getDefaultEmailAddress('reminders-noreply');
-
-			$template = $this->mailer->createEMailTemplate('dav.calendarReminder');
-			$template->addHeader();
-			$this->addSubjectAndHeading($template, $l10n, $vevent);
-			$this->addBulletList($template, $l10n, $calendarDisplayName, $vevent);
-			$template->addFooter();
-
-			foreach ($emailAddresses as $emailAddress) {
-				if (!$this->mailer->validateMailAddress($emailAddress)) {
-					$this->logger->error('Email address {address} for reminder notification is incorrect', ['app' => 'dav', 'address' => $emailAddress]);
-					continue;
-				}
-
-				$message = $this->mailer->createMessage();
-				$message->setFrom([$fromEMail]);
-				if ($organizer) {
-					$message->setReplyTo($organizer);
-				}
-				$message->setTo([$emailAddress]);
-				$message->useTemplate($template);
-				$message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
-
-				try {
-					$failed = $this->mailer->send($message);
-					if ($failed) {
-						$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-					}
-				} catch (\Exception $ex) {
-					$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param VEvent $vevent
-	 */
-	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
-		$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
-		$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param string $calendarDisplayName
-	 * @param array $eventData
-	 */
-	private function addBulletList(IEMailTemplate $template,
-								   IL10N $l10n,
-								   string $calendarDisplayName,
-								   VEvent $vevent):void {
-		$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
-			$this->getAbsoluteImagePath('actions/info.png'));
-
-		$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
-			$this->getAbsoluteImagePath('places/calendar.png'));
-
-		if (isset($vevent->LOCATION)) {
-			$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
-				$this->getAbsoluteImagePath('actions/address.png'));
-		}
-		if (isset($vevent->DESCRIPTION)) {
-			$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('actions/more.png'));
-		}
-	}
-
-	private function getAbsoluteImagePath(string $path):string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array|null
-	 */
-	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
-		if (!$vevent->ORGANIZER) {
-			return null;
-		}
-
-		$organizer = $vevent->ORGANIZER;
-		if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
-			return null;
-		}
-
-		$organizerEMail = substr($organizer->getValue(), 7);
-
-		if (!$this->mailer->validateMailAddress($organizerEMail)) {
-			return null;
-		}
-
-		$name = $organizer->offsetGet('CN');
-		if ($name instanceof Parameter) {
-			return [$organizerEMail => $name];
-		}
-
-		return [$organizerEMail];
-	}
-
-	/**
-	 * @param array<string, array{LANG?: string}> $emails
-	 * @return array<string, string[]>
-	 */
-	private function sortEMailAddressesByLanguage(array $emails,
-												  string $defaultLanguage):array {
-		$sortedByLanguage = [];
-
-		foreach ($emails as $emailAddress => $parameters) {
-			if (isset($parameters['LANG'])) {
-				$lang = $parameters['LANG'];
-			} else {
-				$lang = $defaultLanguage;
-			}
-
-			if (!isset($sortedByLanguage[$lang])) {
-				$sortedByLanguage[$lang] = [];
-			}
-
-			$sortedByLanguage[$lang][] = $emailAddress;
-		}
-
-		return $sortedByLanguage;
-	}
-
-	/**
-	 * @param VEvent $vevent
-	 * @return array<string, array{LANG?: string}>
-	 */
-	private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
-		$emailAddresses = [];
-
-		if (isset($vevent->ATTENDEE)) {
-			foreach ($vevent->ATTENDEE as $attendee) {
-				if (!($attendee instanceof VObject\Property)) {
-					continue;
-				}
-
-				$cuType = $this->getCUTypeOfAttendee($attendee);
-				if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
-					// Don't send emails to things
-					continue;
-				}
-
-				$partstat = $this->getPartstatOfAttendee($attendee);
-				if ($partstat === 'DECLINED') {
-					// Don't send out emails to people who declined
-					continue;
-				}
-				if ($partstat === 'DELEGATED') {
-					$delegates = $attendee->offsetGet('DELEGATED-TO');
-					if (!($delegates instanceof VObject\Parameter)) {
-						continue;
-					}
-
-					$emailAddressesOfDelegates = $delegates->getParts();
-					foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
-						if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
-							$delegateEmail = substr($addressesOfDelegate, 7);
-							if ($this->mailer->validateMailAddress($delegateEmail)) {
-								$emailAddresses[$delegateEmail] = [];
-							}
-						}
-					}
-
-					continue;
-				}
-
-				$emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
-				if ($emailAddressOfAttendee !== null) {
-					$properties = [];
-
-					$langProp = $attendee->offsetGet('LANG');
-					if ($langProp instanceof VObject\Parameter && $langProp->getValue() !== null) {
-						$properties['LANG'] = $langProp->getValue();
-					}
-
-					$emailAddresses[$emailAddressOfAttendee] = $properties;
-				}
-			}
-		}
-
-		if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
-			$organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
-			if ($organizerEmailAddress !== null) {
-				$emailAddresses[$organizerEmailAddress] = [];
-			}
-		}
-
-		return $emailAddresses;
-	}
-
-	private function getCUTypeOfAttendee(VObject\Property $attendee):string {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if ($cuType instanceof VObject\Parameter) {
-			return strtoupper($cuType->getValue());
-		}
-
-		return 'INDIVIDUAL';
-	}
-
-	private function getPartstatOfAttendee(VObject\Property $attendee):string {
-		$partstat = $attendee->offsetGet('PARTSTAT');
-		if ($partstat instanceof VObject\Parameter) {
-			return strtoupper($partstat->getValue());
-		}
-
-		return 'NEEDS-ACTION';
-	}
-
-	private function hasAttendeeMailURI(VObject\Property $attendee): bool {
-		return stripos($attendee->getValue(), 'mailto:') === 0;
-	}
-
-	private function getEMailAddressOfAttendee(VObject\Property $attendee): ?string {
-		if (!$this->hasAttendeeMailURI($attendee)) {
-			return null;
-		}
-		$attendeeEMail = substr($attendee->getValue(), 7);
-		if (!$this->mailer->validateMailAddress($attendeeEMail)) {
-			return null;
-		}
-
-		return $attendeeEMail;
-	}
-
-	/**
-	 * @param IUser[] $users
-	 * @return array<string, array{LANG?: string}>
-	 */
-	private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
-		$emailAddresses = [];
-
-		foreach ($users as $user) {
-			$emailAddress = $user->getEMailAddress();
-			if ($emailAddress) {
-				$lang = $this->l10nFactory->getUserLanguage($user);
-				if ($lang) {
-					$emailAddresses[$emailAddress] = [
-						'LANG' => $lang,
-					];
-				} else {
-					$emailAddresses[$emailAddress] = [];
-				}
-			}
-		}
-
-		return $emailAddresses;
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	private function generateDateString(IL10N $l10n, VEvent $vevent): string {
-		$isAllDay = $vevent->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 = $vevent->DTSTART->getDateTime();
-		/** @var \DateTimeImmutable $dtendDt */
-		$dtendDt = $this->getDTEndFromEvent($vevent)->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 $this->getDateString($l10n, $dtstartDt);
-			}
-
-			return implode(' - ', [
-				$this->getDateString($l10n, $dtstartDt),
-				$this->getDateString($l10n, $dtendDt),
-			]);
-		}
-
-		$startTimezone = $endTimezone = null;
-		if (!$vevent->DTSTART->isFloating()) {
-			$startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
-			$endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
-		}
-
-		$localeStart = implode(', ', [
-			$this->getWeekDayName($l10n, $dtstartDt),
-			$this->getDateTimeString($l10n, $dtstartDt)
-		]);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-			return $localeStart
-				. ' (' . $startTimezone . ') '
-				. ' - '
-				. $localeEnd
-				. ' (' . $endTimezone . ')';
-		}
-
-		// Show only the time if the day is the same
-		$localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
-			? $this->getTimeString($l10n, $dtendDt)
-			: implode(', ', [
-				$this->getWeekDayName($l10n, $dtendDt),
-				$this->getDateTimeString($l10n, $dtendDt)
-			]);
-
-		return $localeStart
-			. ' - '
-			. $localeEnd
-			. ' (' . $startTimezone . ')';
-	}
-
-	private function isDayEqual(DateTime $dtStart,
-								DateTime $dtEnd):bool {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
-	}
-
-	private function getDateString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('date', $dt, ['width' => 'medium']);
-	}
-
-	private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('datetime', $dt, ['width' => 'medium|short']);
-	}
-
-	private function getTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('time', $dt, ['width' => 'short']);
-	}
-
-	private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
-		if (isset($vevent->SUMMARY)) {
-			return (string)$vevent->SUMMARY;
-		}
-
-		return $l10n->t('Untitled event');
-	}
+    /** @var string */
+    public const NOTIFICATION_TYPE = 'EMAIL';
+
+    private IMailer $mailer;
+
+    public function __construct(IConfig $config,
+                                IMailer $mailer,
+                                LoggerInterface $logger,
+                                L10NFactory $l10nFactory,
+                                IURLGenerator $urlGenerator) {
+        parent::__construct($logger, $l10nFactory, $urlGenerator, $config);
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Send out notification via email
+     *
+     * @param VEvent $vevent
+     * @param string $calendarDisplayName
+     * @param string[] $principalEmailAddresses
+     * @param array $users
+     * @throws \Exception
+     */
+    public function send(VEvent $vevent,
+                            string $calendarDisplayName,
+                            array $principalEmailAddresses,
+                            array $users = []):void {
+        $fallbackLanguage = $this->getFallbackLanguage();
+
+        $organizerEmailAddress = null;
+        if (isset($vevent->ORGANIZER)) {
+            $organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
+        }
+
+        $emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
+        $emailAddressesOfAttendees = [];
+        if (count($principalEmailAddresses) === 0
+            || ($organizerEmailAddress && in_array($organizerEmailAddress, $principalEmailAddresses, true))
+        ) {
+            $emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
+        }
+
+        // Quote from php.net:
+        // If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
+        // => if there are duplicate email addresses, it will always take the system value
+        $emailAddresses = array_merge(
+            $emailAddressesOfAttendees,
+            $emailAddressesOfSharees
+        );
+
+        $sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
+        $organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
+
+        foreach ($sortedByLanguage as $lang => $emailAddresses) {
+            if (!$this->hasL10NForLang($lang)) {
+                $lang = $fallbackLanguage;
+            }
+            $l10n = $this->getL10NForLang($lang);
+            $fromEMail = \OCP\Util::getDefaultEmailAddress('reminders-noreply');
+
+            $template = $this->mailer->createEMailTemplate('dav.calendarReminder');
+            $template->addHeader();
+            $this->addSubjectAndHeading($template, $l10n, $vevent);
+            $this->addBulletList($template, $l10n, $calendarDisplayName, $vevent);
+            $template->addFooter();
+
+            foreach ($emailAddresses as $emailAddress) {
+                if (!$this->mailer->validateMailAddress($emailAddress)) {
+                    $this->logger->error('Email address {address} for reminder notification is incorrect', ['app' => 'dav', 'address' => $emailAddress]);
+                    continue;
+                }
+
+                $message = $this->mailer->createMessage();
+                $message->setFrom([$fromEMail]);
+                if ($organizer) {
+                    $message->setReplyTo($organizer);
+                }
+                $message->setTo([$emailAddress]);
+                $message->useTemplate($template);
+                $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
+
+                try {
+                    $failed = $this->mailer->send($message);
+                    if ($failed) {
+                        $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                    }
+                } catch (\Exception $ex) {
+                    $this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param VEvent $vevent
+     */
+    private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
+        $template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
+        $template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param string $calendarDisplayName
+     * @param array $eventData
+     */
+    private function addBulletList(IEMailTemplate $template,
+                                    IL10N $l10n,
+                                    string $calendarDisplayName,
+                                    VEvent $vevent):void {
+        $template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
+            $this->getAbsoluteImagePath('actions/info.png'));
+
+        $template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
+            $this->getAbsoluteImagePath('places/calendar.png'));
+
+        if (isset($vevent->LOCATION)) {
+            $template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
+                $this->getAbsoluteImagePath('actions/address.png'));
+        }
+        if (isset($vevent->DESCRIPTION)) {
+            $template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
+                $this->getAbsoluteImagePath('actions/more.png'));
+        }
+    }
+
+    private function getAbsoluteImagePath(string $path):string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array|null
+     */
+    private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
+        if (!$vevent->ORGANIZER) {
+            return null;
+        }
+
+        $organizer = $vevent->ORGANIZER;
+        if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
+            return null;
+        }
+
+        $organizerEMail = substr($organizer->getValue(), 7);
+
+        if (!$this->mailer->validateMailAddress($organizerEMail)) {
+            return null;
+        }
+
+        $name = $organizer->offsetGet('CN');
+        if ($name instanceof Parameter) {
+            return [$organizerEMail => $name];
+        }
+
+        return [$organizerEMail];
+    }
+
+    /**
+     * @param array<string, array{LANG?: string}> $emails
+     * @return array<string, string[]>
+     */
+    private function sortEMailAddressesByLanguage(array $emails,
+                                                    string $defaultLanguage):array {
+        $sortedByLanguage = [];
+
+        foreach ($emails as $emailAddress => $parameters) {
+            if (isset($parameters['LANG'])) {
+                $lang = $parameters['LANG'];
+            } else {
+                $lang = $defaultLanguage;
+            }
+
+            if (!isset($sortedByLanguage[$lang])) {
+                $sortedByLanguage[$lang] = [];
+            }
+
+            $sortedByLanguage[$lang][] = $emailAddress;
+        }
+
+        return $sortedByLanguage;
+    }
+
+    /**
+     * @param VEvent $vevent
+     * @return array<string, array{LANG?: string}>
+     */
+    private function getAllEMailAddressesFromEvent(VEvent $vevent):array {
+        $emailAddresses = [];
+
+        if (isset($vevent->ATTENDEE)) {
+            foreach ($vevent->ATTENDEE as $attendee) {
+                if (!($attendee instanceof VObject\Property)) {
+                    continue;
+                }
+
+                $cuType = $this->getCUTypeOfAttendee($attendee);
+                if (\in_array($cuType, ['RESOURCE', 'ROOM', 'UNKNOWN'])) {
+                    // Don't send emails to things
+                    continue;
+                }
+
+                $partstat = $this->getPartstatOfAttendee($attendee);
+                if ($partstat === 'DECLINED') {
+                    // Don't send out emails to people who declined
+                    continue;
+                }
+                if ($partstat === 'DELEGATED') {
+                    $delegates = $attendee->offsetGet('DELEGATED-TO');
+                    if (!($delegates instanceof VObject\Parameter)) {
+                        continue;
+                    }
+
+                    $emailAddressesOfDelegates = $delegates->getParts();
+                    foreach ($emailAddressesOfDelegates as $addressesOfDelegate) {
+                        if (strcasecmp($addressesOfDelegate, 'mailto:') === 0) {
+                            $delegateEmail = substr($addressesOfDelegate, 7);
+                            if ($this->mailer->validateMailAddress($delegateEmail)) {
+                                $emailAddresses[$delegateEmail] = [];
+                            }
+                        }
+                    }
+
+                    continue;
+                }
+
+                $emailAddressOfAttendee = $this->getEMailAddressOfAttendee($attendee);
+                if ($emailAddressOfAttendee !== null) {
+                    $properties = [];
+
+                    $langProp = $attendee->offsetGet('LANG');
+                    if ($langProp instanceof VObject\Parameter && $langProp->getValue() !== null) {
+                        $properties['LANG'] = $langProp->getValue();
+                    }
+
+                    $emailAddresses[$emailAddressOfAttendee] = $properties;
+                }
+            }
+        }
+
+        if (isset($vevent->ORGANIZER) && $this->hasAttendeeMailURI($vevent->ORGANIZER)) {
+            $organizerEmailAddress = $this->getEMailAddressOfAttendee($vevent->ORGANIZER);
+            if ($organizerEmailAddress !== null) {
+                $emailAddresses[$organizerEmailAddress] = [];
+            }
+        }
+
+        return $emailAddresses;
+    }
+
+    private function getCUTypeOfAttendee(VObject\Property $attendee):string {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if ($cuType instanceof VObject\Parameter) {
+            return strtoupper($cuType->getValue());
+        }
+
+        return 'INDIVIDUAL';
+    }
+
+    private function getPartstatOfAttendee(VObject\Property $attendee):string {
+        $partstat = $attendee->offsetGet('PARTSTAT');
+        if ($partstat instanceof VObject\Parameter) {
+            return strtoupper($partstat->getValue());
+        }
+
+        return 'NEEDS-ACTION';
+    }
+
+    private function hasAttendeeMailURI(VObject\Property $attendee): bool {
+        return stripos($attendee->getValue(), 'mailto:') === 0;
+    }
+
+    private function getEMailAddressOfAttendee(VObject\Property $attendee): ?string {
+        if (!$this->hasAttendeeMailURI($attendee)) {
+            return null;
+        }
+        $attendeeEMail = substr($attendee->getValue(), 7);
+        if (!$this->mailer->validateMailAddress($attendeeEMail)) {
+            return null;
+        }
+
+        return $attendeeEMail;
+    }
+
+    /**
+     * @param IUser[] $users
+     * @return array<string, array{LANG?: string}>
+     */
+    private function getEMailAddressesOfAllUsersWithWriteAccessToCalendar(array $users):array {
+        $emailAddresses = [];
+
+        foreach ($users as $user) {
+            $emailAddress = $user->getEMailAddress();
+            if ($emailAddress) {
+                $lang = $this->l10nFactory->getUserLanguage($user);
+                if ($lang) {
+                    $emailAddresses[$emailAddress] = [
+                        'LANG' => $lang,
+                    ];
+                } else {
+                    $emailAddresses[$emailAddress] = [];
+                }
+            }
+        }
+
+        return $emailAddresses;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    private function generateDateString(IL10N $l10n, VEvent $vevent): string {
+        $isAllDay = $vevent->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 = $vevent->DTSTART->getDateTime();
+        /** @var \DateTimeImmutable $dtendDt */
+        $dtendDt = $this->getDTEndFromEvent($vevent)->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 $this->getDateString($l10n, $dtstartDt);
+            }
+
+            return implode(' - ', [
+                $this->getDateString($l10n, $dtstartDt),
+                $this->getDateString($l10n, $dtendDt),
+            ]);
+        }
+
+        $startTimezone = $endTimezone = null;
+        if (!$vevent->DTSTART->isFloating()) {
+            $startTimezone = $vevent->DTSTART->getDateTime()->getTimezone()->getName();
+            $endTimezone = $this->getDTEndFromEvent($vevent)->getDateTime()->getTimezone()->getName();
+        }
+
+        $localeStart = implode(', ', [
+            $this->getWeekDayName($l10n, $dtstartDt),
+            $this->getDateTimeString($l10n, $dtstartDt)
+        ]);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+            return $localeStart
+                . ' (' . $startTimezone . ') '
+                . ' - '
+                . $localeEnd
+                . ' (' . $endTimezone . ')';
+        }
+
+        // Show only the time if the day is the same
+        $localeEnd = $this->isDayEqual($dtstartDt, $dtendDt)
+            ? $this->getTimeString($l10n, $dtendDt)
+            : implode(', ', [
+                $this->getWeekDayName($l10n, $dtendDt),
+                $this->getDateTimeString($l10n, $dtendDt)
+            ]);
+
+        return $localeStart
+            . ' - '
+            . $localeEnd
+            . ' (' . $startTimezone . ')';
+    }
+
+    private function isDayEqual(DateTime $dtStart,
+                                DateTime $dtEnd):bool {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+    }
+
+    private function getDateString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('date', $dt, ['width' => 'medium']);
+    }
+
+    private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('datetime', $dt, ['width' => 'medium|short']);
+    }
+
+    private function getTimeString(IL10N $l10n, DateTime $dt):string {
+        return (string)$l10n->l('time', $dt, ['width' => 'short']);
+    }
+
+    private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
+        if (isset($vevent->SUMMARY)) {
+            return (string)$vevent->SUMMARY;
+        }
+
+        return $l10n->t('Untitled event');
+    }
 }

apps/settings/lib/Mailer/NewUserMailHelper.php

Indentation +132 added lines, -132 removed lines

@@ -42,147 +42,147 @@
 use OCP\Security\ISecureRandom;
 
 class NewUserMailHelper {
-	/** @var Defaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IMailer */
-	private $mailer;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IConfig */
-	private $config;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var string */
-	private $fromAddress;
+    /** @var Defaults */
+    private $themingDefaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IMailer */
+    private $mailer;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var string */
+    private $fromAddress;
 
-	/**
-	 * @param Defaults $themingDefaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IFactory $l10nFactory
-	 * @param IMailer $mailer
-	 * @param ISecureRandom $secureRandom
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param string $fromAddress
-	 */
-	public function __construct(Defaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								IFactory $l10nFactory,
-								IMailer $mailer,
-								ISecureRandom $secureRandom,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ICrypto $crypto,
-								$fromAddress) {
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFactory = $l10nFactory;
-		$this->mailer = $mailer;
-		$this->secureRandom = $secureRandom;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->crypto = $crypto;
-		$this->fromAddress = $fromAddress;
-	}
+    /**
+     * @param Defaults $themingDefaults
+     * @param IURLGenerator $urlGenerator
+     * @param IFactory $l10nFactory
+     * @param IMailer $mailer
+     * @param ISecureRandom $secureRandom
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param string $fromAddress
+     */
+    public function __construct(Defaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                IFactory $l10nFactory,
+                                IMailer $mailer,
+                                ISecureRandom $secureRandom,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ICrypto $crypto,
+                                $fromAddress) {
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFactory = $l10nFactory;
+        $this->mailer = $mailer;
+        $this->secureRandom = $secureRandom;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->crypto = $crypto;
+        $this->fromAddress = $fromAddress;
+    }
 
-	/**
-	 * @param IUser $user
-	 * @param bool $generatePasswordResetToken
-	 * @return IEMailTemplate
-	 */
-	public function generateTemplate(IUser $user, $generatePasswordResetToken = false) {
-		$userId = $user->getUID();
-		$lang = $this->l10nFactory->getUserLanguage($user);
-		$l10n = $this->l10nFactory->get('settings', $lang);
+    /**
+     * @param IUser $user
+     * @param bool $generatePasswordResetToken
+     * @return IEMailTemplate
+     */
+    public function generateTemplate(IUser $user, $generatePasswordResetToken = false) {
+        $userId = $user->getUID();
+        $lang = $this->l10nFactory->getUserLanguage($user);
+        $l10n = $this->l10nFactory->get('settings', $lang);
 
-		if ($generatePasswordResetToken) {
-			$token = $this->secureRandom->generate(
-				21,
-				ISecureRandom::CHAR_ALPHANUMERIC
-			);
-			$tokenValue = $this->timeFactory->getTime() . ':' . $token;
-			$mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
-			$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
-			$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
-		} else {
-			$link = $this->urlGenerator->getAbsoluteURL('/');
-		}
-		$displayName = $user->getDisplayName();
+        if ($generatePasswordResetToken) {
+            $token = $this->secureRandom->generate(
+                21,
+                ISecureRandom::CHAR_ALPHANUMERIC
+            );
+            $tokenValue = $this->timeFactory->getTime() . ':' . $token;
+            $mailAddress = (null !== $user->getEMailAddress()) ? $user->getEMailAddress() : '';
+            $encryptedValue = $this->crypto->encrypt($tokenValue, $mailAddress . $this->config->getSystemValue('secret'));
+            $this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
+            $link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', ['userId' => $user->getUID(), 'token' => $token]);
+        } else {
+            $link = $this->urlGenerator->getAbsoluteURL('/');
+        }
+        $displayName = $user->getDisplayName();
 
-		$emailTemplate = $this->mailer->createEMailTemplate('settings.Welcome', [
-			'link' => $link,
-			'displayname' => $displayName,
-			'userid' => $userId,
-			'instancename' => $this->themingDefaults->getName(),
-			'resetTokenGenerated' => $generatePasswordResetToken,
-		]);
+        $emailTemplate = $this->mailer->createEMailTemplate('settings.Welcome', [
+            'link' => $link,
+            'displayname' => $displayName,
+            'userid' => $userId,
+            'instancename' => $this->themingDefaults->getName(),
+            'resetTokenGenerated' => $generatePasswordResetToken,
+        ]);
 
-		$emailTemplate->setSubject($l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
-		$emailTemplate->addHeader();
-		if ($displayName === $userId) {
-			$emailTemplate->addHeading($l10n->t('Welcome aboard'));
-		} else {
-			$emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
-		}
-		$emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
-		if ($user->getBackendClassName() !== 'LDAP') {
-			$emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
-		}
-		if ($generatePasswordResetToken) {
-			$leftButtonText = $l10n->t('Set your password');
-		} else {
-			$leftButtonText = $l10n->t('Go to %s', [$this->themingDefaults->getName()]);
-		}
+        $emailTemplate->setSubject($l10n->t('Your %s account was created', [$this->themingDefaults->getName()]));
+        $emailTemplate->addHeader();
+        if ($displayName === $userId) {
+            $emailTemplate->addHeading($l10n->t('Welcome aboard'));
+        } else {
+            $emailTemplate->addHeading($l10n->t('Welcome aboard %s', [$displayName]));
+        }
+        $emailTemplate->addBodyText($l10n->t('Welcome to your %s account, you can add, protect, and share your data.', [$this->themingDefaults->getName()]));
+        if ($user->getBackendClassName() !== 'LDAP') {
+            $emailTemplate->addBodyText($l10n->t('Your username is: %s', [$userId]));
+        }
+        if ($generatePasswordResetToken) {
+            $leftButtonText = $l10n->t('Set your password');
+        } else {
+            $leftButtonText = $l10n->t('Go to %s', [$this->themingDefaults->getName()]);
+        }
 
-		$clientDownload = $this->config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients');
-		if ($clientDownload === '') {
-			$emailTemplate->addBodyButton(
-				$leftButtonText,
-				$link
-			);
-		} else {
-			$emailTemplate->addBodyButtonGroup(
-				$leftButtonText,
-				$link,
-				$l10n->t('Install Client'),
-				$clientDownload
-			);
-		}
+        $clientDownload = $this->config->getSystemValue('customclient_desktop', 'https://nextcloud.com/install/#install-clients');
+        if ($clientDownload === '') {
+            $emailTemplate->addBodyButton(
+                $leftButtonText,
+                $link
+            );
+        } else {
+            $emailTemplate->addBodyButtonGroup(
+                $leftButtonText,
+                $link,
+                $l10n->t('Install Client'),
+                $clientDownload
+            );
+        }
 
-		$emailTemplate->addFooter('', $lang);
+        $emailTemplate->addFooter('', $lang);
 
-		return $emailTemplate;
-	}
+        return $emailTemplate;
+    }
 
-	/**
-	 * Sends a welcome mail to $user
-	 *
-	 * @param IUser $user
-	 * @param IEmailTemplate $emailTemplate
-	 * @throws \Exception If mail could not be sent
-	 */
-	public function sendMail(IUser $user,
-							 IEMailTemplate $emailTemplate): void {
+    /**
+     * Sends a welcome mail to $user
+     *
+     * @param IUser $user
+     * @param IEmailTemplate $emailTemplate
+     * @throws \Exception If mail could not be sent
+     */
+    public function sendMail(IUser $user,
+                                IEMailTemplate $emailTemplate): void {
 
-		// Be sure to never try to send to an empty e-mail
-		$email = $user->getEMailAddress();
-		if ($email === null) {
-			return;
-		}
+        // Be sure to never try to send to an empty e-mail
+        $email = $user->getEMailAddress();
+        if ($email === null) {
+            return;
+        }
 
-		$message = $this->mailer->createMessage();
-		$message->setTo([$email => $user->getDisplayName()]);
-		$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
-		$message->useTemplate($emailTemplate);
-		$message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
-		$this->mailer->send($message);
-	}
+        $message = $this->mailer->createMessage();
+        $message->setTo([$email => $user->getDisplayName()]);
+        $message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
+        $message->useTemplate($emailTemplate);
+        $message->setAutoSubmitted(AutoSubmitted::VALUE_AUTO_GENERATED);
+        $this->mailer->send($message);
+    }
 }