nextcloud / server

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

Indentation +489 added lines, -489 removed lines

@@ -60,494 +60,494 @@
  */
 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;
-
-	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 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, $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;
-	}
-
-	/**
-	 * 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;
-
-		/** @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);
-		$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 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 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]);
+    /** @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;
+
+    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 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, $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;
+    }
+
+    /**
+     * 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;
+
+        /** @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);
+        $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 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 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'}->getValue() : null;
-		$uid = $vevent->{'UID'};
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_invitation_tokens')
-			->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;
-	}
+        $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'}->getValue() : null;
+        $uid = $vevent->{'UID'};
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_invitation_tokens')
+            ->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;
+    }
 }

apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php

Indentation +63 added lines, -63 removed lines

@@ -32,77 +32,77 @@
 
 class InvitationResponseServer {
 
-	/** @var \OCA\DAV\Connector\Sabre\Server */
-	public $server;
+    /** @var \OCA\DAV\Connector\Sabre\Server */
+    public $server;
 
-	/**
-	 * InvitationResponseServer constructor.
-	 *
-	 * @param string $baseUri
-	 */
-	public function __construct($baseUri) {
-		$logger = \OC::$server->getLogger();
-		$dispatcher = \OC::$server->getEventDispatcher();
+    /**
+     * InvitationResponseServer constructor.
+     *
+     * @param string $baseUri
+     */
+    public function __construct($baseUri) {
+        $logger = \OC::$server->getLogger();
+        $dispatcher = \OC::$server->getEventDispatcher();
 
-		$root = new RootCollection();
-		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
+        $root = new RootCollection();
+        $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
-		// Add maintenance plugin
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
+        // Add maintenance plugin
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
 
-		// Set URL explicitly due to reverse-proxy situations
-		$this->server->httpRequest->setUrl($baseUri);
-		$this->server->setBaseUri($baseUri);
+        // Set URL explicitly due to reverse-proxy situations
+        $this->server->httpRequest->setUrl($baseUri);
+        $this->server->setBaseUri($baseUri);
 
-		$this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
-		$this->server->addPlugin(new AnonymousOptionsPlugin());
-		$this->server->addPlugin(new class() extends Plugin {
-			public function getCurrentPrincipal() {
-				return 'principals/system/public';
-			}
-		});
+        $this->server->addPlugin(new BlockLegacyClientPlugin(\OC::$server->getConfig()));
+        $this->server->addPlugin(new AnonymousOptionsPlugin());
+        $this->server->addPlugin(new class() extends Plugin {
+            public function getCurrentPrincipal() {
+                return 'principals/system/public';
+            }
+        });
 
-		// allow setup of additional auth backends
-		$event = new SabrePluginEvent($this->server);
-		$dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
+        // allow setup of additional auth backends
+        $event = new SabrePluginEvent($this->server);
+        $dispatcher->dispatch('OCA\DAV\Connector\Sabre::authInit', $event);
 
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
-		$this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
-		$this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $logger));
+        $this->server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin());
+        $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 
-		// acl
-		$acl = new DavAclPlugin();
-		$acl->principalCollectionSet = [
-			'principals/users', 'principals/groups'
-		];
-		$acl->defaultUsernamePath = 'principals/users';
-		$this->server->addPlugin($acl);
+        // acl
+        $acl = new DavAclPlugin();
+        $acl->principalCollectionSet = [
+            'principals/users', 'principals/groups'
+        ];
+        $acl->defaultUsernamePath = 'principals/users';
+        $this->server->addPlugin($acl);
 
-		// calendar plugins
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
-		$this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
-		//$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
-		$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
-			\OC::$server->getConfig(),
-			\OC::$server->getURLGenerator()
-		));
+        // calendar plugins
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin());
+        $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin());
+        //$this->server->addPlugin(new \OCA\DAV\DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest()));
+        $this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
+            \OC::$server->getConfig(),
+            \OC::$server->getURLGenerator()
+        ));
 
