From 27fa2482365d977fd6e592754b5c70149e35e84a Mon Sep 17 00:00:00 2001 From: Juan Leyva Date: Fri, 8 Sep 2017 12:15:45 +0200 Subject: [PATCH 1/1] MDL-59239 mod_workshop: Move submission event trigger MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The submission viewed event was being triggered at the beginning of the script (before doing all the validation/safety checks). I’ve moved the triggering to a better place so the event it is only triggered when is verified that the user has permissions to view the submission. --- mod/workshop/submission.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php index 5acbd59e15b..8985e04fb42 100644 --- a/mod/workshop/submission.php +++ b/mod/workshop/submission.php @@ -51,8 +51,6 @@ if ($edit) { if ($id) { // submission is specified $submission = $workshop->get_submission_by_id($id); - // Trigger submission viewed event. - $workshop->set_submission_viewed($submission); } else { // no submission specified if (!$submission = $workshop->get_submission_by_author($USER->id)) { @@ -124,6 +122,11 @@ if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) { print_error('nopermissions', 'error', $workshop->view_url(), 'view or create submission'); } +if ($submission->id) { + // Trigger submission viewed event. + $workshop->set_submission_viewed($submission); +} + if ($assess and $submission->id and !$isreviewer and $canallocate and $workshop->assessing_allowed($USER->id)) { require_sesskey(); $assessmentid = $workshop->add_allocation($submission, $USER->id); -- 2.43.0