|
@@ -210,11 +210,11 @@ discard block |
|
|
block discarded – undo |
|
210
|
210
|
} |
|
211
|
211
|
|
|
212
|
212
|
$data = [ |
|
213
|
|
- 'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal, |
|
214
|
|
- 'invitee_name' => (string)$meetingInviteeName ?: $defaultVal, |
|
215
|
|
- 'meeting_title' => (string)$meetingTitle ?: $defaultVal, |
|
216
|
|
- 'meeting_description' => (string)$meetingDescription ?: $defaultVal, |
|
217
|
|
- 'meeting_url' => (string)$meetingUrl ?: $defaultVal, |
|
|
213
|
+ 'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal, |
|
|
214
|
+ 'invitee_name' => (string) $meetingInviteeName ?: $defaultVal, |
|
|
215
|
+ 'meeting_title' => (string) $meetingTitle ?: $defaultVal, |
|
|
216
|
+ 'meeting_description' => (string) $meetingDescription ?: $defaultVal, |
|
|
217
|
+ 'meeting_url' => (string) $meetingUrl ?: $defaultVal, |
|
218
|
218
|
]; |
|
219
|
219
|
|
|
220
|
220
|
$fromEMail = Util::getDefaultEmailAddress('invitations-noreply'); |
|
@@ -225,7 +225,7 @@ discard block |
|
|
block discarded – undo |
|
225
|
225
|
->setTo([$recipient => $recipientName]) |
|
226
|
226
|
->setReplyTo([$sender => $senderName]); |
|
227
|
227
|
|
|
228
|
|
- $template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data); |
|
|
228
|
+ $template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data); |
|
229
|
229
|
$template->addHeader(); |
|
230
|
230
|
|
|
231
|
231
|
$summary = ((string) $summary !== '') ? (string) $summary : $l10n->t('Untitled event'); |
|
@@ -270,8 +270,8 @@ discard block |
|
|
block discarded – undo |
|
270
|
270
|
|
|
271
|
271
|
$attachment = $this->mailer->createAttachment( |
|
272
|
272
|
$iTipMessage->message->serialize(), |
|
273
|
|
- 'event.ics',// TODO(leon): Make file name unique, e.g. add event id |
|
274
|
|
- 'text/calendar; method=' . $iTipMessage->method |
|
|
273
|
+ 'event.ics', // TODO(leon): Make file name unique, e.g. add event id |
|
|
274
|
+ 'text/calendar; method='.$iTipMessage->method |
|
275
|
275
|
); |
|
276
|
276
|
$message->attach($attachment); |
|
277
|
277
|
|
|
@@ -318,7 +318,7 @@ discard block |
|
|
block discarded – undo |
|
318
|
318
|
$lastOccurrence = $firstOccurrence; |
|
319
|
319
|
} |
|
320
|
320
|
} else { |
|
321
|
|
- $it = new EventIterator($vObject, (string)$component->UID); |
|
|
321
|
+ $it = new EventIterator($vObject, (string) $component->UID); |
|
322
|
322
|
$maxDate = new \DateTime(self::MAX_DATE); |
|
323
|
323
|
if ($it->isInfinite()) { |
|
324
|
324
|
$lastOccurrence = $maxDate->getTimestamp(); |
|
@@ -443,7 +443,7 @@ discard block |
|
|
block discarded – undo |
|
443
|
443
|
$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']); |
|
444
|
444
|
$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']); |
|
445
|
445
|
|
|
446
|
|
- return $localeStart . ' - ' . $localeEnd; |
|
|
446
|
+ return $localeStart.' - '.$localeEnd; |
|
447
|
447
|
} |
|
448
|
448
|
|
|
449
|
449
|
/** @var Property\ICalendar\DateTime $dtstart */ |
|
@@ -462,26 +462,26 @@ discard block |
|
|
block discarded – undo |
|
462
|
462
|
} |
|
463
|
463
|
} |
|
464
|
464
|
|
|
465
|
|
- $localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']) . ', ' . |
|
|
465
|
+ $localeStart = $l10n->l('weekdayName', $dtstartDt, ['width' => 'abbreviated']).', '. |
|
466
|
466
|
$l10n->l('datetime', $dtstartDt, ['width' => 'medium|short']); |
|
467
|
467
|
|
|
468
|
468
|
// always show full date with timezone if timezones are different |
|
469
|
469
|
if ($startTimezone !== $endTimezone) { |
|
470
|
470
|
$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium|short']); |
|
471
|
471
|
|
|
472
|
|
- return $localeStart . ' (' . $startTimezone . ') - ' . |
|
473
|
|
- $localeEnd . ' (' . $endTimezone . ')'; |
|
|
472
|
+ return $localeStart.' ('.$startTimezone.') - '. |
|
|
473
|
+ $localeEnd.' ('.$endTimezone.')'; |
|
474
|
474
|
} |
|
475
|
475
|
|
|
476
|
476
|
// show only end time if date is the same |
|
477
|
477
|
if ($this->isDayEqual($dtstartDt, $dtendDt)) { |
|
478
|
478
|
$localeEnd = $l10n->l('time', $dtendDt, ['width' => 'short']); |
|
479
|
479
|
} else { |
|
480
|
|
- $localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']) . ', ' . |
|
|
480
|
+ $localeEnd = $l10n->l('weekdayName', $dtendDt, ['width' => 'abbreviated']).', '. |
|
481
|
481
|
$l10n->l('datetime', $dtendDt, ['width' => 'medium|short']); |
|
482
|
482
|
} |
|
483
|
483
|
|
|
484
|
|
- return $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')'; |
|
|
484
|
+ return $localeStart.' - '.$localeEnd.' ('.$startTimezone.')'; |
|
485
|
485
|
} |
|
486
|
486
|
|
|
487
|
487
|
/** |
|
@@ -580,7 +580,7 @@ discard block |
|
|
block discarded – undo |
|
580
|
580
|
/** @var Property\ICalendar\CalAddress $organizer */ |
|
581
|
581
|
$organizer = $vevent->ORGANIZER; |
|
582
|
582
|
$organizerURI = $organizer->getNormalizedValue(); |
|
583
|
|
- [$scheme,$organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto: |
|
|
583
|
+ [$scheme, $organizerEmail] = explode(':', $organizerURI, 2); # strip off scheme mailto: |
|
584
|
584
|
/** @var string|null $organizerName */ |
|
585
|
585
|
$organizerName = isset($organizer['CN']) ? $organizer['CN'] : null; |
|
586
|
586
|
$organizerHTML = sprintf('<a href="%s">%s</a>', |
|
@@ -609,7 +609,7 @@ discard block |
|
|
block discarded – undo |
|
609
|
609
|
$attendeesText = []; |
|
610
|
610
|
foreach ($attendees as $attendee) { |
|
611
|
611
|
$attendeeURI = $attendee->getNormalizedValue(); |
|
612
|
|
- [$scheme,$attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto: |
|
|
612
|
+ [$scheme, $attendeeEmail] = explode(':', $attendeeURI, 2); # strip off scheme mailto: |
|
613
|
613
|
$attendeeName = isset($attendee['CN']) ? $attendee['CN'] : null; |
|
614
|
614
|
$attendeeHTML = sprintf('<a href="%s">%s</a>', |
|
615
|
615
|
htmlspecialchars($attendeeURI), |