nextcloud / server

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

Spacing +31 added lines, -31 removed lines

@@ -231,8 +231,8 @@ 
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// generate localized when string
 		// TRANSLATORS
@@ -358,14 +358,14 @@ 
 	public function generateWhenStringRecurringDaily(EventReader $er): string {
 
 		// initialize
-		$interval = (int)$er->recurringInterval();
+		$interval = (int) $er->recurringInterval();
 		$startTime = null;
 		$conclusion = null;
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// conclusion
 		if ($er->recurringConcludes()) {
@@ -409,16 +409,16 @@ 
 	public function generateWhenStringRecurringWeekly(EventReader $er): string {
 
 		// initialize
-		$interval = (int)$er->recurringInterval();
+		$interval = (int) $er->recurringInterval();
 		$startTime = null;
 		$conclusion = null;
 		// days of the week
-		$days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+		$days = implode(', ', array_map(function($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// conclusion
 		if ($er->recurringConcludes()) {
@@ -462,21 +462,21 @@ 
 	public function generateWhenStringRecurringMonthly(EventReader $er): string {
 
 		// initialize
-		$interval = (int)$er->recurringInterval();
+		$interval = (int) $er->recurringInterval();
 		$startTime = null;
 		$conclusion = null;
 		// days of month
 		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
-					. implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+			$days = implode(', ', array_map(function($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())).' '
+					. implode(', ', array_map(function($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
 		} else {
 			$days = implode(', ', $er->recurringDaysOfMonth());
 		}
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// conclusion
 		if ($er->recurringConcludes()) {
@@ -527,23 +527,23 @@ 
 	public function generateWhenStringRecurringYearly(EventReader $er): string {
 
 		// initialize
-		$interval = (int)$er->recurringInterval();
+		$interval = (int) $er->recurringInterval();
 		$startTime = null;
 		$conclusion = null;
 		// months of year
-		$months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
+		$months = implode(', ', array_map(function($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
 		// days of month
 		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
-					. implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+			$days = implode(', ', array_map(function($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())).' '
+					. implode(', ', array_map(function($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
 		} else {
 			$days = $er->startDateTime()->format('jS');
 		}
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// conclusion
 		if ($er->recurringConcludes()) {
@@ -575,7 +575,7 @@ 
 			[false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
 			[false, true, true] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', [$months, $days, $startTime, $endTime, $conclusion]),
 			[true, false, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day', [$interval, $months, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months,  $days, $conclusion]),
+			[true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months, $days, $conclusion]),
 			[true, true, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [$interval, $months, $days, $startTime, $endTime]),
 			[true, true, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [$interval, $months, $days, $startTime, $endTime, $conclusion]),
 			default => $this->l10n->t('Could not generate event recurrence statement')
@@ -598,8 +598,8 @@ 
 		// time of the day
 		if (!$er->entireDay()) {
 			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' ('.$er->startTimeZone()->getName().')' : '';
+			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']).' ('.$er->endTimeZone()->getName().')';
 		}
 		// conclusion
 		$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
@@ -799,21 +799,21 @@ 
 		$strikethrough = "<span style='text-decoration: line-through'>%s</span>";
 
 		$newMeetingWhen = $this->generateWhenString($eventReaderCurrent);
-		$newSummary = htmlspecialchars(isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event'));
-		$newDescription = htmlspecialchars(isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal);
-		$newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
-		$newLocation = htmlspecialchars(isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal);
+		$newSummary = htmlspecialchars(isset($vEvent->SUMMARY) && (string) $vEvent->SUMMARY !== '' ? (string) $vEvent->SUMMARY : $this->l10n->t('Untitled event'));
+		$newDescription = htmlspecialchars(isset($vEvent->DESCRIPTION) && (string) $vEvent->DESCRIPTION !== '' ? (string) $vEvent->DESCRIPTION : $defaultVal);
+		$newUrl = isset($vEvent->URL) && (string) $vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
+		$newLocation = htmlspecialchars(isset($vEvent->LOCATION) && (string) $vEvent->LOCATION !== '' ? (string) $vEvent->LOCATION : $defaultVal);
 		$newLocationHtml = $this->linkify($newLocation) ?? $newLocation;
 
 		$data = [];
 		$data['meeting_when_html'] = $newMeetingWhen === '' ?: sprintf($strikethrough, $newMeetingWhen);
 		$data['meeting_when'] = $newMeetingWhen;
 		$data['meeting_title_html'] = sprintf($strikethrough, $newSummary);
-		$data['meeting_title'] = $newSummary !== '' ? $newSummary: $this->l10n->t('Untitled event');
+		$data['meeting_title'] = $newSummary !== '' ? $newSummary : $this->l10n->t('Untitled event');
 		$data['meeting_description_html'] = $newDescription !== '' ? sprintf($strikethrough, $newDescription) : '';
 		$data['meeting_description'] = $newDescription;
 		$data['meeting_url_html'] = $newUrl !== '' ? sprintf($strikethrough, $newUrl) : '';
-		$data['meeting_url'] = isset($vEvent->URL) ? (string)$vEvent->URL : '';
+		$data['meeting_url'] = isset($vEvent->URL) ? (string) $vEvent->URL : '';
 		$data['meeting_location_html'] = $newLocationHtml !== '' ? sprintf($strikethrough, $newLocationHtml) : '';
 		$data['meeting_location'] = $newLocation;
 		return $data;
@@ -830,7 +830,7 @@ 
 		$component = $vObject->VEVENT;
 
 		if (isset($component->RRULE)) {
-			$it = new EventIterator($vObject, (string)$component->UID);
+			$it = new EventIterator($vObject, (string) $component->UID);
 			$maxDate = new \DateTime(IMipPlugin::MAX_DATE);
 			if ($it->isInfinite()) {
 				return $maxDate->getTimestamp();
@@ -1232,7 +1232,7 @@ 
 			$interval = $dateInterval->m;
 			$scale = 'month';
 		} elseif ($dateInterval->d >= 7) {
-			$interval = (int)($dateInterval->d / 7);
+			$interval = (int) ($dateInterval->d / 7);
 			$scale = 'week';
 		} elseif ($dateInterval->d > 0) {
 			$interval = $dateInterval->d;

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

Spacing +14 added lines, -14 removed lines

@@ -130,7 +130,7 @@ 
 	 * @param VEvent $vevent
 	 */
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n, VEvent $vevent):void {
-		$template->setSubject('Notification: ' . $this->getTitleFromVEvent($vevent, $l10n));
+		$template->setSubject('Notification: '.$this->getTitleFromVEvent($vevent, $l10n));
 		$template->addHeading($this->getTitleFromVEvent($vevent, $l10n));
 	}
 
@@ -156,18 +156,18 @@ 
 
 		if (isset($vevent->LOCATION)) {
 			$template->addBodyListItem(
-				htmlspecialchars((string)$vevent->LOCATION),
+				htmlspecialchars((string) $vevent->LOCATION),
 				$l10n->t('Where:'),
 				$this->getAbsoluteImagePath('actions/address.png'),
-				htmlspecialchars((string)$vevent->LOCATION),
+				htmlspecialchars((string) $vevent->LOCATION),
 			);
 		}
 		if (isset($vevent->DESCRIPTION)) {
 			$template->addBodyListItem(
-				htmlspecialchars((string)$vevent->DESCRIPTION),
+				htmlspecialchars((string) $vevent->DESCRIPTION),
 				$l10n->t('Description:'),
 				$this->getAbsoluteImagePath('actions/more.png'),
-				htmlspecialchars((string)$vevent->DESCRIPTION),
+				htmlspecialchars((string) $vevent->DESCRIPTION),
 			);
 		}
 	}
@@ -182,7 +182,7 @@ 
 	 * @param VEvent $vevent
 	 * @return array|null
 	 */
-	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
+	private function getOrganizerEMailAndNameFromEvent(VEvent $vevent): ?array {
 		if (!$vevent->ORGANIZER) {
 			return null;
 		}
@@ -405,10 +405,10 @@ 
 			]);
 
 			return $localeStart
-				. ' (' . $startTimezone . ') '
+				. ' ('.$startTimezone.') '
 				. ' - '
 				. $localeEnd
-				. ' (' . $endTimezone . ')';
+				. ' ('.$endTimezone.')';
 		}
 
 		// Show only the time if the day is the same
@@ -422,7 +422,7 @@ 
 		return $localeStart
 			. ' - '
 			. $localeEnd
-			. ' (' . $startTimezone . ')';
+			. ' ('.$startTimezone.')';
 	}
 
 	private function isDayEqual(DateTime $dtStart,
@@ -431,24 +431,24 @@ 
 	}
 
 	private function getWeekDayName(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+		return (string) $l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
 	}
 
 	private function getDateString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('date', $dt, ['width' => 'medium']);
+		return (string) $l10n->l('date', $dt, ['width' => 'medium']);
 	}
 
 	private function getDateTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('datetime', $dt, ['width' => 'medium|short']);
+		return (string) $l10n->l('datetime', $dt, ['width' => 'medium|short']);
 	}
 
 	private function getTimeString(IL10N $l10n, DateTime $dt):string {
-		return (string)$l10n->l('time', $dt, ['width' => 'short']);
+		return (string) $l10n->l('time', $dt, ['width' => 'short']);
 	}
 
 	private function getTitleFromVEvent(VEvent $vevent, IL10N $l10n):string {
 		if (isset($vevent->SUMMARY)) {
-			return (string)$vevent->SUMMARY;
+			return (string) $vevent->SUMMARY;
 		}
 
 		return $l10n->t('Untitled event');