nextcloud / server

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

Spacing +26 added lines, -26 removed lines

@@ -229,11 +229,11 @@ 
 		}
 
 		$data = [
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
+			'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal,
+			'invitee_name' => (string) $meetingInviteeName ?: $defaultVal,
+			'meeting_title' => (string) $meetingTitle ?: $defaultVal,
+			'meeting_description' => (string) $meetingDescription ?: $defaultVal,
+			'meeting_url' => (string) $meetingUrl ?: $defaultVal,
 		];
 
 		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
@@ -247,7 +247,7 @@ 
 			$message->setReplyTo([$sender => $senderName]);
 		}
 
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data);
 		$template->addHeader();
 
 		$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event');
@@ -294,8 +294,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);
 
@@ -342,7 +342,7 @@ 
 				$lastOccurrence = $firstOccurrence;
 			}
 		} else {
-			$it = new EventIterator($vObject, (string)$component->UID);
+			$it = new EventIterator($vObject, (string) $component->UID);
 			$maxDate = new \DateTime(self::MAX_DATE);
 			if ($it->isInfinite()) {
 				$lastOccurrence = $maxDate->getTimestamp();
@@ -458,7 +458,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 */
@@ -477,26 +477,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.')';
 	}
 
 	/**
@@ -539,16 +539,16 @@ 
 	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
 		if ($vevent->SUMMARY) {
 			$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
-				$this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/title.png'), '', '', self::IMIP_INDENT);
 		}
 		$meetingWhen = $this->generateWhenString($l10n, $vevent);
 		if ($meetingWhen) {
 			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/time.png'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->LOCATION) {
 			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/location.png'), '', '', self::IMIP_INDENT);
 		}
 		if ($vevent->URL) {
 			$url = $vevent->URL->getValue();
@@ -557,7 +557,7 @@ 
 					htmlspecialchars($url)),
 				$l10n->t('Link:'),
 				$this->getAbsoluteImagePath('caldav/link.png'),
-				$url,'',self::IMIP_INDENT);
+				$url, '', self::IMIP_INDENT);
 		}
 
 		$this->addAttendees($template, $l10n, $vevent);
@@ -565,7 +565,7 @@ 
 		/* Put description last, like an email body, since it can be arbitrarily long */
 		if ($vevent->DESCRIPTION) {
 			$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/description.png'), '', '', self::IMIP_INDENT);
 		}
 	}
 
@@ -595,7 +595,7 @@ 
 			/** @var Property\ICalendar\CalAddress $organizer */
 			$organizer = $vevent->ORGANIZER;
 			$organizerURI = $organizer->getNormalizedValue();
-			[$scheme,$organizerEmail] = explode(':',$organizerURI,2); # strip off scheme mailto:
+			[$scheme, $organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto:
 			/** @var string|null $organizerName */
 			$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null;
 			$organizerHTML = sprintf('<a href="%s">%s</a>',
@@ -612,7 +612,7 @@ 
 			}
 			$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
 				$this->getAbsoluteImagePath('caldav/organizer.png'),
-				$organizerText,'',self::IMIP_INDENT);
+				$organizerText, '', self::IMIP_INDENT);
 		}
 
 		$attendees = $vevent->select('ATTENDEE');
@@ -624,7 +624,7 @@ 
 		$attendeesText = [];
 		foreach ($attendees as $attendee) {
 			$attendeeURI = $attendee->getNormalizedValue();
-			[$scheme,$attendeeEmail] = explode(':',$attendeeURI,2); # strip off scheme mailto:
+			[$scheme, $attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto:
 			$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null;
 			$attendeeHTML = sprintf('<a href="%s">%s</a>',
 				htmlspecialchars($attendeeURI),
@@ -639,9 +639,9 @@ 
 			array_push($attendeesText, $attendeeText);
 		}
 
-		$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
+		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $l10n->t('Attendees:'),
 			$this->getAbsoluteImagePath('caldav/attendees.png'),
-			implode("\n",$attendeesText),'',self::IMIP_INDENT);
+			implode("\n", $attendeesText), '', self::IMIP_INDENT);
 	}
 
 	/**
@@ -692,7 +692,7 @@ 
 	 * @return string
 	 */
 	private function createInvitationToken(Message $iTipMessage, $lastOccurrence):string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		$token = $this->random->generate(60, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 
 		/** @var VEvent $vevent */
 		$vevent = $iTipMessage->message->VEVENT;