nextcloud / server

lib/public/Mail/IEMailTemplate.php

Indentation +105 added lines, -105 removed lines

@@ -58,119 +58,119 @@
  */
 interface IEMailTemplate {
 
-	/**
-	 * Sets the subject of the email
-	 *
-	 * @param string $subject
-	 *
-	 * @since 13.0.0
-	 */
-	public function setSubject(string $subject);
+    /**
+     * Sets the subject of the email
+     *
+     * @param string $subject
+     *
+     * @since 13.0.0
+     */
+    public function setSubject(string $subject);
 
-	/**
-	 * Adds a header to the email
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeader();
+    /**
+     * Adds a header to the email
+     *
+     * @since 12.0.0
+     */
+    public function addHeader();
 
-	/**
-	 * Adds a heading to the email
-	 *
-	 * @param string $title
-	 * @param string|bool $plainTitle Title that is used in the plain text email
-	 *   if empty the $title is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addHeading(string $title, $plainTitle = '');
+    /**
+     * Adds a heading to the email
+     *
+     * @param string $title
+     * @param string|bool $plainTitle Title that is used in the plain text email
+     *   if empty the $title is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addHeading(string $title, $plainTitle = '');
 
-	/**
-	 * Adds a paragraph to the body of the email
-	 *
-	 * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyText(string $text, $plainText = '');
+    /**
+     * Adds a paragraph to the body of the email
+     *
+     * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyText(string $text, $plainText = '');
 
-	/**
-	 * Adds a list item to the body of the email
-	 *
-	 * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $metaInfo; Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $icon Absolute path, must be 16*16 pixels
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
-	 *   if empty the $metaInfo is used, if false none will be used
-	 * @param integer plainIndent If > 0, Indent plainText by this amount.
-	 * @since 12.0.0
-	 */
-	public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '', $plainIndent = 0);
+    /**
+     * Adds a list item to the body of the email
+     *
+     * @param string $text; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $metaInfo; Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $icon Absolute path, must be 16*16 pixels
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
+     *   if empty the $metaInfo is used, if false none will be used
+     * @param integer plainIndent If > 0, Indent plainText by this amount.
+     * @since 12.0.0
+     */
+    public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '', $plainIndent = 0);
 
-	/**
-	 * Adds a button group of two buttons to the body of the email
-	 *
-	 * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlLeft URL of left button
-	 * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlRight URL of right button
-	 * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
-	 * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButtonGroup(string $textLeft, string $urlLeft, string $textRight, string $urlRight, string $plainTextLeft = '', string $plainTextRight = '');
+    /**
+     * Adds a button group of two buttons to the body of the email
+     *
+     * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlLeft URL of left button
+     * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlRight URL of right button
+     * @param string $plainTextLeft Text of left button that is used in the plain text version - if empty the $textLeft is used
+     * @param string $plainTextRight Text of right button that is used in the plain text version - if empty the $textRight is used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButtonGroup(string $textLeft, string $urlLeft, string $textRight, string $urlRight, string $plainTextLeft = '', string $plainTextRight = '');
 
-	/**
-	 * Adds a button to the body of the email
-	 *
-	 * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $url URL of button
-	 * @param string $plainText Text of button in plain text version
-	 * 		if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButton(string $text, string $url, $plainText = '');
+    /**
+     * Adds a button to the body of the email
+     *
+     * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $url URL of button
+     * @param string $plainText Text of button in plain text version
+     * 		if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButton(string $text, string $url, $plainText = '');
 
-	/**
-	 * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
-	 *
-	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
-	 * @param string $lang Optional language to set the default footer in
-	 *
-	 * @since 12.0.0
-	 */
-	public function addFooter(string $text = '', ?string $lang = null);
+    /**
+     * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
+     *
+     * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
+     * @param string $lang Optional language to set the default footer in
+     *
+     * @since 12.0.0
+     */
+    public function addFooter(string $text = '', ?string $lang = null);
 
-	/**
-	 * Returns the rendered email subject as string
-	 *
-	 * @return string
-	 *
-	 * @since 13.0.0
-	 */
-	public function renderSubject(): string;
+    /**
+     * Returns the rendered email subject as string
+     *
+     * @return string
+     *
+     * @since 13.0.0
+     */
+    public function renderSubject(): string;
 
-	/**
-	 * Returns the rendered HTML email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderHtml(): string;
+    /**
+     * Returns the rendered HTML email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderHtml(): string;
 
-	/**
-	 * Returns the rendered plain text email as string
-	 *
-	 * @return string
-	 *
-	 * @since 12.0.0
-	 */
-	public function renderText(): string;
+    /**
+     * Returns the rendered plain text email as string
+     *
+     * @return string
+     *
+     * @since 12.0.0
+     */
+    public function renderText(): string;
 }

lib/private/Mail/EMailTemplate.php

Indentation +355 added lines, -355 removed lines

