Fixed inserts for log_display.

diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php
index 85a0499149eb983c69487acaf29db3561657e9de..c96b0dd015c5f0d2f860e78e3c7064774993b68e 100644 (file)
--- a/mod/forum/db/mysql.php
+++ b/mod/forum/db/mysql.php
@@ -16,11 +16,11 @@ function forum_upgrade($oldversion) {
     execute_sql("ALTER TABLE `forum` CHANGE `type` `type` ENUM( 'single', 'news', 'social', 'general', 
                              'eachuser', 'teacher' ) DEFAULT 'general' NOT NULL ");
     execute_sql("ALTER TABLE `forum_posts` CHANGE `discuss` `discussion` INT( 10 ) UNSIGNED DEFAULT '0' NOT NULL ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'add', 'forum', 'name') ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'add discussion', 'forum_discussions', 'name') ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'add post', 'forum_posts', 'subject') ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'update post', 'forum_posts', 'subject') ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'view discussion', 'forum_discussions', 'name') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'add', 'forum', 'name') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'add discussion', 'forum_discussions', 'name') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'add post', 'forum_posts', 'subject') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'update post', 'forum_posts', 'subject') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'view discussion', 'forum_discussions', 'name') ");
     execute_sql("DELETE FROM log_display WHERE module = 'discuss' ");
     execute_sql("UPDATE log SET action = 'view discussion' WHERE module = 'discuss' AND action = 'view' ");
     execute_sql("UPDATE log SET action = 'add discussion' WHERE module = 'discuss' AND action = 'add' ");
@@ -29,8 +29,8 @@ function forum_upgrade($oldversion) {
   }
 
   if ($oldversion < 2002080100) {
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'view subscribers', 'forum', 'name') ");
-    execute_sql("INSERT INTO log_display VALUES ('forum', 'update', 'forum', 'name') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'view subscribers', 'forum', 'name') ");
+    execute_sql("INSERT INTO log_display (module, action, mtable, field) VALUES ('forum', 'update', 'forum', 'name') ");
   }
 
   if ($oldversion < 2002082900) {
@@ -59,7 +59,7 @@ function forum_upgrade($oldversion) {
   }
 
   if ($oldversion < 2003042402) {
-      execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
+      execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
   }
 
   if ($oldversion < 2003081403) {

diff --git a/mod/forum/db/postgres7.php b/mod/forum/db/postgres7.php
index 115d36bed445a55876b0c15a0b4853d90054596a..ff5c1851be36ff9987b38b187d7640f8988e9c98 100644 (file)
--- a/mod/forum/db/postgres7.php
+++ b/mod/forum/db/postgres7.php
@@ -7,7 +7,7 @@ function forum_upgrade($oldversion) {
   global $CFG;
 
   if ($oldversion < 2003042402) {
-      execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
+      execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
   }
 
   if ($oldversion < 2003082500) {

diff --git a/mod/glossary/db/mysql.php b/mod/glossary/db/mysql.php
index 003170b104821509fd8c2bb46c01f5c319089791..286f703995e81b28291767ef56ec793b9adc3bc5 100644 (file)
--- a/mod/glossary/db/mysql.php
+++ b/mod/glossary/db/mysql.php
@@ -19,8 +19,8 @@ function glossary_upgrade($oldversion) {
                     " ADD timemodified INT(10) UNSIGNED NOT NULL default '0' AFTER `timecreated` , ".
                     " ADD teacherentry TINYINT(2) UNSIGNED NOT NULL default '0' AFTER `timemodified` ");
 
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'delete', 'glossary', 'name') ");
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'delete entry', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'delete', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'delete entry', 'glossary', 'name') ");
     }
     
     if ( $oldversion < 2003091500 ) {
@@ -86,9 +86,9 @@ function glossary_upgrade($oldversion) {
                     PRIMARY KEY  (`id`)
                     ) TYPE=MyISAM COMMENT='comments on glossary entries'");
 
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'add comment', 'glossary', 'name') ");
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'update comment', 'glossary', 'name') ");
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'delete comment', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'add comment', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'update comment', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'delete comment', 'glossary', 'name') ");
     }
 
     if ( $oldversion < 2003101600 ) {
@@ -116,7 +116,7 @@ function glossary_upgrade($oldversion) {
         execute_sql( "ALTER TABLE `{$CFG->prefix}glossary_entries`" .
                     " ADD `approved` TINYINT(2) UNSIGNED NOT NULL default '1' AFTER `fullmatch`");
 
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('glossary', 'approve entry', 'glossary', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('glossary', 'approve entry', 'glossary', 'name') ");
     }
 
     if ( $oldversion < 2003102800 ) {

diff --git a/mod/quiz/db/mysql.php b/mod/quiz/db/mysql.php
index 8aa670375e3219d0926427d8671c5324b3813dbe..6fdd8512f4b6c9b90a83d67c8441c1ce001032d5 100644 (file)
--- a/mod/quiz/db/mysql.php
+++ b/mod/quiz/db/mysql.php
@@ -16,10 +16,10 @@ function quiz_upgrade($oldversion) {
     }
     if ($oldversion < 2002102101) {
         execute_sql(" DELETE FROM log_display WHERE module = 'quiz' ");
-        execute_sql(" INSERT INTO log_display VALUES ('quiz', 'view', 'quiz', 'name') ");
-        execute_sql(" INSERT INTO log_display VALUES ('quiz', 'report', 'quiz', 'name') ");
-        execute_sql(" INSERT INTO log_display VALUES ('quiz', 'attempt', 'quiz', 'name') ");
-        execute_sql(" INSERT INTO log_display VALUES ('quiz', 'submit', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO log_display (module, action, mtable, field) VALUES ('quiz', 'view', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO log_display (module, action, mtable, field) VALUES ('quiz', 'report', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO log_display (module, action, mtable, field) VALUES ('quiz', 'attempt', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO log_display (module, action, mtable, field) VALUES ('quiz', 'submit', 'quiz', 'name') ");
     }
     if ($oldversion < 2002102600) {
         execute_sql(" ALTER TABLE `quiz_answers` CHANGE `feedback` `feedback` TEXT NOT NULL ");
@@ -107,7 +107,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2003072400) {
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('quiz', 'review', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('quiz', 'review', 'quiz', 'name') ");
     }
 
     if ($oldversion < 2003072901) {
@@ -187,8 +187,8 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004021900) {
-        modify_database("","INSERT INTO prefix_log_display VALUES ('quiz', 'add', 'quiz', 'name');");
-        modify_database("","INSERT INTO prefix_log_display VALUES ('quiz', 'update', 'quiz', 'name');");
+        modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'add', 'quiz', 'name');");
+        modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'update', 'quiz', 'name');");
     }
 
     if ($oldversion < 2004051700) {
@@ -328,7 +328,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2005032000) {
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('quiz', 'editquestions', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('quiz', 'editquestions', 'quiz', 'name') ");
     }
 
     if ($oldversion < 2005032300) {
@@ -479,9 +479,9 @@ function quiz_upgrade($oldversion) {
 
     /// Entries for the log_display table
 
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'preview', 'quiz', 'name');");
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'start attempt', 'quiz', 'name');");
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'close attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'preview', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'start attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'close attempt', 'quiz', 'name');");
 
     /// update the default settings in $CFG
         $review = (QUIZ_REVIEW_IMMEDIATELY & (QUIZ_REVIEW_RESPONSES + QUIZ_REVIEW_SCORES));
@@ -1012,7 +1012,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2006041000) {
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'continue attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'continue attempt', 'quiz', 'name');");
     }
 
     if ($oldversion < 2006041001) {

diff --git a/mod/quiz/db/postgres7.php b/mod/quiz/db/postgres7.php
index 9902c38c46cc8fb8d91791a58d6e2ef613cabd07..a0ea972f22664dd9aef273c1291a8c8a9a8cb871 100644 (file)
--- a/mod/quiz/db/postgres7.php
+++ b/mod/quiz/db/postgres7.php
@@ -72,7 +72,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2003072400) {
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('quiz', 'review', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('quiz', 'review', 'quiz', 'name') ");
     }
 
     if ($oldversion < 2003082300) {
@@ -142,8 +142,8 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004021900) {
-        modify_database("","INSERT INTO prefix_log_display VALUES ('quiz', 'add', 'quiz', 'name');");
-        modify_database("","INSERT INTO prefix_log_display VALUES ('quiz', 'update', 'quiz', 'name');");
+        modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'add', 'quiz', 'name');");
+        modify_database("","INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'update', 'quiz', 'name');");
     }
 
     if ($oldversion < 2004051700) {
@@ -313,7 +313,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2005032000) {
-        execute_sql(" INSERT INTO {$CFG->prefix}log_display VALUES ('quiz', 'editquestions', 'quiz', 'name') ");
+        execute_sql(" INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('quiz', 'editquestions', 'quiz', 'name') ");
     }
 
     if ($oldversion < 2005032300) {
@@ -476,9 +476,9 @@ function quiz_upgrade($oldversion) {
 
         /// Entries for the log_display table
 
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'preview', 'quiz', 'name');");
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'start attempt', 'quiz', 'name');");
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'close attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'preview', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'start attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'close attempt', 'quiz', 'name');");
 
         /// update the default settings in $CFG
         $review = (QUIZ_REVIEW_IMMEDIATELY & (QUIZ_REVIEW_RESPONSES + QUIZ_REVIEW_SCORES));
