Only show file kinds that are actually allowed to be uploaded

Resolves #3917
craftcms · Feb 27, 2019 · 97da9fa · 97da9fa
1 parent e94d1c9
commit 97da9fa
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -2,7 +2,11 @@
 
 ## Unreleased
 
+### Added
+- Added `craft\helers\Assets::getAllowedFileKinds()`.
+
 ### Changed
+- Assets field settings no longer list file kinds that aren’t allowed to be uploaded, per the `allowedFileExtensions` and `extraAllowedFileExtensions` config settings. ([#3917](https://github.com/craftcms/cms/issues/3917))
 - The `{% exit %}` tag now throws a more specific exception depending on the status code passed to it (e.g. `yii\web\NotFoundHttpException` for 404s). ([#3915](https://github.com/craftcms/cms/issues/3915))
 
 ### Fixed

diff --git a/src/fields/Assets.php b/src/fields/Assets.php
@@ -176,7 +176,7 @@ public function getFileKindOptions(): array
     {
         $fileKindOptions = [];
 
-        foreach (AssetsHelper::getFileKinds() as $value => $kind) {
+        foreach (AssetsHelper::getAllowedFileKinds() as $value => $kind) {
             $fileKindOptions[] = ['value' => $value, 'label' => $kind['label']];
         }
 

diff --git a/src/helpers/Assets.php b/src/helpers/Assets.php
@@ -45,8 +45,18 @@ class Assets
     // Properties
     // =========================================================================
 
+    /**
+     * @var array Supported file kinds
+     * @see getFileKinds()
+     */
     private static $_fileKinds;
 
+    /**
+     * @var array Allowed file kinds
+     * @see getAllowedFileKinds()
+     */
+    private static $_allowedFileKinds;
+
     // Public Methods
     // =========================================================================
 
@@ -278,6 +288,32 @@ public static function getFileKinds(): array
         return self::$_fileKinds;
     }
 
+    /**
+     * Returns a list of file kinds that are allowed to be uploaded.
+     *
+     * @return array The allowed file kinds
+     */
+    public static function getAllowedFileKinds(): array
+    {
+        if (self::$_allowedFileKinds !== null) {
+            return self::$_allowedFileKinds;
+        }
+
+        self::$_allowedFileKinds = [];
+        $allowedExtensions = array_flip(Craft::$app->getConfig()->getGeneral()->allowedFileExtensions);
+
+        foreach (static::getFileKinds() as $kind => $info) {
+            foreach ($info['extensions'] as $extension) {
+                if (isset($allowedExtensions[$extension])) {
+                    self::$_allowedFileKinds[$kind] = $info;
+                    continue 2;
+                }
+            }
+        }
+
+        return self::$_allowedFileKinds;
+    }
+
     /**
      * Returns the label of a given file kind.
      *