From 2dbd7916e02f671435cd0d8d185aaae60d816d8f Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Thu, 1 Jun 2006 23:16:08 +0000
Subject: [PATCH] Adding propper support for the forum->user report log action.
 It was a bit wrong. Code credits go to Petr!

Merged from MOODLE_16_STABLE
---
 mod/forum/db/mysql.php     | 4 ++++
 mod/forum/db/mysql.sql     | 1 +
 mod/forum/db/postgres7.php | 4 ++++
 mod/forum/db/postgres7.sql | 1 +
 mod/forum/user.php         | 2 +-
 mod/forum/version.php      | 2 +-
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php
index c96b0dd015..93b0403dd2 100644
--- a/mod/forum/db/mysql.php
+++ b/mod/forum/db/mysql.php
@@ -224,6 +224,10 @@ function forum_upgrade($oldversion) {
       table_column('forum_posts','','mailnow','integer');
   }
 
+  if ($oldversion < 2006011702) {
+      execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('forum', 'user report', 'user', 'CONCAT(firstname,\' \',lastname)')");
+  }
+
   return true;
   
 }
diff --git a/mod/forum/db/mysql.sql b/mod/forum/db/mysql.sql
index 50861ebc86..44ea4d7178 100644
--- a/mod/forum/db/mysql.sql
+++ b/mod/forum/db/mysql.sql
@@ -163,6 +163,7 @@ INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum',
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'add discussion', 'forum_discussions', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'add post', 'forum_posts', 'subject');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'update post', 'forum_posts', 'subject');
+INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'user report', 'user', 'CONCAT(firstname,\' \',lastname)');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'move discussion', 'forum_discussions', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'view subscribers', 'forum', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'view discussion', 'forum_discussions', 'name');
diff --git a/mod/forum/db/postgres7.php b/mod/forum/db/postgres7.php
index dab254bf7a..75e44cb49b 100644
--- a/mod/forum/db/postgres7.php
+++ b/mod/forum/db/postgres7.php
@@ -175,6 +175,10 @@ function forum_upgrade($oldversion) {
       execute_sql("ALTER TABLE {$CFG->prefix}forum DROP CONSTRAINT {$CFG->prefix}forum_type_check");
   }
 
+  if ($oldversion < 2006011702) {
+      execute_sql("INSERT INTO {$CFG->prefix}log_display (module, action, mtable, field) VALUES ('forum', 'user report', 'user', 'firstname||\' \'||lastname')");
+  }
+
 
   return true;
 
diff --git a/mod/forum/db/postgres7.sql b/mod/forum/db/postgres7.sql
index 96820bfc55..85ec2e4599 100644
--- a/mod/forum/db/postgres7.sql
+++ b/mod/forum/db/postgres7.sql
@@ -175,6 +175,7 @@ INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum',
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'add discussion', 'forum_discussions', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'add post', 'forum_posts', 'subject');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'update post', 'forum_posts', 'subject');
+INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'user report', 'user', 'firstname||\' \'||lastname');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'move discussion', 'forum_discussions', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'view subscribers', 'forum', 'name');
 INSERT INTO prefix_log_display (module, action, mtable, field) VALUES ('forum', 'view discussion', 'forum_discussions', 'name');
diff --git a/mod/forum/user.php b/mod/forum/user.php
index 8e277fbff2..185921f584 100644
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -27,7 +27,7 @@
     require_course_login($course);
 
 
-    add_to_log($course->id, "forum", "user report", "user.php?id=$course->id&amp;user=$user->id&amp;mode=$mode", "$user->id"); 
+    add_to_log($course->id, "forum", "user report", "user.php?course=$course->id&amp;id=$user->id&amp;mode=$mode", "$user->id");
 
     $strforumposts   = get_string('forumposts', 'forum');
     $strparticipants = get_string('participants');
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 830cb1b55f..dc01f6ecc2 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2006011701;
+$module->version  = 2006011702;
 $module->requires = 2005031000;  // Requires this Moodle version
 $module->cron     = 60;
 
-- 
2.39.5