From db70b54b62e137838925d4c8b6a81acad52f7a00 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Wed, 1 Jan 2003 08:15:55 +0000
Subject: [PATCH] Better log_display fixes

---
 lib/db/mysql.php     |  6 ++++--
 lib/db/mysql.sql     |  4 +++-
 lib/db/postgres7.php | 20 ++++++++++++++++++++
 lib/db/postgres7.sql |  4 ++++
 version.php          |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 7dbdbf8c34..15da4cd4db 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -230,12 +230,12 @@ function main_upgrade($oldversion=0) {
             execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname,' ',lastname)') ");
         }
     }
-    if ($oldversion < 2003010100) {
+    if ($oldversion < 2003010101) {
         delete_records("log_display", "module", "user");
         $new->module = "user";
         $new->action = "view";
         $new->mtable = "user";
-        $new->field  = "CONCAT(firstname,\' \',lastname)";
+        $new->field  = "CONCAT(firstname,\" \",lastname)";
         insert_record("log_display", $new);
 
         delete_records("log_display", "module", "course");
@@ -246,6 +246,8 @@ function main_upgrade($oldversion=0) {
         insert_record("log_display", $new);
         $new->action = "update";
         insert_record("log_display", $new);
+        $new->action = "enrol";
+        insert_record("log_display", $new);
     }
 
     return true;
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 38fc5a820c..30ffb85097 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -227,6 +227,8 @@ CREATE TABLE `prefix_user_teachers` (
   UNIQUE KEY `id` (`id`)
 ) TYPE=MyISAM COMMENT='One record per teacher per course';
 
-INSERT INTO prefix_log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname,' ',lastname)');
+INSERT INTO prefix_log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname," ",lastname)');
 INSERT INTO prefix_log_display VALUES ('course', 'view', 'course', 'fullname');
 INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
+INSERT INTO prefix_log_display VALUES ('course', 'enrol', 'course', 'fullname');
+INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 385b4b6b1e..6d71be1f0f 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -19,6 +19,26 @@
 
 function main_upgrade($oldversion=0) {
 
+    if ($oldversion < 2003010101) {
+        delete_records("log_display", "module", "user");
+        $new->module = "user";
+        $new->action = "view";
+        $new->mtable = "user";
+        $new->field  = "CONCAT(firstname,\" \",lastname)";
+        insert_record("log_display", $new);
+
+        delete_records("log_display", "module", "course");
+        $new->module = "course";
+        $new->action = "view";
+        $new->mtable = "course";
+        $new->field  = "fullname";
+        insert_record("log_display", $new);
+        $new->action = "update";
+        insert_record("log_display", $new);
+        $new->action = "enrol";
+        insert_record("log_display", $new);
+    }
+
     return true;
 }
 
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 250781293e..a723fb1270 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -137,3 +137,7 @@ CREATE TABLE prefix_user_teachers (
 
 
 INSERT INTO prefix_log_display VALUES ('user', 'view', 'user', 'CONCAT(firstname," ",lastname)');
+INSERT INTO prefix_log_display VALUES ('course', 'view', 'course', 'fullname');
+INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
+INSERT INTO prefix_log_display VALUES ('course', 'enrol', 'course', 'fullname');
+INSERT INTO prefix_log_display VALUES ('course', 'update', 'course', 'fullname');
diff --git a/version.php b/version.php
index 469cccc162..dd500fde0a 100644
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2003010100;   // The current version is a date (YYYYMMDDXX)
+$version = 2003010101;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.0.8 alpha";  // User-friendly version number
 
-- 
2.39.5