Upgraded add_to_log to send cm->id

diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index 28df88b6e89318e8ea095890b9a17ff503dcb9c7..9775749d5cc9cc8b8874869652580ce97945bddf 100644 (file)
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -33,7 +33,7 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "assignment", "view", "view.php?id=$cm->id", "$assignment->id");
+    add_to_log($course->id, "assignment", "view", "view.php?id=$cm->id", $assignment->id, $cm->id);
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";

diff --git a/mod/attendance/view.php b/mod/attendance/view.php
index bfcce5732fcbc670abe3627a4b911402b1a26f80..aae353fba50ffd4a2cebd0179c33abcd1c33e87c 100644 (file)
--- a/mod/attendance/view.php
+++ b/mod/attendance/view.php
@@ -30,7 +30,7 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "attendance", "view", "view.php?id=$cm->id", "$attendance->id");
+    add_to_log($course->id, "attendance", "view", "view.php?id=$cm->id", $attendance->id, $cm->id);
 
 /// Print the page header
 

diff --git a/mod/chat/view.php b/mod/chat/view.php
index 4cea37c128574313517be331a71d45b115b97437..9e1190e6134e5e17386e0187e6cdfc0b3c8fec13 100644 (file)
--- a/mod/chat/view.php
+++ b/mod/chat/view.php
@@ -39,7 +39,7 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "chat", "view", "view.php?id=$cm->id", "$chat->id");
+    add_to_log($course->id, "chat", "view", "view.php?id=$cm->id", $chat->id, $cm->id);
 
 /// Print the page header
 

diff --git a/mod/choice/view.php b/mod/choice/view.php
index 4309fc0079628d4c6ca7117aaaadf32945e2b61f..9bc612b923dd6055f25ee953e820638816cc27fb 100644 (file)
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -35,7 +35,7 @@
             if (! update_record("choice_answers", $newanswer)) {
                 error("Could not update your choice");
             }
-            add_to_log($course->id, "choice", "update", "view.php?id=$cm->id", "$choice->id");
+            add_to_log($course->id, "choice", "update", "view.php?id=$cm->id", $choice->id, $cm->id);
         } else {
             $newanswer->choice = $choice->id;
             $newanswer->userid = $USER->id;
@@ -44,7 +44,7 @@
             if (! insert_record("choice_answers", $newanswer)) {
                 error("Could not save your choice");
             }
-            add_to_log($course->id, "choice", "add", "view.php?id=$cm->id", "$choice->id");
+            add_to_log($course->id, "choice", "add", "view.php?id=$cm->id", $choice->id, $cm->id);
         }
         redirect("$CFG->wwwroot/course/view.php?id=$course->id");
         exit;
@@ -53,7 +53,7 @@
     $strchoice = get_string("modulename", "choice");
     $strchoices = get_string("modulenameplural", "choice");
 
-    add_to_log($course->id, "choice", "view", "view.php?id=$cm->id", "$choice->id");
+    add_to_log($course->id, "choice", "view", "view.php?id=$cm->id", $choice->id, $cm->id);
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";

diff --git a/mod/dialogue/view.php b/mod/dialogue/view.php
index 83cb0e453c248d1567ffd96a518f4065bfd84541..c289fd20a4d8eb8c66725fc0164ef371e307e42a 100644 (file)
--- a/mod/dialogue/view.php
+++ b/mod/dialogue/view.php
@@ -19,7 +19,7 @@
         error("Course module is incorrect");
     }
 
-    add_to_log($course->id, "dialogue", "view", "view.php?id=$cm->id", "$dialogue->id");
+    add_to_log($course->id, "dialogue", "view", "view.php?id=$cm->id", $dialogue->id, $cm->id);
 
     if (! $cw = get_record("course_sections", "id", $cm->section)) {
         error("Course module is incorrect");

diff --git a/mod/exercise/view.php b/mod/exercise/view.php
index c9d4e76e494319f4c2adc3083151057210a7c89a..45252d872cc83c7ff89bf9462308e2b89e0dae01 100644 (file)
--- a/mod/exercise/view.php
+++ b/mod/exercise/view.php
@@ -36,7 +36,7 @@
     require_login($course->id);
 
     // ...log activity...
-       add_to_log($course->id, "exercise", "view", "view.php?id=$cm->id", "$exercise->id");
+       add_to_log($course->id, "exercise", "view", "view.php?id=$cm->id", $exercise->id, $cm->id);
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
@@ -145,7 +145,7 @@
                }
 
                set_field("exercise", "phase", 3, "id", "$exercise->id");
