nextcloud / server

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

Indentation +410 added lines, -410 removed lines

@@ -59,414 +59,414 @@
  */
 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 Defaults */
-	private $defaults;
-
-	const MAX_DATE = '2038-01-01';
-
-	const METHOD_REQUEST = 'request';
-	const METHOD_REPLY = 'reply';
-	const METHOD_CANCEL = 'cancel';
-
-	/**
-	 * @param IConfig $config
-	 * @param IMailer $mailer
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 * @param L10NFactory $l10nFactory
-	 * @param IUrlGenerator $urlGenerator
-	 * @param Defaults $defaults
-	 * @param string $userId
-	 */
-	public function __construct(IConfig $config, IMailer $mailer, ILogger $logger, ITimeFactory $timeFactory, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, Defaults $defaults, $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->defaults = $defaults;
-	}
-
-	/**
-	 * 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
-		if ($this->isEventInThePast($iTipMessage->message)) {
-			return;
-		}
-
-		// Strip off mailto:
-		$sender = substr($iTipMessage->sender, 7);
-		$recipient = substr($iTipMessage->recipient, 7);
-
-		$senderName = $iTipMessage->senderName ?: null;
-		$recipientName = $iTipMessage->recipientName ?: null;
-
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-
-		$attendee = $this->getCurrentAttendee($iTipMessage);
-		$defaultLang = $this->config->getUserValue($this->userId, 'core', 'lang', $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;
-
-		$start = $vevent->DTSTART;
-		if (isset($vevent->DTEND)) {
-			$end = $vevent->DTEND;
-		} elseif (isset($vevent->DURATION)) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-		} elseif (!$vevent->DTSTART->hasTime()) {
-			$isFloating = $vevent->DTSTART->isFloating();
-			$end = clone $vevent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-		} else {
-			$end = clone $vevent->DTSTART;
-		}
-
-		$meetingWhen = $this->generateWhenString($l10n, $start, $end);
-
-		$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 = array(
-			'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 = \OCP\Util::getDefaultEmailAddress('invitations-noreply');
-		$fromName = $l10n->t('%s via %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();
-
-		$this->addSubjectAndHeading($template, $l10n, $method, $summary,
-			$meetingAttendeeName, $meetingInviteeName);
-		$this->addBulletList($template, $l10n, $meetingWhen, $meetingLocation,
-			$meetingDescription, $meetingUrl);
-
-		$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 bool
-	 */
-	private function isEventInThePast(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();
-			}
-		}
-
-		$currentTime = $this->timeFactory->getTime();
-		return $lastOccurrence < $currentTime;
-	}
-
-
-	/**
-	 * @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 IL10N $l10n
-	 * @param Property $dtstart
-	 * @param Property $dtend
-	 */
-	private function generateWhenString(IL10N $l10n, Property $dtstart, Property $dtend) {
-		$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']);
-			}
-
-			//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
-	 * @param string $attendeeName
-	 * @param string $inviteeName
-	 */
-	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
-										  $method, $summary, $attendeeName, $inviteeName) {
-		if ($method === self::METHOD_CANCEL) {
-			$template->setSubject('Cancelled: ' . $summary);
-			$template->addHeading($l10n->t('Invitation canceled'), $l10n->t('Hello %s,', [$attendeeName]));
-			$template->addBodyText($l10n->t('The meeting »%s« with %s was canceled.', [$summary, $inviteeName]));
-		} else if ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
-			$template->addHeading($l10n->t('Invitation updated'), $l10n->t('Hello %s,', [$attendeeName]));
-			$template->addBodyText($l10n->t('The meeting »%s« with %s was updated.', [$summary, $inviteeName]));
-		} else {
-			$template->setSubject('Invitation: ' . $summary);
-			$template->addHeading($l10n->t('%s invited you to »%s«', [$inviteeName, $summary]), $l10n->t('Hello %s,', [$attendeeName]));
-		}
-
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param IL10N $l10n
-	 * @param string $time
-	 * @param string $location
-	 * @param string $description
-	 * @param string $url
-	 */
-	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $time, $location, $description, $url) {
-		$template->addBodyListItem($time, $l10n->t('When:'),
-			$this->getAbsoluteImagePath('filetypes/text-calendar.svg'));
-
-		if ($location) {
-			$template->addBodyListItem($location, $l10n->t('Where:'),
-				$this->getAbsoluteImagePath('filetypes/location.svg'));
-		}
-		if ($description) {
-			$template->addBodyListItem((string)$description, $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('filetypes/text.svg'));
-		}
-		if ($url) {
-			$template->addBodyListItem((string)$url, $l10n->t('Link:'),
-				$this->getAbsoluteImagePath('filetypes/link.svg'));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function getAbsoluteImagePath($path) {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
+    /** @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 Defaults */
+    private $defaults;
+
+    const MAX_DATE = '2038-01-01';
+
+    const METHOD_REQUEST = 'request';
+    const METHOD_REPLY = 'reply';
+    const METHOD_CANCEL = 'cancel';
+
+    /**
+     * @param IConfig $config
+     * @param IMailer $mailer
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     * @param L10NFactory $l10nFactory
+     * @param IUrlGenerator $urlGenerator
+     * @param Defaults $defaults
+     * @param string $userId
+     */
+    public function __construct(IConfig $config, IMailer $mailer, ILogger $logger, ITimeFactory $timeFactory, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, Defaults $defaults, $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->defaults = $defaults;
+    }
+
+    /**
+     * 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
+        if ($this->isEventInThePast($iTipMessage->message)) {
+            return;
+        }
+
+        // Strip off mailto:
+        $sender = substr($iTipMessage->sender, 7);
+        $recipient = substr($iTipMessage->recipient, 7);
+
+        $senderName = $iTipMessage->senderName ?: null;
+        $recipientName = $iTipMessage->recipientName ?: null;
+
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+
+        $attendee = $this->getCurrentAttendee($iTipMessage);
+        $defaultLang = $this->config->getUserValue($this->userId, 'core', 'lang', $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;
+
+        $start = $vevent->DTSTART;
+        if (isset($vevent->DTEND)) {
+            $end = $vevent->DTEND;
+        } elseif (isset($vevent->DURATION)) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($vevent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+        } elseif (!$vevent->DTSTART->hasTime()) {
+            $isFloating = $vevent->DTSTART->isFloating();
+            $end = clone $vevent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+        } else {
+            $end = clone $vevent->DTSTART;
+        }
+
+        $meetingWhen = $this->generateWhenString($l10n, $start, $end);
+
+        $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 = array(
+            '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 = \OCP\Util::getDefaultEmailAddress('invitations-noreply');
+        $fromName = $l10n->t('%s via %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();
+
+        $this->addSubjectAndHeading($template, $l10n, $method, $summary,
+            $meetingAttendeeName, $meetingInviteeName);
+        $this->addBulletList($template, $l10n, $meetingWhen, $meetingLocation,
+            $meetingDescription, $meetingUrl);
+
+        $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 bool
+     */
+    private function isEventInThePast(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();
+            }
+        }
+
+        $currentTime = $this->timeFactory->getTime();
+        return $lastOccurrence < $currentTime;
+    }
+
+
+    /**
+     * @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 IL10N $l10n
+     * @param Property $dtstart
+     * @param Property $dtend
+     */
+    private function generateWhenString(IL10N $l10n, Property $dtstart, Property $dtend) {
+        $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']);
+            }
+
+            //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
+     * @param string $attendeeName
+     * @param string $inviteeName
+     */
+    private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
+                                            $method, $summary, $attendeeName, $inviteeName) {
+        if ($method === self::METHOD_CANCEL) {
+            $template->setSubject('Cancelled: ' . $summary);
+            $template->addHeading($l10n->t('Invitation canceled'), $l10n->t('Hello %s,', [$attendeeName]));
+            $template->addBodyText($l10n->t('The meeting »%s« with %s was canceled.', [$summary, $inviteeName]));
+        } else if ($method === self::METHOD_REPLY) {
+            $template->setSubject('Re: ' . $summary);
+            $template->addHeading($l10n->t('Invitation updated'), $l10n->t('Hello %s,', [$attendeeName]));
+            $template->addBodyText($l10n->t('The meeting »%s« with %s was updated.', [$summary, $inviteeName]));
+        } else {
+            $template->setSubject('Invitation: ' . $summary);
+            $template->addHeading($l10n->t('%s invited you to »%s«', [$inviteeName, $summary]), $l10n->t('Hello %s,', [$attendeeName]));
+        }
+
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param IL10N $l10n
+     * @param string $time
+     * @param string $location
+     * @param string $description
+     * @param string $url
+     */
+    private function addBulletList(IEMailTemplate $template, IL10N $l10n, $time, $location, $description, $url) {
+        $template->addBodyListItem($time, $l10n->t('When:'),
+            $this->getAbsoluteImagePath('filetypes/text-calendar.svg'));
+
+        if ($location) {
+            $template->addBodyListItem($location, $l10n->t('Where:'),
+                $this->getAbsoluteImagePath('filetypes/location.svg'));
+        }
+        if ($description) {
+            $template->addBodyListItem((string)$description, $l10n->t('Description:'),
+                $this->getAbsoluteImagePath('filetypes/text.svg'));
+        }
+        if ($url) {
+            $template->addBodyListItem((string)$url, $l10n->t('Link:'),
+                $this->getAbsoluteImagePath('filetypes/link.svg'));
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function getAbsoluteImagePath($path) {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
 }

Spacing +22 added lines, -22 removed lines

@@ -201,11 +201,11 @@ 
 		}
 
 		$data = array(
-			'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 = \OCP\Util::getDefaultEmailAddress('invitations-noreply');
@@ -216,7 +216,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();
 
 		$this->addSubjectAndHeading($template, $l10n, $method, $summary,
@@ -229,8 +229,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);
 
@@ -241,7 +241,7 @@ 
 				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
 				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 			}
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$this->logger->logException($ex, ['app' => 'dav']);
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
 		}
@@ -277,13 +277,13 @@ 
 				$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();
 			} else {
 				$end = $it->getDtEnd();
-				while($it->valid() && $end < $maxDate) {
+				while ($it->valid() && $end < $maxDate) {
 					$end = $it->getDtEnd();
 					$it->next();
 
@@ -359,7 +359,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 */
@@ -378,26 +378,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.')';
 	}
 
 	/**
@@ -420,15 +420,15 @@ 
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
 										  $method, $summary, $attendeeName, $inviteeName) {
 		if ($method === self::METHOD_CANCEL) {
-			$template->setSubject('Cancelled: ' . $summary);
+			$template->setSubject('Cancelled: '.$summary);
 			$template->addHeading($l10n->t('Invitation canceled'), $l10n->t('Hello %s,', [$attendeeName]));
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was canceled.', [$summary, $inviteeName]));
 		} else if ($method === self::METHOD_REPLY) {
-			$template->setSubject('Re: ' . $summary);
+			$template->setSubject('Re: '.$summary);
 			$template->addHeading($l10n->t('Invitation updated'), $l10n->t('Hello %s,', [$attendeeName]));
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was updated.', [$summary, $inviteeName]));
 		} else {
-			$template->setSubject('Invitation: ' . $summary);
+			$template->setSubject('Invitation: '.$summary);
 			$template->addHeading($l10n->t('%s invited you to »%s«', [$inviteeName, $summary]), $l10n->t('Hello %s,', [$attendeeName]));
 		}
 
@@ -451,11 +451,11 @@ 
 				$this->getAbsoluteImagePath('filetypes/location.svg'));
 		}
 		if ($description) {
-			$template->addBodyListItem((string)$description, $l10n->t('Description:'),
+			$template->addBodyListItem((string) $description, $l10n->t('Description:'),
 				$this->getAbsoluteImagePath('filetypes/text.svg'));
 		}
 		if ($url) {
-			$template->addBodyListItem((string)$url, $l10n->t('Link:'),
+			$template->addBodyListItem((string) $url, $l10n->t('Link:'),
 				$this->getAbsoluteImagePath('filetypes/link.svg'));
 		}
 	}