From 9069c66e4243d7d0dbd92c9aa4059105dbdf1e09 Mon Sep 17 00:00:00 2001
From: Jake Dallimore <jake@moodle.com>
Date: Thu, 22 Jun 2017 09:59:00 +0800
Subject: [PATCH] MDL-59299 mod_assign: use new filetypes element for accepted
 file types

---
 mod/assign/submission/file/locallib.php | 5 ++---
 mod/assign/submission/file/settings.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mod/assign/submission/file/locallib.php b/mod/assign/submission/file/locallib.php
index d96b293009a..749a7dc27a4 100644
--- a/mod/assign/submission/file/locallib.php
+++ b/mod/assign/submission/file/locallib.php
@@ -113,16 +113,15 @@ class assign_submission_file extends assign_submission_plugin {
                            'notchecked');
 
         $name = get_string('acceptedfiletypes', 'assignsubmission_file');
-        $mform->addElement('text', 'assignsubmission_file_filetypes', $name, array('size' => '60'));
+        $mform->addElement('filetypes', 'assignsubmission_file_filetypes', $name);
         $mform->addHelpButton('assignsubmission_file_filetypes', 'acceptedfiletypes', 'assignsubmission_file');
-        $mform->setType('assignsubmission_file_filetypes', PARAM_RAW);
         $mform->setDefault('assignsubmission_file_filetypes', $defaultfiletypes);
         $mform->disabledIf('assignsubmission_file_filetypes', 'assignsubmission_file_enabled', 'notchecked');
         $mform->addFormRule(function ($values, $files) {
             if (empty($values['assignsubmission_file_filetypes'])) {
                 return true;
             }
-            $nonexistent = $this->get_nonexistent_file_types($values['assignsubmission_file_filetypes']);
+            $nonexistent = $this->get_nonexistent_file_types($values['assignsubmission_file_filetypes']['filetypes']);
             if (empty($nonexistent)) {
                 return true;
             } else {
diff --git a/mod/assign/submission/file/settings.php b/mod/assign/submission/file/settings.php
index a895e6240be..9ed9b5e6fd4 100644
--- a/mod/assign/submission/file/settings.php
+++ b/mod/assign/submission/file/settings.php
@@ -32,9 +32,9 @@ $settings->add(new admin_setting_configtext('assignsubmission_file/maxfiles',
                    new lang_string('maxfiles', 'assignsubmission_file'),
                    new lang_string('maxfiles_help', 'assignsubmission_file'), 20, PARAM_INT));
 
-$settings->add(new admin_setting_configtext('assignsubmission_file/filetypes',
+$settings->add(new admin_setting_filetypes('assignsubmission_file/filetypes',
                    new lang_string('defaultacceptedfiletypes', 'assignsubmission_file'),
-                   new lang_string('acceptedfiletypes_help', 'assignsubmission_file'), '', PARAM_RAW, 60));
+                   new lang_string('acceptedfiletypes_help', 'assignsubmission_file'), ''));
 
 if (isset($CFG->maxbytes)) {