--- loncom/interface/lonfeedback.pm	2003/09/14 23:57:18	1.54
+++ loncom/interface/lonfeedback.pm	2003/09/19 16:12:50	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.54 2003/09/14 23:57:18 www Exp $
+# $Id: lonfeedback.pm,v 1.61 2003/09/19 16:12:50 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,15 @@ use Apache::loncommon();
 use Apache::lontexconvert();
 
 sub list_discussion {
-    my ($crs,$symb,$discussiononly)=@_;
+    my ($mode,$status,$symb)=@_;
+    my $discussiononly=0;
+    if ($mode eq 'board') { $discussiononly=1; }
+    unless ($ENV{'request.course.id'}) { return ''; }
+    my $crs='/'.$ENV{'request.course.id'};
+    if ($ENV{'request.course.sec'}) {
+	$crs.='_'.$ENV{'request.course.sec'};
+    }                 
+    $crs=~s/\_/\//g;
     unless ($symb) {
 	$symb=&Apache::lonnet::symbread();
     }
@@ -357,14 +365,14 @@ sub clear_out_html {
       # allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> 
       # <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
       my %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
-		BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1);
+		BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
+                M=>1);
 
       $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
 	  {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
       $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
 	  {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\&gt;"}/ge;
   } else {
-      $message=~s/\<\/*m\s*\>//g;
       $message=~s/\</\&lt\;/g;
       $message=~s/\>/\&gt\;/g;
   }
@@ -729,7 +737,7 @@ sub handler {
    }
   } else {
 # Ambiguous Problem Resource
-      if ( Apache::exists_config_define("MODPERL2") ) {
+      if ( &Apache::lonnet::mod_perl_version() == 2 ) {
 	  &Apache::lonnet::cleanenv();
       }
       $r->internal_redirect('/adm/ambiguous');