From a68d660a45706e4ab2ef9a21cfcdf3e87f2782dc Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 7 Nov 2005 09:18:34 +0000
Subject: [PATCH] fix for bug 4278

---
 mod/forum/lib.php  | 20 +++++++++++++++++++-
 mod/forum/user.php | 12 ++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 7e4bcf8dd4b..3683891ab00 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2572,7 +2572,6 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis
                                         $currentgroup=-1, $groupmode=-1, $page=-1) {
     global $CFG, $USER;
 
-
 /// Sort out some defaults
 
     if ((!$maxdiscussions) && ($displayformat == 'plain')) {
@@ -3595,5 +3594,24 @@ function forum_discussion_update_last_post($discussionid) {
 /// or we couldn't update the discussion record (weird x2)
     return false;
 }
+
+
+///this function returns all the separate forum ids, given a courseid
+//@ param int $courseid
+//@ return array
+function forum_get_separate_modules($courseid) {
+
+    global $CFG,$db;
+    $forummodule = get_record("modules", "name", "forum");
+
+    $sql = 'SELECT f.id, f.id FROM '.$CFG->prefix.'forum f, '.$CFG->prefix.'course_modules cm WHERE
+           f.id = cm.instance AND cm.module ='.$forummodule->id.' AND cm.visible = 1 AND cm.course = '.$courseid.'
+           AND cm.groupmode ='.SEPARATEGROUPS;
+           
+    return get_records_sql($sql);
+
+}
+
+
          
 ?>
diff --git a/mod/forum/user.php b/mod/forum/user.php
index a1697572df4..ba326357324 100644
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -49,9 +49,17 @@
     $currenttab = $mode;
     include($CFG->dirroot.'/user/tabs.php');   /// Prints out tabs as part of user page
 
-    $isseparategroups = ($course->groupmode == SEPARATEGROUPS and
+    //look for any forum that is in separate group mode, if there is one, we need to pass groupid
+    //for student and non-editting teacher
+
+    $isseparategroups = /*(($course->groupmode == SEPARATEGROUPS and
                          $course->groupmodeforce and
-                         !isteacheredit($course->id));
+                         !isteacheredit($course->id))*/forum_get_separate_modules($course->id);
+                         
+    //editting teacher can view everything so do not pass in groupid
+    if (isteacheredit ($course->id)){
+        $isseparategroups = false;
+    }
 
     $groupid = $isseparategroups ? get_current_group($course->id) : NULL;