Fixed longtimenosee unenrolments. user_lastaccess and role_assignments were growing...

See  MDL-11571

diff --git a/admin/cron.php b/admin/cron.php
index 6e800104ad6a6120c5966ff7b7cdcc5f0f1a1da6..b21e6ddadb8acb5f28d53aad67490a96c05fa54a 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -199,8 +199,8 @@
             if ($assigns = get_users_longtimenosee($longtime)) {
                 foreach ($assigns as $assign) {
                     if ($context = get_context_instance(CONTEXT_COURSE, $assign->courseid)) {
-                        if (role_unassign(0, $assign->id, 0, $context->id)) {
-                            mtrace("Deleted assignment for user $assign->id from course $assign->courseid");
+                        if (role_unassign(0, $assign->userid, 0, $context->id)) {
+                            mtrace("Deleted assignment for user $assign->userid from course $assign->courseid");
                         }
                     }
                 }
@@ -474,4 +474,4 @@
         echo "</xmp>";
     }
 
-?>
\ No newline at end of file
+?>

diff --git a/lib/datalib.php b/lib/datalib.php
index cdbfc931a0d268626f078fb462a92ab0a6d9aa4c..bb009ca8fa4e7a03dbb79c4273600dd082f12ecd 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -354,10 +354,9 @@ function get_users_unconfirmed($cutofftime=2000000000) {
  */
 function get_users_longtimenosee($cutofftime) {
     global $CFG;
-    return get_records_sql("SELECT userid as id, courseid
+    return get_records_sql("SELECT id, userid, courseid
                               FROM {$CFG->prefix}user_lastaccess
                              WHERE courseid != ".SITEID."
-                               AND timeaccess > 0
                                AND timeaccess < $cutofftime ");
 }