-               add_to_log($course->id, "exercise", "display", "view.php?id=$cm->id", "$exercise->id");
+               add_to_log($course->id, "exercise", "display", "view.php?id=$cm->id", "$exercise->id", $cm->id);
                redirect("view.php?id=$cm->id", get_string("movingtophase", "exercise", 3));
        }
        
@@ -169,7 +169,7 @@
                        }
                else {
                        set_field("exercise", "phase", 2, "id", "$exercise->id");
-                       add_to_log($course->id, "exercise", "open", "view.php?id=$cm->id", "$exercise->id");
+                       add_to_log($course->id, "exercise", "open", "view.php?id=$cm->id", "$exercise->id", $cm->id);
                        redirect("view.php?id=$cm->id", get_string("movingtophase", "exercise", 2));
                }
        }
@@ -183,7 +183,7 @@
                }
 
                set_field("exercise", "phase", 1, "id", "$exercise->id");
-               add_to_log($course->id, "exercise", "set up", "view.php?id=$cm->id", "$exercise->id");
+               add_to_log($course->id, "exercise", "set up", "view.php?id=$cm->id", "$exercise->id", $cm->id);
                redirect("view.php?id=$cm->id", get_string("movingtophase", "exercise", 1));
        }
        

diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 71b0e00cd923adf857960383981186fcac6585b2..d0368b1aef36c42d18f8a6a3f5034eb34225dcea 100644 (file)
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -85,7 +85,7 @@
     if (!$cm->visible and !isteacher($course->id)) {
         notice(get_string("activityiscurrentlyhidden"));
     } 
-    add_to_log($course->id, "glossary", "view", "view.php?id=$cm->id&tab=$tab", "$glossary->id");
+    add_to_log($course->id, "glossary", "view", "view.php?id=$cm->id&tab=$tab", $glossary->id, $cm->id);
 
 /// stablishing flag variables
     if ( $sortorder = strtolower($sortorder) ) {

diff --git a/mod/journal/view.php b/mod/journal/view.php
index bbb625e2401ca0599d3e4be3995c34f0c8fc8d6a..23f2011bfc57fbdcf00915b56b4d715c048f40a1 100644 (file)
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -19,7 +19,7 @@
         error("Course module is incorrect");
     }
 
-    add_to_log($course->id, "journal", "view", "view.php?id=$cm->id", "$journal->id");
+    add_to_log($course->id, "journal", "view", "view.php?id=$cm->id", $journal->id, $cm->id);
 
     if (! $cw = get_record("course_sections", "id", $cm->section)) {
         error("Course module is incorrect");

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 71f6b0030404d8ba48c3b11951d924d646cb86a8..fa74677490d34491f61f5454314b14cf6e48fa03 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -35,7 +35,7 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "quiz", "view", "view.php?id=$cm->id", "$quiz->id");
+    add_to_log($course->id, "quiz", "view", "view.php?id=$cm->id", $quiz->id, $cm->id);
 
     $timenow = time();
 
@@ -43,7 +43,7 @@
 // Print the page header
 
     if ($course->category) {
-        $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
+        $navigation = "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
     }
 
     $strquizzes = get_string("modulenameplural", "quiz");

diff --git a/mod/resource/view.php b/mod/resource/view.php
index bcb18726440e6fd7d3fc037f25e6830c9835d291..34992ca05a9ae3eede5995849370dc315beb1b08 100644 (file)
--- a/mod/resource/view.php
+++ b/mod/resource/view.php
@@ -40,7 +40,7 @@
 
     switch ($resource->type) {
         case REFERENCE:
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
             print_header($pagetitle, "$course->fullname", "$navigation $resource->name", "", "", true, 
                          update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm));
 
@@ -55,7 +55,7 @@
             break;
 
         case WEBLINK:
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
 
             $inpopup = !empty($_GET["inpopup"]);
 
@@ -109,7 +109,7 @@
                 } else {
                     $url = "$resource->reference";
                 }
-                add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+                add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
                 echo "<head><title>$course->shortname: $resource->name</title></head>\n";
                 echo "<frameset rows=\"$CFG->resource_framesize,*\" border=\"2\">";
                 echo "<frame src=\"view.php?id=$cm->id&frameset=top\">";
@@ -210,7 +210,7 @@
 
             /// We can only get here once per resource, so add an entry to the log
 
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
 
 
             /// If we are in a frameset, just print the top of it
@@ -305,7 +305,7 @@
 
 
         case PLAINTEXT:
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
             print_header($pagetitle, "$course->fullname", "$navigation $resource->name",
                          "", "", true, update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm));
 
