diff --git a/public/mod/feedback/classes/completion.php b/public/mod/feedback/classes/completion.php index 879a091f420..860d822594f 100644 --- a/public/mod/feedback/classes/completion.php +++ b/public/mod/feedback/classes/completion.php @@ -545,7 +545,7 @@ class mod_feedback_completion extends mod_feedback_structure { * It is also responsible for sending email notifications when applicable. */ public function save_response() { - global $SESSION, $DB, $USER; + global $DB, $USER; $feedbackcompleted = $this->find_last_completed(); // If no record is found, change false to null for safe use in feedback_save_tmp_values. @@ -563,8 +563,6 @@ class mod_feedback_completion extends mod_feedback_structure { feedback_send_email_anonym($this->cm, $this->feedback, $this->cm->get_course()); } - unset($SESSION->feedback->is_started); - // Update completion state. $completion = new completion_info($this->cm->get_course()); if ((isloggedin() || $USER->id != $this->userid) && $completion->is_enabled($this->cm) && @@ -680,7 +678,7 @@ class mod_feedback_completion extends mod_feedback_structure { * @since Moodle 3.3 */ public function process_page($gopage, $gopreviouspage = false) { - global $CFG, $PAGE, $SESSION; + global $PAGE; $urltogo = null; @@ -696,9 +694,6 @@ class mod_feedback_completion extends mod_feedback_structure { ($this->form->is_validated() || $gopreviouspage)) { // Form was submitted (skip validation for "Previous page" button). $data = $this->form->get_submitted_data(); - if (!isset($SESSION->feedback->is_started) OR !$SESSION->feedback->is_started == true) { - throw new \moodle_exception('error', '', $CFG->wwwroot.'/course/view.php?id='.$this->courseid); - } $this->save_response_tmp($data); if (!empty($data->savevalues) || !empty($data->gonextpage)) { if (($nextpage = $this->get_next_page($gopage)) !== null) { @@ -731,10 +726,6 @@ class mod_feedback_completion extends mod_feedback_structure { * @since Moodle 3.3 */ public function render_items() { - global $SESSION; - - // Print the items. - $SESSION->feedback->is_started = true; return $this->form->render(); } } diff --git a/public/mod/feedback/classes/external.php b/public/mod/feedback/classes/external.php index 8dc80d85368..1f127e206e5 100644 --- a/public/mod/feedback/classes/external.php +++ b/public/mod/feedback/classes/external.php @@ -729,7 +729,7 @@ class mod_feedback_external extends external_api { * @since Moodle 3.3 */ public static function process_page($feedbackid, $page, $responses = [], $goprevious = false, $courseid = 0) { - global $USER, $SESSION; + global $USER; $params = array('feedbackid' => $feedbackid, 'page' => $page, 'responses' => $responses, 'goprevious' => $goprevious, 'courseid' => $courseid); @@ -768,8 +768,6 @@ class mod_feedback_external extends external_api { // Ignore sesskey (deep in some APIs), the request is already validated. $USER->ignoresesskey = true; - feedback_init_feedback_session(); - $SESSION->feedback->is_started = true; $feedbackcompletion->process_page($params['page'], $params['goprevious']); $completed = $feedbackcompletion->just_completed(); diff --git a/public/mod/feedback/complete.php b/public/mod/feedback/complete.php index 8d5ba795470..7fd7e61fda4 100644 --- a/public/mod/feedback/complete.php +++ b/public/mod/feedback/complete.php @@ -25,8 +25,6 @@ require_once("../../config.php"); require_once("lib.php"); -feedback_init_feedback_session(); - $id = required_param('id', PARAM_INT); $courseid = optional_param('courseid', null, PARAM_INT); $gopage = optional_param('gopage', 0, PARAM_INT);