MDL-11660

* user_lastaccess deleted when deleting course
* rewritten deleting of contexts - does not use get_context_instance() anymore because it is much more strict now
* added deleting of grade_letters and settings when deleting course

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 7fa7f858bb024ec5e354bfee6d5a3fb38aa9d990..d6ab3e22089f6c88df2c0c07fec77f1f7154fb6d 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2280,21 +2280,39 @@ function get_system_context($cache=true) {
     $cached = $context;
     return $cached;
 }
+
 /**
- * Remove a context record and any dependent entries
+ * Remove a context record and any dependent entries,
+ * removes context from static context cache too
  * @param $level
  * @param $instanceid
  *
  * @return bool properly deleted
  */
 function delete_context($contextlevel, $instanceid) {
-    if ($context = get_context_instance($contextlevel, $instanceid)) {
-        mark_context_dirty($context->path);
-        return delete_records('context', 'id', $context->id) &&
-               delete_records('role_assignments', 'contextid', $context->id) &&
-               delete_records('role_capabilities', 'contextid', $context->id);
+    global $context_cache, $context_cache_id;
+
+    // do not use get_context_instance(), because the related object might not exist,
+    // or the context does not exist yet and it would be created now
+    if ($context = get_record('context', 'contextlevel', $contextlevel, 'instanceid', $instanceid)) {
+        $result = delete_records('role_assignments', 'contextid', $context->id) &&
+                  delete_records('role_capabilities', 'contextid', $context->id) &&
+                  delete_records('context', 'id', $context->id);
+
+        // do not mark dirty contexts if parents unknown
+        if (!is_null($context->path) and $context->depth > 0) {
+            mark_context_dirty($context->path);
+        }
+
+        // purge static context cache if entry present
+        unset($context_cache[$contextlevel][$instanceid]);
+        unset($context_cache_id[$context->id]);
+
+        return $result;
+    } else {
+
+        return true;
     }
-    return true;
 }
 
 /**

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 73aaacc1fa91215cd2e45f8af9dfcd43ea4b40c2..80f8b06dec05fbff91d9a1da99b0e21fd1327807 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -1008,6 +1008,18 @@ function grade_get_legacy_grade_item($modinstance, $grademax, $scaleid) {
     return $grade_item;
 }
 
+/**
+ * Remove grade letters for given context
+ * @param object $context
+ */
+function remove_grade_letters($context, $showfeedback) {
+    $strdeleted = get_string('deleted');
+
+    delete_records('grade_letters', 'contextid', $context->id);
+    if ($showfeedback) {
+        notify($strdeleted.' - '.get_string('letters', 'grades'));
+    }
+}
 /**
  * Remove all grade related course data - history is kept
  * @param int $courseid
@@ -1040,6 +1052,11 @@ function remove_course_grades($courseid, $showfeedback) {
     if ($showfeedback) {
         notify($strdeleted.' - '.get_string('scales'));
     }
+
+    delete_records('grade_settings', 'courseid', $courseid);
+    if ($showfeedback) {
+        notify($strdeleted.' - '.get_string('settings', 'grades'));
+    }
 }
 
 /**

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 0e4718f8dfa6f12570855b2e6b630e4f7490fcf4..d24d0c9a5c0678d8773c6515628d9a4f984dca19 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3253,6 +3253,13 @@ function delete_course($courseid, $showfeedback = true) {
     require_once($CFG->libdir.'/gradelib.php');
     $result = true;
 
+    // frontpage course can not be deleted!!
+    if ($courseid == SITEID) {
+        return false;
+    }
+
+    $context = get_context_instance(CONTEXT_COURSE, $courseid);
+
     if (!remove_course_contents($courseid, $showfeedback)) {
         if ($showfeedback) {
             notify("An error occurred while deleting some of the course contents.");
@@ -3261,6 +3268,7 @@ function delete_course($courseid, $showfeedback = true) {
     }
 
     remove_course_grades($courseid, $showfeedback);
+    remove_grade_letters($context, $showfeedback);
 
     if (!delete_records("course", "id", $courseid)) {
         if ($showfeedback) {
@@ -3269,9 +3277,10 @@ function delete_course($courseid, $showfeedback = true) {
         $result = false;
     }
 
-    if (!delete_records('context', 'contextlevel', CONTEXT_COURSE, 'instanceid', $courseid)) {
+/// Delete all roles and overiddes in the course context
+    if (!delete_context(CONTEXT_COURSE, $courseid)) {
         if ($showfeedback) {
-            notify("An error occurred while deleting the main context record.");
+            notify("An error occurred while deleting the main course context.");
         }
         $result = false;
     }
@@ -3327,7 +3336,6 @@ function remove_course_contents($courseid, $showfeedback=true) {
                             if ($cm = get_coursemodule_from_instance($modname, $instance->id, $course->id)) {
                                 /// Delete activity context questions and question categories
                                 question_delete_activity($cm,  $showfeedback);
-                                delete_context(CONTEXT_MODULE, $cm->id);
                             }
                             if ($moddelete($instance->id)) {
                                 $count++;
@@ -3336,6 +3344,11 @@ function remove_course_contents($courseid, $showfeedback=true) {
                                 notify('Could not delete '. $modname .' instance '. $instance->id .' ('. format_string($instance->name) .')');
                                 $result = false;
                             }
+                            if ($cm) {
+                                // delete cm and its context in correct order
+                                delete_records('course_modules', 'id', $cm->id);
+                                delete_context(CONTEXT_MODULE, $cm->id);
+                            }
                         }
                     }
                 } else {
@@ -3373,12 +3386,7 @@ function remove_course_contents($courseid, $showfeedback=true) {
             require_once($CFG->libdir.'/blocklib.php');
             foreach ($blocks as $block) {  /// Delete any associated contexts for this block
 
-                // Block instances are rarely created. Since the block instance is gone from the above delete
-                // statement, calling delete_context() will generate a warning as get_context_instance could
-                // no longer create the context as the block is already gone.
-                if (record_exists('context', 'contextlevel', CONTEXT_BLOCK, 'instanceid', $block->id)) {
-                    delete_context(CONTEXT_BLOCK, $block->id);
-                }
+                delete_context(CONTEXT_BLOCK, $block->id);
 
                 // fix for MDL-7164
                 // Get the block object and call instance_delete()
@@ -3394,6 +3402,7 @@ function remove_course_contents($courseid, $showfeedback=true) {
                 // third party blocks might have stuff to clean up
                 // we execute this anyway
                 $obj->instance_delete();
+
             }
         } else {
             $result = false;
@@ -3415,6 +3424,7 @@ function remove_course_contents($courseid, $showfeedback=true) {
         'course_sections' => 'course', // Delete any course stuff
         'course_modules' => 'course',
         'backup_courses' => 'courseid', // Delete scheduled backup stuff
+        'user_lastaccess' => 'courseid',
         'backup_log' => 'courseid'
     );
     foreach ($tablestoclear as $table => $col) {
@@ -3450,11 +3460,6 @@ function remove_course_contents($courseid, $showfeedback=true) {
 /// Delete questions and question categories
     question_delete_course($course, $showfeedback);
 
-/// Delete all roles and overiddes in the course context (but keep the course context)
-    if ($courseid != SITEID) {
-        delete_context(CONTEXT_COURSE, $course->id);
-    }
-
     return $result;
 }