@@ -52,33 +52,33 @@ 
  * @package OC\Mail
  */
 class EMailTemplate implements IEMailTemplate {
-	/** @var Defaults */
-	protected $themingDefaults;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IFactory */
-	protected $l10nFactory;
-	/** @var string */
-	protected $emailId;
-	/** @var array */
-	protected $data;
-
-	/** @var string */
-	protected $subject = '';
-	/** @var string */
-	protected $htmlBody = '';
-	/** @var string */
-	protected $plainBody = '';
-	/** @var bool indicated if the footer is added */
-	protected $headerAdded = false;
-	/** @var bool indicated if the body is already opened */
-	protected $bodyOpened = false;
-	/** @var bool indicated if there is a list open in the body */
-	protected $bodyListOpened = false;
-	/** @var bool indicated if the footer is added */
-	protected $footerAdded = false;
-
-	protected $head = <<<EOF
+    /** @var Defaults */
+    protected $themingDefaults;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IFactory */
+    protected $l10nFactory;
+    /** @var string */
+    protected $emailId;
+    /** @var array */
+    protected $data;
+
+    /** @var string */
+    protected $subject = '';
+    /** @var string */
+    protected $htmlBody = '';
+    /** @var string */
+    protected $plainBody = '';
+    /** @var bool indicated if the footer is added */
+    protected $headerAdded = false;
+    /** @var bool indicated if the body is already opened */
+    protected $bodyOpened = false;
+    /** @var bool indicated if there is a list open in the body */
+    protected $bodyListOpened = false;
+    /** @var bool indicated if the footer is added */
+    protected $footerAdded = false;
+
+    protected $head = <<<EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" style="-webkit-font-smoothing:antialiased;background:#fff!important">
 <head>
@@ -96,7 +96,7 @@ 
 				<center data-parsed="" style="min-width:580px;width:100%">
 EOF;
 
-	protected $tail = <<<EOF
+    protected $tail = <<<EOF
 					</center>
 				</td>
 			</tr>
@@ -108,7 +108,7 @@ 
 
 EOF;
 
-	protected $header = <<<EOF
+    protected $header = <<<EOF
 <table align="center" class="wrapper header float-center" style="Margin:0 auto;background:#fff;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
 	<tr style="padding:0;text-align:left;vertical-align:top">
 		<td class="wrapper-inner" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:20px;text-align:left;vertical-align:top;word-wrap:break-word">
@@ -141,7 +141,7 @@ 
 </table>
 EOF;
 
-	protected $heading = <<<EOF
+    protected $heading = <<<EOF
 <table align="center" class="container main-heading float-center" style="Margin:0 auto;background:0 0!important;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:580px">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -160,7 +160,7 @@ 
 </table>
 EOF;
 
-	protected $bodyBegin = <<<EOF
+    protected $bodyBegin = <<<EOF
 <table align="center" class="wrapper content float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%">
 	<tr style="padding:0;text-align:left;vertical-align:top">
 		<td class="wrapper-inner" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">
@@ -170,7 +170,7 @@ 
 					<td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">
 EOF;
 
-	protected $bodyText = <<<EOF
+    protected $bodyText = <<<EOF
 <table class="row description" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -189,8 +189,8 @@ 
 </table>
 EOF;
 
-	// note: listBegin (like bodyBegin) is not processed through sprintf, so "%" is not escaped as "%%". (bug #12151)
-	protected $listBegin = <<<EOF
+    // note: listBegin (like bodyBegin) is not processed through sprintf, so "%" is not escaped as "%%". (bug #12151)
+    protected $listBegin = <<<EOF
 <table class="row description" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -198,7 +198,7 @@ 
 			<table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%">
 EOF;
 
-	protected $listItem = <<<EOF
+    protected $listItem = <<<EOF
 				<tr style="padding:0;text-align:left;vertical-align:top">
 					<td style="Margin:0;color:#0a0a0a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left;width:15px;">
 						<p class="text-left" style="Margin:0;Margin-bottom:10px;color:#777;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen-Sans,Ubuntu,Cantarell,'Helvetica Neue',Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;margin-bottom:10px;padding:0;padding-left:10px;text-align:left">%s</p>
@@ -210,7 +210,7 @@ 
 				</tr>
 EOF;
 
-	protected $listEnd = <<<EOF
+    protected $listEnd = <<<EOF
 			</table>
 		</th>
 	</tr>
@@ -218,7 +218,7 @@ 
 </table>
 EOF;
 
-	protected $buttonGroup = <<<EOF
+    protected $buttonGroup = <<<EOF
 <table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -271,7 +271,7 @@ 
 </table>
 EOF;
 
-	protected $button = <<<EOF
+    protected $button = <<<EOF
 <table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -311,7 +311,7 @@ 
 </table>
 EOF;
 
-	protected $bodyEnd = <<<EOF
+    protected $bodyEnd = <<<EOF
 
 					</td>
 				</tr>
@@ -322,7 +322,7 @@ 
 </table>
 EOF;
 
-	protected $footer = <<<EOF
+    protected $footer = <<<EOF
 <table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%%">
 	<tbody>
 	<tr style="padding:0;text-align:left;vertical-align:top">
@@ -348,327 +348,327 @@ 
 </table>
 EOF;
 
-	public function __construct(Defaults $themingDefaults,
-								IURLGenerator $urlGenerator,
-								IFactory $l10nFactory,
-								$emailId,
-								array $data) {
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFactory = $l10nFactory;
-		$this->htmlBody .= $this->head;
-		$this->emailId = $emailId;
-		$this->data = $data;
-	}
-
-	/**
-	 * Sets the subject of the email
-	 *
-	 * @param string $subject
-	 */
-	public function setSubject(string $subject) {
-		$this->subject = $subject;
-	}
-
-	/**
-	 * Adds a header to the email
-	 */
-	public function addHeader() {
-		if ($this->headerAdded) {
-			return;
-		}
-		$this->headerAdded = true;
-
-		$logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo(false));
-		$this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getColorPrimary(), $logoUrl, $this->themingDefaults->getName()]);
-	}
-
-	/**
-	 * Adds a heading to the email
-	 *
-	 * @param string $title
-	 * @param string|bool $plainTitle Title that is used in the plain text email
-	 *   if empty the $title is used, if false none will be used
-	 */
-	public function addHeading(string $title, $plainTitle = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainTitle === '') {
-			$plainTitle = $title;
-		}
-
-		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
-		if ($plainTitle !== false) {
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
-		}
-	}
-
-	/**
-	 * Open the HTML body when it is not already
-	 */
-	protected function ensureBodyIsOpened() {
-		if ($this->bodyOpened) {
-			return;
-		}
-
-		$this->htmlBody .= $this->bodyBegin;
-		$this->bodyOpened = true;
-	}
-
-	/**
-	 * Adds a paragraph to the body of the email
-	 *
-	 * @param string $text Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty the $text is used, if false none will be used
-	 */
-	public function addBodyText(string $text, $plainText = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainText === '') {
-			$plainText = $text;
-			$text = htmlspecialchars($text);
-		}
-
-		$this->ensureBodyListClosed();
-		$this->ensureBodyIsOpened();
-
-		$this->htmlBody .= vsprintf($this->bodyText, [$text]);
-		if ($plainText !== false) {
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
-		}
-	}
-
-	/**
-	 * Adds a list item to the body of the email
-	 *
-	 * @param string $text Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $metaInfo Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $icon Absolute path, must be 16*16 pixels
-	 * @param string|bool $plainText Text that is used in the plain text email
-	 *   if empty or true the $text is used, if false none will be used
-	 * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
-	 *   if empty or true the $metaInfo is used, if false none will be used
-	 * @param integer plainIndent If > 0, Indent plainText by this amount.
-	 * @since 12.0.0
-	 */
-	public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '', $plainIndent = 0) {
-		$this->ensureBodyListOpened();
-
-		if ($plainText === '' || $plainText === true) {
-			$plainText = $text;
-			$text = htmlspecialchars($text);
-			$text = str_replace("\n", "<br/>", $text); // convert newlines to HTML breaks
-		}
-		if ($plainMetaInfo === '' || $plainMetaInfo === true) {
-			$plainMetaInfo = $metaInfo;
-			$metaInfo = htmlspecialchars($metaInfo);
-		}
-
-		$htmlText = $text;
-		if ($metaInfo) {
-			$htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText;
-		}
-		if ($icon !== '') {
-			$icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';
-		} else {
-			$icon = '&bull;';
-		}
-		$this->htmlBody .= vsprintf($this->listItem, [$icon, $htmlText]);
-		if ($plainText !== false) {
-			if ($plainIndent === 0) {
-				/*
+    public function __construct(Defaults $themingDefaults,
+                                IURLGenerator $urlGenerator,
+                                IFactory $l10nFactory,
+                                $emailId,
+                                array $data) {
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFactory = $l10nFactory;
+        $this->htmlBody .= $this->head;
+        $this->emailId = $emailId;
+        $this->data = $data;
+    }
+
+    /**
+     * Sets the subject of the email
+     *
+     * @param string $subject
+     */
+    public function setSubject(string $subject) {
+        $this->subject = $subject;
+    }
+
+    /**
+     * Adds a header to the email
+     */
+    public function addHeader() {
+        if ($this->headerAdded) {
+            return;
+        }
+        $this->headerAdded = true;
+
+        $logoUrl = $this->urlGenerator->getAbsoluteURL($this->themingDefaults->getLogo(false));
+        $this->htmlBody .= vsprintf($this->header, [$this->themingDefaults->getColorPrimary(), $logoUrl, $this->themingDefaults->getName()]);
+    }
+
+    /**
+     * Adds a heading to the email
+     *
+     * @param string $title
+     * @param string|bool $plainTitle Title that is used in the plain text email
+     *   if empty the $title is used, if false none will be used
+     */
+    public function addHeading(string $title, $plainTitle = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainTitle === '') {
+            $plainTitle = $title;
+        }
+
+        $this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
+        if ($plainTitle !== false) {
+            $this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
+        }
+    }
+
+    /**
+     * Open the HTML body when it is not already
+     */
+    protected function ensureBodyIsOpened() {
+        if ($this->bodyOpened) {
+            return;
+        }
+
+        $this->htmlBody .= $this->bodyBegin;
+        $this->bodyOpened = true;
+    }
+
+    /**
+     * Adds a paragraph to the body of the email
+     *
+     * @param string $text Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty the $text is used, if false none will be used
+     */
+    public function addBodyText(string $text, $plainText = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainText === '') {
+            $plainText = $text;
+            $text = htmlspecialchars($text);
+        }
+
+        $this->ensureBodyListClosed();
+        $this->ensureBodyIsOpened();
+
+        $this->htmlBody .= vsprintf($this->bodyText, [$text]);
+        if ($plainText !== false) {
+            $this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
+        }
+    }
+
+    /**
+     * Adds a list item to the body of the email
+     *
+     * @param string $text Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $metaInfo Note: When $plainMetaInfo falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $icon Absolute path, must be 16*16 pixels
+     * @param string|bool $plainText Text that is used in the plain text email
+     *   if empty or true the $text is used, if false none will be used
+     * @param string|bool $plainMetaInfo Meta info that is used in the plain text email
+     *   if empty or true the $metaInfo is used, if false none will be used
+     * @param integer plainIndent If > 0, Indent plainText by this amount.
+     * @since 12.0.0
+     */
+    public function addBodyListItem(string $text, string $metaInfo = '', string $icon = '', $plainText = '', $plainMetaInfo = '', $plainIndent = 0) {
+        $this->ensureBodyListOpened();
+
+        if ($plainText === '' || $plainText === true) {
+            $plainText = $text;
+            $text = htmlspecialchars($text);
+            $text = str_replace("\n", "<br/>", $text); // convert newlines to HTML breaks
+        }
+        if ($plainMetaInfo === '' || $plainMetaInfo === true) {
+            $plainMetaInfo = $metaInfo;
+            $metaInfo = htmlspecialchars($metaInfo);
+        }
+
+        $htmlText = $text;
+        if ($metaInfo) {
+            $htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText;
+        }
+        if ($icon !== '') {
+            $icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';
+        } else {
+            $icon = '&bull;';
+        }
+        $this->htmlBody .= vsprintf($this->listItem, [$icon, $htmlText]);
+        if ($plainText !== false) {
+            if ($plainIndent === 0) {
+                /*
 				 * If plainIndent is not set by caller, this is the old NC17 layout code.
 				 */
-				$this->plainBody .= '  * ' . $plainText;
-				if ($plainMetaInfo !== false) {
-					$this->plainBody .= ' (' . $plainMetaInfo . ')';
-				}
-				$this->plainBody .= PHP_EOL;
-			} else {
-				/*
+                $this->plainBody .= '  * ' . $plainText;
+                if ($plainMetaInfo !== false) {
+                    $this->plainBody .= ' (' . $plainMetaInfo . ')';
+                }
+                $this->plainBody .= PHP_EOL;
+            } else {
+                /*
 				 * Caller can set plainIndent > 0 to format plainText in tabular fashion.
 				 * with plainMetaInfo in column 1, and plainText in column 2.
 				 * The plainMetaInfo label is right justified in a field of width
 				 * "plainIndent". Multilines after the first are indented plainIndent+1
 				 * (to account for space after label).  Fixes: #12391
 				 */
-				/** @var string $label */
-				$label = ($plainMetaInfo !== false)? $plainMetaInfo : '';
-				$this->plainBody .= sprintf("%${plainIndent}s %s\n",
-					$label,
-					str_replace("\n", "\n" . str_repeat(' ', $plainIndent+1), $plainText));
-			}
-		}
-	}
-
-	protected function ensureBodyListOpened() {
-		if ($this->bodyListOpened) {
-			return;
-		}
-
-		$this->ensureBodyIsOpened();
-		$this->bodyListOpened = true;
-		$this->htmlBody .= $this->listBegin;
-	}
-
-	protected function ensureBodyListClosed() {
-		if (!$this->bodyListOpened) {
-			return;
-		}
-
-		$this->bodyListOpened = false;
-		$this->htmlBody .= $this->listEnd;
-	}
-
-	/**
-	 * Adds a button group of two buttons to the body of the email
-	 *
-	 * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlLeft URL of left button
-	 * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $urlRight URL of right button
-	 * @param string $plainTextLeft Text of left button that is used in the plain text version - if unset the $textLeft is used
-	 * @param string $plainTextRight Text of right button that is used in the plain text version - if unset the $textRight is used
-	 */
-	public function addBodyButtonGroup(string $textLeft,
-									   string $urlLeft,
-									   string $textRight,
-									   string $urlRight,
-									   string $plainTextLeft = '',
-									   string $plainTextRight = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-		if ($plainTextLeft === '') {
-			$plainTextLeft = $textLeft;
-			$textLeft = htmlspecialchars($textLeft);
-		}
-
-		if ($plainTextRight === '') {
-			$plainTextRight = $textRight;
-			$textRight = htmlspecialchars($textRight);
-		}
-
-		$this->ensureBodyIsOpened();
-		$this->ensureBodyListClosed();
-
-		$color = $this->themingDefaults->getColorPrimary();
-		$textColor = $this->themingDefaults->getTextColorPrimary();
-
-		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]);
-		$this->plainBody .= PHP_EOL . $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
-	}
-
-	/**
-	 * Adds a button to the body of the email
-	 *
-	 * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
-	 * @param string $url URL of button
-	 * @param string $plainText Text of button in plain text version
-	 * 		if empty the $text is used, if false none will be used
-	 *
-	 * @since 12.0.0
-	 */
-	public function addBodyButton(string $text, string $url, $plainText = '') {
-		if ($this->footerAdded) {
-			return;
-		}
-
-		$this->ensureBodyIsOpened();
-		$this->ensureBodyListClosed();
-
-		if ($plainText === '') {
-			$plainText = $text;
-			$text = htmlspecialchars($text);
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-		$textColor = $this->themingDefaults->getTextColorPrimary();
-		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]);
-
-		if ($plainText !== false) {
-			$this->plainBody .= $plainText . ': ';
-		}
-
-		$this->plainBody .=  $url . PHP_EOL;
-	}
-
-	/**
-	 * Close the HTML body when it is open
-	 */
-	protected function ensureBodyIsClosed() {
-		if (!$this->bodyOpened) {
-			return;
-		}
-
-		$this->ensureBodyListClosed();
-
-		$this->htmlBody .= $this->bodyEnd;
-		$this->bodyOpened = false;
-	}
-
-	/**
-	 * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
-	 *
-	 * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
-	 */
-	public function addFooter(string $text = '', ?string $lang = null) {
-		if ($text === '') {
-			$l10n = $this->l10nFactory->get('lib', $lang);
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan($lang) . '<br>' . $l10n->t('This is an automatically sent email, please do not reply.');
-		}
-
-		if ($this->footerAdded) {
-			return;
-		}
-		$this->footerAdded = true;
-
-		$this->ensureBodyIsClosed();
-
-		$this->htmlBody .= vsprintf($this->footer, [$text]);
-		$this->htmlBody .= $this->tail;
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
-		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
-	}
-
-	/**
-	 * Returns the rendered email subject as string
-	 *
-	 * @return string
-	 */
-	public function renderSubject(): string {
-		return $this->subject;
-	}
-
-	/**
-	 * Returns the rendered HTML email as string
-	 *
-	 * @return string
-	 */
-	public function renderHtml(): string {
-		if (!$this->footerAdded) {
-			$this->footerAdded = true;
-			$this->ensureBodyIsClosed();
-			$this->htmlBody .= $this->tail;
-		}
-		return $this->htmlBody;
-	}
-
-	/**
-	 * Returns the rendered plain text email as string
-	 *
-	 * @return string
-	 */
-	public function renderText(): string {
-		if (!$this->footerAdded) {
-			$this->footerAdded = true;
-			$this->ensureBodyIsClosed();
-			$this->htmlBody .= $this->tail;
-		}
-		return $this->plainBody;
-	}
+                /** @var string $label */
+                $label = ($plainMetaInfo !== false)? $plainMetaInfo : '';
+                $this->plainBody .= sprintf("%${plainIndent}s %s\n",
+                    $label,
+                    str_replace("\n", "\n" . str_repeat(' ', $plainIndent+1), $plainText));
+            }
+        }
+    }
+
+    protected function ensureBodyListOpened() {
+        if ($this->bodyListOpened) {
+            return;
+        }
+
+        $this->ensureBodyIsOpened();
+        $this->bodyListOpened = true;
+        $this->htmlBody .= $this->listBegin;
+    }
+
+    protected function ensureBodyListClosed() {
+        if (!$this->bodyListOpened) {
+            return;
+        }
+
+        $this->bodyListOpened = false;
+        $this->htmlBody .= $this->listEnd;
+    }
+
+    /**
+     * Adds a button group of two buttons to the body of the email
+     *
+     * @param string $textLeft Text of left button; Note: When $plainTextLeft falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlLeft URL of left button
+     * @param string $textRight Text of right button; Note: When $plainTextRight falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $urlRight URL of right button
+     * @param string $plainTextLeft Text of left button that is used in the plain text version - if unset the $textLeft is used
+     * @param string $plainTextRight Text of right button that is used in the plain text version - if unset the $textRight is used
+     */
+    public function addBodyButtonGroup(string $textLeft,
+                                        string $urlLeft,
+                                        string $textRight,
+                                        string $urlRight,
+                                        string $plainTextLeft = '',
+                                        string $plainTextRight = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+        if ($plainTextLeft === '') {
+            $plainTextLeft = $textLeft;
+            $textLeft = htmlspecialchars($textLeft);
+        }
+
+        if ($plainTextRight === '') {
+            $plainTextRight = $textRight;
+            $textRight = htmlspecialchars($textRight);
+        }
+
+        $this->ensureBodyIsOpened();
+        $this->ensureBodyListClosed();
+
+        $color = $this->themingDefaults->getColorPrimary();
+        $textColor = $this->themingDefaults->getTextColorPrimary();
+
+        $this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]);
+        $this->plainBody .= PHP_EOL . $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
+        $this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
+    }
+
+    /**
+     * Adds a button to the body of the email
+     *
+     * @param string $text Text of button; Note: When $plainText falls back to this, HTML is automatically escaped in the HTML email
+     * @param string $url URL of button
+     * @param string $plainText Text of button in plain text version
+     * 		if empty the $text is used, if false none will be used
+     *
+     * @since 12.0.0
+     */
+    public function addBodyButton(string $text, string $url, $plainText = '') {
+        if ($this->footerAdded) {
+            return;
+        }
+
+        $this->ensureBodyIsOpened();
+        $this->ensureBodyListClosed();
+
+        if ($plainText === '') {
+            $plainText = $text;
+            $text = htmlspecialchars($text);
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+        $textColor = $this->themingDefaults->getTextColorPrimary();
+        $this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]);
+
+        if ($plainText !== false) {
+            $this->plainBody .= $plainText . ': ';
+        }
+
+        $this->plainBody .=  $url . PHP_EOL;
+    }
+
+    /**
+     * Close the HTML body when it is open
+     */
+    protected function ensureBodyIsClosed() {
+        if (!$this->bodyOpened) {
+            return;
+        }
+
+        $this->ensureBodyListClosed();
+
+        $this->htmlBody .= $this->bodyEnd;
+        $this->bodyOpened = false;
+    }
+
+    /**
+     * Adds a logo and a text to the footer. <br> in the text will be replaced by new lines in the plain text email
+     *
+     * @param string $text If the text is empty the default "Name - Slogan<br>This is an automatically sent email" will be used
+     */
+    public function addFooter(string $text = '', ?string $lang = null) {
+        if ($text === '') {
+            $l10n = $this->l10nFactory->get('lib', $lang);
+            $text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan($lang) . '<br>' . $l10n->t('This is an automatically sent email, please do not reply.');
+        }
+
+        if ($this->footerAdded) {
+            return;
+        }
+        $this->footerAdded = true;
+
+        $this->ensureBodyIsClosed();
+
+        $this->htmlBody .= vsprintf($this->footer, [$text]);
+        $this->htmlBody .= $this->tail;
+        $this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
+        $this->plainBody .= str_replace('<br>', PHP_EOL, $text);
+    }
+
+    /**
+     * Returns the rendered email subject as string
+     *
+     * @return string
+     */
+    public function renderSubject(): string {
+        return $this->subject;
+    }
+
+    /**
+     * Returns the rendered HTML email as string
+     *
+     * @return string
+     */
+    public function renderHtml(): string {
+        if (!$this->footerAdded) {
+            $this->footerAdded = true;
+            $this->ensureBodyIsClosed();
+            $this->htmlBody .= $this->tail;
+        }
+        return $this->htmlBody;
+    }
+
+    /**
+     * Returns the rendered plain text email as string
+     *
+     * @return string
+     */
+    public function renderText(): string {
+        if (!$this->footerAdded) {
+            $this->footerAdded = true;
+            $this->ensureBodyIsClosed();
+            $this->htmlBody .= $this->tail;
+        }
+        return $this->plainBody;
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -400,7 +400,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->heading, [htmlspecialchars($title)]);
 		if ($plainTitle !== false) {
-			$this->plainBody .= $plainTitle . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainTitle.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -437,7 +437,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->bodyText, [$text]);
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . PHP_EOL . PHP_EOL;
+			$this->plainBody .= $plainText.PHP_EOL.PHP_EOL;
 		}
 	}
 
