MDL-82958 user: Return general error if course/context not valid

mickhawkins · Aug 30, 2024 · 01fbadf · 01fbadf
1 parent 056f473
commit 01fbadf
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/user/index.php b/user/index.php
@@ -52,16 +52,21 @@
         'id' => $courseid,
         'newcourse' => $newcourse));
 
-if ($contextid) {
-    $context = context::instance_by_id($contextid, MUST_EXIST);
-    if ($context->contextlevel != CONTEXT_COURSE) {
-        throw new \moodle_exception('invalidcontext');
+try {
+    if ($contextid) {
+        $context = context::instance_by_id($contextid, MUST_EXIST);
+        if ($context->contextlevel != CONTEXT_COURSE) {
+            throw new \moodle_exception('invalidcontext');
+        }
+        $course = $DB->get_record('course', array('id' => $context->instanceid), '*', MUST_EXIST);
+    } else {
+        $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
+        $context = context_course::instance($course->id, MUST_EXIST);
     }
-    $course = $DB->get_record('course', array('id' => $context->instanceid), '*', MUST_EXIST);
-} else {
-    $course = $DB->get_record('course', array('id' => $courseid), '*', MUST_EXIST);
-    $context = context_course::instance($course->id, MUST_EXIST);
+} catch (\dml_exception $e) {
+    throw new \moodle_exception('invaliddata');
 }
+
 // Not needed anymore.
 unset($contextid);
 unset($courseid);