From f03a17bb09bed83a29cda253c2049c937852dd38 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 9 Sep 2011 09:32:47 +0800 Subject: [PATCH] MDL-25937 Froms Library: Added server side validation for filepicker and filemanager --- grade/import/xml/grade_import_form.php | 2 +- lib/form/filemanager.php | 1 + lib/form/filepicker.php | 1 + lib/formslib.php | 47 ++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php index 70e69f87549..1984916d03a 100644 --- a/grade/import/xml/grade_import_form.php +++ b/grade/import/xml/grade_import_form.php @@ -32,7 +32,6 @@ class grade_import_form extends moodleform { $mform->setType('id', PARAM_INT); $mform->addElement('header', 'general', get_string('importfile', 'grades')); - $mform->disabledIf('url', 'userfile', 'noteq', ''); $mform->addElement('advcheckbox', 'feedback', get_string('importfeedback', 'grades')); $mform->setDefault('feedback', 0); @@ -42,6 +41,7 @@ class grade_import_form extends moodleform { $mform->disabledIf('userfile', 'url', 'noteq', ''); $mform->addElement('text', 'url', get_string('fileurl', 'gradeimport_xml'), 'size="80"'); + $mform->disabledIf('url', 'userfile', 'noteq', ''); if (!empty($CFG->gradepublishing)) { $mform->addElement('header', 'publishing', get_string('publishing', 'grades')); diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php index 89922a05c21..3670fef7551 100644 --- a/lib/form/filemanager.php +++ b/lib/form/filemanager.php @@ -45,6 +45,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element { if (!empty($options['maxbytes'])) { $this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']); } + $this->_type = 'filemanager'; parent::HTML_QuickForm_element($elementName, $elementLabel, $attributes); } diff --git a/lib/form/filepicker.php b/lib/form/filepicker.php index 039ab7675e5..3007020d274 100644 --- a/lib/form/filepicker.php +++ b/lib/form/filepicker.php @@ -29,6 +29,7 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input { if (!empty($options['maxbytes'])) { $this->_options['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $options['maxbytes']); } + $this->_type = 'filepicker'; parent::HTML_QuickForm_input($elementName, $elementLabel, $attributes); } diff --git a/lib/formslib.php b/lib/formslib.php index d579b8773d0..a521cc2f4b4 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -339,6 +339,43 @@ abstract class moodleform { } } + /** + * Internal method. Validates filepicker and filemanager files if they are + * set as required fields. Also, sets the error message if encountered one. + * + * @return bool/array with errors + */ + function _validate_draft_files() { + global $USER; + $mform =& $this->_form; + + $errors = array(); + //Go through all the required elements and make sure you hit filepicker or + //filemanager element. + foreach ($mform->_rules as $elementname => $rules) { + $elementtype = $mform->getElementType($elementname); + //If element is of type filepicker then do validation + if (($elementtype == 'filepicker') || ($elementtype == 'filemanager')){ + //Check if rule defined is required rule + foreach ($rules as $rule) { + if ($rule['type'] == 'required') { + $draftid = (int)$mform->getSubmitValue($elementname); + $fs = get_file_storage(); + $context = get_context_instance(CONTEXT_USER, $USER->id); + if (!$files = $fs->get_area_files($context->id, 'user', 'draft', $draftid, 'id DESC', false)) { + $errors[$elementname] = $rule['message']; + } + } + } + } + } + if (empty($errors)) { + return true; + } else { + return $errors; + } + } + /** * Load in existing data as form defaults. Usually new entry defaults are stored directly in * form definition (new entry form); this function is used to load in data where values @@ -439,6 +476,16 @@ abstract class moodleform { $files = array(); $file_val = $this->_validate_files($files); + //check draft files for validation and flag them if required files + //are not in draft area. + $draftfilevalue = $this->_validate_draft_files(); + + if ($file_val !== true && $draftfilevalue !== true) { + $file_val = array_merge($file_val, $draftfilevalue); + } else if ($draftfilevalue !== true) { + $file_val = $draftfilevalue; + } //default is file_val, so no need to assign. + if ($file_val !== true) { if (!empty($file_val)) { foreach ($file_val as $element=>$msg) { -- 2.43.0