@@ -1181,7 +1181,7 @@ function quiz_upgrade($oldversion) {
     }
 
     if ($oldversion < 2006041000) {
-        modify_database('', " INSERT INTO prefix_log_display VALUES ('quiz', 'continue attempt', 'quiz', 'name');");
+        modify_database('', " INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('quiz', 'continue attempt', 'quiz', 'name');");
     }
 
     if ($oldversion < 2006041001) {

diff --git a/mod/scorm/db/mysql.php b/mod/scorm/db/mysql.php
index 62fa2700bed7ec679e083be6b56445345113992e..841cabb511cf93e89245c36c618d2aebd3430aa1 100755 (executable)
--- a/mod/scorm/db/mysql.php
+++ b/mod/scorm/db/mysql.php
@@ -97,7 +97,7 @@ function scorm_upgrade($oldversion) {
         }
 
         modify_database('',"DROP TABLE prefix_scorm_sco_users");
-        modify_database('',"INSERT INTO prefix_log_display VALUES ('scorm', 'review', 'resource', 'name')");
+        modify_database('',"INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('scorm', 'review', 'resource', 'name')");
     }
     
     if ($oldversion < 2005040200) {

diff --git a/mod/scorm/db/postgres7.php b/mod/scorm/db/postgres7.php
index 7f77072f175efc804f6da250b495a889308177e5..6aa2cfeb6834f0924bc2467b74ec4f7db723f307 100755 (executable)
--- a/mod/scorm/db/postgres7.php
+++ b/mod/scorm/db/postgres7.php
@@ -97,7 +97,7 @@ function scorm_upgrade($oldversion) {
         }
 
         modify_database('',"DROP TABLE prefix_scorm_sco_users");
-        modify_database('',"INSERT INTO prefix_log_display VALUES ('resource', 'review', 'resource', 'name')");
+        modify_database('',"INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('resource', 'review', 'resource', 'name')");
     }
 
     if ($oldversion < 2005040200) {

diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index d5000bb77032632a0667425fe4c0e368fc40fa24..2ad0a614880b2e2c359ad9e388fcfdc039f7c7ed 100644 (file)
--- a/mod/survey/db/mysql.php
+++ b/mod/survey/db/mysql.php
@@ -173,8 +173,8 @@ function survey_upgrade($oldversion) {
     }
 
     if ($oldversion < 2004021900) {
-        modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'add', 'survey', 'name');");
-        modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'update', 'survey', 'name');");
+        modify_database("", "INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('survey', 'add', 'survey', 'name');");
+        modify_database("", "INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('survey', 'update', 'survey', 'name');");
     }
 
     if ($oldversion < 2004111200) {

diff --git a/mod/survey/db/postgres7.php b/mod/survey/db/postgres7.php
index 0704cebe988c25906d97d2d5ff00d61662103d90..eea3fc3e109ad169beea57d9594d233a345bb105 100644 (file)
--- a/mod/survey/db/postgres7.php
+++ b/mod/survey/db/postgres7.php
@@ -20,8 +20,8 @@ function survey_upgrade($oldversion) {
         table_column("survey_answers", "answer2", "answer2", "text", "", "", "");
     }
     if ($oldversion < 2004021900) {
-        modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'add', 'survey', 'name');");
-        modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'update', 'survey', 'name');");
+        modify_database("", "INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('survey', 'add', 'survey', 'name');");
+        modify_database("", "INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('survey', 'update', 'survey', 'name');");
     }
 
     if ($oldversion < 2004111200) { 

diff --git a/mod/workshop/db/postgres7.php b/mod/workshop/db/postgres7.php
index 156cca6cc0b4a76c978bab33c17eabc3e124d46d..8f8cd67471b772257e333e26f2501fa49ab78ad1 100644 (file)
--- a/mod/workshop/db/postgres7.php
+++ b/mod/workshop/db/postgres7.php
@@ -53,14 +53,14 @@ function workshop_upgrade($oldversion) {
     if ($oldversion < 2003100800) {
         // tidy up log_display entries
         execute_sql("DELETE FROM {$CFG->prefix}log_display WHERE module = 'workshop'");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES('workshop', 'assessments', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'close', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'display', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'resubmit', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'set up', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'submissions', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'view', 'workshop', 'name')");
-        execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('workshop', 'update', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES('workshop', 'assessments', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'close', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'display', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'resubmit', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'set up', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'submissions', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'view', 'workshop', 'name')");
+        execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('workshop', 'update', 'workshop', 'name')");
     }
 
     if ($oldversion < 2003113000) {