-		// wait with registering these until auth is handled and the filesystem is setup
-		$this->server->on('beforeMethod', function () use ($root) {
-			// register plugins from apps
-			$pluginManager = new PluginManager(
-				\OC::$server,
-				\OC::$server->getAppManager()
-			);
-			foreach ($pluginManager->getAppPlugins() as $appPlugin) {
-				$this->server->addPlugin($appPlugin);
-			}
-			foreach ($pluginManager->getAppCollections() as $appCollection) {
-				$root->addChild($appCollection);
-			}
-		});
-	}
+        // wait with registering these until auth is handled and the filesystem is setup
+        $this->server->on('beforeMethod', function () use ($root) {
+            // register plugins from apps
+            $pluginManager = new PluginManager(
+                \OC::$server,
+                \OC::$server->getAppManager()
+            );
+            foreach ($pluginManager->getAppPlugins() as $appPlugin) {
+                $this->server->addPlugin($appPlugin);
+            }
+            foreach ($pluginManager->getAppCollections() as $appCollection) {
+                $root->addChild($appCollection);
+            }
+        });
+    }
 }
\ No newline at end of file

apps/dav/lib/Migration/Version1006Date20180619154313.php

Indentation +53 added lines, -53 removed lines

@@ -11,61 +11,61 @@
  */
 class Version1006Date20180619154313 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_invitation_tokens')) {
-			$table = $schema->createTable('calendar_invitation_tokens');
+        if (!$schema->hasTable('calendar_invitation_tokens')) {
+            $table = $schema->createTable('calendar_invitation_tokens');
 
-			$table->addColumn('id', Type::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Type::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrenceid', Type::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('attendee', Type::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('organizer', Type::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('sequence', Type::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token', Type::STRING, [
-				'notnull' => true,
-				'length' => 60,
-			]);
-			$table->addColumn('expiration', Type::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
+            $table->addColumn('id', Type::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Type::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrenceid', Type::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('attendee', Type::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('organizer', Type::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('sequence', Type::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token', Type::STRING, [
+                'notnull' => true,
+                'length' => 60,
+            ]);
+            $table->addColumn('expiration', Type::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'calendar_invitation_tokens_id_idx');
-			$table->addIndex(['token'], 'calendar_invitation_tokens_token_idx');
+            $table->setPrimaryKey(['id'], 'calendar_invitation_tokens_id_idx');
+            $table->addIndex(['token'], 'calendar_invitation_tokens_token_idx');
 
-			return $schema;
-		}
-	}
+            return $schema;
+        }
+    }
 }

apps/dav/lib/Controller/InvitationResponseController.php

Indentation +194 added lines, -194 removed lines

