Upgrade logs for assignments

diff --git a/mod/assignment/db/mysql.php b/mod/assignment/db/mysql.php
index 62267350f2e9a5463ec99310a7d2378cee4b16f6..f579beed473875d1360f44908cd90a5341700473 100644 (file)
--- a/mod/assignment/db/mysql.php
+++ b/mod/assignment/db/mysql.php
@@ -92,6 +92,20 @@ function assignment_upgrade($oldversion) {
         execute_sql("ALTER TABLE `assignment_submissions` CHANGE `user` `userid` INT(10) UNSIGNED DEFAULT '0' NOT NULL ");
     }
 
+    if ($oldversion < 2004020500) {
+        if ($assignments = get_records("assignment")) {
+            foreach ($assignments as $assignment) {
+                if ($cm = get_coursemodule_from_instance("assignment", $assignment->id, $assignment->course)) {
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = 'assignment' AND url = 'submissions.php?id=$assignment->id'");
+
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = 'assignment' AND url = 'view.php?a=$assignment->id'");
+                }
+            }
+        }
+    }
+
     return true;
 }
 

diff --git a/mod/assignment/db/postgres7.php b/mod/assignment/db/postgres7.php
index 7fe658374dd12312493b7d8c1eee56f3edf2b096..122ff021f780cf875928bee21ea953ceb4aac3c7 100644 (file)
--- a/mod/assignment/db/postgres7.php
+++ b/mod/assignment/db/postgres7.php
@@ -88,6 +88,20 @@ function assignment_upgrade($oldversion) {
         table_column("assignment", "", "resubmit", "integer", "2", "unsigned", "0", "", "format");
     }
 
+    if ($oldversion < 2004020500) {
+        if ($assignments = get_records("assignment")) {
+            foreach ($assignments as $assignment) {
+                if ($cm = get_coursemodule_from_instance("assignment", $assignment->id, $assignment->course)) {
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = 'assignment' AND url = 'submissions.php?id=$assignment->id'");
+
+                    execute_sql("UPDATE {$CFG->prefix}log SET cmid = '$cm->id' 
+                                 WHERE module = 'assignment' AND url = 'view.php?a=$assignment->id'");
+                }
+            }
+        }
+    }
+
     return true;
 }
 

diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index 40db547fba0b20448dfa78fffedd4fb87796dfa4..b7267248d0372631dbbcbf21c00100cedb2fa3d5 100644 (file)
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -121,10 +121,10 @@
             }
         }
         $submissions = assignment_get_all_submissions($assignment,$sort, $dir);
-        add_to_log($course->id, "assignment", "update grades", "submissions.php?id=$assignment->id", "$count users");
+        add_to_log($course->id, "assignment", "update grades", "submissions.php?id=$assignment->id", "$count users", $cm->id);
         notify(get_string("feedbackupdated", "assignment", $count));
     } else {
-        add_to_log($course->id, "assignment", "view submissions", "submissions.php?id=$assignment->id", "$assignment->id");
+        add_to_log($course->id, "assignment", "view submissions", "submissions.php?id=$assignment->id", "$assignment->id", $cm->id);
     }
 
     // Submission sorting

diff --git a/mod/assignment/upload.php b/mod/assignment/upload.php
index fa0276f442397dc054a1c75239b9f83f23d0766f..83d61b839384d61e9add2b1200c22303404fed6c 100644 (file)
--- a/mod/assignment/upload.php
+++ b/mod/assignment/upload.php
@@ -17,9 +17,13 @@
         error("Course is misconfigured");
     }
 
+    if (! $cm = get_coursemodule_from_instance("assignment", $assignment->id, $course->id)) {
+        error("Course Module ID was incorrect");
+    }
+
     require_login($course->id);
 
-    add_to_log($course->id, "assignment", "upload", "view.php?a=$assignment->id", "$assignment->id");
+    add_to_log($course->id, "assignment", "upload", "view.php?a=$assignment->id", "$assignment->id", $cm->id);
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";

diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index 660a96ab37b5f1457f2eee677193c59c3ff63dca..b36114e59756c3286f794b4980708524fbe705ed 100644 (file)
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004013101;
+$module->version  = 2004020500;
 $module->requires = 2004013101;  // Requires this Moodle version
 $module->cron     = 60;