MDL-59299 filemanager: Display what filetypes are accepted

diff --git a/lang/en/form.php b/lang/en/form.php
index 2b9b10a..b899919 100644 (file)
--- a/lang/en/form.php
+++ b/lang/en/form.php
@@ -42,6 +42,7 @@ $string['err_numeric'] = 'You must enter a number here.';
 $string['err_rangelength'] = 'You must enter between {$a->format[0]} and {$a->format[1]} characters here.';
 $string['err_required'] = 'You must supply a value here.';
 $string['err_wrongfileextension'] = 'Some files ({$a->wrongfiles}) cannot be uploaded. Only file types {$a->whitelist} are allowed.';
+$string['filesofthesetypes'] = 'Accepted files types:';
 $string['filetypesany'] = 'All file types';
 $string['filetypesnotall'] = 'It is not allowed to select \'All file types\' here';
 $string['filetypesnotwhitelisted'] = 'These file types are not allowed here: {$a}';

diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index 93ff4cf..71686d0 100644 (file)
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -300,6 +300,14 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element implements temp
         // label element needs 'for' attribute work
         $html .= html_writer::empty_tag('input', array('value' => '', 'id' => 'id_'.$elname, 'type' => 'hidden'));
 
+        if (!empty($options->accepted_types) && $options->accepted_types != '*') {
+            $html .= html_writer::tag('p', get_string('filesofthesetypes', 'form'));
+            $util = new \core_form\filetypes_util();
+            $filetypes = $options->accepted_types;
+            $filetypedescriptions = $util->describe_file_types($filetypes);
+            $html .= $OUTPUT->render_from_template('core_form/filetypes-descriptions', $filetypedescriptions);
+        }
+
         return $html;
     }
 

diff --git a/mod/assign/submission/file/lang/en/assignsubmission_file.php b/mod/assign/submission/file/lang/en/assignsubmission_file.php
index 8a039df..45dd3ff 100644 (file)
--- a/mod/assign/submission/file/lang/en/assignsubmission_file.php
+++ b/mod/assign/submission/file/lang/en/assignsubmission_file.php
@@ -34,7 +34,6 @@ $string['enabled'] = 'File submissions';
 $string['enabled_help'] = 'If enabled, students are able to upload one or more files as their submission.';
 $string['eventassessableuploaded'] = 'A file has been uploaded.';
 $string['file'] = 'File submissions';
-$string['filesofthesetypes'] = 'Files of these types may be added to the submission:';
 $string['maxbytes'] = 'Maximum file size';
 $string['maxfiles'] = 'Maximum files per submission';
 $string['maxfiles_help'] = 'If file submissions are enabled, each assignment can be set to accept up to this number of files for their submission.';
@@ -47,5 +46,6 @@ $string['pluginname'] = 'File submissions';
 $string['siteuploadlimit'] = 'Site upload limit';
 $string['submissionfilearea'] = 'Uploaded submission files';
 // Deprecated since Moodle 3.4.
+$string['filesofthesetypes'] = 'Files of these types may be added to the submission:';
 $string['filetypewithexts'] = '{$a->name} — {$a->extlist}';
 $string['nonexistentfiletypes'] = 'The following file types were not recognised: {$a}';

diff --git a/mod/assign/submission/file/lang/en/deprecated.txt b/mod/assign/submission/file/lang/en/deprecated.txt
index b6128ca..c3ca9ee 100644 (file)
--- a/mod/assign/submission/file/lang/en/deprecated.txt
+++ b/mod/assign/submission/file/lang/en/deprecated.txt
@@ -1,2 +1,3 @@
+filesofthesetypes,assignsubmission_file
 filetypewithexts,assignsubmission_file
 nonexistentfiletypes,assignsubmission_file

diff --git a/mod/assign/submission/file/locallib.php b/mod/assign/submission/file/locallib.php
index 775df9d..8a82199 100644 (file)
--- a/mod/assign/submission/file/locallib.php
+++ b/mod/assign/submission/file/locallib.php
@@ -183,15 +183,6 @@ class assign_submission_file extends assign_submission_plugin {
                                                   $submissionid);
         $mform->addElement('filemanager', 'files_filemanager', $this->get_name(), null, $fileoptions);
 
-        if (!empty($this->get_config('filetypeslist'))) {
-            $text = html_writer::tag('p', get_string('filesofthesetypes', 'assignsubmission_file'));
-            $util = new \core_form\filetypes_util();
-            $filetypes = $this->get_configured_typesets();
-            $filetypedescriptions = $util->describe_file_types($filetypes);
-            $text .= $OUTPUT->render_from_template('core_form/filetypes-descriptions', $filetypedescriptions);
-            $mform->addElement('static', '', '', $text);
-        }
-
         return true;
     }