@@ -317,7 +317,7 @@
             break;
 
         case HTML:
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
             print_header($pagetitle, "$course->fullname", "$navigation $resource->name",
                          "", "", true, update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm));
 
@@ -333,7 +333,7 @@
             break;
 
         case PROGRAM:   // Code provided by Mark Kimes <hectorp@buckfoodsvc.com>
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
 
             $temptime = gmdate("YmdHis",time());
 
@@ -380,7 +380,7 @@
             break;
 
         case WIKITEXT:
-            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id");
+            add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", $resource->id, $cm->id);
             print_header($pagetitle, "$course->fullname", "$navigation $resource->name",
                 "", "", true, update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm));
 

diff --git a/mod/survey/view.php b/mod/survey/view.php
index 4cb7fb5b0321a82f3904ce30c30ea46a483aa329..f58baf466f37230f95fa5c1d74e3c8f84eefa633 100644 (file)
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -46,7 +46,7 @@
 //  Check the survey hasn't already been filled out.
 
     if (survey_already_done($survey->id, $USER->id)) {
-        add_to_log($course->id, "survey", "view graph", "view.php?id=$cm->id", "$survey->id");
+        add_to_log($course->id, "survey", "view graph", "view.php?id=$cm->id", $survey->id, $cm->id);
         print_heading(get_string("surveycompleted", "survey"));
         $numusers = survey_count_responses($survey->id);
         print_heading(get_string("peoplecompleted", "survey", $numusers));
@@ -58,7 +58,7 @@
     }
 
 //  Start the survey form
-    add_to_log($course->id, "survey", "view form", "view.php?id=$cm->id", "$survey->id");
+    add_to_log($course->id, "survey", "view form", "view.php?id=$cm->id", $survey->id, $cm->id);
 
     echo "<form name=form method=post action=save.php>";
     echo "<input type=hidden name=id value=$id>";

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index da74d99e1545825c31efc1ec251dc42f336c3b1d..1b84d044c193a970026e98a5f52b7ed0cdc405a5 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -51,7 +51,7 @@
     require_login($course->id);
 
     // ...log activity...
-       add_to_log($course->id, "workshop", "view", "view.php?id=$cm->id", "$workshop->id");
+       add_to_log($course->id, "workshop", "view", "view.php?id=$cm->id", $workshop->id, $cm->id);
 
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
@@ -107,7 +107,7 @@
 
                // move to phase 4
                set_field("workshop", "phase", 4, "id", "$workshop->id");
-               add_to_log($course->id, "workshop", "assessments only", "view.php?id=$cm->id", "$workshop->id");
+               add_to_log($course->id, "workshop", "assessments only", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 4));
        }
        
@@ -121,7 +121,7 @@
 
                // move to phase 3
                set_field("workshop", "phase", 3, "id", "$workshop->id");
-               add_to_log($course->id, "workshop", "allow both", "view.php?id=$cm->id", "$workshop->id");
+               add_to_log($course->id, "workshop", "allow both", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 3));
        }
        
@@ -140,7 +140,7 @@
                }
                else {
                        set_field("workshop", "phase", 2, "id", "$workshop->id");
-                       add_to_log($course->id, "workshop", "submissions", "view.php?id=$cm->id", "$workshop->id");
+                       add_to_log($course->id, "workshop", "submissions", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                        redirect("view.php?id=$cm->id", get_string("movingtophase", "workshop", 2));
                }
        }
@@ -155,7 +155,7 @@
 
                // move to phase 5
                set_field("workshop", "phase", 5, "id", "$workshop->id");
-               add_to_log($course->id, "workshop", "close", "view.php?id=$cm->id", "$workshop->id");
+               add_to_log($course->id, "workshop", "close", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 5));
        }
        
@@ -290,7 +290,7 @@
                }
 
                set_field("workshop", "phase", 6, "id", "$workshop->id");
-               add_to_log($course->id, "workshop", "display grades", "view.php?id=$cm->id", "$workshop->id");
+               add_to_log($course->id, "workshop", "display grades", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 6));
        }
        
@@ -309,7 +309,7 @@
                }
 
                set_field("workshop", "phase", 1, "id", "$workshop->id");
-               add_to_log($course->id, "workshop", "set up", "view.php?id=$cm->id", "$workshop->id");
+               add_to_log($course->id, "workshop", "set up", "view.php?id=$cm->id", "$workshop->id", $cm->id);
                redirect("view.php?a=$workshop->id", get_string("movingtophase", "workshop", 1));
        }