@@ -469,10 +469,10 @@ 
 
 		$htmlText = $text;
 		if ($metaInfo) {
-			$htmlText = '<em style="color:#777;">' . $metaInfo . '</em><br>' . $htmlText;
+			$htmlText = '<em style="color:#777;">'.$metaInfo.'</em><br>'.$htmlText;
 		}
 		if ($icon !== '') {
-			$icon = '<img src="' . htmlspecialchars($icon) . '" alt="&bull;">';
+			$icon = '<img src="'.htmlspecialchars($icon).'" alt="&bull;">';
 		} else {
 			$icon = '&bull;';
 		}
@@ -482,9 +482,9 @@ 
 				/*
 				 * If plainIndent is not set by caller, this is the old NC17 layout code.
 				 */
-				$this->plainBody .= '  * ' . $plainText;
+				$this->plainBody .= '  * '.$plainText;
 				if ($plainMetaInfo !== false) {
-					$this->plainBody .= ' (' . $plainMetaInfo . ')';
+					$this->plainBody .= ' ('.$plainMetaInfo.')';
 				}
 				$this->plainBody .= PHP_EOL;
 			} else {
@@ -496,10 +496,10 @@ 
 				 * (to account for space after label).  Fixes: #12391
 				 */
 				/** @var string $label */
-				$label = ($plainMetaInfo !== false)? $plainMetaInfo : '';
+				$label = ($plainMetaInfo !== false) ? $plainMetaInfo : '';
 				$this->plainBody .= sprintf("%${plainIndent}s %s\n",
 					$label,
-					str_replace("\n", "\n" . str_repeat(' ', $plainIndent+1), $plainText));
+					str_replace("\n", "\n".str_repeat(' ', $plainIndent + 1), $plainText));
 			}
 		}
 	}
