|
|
|
|
@ -98,7 +98,7 @@ class IMipService { |
|
|
|
|
return $default; |
|
|
|
|
} |
|
|
|
|
$newstring = $vevent->$property->getValue(); |
|
|
|
|
if(isset($oldVEvent->$property)) { |
|
|
|
|
if(isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring ) { |
|
|
|
|
$oldstring = $oldVEvent->$property->getValue(); |
|
|
|
|
return sprintf($strikethrough, $oldstring, $newstring); |
|
|
|
|
} |
|
|
|
|
@ -128,7 +128,7 @@ class IMipService { |
|
|
|
|
$data['meeting_location_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']); |
|
|
|
|
|
|
|
|
|
$oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal); |
|
|
|
|
$data['meeting_url_html'] = !empty($oldUrl) ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url']; |
|
|
|
|
$data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url']; |
|
|
|
|
|
|
|
|
|
$data['meeting_when_html'] = |
|
|
|
|
($oldMeetingWhen !== $data['meeting_when'] && $oldMeetingWhen !== null) |
|
|
|
|
@ -477,7 +477,7 @@ class IMipService { |
|
|
|
|
*/ |
|
|
|
|
public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) { |
|
|
|
|
$template->addBodyListItem( |
|
|
|
|
$data['meeting_title'], $this->l10n->t('Title:'), |
|
|
|
|
$data['meeting_title_html'] ?? $data['meeting_title'], $this->l10n->t('Title:'), |
|
|
|
|
$this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT); |
|
|
|
|
if ($data['meeting_when'] !== '') { |
|
|
|
|
$template->addBodyListItem($data['meeting_when_html'] ?? $data['meeting_when'], $this->l10n->t('Time:'), |
|
|
|
|
|