diff --git a/Admin/Install/Messages.install.json b/Admin/Install/Messages.install.json index 674b454..19f15b0 100755 --- a/Admin/Install/Messages.install.json +++ b/Admin/Install/Messages.install.json @@ -9,13 +9,13 @@ "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

", - "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" + "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

", - "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" + "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" } }, "send": false diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 1df9bf8..9bb54a5 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -57,6 +57,27 @@ return [ ], ], + '^.*/orw/resource/inform.*$' => [ + [ + 'dest' => '\Modules\OnlineResourceWatcher\Controller\ApiController:apiInformCreate', + 'verb' => RouteVerb::PUT, + 'permission' => [ + 'module' => ApiController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::RESOURCE, + ], + ], + [ + 'dest' => '\Modules\OnlineResourceWatcher\Controller\ApiController:apiInformDelete', + 'verb' => RouteVerb::DELETE, + 'permission' => [ + 'module' => ApiController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::RESOURCE, + ], + ], + ], + '^.*/orw/resource/render.*$' => [ [ 'dest' => '\Modules\OnlineResourceWatcher\Controller\ApiController:apiResourceRender', diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 8adeadb..beb2344 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -410,8 +410,9 @@ final class ApiController extends Controller continue; } - $extension = ($pos = \strrpos($file, '.')) !== false ? \substr($file, $pos + 1) : ''; - $possibleExtension = MimeType::mimeToExtension(\mime_content_type($path . '/' . $file)); + $extension = ($pos = \strrpos($file, '.')) === false ? '' : \substr($file, $pos + 1); + $mimeContentType = \mime_content_type($path . '/' . $file); + $possibleExtension = MimeType::mimeToExtension($mimeContentType === false ? '' : $mimeContentType); $newFileName = FileUtils::makeSafeFileName($file); if ($possibleExtension !== null && $possibleExtension !== $extension) {