--- loncom/interface/lonfeedback.pm	2004/06/02 16:47:33	1.87
+++ loncom/interface/lonfeedback.pm	2004/06/03 20:28:22	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.87 2004/06/02 16:47:33 www Exp $
+# $Id: lonfeedback.pm,v 1.90 2004/06/03 20:28:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,14 +37,25 @@ use Apache::lontexconvert();
 use Apache::lonlocal; # must not have ()
 use Apache::lonhtmlcommon();
 
-sub list_discussion {
-    my ($mode,$status,$symb)=@_;
-#    &Apache::lonnet::logthis("status is $status");
+sub discussion_closed {
+    my ($status)=@_;
     if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
-	return '';
+	return '1';
     }
+    my $close=&Apache::lonnet::EXT('resource.0.discussend');
+    if (defined($close) && $close ne '' && $close < time) {
+	return '1'
+    }
+    return 0;
+}
 
+sub list_discussion {
+    my ($mode,$status,$symb)=@_;
+
+    if (&discussion_closed($status)) {
+	return '';
+    }
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }
@@ -248,7 +259,8 @@ sub list_discussion {
 			    $sender='<i>'.$screenname.'</i>';
 			}
 		    }
-		    if (&Apache::lonnet::allowed('pch',
+		    if (!&discusion_closed($status) &&
+			&Apache::lonnet::allowed('pch',
 						 $ENV{'request.course.id'}.
 						 ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 			$sender.=' <a href="/adm/feedback?replydisc='.
@@ -412,7 +424,7 @@ sub list_discussion {
 <font size="1">Note: in anonymous discussion, your name is visible only to
 course faculty</font><br />
 <b>Title:</b>&nbsp;<input type="text" name="subject" value="" size="30" /><br /><br />
-<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
+<textarea name="comment" cols="60" rows="12" wrap="hard"></textarea>
 <p>
 Attachment (128 KB max size): <input type="file" name="attachment" />
 </p>
@@ -420,7 +432,8 @@ Attachment (128 KB max size): <input typ
 ENDDISCUSS
       $discussion.=&generate_preview_button();
     } else {
-	if (&Apache::lonnet::allowed('pch',
+	if (!&discussion_closed($status) &&
+	    &Apache::lonnet::allowed('pch',
 				   $ENV{'request.course.id'}.
 	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 			    $discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
@@ -643,7 +656,8 @@ sub screen_header {
 	}
     }
     if ($ENV{'request.course.id'}) {
-	if (&Apache::lonnet::allowed('pch',
+	if (not &discussion_closed() &&
+	    &Apache::lonnet::allowed('pch',
 				     $ENV{'request.course.id'}.
 				     ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 	    $discussoptions='<input type="checkbox" name="discuss" onClick="this.form.anondiscuss.checked=false;" '.
@@ -675,14 +689,17 @@ sub resource_output {
 
 sub clear_out_html {
   my ($message,$override)=@_;
+  unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
   my $cid=$ENV{'request.course.id'};
   if (($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) ||
       ($override)) {
       # allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> 
-      # <BLOCKQUOTE> <DIV .*> <DIV> <IMG>
+      # <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
+      # <SUP>
       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,
-                M=>1);
+                M=>1, SUB=>1, SUP=>1, SPAN=>1, 
+		H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
 
       $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
 	  {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\&lt;$1"}/ge;
@@ -816,7 +833,8 @@ sub send_msg {
 sub adddiscuss {
     my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
     my $status='';
-    if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
+    if (not &discussion_closed() &&
+	&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 
     my %contrib=('message'      => $email,