From: moodler <moodler>
Date: Sat, 1 Jan 2005 08:41:13 +0000 (+0000)
Subject: New log display stuff for message contacts
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=36f01e7b1bf8bf2dbd645bccaf4013735b340a71;p=moodle.git

New log display stuff for message contacts
---

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index bb7b299d70..1f2dcac732 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1086,6 +1086,12 @@ function main_upgrade($oldversion=0) {
         table_column('message_read', '', 'format', 'integer', '4', 'unsigned', '0', 'not null', 'message');
     }
 
+    if ($oldversion < 2005010100) {
+        modify_database('', "INSERT INTO prefix_log_display VALUES ('message', 'add contact', 'user', 'CONCAT(firstname,\" \",lastname)'); ");
+        modify_database('', "INSERT INTO prefix_log_display VALUES ('message', 'remove contact', 'user', 'CONCAT(firstname,\" \",lastname)'); ");
+        modify_database('', "INSERT INTO prefix_log_display VALUES ('message', 'block contact', 'user', 'CONCAT(firstname,\" \",lastname)'); ");
+        modify_database('', "INSERT INTO prefix_log_display VALUES ('message', 'unblock contact', 'user', 'CONCAT(firstname,\" \",lastname)'); ");
+    }
     return $result;
 
 }
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 80f3a40fb0..dacedc6101 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -556,3 +556,7 @@ 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 ('message', 'write', 'user', 'CONCAT(firstname," ",lastname)');
 INSERT INTO prefix_log_display VALUES ('message', 'read', 'user', 'CONCAT(firstname," ",lastname)');
+INSERT INTO prefix_log_display VALUES ('message', 'add contact', 'user', 'CONCAT(firstname," ",lastname)');
+INSERT INTO prefix_log_display VALUES ('message', 'remove contact', 'user', 'CONCAT(firstname," ",lastname)');
+INSERT INTO prefix_log_display VALUES ('message', 'block contact', 'user', 'CONCAT(firstname," ",lastname)');
+INSERT INTO prefix_log_display VALUES ('message', 'unblock contact', 'user', 'CONCAT(firstname," ",lastname)');
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index fa2e276ddd..7452d98cf8 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -860,6 +860,14 @@ function main_upgrade($oldversion=0) {
     }
        
                                 
+    if ($oldversion < 2005010100) {
+        modify_database('',"INSERT INTO prefix_log_display VALUES ('message', 'add contact', 'user', 'firstname||\' \'||lastname');
+                            INSERT INTO prefix_log_display VALUES ('message', 'remove contact', 'user', 'firstname||\' \'||lastname');
+                            INSERT INTO prefix_log_display VALUES ('message', 'block contact', 'user', 'firstname||\' \'||lastname');
+                            INSERT INTO prefix_log_display VALUES ('message', 'unblock contact', 'user', 'firstname||\' \'||lastname');
+                            ");
+    }
+
     return $result;
 }
 
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 7d53ae5aaf..01b7a38a72 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -387,3 +387,7 @@ 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 ('message', 'write', 'user', 'firstname||\' \'||lastname');
 INSERT INTO prefix_log_display VALUES ('message', 'read', 'user', 'firstname||\' \'||lastname');
+INSERT INTO prefix_log_display VALUES ('message', 'add contact', 'user', 'firstname||\' \'||lastname');
+INSERT INTO prefix_log_display VALUES ('message', 'remove contact', 'user', 'firstname||\' \'||lastname');
+INSERT INTO prefix_log_display VALUES ('message', 'block contact', 'user', 'firstname||\' \'||lastname');
+INSERT INTO prefix_log_display VALUES ('message', 'unblock contact', 'user', 'firstname||\' \'||lastname');
diff --git a/version.php b/version.php
index 5587576ae8..4841f05b45 100644
--- 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 = 2004122801;  // YYYYMMDD = date of first major branch release 1.4
+   $version = 2005010100;  // YYYYMMDD = date of first major branch release 1.4
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name