"MDL-14668, fix course full in activity reports (upgrade course module version)"

diff --git a/course/unenrol.php b/course/unenrol.php
index bede2873b426ea216e4ab806335fed62caf6f275..1b093eb1370c6277f7ffb4eab30064c96b0593b2 100644 (file)
--- a/course/unenrol.php
+++ b/course/unenrol.php
@@ -63,7 +63,8 @@
                 print_error("unenrolerror");
             }
 
-            add_to_log($course->id, 'course', 'unenrol', "view.php?id=$course->id", $userid);
+            add_to_log($course->id, 'course', 'unenrol',
+                    "view.php?id=$course->id", $course->id);
             redirect($CFG->wwwroot.'/user/index.php?id='.$course->id);
 
         } else {
@@ -73,7 +74,8 @@
 
             // force a refresh of mycourses
             unset($USER->mycourses);
-            add_to_log($course->id, 'course', 'unenrol', "view.php?id=$course->id", $USER->id);
+            add_to_log($course->id, 'course', 'unenrol',
+                    "view.php?id=$course->id", $course->id);
 
             redirect($CFG->wwwroot);
         }

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0995ea3173710a738d10f32b3d170f8a4d37d2e3..adc6695eb736b78a1efe3f8839a220306965317a 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2887,7 +2887,8 @@ function enrol_into_course($course, $user, $enrol) {
 
         email_welcome_message_to_user($course, $user);
 
-        add_to_log($course->id, 'course', 'enrol', 'view.php?id='.$course->id, $user->id);
+        add_to_log($course->id, 'course', 'enrol',
+                'view.php?id='.$course->id, $course->id);
 
         return true;
     }

diff --git a/lib/db/install.xml b/lib/db/install.xml
index a9aa762bbdeb790c923594a79af0a367b8fb3351..05ca2b2daa3afd6a51c1c5dd9a3e602d88c5c25a 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1675,6 +1675,7 @@
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'view', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'update', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'enrol', 'course', 'fullname')" />
+        <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'unenrol', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report log', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report live', 'course', 'fullname')" />
         <SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'report outline', 'course', 'fullname')" />
@@ -1690,4 +1691,4 @@
       </SENTENCES>
     </STATEMENT>
   </STATEMENTS>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index d7d58ca5e0d15773f6b2e9d9825a1367fef8e543..f3a8e415273dc8ebc352d721da81964ddb1e1762 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -121,6 +121,19 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2008051201);
     }
 
+    if ($result && $oldversion < 2008051202) {
+        $log_action = new stdClass();
+        $log_action->module = 'course';
+        $log_action->action = 'unenrol';
+        $log_action->mtable = 'course';
+        $log_action->field  = 'fullname';
+        if (!record_exists("log_display", "action", "unenrol",
+                    "module", "course")){
+            $result = $result && insert_record('log_display', $log_action);
+        }
+        upgrade_main_savepoint($result, 2008051202);
+    }
+
 /*
  * TODO:
  *   drop adodb_logsql table and create a ner general sql log table

diff --git a/version.php b/version.php
index 69fd2f31809e01c0cbc482e5b1345ef105e67286..a9bc5320288241c8fa4c5d7fd4e0971e3d13e296 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2008051201;  // YYYYMMDD   = date of the last version bump
+    $version = 2008051202;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20080516)';  // Human-friendly version name