--- loncom/interface/lonfeedback.pm	2004/05/25 22:16:05	1.84
+++ loncom/interface/lonfeedback.pm	2004/06/03 20:06:15	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.84 2004/05/25 22:16:05 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.89 2004/06/03 20:06:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,15 +34,20 @@ use Apache::Constants qw(:common);
 use Apache::lonmsg();
 use Apache::loncommon();
 use Apache::lontexconvert();
-use Apache::lonlocal;
+use Apache::lonlocal; # must not have ()
+use Apache::lonhtmlcommon();
 
 sub list_discussion {
     my ($mode,$status,$symb)=@_;
-#    &Apache::lonnet::logthis("status is $status");
+
     if (!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
 	return '';
     }
+    my $close=&Apache::lonnet::EXT('resource.0.discussend');
+    if (defined($close) && $close ne '' && $close < time) {
+	return ''
+    }
 
     my @bgcols = ("#cccccc","#eeeeee");
     my $discussiononly=0;
@@ -411,7 +416,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>
@@ -457,13 +462,15 @@ sub mail_screen {
           $prevtag = '<input type="hidden" name="previous" value="'.$ENV{'form.previous'}.'" />';
       }
   }
-  my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
+  my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
+  my $htmlheader=&Apache::lonhtmlcommon::htmlareaheaders();
   my $send=&mt('Send');
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <meta http-equiv="pragma" content="no-cache"></meta>
+$htmlheader
 <script type="text/javascript">
 //<!--
     function gosubmit() {
@@ -500,6 +507,7 @@ sub mail_screen {
         }
 
         if (rec) {
+	    document.mailform.onsubmit();
 	    document.mailform.submit();
         } else {
             alert('Please check a feedback type.');
@@ -534,7 +542,9 @@ Attachment (128 KB max size): <input typ
 </p>
 </form>
 ENDDOCUMENT
-$r->print(&generate_preview_button().'</body></html>');
+$r->print(&generate_preview_button().
+&Apache::lonhtmlcommon::htmlareaactive().
+'</body></html>');
 }
 
 sub fail_redirect {
@@ -669,14 +679,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;
@@ -877,7 +890,7 @@ sub generate_preview_button {
 <input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
+onClick="document.mailform.onsubmit();this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }
