### Eclipse Workspace Patch 1.0
#P moodle19
Index: mod/quiz/review.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/review.php,v
retrieving revision 1.59.2.5
diff -u -r1.59.2.5 review.php
--- mod/quiz/review.php	14 Nov 2007 01:09:30 -0000	1.59.2.5
+++ mod/quiz/review.php	12 Feb 2008 11:00:12 -0000
@@ -184,7 +184,7 @@
     echo '<table class="generaltable generalbox quizreviewsummary"><tbody>';
     if ($attempt->userid <> $USER->id) {
         $student = get_record('user', 'id', $attempt->userid);
-        $picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
+        $picture = print_user_picture($student, $course->id, $student->picture, false, true);
         echo '<tr><th scope="row" class="cell">', $picture, '</th><td class="cell"><a href="', $CFG->wwwroot,
             '/user/view.php?id=', $student->id, '&amp;course='.$course->id.'">',
             fullname($student, true), '</a></td></tr>';
Index: mod/quiz/reviewquestion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/quiz/reviewquestion.php,v
retrieving revision 1.16.10.3
diff -u -r1.16.10.3 reviewquestion.php
--- mod/quiz/reviewquestion.php	26 Nov 2007 04:42:25 -0000	1.16.10.3
+++ mod/quiz/reviewquestion.php	12 Feb 2008 11:00:12 -0000
@@ -119,7 +119,7 @@
     if ($attempt->userid <> $USER->id) {
         // Print user picture and name
         $student = get_record('user', 'id', $attempt->userid);
-        $picture = print_user_picture($student->id, $course->id, $student->picture, false, true);
+        $picture = print_user_picture($student, $course->id, $student->picture, false, true);
         $table->data[] = array($picture, fullname($student, true));
     }
     // print quiz name
Index: mod/forum/settings.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/settings.php,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 settings.php
--- mod/forum/settings.php	3 Feb 2008 10:35:23 -0000	1.1.2.3
+++ mod/forum/settings.php	12 Feb 2008 11:00:08 -0000
@@ -2,10 +2,8 @@
 
 require_once($CFG->dirroot.'/mod/forum/lib.php');
 
-global $FORUM_LAYOUT_MODES; // make sure we have the pesky global
-
 $settings->add(new admin_setting_configselect('forum_displaymode', get_string('displaymode', 'forum'),
-                   get_string('configdisplaymode', 'forum'), FORUM_MODE_NESTED, $FORUM_LAYOUT_MODES));
+                   get_string('configdisplaymode', 'forum'), FORUM_MODE_NESTED, forum_get_layout_modes()));
 
 $settings->add(new admin_setting_configcheckbox('forum_replytouser', get_string('replytouser', 'forum'),
                    get_string('configreplytouser', 'forum'), 1));
Index: mod/forum/discuss.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v
retrieving revision 1.112.2.2
diff -u -r1.112.2.2 discuss.php
--- mod/forum/discuss.php	10 Jan 2008 23:12:46 -0000	1.112.2.2
+++ mod/forum/discuss.php	12 Feb 2008 11:00:00 -0000
@@ -3,39 +3,38 @@
 //  Displays a post, and all the posts below it.
 //  If no post is given, displays all posts in a discussion
 
-    require_once("../../config.php");
+    require_once('../../config.php');
+    require_once('lib.php');
     
     $d      = required_param('d', PARAM_INT);                // Discussion ID
     $parent = optional_param('parent', 0, PARAM_INT);        // If set, then display this post and all children.
     $mode   = optional_param('mode', 0, PARAM_INT);          // If set, changes the layout of the thread
     $move   = optional_param('move', 0, PARAM_INT);          // If set, moves this discussion to another forum
-    $fromforum = optional_param('fromforum', 0, PARAM_INT);  // Needs to be set when we want to move a discussion.
     $mark   = optional_param('mark', '', PARAM_ALPHA);       // Used for tracking read posts if user initiated.
     $postid = optional_param('postid', 0, PARAM_INT);        // Used for tracking read posts if user initiated.
 
-    if (!$discussion = get_record("forum_discussions", "id", $d)) {
+    if (!$discussion = get_record('forum_discussions', 'id', $d)) {
         error("Discussion ID was incorrect or no longer exists");
     }
 
-    if (!$course = get_record("course", "id", $discussion->course)) {
+    if (!$course = get_record('course', 'id', $discussion->course)) {
         error("Course ID is incorrect - discussion is faulty");
     }
 
-    if (!$forum = get_record("forum", "id", $discussion->forum)) {
+    if (!$forum = get_record('forum', 'id', $discussion->forum)) {
         notify("Bad forum ID stored in this discussion");
     }
 
     if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
         error('Course Module ID was incorrect');
     }
-    // move this down fix for MDL-6926
-    require_once("lib.php");
+
     require_course_login($course, true, $cm);
 
     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-    $canviewdiscussion = has_capability('mod/forum:viewdiscussion', $modcontext);
+    require_capability('mod/forum:viewdiscussion', $modcontext, NULL, true, 'noviewdiscussionspermission', 'forum');
     
-    if ($forum->type == "news") {
+    if ($forum->type == 'news') {
         if (!($USER->id == $discussion->userid || (($discussion->timestart == 0
             || $discussion->timestart <= time())
             && ($discussion->timeend == 0 || $discussion->timeend > time())))) {
@@ -43,45 +42,46 @@
         }
     }
 
+/// move discussion if requested
+    if ($move > 0 and confirm_sesskey()) {
+        $return = $CFG->wwwroot.'/mod/forum/discussion.php?d='.$discussion->id;
 
-    if (!empty($move)) {
-        
-        if (!$sourceforum = get_record('forum', 'id', $fromforum)) {
-            error('Cannot find which forum this discussion is being moved from');
+        require_capability('mod/forum:movediscussions', $modcontext);
+
+        if ($forum->type == 'single') {
+            error('Cannot move discussion from a simple single discussion forum', $return);
+        }
+
+        if ($forumto = get_record('forum', 'id', $move)) {
+            error('You can\'t move to that forum - it doesn\'t exist!', $return);
+        }
+
+        if (!$cmto = get_coursemodule_from_instance('forum', $forumto->id, $course->id)) {
+            error('Target forum not found in this course.', $return);
+        }
+
+        if (!coursemodule_visible_for_user($cmto)) {
+            error('Forum not visible', $return);
         }
-        if ($sourceforum->type == 'single') {
-            error('Cannot move discussion from a simple single discussion forum');
+
+        if (!forum_move_attachments($discussion, $forumto)) {
+            notify("Errors occurred while moving attachment directories - check your file permissions");
         }
+        set_field('forum_discussions', 'forum', $forumto->id, 'id', $discussion->id);
+        add_to_log($course->id, 'forum', 'move discussion', "discuss.php?d=$discussion->id", $discussion->id, $cmto->id);
         
-        require_capability('mod/forum:movediscussions', $modcontext);
+        require_once($CFG->libdir.'/rsslib.php');
+        require_once('rsslib.php');
 
-        if ($forum = get_record("forum", "id", $move)) {
-            if (!forum_move_attachments($discussion, $move)) {
-                notify("Errors occurred while moving attachment directories - check your file permissions");
-            }
-            set_field("forum_discussions", "forum", $forum->id, "id", $discussion->id);
-            $discussion->forum = $forum->id;
-            if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-                add_to_log($course->id, "forum", "move discussion", "discuss.php?d=$discussion->id", "$discussion->id",
-                           $cm->id);
-            } else {
-                add_to_log($course->id, "forum", "move discussion", "discuss.php?d=$discussion->id", "$discussion->id");
-            }
-            $discussionmoved = true;
-            
-            require_once('rsslib.php');
-            require_once($CFG->libdir.'/rsslib.php');
-
-            // Delete the RSS files for the 2 forums because we want to force
-            // the regeneration of the feeds since the discussions have been
-            // moved.
-            if (!forum_rss_delete_file($forum) || !forum_rss_delete_file($sourceforum)) {
-                notify('Could not purge the cached RSS feeds for the source and/or'.
-                       'destination forum(s) - check your file permissionsforums');
-            }
-        } else {
-            error('You can\'t move to that forum - it doesn\'t exist!');
+        // Delete the RSS files for the 2 forums because we want to force
+        // the regeneration of the feeds since the discussions have been
+        // moved.
+        if (!forum_rss_delete_file($forum) || !forum_rss_delete_file($sourceforum)) {
+            error('Could not purge the cached RSS feeds for the source and/or'.
+                   'destination forum(s) - check your file permissionsforums', $return);
         }
+
+        redirect($return.'&amp;moved=-1&amp;sesskey='.sesskey());
     }
 
     $logparameters = "d=$discussion->id";
@@ -89,11 +89,7 @@
         $logparameters .= "&amp;parent=$parent";
     }
 
-    if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-        add_to_log($course->id, "forum", "view discussion", "discuss.php?$logparameters", "$discussion->id", $cm->id);
-    } else {
-        add_to_log($course->id, "forum", "view discussion", "discuss.php?$logparameters", "$discussion->id");
-    }
+    add_to_log($course->id, 'forum', 'view discussion', "discuss.php?$logparameters", $discussion->id, $cm->id);
 
     unset($SESSION->fromdiscussion);
 
@@ -104,39 +100,41 @@
     $displaymode = get_user_preferences('forum_displaymode', $CFG->forum_displaymode);
 
     if ($parent) {
-        if (abs($displaymode) == 1) {  // If flat AND parent, then force nested display this time
-            $displaymode = 3;
+        // If flat AND parent, then force nested display this time
+        if ($displaymode == FORUM_MODE_FLATOLDEST or $displaymode == FORUM_MODE_FLATNEWEST) {
+            $displaymode = FORUM_MODE_NESTED;
         }
     } else {
         $parent = $discussion->firstpost;
     }
-    
-    if (!forum_user_can_view_post($parent, $course, $cm, $forum, $discussion)) {
-        error('You do not have permissions to view this post', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id");
-    }
 
     if (! $post = forum_get_post_full($parent)) {
         error("Discussion no longer exists", "$CFG->wwwroot/mod/forum/view.php?f=$forum->id");
     }
 
-    $post->modcontext = $modcontext;
+    
+    if (!forum_user_can_view_post($post, $course, $cm, $forum, $discussion)) {
+        error('You do not have permissions to view this post', "$CFG->wwwroot/mod/forum/view.php?id=$forum->id");
+    }
 
-    if (forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum) && 
-        $CFG->forum_usermarksread) {
-        if ($mark == 'read') {
-            forum_tp_add_read_record($USER->id, $postid, $discussion->id, $forum->id);
-        } else if ($mark == 'unread') {
-            forum_tp_delete_read_records($USER->id, $postid);
+    if ($mark == 'read' or $mark == 'unread') {
+        if (forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum) && 
+            $CFG->forum_usermarksread) {
+            if ($mark == 'read') {
+                forum_tp_add_read_record($USER->id, $postid, $discussion->id, $forum->id);
+            } else {
+                // unread
+                forum_tp_delete_read_records($USER->id, $postid);
+            }
         }
     }
 
-
     $searchform = forum_search_form($course);
 
     $navlinks = array();
-    $navlinks[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
+    $navlinks[] = array('name' => format_string($discussion->name), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
     if ($parent != $discussion->firstpost) {
-        $navlinks[] = array('name' => format_string($post->subject,true), 'type' => 'title');
+        $navlinks[] = array('name' => format_string($post->subject), 'type' => 'title');
     }
     
     $navigation = build_navigation($navlinks, $cm); 
@@ -185,7 +183,8 @@
         }
     } else { // allow guests to see the link
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
+        if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {
+            // User is a guest here ! guests are prompted to login later if try to reply
             $canreply = true;
         }
     }
@@ -205,21 +204,27 @@
         
         // Popup menu to move discussions to other forums. The discussion in a
         // single discussion forum can't be moved.
-        if ($forums = get_all_instances_in_course("forum", $course)) {
+        $modinfo = get_fast_modinfo($course);
+        if (isset($modinfo->instances['forum'])) {
             if ($course->format == 'weeks') {
                 $strsection = get_string("week");
             } else {
                 $strsection = get_string("topic");
             }
             $section = -1;
-            foreach ($forums as $courseforum) {
-                if (!empty($courseforum->section) and $section != $courseforum->section) {
-                    $forummenu[] = "-------------- $strsection $courseforum->section --------------";
+            $forummenu = array();
+            foreach ($modinfo->instances['forum'] as $forumcm) {
+                if (!$forumcm->uservisible) {
+                    continue;
                 }
-                $section = $courseforum->section;
-                if ($courseforum->id != $forum->id) {
-                    $url = "discuss.php?d=$discussion->id&amp;fromforum=$discussion->forum&amp;move=$courseforum->id";
-                    $forummenu[$url] = format_string($courseforum->name,true);
+                
+                if (!empty($forumcm->sectionnum) and $section != $forumcm->sectionnum) {
+                    $forummenu[] = "-------------- $strsection $forumcm->sectionnum --------------";
+                }
+                $section = $forumcm->sectionnum;
+                if ($forumcm->instance != $forum->id) {
+                    $url = "discuss.php?d=$discussion->id&amp;move=$forumcm->instance&amp;sesskey=".sesskey();
+                    $forummenu[$url] = format_string($forumcm->name);
                 }
             }
             if (!empty($forummenu)) {
@@ -233,7 +238,8 @@
     echo "</td></tr></table>";
 
     if (!empty($forum->blockafter) && !empty($forum->blockperiod)) {
-        $a->blockafter = $forum->blockafter;
+        $a = new object();
+        $a->blockafter  = $forum->blockafter;
         $a->blockperiod = get_string('secondstotime'.$forum->blockperiod);
         notify(get_string('thisforumisthrottled','forum',$a));
     }
@@ -243,18 +249,12 @@
         notify(get_string('qandanotify','forum'));
     }
 
-    if (isset($discussionmoved)) {
-        notify(get_string("discussionmoved", "forum", format_string($forum->name,true)));
+    if ($move == -1 and confirm_sesskey()) {
+        notify(get_string('discussionmoved', 'forum', format_string($forum->name,true)));
     }
 
-
-/// Print the actual discussion
-    if (!$canviewdiscussion) {
-        notice(get_string('noviewdiscussionspermission', 'forum'));
-    } else {
-        $canrate = has_capability('mod/forum:rate', $modcontext);
-        forum_print_discussion($course, $forum, $discussion, $post, $displaymode, $canreply, $canrate);
-    }
+    $canrate = has_capability('mod/forum:rate', $modcontext);
+    forum_print_discussion($course, $cm, $forum, $discussion, $post, $displaymode, $canreply, $canrate);
     
     print_footer($course);
     
Index: mod/forum/restorelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/restorelib.php,v
retrieving revision 1.60.4.2
diff -u -r1.60.4.2 restorelib.php
--- mod/forum/restorelib.php	27 Jan 2008 00:34:41 -0000	1.60.4.2
+++ mod/forum/restorelib.php	12 Feb 2008 11:00:08 -0000
@@ -143,7 +143,7 @@
                     $sd->format   = $defaultformat;
                     $sd->mailnow  = false;
                     //Insert dicussion/post data
-                    $sdid = forum_add_discussion($sd, $sd->intro);
+                    $sdid = forum_add_discussion($sd, $sd->intro, $forum);
                     //Now, mark the initial post of the discussion as mailed!
                     if ($sdid) {
                         set_field ('forum_posts','mailed', '1', 'discussion', $sdid);
Index: mod/forum/subscribers.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/subscribers.php,v
retrieving revision 1.40.2.1
diff -u -r1.40.2.1 subscribers.php
--- mod/forum/subscribers.php	12 Oct 2007 16:09:42 -0000	1.40.2.1
+++ mod/forum/subscribers.php	12 Feb 2008 11:00:08 -0000
@@ -67,7 +67,7 @@
             echo '<table align="center" cellpadding="5" cellspacing="5">';
             foreach ($users as $user) {
                 echo '<tr><td>';
-                print_user_picture($user->id, $course->id, $user->picture);
+                print_user_picture($user, $course->id);
                 echo '</td><td>';
                 echo fullname($user);
                 echo '</td><td>';
Index: mod/forum/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/view.php,v
retrieving revision 1.106.2.8
diff -u -r1.106.2.8 view.php
--- mod/forum/view.php	27 Jan 2008 16:59:29 -0000	1.106.2.8
+++ mod/forum/view.php	12 Feb 2008 11:00:09 -0000
@@ -14,9 +14,9 @@
     $search      = optional_param('search', '');             // search string
 
 
+    $buttontext = '';
 
     if ($id) {
-
         if (! $cm = get_coursemodule_from_id('forum', $id)) {
             error("Course Module ID was incorrect");
         }
@@ -42,14 +42,12 @@
         $strforums = get_string("modulenameplural", "forum");
         $strforum = get_string("modulename", "forum");
 
-        if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-            $buttontext = update_module_button($cm->id, $course->id, $strforum);
-        } else {
-            $cm->id = 0;
-            $cm->visible = 1;
-            $cm->course = $course->id;
-            $buttontext = "";
+        if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
+            error("Course Module missing");
         }
+
+        $buttontext = update_module_button($cm->id, $course->id, $strforum);
+
     } else {
         error('Must specify a course module or a forum ID');
     }
@@ -223,7 +221,7 @@
             }
             $displaymode = get_user_preferences("forum_displaymode", $CFG->forum_displaymode);
             $canrate = has_capability('mod/forum:rate', $context);
-            forum_print_discussion($course, $forum, $discussion, $post, $displaymode, NULL, $canrate);
+            forum_print_discussion($course, $cm, $forum, $discussion, $post, $displaymode, NULL, $canrate);
             break;
 
         case 'eachuser':
Index: mod/forum/mod_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/mod_form.php,v
retrieving revision 1.23.2.3
diff -u -r1.23.2.3 mod_form.php
--- mod/forum/mod_form.php	5 Feb 2008 11:21:37 -0000	1.23.2.3
+++ mod/forum/mod_form.php	12 Feb 2008 11:00:05 -0000
@@ -5,7 +5,7 @@
 
     function definition() {
 
-        global $CFG, $FORUM_TYPES, $COURSE;
+        global $CFG, $COURSE;
         $mform    =& $this->_form;
 
 //-------------------------------------------------------------------------------
@@ -15,8 +15,10 @@
         $mform->setType('name', PARAM_TEXT);
         $mform->addRule('name', null, 'required', null, 'client');
 
-        asort($FORUM_TYPES);
-        $mform->addElement('select', 'type', get_string('forumtype', 'forum'), $FORUM_TYPES);
+        $forum_types = get_forum_types();
+
+        asort($forum_types);
+        $mform->addElement('select', 'type', get_string('forumtype', 'forum'), $forum_types);
         $mform->setHelpButton('type', array('forumtype', get_string('forumtype', 'forum'), 'forum'));
         $mform->setDefault('type', 'general');
 
Index: mod/forum/subscriber.html
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/subscriber.html,v
retrieving revision 1.4
diff -u -r1.4 subscriber.html
--- mod/forum/subscriber.html	4 Jan 2007 21:32:42 -0000	1.4
+++ mod/forum/subscriber.html	12 Feb 2008 11:00:08 -0000
@@ -1,6 +1,6 @@
 
 <form id="subscriberform" method="post" action="subscribers.php">
-<input type="hidden" name="previoussearch" value="<?php echo $previoussearch ?>" />
+<input type="hidden" name="previoussearch" value="<?php p($previoussearch) ?>" />
 <input type="hidden" name="id" value="<?php echo $id?>" />
   <table align="center" border="0" cellpadding="5" cellspacing="0">
     <tr>
@@ -56,7 +56,7 @@
           ?>
          </select>
          <br />
-         <input type="text" name="searchtext" size="30" value="<?php echo $searchtext ?>" 
+         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>" 
                   onFocus ="getElementById('subscriberform').add.disabled=true;
                             getElementById('subscriberform').remove.disabled=true;
                             getElementById('subscriberform').removeselect.selectedIndex=-1;
Index: mod/forum/user.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/user.php,v
retrieving revision 1.30.2.1
diff -u -r1.30.2.1 user.php
--- mod/forum/user.php	10 Jan 2008 10:58:09 -0000	1.30.2.1
+++ mod/forum/user.php	12 Feb 2008 11:00:09 -0000
@@ -24,7 +24,7 @@
         error("Course id is incorrect.");
     }
 
-    $syscontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
+    $syscontext = get_context_instance(CONTEXT_SYSTEM);
     $usercontext   = get_context_instance(CONTEXT_USER, $id);
     
     // do not force parents to enrol
@@ -89,16 +89,39 @@
         
         print_paging_bar($totalcount, $page, $perpage, 
                          "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
+
+        $discussions = array();
+        $forums      = array();
+        $cms         = array();
         
         foreach ($posts as $post) {
-    
-            if (! $discussion = get_record('forum_discussions', 'id', $post->discussion)) {
-                error('Discussion ID was incorrect');
+
+            if (!isset($discussions[$post->discussion])) {
+                if (! $discussion = get_record('forum_discussions', 'id', $post->discussion)) {
+                    error('Discussion ID was incorrect');
+                }
+                $discussions[$post->discussion] = $discussion;
+            } else {
+                $discussion = $discussions[$post->discussion];
             }
-            if (! $forum = get_record('forum', 'id', "$discussion->forum")) {
-                error("Could not find forum $discussion->forum");
+
+            if (!isset($forums[$discussion->forum])) {
+                if (! $forum = get_record('forum', 'id', $discussion->forum)) {
+                    error("Could not find forum $discussion->forum");
+                }
+                $forums[$discussion->forum] = $forum;
+            } else {
+                $forum = $forums[$discussion->forum];
             }
-            
+
+            if (!isset($cms[$forum->id])) {
+                if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
+                    error('Course Module ID was incorrect');
+                }
+                $cms[$forum->id] = $cm;
+                unset($cm); // do not use cm directly, it would break caching
+            }
+
             $fullsubject = "<a href=\"view.php?f=$forum->id\">".format_string($forum->name,true)."</a>";
             if ($forum->type != 'single') {
                 $fullsubject .= " -> <a href=\"discuss.php?d=$discussion->id\">".format_string($discussion->name,true)."</a>";
@@ -107,8 +130,7 @@
                 }
             }
             
-            $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
-            if ($course->id == SITEID && has_capability('moodle/site:config', $context)) {
+            if ($course->id == SITEID && has_capability('moodle/site:config', $syscontext)) {
                 $postcoursename = get_field('course', 'shortname', 'id', $forum->course);
                 $fullsubject = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$forum->course.'">'.$postcoursename.'</a> -> '. $fullsubject;
             }
@@ -118,7 +140,7 @@
             $fulllink = "<a href=\"discuss.php?d=$post->discussion#p$post->id\">".
                          get_string("postincontext", "forum")."</a>";
 
-            forum_print_post($post, $course->id, false, false, false, false, $fulllink);
+            forum_print_post($post, $discussion, $forum, $cms[$forum->id], $course, false, false, false, false, $fulllink);
             echo "<br />";
         }
     
Index: mod/forum/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
retrieving revision 1.609.2.24
diff -u -r1.609.2.24 lib.php
--- mod/forum/lib.php	5 Feb 2008 11:48:45 -0000	1.609.2.24
+++ mod/forum/lib.php	12 Feb 2008 11:00:05 -0000
@@ -26,33 +26,6 @@
 define ('FORUM_AGGREGATE_MIN', 4);
 define ('FORUM_AGGREGATE_SUM', 5);
 
-// this file may be included from some functions, we must define these as global explicitly
-global $FORUM_LAYOUT_MODES, $FORUM_TYPES, $FORUM_TYPES_ALL, $FORUM_OPEN_MODES;
-
-$FORUM_LAYOUT_MODES = array ( FORUM_MODE_FLATOLDEST => get_string('modeflatoldestfirst', 'forum'),
-                              FORUM_MODE_FLATNEWEST => get_string('modeflatnewestfirst', 'forum'),
-                              FORUM_MODE_THREADED   => get_string('modethreaded', 'forum'),
-                              FORUM_MODE_NESTED     => get_string('modenested', 'forum') );
-
-// These are course content forums that can be added to the course manually
-$FORUM_TYPES   = array ('general'    => get_string('generalforum', 'forum'),
-                        'eachuser'   => get_string('eachuserforum', 'forum'),
-                        'single'     => get_string('singleforum', 'forum'),
-                        'qanda'      => get_string('qandaforum', 'forum'));
-
-$FORUM_TYPES_ALL = array ('news'       => get_string('namenews','forum'),
-                          'social'     => get_string('namesocial','forum'),
-                          'general'    => get_string('generalforum', 'forum'),
-                          'eachuser'   => get_string('eachuserforum', 'forum'),
-                          'single'     => get_string('singleforum', 'forum'),
-                          'qanda'      => get_string('qandaforum', 'forum'));
-
-
-$FORUM_OPEN_MODES   = array ('2' => get_string('openmode2', 'forum'),
-                             '1' => get_string('openmode1', 'forum'),
-                             '0' => get_string('openmode0', 'forum') );
-
-
 /// STANDARD FUNCTIONS ///////////////////////////////////////////////////////////
 
 /**
@@ -378,7 +351,7 @@
                 }
                 if (!isset($userto->canpost[$forum->id])) {
                     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-                    $userto->canpost[$forum->id] = forum_user_can_post($forum, $userto, null, $modcontext);
+                    $userto->canpost[$forum->id] = forum_user_can_post($forum, $userto, $cm, $modcontext);
                 }
                 if (!isset($userfrom->groups[$forum->id])) {
                     if (!isset($userfrom->groups)) {
@@ -640,7 +613,7 @@
 
                     $strforums = get_string('forums', 'forum');
                     $canunsubscribe = ! forum_is_forcesubscribed($forum);
-                    $canreply = forum_user_can_post($forum, $userto);
+                    $canreply = forum_user_can_post($forum, $userto, $cm);
 
                     // Fill caches
                     if (!isset($userto->viewfullnames[$forum->id])) {
@@ -649,7 +622,7 @@
                     }
                     if (!isset($userto->canpost[$forum->id])) {
                         $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-                        $userto->canpost[$forum->id] = forum_user_can_post($forum, $userto, null, $modcontext);
+                        $userto->canpost[$forum->id] = forum_user_can_post($forum, $userto, $cm, $modcontext);
                     }
 
                     $posttext .= "\n \n";
@@ -952,10 +925,15 @@
     global $CFG;
 
     if ($posts = forum_get_user_posts($forum->id, $user->id)) {
-        foreach ($posts as $post) {
 
-            $post->forum = $forum->id;
-            forum_print_post($post, $course->id, $ownpost=false, $reply=false, $link=false, $rate=false);
+        if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
+            error('Course Module ID was incorrect');
+        }
+        $discussions = get_records('discussions', 'forum', $forum->id); // TODO: improve
+
+        foreach ($posts as $post) {
+            $discussion = $discussions[$forum->discussion];
+            forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false, false);
         }
 
     } else {
@@ -1446,6 +1424,36 @@
 }
 
 /**
+ * Gets all posts in discussion including top parent.
+ */
+function forum_get_all_discussion_posts($discussionid, $sort) {
+    global $CFG;
+
+    if (!$posts = get_records_sql("SELECT p.*, u.firstname, u.lastname, u.email, u.picture, u.imagealt
+                              FROM {$CFG->prefix}forum_posts p
+                                   LEFT JOIN {$CFG->prefix}user u ON p.userid = u.id
+                             WHERE p.discussion = $discussionid
+                          ORDER BY $sort")) {
+        return array();
+    }
+
+    foreach ($posts as $pid=>$p) {
+        if (!$p->parent) {
+            continue;
+        }
+        if (!isset($posts[$p->parent])) {
+            continue; // parent does not exist??
+        }
+        if (!isset($posts[$p->parent]->children)) {
+            $posts[$p->parent]->children = array();
+        }
+        $posts[$p->parent]->children[$pid] =& $posts[$pid]; 
+    }
+
+    return $posts;
+}
+
+/**
  * Gets posts with all info ready for forum_print_post
  * We pass forumid in because we always know it so no need to make a
  * complicated join to find it out.
@@ -1726,6 +1734,15 @@
     return get_records_sql($searchsql, $limitfrom, $limitnum);
 }
 
+function forum_get_all_discussion_ratings($discussion) {
+    global $CFG;
+    return get_records_sql("SELECT r.id, r.userid, p.id AS postid, r.rating
+                              FROM {$CFG->prefix}forum_ratings r,
+                                   {$CFG->prefix}forum_posts p
+                             WHERE r.post = p.id AND p.discussion = $discussion->id
+                             ORDER BY p.id ASC");
+}
+
 /**
  * Returns a list of ratings for a particular post - sorted.
  */
@@ -2277,7 +2294,7 @@
  *          (the default) then print a dummy 'you can't see this post' post.
  *          If false, don't output anything at all.
  */
-function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link=false,
+function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=false, $reply=false, $link=false,
                           $ratings=NULL, $footer="", $highlight="", $post_read=-99, $dummyifcantsee=true) {
 
     global $USER, $CFG;
@@ -2286,20 +2303,31 @@
     static $strpruneheading, $displaymode;
     static $strmarkread, $strmarkunread, $istracked;
 
+    $post->course = $course->id;
+    $post->forum  = $forum->id;
 
-    if (empty($post->modcontext)) {   // Have to generate it, which is expensive!  Should always be set.
-        if (empty($post->forum)) {
-            $discussion = get_record('forum_discussions', 'id', $post->discussion);
-            $post->forum = $discussion->forum;
-        }
+    // caching
+    if (!isset($cm->cache)) {
+        $cm->cache = new object();
+    }
 
-        if (!$cm = get_coursemodule_from_instance('forum', $post->forum)) {
-            error('Course Module ID was incorrect');
-        }
-        $post->modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    if (!isset($cm->cache->caps)) {
+        $cm->cache->caps = array();
+        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $cm->cache->caps['mod/forum:viewdiscussion']   = has_capability('mod/forum:viewdiscussion', $modcontext);
+        $cm->cache->caps['moodle/site:viewfullnames']  = has_capability('moodle/site:viewfullnames', $modcontext);
+        $cm->cache->caps['mod/forum:editanypost']      = has_capability('mod/forum:editanypost', $modcontext);
+        $cm->cache->caps['mod/forum:splitdiscussions'] = has_capability('mod/forum:splitdiscussions', $modcontext);
+        $cm->cache->caps['mod/forum:deleteownpost']    = has_capability('mod/forum:deleteownpost', $modcontext);
+        $cm->cache->caps['mod/forum:deleteanypost']    = has_capability('mod/forum:deleteanypost', $modcontext);
+        $cm->cache->caps['mod/forum:viewanyrating']    = has_capability('mod/forum:viewanyrating', $modcontext);
+    }
+
+    if (!isset($cm->uservisible)) {
+        $cm->uservisible = coursemodule_visible_for_user($cm);
     }
 
-    if (!forum_user_can_see_post($post->forum,$post->discussion,$post)) {
+    if (!forum_user_can_see_post($forum, $discussion, $post, NULL, $cm)) {
         if (!$dummyifcantsee) {
             return;
         }
@@ -2330,19 +2358,19 @@
     }
 
     if (empty($stredit)) {
-        $stredit = get_string('edit', 'forum');
-        $strdelete = get_string('delete', 'forum');
-        $strreply = get_string('reply', 'forum');
-        $strparent = get_string('parent', 'forum');
+        $stredit         = get_string('edit', 'forum');
+        $strdelete       = get_string('delete', 'forum');
+        $strreply        = get_string('reply', 'forum');
+        $strparent       = get_string('parent', 'forum');
         $strpruneheading = get_string('pruneheading', 'forum');
-        $strprune = get_string('prune', 'forum');
-        $displaymode = get_user_preferences('forum_displaymode', $CFG->forum_displaymode);
-        $strmarkread = get_string('markread', 'forum');
-        $strmarkunread = get_string('markunread', 'forum');
+        $strprune        = get_string('prune', 'forum');
+        $displaymode     = get_user_preferences('forum_displaymode', $CFG->forum_displaymode);
+        $strmarkread     = get_string('markread', 'forum');
+        $strmarkunread   = get_string('markunread', 'forum');
 
         if (!empty($post->forum)) {
-            $istracked = (forum_tp_can_track_forums($post->forum) &&
-                          forum_tp_is_tracked($post->forum));
+            $istracked = (forum_tp_can_track_forums($forum) &&
+                          forum_tp_is_tracked($forum));
         } else {
             $istracked = false;
         }
@@ -2368,15 +2396,15 @@
     echo '<table cellspacing="0" class="forumpost'.$read_style.'">';
 
     // Picture
-    $postuser = new object;
-    $postuser->id = $post->userid;
+    $postuser = new object();
+    $postuser->id        = $post->userid;
     $postuser->firstname = $post->firstname;
-    $postuser->lastname = $post->lastname;
-    $postuser->imagealt = $post->imagealt;
-    $postuser->picture = $post->picture;
+    $postuser->lastname  = $post->lastname;
+    $postuser->imagealt  = $post->imagealt;
+    $postuser->picture   = $post->picture;
 
     echo '<tr class="header"><td class="picture left">';
-    print_user_picture($postuser, $courseid);
+    print_user_picture($postuser, $course->id);
     echo '</td>';
 
     if ($post->parent) {
@@ -2392,17 +2420,28 @@
     }
 
     echo '<div class="author">';
-    $fullname = fullname($post, has_capability('moodle/site:viewfullnames', $post->modcontext));
+    $fullname = fullname($postuser, $cm->cache->caps['moodle/site:viewfullnames']);
     $by = new object();
     $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.
-                $post->userid.'&amp;course='.$courseid.'">'.$fullname.'</a>';
+                $post->userid.'&amp;course='.$course->id.'">'.$fullname.'</a>';
     $by->date = userdate($post->modified);
     print_string('bynameondate', 'forum', $by);
     echo '</div></td></tr>';
 
     echo '<tr><td class="left side">';
-    if ($group = groups_get_all_groups($courseid, $post->userid)) {
-        print_group_picture($group, $courseid, false, false, true);
+    if (isset($cm->cache->usersgroups)) {
+        $groups = array();
+        if (isset($cm->cache->usersgroups[$post->userid])) {
+            foreach ($cm->cache->usersgroups[$post->userid] as $gid) {
+                $groups[$gid] = $cm->cache->groups[$gid];
+            }
+        }
+    } else {
+        $groups = groups_get_all_groups($course->id, $post->userid, $cm->groupingid);
+    }
+
+    if ($groups) {
+        print_group_picture($groups, $course->id, false, false, true);
     } else {
         echo '&nbsp;';
     }
@@ -2412,8 +2451,6 @@
     echo '</td><td class="content">'."\n";
 
     if ($post->attachment) {
-        $post->course = $courseid;
-        $post->forum = get_field('forum_discussions', 'forum', 'id', $post->discussion);
         echo '<div class="attachments">';
         $attachedimages = forum_print_attachments($post);
         echo '</div>';
@@ -2422,12 +2459,12 @@
     }
 
 
-    $options = new Object;
-    $options->para = false;
+    $options = new object();
+    $options->para      = false;
     $options->trusttext = true;
     if ($link and (strlen(strip_tags($post->message)) > $CFG->forum_longpost)) {
         // Print shortened version
-        echo format_text(forum_shorten_post($post->message), $post->format, $options, $courseid);
+        echo format_text(forum_shorten_post($post->message), $post->format, $options, $course->id);
         $numwords = count_words(strip_tags($post->message));
         echo '<p><a href="'.$CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'">';
         echo get_string('readtherest', 'forum');
@@ -2435,9 +2472,9 @@
     } else {
         // Print whole message
         if ($highlight) {
-            echo highlight($highlight, format_text($post->message, $post->format, $options, $courseid));
+            echo highlight($highlight, format_text($post->message, $post->format, $options, $course->id));
         } else {
-            echo format_text($post->message, $post->format, $options, $courseid);
+            echo format_text($post->message, $post->format, $options, $course->id);
         }
         echo $attachedimages;
     }
@@ -2450,7 +2487,7 @@
     if ($istracked) {
         // SPECIAL CASE: The front page can display a news item post to non-logged in users.
         // Don't display the mark read / unread controls in this case.
-        if ($CFG->forum_usermarksread && !empty($USER)) {
+        if ($CFG->forum_usermarksread and isloggedin()) {
             if ($post_read) {
                 $mcmd = '&amp;mark=unread&amp;postid='.$post->id;
                 $mtxt = $strmarkunread;
@@ -2478,22 +2515,12 @@
         }
     }
 
-    if (!isset($post->forumtype)) {
-        $post->forumtype = get_field('forum', 'type', 'id', $post->forum);
-    }
-
-if (!isset($post->aggtype)) {
-        $post->aggtype = get_field('forum', 'assessed', 'id', $post->forum);
-    }
-
     $age = time() - $post->created;
     // Hack for allow to edit news posts those are not displayed yet until they are displayed
-    if (!$post->parent
-        && $post->forumtype == 'news'
-        && get_field_sql("SELECT id FROM {$CFG->prefix}forum_discussions WHERE id = $post->discussion AND timestart > ".time())) {
+    if (!$post->parent and $forum->type == 'news' and $discussion->timestart > time()) {
         $age = 0;
     }
-    $editanypost = has_capability('mod/forum:editanypost', $post->modcontext);
+    $editanypost = $cm->cache->caps['mod/forum:editanypost'];
 
     if ($ownpost or $editanypost) {
         if (($age < $CFG->maxeditingtime) or $editanypost) {
@@ -2501,16 +2528,16 @@
         }
     }
 
-    if (has_capability('mod/forum:splitdiscussions', $post->modcontext)
-                && $post->parent && $post->forumtype != 'single') {
+    if ($cm->cache->caps['mod/forum:splitdiscussions']
+                && $post->parent && $forum->type != 'single') {
 
         $commands[] = '<a href="'.$CFG->wwwroot.'/mod/forum/post.php?prune='.$post->id.
                       '" title="'.$strpruneheading.'">'.$strprune.'</a>';
     }
 
     if (($ownpost and $age < $CFG->maxeditingtime
-                and has_capability('mod/forum:deleteownpost', $post->modcontext))
-                or has_capability('mod/forum:deleteanypost', $post->modcontext)) {
+                and $cm->cache->caps['mod/forum:deleteownpost'])
+                or $cm->cache->caps['mod/forum:deleteanypost']) {
         $commands[] = '<a href="'.$CFG->wwwroot.'/mod/forum/post.php?delete='.$post->id.'">'.$strdelete.'</a>';
     }
 
@@ -2526,7 +2553,7 @@
 // Ratings
 
     $ratingsmenuused = false;
-    if (!empty($ratings) and !empty($USER->id)) {
+    if (!empty($ratings) and isloggedin()) {
         echo '<div class="ratings">';
         $useratings = true;
         if ($ratings->assesstimestart and $ratings->assesstimefinish) {
@@ -2537,21 +2564,41 @@
         if ($useratings) {
             $mypost = ($USER->id == $post->userid);
 
-            $canviewallratings = has_capability('mod/forum:viewanyrating', $post->modcontext);
+            $canviewallratings = $cm->cache->caps['mod/forum:viewanyrating'];
+
+            if (isset($cm->cache->ratings)) {
+                if (isset($cm->cache->ratings[$post->id])) {
+                    $allratings = $cm->cache->ratings[$post->id];
+                } else {
+                    $allratings = array(); // no reatings present yet
+                }
+            } else {
+                $allratings = NULL; // not preloaded
+            }
+
+            if (isset($cm->cache->myratings)) {
+                if (isset($cm->cache->myratings[$post->id])) {
+                    $myrating = $cm->cache->myratings[$post->id];
+                } else {
+                    $myrating = FORUM_UNSET_POST_RATING; // no reatings present yet
+                }
+            } else {
+                $myrating = NULL; // not preloaded
+            }
 
             if ($canviewallratings and !$mypost) {
-                forum_print_ratings_mean($post->id, $ratings->scale, $post->aggtype, $canviewallratings);
+                forum_print_ratings($post->id, $ratings->scale, $forum->assessed, $canviewallratings, $allratings);
                 if (!empty($ratings->allow)) {
                     echo '&nbsp;';
-                    forum_print_rating_menu($post->id, $USER->id, $ratings->scale);
+                    forum_print_rating_menu($post->id, $USER->id, $ratings->scale, $myrating);
                     $ratingsmenuused = true;
                 }
 
             } else if ($mypost) {
-                forum_print_ratings_mean($post->id, $ratings->scale, $post->aggtype, true);
+                forum_print_ratings($post->id, $ratings->scale, $forum->assessed, true, $allratings);
 
             } else if (!empty($ratings->allow) ) {
-                forum_print_rating_menu($post->id, $USER->id, $ratings->scale);
+                forum_print_rating_menu($post->id, $USER->id, $ratings->scale, $myrating);
                 $ratingsmenuused = true;
             }
         }
@@ -2577,8 +2624,8 @@
     }
     echo '</td></tr></table>'."\n\n";
 
-    if ($istracked && !$CFG->forum_usermarksread && !empty($post->forum)) {
-        forum_tp_mark_post_read($USER->id, $post, $post->forum);
+    if ($istracked && !$CFG->forum_usermarksread) {
+        forum_tp_mark_post_read($USER->id, $post, $forum->id);
     }
 
     return $ratingsmenuused;
@@ -2772,29 +2819,29 @@
  * Forumid prevents the double lookup of the forumid in discussion to determine the aggregate type
  * Scale is an array of ratings
  */
-function forum_print_ratings_mean($postid, $scale, $aggregatetype, $link=true) {
+function forum_print_ratings($postid, $scale, $aggregatetype, $link=true, $ratings=null) {
 
     $strratings = '';
 
     switch ($aggregatetype) {
         case FORUM_AGGREGATE_AVG :
-            $agg        = forum_get_ratings_mean($postid, $scale);
+            $agg        = forum_get_ratings_mean($postid, $scale, $ratings);
             $strratings = get_string("aggregateavg", "forum");
             break;
         case FORUM_AGGREGATE_COUNT :
-            $agg        = forum_get_ratings_count($postid, $scale);
+            $agg        = forum_get_ratings_count($postid, $scale, $ratings);
             $strratings = get_string("aggregatecount", "forum");
             break;
         case FORUM_AGGREGATE_MAX :
-            $agg        = forum_get_ratings_max($postid, $scale);
+            $agg        = forum_get_ratings_max($postid, $scale, $ratings);
             $strratings = get_string("aggregatemax", "forum");
             break;
         case FORUM_AGGREGATE_MIN :
-            $agg        = forum_get_ratings_min($postid, $scale);
+            $agg        = forum_get_ratings_min($postid, $scale, $ratings);
             $strratings = get_string("aggregatemin", "forum");
             break;
         case FORUM_AGGREGATE_SUM :
-            $agg        = forum_get_ratings_sum($postid, $scale);
+            $agg        = forum_get_ratings_sum($postid, $scale, $ratings);
             $strratings = get_string("aggregatesum", "forum");
             break;
     }
@@ -2823,7 +2870,7 @@
  */
 function forum_get_ratings_mean($postid, $scale, $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -2838,7 +2885,8 @@
         return "";
 
     } else if ($count == 1) {
-        return $scale[$ratings[0]];
+        $rating = reset($ratings);
+        return $scale[$rating];
 
     } else {
         $total = 0;
@@ -2862,7 +2910,7 @@
  */
 function forum_get_ratings_count($postid, $scale, $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -2887,7 +2935,7 @@
  */
 function forum_get_ratings_max($postid, $scale, $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -2903,7 +2951,8 @@
         return "";
 
     } else if ($count == 1) { //this works for max
-        return $scale[$ratings[0]];
+        $rating = reset($ratings);
+        return $scale[$rating];
 
     } else {
 
@@ -2922,7 +2971,7 @@
  */
 function forum_get_ratings_min($postid, $scale,  $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -2938,7 +2987,8 @@
         return "";
 
     } else if ($count == 1) {
-        return $scale[$ratings[0]]; //this works for min
+        $rating = reset($ratings);
+        return $scale[$rating]; //this works for min
 
     } else {
 
@@ -2958,7 +3008,7 @@
  */
 function forum_get_ratings_sum($postid, $scale, $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -2974,7 +3024,8 @@
         return "";
 
     } else if ($count == 1) { //this works for max.
-        return $scale[$ratings[0]];
+        $rating = reset($ratings);
+        return $scale[$rating];
 
     } else {
         $total = 0;
@@ -2999,7 +3050,7 @@
  */
 function forum_get_ratings_summary($postid, $scale, $ratings=NULL) {
 
-    if (!$ratings) {
+    if (is_null($ratings)) {
         $ratings = array();
         if ($rates = get_records("forum_ratings", "post", $postid)) {
             foreach ($rates as $rate) {
@@ -3037,19 +3088,23 @@
  * If the post has already been - set that value.
  * Scale is an array of ratings
  */
-function forum_print_rating_menu($postid, $userid, $scale) {
+function forum_print_rating_menu($postid, $userid, $scale, $myrating=NULL) {
 
     static $strrate;
 
-    if (!$rating = get_record("forum_ratings", "userid", $userid, "post", $postid)) {
-        $rating->rating = FORUM_UNSET_POST_RATING;
+    if (is_null($myrating)) {
+        if (!$rating = get_record("forum_ratings", "userid", $userid, "post", $postid)) {
+            $myrating = FORUM_UNSET_POST_RATING;
+        } else {
+            $myrating = $rating->rating;
+        }
     }
 
     if (empty($strrate)) {
         $strrate = get_string("rate", "forum");
     }
     $scale = array(FORUM_UNSET_POST_RATING => $strrate.'...') + $scale;
-    choose_from_menu($scale, $postid, $rating->rating, '');
+    choose_from_menu($scale, $postid, $myrating, '');
 }
 
 /**
@@ -3061,12 +3116,10 @@
  * @param $forumtype - optional
  */
 function forum_print_mode_form($id, $mode, $forumtype='') {
-    global $FORUM_LAYOUT_MODES;
-
     if ($forumtype == 'single') {
-        popup_form("view.php?f=$id&amp;mode=", $FORUM_LAYOUT_MODES, "mode", $mode, "");
+        popup_form("view.php?f=$id&amp;mode=", forum_get_layout_modes(), "mode", $mode, "");
     } else {
-        popup_form("discuss.php?d=$id&amp;mode=", $FORUM_LAYOUT_MODES, "mode", $mode, "");
+        popup_form("discuss.php?d=$id&amp;mode=", forum_get_layout_modes(), "mode", $mode, "");
     }
 }
 
@@ -3132,7 +3185,20 @@
 function forum_file_area_name($post) {
     global $CFG;
 
-    return "$post->course/$CFG->moddata/forum/$post->forum/$post->id";
+    if (!isset($post->forum)) {
+        debugging('missing forum');
+        if (!$discussion = get_record('forum_discussions', 'id', $post->discussion)) {
+            return false;
+        }
+        if (!$forum = get_record('forum', 'id', $discussion->forum)) {
+            return false;
+        }
+        $forumid = $forum->id;
+    } else {
+    	$forumid = $post->forum;
+    }
+
+    return "$post->course/$CFG->moddata/forum/$forumid/$post->id";
 }
 
 /**
@@ -3746,9 +3812,10 @@
  */
 function forum_user_can_post_discussion($forum, $currentgroup=-1, $groupmode=-1, $cm=NULL, $context=NULL) {
 // $forum is an object
-    global $USER, $SESSION;
+    global $USER, $SESSION, $COURSE;
 
     if (!$cm) {
+        debugging('missing cm');
         if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) {
             error('Course Module ID was incorrect');
         }
@@ -3762,9 +3829,6 @@
     }
 
     if ($groupmode == -1) {
-        if (!$course = get_record('course', 'id', $cm->course)) {
-            error('Can not find course');
-        }
         $groupmode = groups_get_activity_groupmode($cm);
     }
 
@@ -3811,6 +3875,7 @@
 
     if (!$context) {
         if (!$cm) {
+            debugging('missing cm');
             if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) {
                 error('Course Module ID was incorrect');
             }
@@ -3873,11 +3938,13 @@
 
     // retrieve objects (yuk)
     if (is_numeric($forum)) {
+        debugging('missing full forum');
         if (!$forum = get_record('forum','id',$forum)) {
             return false;
         }
     }
     if (is_numeric($discussion)) {
+        debugging('missing full discussion');
         if (!$discussion = get_record('forum_discussions','id',$discussion)) {
             return false;
         }
@@ -3904,17 +3971,20 @@
 
     // retrieve objects (yuk)
     if (is_numeric($forum)) {
+        debugging('missinf full forum');
         if (!$forum = get_record('forum','id',$forum)) {
             return false;
         }
     }
 
     if (is_numeric($discussion)) {
+        debugging('missinf full discussion');
         if (!$discussion = get_record('forum_discussions','id',$discussion)) {
             return false;
         }
     }
     if (is_numeric($post)) {
+        debugging('missinf full post');
         if (!$post = get_record('forum_posts','id',$post)) {
             return false;
         }
@@ -3924,6 +3994,7 @@
     }
 
     if (!$cm) {
+        debugging('missing cm');
         if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $forum->course)) {
             error('Course Module ID was incorrect');
         }
@@ -3933,16 +4004,27 @@
         $user = $USER;
     }
 
-    $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-
-    if (!has_capability('mod/forum:viewdiscussion', $modcontext, $user->id)) {
-        return false;
+    if (isset($cm->cache->caps['mod/forum:viewdiscussion'])) {
+        if (!$cm->cache->caps['mod/forum:viewdiscussion']) {
+            return false;
+        }
+    } else {
+        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+        if (!has_capability('mod/forum:viewdiscussion', $modcontext, $user->id)) {
+            return false;
+        }
     }
-    
-    if (!groups_course_module_visible($cm, $user->id)) {
-        return false;
+
+    if (isset($cm->uservisible)) {
+        if (!$cm->uservisible) {
+            return false;
+        }
+    } else {
+        if (!coursemodule_visible_for_user($cm, $user->id)) {
+            return false;
+        }
     }
-    
+
     if ($forum->type == 'qanda') {
         $firstpost = forum_get_firstpost_from_discussion($discussion->id);
 
@@ -4063,7 +4145,7 @@
 
     $replies = forum_count_discussion_replies($forum->id);
 
-    $canreply = forum_user_can_post($forum);
+    $canreply = forum_user_can_post($forum, null, $cm, $context);
     $canviewparticipants = has_capability('moodle/course:viewparticipants',$context); 
 
     $discussioncount = 0;
@@ -4170,7 +4252,7 @@
 
                 $discussion->forum = $forum->id;
 
-                forum_print_post($discussion, $course->id, $ownpost, $reply=0, $link, $assessed=false);
+                forum_print_post($discussion, $discussion, $forum, $cm, $course, $ownpost, 0, $link, false);
             break;
         }
     }
@@ -4195,7 +4277,7 @@
 /**
  * 
  */
-function forum_print_discussion($course, $forum, $discussion, $post, $mode, $canreply=NULL, $canrate=false) {
+function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode, $canreply=NULL, $canrate=false) {
 
     global $USER, $CFG;
 
@@ -4205,15 +4287,46 @@
         $ownpost = false;
     }
     if ($canreply === NULL) {
-        $reply = forum_user_can_post($forum);
+        $reply = forum_user_can_post($forum, null, $cm);
     } else {
         $reply = $canreply;
     }
 
+    // $cm holds general cache for forum functions
+    $cm->cache = new object();
+    $cm->cache->groups      = groups_get_all_groups($course->id, 0, $cm->groupingid);
+    $cm->cache->usersgroups = array();
+
+    $posters = array();
+
+    // preload all posts - TODO: improve...
+    if ($mode == FORUM_MODE_FLATNEWEST) {
+        $sort = "created DESC";
+    } else {
+        $sort = "created ASC";
+    }
+
+    $posts = forum_get_all_discussion_posts($discussion->id, $sort);
+
+    foreach ($posts as $pid=>$p) {
+        $posters[$p->userid] = $p->userid;
+    }
+
+    // preload all groups of ppl that posted in this discussion
+    if ($postersgroups = groups_get_all_groups($course->id, $posters, $cm->groupingid, 'g.id, gm.userid')) {
+        foreach($postersgroups as $pg) {
+            if (!isset($cm->cache->usersgroups[$pg->userid])) {
+                $cm->cache->usersgroups[$pg->userid] = array();
+            }
+            $cm->cache->usersgroups[$pg->userid][$pg->id] = $pg->id;
+        }
+        unset($postersgroups);
+    }
+
     $ratings = NULL;
     $ratingsmenuused = false;
     $ratingsformused = false;
-    if ($forum->assessed and !empty($USER->id)) {
+    if ($forum->assessed and isloggedin()) {
         if ($ratings->scale = make_grades_menu($forum->scale)) {
             $ratings->assesstimestart = $forum->assesstimestart;
             $ratings->assesstimefinish = $forum->assesstimefinish;
@@ -4225,9 +4338,26 @@
                 echo '<input type="hidden" name="forumid" value="'.$forum->id.'" />';
                 $ratingsformused = true;
             }
+
+            // preload all ratings - one query only and minimal memory
+            $cm->cache->ratings = array(); 
+            $cm->cache->myratings = array(); 
+            if ($postratings = forum_get_all_discussion_ratings($discussion)) {
+                foreach ($postratings as $pr) {
+                    if (!isset($cm->cache->ratings[$pr->postid])) {
+                        $cm->cache->ratings[$pr->postid] = array();
+                    }
+                    $cm->cache->ratings[$pr->postid][$pr->id] = $pr->rating;
+                    if ($pr->userid == $USER->id) {
+                        $cm->cache->myratings[$pr->postid] = $pr->rating;
+                    }
+                }
+                unset($postratings);
+            }
         }
     }
 
+
     $post->forum = $forum->id;   // Add the forum id to the post object, later used by forum_print_post
     $post->forumtype = $forum->type;
 
@@ -4244,18 +4374,7 @@
         $user_read_array = array();
     }
 
-    if (empty($post->modcontext)) {   // Have to generate it, which is expensive!  Should always be set.
-        if (empty($post->forum)) {
-            $discussion = get_record('forum_discussions', 'id', $post->discussion);
-            $post->forum = $discussion->forum;
-        }
-        if (!$cm = get_coursemodule_from_instance('forum', $post->forum)) {
-            error('Course Module ID was incorrect');
-        }
-        $post->modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
-    }
-
-    if (forum_print_post($post, $course->id, $ownpost, $reply, $link=false, $ratings,
+    if (forum_print_post($post, $discussion, $forum, $cm, $course, $ownpost, $reply, false, $ratings,
                          '', '', (!$forumtracked || isset($user_read_array[$post->id]) || forum_tp_is_post_old($post)))) {
         $ratingsmenuused = true;
     }
@@ -4264,22 +4383,19 @@
         case FORUM_MODE_FLATOLDEST :
         case FORUM_MODE_FLATNEWEST :
         default:
-            if (forum_print_posts_flat($post->discussion, $course->id, $mode, $ratings, $reply,
-                                       $user_read_array, $post->forum, $post->modcontext)) {
+            if (forum_print_posts_flat($course, $cm, $forum, $discussion, $post, $mode, $ratings, $reply, $user_read_array, $posts)) {
                 $ratingsmenuused = true;
             }
             break;
 
         case FORUM_MODE_THREADED :
-            if (forum_print_posts_threaded($post->id, $course->id, 0, $ratings, $reply,
-                                           $user_read_array, $post->forum, $post->modcontext)) {
+            if (forum_print_posts_threaded($course, $cm, $forum, $discussion, $post, 0, $ratings, $reply, $user_read_array, $posts)) {
                 $ratingsmenuused = true;
             }
             break;
 
         case FORUM_MODE_NESTED :
-            if (forum_print_posts_nested($post->id, $course->id, $ratings, $reply,
-                                         $user_read_array, $post->forum, $post->modcontext)) {
+            if (forum_print_posts_nested($course, $cm, $forum, $discussion, $post, $ratings, $reply, $user_read_array, $posts)) {
                 $ratingsmenuused = true;
             }
             break;
@@ -4306,29 +4422,28 @@
 /**
  * 
  */
-function forum_print_posts_flat($discussion, $courseid, $direction, $ratings, $reply, &$user_read_array, $forumid=0, $modcontext=NULL) {
+function forum_print_posts_flat($course, &$cm, $forum, $discussion, $post, $mode, $ratings, $reply, $user_read_array, $posts) {
     global $USER, $CFG;
 
     $link  = false;
     $ratingsmenuused = false;
 
-    if ($direction < 0) {
+    if ($mode == FORUM_MODE_FLATNEWEST) {
         $sort = "ORDER BY created DESC";
     } else {
         $sort = "ORDER BY created ASC";
     }
 
-    if ($posts = forum_get_discussion_posts($discussion, $sort, $forumid)) {
-        foreach ($posts as $post) {
-
-            $post->subject = format_string($post->subject);
-            $post->modcontext = $modcontext;
+    foreach ($posts as $post) {
+        if (!$post->parent) {
+            continue;
+        }
+        $post->subject = format_string($post->subject);
+        $ownpost = ($USER->id == $post->userid);
 
-            $ownpost = ($USER->id == $post->userid);
-            if (forum_print_post($post, $courseid, $ownpost, $reply, $link, $ratings,
-                                 '', '', (isset($user_read_array[$post->id]) || forum_tp_is_post_old($post)))) {
-                $ratingsmenuused = true;
-            }
+        if (forum_print_post($post, $discussion, $forum, $cm, $course, $ownpost, $reply, $link, $ratings,
+                             '', '', (isset($user_read_array[$post->id]) || forum_tp_is_post_old($post)))) {
+            $ratingsmenuused = true;
         }
     }
 
@@ -4339,16 +4454,18 @@
 /**
  * TODO document
  */
-function forum_print_posts_threaded($parent, $courseid, $depth, $ratings, $reply, &$user_read_array, $forumid=0, $modcontext=NULL) {
+function forum_print_posts_threaded($course, &$cm, $forum, $discussion, $parent, $depth, $ratings, $reply, $user_read_array, $posts) {
     global $USER, $CFG;
 
     $link  = false;
     $ratingsmenuused = false;
 
-    $istracking = forum_tp_can_track_forums($forumid) && forum_tp_is_tracked($forumid);
+    $istracking = forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum);
 
-    if ($posts = forum_get_child_posts($parent, $forumid)) {
+    if (!empty($posts[$parent->id]->children)) {
+        $posts = $posts[$parent->id]->children;
 
+        $modcontext       = get_context_instance(CONTEXT_MODULE, $cm->id);
         $canviewfullnames = has_capability('moodle/site:viewfullnames', $modcontext);
 
         foreach ($posts as $post) {
@@ -4357,14 +4474,13 @@
             if ($depth > 0) {
                 $ownpost = ($USER->id == $post->userid);
                 $post->subject = format_string($post->subject);
-                $post->modcontext = $modcontext;
 
-                if (forum_print_post($post, $courseid, $ownpost, $reply, $link, $ratings,
+                if (forum_print_post($post, $discussion, $forum, $cm, $course, $ownpost, $reply, $link, $ratings,
                                      '', '', (isset($user_read_array[$post->id]) || forum_tp_is_post_old($post)))) {
                     $ratingsmenuused = true;
                 }
             } else {
-                if (!forum_user_can_see_post($post->forum,$post->discussion,$post)) {
+                if (!forum_user_can_see_post($forum, $discussion, $post, NULL, $cm)) {
                     continue;
                 }
                 $by = new object();
@@ -4386,8 +4502,7 @@
                 echo "</span>";
             }
 
-            if (forum_print_posts_threaded($post->id, $courseid, $depth-1, $ratings, $reply,
-                                           $user_read_array, $forumid, $modcontext)) {
+            if (forum_print_posts_threaded($course, $cm, $forum, $discussion, $post, $depth-1, $ratings, $reply, $user_read_array, $posts)) {
                 $ratingsmenuused = true;
             }
             echo "</div>\n";
@@ -4399,13 +4514,15 @@
 /**
  * 
  */
-function forum_print_posts_nested($parent, $courseid, $ratings, $reply, &$user_read_array, $forumid=0, $modcontext=NULL) {
+function forum_print_posts_nested($course, &$cm, $forum, $discussion, $parent, $ratings, $reply, $user_read_array, $posts) {
     global $USER, $CFG;
 
     $link  = false;
     $ratingsmenuused = false;
 
-    if ($posts = forum_get_child_posts($parent, $forumid)) {
+    if (!empty($posts[$parent->id]->children)) {
+        $posts = $posts[$parent->id]->children;
+
         foreach ($posts as $post) {
 
             echo '<div class="indent">';
@@ -4417,13 +4534,11 @@
 
             $post->subject = format_string($post->subject);
 
-            $post->modcontext = $modcontext;
-
-            if (forum_print_post($post, $courseid, $ownpost, $reply, $link, $ratings,
+            if (forum_print_post($post, $discussion, $forum, $cm, $course, $ownpost, $reply, $link, $ratings,
                                  '', '', (isset($user_read_array[$post->id]) || forum_tp_is_post_old($post)))) {
                 $ratingsmenuused = true;
             }
-            if (forum_print_posts_nested($post->id, $courseid, $ratings, $reply, $user_read_array, $forumid, $modcontext)) {
+            if (forum_print_posts_nested($course, $cm, $forum, $discussion, $post, $ratings, $reply, $user_read_array, $posts)) {
                 $ratingsmenuused = true;
             }
             echo "</div>\n";
@@ -5054,7 +5169,7 @@
 /**
  * 
  */
-function forum_tp_is_post_read($userid, &$post) {
+function forum_tp_is_post_read($userid, $post) {
     return (forum_tp_is_post_old($post) ||
             (get_record('forum_read', 'userid', $userid, 'postid', $post->id) !== false));
 }
@@ -5062,7 +5177,7 @@
 /**
  * 
  */
-function forum_tp_is_post_old(&$post, $time=null) {
+function forum_tp_is_post_old($post, $time=null) {
     global $CFG;
 
     if (is_null($time)) $time = time();
@@ -5516,7 +5631,7 @@
  * @return array status array
  */
 function forum_reset_userdata($data) {
-    global $CFG, $FORUM_TYPES_ALL;
+    global $CFG;
     require_once($CFG->libdir.'/filelib.php');
 
     $componentstr = get_string('modulenameplural', 'forum');
@@ -5533,12 +5648,13 @@
         $removeposts = true;
         $typesql     = "";
         $types       = array();
+        $forum_types_all = forum_get_types_all();
         foreach ($data->reset_forum_types as $type) {
-            if (!array_key_exists($type, $FORUM_TYPES_ALL)) {
+            if (!array_key_exists($type, $forum_types_all)) {
                 continue;
             }
             $typesql .= " AND f.type='$type'";
-            $types[] = $FORUM_TYPES_ALL[$type];
+            $types[] = $forum_types_all[$type];
         }
         $typesstr = get_string('resetforums', 'forum').': '.implode(', ', $types);
 
@@ -5635,13 +5751,11 @@
  * @param $mform form passed by reference
  */
 function forum_reset_course_form_definition(&$mform) {
-    global $FORUM_TYPES_ALL;
-
     $mform->addElement('header', 'forumheader', get_string('modulenameplural', 'forum'));
 
     $mform->addElement('checkbox', 'reset_forum_all', get_string('resetforumsall','forum'));
 
-    $mform->addElement('select', 'reset_forum_types', get_string('resetforums', 'forum'), $FORUM_TYPES_ALL, array('multiple' => 'multiple'));
+    $mform->addElement('select', 'reset_forum_types', get_string('resetforums', 'forum'), forum_get_types_all(), array('multiple' => 'multiple'));
     $mform->setAdvanced('reset_forum_types');
     $mform->disabledIf('reset_forum_types', 'reset_forum_all', 'checked');
 
@@ -5892,17 +6006,53 @@
  * Returns array of forum aggregate types 
  */
 function forum_get_aggregate_types() { 
+    return array (FORUM_AGGREGATE_NONE  => get_string('aggregatenone', 'forum'),
+                  FORUM_AGGREGATE_AVG   => get_string('aggregateavg', 'forum'),
+                  FORUM_AGGREGATE_COUNT => get_string('aggregatecount', 'forum'),
+                  FORUM_AGGREGATE_MAX   => get_string('aggregatemax', 'forum'),
+                  FORUM_AGGREGATE_MIN   => get_string('aggregatemin', 'forum'),
+                  FORUM_AGGREGATE_SUM   => get_string('aggregatesum', 'forum'));
+}
 
-    $forum_aggregate_types   = array (
-        FORUM_AGGREGATE_NONE => get_string('aggregatenone', 'forum'),
-        FORUM_AGGREGATE_AVG    => get_string('aggregateavg', 'forum'),
-        FORUM_AGGREGATE_COUNT   => get_string('aggregatecount', 'forum'),
-        FORUM_AGGREGATE_MAX     => get_string('aggregatemax', 'forum'),
-        FORUM_AGGREGATE_MIN      => get_string('aggregatemin', 'forum'),
-        FORUM_AGGREGATE_SUM      => get_string('aggregatesum', 'forum'));
+/**
+ * Returns array of forum layout modes 
+ */
+function forum_get_layout_modes() { 
+    return array (FORUM_MODE_FLATOLDEST => get_string('modeflatoldestfirst', 'forum'),
+                  FORUM_MODE_FLATNEWEST => get_string('modeflatnewestfirst', 'forum'),
+                  FORUM_MODE_THREADED   => get_string('modethreaded', 'forum'),
+                  FORUM_MODE_NESTED     => get_string('modenested', 'forum'));
+}
 
-return $forum_aggregate_types;
+/**
+ * Returns array of forum types 
+ */
+function forum_get_types() { 
+    return array ('general'  => get_string('generalforum', 'forum'),
+                  'eachuser' => get_string('eachuserforum', 'forum'),
+                  'single'   => get_string('singleforum', 'forum'),
+                  'qanda'    => get_string('qandaforum', 'forum'));
+}
+
+/**
+ * Returns array of all forum layout modes 
+ */
+function forum_get_types_all() { 
+    return array ('news'     => get_string('namenews','forum'),
+                  'social'   => get_string('namesocial','forum'),
+                  'general'  => get_string('generalforum', 'forum'),
+                  'eachuser' => get_string('eachuserforum', 'forum'),
+                  'single'   => get_string('singleforum', 'forum'),
+                  'qanda'    => get_string('qandaforum', 'forum'));
+}
 
+/**
+ * Returns array of forum open modes 
+ */
+function forum_get_open_modes() {
+    return array ('2' => get_string('openmode2', 'forum'),
+                  '1' => get_string('openmode1', 'forum'),
+                  '0' => get_string('openmode0', 'forum') );
 }
 
 ?>
Index: mod/forum/search.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/search.php,v
retrieving revision 1.86.2.3
diff -u -r1.86.2.3 search.php
--- mod/forum/search.php	24 Jan 2008 20:29:34 -0000	1.86.2.3
+++ mod/forum/search.php	12 Feb 2008 11:00:08 -0000
@@ -188,6 +188,10 @@
             error("Could not find forum $discussion->forum");
         }
 
+        if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
+            error('Course Module ID was incorrect');
+        }
+
         $post->subject = highlight($strippedsearch, $post->subject);
         $discussion->name = highlight($strippedsearch, $discussion->name);
 
@@ -228,7 +232,7 @@
         $fulllink = "<a href=\"discuss.php?d=$post->discussion#p$post->id\">".get_string("postincontext", "forum")."</a>";
 
         // Now pring the post.
-        forum_print_post($post, $course->id, false, false, false, false,
+        forum_print_post($post, $discussion, $forum, $cm, $cours, false, false, false, false,
                 $fulllink, $strippedsearch, -99, false);
     }
 
Index: mod/forum/post.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v
retrieving revision 1.154.2.5
diff -u -r1.154.2.5 post.php
--- mod/forum/post.php	30 Jan 2008 21:00:00 -0000	1.154.2.5
+++ mod/forum/post.php	12 Feb 2008 11:00:06 -0000
@@ -74,8 +74,13 @@
         if (! $course = get_record("course", "id", $forum->course)) {
             error("The course number was incorrect ($forum->course)");
         }
+        if (! $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
+            error("Incorrect course module");
+        }
+
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
-        if (! forum_user_can_post_discussion($forum)) {
+
+        if (! forum_user_can_post_discussion($forum, -1, -1, $cm)) {
             if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
                 $SESSION->wantsurl = $FULLME;
                 $SESSION->enrolcancel = $_SERVER['HTTP_REFERER'];
@@ -85,10 +90,8 @@
             }
         }
 
-        if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
-            if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
-                error(get_string("activityiscurrentlyhidden"));
-            }
+        if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
+            error(get_string("activityiscurrentlyhidden"));
         }
 
         if (isset($_SERVER["HTTP_REFERER"])) {
@@ -140,7 +143,7 @@
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $modcontext    = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-        if (! forum_user_can_post($forum)) {
+        if (! forum_user_can_post($forum, null, $cm, $modcontext)) {
             if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) {  // User is a guest here!
                 $SESSION->wantsurl = $FULLME;
                 $SESSION->enrolcancel = $_SERVER['HTTP_REFERER'];
@@ -313,21 +316,22 @@
                              "post.php?delete=$delete&amp;confirm=$delete",
                              $CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'#p'.$post->id);
 
-                forum_print_post($post, $course->id, $ownpost=false, $reply=false, $link=false);
+                forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
                 if (empty($post->edit)) {
                     if (forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum)) {
                         $user_read_array = forum_tp_get_discussion_read_records($USER->id, $discussion->id);
                     } else {
                         $user_read_array = array();
                     }
-                    forum_print_posts_nested($post->id, $course->id, false, false, $user_read_array, $forum->id);
+                    $posts = forum_get_all_discussion_posts($discussion->id, "created ASC");
+                    forum_print_posts_nested($course, $cm, $forum, $discussion, $post, false, false, $user_read_array, $posts);
                 }
             } else {
                 print_header();
                 notice_yesno(get_string("deletesure", "forum", $replycount),
                              "post.php?delete=$delete&amp;confirm=$delete",
                              $CFG->wwwroot.'/mod/forum/discuss.php?d='.$post->discussion.'#p'.$post->id);
-                forum_print_post($post, $forum->course, $ownpost=false, $reply=false, $link=false);
+                forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
             }
 
         }
@@ -414,7 +418,7 @@
 
             include('prune.html');
 
-            forum_print_post($post, $forum->course, $ownpost=false, $reply=false, $link=false);
+            forum_print_post($post, $discussion, $forum, $cm, $course, false, false, false);
             echo '</center>';
         }
         print_footer($course);
@@ -657,10 +661,10 @@
                   $navigation, $mform_post->focus($forcefocus), "", true, "", navmenu($course, $cm));
    
 // checkup
-    if (!empty($parent) && !forum_user_can_see_post($forum, $discussion, $post)) {
+    if (!empty($parent) && !forum_user_can_see_post($forum, $discussion, $post, null, $cm)) {
         error("You cannot reply to this post");
     }
-    if (empty($parent) && empty($edit) && !forum_user_can_post_discussion($forum)) {
+    if (empty($parent) && empty($edit) && !forum_user_can_post_discussion($forum, -1, -1, $cm, $modcontext)) {
         error("You cannot start a new discussion in this forum");
     }
 
@@ -674,7 +678,11 @@
     forum_check_throttling($forum);
 
     if (!empty($parent)) {
-        forum_print_post($parent, $course->id, $ownpost=false, $reply=false, $link=false);
+        if (! $discussion = get_record('forum_discussions', 'id', $parent->discussion)) {
+            error('This post is not part of a discussion!');
+        }
+
+        forum_print_post($parent, $discussion, $forum, $cm, $course, false, false, false);
         if (empty($post->edit)) {
             if (forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum)) {
                 $user_read_array = forum_tp_get_discussion_read_records($USER->id, $discussion->id);
@@ -682,7 +690,8 @@
                 $user_read_array = array();
             }
             if ($forum->type != 'qanda' || forum_user_can_see_discussion($forum, $discussion, $modcontext)) {
-                forum_print_posts_threaded($parent->id, $course->id, 0, false, false, $user_read_array, $discussion->forum, $modcontext);
+                $posts = forum_get_all_discussion_posts($discussion->id, "created ASC");
+                forum_print_posts_threaded($course, $cm, $forum, $discussion, $parent, 0, false, false, $user_read_array, $posts);
             }
         }
         $heading = get_string("yourreply", "forum");
Index: mod/chat/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/chat/lib.php,v
retrieving revision 1.99.2.9
diff -u -r1.99.2.9 lib.php
--- mod/chat/lib.php	24 Jan 2008 20:29:32 -0000	1.99.2.9
+++ mod/chat/lib.php	12 Feb 2008 10:59:56 -0000
@@ -386,7 +386,7 @@
         $groupingjoin = '';
     }
 
-    return get_records_sql("SELECT DISTINCT u.id, u.firstname, u.lastname, u.picture, c.lastmessageping, c.firstping
+    return get_records_sql("SELECT DISTINCT u.id, u.firstname, u.lastname, u.picture, c.lastmessageping, c.firstping, u.imagealt
                               FROM {$CFG->prefix}chat_users c
                                 INNER JOIN {$CFG->prefix}user u ON u.id = c.userid
                                 $groupingjoin
Index: mod/chat/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/chat/view.php,v
retrieving revision 1.61.2.3
diff -u -r1.61.2.3 view.php
--- mod/chat/view.php	26 Dec 2007 20:18:14 -0000	1.61.2.3
+++ mod/chat/view.php	12 Feb 2008 10:59:57 -0000
@@ -178,7 +178,7 @@
                         $lastping = $timenow - $chatuser->lastmessageping;
                         echo '<tr><td class="chatuserimage">';
                         echo "<a href=\"$CFG->wwwroot/user/view.php?id=$chatuser->id&amp;course=$chat->course\">";
-                        print_user_picture($chatuser->id, 0, $chatuser->picture, false, false, false);
+                        print_user_picture($chatuser, 0, $chatuser->picture, false, false, false);
                         echo '</a></td><td class="chatuserdetails">';
                         echo '<p>';
                         echo fullname($chatuser).'<br />';
Index: mod/chat/report.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/chat/report.php,v
retrieving revision 1.37.2.1
diff -u -r1.37.2.1 report.php
--- mod/chat/report.php	12 Oct 2007 16:09:37 -0000	1.37.2.1
+++ mod/chat/report.php	12 Feb 2008 10:59:57 -0000
@@ -172,7 +172,7 @@
                 arsort($sessionusers);
                 foreach ($sessionusers as $sessionuser => $usermessagecount) {
                     if ($user = get_record('user', 'id', $sessionuser)) {
-                        print_user_picture($user->id, $course->id, $user->picture);
+                        print_user_picture($user, $course->id, $user->picture);
                         echo '&nbsp;'.fullname($user, true); // XXX TODO  use capability instead of true
                         echo "&nbsp;($usermessagecount)<br />";
                     }
Index: user/editadvanced_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/editadvanced_form.php,v
retrieving revision 1.14.2.1
diff -u -r1.14.2.1 editadvanced_form.php
--- user/editadvanced_form.php	4 Dec 2007 23:52:09 -0000	1.14.2.1
+++ user/editadvanced_form.php	12 Feb 2008 11:00:13 -0000
@@ -94,7 +94,7 @@
         if (!empty($CFG->gdversion)) {
             $image_el =& $mform->getElement('currentpicture');
             if ($user and $user->picture) {
-                $image_el->setValue(print_user_picture($user->id, SITEID, $user->picture, 64, true, false, '', true));
+                $image_el->setValue(print_user_picture($user, SITEID, $user->picture, 64, true, false, '', true));
             } else {
                 $image_el->setValue(get_string('none'));
             }
Index: user/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/view.php,v
retrieving revision 1.168.2.5
diff -u -r1.168.2.5 view.php
--- user/view.php	5 Feb 2008 12:58:59 -0000	1.168.2.5
+++ user/view.php	12 Feb 2008 11:00:13 -0000
@@ -208,7 +208,7 @@
     echo '<table width="80%" class="userinfobox" summary="">';
     echo '<tr>';
     echo '<td class="side">';
-    print_user_picture($user->id, $course->id, $user->picture, true, false, false);
+    print_user_picture($user, $course->id, $user->picture, true, false, false);
     echo '</td><td class="content">';
 
     // Print the description
Index: user/edit_form.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/edit_form.php,v
retrieving revision 1.24.2.1
diff -u -r1.24.2.1 edit_form.php
--- user/edit_form.php	23 Nov 2007 22:12:36 -0000	1.24.2.1
+++ user/edit_form.php	12 Feb 2008 11:00:13 -0000
@@ -60,7 +60,7 @@
             if (!empty($CFG->gdversion)) {
                 $image_el =& $mform->getElement('currentpicture');
                 if ($user and $user->picture) {
-                    $image_el->setValue(print_user_picture($user->id, SITEID, $user->picture, 64,true,false,'',true));
+                    $image_el->setValue(print_user_picture($user, SITEID, $user->picture, 64,true,false,'',true));
                 } else {
                     $image_el->setValue(get_string('none'));
                 }
Index: blog/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v
retrieving revision 1.80.2.1
diff -u -r1.80.2.1 lib.php
--- blog/lib.php	6 Feb 2008 03:34:15 -0000	1.80.2.1
+++ blog/lib.php	12 Feb 2008 10:59:46 -0000
@@ -171,7 +171,7 @@
         echo '<table cellspacing="0" class="forumpost blogpost blog'.$template['publishstate'].'" width="100%">';
 
         echo '<tr class="header"><td class="picture left">';
-        print_user_picture($template['userid'], SITEID, $user->picture);
+        print_user_picture($user, SITEID, $user->picture);
         echo '</td>';
 
         echo '<td class="topic starter"><div class="subject">'.$template['title'].'</div><div class="author">';
Index: message/discussion.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/discussion.php,v
retrieving revision 1.15.2.1
diff -u -r1.15.2.1 discussion.php
--- message/discussion.php	21 Nov 2007 07:52:51 -0000	1.15.2.1
+++ message/discussion.php	12 Feb 2008 10:59:55 -0000
@@ -124,7 +124,7 @@
     print_header(get_string('discussion', 'message').': '.fullname($user), '', '', 'edit-message');
     echo '<div class="message-discussion-noframes">';
     echo '<div id="userinfo">';
-    echo print_user_picture($user->id, SITEID, $user->picture, 48, true, true, 'userwindow');
+    echo print_user_picture($user, SITEID, $user->picture, 48, true, true, 'userwindow');
     echo '<div class="name"><h1>'.$userfullname.'</h1></div>';
     echo '<div class="commands"><ul>';
     if ($contact = get_record('message_contacts', 'userid', $USER->id, 'contactid', $user->id)) {
Index: message/user.php
===================================================================
RCS file: /cvsroot/moodle/moodle/message/user.php,v
retrieving revision 1.29.2.2
diff -u -r1.29.2.2 user.php
--- message/user.php	14 Dec 2007 21:21:07 -0000	1.29.2.2
+++ message/user.php	12 Feb 2008 10:59:55 -0000
@@ -52,7 +52,7 @@
     print_header('','','','','',false,'','',false,'');
     echo '<table width="100%" cellpadding="0" cellspacing="0"><tr>';
     echo '<td width="100">';
-    echo print_user_picture($user->id, SITEID, $user->picture, true, true, true, 'userwindow').'</td>';
+    echo print_user_picture($user, SITEID, $user->picture, true, true, true, 'userwindow').'</td>';
     echo '<td valign="middle" align="center">';
 
     echo '<div class="name">'.fullname($user).'</div>';
Index: course/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/lib.php,v
retrieving revision 1.538.2.20
diff -u -r1.538.2.20 lib.php
--- course/lib.php	1 Feb 2008 14:09:28 -0000	1.538.2.20
+++ course/lib.php	12 Feb 2008 10:59:49 -0000
@@ -1074,6 +1074,16 @@
 
     $modlurals = array();
 
+    $cmids    = array();
+    $contexts = null;
+    foreach ($info as $mod) {
+        $cmids[$mod->cm] = $mod->cm;
+    }
+    if ($cmids) {
+        // preload all module contexts with one query
+        $contexts = get_context_instance(CONTEXT_MODULE, $cmids);
+    }
+
     foreach ($info as $mod) {
         // reconstruct minimalistic $cm
         $cm = new object();
@@ -1097,11 +1107,11 @@
         }
         $cm->modplural = $modlurals[$cm->modname];
 
-        if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id), $userid)) {
+        if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $contexts[$cm->id], $userid)) {
             $cm->uservisible = false;
 
         } else if (!empty($CFG->enablegroupings) and !empty($cm->groupmembersonly)
-                and !has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id), $userid)) {
+                and !has_capability('moodle/site:accessallgroups', $contexts[$cm->id], $userid)) {
             if (is_null($modinfo->groups)) {
                 $modinfo->groups = groups_get_user_groups($course->id, $userid);
             }
Index: mod/glossary/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/lib.php,v
retrieving revision 1.193.2.6
diff -u -r1.193.2.6 lib.php
--- mod/glossary/lib.php	24 Jan 2008 20:29:35 -0000	1.193.2.6
+++ mod/glossary/lib.php	12 Feb 2008 11:00:11 -0000
@@ -1563,7 +1563,7 @@
     echo '<table class="glossarycomment" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<td class="left picture">';
-    print_user_picture($user->id, $course->id, $user->picture);
+    print_user_picture($user, $course->id, $user->picture);
     echo '</td>';
     echo '<td class="entryheader">';
 
Index: mod/glossary/view.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/view.php,v
retrieving revision 1.128.2.6
diff -u -r1.128.2.6 view.php
--- mod/glossary/view.php	21 Jan 2008 13:39:51 -0000	1.128.2.6
+++ mod/glossary/view.php	12 Feb 2008 11:00:11 -0000
@@ -442,7 +442,7 @@
                         echo '<th align="left">';
 
                         $user = get_record("user","id",$entry->userid);
-                        print_user_picture($user->id, $course->id, $user->picture);
+                        print_user_picture($user, $course->id, $user->picture);
                         $pivottoshow = fullname($user, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
                     } else {
                         echo '<th >';
Index: lib/accesslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v
retrieving revision 1.421.2.48
diff -u -r1.421.2.48 accesslib.php
--- lib/accesslib.php	5 Feb 2008 17:18:10 -0000	1.421.2.48
+++ lib/accesslib.php	12 Feb 2008 10:59:54 -0000
@@ -2533,7 +2533,7 @@
  */
 function get_context_instance($contextlevel, $instance=0) {
 
-    global $context_cache, $context_cache_id;
+    global $context_cache, $context_cache_id, $CFG;
     static $allowed_contexts = array(CONTEXT_SYSTEM, CONTEXT_USER, CONTEXT_COURSECAT, CONTEXT_COURSE, CONTEXT_GROUP, CONTEXT_MODULE, CONTEXT_BLOCK);
 
     if ($contextlevel === 'clearcache') {
@@ -2556,30 +2556,79 @@
         error('Error: get_context_instance() called with incorrect context level "'.s($contextlevel).'"');
     }
 
-/// Check the cache
-    if (isset($context_cache[$contextlevel][$instance])) {  // Already cached
-        return $context_cache[$contextlevel][$instance];
+    if (!is_array($instance)) {
+    /// Check the cache
+        if (isset($context_cache[$contextlevel][$instance])) {  // Already cached
+            return $context_cache[$contextlevel][$instance];
+        }
+
+    /// Get it from the database, or create it
+        if (!$context = get_record('context', 'contextlevel', $contextlevel, 'instanceid', $instance)) {
+            $context = create_context($contextlevel, $instance);
+        }
+
+    /// Only add to cache if context isn't empty.
+        if (!empty($context)) {
+            $context_cache[$contextlevel][$instance] = $context;    // Cache it for later
+            $context_cache_id[$context->id]          = $context;    // Cache it for later
+        }
+
+        return $context;
     }
 
-/// Get it from the database, or create it
-    if (!$context = get_record('context', 'contextlevel', $contextlevel, 'instanceid', $instance)) {
-        $context = create_context($contextlevel, $instance);
+
+/// ok, somebody wants to load several contexts to save some db queries ;-)
+    $instances = $instance;
+    $result = array();
+
+    foreach ($instances as $key=>$instance) {
+    /// Check the cache first
+        if (isset($context_cache[$contextlevel][$instance])) {  // Already cached
+            $result[$instance] = $context_cache[$contextlevel][$instance];
+            unset($instances[$key]);
+            continue;
+        }
     }
 
-/// Only add to cache if context isn't empty.
-    if (!empty($context)) {
-        $context_cache[$contextlevel][$instance] = $context;    // Cache it for later
-        $context_cache_id[$context->id] = $context;      // Cache it for later
+    if ($instances) {
+        if (count($instances) > 1) {
+            $instanceids = implode(',', $instances);
+            $instanceids = "instanceid IN ($instanceids)";
+        } else {
+            $instance = reset($instances);
+            $instanceids = "instanceid = $instance";
+        }
+        
+        if (!$contexts = get_records_sql("SELECT instanceid, id, contextlevel, path, depth
+                                            FROM {$CFG->prefix}context
+                                           WHERE contextlevel=$contextlevel AND $instanceids")) {
+            $contexts = array();
+        }
+
+        foreach ($instances as $instance) {
+            if (isset($contexts[$instance])) {
+                $context = $contexts[$instance];
+            } else {
+                $context = create_context($contextlevel, $instance);
+            }
+
+            if (!empty($context)) {
+                $context_cache[$contextlevel][$instance] = $context;    // Cache it for later
+                $context_cache_id[$context->id] = $context;             // Cache it for later
+            }
+
+            $result[$instance] = $context;
+        }
     }
 
-    return $context;
+    return $result;
 }
 
 
 /**
  * Get a context instance as an object, from a given context id.
- * @param $id a context id.
- * @return object The context object.
+ * @param mixed $id a context id or array of ids.
+ * @return mixed object or array of the context object.
  */
 function get_context_instance_by_id($id) {
 
Index: lib/grouplib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/grouplib.php,v
retrieving revision 1.22.2.4
diff -u -r1.22.2.4 grouplib.php
--- lib/grouplib.php	24 Jan 2008 20:29:38 -0000	1.22.2.4
+++ lib/grouplib.php	12 Feb 2008 10:59:55 -0000
@@ -93,12 +93,12 @@
 /**
  * Gets array of all groups in a specified course.
  * @param int $courseid The id of the course.
- * @param int $userid optional user id, returns only groups of the user.
+ * @param mixed $userid optional user id or array of ids, returns only groups of the user.
  * @param int $groupingid optional returns only groups in the specified grouping.
  * @return array | false Returns an array of the group objects or false if no records
- * or an error occurred.
+ * or an error occurred. (userid field returned if array in $userid)
  */
-function groups_get_all_groups($courseid, $userid=0, $groupingid=0) {
+function groups_get_all_groups($courseid, $userid=0, $groupingid=0, $fields='g.*') {
     global $CFG;
 
     // groupings are ignored when not enabled
@@ -106,12 +106,18 @@
         $groupingid = 0;
     }
 
-    if (!empty($userid)) {
-        $userfrom  = ", {$CFG->prefix}groups_members gm";
-        $userwhere = "AND g.id = gm.groupid AND gm.userid = '$userid'";
-    } else {
+    if (empty($userid)) {
         $userfrom  = "";
         $userwhere = "";
+
+    } else if (is_array($userid)) {
+        $userids = implode(',', $userid);
+        $userfrom  = ", {$CFG->prefix}groups_members gm";
+        $userwhere = "AND g.id = gm.groupid AND gm.userid IN ($userids)";
+
+    } else {
+        $userfrom  = ", {$CFG->prefix}groups_members gm";
+        $userwhere = "AND g.id = gm.groupid AND gm.userid = '$userid'";
     }
 
     if (!empty($groupingid)) {
@@ -122,7 +128,7 @@
         $groupingwhere = "";
     }
 
-    return get_records_sql("SELECT g.*
+    return get_records_sql("SELECT $fields
                               FROM {$CFG->prefix}groups g $userfrom $groupingfrom
                              WHERE g.courseid = $courseid $userwhere $groupingwhere
                           ORDER BY name ASC");
Index: mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php,v
retrieving revision 1.17.4.1
diff -u -r1.17.4.1 fullwithauthor_format.php
--- mod/glossary/formats/fullwithauthor/fullwithauthor_format.php	9 Nov 2007 14:35:06 -0000	1.17.4.1
+++ mod/glossary/formats/fullwithauthor/fullwithauthor_format.php	12 Feb 2008 11:00:12 -0000
@@ -13,7 +13,7 @@
         echo '<tr valign="top">';
         
         echo '<td class="picture">';
-        print_user_picture($user->id, $course->id, $user->picture);
+        print_user_picture($user, $course->id, $user->picture);
         echo '</td>';
         
         echo '<th class="entryheader">';
Index: notes/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/notes/lib.php,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 lib.php
--- notes/lib.php	29 Nov 2007 14:40:54 -0000	1.7.2.1
+++ notes/lib.php	12 Feb 2008 11:00:12 -0000
@@ -172,7 +172,7 @@
     if($detail & NOTES_SHOW_HEAD) {
         echo '<div class="header">';
         echo '<div class="user">';
-        print_user_picture($user->id, $note->courseid, $user->picture);
+        print_user_picture($user, $note->courseid, $user->picture);
         echo fullname($user) . '</div>';
         echo '<div class="info">' .
             get_string('bynameondate', 'notes', $authoring) .
Index: mod/data/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/data/lib.php,v
retrieving revision 1.137.2.8
diff -u -r1.137.2.8 lib.php
--- mod/data/lib.php	24 Jan 2008 20:29:37 -0000	1.137.2.8
+++ mod/data/lib.php	12 Feb 2008 10:59:59 -0000
@@ -1376,7 +1376,7 @@
     echo '<table cellspacing="0" align="center" width="50%" class="datacomment forumpost">';
 
     echo '<tr class="header"><td class="picture left">';
-    print_user_picture($comment->userid, $data->course, $user->picture);
+    print_user_picture($user, $data->course, $user->picture);
     echo '</td>';
 
     echo '<td class="topic starter" align="left"><div class="author">';
Index: mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php,v
retrieving revision 1.9.4.1
diff -u -r1.9.4.1 TEMPLATE_format.php
--- mod/glossary/formats/TEMPLATE/TEMPLATE_format.php	9 Nov 2007 14:35:06 -0000	1.9.4.1
+++ mod/glossary/formats/TEMPLATE/TEMPLATE_format.php	12 Feb 2008 11:00:11 -0000
@@ -16,7 +16,7 @@
 
         //Use this function to show author's image
         //Comments: Configuration not supported
-        print_user_picture($user->id, $course->id, $user->picture);
+        print_user_picture($user, $course->id, $user->picture);
 
         //Line separator to show this template fine. :-)
         echo '<br />';
Index: mod/glossary/formats/encyclopedia/encyclopedia_format.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/glossary/formats/encyclopedia/encyclopedia_format.php,v
retrieving revision 1.17.4.2
diff -u -r1.17.4.2 encyclopedia_format.php
--- mod/glossary/formats/encyclopedia/encyclopedia_format.php	9 Nov 2007 14:35:07 -0000	1.17.4.2
+++ mod/glossary/formats/encyclopedia/encyclopedia_format.php	12 Feb 2008 11:00:12 -0000
@@ -13,7 +13,7 @@
         echo '<tr valign="top">';
         echo '<td class="left picture">';
         
-        print_user_picture($user->id, $course->id, $user->picture);
+        print_user_picture($user, $course->id, $user->picture);
     
         echo '</td>';
         echo '<th class="entryheader">';
Index: blocks/messages/block_messages.php
===================================================================
RCS file: /cvsroot/moodle/moodle/blocks/messages/block_messages.php,v
retrieving revision 1.13.4.1
diff -u -r1.13.4.1 block_messages.php
--- blocks/messages/block_messages.php	22 Nov 2007 01:16:37 -0000	1.13.4.1
+++ blocks/messages/block_messages.php	12 Feb 2008 10:59:46 -0000
@@ -28,7 +28,7 @@
         $this->content->footer = '<a href="'.$CFG->wwwroot.'/message/index.php" onclick="this.target=\'message\'; return openpopup(\'/message/index.php\', \'message\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'.get_string('messages', 'message').'</a>...';
 
         $users = get_records_sql("SELECT m.useridfrom as id, COUNT(m.useridfrom) as count,
-                                         u.firstname, u.lastname, u.picture, u.lastaccess
+                                         u.firstname, u.lastname, u.picture, u.imagealt, u.lastaccess
                                        FROM {$CFG->prefix}user u, 
                                             {$CFG->prefix}message m 
                                        WHERE m.useridto = '$USER->id' 
@@ -43,7 +43,7 @@
             foreach ($users as $user) {
                 $timeago = format_time(time() - $user->lastaccess);
                 $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->instance->pageid.'" title="'.$timeago.'">';
-                $this->content->text .= print_user_picture($user->id, $this->instance->pageid, $user->picture, 0, true, false, '', false);
+                $this->content->text .= print_user_picture($user, $this->instance->pageid, $user->picture, 0, true, false, '', false);
                 $this->content->text .= fullname($user).'</a></div>';
                 $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$CFG->pixpath.'/t/message.gif" alt="" />&nbsp;'.$user->count.'</a>';
                 $this->content->text .= '</div></li>';