[REFACTOR] update filterFilesByMimeType for better custom dlf-mimetype use

Author: fschoelzel

Classes/Common/Helper.php

@@ -952,14 +952,15 @@ private static function getLocalConfigurationByPath(string $path)
      *
      * @param mixed $file The file array to filter
      * @param array $allowedCategories The allowed MIME type categories to filter by (e.g., ['audio'], ['video'] or ['image', 'application'])
-     * @param array|null $dlfMimeTypes Optional array of custom DLF mimetype keys to filter by. Default is null.
-     *                   Pass null to use all available custom DLF mimetype keys
-     *                   Pass array of keys to use only specific types - Accepted values: 'IIIF', 'IIP', 'ZOOMIFY', 'JPG'
+     * @param null|bool|array $dlfMimeTypes Optional array of custom dlf mimetype keys to filter by. Default is null.
+     *                      - null: use no custom dlf mimetypes
+     *                      - true: use all custom dlf mimetypes
+     *                      - array: use only specific types - Accepted values: 'IIIF', 'IIP', 'ZOOMIFY', 'JPG'
      * @param string $mimeTypeKey The key used to access the mimetype in the file array (default is 'mimetype')
      *
      * @return bool True if the file mimetype belongs to any of the allowed mimetypes or matches any custom dlf mimetypes, false otherwise
      */
-    public static function filterFilesByMimeType($file, array $allowedCategories, ?array $dlfMimeTypes = null, string $mimeTypeKey = 'mimetype'): bool
+    public static function filterFilesByMimeType($file, array $allowedCategories, null|bool|array $dlfMimeTypes = null, string $mimeTypeKey = 'mimetype'): bool
     {
         if (empty($allowedCategories) && empty($dlfMimeTypes)) {
             return false;
@@ -988,9 +989,12 @@ function ($mimeType) use ($allowedCategories) {
         ];
 
         // Apply filtering to the custom dlf MIME type array
-        $filteredDlfMimeTypes = $dlfMimeTypes === null
-            ? $dlfMimeTypeArray
-            : array_intersect_key($dlfMimeTypeArray, array_flip($dlfMimeTypes));
+        $filteredDlfMimeTypes = match(true) {
+            $dlfMimeTypes === null => [],
+            $dlfMimeTypes === true => $dlfMimeTypeArray,
+            is_array($dlfMimeTypes) => array_intersect_key($dlfMimeTypeArray, array_flip($dlfMimeTypes)),
+            default => []
+        };
 
         // Actual filtering to check if the file's MIME type is allowed
         if (is_array($file) && isset($file[$mimeTypeKey])) {

Classes/Controller/PageViewController.php

@@ -637,7 +637,7 @@ protected function getImage(int $page, MetsDocument $specificDoc = null): array
             // Get file info for the specific page and file group
             $file = $this->fetchFileInfo($page, $fileGrpImages, $specificDoc);
 
-            if ($file && Helper::filterFilesByMimeType($file, ['image'], null, 'mimeType')) {
+            if ($file && Helper::filterFilesByMimeType($file, ['image'], true, 'mimeType')) {
                 $image['url'] = $file['location'];
                 $image['mimetype'] = $file['mimeType'];
 

Classes/Controller/ToolboxController.php

@@ -283,13 +283,13 @@ private function renderImageDownloadTool(): void
         $imageArray = [];
         // Get left or single page download.
         $image = $this->getImage($page);
-        if (Helper::filterFilesByMimeType($image, ['image'])) {
+        if (Helper::filterFilesByMimeType($image, ['image'], true)) {
             $imageArray[0] = $image;
         }
 
         if ($this->requestData['double'] == 1) {
             $image = $this->getImage($page + 1);
-            if (Helper::filterFilesByMimeType($image, ['image'])) {
+            if (Helper::filterFilesByMimeType($image, ['image'], true)) {
                 $imageArray[1] = $image;
             }
         }