From d7d1f618e8a6923c7874d111cc233697f6409529 Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Wed, 31 Jul 2002 16:53:32 +0000
Subject: [PATCH] Fixes to logging and log display

---
 mod/forum/db/mysql.sql | 7 +++++--
 mod/forum/mod.php      | 8 +++++++-
 mod/forum/search.php   | 2 +-
 mod/forum/version.php  | 7 ++++++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/mod/forum/db/mysql.sql b/mod/forum/db/mysql.sql
index 8432de56e4..0eec2429e0 100644
--- a/mod/forum/db/mysql.sql
+++ b/mod/forum/db/mysql.sql
@@ -83,10 +83,13 @@ CREATE TABLE forum_subscriptions (
 #
 
 INSERT INTO log_display VALUES ('forum', 'add', 'forum', 'name');
-INSERT INTO log_display VALUES ('forum', 'add discussion', 'forum_discuss', 'name');
+INSERT INTO log_display VALUES ('forum', 'update', 'forum', 'name');
+INSERT INTO log_display VALUES ('forum', 'add discussion', 'forum_discussions', 'name');
 INSERT INTO log_display VALUES ('forum', 'add post', 'forum_posts', 'subject');
 INSERT INTO log_display VALUES ('forum', 'update post', 'forum_posts', 'subject');
-INSERT INTO log_display VALUES ('forum', 'view discussion', 'forum_discuss', 'name');
+INSERT INTO log_display VALUES ('forum', 'view subscribers', 'forum', 'name');
+INSERT INTO log_display VALUES ('forum', 'view discussion', 'forum_discussions', 'name');
 INSERT INTO log_display VALUES ('forum', 'view forum', 'forum', 'name');
 INSERT INTO log_display VALUES ('forum', 'subscribe', 'forum', 'name');
 INSERT INTO log_display VALUES ('forum', 'unsubscribe', 'forum', 'name');
+
diff --git a/mod/forum/mod.php b/mod/forum/mod.php
index 66399e8270..440d4f803a 100644
--- a/mod/forum/mod.php
+++ b/mod/forum/mod.php
@@ -36,6 +36,7 @@ function add_instance($forum) {
             error("Could not add the discussion for this forum");
         }
     }
+    add_to_log($forum->course, "forum", "add", "index.php?f=$forum->id", "$forum->id");
 
     return $forum->id;
 }
@@ -77,7 +78,12 @@ function update_instance($forum) {
         }
     }
 
-    return update_record("forum", $forum);
+    if (update_record("forum", $forum)) {
+        add_to_log($forum->course, "forum", "update", "index.php?f=$forum->id", "$forum->id");
+        return true;
+    } else {
+        return false;
+    }
 }
 
 
diff --git a/mod/forum/search.php b/mod/forum/search.php
index cb60507a33..e9bd5287f2 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -14,7 +14,7 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "course", "search", "search.php?id=$course->id&search=$search", "$search"); 
+    add_to_log($course->id, "forum", "search", "search.php?id=$course->id&search=$search", "$search"); 
 
     if ($search) {
         print_header("$course->shortname: Search Results", "$course->fullname",
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 1956511859..d71ff35ef1 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 $module->fullname = "Forum";
-$module->version  = 2002073008;
+$module->version  = 2002080100;
 $module->cron     = 60;
 $module->search   = "";
 
@@ -36,6 +36,11 @@ function forum_upgrade($oldversion) {
     notify("Renamed all the old discuss tables (now part of forum) and created new forum_types");
   }
 
+  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') ");
+  }
+
   return true;
 
 }
-- 
2.39.5