Completed
Pull Request — master (#6402)
by Georg
33:39 queued 16:14
created
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -193,18 +193,18 @@  discard block
 block discarded – undo
193 193
 		}
194 194
 
195 195
 		$data = array(
196
-			'attendee_name' => (string)$meetingAttendeeName ?: $defaultVal,
197
-			'invitee_name' => (string)$meetingInviteeName ?: $defaultVal,
198
-			'meeting_title' => (string)$meetingTitle ?: $defaultVal,
199
-			'meeting_description' => (string)$meetingDescription ?: $defaultVal,
200
-			'meeting_url' => (string)$meetingUrl ?: $defaultVal,
196
+			'attendee_name' => (string) $meetingAttendeeName ?: $defaultVal,
197
+			'invitee_name' => (string) $meetingInviteeName ?: $defaultVal,
198
+			'meeting_title' => (string) $meetingTitle ?: $defaultVal,
199
+			'meeting_description' => (string) $meetingDescription ?: $defaultVal,
200
+			'meeting_url' => (string) $meetingUrl ?: $defaultVal,
201 201
 		);
202 202
 
203 203
 		$message = $this->mailer->createMessage()
204 204
 			->setReplyTo([$sender => $senderName])
205 205
 			->setTo([$recipient => $recipientName]);
206 206
 
207
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
207
+		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.'.$method, $data);
208 208
 		$template->addHeader();
209 209
 
210 210
 		$this->addSubjectAndHeading($template, $l10n, $method, $summary,
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
 
218 218
 		$attachment = $this->mailer->createAttachment(
219 219
 			$iTipMessage->message->serialize(),
220
-			'event.ics',// TODO(leon): Make file name unique, e.g. add event id
221
-			'text/calendar; method=' . $iTipMessage->method
220
+			'event.ics', // TODO(leon): Make file name unique, e.g. add event id
221
+			'text/calendar; method='.$iTipMessage->method
222 222
 		);
223 223
 		$message->attach($attachment);
224 224
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' =>  implode(', ', $failed)]);
230 230
 				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
231 231
 			}
232
-		} catch(\Exception $ex) {
232
+		} catch (\Exception $ex) {
233 233
 			$this->logger->logException($ex, ['app' => 'dav']);
234 234
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
235 235
 		}
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
 				$lastOccurrence = $firstOccurrence;
266 266
 			}
267 267
 		} else {
268
-			$it = new EventIterator($vObject, (string)$component->UID);
268
+			$it = new EventIterator($vObject, (string) $component->UID);
269 269
 			$maxDate = new \DateTime(self::MAX_DATE);
270 270
 			if ($it->isInfinite()) {
271 271
 				$lastOccurrence = $maxDate->getTimestamp();
272 272
 			} else {
273 273
 				$end = $it->getDtEnd();
274
-				while($it->valid() && $end < $maxDate) {
274
+				while ($it->valid() && $end < $maxDate) {
275 275
 					$end = $it->getDtEnd();
276 276
 					$it->next();
277 277
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			$localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']);
348 348
 			$localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']);
349 349
 
350
-			return $localeStart . ' - ' . $localeEnd;
350
+			return $localeStart.' - '.$localeEnd;
351 351
 		}
352 352
 
353 353
 		/** @var Property\ICalendar\DateTime $dtstart */
@@ -372,8 +372,8 @@  discard block
 block discarded – undo
372 372
 		if ($startTimezone !== $endTimezone) {
373 373
 			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium']);
374 374
 
375
-			return $localeStart . ' (' . $startTimezone . ') - ' .
376
-				$localeEnd . ' (' . $endTimezone . ')';
375
+			return $localeStart.' ('.$startTimezone.') - '.
376
+				$localeEnd.' ('.$endTimezone.')';
377 377
 		}
378 378
 
379 379
 		// show only end time if date is the same
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			$localeEnd = $l10n->l('datetime', $dtendDt, ['width' => 'medium']);
384 384
 		}
385 385
 
386
-		return  $localeStart . ' - ' . $localeEnd . ' (' . $startTimezone . ')';
386
+		return  $localeStart.' - '.$localeEnd.' ('.$startTimezone.')';
387 387
 	}
388 388
 
389 389
 	/**
@@ -406,15 +406,15 @@  discard block
 block discarded – undo
406 406
 	private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
407 407
 										  $method, $summary, $attendeeName, $inviteeName) {
408 408
 		if ($method === self::METHOD_CANCEL) {
409
-			$template->setSubject('Cancelled: ' . $summary);
409
+			$template->setSubject('Cancelled: '.$summary);
410 410
 			$template->addHeading($l10n->t('Invitation canceled'), $l10n->t('Hello %s,', [$attendeeName]));
411 411
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was canceled.', [$summary, $inviteeName]));
412 412
 		} else if ($method === self::METHOD_REPLY) {
413
-			$template->setSubject('Re: ' . $summary);
413
+			$template->setSubject('Re: '.$summary);
414 414
 			$template->addHeading($l10n->t('Invitation updated'), $l10n->t('Hello %s,', [$attendeeName]));
415 415
 			$template->addBodyText($l10n->t('The meeting »%s« with %s was updated.', [$summary, $inviteeName]));
416 416
 		} else {
417
-			$template->setSubject('Invitation: ' . $summary);
417
+			$template->setSubject('Invitation: '.$summary);
418 418
 			$template->addHeading($l10n->t('%s invited you to »%s«', [$inviteeName, $summary]), $l10n->t('Hello %s,', [$attendeeName]));
419 419
 		}
420 420
 
@@ -437,11 +437,11 @@  discard block
 block discarded – undo
437 437
 				$this->getAbsoluteImagePath('filetypes/location.svg'));
438 438
 		}
439 439
 		if ($description) {
440
-			$template->addBodyListItem((string)$description, $l10n->t('Description:'),
440
+			$template->addBodyListItem((string) $description, $l10n->t('Description:'),
441 441
 				$this->getAbsoluteImagePath('filetypes/text.svg'));
442 442
 		}
443 443
 		if ($url) {
444
-			$template->addBodyListItem((string)$url, $l10n->t('Link:'),
444
+			$template->addBodyListItem((string) $url, $l10n->t('Link:'),
445 445
 				$this->getAbsoluteImagePath('filetypes/link.svg'));
446 446
 		}
447 447
 	}
Please login to merge, or discard this patch.