diff --git a/Admin/Install/Messages.install.json b/Admin/Install/Messages.install.json index 19f15b0..5c03ef7 100755 --- a/Admin/Install/Messages.install.json +++ b/Admin/Install/Messages.install.json @@ -9,12 +9,12 @@ "l11n": { "en": { "subject": "ORW Resource Change", - "body": "Resource Change

Resource Change

The resource {resource.url} changed.

This email is sent to you from {owner_email}, if you don't wan't to receive these emails click here

Jingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058

", + "body": "Resource Change

Resource Change

The resource {resource.url} changed.

This email is sent to you from {owner_email}, if you don't wan't to receive these emails click here

Jingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058

", "bodyalt": "Resource Change\n\nThe resource {resource.url} changed.\n\n\nThis email is sent to you from {owner_email}, if you don't wan't to receive these emails visit https://orw.jingga.app/unsubscribe?email={email}&resource={resource.id}\n\n\nJingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058" }, "de": { "subject": "Ressourcenänderung", - "body": "Ressourcenänderung

Ressourcenänderung

Die Ressource {resource.url} hat sich geändert.

Diese E-Mail wird Ihnen von {owner_email} gesendet. Wenn Sie diese E-Mails nicht mehr erhalten möchten, klicken Sie hier.

Jingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058

", + "body": "Ressourcenänderung

Ressourcenänderung

Die Ressource {resource.url} hat sich geändert.

Diese E-Mail wird Ihnen von {owner_email} gesendet. Wenn Sie diese E-Mails nicht mehr erhalten möchten, klicken Sie hier.

Jingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058

", "bodyalt": "Ressourcenänderung\n\nDie Ressource {resource.url} hat sich geändert.\n\nDiese E-Mail wird Ihnen von {owner_email} gesendet. Wenn Sie diese E-Mails nicht mehr erhalten möchten, besuchen Sie https://orw.jingga.app/unsubscribe?email={email}&resource={resource.id}\n\n\nJingga e.K. - www.jingga.app - CEO Dennis Eichhorn - Amtsgericht Friedberg HRA 5058" } }, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 21b9509..cb39347 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -295,9 +295,13 @@ final class ApiController extends Controller /** @var \Model\Setting $emailSettings */ $emailSettings = $this->app->appSettings->get( names: SettingsEnum::MAIL_SERVER_ADDR, - module: 'OnlineResourceWatcher' + module: 'Admin' ); + if (empty($emailSettings->content)) { + return; + } + /** @var \Model\Setting $templateSettings */ $templateSettings = $this->app->appSettings->get( names: OrwSettingsEnum::ORW_CHANGE_MAIL_TEMPLATE, @@ -343,40 +347,18 @@ final class ApiController extends Controller } $mail->subject = $mailL11n->subject; + $mail->body = $mailL11n->body; + $mail->bodyAlt = $mailL11n->bodyAlt; + + $mail->template = [ + '{resource.id}' => $resource->id, + '{email}' => $inform->email, + '{resource.url}' => $resource->uri, + '{owner_email}' => $resource->owner->getEmail(), + ]; - $mail->body = \str_replace( - [ - '{resource.id}', - '{email}', - '{resource.url}', - '{owner_email}', - ], - [ - $resource->id, - $inform->email, - $resource->uri, - $resource->owner->getEmail(), - ], - $mailL11n->body - ); $mail->msgHTML($mail->body); - $mail->bodyAlt = \str_replace( - [ - '{resource.id}', - '{email}', - '{resource.url}', - '{owner_email}', - ], - [ - $resource->id, - $inform->email, - $resource->uri, - $resource->owner->getEmail(), - ], - $mailL11n->bodyAlt - ); - $mail->addTo($inform->email); $handler->send($mail); } @@ -652,8 +634,6 @@ final class ApiController extends Controller ' ' ) ); - - // @todo allow $resource->path handling for html paths } elseif (\in_array($extension, self::IMG_RENDERABLE)) { $diffPath = \dirname($newPath) . '/_' . \basename($newPath); diff --git a/Theme/Backend/resource-comparison-inline.tpl.php b/Theme/Backend/resource-comparison-inline.tpl.php index 1d2a182..9f71029 100644 --- a/Theme/Backend/resource-comparison-inline.tpl.php +++ b/Theme/Backend/resource-comparison-inline.tpl.php @@ -26,12 +26,8 @@ use phpOMS\Uri\UriFactory; continue; } - $old = $new; + $old = $new ?? $report; $new = $report; - - if ($old === null) { - $old = $report; - } } if ($resource->checkedAt !== null) :