From 443ab2cea98d17271e521a6f45c00d4f45824998 Mon Sep 17 00:00:00 2001 From: Stephen Bourget Date: Thu, 23 Jun 2016 17:39:48 -0400 Subject: [PATCH] MDL-54911 mod_feedback: start date should be before the end date --- mod/feedback/lang/en/feedback.php | 1 + mod/feedback/mod_form.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php index 052930d2ebc..6e2988e7cc5 100644 --- a/mod/feedback/lang/en/feedback.php +++ b/mod/feedback/lang/en/feedback.php @@ -41,6 +41,7 @@ $string['cannotaccess'] = 'You can only access this feedback from a course'; $string['cannotsavetempl'] = 'saving templates is not allowed'; $string['captcha'] = 'Captcha'; $string['captchanotset'] = 'Captcha hasn\'t been set.'; +$string['closebeforeopen'] = 'You have specified an end date before the start date.'; $string['completed_feedbacks'] = 'Submitted answers'; $string['complete_the_form'] = 'Answer the questions...'; $string['completionsubmit'] = 'View as completed if the feedback is submitted'; diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php index 2bf91dd0fe2..81bd89b61e0 100644 --- a/mod/feedback/mod_form.php +++ b/mod/feedback/mod_form.php @@ -179,8 +179,21 @@ class mod_feedback_mod_form extends moodleform_mod { return $data; } + /** + * Enforce validation rules here + * + * @param array $data array of ("fieldname"=>value) of submitted data + * @param array $files array of uploaded files "element_name"=>tmp_file_path + * @return array + **/ public function validation($data, $files) { $errors = parent::validation($data, $files); + + // Check open and close times are consistent. + if ($data['timeopen'] && $data['timeclose'] && + $data['timeclose'] < $data['timeopen']) { + $errors['timeclose'] = get_string('closebeforeopen', 'feedback'); + } return $errors; }