@@ -33,160 +33,160 @@ 
 
 class InvitationResponseController extends Controller {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var TimeFactory */
-	private $timeFactory;
-
-	/**
-	 * InvitationResponseController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IDBConnection $db
-	 * @param TimeFactory $timeFactory
-	 */
-	public function __construct(string $appName, IRequest $request,
-								IDBConnection $db, TimeFactory $timeFactory) {
-		parent::__construct($appName, $request);
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	public function accept(string $token):TemplateResponse {
-		$row = $this->getTokenInformation($token);
-		if (!$row) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, 'ACCEPTED');
-		$this->handleITipMessage($iTipMessage);
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	public function decline(string $token):TemplateResponse {
-		$row = $this->getTokenInformation($token);
-		if (!$row) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, 'DECLINED');
-		$this->handleITipMessage($iTipMessage);
-
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @return TemplateResponse
-	 */
-	public function options(string $token):TemplateResponse {
-		return new TemplateResponse($this->appName, 'schedule-response-options', [
-			'token' => $token
-		], 'guest');
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 *
-	 * @return TemplateResponse
-	 */
-	public function processMoreOptionsResult(string $token):TemplateResponse {
-		$partstat = $this->request->getParam('partStat');
-		$guests = (int) $this->request->getParam('guests');
-		$comment = $this->request->getParam('comment');
-
-		$row = $this->getTokenInformation($token);
-		if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
-			return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
-		}
-
-		$iTipMessage = $this->buildITipResponse($row, 'ACCEPTED', $guests, $comment);
-		$this->handleITipMessage($iTipMessage);
-		if ($iTipMessage->getScheduleStatus() === '1.2') {
-			return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
-		}
-
-		return new TemplateResponse($this->appName, 'schedule-response-error', [
-			'organizer' => $row['organizer'],
-		], 'guest');
-	}
-
-	/**
-	 * @param string $token
-	 * @return array|null
-	 */
-	private function getTokenInformation(string $token):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('calendar_invitation_tokens')
-			->where($query->expr()->eq('token', $query->createNamedParameter($token)));
-		$stmt = $query->execute();
-		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-		if(!$row) {
-			return null;
-		}
-
-		$currentTime = $this->timeFactory->getTime();
-		if (((int) $row['expiration']) < $currentTime) {
-			return null;
-		}
-
-		return $row;
-	}
-
-	/**
-	 * @param array $row
-	 * @param string $partStat participation status of attendee - SEE RFC 5545
-	 * @param int|null $guests
-	 * @param string|null $comment
-	 * @return Message
-	 */
-	private function buildITipResponse(array $row, string $partStat, int $guests=null,
-									   string $comment=null):Message {
-		$iTipMessage = new Message();
-		$iTipMessage->uid = $row['uid'];
-		$iTipMessage->component = 'VEVENT';
-		$iTipMessage->method = 'REPLY';
-		$iTipMessage->sequence = $row['sequence'];
-		$iTipMessage->sender = $row['attendee'];
-		$iTipMessage->recipient = $row['organizer'];
-
-		$message = <<<EOF
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var TimeFactory */
+    private $timeFactory;
+
+    /**
+     * InvitationResponseController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IDBConnection $db
+     * @param TimeFactory $timeFactory
+     */
+    public function __construct(string $appName, IRequest $request,
+                                IDBConnection $db, TimeFactory $timeFactory) {
+        parent::__construct($appName, $request);
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @return TemplateResponse
+     */
+    public function accept(string $token):TemplateResponse {
+        $row = $this->getTokenInformation($token);
+        if (!$row) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, 'ACCEPTED');
+        $this->handleITipMessage($iTipMessage);
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @return TemplateResponse
+     */
+    public function decline(string $token):TemplateResponse {
+        $row = $this->getTokenInformation($token);
+        if (!$row) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, 'DECLINED');
+        $this->handleITipMessage($iTipMessage);
+
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @return TemplateResponse
+     */
+    public function options(string $token):TemplateResponse {
+        return new TemplateResponse($this->appName, 'schedule-response-options', [
+            'token' => $token
+        ], 'guest');
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     *
+     * @return TemplateResponse
+     */
+    public function processMoreOptionsResult(string $token):TemplateResponse {
+        $partstat = $this->request->getParam('partStat');
+        $guests = (int) $this->request->getParam('guests');
+        $comment = $this->request->getParam('comment');
+
+        $row = $this->getTokenInformation($token);
+        if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
+            return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
+        }
+
+        $iTipMessage = $this->buildITipResponse($row, 'ACCEPTED', $guests, $comment);
+        $this->handleITipMessage($iTipMessage);
+        if ($iTipMessage->getScheduleStatus() === '1.2') {
+            return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
+        }
+
+        return new TemplateResponse($this->appName, 'schedule-response-error', [
+            'organizer' => $row['organizer'],
+        ], 'guest');
+    }
+
+    /**
+     * @param string $token
+     * @return array|null
+     */
+    private function getTokenInformation(string $token):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('calendar_invitation_tokens')
+            ->where($query->expr()->eq('token', $query->createNamedParameter($token)));
+        $stmt = $query->execute();
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if(!$row) {
+            return null;
+        }
+
+        $currentTime = $this->timeFactory->getTime();
+        if (((int) $row['expiration']) < $currentTime) {
+            return null;
+        }
+
+        return $row;
+    }
+
+    /**
+     * @param array $row
+     * @param string $partStat participation status of attendee - SEE RFC 5545
+     * @param int|null $guests
+     * @param string|null $comment
+     * @return Message
+     */
+    private function buildITipResponse(array $row, string $partStat, int $guests=null,
+                                        string $comment=null):Message {
+        $iTipMessage = new Message();
+        $iTipMessage->uid = $row['uid'];
+        $iTipMessage->component = 'VEVENT';
+        $iTipMessage->method = 'REPLY';
+        $iTipMessage->sequence = $row['sequence'];
+        $iTipMessage->sender = $row['attendee'];
+        $iTipMessage->recipient = $row['organizer'];
+
+        $message = <<<EOF
 BEGIN:VCALENDAR
 PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
 METHOD:REPLY
@@ -201,44 +201,44 @@ 
 END:VCALENDAR
 EOF;
 
-		$vObject = Reader::read(vsprintf($message, [
-			$partStat, $row['attendee'], $row['organizer'],
-			$row['uid'], $row['sequence'] ?? 0,
-		]));
-		$vEvent = $vObject->{'VEVENT'};
-		/** @var \Sabre\VObject\Property\ICalendar\CalAddress $attendee */
-		$attendee = $vEvent->{'ATTENDEE'};
-
-		$vEvent->DTSTAMP = date('Ymd\\THis\\Z');
-
-		if ($row['recurrenceid']) {
-			$vEvent->add('RECURRENCE-ID', $row['recurrenceid']);
-		}
-		if ($comment) {
-			$attendee->add('X-RESPONSE-COMMENT', $comment);
-			$vObject->add('COMMENT', $comment);
-		}
-		if ($guests) {
-			$attendee->add('X-NUM-GUESTS', $guests);
-		}
-
-		$iTipMessage->message = $vObject;
-
-		return $iTipMessage;
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	private function handleITipMessage(Message $iTipMessage) {
-		$server = new InvitationResponseServer(\OC::$WEBROOT . '/remote.php/dav/');
-		// Don't run `$server->exec()`, because we just need access to the
-		// fully initialized schedule plugin, but we don't want Sabre/DAV
-		// to actually handle and reply to the request
-
-		/** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
-		$schedulingPlugin = $server->server->getPlugin('caldav-schedule');
-		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
-	}
+        $vObject = Reader::read(vsprintf($message, [
+            $partStat, $row['attendee'], $row['organizer'],
+            $row['uid'], $row['sequence'] ?? 0,
+        ]));
+        $vEvent = $vObject->{'VEVENT'};
+        /** @var \Sabre\VObject\Property\ICalendar\CalAddress $attendee */
+        $attendee = $vEvent->{'ATTENDEE'};
+
+        $vEvent->DTSTAMP = date('Ymd\\THis\\Z');
+
+        if ($row['recurrenceid']) {
+            $vEvent->add('RECURRENCE-ID', $row['recurrenceid']);
+        }
+        if ($comment) {
+            $attendee->add('X-RESPONSE-COMMENT', $comment);
+            $vObject->add('COMMENT', $comment);
+        }
+        if ($guests) {
+            $attendee->add('X-NUM-GUESTS', $guests);
+        }
+
+        $iTipMessage->message = $vObject;
+
+        return $iTipMessage;
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @return void
+     */
+    private function handleITipMessage(Message $iTipMessage) {
+        $server = new InvitationResponseServer(\OC::$WEBROOT . '/remote.php/dav/');
+        // Don't run `$server->exec()`, because we just need access to the
+        // fully initialized schedule plugin, but we don't want Sabre/DAV
+        // to actually handle and reply to the request
+
+        /** @var \OCA\DAV\CalDAV\Schedule\Plugin $schedulingPlugin */
+        $schedulingPlugin = $server->server->getPlugin('caldav-schedule');
+        $schedulingPlugin->scheduleLocalDelivery($iTipMessage);
+    }
 }

apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php

Indentation +15 added lines, -15 removed lines

@@ -30,23 +30,23 @@
 
 class CleanupInvitationTokenJob extends TimedJob {
 
-	/** @var IDBConnection  */
-	private $db;
+    /** @var IDBConnection  */
+    private $db;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->timeFactory = $timeFactory;
+    public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->timeFactory = $timeFactory;
 
-		$this->setInterval(60 * 60 * 24);
-	}
+        $this->setInterval(60 * 60 * 24);
+    }
 
-	protected function run($argument) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendar_invitation_tokens')
-			->where($query->expr()->lt('expiration',
-				$query->createNamedParameter($this->timeFactory->getTime())));
-	}
+    protected function run($argument) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendar_invitation_tokens')
+            ->where($query->expr()->lt('expiration',
+                $query->createNamedParameter($this->timeFactory->getTime())));
+    }
 }

apps/dav/appinfo/routes.php

Indentation +11 added lines, -11 removed lines

@@ -22,15 +22,15 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'invitation_response#accept', 'url' => '/invitation/accept/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#decline', 'url' => '/invitation/decline/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#options', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST']
-	],
-	'ocs' => [
-		['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'invitation_response#accept', 'url' => '/invitation/accept/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#decline', 'url' => '/invitation/decline/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#options', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST']
+    ],
+    'ocs' => [
+        ['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
+    ],
 ];