カスタムコンテンツのファイル拡張子チェックのデフォルト値を設定

Author: seto1

plugins/bc-admin-third/templates/plugin/BcCustomContent/Admin/element/CustomFields/form.php

@@ -127,7 +127,7 @@
             </li>
             <li>
               <strong><?php echo __d('baser_core', 'ファイル拡張子チェック') ?></strong><br>
-              <?php echo __d('baser_core', '利用するには、「アップロードを許可する拡張子」に拡張子をカンマ区切りで入力します」') ?>
+              <?php echo __d('baser_core', '利用するには、「アップロードを許可する拡張子」に拡張子をカンマ区切りで入力します。未設定の場合は「gif,jpg,jpeg,png,pdf」を許可します。') ?>
             </li>
           </ul>
         </div>

plugins/bc-custom-content/src/Model/Table/CustomEntriesTable.php

@@ -336,8 +336,15 @@ public function setValidateMaxFileSize(Validator $validator, CustomLink $link, a
      */
     public function setValidateFileExt(Validator $validator, CustomLink $link)
     {
-        if (empty($link->custom_field->meta['BcCustomContent']['file_ext'])) return $validator;
-        $fileExt = explode(',', $link->custom_field->meta['BcCustomContent']['file_ext']);
+        if ($link->custom_field->type !== 'BcCcFile') {
+            return $validator;
+        }
+
+        $fileExt = ['gif', 'jpg', 'jpeg', 'png', 'pdf'];
+        if (!empty($link->custom_field->meta['BcCustomContent']['file_ext'])) {
+            $fileExt = explode(',', $link->custom_field->meta['BcCustomContent']['file_ext']);
+        }
+
         $validator->add($link->name, [
             'fileExt' => [
                 'provider' => 'bc',

plugins/bc-custom-content/tests/TestCase/Model/Table/CustomEntriesTableTest.php

@@ -372,6 +372,7 @@ public function test_setupValidate()
         //準備
         CustomFieldFactory::make([
             'id' => 1,
+            'type' => 'BcCcFile',
             'validate' => '["NUMBER","EMAIL","HANKAKU","ZENKAKU_KATAKANA","ZENKAKU_HIRAGANA","DATETIME","EMAIL_CONFIRM"]',
             'meta' => '{"BcCustomContent":{"email_confirm":"","max_file_size":"1","file_ext":"true"}}',
             'regex' => '[0-9]'
@@ -472,23 +473,21 @@ public function test_setValidateFileExt()
     {
         $validator = $this->CustomEntriesTable->getValidator('default');
         $customLink = CustomLinkFactory::make(['name' => 'test'])->getEntity();
-        $customField = CustomFieldFactory::make()->getEntity();
+        $customField = CustomFieldFactory::make(['type' => 'BcCcFile'])->getEntity();
         /**
          * file_ext is null
          */
         $customField->meta = ['BcCustomContent' => ['file_ext' => null]];
         $customLink->custom_field = $customField;
         $rs = $this->CustomEntriesTable->setValidateFileExt($validator, $customLink);
-        //check result return
-        $this->assertArrayNotHasKey('test', $rs);
+        $this->assertEquals(['gif', 'jpg', 'jpeg', 'png', 'pdf'], $rs['test']->rule('fileExt')->get('pass')[0]);
         /**
          * file_ext is not null
          */
         $customField->meta = ['BcCustomContent' => ['file_ext' => 'jpg,png,gif']];
         $customLink->custom_field = $customField;
         $rs = $this->CustomEntriesTable->setValidateFileExt($validator, $customLink);
-        //check result return
-        $this->assertArrayHasKey('test', $rs);
+        $this->assertEquals(['jpg', 'png', 'gif'], $rs['test']->rule('fileExt')->get('pass')[0]);
         /**
          * check message return
          * after when setValidateFileExt