@@ -559,8 +559,8 @@ 
 		$textColor = $this->themingDefaults->getTextColorPrimary();
 
 		$this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]);
-		$this->plainBody .= PHP_EOL . $plainTextLeft . ': ' . $urlLeft . PHP_EOL;
-		$this->plainBody .= $plainTextRight . ': ' . $urlRight . PHP_EOL . PHP_EOL;
+		$this->plainBody .= PHP_EOL.$plainTextLeft.': '.$urlLeft.PHP_EOL;
+		$this->plainBody .= $plainTextRight.': '.$urlRight.PHP_EOL.PHP_EOL;
 	}
 
 	/**
@@ -591,10 +591,10 @@ 
 		$this->htmlBody .= vsprintf($this->button, [$color, $color, $url, $color, $textColor, $textColor, $text]);
 
 		if ($plainText !== false) {
-			$this->plainBody .= $plainText . ': ';
+			$this->plainBody .= $plainText.': ';
 		}
 
-		$this->plainBody .=  $url . PHP_EOL;
+		$this->plainBody .= $url.PHP_EOL;
 	}
 
 	/**
@@ -619,7 +619,7 @@ 
 	public function addFooter(string $text = '', ?string $lang = null) {
 		if ($text === '') {
 			$l10n = $this->l10nFactory->get('lib', $lang);
-			$text = $this->themingDefaults->getName() . ' - ' . $this->themingDefaults->getSlogan($lang) . '<br>' . $l10n->t('This is an automatically sent email, please do not reply.');
+			$text = $this->themingDefaults->getName().' - '.$this->themingDefaults->getSlogan($lang).'<br>'.$l10n->t('This is an automatically sent email, please do not reply.');
 		}
 
 		if ($this->footerAdded) {
@@ -631,7 +631,7 @@ 
 
 		$this->htmlBody .= vsprintf($this->footer, [$text]);
 		$this->htmlBody .= $this->tail;
-		$this->plainBody .= PHP_EOL . '-- ' . PHP_EOL;
+		$this->plainBody .= PHP_EOL.'-- '.PHP_EOL;
 		$this->plainBody .= str_replace('<br>', PHP_EOL, $text);
 	}
 

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

Indentation +616 added lines, -616 removed lines

@@ -69,186 +69,186 @@ 
  */
 class IMipPlugin extends SabreIMipPlugin {
 
-	/** @var string */
-	private $userId;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var ILogger */
-	private $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
-
-	/**
-	 * @param IConfig $config
-	 * @param IMailer $mailer
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 * @param L10NFactory $l10nFactory
-	 * @param IUrlGenerator $urlGenerator
-	 * @param Defaults $defaults
-	 * @param ISecureRandom $random
-	 * @param IDBConnection $db
-	 * @param string $userId
-	 */
-	public function __construct(IConfig $config, IMailer $mailer, ILogger $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);
-
-		$senderName = $iTipMessage->senderName ?: null;
-		$recipientName = $iTipMessage->recipientName ?: null;
-
-		if ($senderName === null || empty(trim($senderName))) {
-			$user = $this->userManager->get($this->userId);
-			if ($user) {
-				// getDisplayName automatically uses the uid
-				// if no display-name is set
-				$senderName = $user->getDisplayName();
-			}
-		}
-
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-
-		$attendee = $this->getCurrentAttendee($iTipMessage);
-		$defaultLang = $this->l10nFactory->findLanguage();
-		$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->defaults->getName()]);
-
-		$message = $this->mailer->createMessage()
-			->setFrom([$fromEMail => $fromName])
-			->setReplyTo([$sender => $senderName])
-			->setTo([$recipient => $recipientName]);
-
-		$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->getAttendeeRSVP($attendee)) {
+    /** @var string */
+    private $userId;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var ILogger */
+    private $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
+
+    /**
+     * @param IConfig $config
+     * @param IMailer $mailer
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     * @param L10NFactory $l10nFactory
+     * @param IUrlGenerator $urlGenerator
+     * @param Defaults $defaults
+     * @param ISecureRandom $random
+     * @param IDBConnection $db
+     * @param string $userId
+     */
+    public function __construct(IConfig $config, IMailer $mailer, ILogger $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);
+
+        $senderName = $iTipMessage->senderName ?: null;
+        $recipientName = $iTipMessage->recipientName ?: null;
+
+        if ($senderName === null || empty(trim($senderName))) {
+            $user = $this->userManager->get($this->userId);
+            if ($user) {
+                // getDisplayName automatically uses the uid
+                // if no display-name is set
+                $senderName = $user->getDisplayName();
+            }
+        }
+
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+
+        $attendee = $this->getCurrentAttendee($iTipMessage);
+        $defaultLang = $this->l10nFactory->findLanguage();
+        $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->defaults->getName()]);
+
+        $message = $this->mailer->createMessage()
+            ->setFrom([$fromEMail => $fromName])
+            ->setReplyTo([$sender => $senderName])
+            ->setTo([$recipient => $recipientName]);
+
+        $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->getAttendeeRSVP($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
@@ -267,441 +267,441 @@ 
 			** 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->logException($ex, ['app' => 'dav']);
-			$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 getAttendeeRSVP(Property $attendee = null) {
-		if ($attendee !== null) {
-			$rsvp = $attendee->offsetGet('RSVP');
-			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 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(\DateTime::ATOM));
-		$dtendDt = new \DateTime($dtendDt->format(\DateTime::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) {
-			$template->setSubject('Canceled: ' . $summary);
-			$template->addHeading($l10n->t('Invitation canceled'));
-		} elseif ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
-			$template->addHeading($l10n->t('Invitation updated'));
-		} else {
-			$template->setSubject('Invitation: ' . $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.svg'),'','',self::IMIP_INDENT);
-		}
-		$meetingWhen = $this->generateWhenString($l10n, $vevent);
-		if ($meetingWhen) {
-			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
-		}
-		if ($vevent->LOCATION) {
-			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.svg'),'','',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.svg'),
-				$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.svg'),'','',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();
-			list($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.svg'),
-				$organizerText,'',self::IMIP_INDENT);
-		}
-
-		$attendees = $vevent->select('ATTENDEE');
-		if (count($attendees) === 0) {
-			return;
-		}
-
-		$attendeesHTML = [];
-		$attendeesText = [];
-		foreach ($attendees as $attendee) {
-			$attendeeURI = $attendee->getNormalizedValue();
-			list($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.svg'),
-			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_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
-
-		/** @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->logException($ex, ['app' => 'dav']);
+            $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 getAttendeeRSVP(Property $attendee = null) {
+        if ($attendee !== null) {
+            $rsvp = $attendee->offsetGet('RSVP');
+            if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 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(\DateTime::ATOM));
+        $dtendDt = new \DateTime($dtendDt->format(\DateTime::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) {
+            $template->setSubject('Canceled: ' . $summary);
+            $template->addHeading($l10n->t('Invitation canceled'));
+        } elseif ($method === self::METHOD_REPLY) {
+            $template->setSubject('Re: ' . $summary);
+            $template->addHeading($l10n->t('Invitation updated'));
+        } else {
+            $template->setSubject('Invitation: ' . $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.svg'),'','',self::IMIP_INDENT);
+        }
+        $meetingWhen = $this->generateWhenString($l10n, $vevent);
+        if ($meetingWhen) {
+            $template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
+                $this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
+        }
+        if ($vevent->LOCATION) {
+            $template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
+                $this->getAbsoluteImagePath('caldav/location.svg'),'','',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.svg'),
+                $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.svg'),'','',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();
+            list($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.svg'),
+                $organizerText,'',self::IMIP_INDENT);
+        }
+
+        $attendees = $vevent->select('ATTENDEE');
+        if (count($attendees) === 0) {
+            return;
+        }
+
+        $attendeesHTML = [];
+        $attendeesText = [];
+        foreach ($attendees as $attendee) {
+            $attendeeURI = $attendee->getNormalizedValue();
+            list($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.svg'),
+            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_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+
+        /** @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 +29 added lines, -29 removed lines

@@ -221,11 +221,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');
@@ -236,7 +236,7 @@ 
 			->setReplyTo([$sender => $senderName])
 			->setTo([$recipient => $recipientName]);
 
-		$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');
@@ -283,8 +283,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);
 
@@ -331,7 +331,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();
@@ -447,7 +447,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 */
@@ -466,26 +466,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.')';
 	}
 
 	/**
@@ -506,13 +506,13 @@ 
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
 										  $method, $summary) {
 		if ($method === self::METHOD_CANCEL) {
-			$template->setSubject('Canceled: ' . $summary);
+			$template->setSubject('Canceled: '.$summary);
 			$template->addHeading($l10n->t('Invitation canceled'));
 		} elseif ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
+			$template->setSubject('Re: '.$summary);
 			$template->addHeading($l10n->t('Invitation updated'));
 		} else {
-			$template->setSubject('Invitation: ' . $summary);
+			$template->setSubject('Invitation: '.$summary);
 			$template->addHeading($l10n->t('Invitation'));
 		}
 	}
@@ -525,16 +525,16 @@ 
 	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
 		if ($vevent->SUMMARY) {
 			$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
-				$this->getAbsoluteImagePath('caldav/title.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/title.svg'), '', '', self::IMIP_INDENT);
 		}
 		$meetingWhen = $this->generateWhenString($l10n, $vevent);
 		if ($meetingWhen) {
 			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/time.svg'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->LOCATION) {
 			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/location.svg'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->URL) {
 			$url = $vevent->URL->getValue();
@@ -543,7 +543,7 @@ 
 					htmlspecialchars($url)),
 				$l10n->t('Link:'),
 				$this->getAbsoluteImagePath('caldav/link.svg'),
-				$url,'',self::IMIP_INDENT);
+				$url, '', self::IMIP_INDENT);
 		}
 
 		$this->addAttendees($template, $l10n, $vevent);
@@ -551,7 +551,7 @@ 
 		/* 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.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/description.svg'), '', '', self::IMIP_INDENT);
 		}
 	}
 
@@ -581,7 +581,7 @@ 
 			/** @var Property\ICalendar\CalAddress $organizer */
 			$organizer = $vevent->ORGANIZER;
 			$organizerURI = $organizer->getNormalizedValue();
-			list($scheme,$organizerEmail) = explode(':',$organizerURI,2); # strip off scheme mailto:
+			list($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>',
@@ -598,7 +598,7 @@ 
 			}
 			$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
 				$this->getAbsoluteImagePath('caldav/organizer.svg'),
-				$organizerText,'',self::IMIP_INDENT);
+				$organizerText, '', self::IMIP_INDENT);
 		}
 
 		$attendees = $vevent->select('ATTENDEE');
@@ -610,7 +610,7 @@ 
 		$attendeesText = [];
 		foreach ($attendees as $attendee) {
 			$attendeeURI = $attendee->getNormalizedValue();
-			list($scheme,$attendeeEmail) = explode(':',$attendeeURI,2); # strip off scheme mailto:
+			list($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),
@@ -625,9 +625,9 @@ 
 			array_push($attendeesText, $attendeeText);
 		}
 
-		$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
+		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $l10n->t('Attendees:'),
 			$this->getAbsoluteImagePath('caldav/attendees.svg'),
-			implode("\n",$attendeesText),'',self::IMIP_INDENT);
+			implode("\n", $attendeesText), '', self::IMIP_INDENT);
 	}
 
 	/**
@@ -678,7 +678,7 @@ 
 	 * @return string
 	 */
 	private function createInvitationToken(Message $iTipMessage, $lastOccurrence):string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 
 		/** @var VEvent $vevent */
 		$vevent = $iTipMessage->message->VEVENT;