Build a central function for allowed file types

corsacca · corsacca · commit e7dbee23269f · 2026-03-23T13:18:25.000+01:00
diff --git a/dt-assets/functions/enqueue-scripts.php b/dt-assets/functions/enqueue-scripts.php
@@ -444,18 +444,7 @@ function dt_site_scripts() {
         wp_localize_script( 'dt-storage', 'storage_settings',
             [
                 'rest_url' => esc_url_raw( rest_url() ),
-                'accepted_file_types' => [
-                    'image/*',
-                    'application/pdf',
-                    'audio/*',
-                    'video/*',
-                    'application/msword',
-                    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                    'application/vnd.ms-excel',
-                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                    'text/plain',
-                    'text/markdown',
-                ],
+                'accepted_file_types' => dt_get_default_accepted_file_types(),
                 'translations' => [
                     'modals' => [
                         'upload' => [
diff --git a/dt-core/admin/js/dt-settings.js b/dt-core/admin/js/dt-settings.js
@@ -1609,40 +1609,57 @@ jQuery(document).ready(function ($) {
 
     // Add file_upload field-specific options
     if (field_type === 'file_upload') {
-      let accepted_file_types = field_settings['accepted_file_types'] || [
-        'image/*',
-        'application/pdf',
-        'audio/*',
-        'video/*',
-        'application/msword',
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'application/vnd.ms-excel',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'text/plain',
-        'text/markdown',
-      ];
+      const fileTypeCategories = all_settings.file_type_categories || {};
+      let storedTypes = field_settings['accepted_file_types'] || null;
+      let hasStoredTypes = storedTypes !== null;
+
       let max_file_size = field_settings['max_file_size'] || '';
       let delete_enabled = field_settings['delete_enabled'] !== false; // default true
       let display_layout = field_settings['display_layout'] || 'grid';
       let auto_upload = field_settings['auto_upload'] !== false; // default true
       let download_enabled = field_settings['download_enabled'] !== false; // default true
       let rename_enabled = field_settings['rename_enabled'] !== false; // default true
 
+      let categoryCheckboxes = '';
+      for (const [catKey, cat] of Object.entries(fileTypeCategories)) {
+        let isChecked =
+          !hasStoredTypes ||
+          cat.types.every((t) => storedTypes.includes(t));
+        categoryCheckboxes += `
+            <label style="margin-right: 1em;">
+                <input type="checkbox" class="accepted-file-category"
+                  data-types='${JSON.stringify(cat.types)}' ${isChecked ? 'checked' : ''}>
+                ${cat.label}
+            </label>`;
+      }
+
+      // Compute "other" types not covered by any category
+      let allCategoryTypes = Object.values(fileTypeCategories).flatMap(
+        (c) => c.types,
+      );
+      let otherTypes = hasStoredTypes
+        ? storedTypes.filter((t) => !allCategoryTypes.includes(t)).join(', ')
+        : '';
+
       modal_html_content += `
         <tr>
             <td>
-                <label for="accepted_file_types"><b>Accepted File Types</b></label>
+                <b>Accepted File Types</b>
             </td>
             <td>
-                <input type="text" name="accepted_file_types" id="accepted_file_types" 
-                  value="${accepted_file_types.join(', ')}" 
-                  placeholder="e.g., image/*, audio/*, video/*, application/pdf, .docx"
-                  style="width: 100%;">
+                ${categoryCheckboxes}
+                <div style="margin-top: 6px;">
+                    <label for="other_file_types"><b>Other</b></label>
+                    <input type="text" name="other_file_types" id="other_file_types"
+                      value="${otherTypes}"
+                      placeholder="e.g., application/zip, .csv"
+                      style="width: 100%;">
+                    <p style="font-size: 11px; color: #666; margin-top: 3px;">
+                      Comma-separated MIME types or file extensions for additional file types.
+                    </p>
+                </div>
                 <p style="font-size: 11px; color: #666; margin-top: 5px;">
-                  Optional. Comma-separated list of MIME types or file extensions to override the default set (images, PDFs, audio, video, common documents). Leave empty to use the default types.
-                  <a href="https://developer.mozilla.org/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types" target="_blank" rel="noopener noreferrer">
-                    View common MIME types.
-                  </a>
+                  Select which file type categories are allowed for upload. If none are selected, all types will be accepted.
                 </p>
             </td>
         </tr>
@@ -2421,9 +2438,24 @@ jQuery(document).ready(function ($) {
 
     // Add file_upload field-specific options to visibility object
     if (field_settings['type'] && field_settings['type'] === 'file_upload') {
-      visibility['accepted_file_types'] = $('#accepted_file_types')
-        .val()
-        .trim();
+      let checkedTypes = [];
+      let totalCategories = $('.accepted-file-category').length;
+      $('.accepted-file-category:checked').each(function () {
+        checkedTypes = checkedTypes.concat(
+          JSON.parse($(this).attr('data-types')),
+        );
+      });
+      let otherVal = $('#other_file_types').val().trim();
+      let otherList = otherVal
+        ? otherVal.split(',').map((s) => s.trim()).filter(Boolean)
+        : [];
+      let allTypes = checkedTypes.concat(otherList);
+      let allCategoriesChecked =
+        $('.accepted-file-category:checked').length === totalCategories;
+      visibility['accepted_file_types'] =
+        allCategoriesChecked && otherList.length === 0
+          ? ''
+          : allTypes.join(', ');
       visibility['max_file_size'] = $('#max_file_size').val().trim();
       visibility['delete_enabled'] = $('#delete_enabled').is(':checked');
       visibility['display_layout'] = $('#display_layout').val();
diff --git a/dt-core/admin/menu/tabs/tab-custom-fields.php b/dt-core/admin/menu/tabs/tab-custom-fields.php
@@ -545,18 +545,11 @@ private function edit_field( $field_key, $post_type ){
             <?php
                 $custom_fields = dt_get_option( 'dt_field_customizations' );
                 $custom_field = $custom_fields[ $post_type ][ $field_key ] ?? [];
-                $accepted_file_types = $custom_field['accepted_file_types'] ?? [
-                    'image/*',
-                    'application/pdf',
-                    'audio/*',
-                    'video/*',
-                    'application/msword',
-                    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                    'application/vnd.ms-excel',
-                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                    'text/plain',
-                    'text/markdown',
-                ];
+                $file_type_categories = dt_get_file_type_categories();
+                $has_stored_types = isset( $custom_field['accepted_file_types'] );
+                $stored_types = $custom_field['accepted_file_types'] ?? [];
+                $all_category_types = array_merge( ...array_column( $file_type_categories, 'types' ) );
+                $other_types = $has_stored_types ? array_values( array_diff( $stored_types, $all_category_types ) ) : [];
                 $max_file_size = $custom_field['max_file_size'] ?? '';
                 $delete_enabled = isset( $custom_field['delete_enabled'] ) ? $custom_field['delete_enabled'] : true;
                 $display_layout = $custom_field['display_layout'] ?? 'grid';
@@ -567,19 +560,32 @@ private function edit_field( $field_key, $post_type ){
             <h3><?php esc_html_e( 'Field Options', 'disciple_tools' ) ?></h3>
             <table id="file_upload_options">
                 <tr>
-                    <td style="vertical-align: middle">
-                        <label for="accepted_file_types"><b><?php esc_html_e( 'Accepted File Types', 'disciple_tools' ) ?></b></label>
+                    <td style="vertical-align: top">
+                        <b><?php esc_html_e( 'Accepted File Types', 'disciple_tools' ) ?></b>
                     </td>
                     <td>
-                        <input type="text" name="accepted_file_types" id="accepted_file_types"
-                               value="<?php echo esc_attr( implode( ', ', $accepted_file_types ) ) ?>"
-                               placeholder="e.g., image/*, audio/*, video/*, application/pdf, .docx"
-                               style="width: 100%;" />
+                        <?php foreach ( $file_type_categories as $cat_key => $cat ) :
+                            $is_checked = ! $has_stored_types || empty( array_diff( $cat['types'], $stored_types ) );
+                            ?>
+                            <label style="margin-right: 1em;">
+                                <input type="checkbox" name="accepted_file_categories[]"
+                                       value="<?php echo esc_attr( $cat_key ) ?>"
+                                       <?php echo $is_checked ? 'checked' : ''; ?>>
+                                <?php echo esc_html( $cat['label'] ) ?>
+                            </label>
+                        <?php endforeach; ?>
+                        <div style="margin-top: 6px;">
+                            <label for="other_file_types"><b><?php esc_html_e( 'Other', 'disciple_tools' ) ?></b></label>
+                            <input type="text" name="other_file_types" id="other_file_types"
+                                   value="<?php echo esc_attr( implode( ', ', $other_types ) ) ?>"
+                                   placeholder="<?php esc_attr_e( 'e.g., application/zip, .csv', 'disciple_tools' ) ?>"
+                                   style="width: 100%;" />
+                            <p style="font-size: 11px; color: #666; margin-top: 3px;">
+                                <?php esc_html_e( 'Comma-separated MIME types or file extensions for additional file types.', 'disciple_tools' ); ?>
+                            </p>
+                        </div>
                         <p style="font-size: 11px; color: #666; margin-top: 5px;">
-                            <?php esc_html_e( 'Optional. Comma-separated list of MIME types or file extensions to override the default set (images, PDFs, audio, video, common documents). Leave empty to use the default types.', 'disciple_tools' ); ?>
-                            <a href="<?php echo esc_url( 'https://developer.mozilla.org/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types' ); ?>" target="_blank" rel="noopener noreferrer">
-                                <?php esc_html_e( 'View common MIME types.', 'disciple_tools' ); ?>
-                            </a>
+                            <?php esc_html_e( 'Select which file type categories are allowed for upload. If none are selected, all types will be accepted.', 'disciple_tools' ); ?>
                         </p>
                     </td>
                 </tr>
@@ -1045,16 +1051,33 @@ private function process_edit_field( $post_submission ){
 
             // file_upload field options
             if ( $field['type'] === 'file_upload' ) {
-                // Accepted file types
-                if ( isset( $post_submission['accepted_file_types'] ) ) {
-                    $raw_accepted = trim( $post_submission['accepted_file_types'] );
-                    if ( $raw_accepted === '' ) {
-                        // Clear any previously saved override so defaults are used
-                        unset( $custom_field['accepted_file_types'] );
-                    } else {
-                        $types = array_map( 'sanitize_text_field', array_map( 'trim', explode( ',', $raw_accepted ) ) );
-                        $custom_field['accepted_file_types'] = $types;
+                // Accepted file types from category checkboxes
+                $category_mime_map = array_map( function ( $cat ) {
+                    return $cat['types'];
+                }, dt_get_file_type_categories() );
+                $selected_categories = isset( $post_submission['accepted_file_categories'] )
+                    ? array_map( 'sanitize_text_field', $post_submission['accepted_file_categories'] )
+                    : [];
+
+                $raw_other = isset( $post_submission['other_file_types'] ) ? trim( $post_submission['other_file_types'] ) : '';
+                $other_types = $raw_other !== ''
+                    ? array_map( 'sanitize_text_field', array_map( 'trim', explode( ',', $raw_other ) ) )
+                    : [];
+
+                $all_categories_selected = count( $selected_categories ) === count( $category_mime_map );
+                if ( $all_categories_selected && empty( $other_types ) ) {
+                    unset( $custom_field['accepted_file_types'] );
+                } else if ( empty( $selected_categories ) && empty( $other_types ) ) {
+                    unset( $custom_field['accepted_file_types'] );
+                } else {
+                    $types = [];
+                    foreach ( $selected_categories as $cat_key ) {
+                        if ( isset( $category_mime_map[ $cat_key ] ) ) {
+                            $types = array_merge( $types, $category_mime_map[ $cat_key ] );
+                        }
                     }
+                    $types = array_merge( $types, $other_types );
+                    $custom_field['accepted_file_types'] = $types;
                 }
 
                 // Max file size
diff --git a/dt-core/admin/menu/tabs/tab-customizations.php b/dt-core/admin/menu/tabs/tab-customizations.php
@@ -121,6 +121,7 @@ public function admin_enqueue_scripts() {
             'nonce' => wp_create_nonce( 'wp_rest' ),
             'site_url' => get_site_url(),
             'template_dir' => get_template_directory_uri(),
+            'file_type_categories' => dt_get_file_type_categories(),
         ];
 
         if ( !empty( $post_type ) ) {
diff --git a/dt-core/global-functions.php b/dt-core/global-functions.php
@@ -1556,6 +1556,44 @@ function dt_get_duplicate_fields_defaults( $post_type ) {
         return apply_filters( 'dt_duplicate_fields_defaults', $default_fields, $post_type );
     }
 
+    function dt_get_file_type_categories() {
+        return [
+            'images' => [
+                'label' => __( 'Images', 'disciple_tools' ),
+                'types' => [ 'image/*' ],
+            ],
+            'pdfs' => [
+                'label' => __( 'PDFs', 'disciple_tools' ),
+                'types' => [ 'application/pdf' ],
+            ],
+            'documents' => [
+                'label' => __( 'Documents', 'disciple_tools' ),
+                'description' => __( 'Word, Excel, CSV, text, markdown', 'disciple_tools' ),
+                'types' => [
+                    'application/msword',
+                    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    'application/vnd.ms-excel',
+                    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    'text/csv',
+                    'text/plain',
+                    'text/markdown',
+                ],
+            ],
+            'audio' => [
+                'label' => __( 'Audio', 'disciple_tools' ),
+                'types' => [ 'audio/*' ],
+            ],
+            'video' => [
+                'label' => __( 'Video', 'disciple_tools' ),
+                'types' => [ 'video/*' ],
+            ],
+        ];
+    }
+
+    function dt_get_default_accepted_file_types() {
+        return array_merge( ...array_column( dt_get_file_type_categories(), 'types' ) );
+    }
+
     /**
      * All code above here.
      */
diff --git a/dt-core/utilities/dt-components.php b/dt-core/utilities/dt-components.php
@@ -332,18 +332,19 @@ public static function render_file_upload( $field_key, $fields, $post, $params =
         }
 
         // Get field settings for configuration
-        $accepted_file_types = $fields[ $field_key ]['accepted_file_types'] ?? [
-            'image/*',
-            'application/pdf',
-            'audio/*',
-            'video/*',
-            'application/msword',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.ms-excel',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'text/plain',
-            'text/markdown',
-        ];
+        $accepted_file_types = $fields[ $field_key ]['accepted_file_types'] ?? dt_get_default_accepted_file_types();
+        $categories = dt_get_file_type_categories();
+        $all_category_types = array_merge( ...array_column( $categories, 'types' ) );
+        $labels = [];
+        foreach ( $categories as $cat ) {
+            if ( !empty( array_intersect( $cat['types'], $accepted_file_types ) ) ) {
+                $labels[] = $cat['label'];
+            }
+        }
+        $other_types = array_diff( $accepted_file_types, $all_category_types );
+        $labels = array_merge( $labels, array_values( $other_types ) );
+        $accepted_file_types_label = implode( ', ', $labels );
+
         $max_file_size = $fields[$field_key]['max_file_size'] ?? null;
         $delete_enabled = isset( $fields[$field_key]['delete_enabled'] ) ? $fields[$field_key]['delete_enabled'] : true;
         $display_layout = $fields[$field_key]['display_layout'] ?? 'grid';
@@ -420,6 +421,7 @@ public static function render_file_upload( $field_key, $fields, $post, $params =
             <?php endif; ?>
             value="<?php echo esc_attr( json_encode( $enhanced_value ) ) ?>"
             accepted-file-types='<?php echo esc_attr( json_encode( $accepted_file_types ) ) ?>'
+            accepted-file-types-label="<?php echo esc_attr( $accepted_file_types_label ) ?>"
             <?php if ( $max_file_size ): ?>
                 max-file-size="<?php echo esc_attr( $max_file_size ) ?>"
             <?php endif; ?>
