--- loncom/interface/lonfeedback.pm	2001/07/26 15:50:25	1.11
+++ loncom/interface/lonfeedback.pm	2003/11/03 20:34:54	1.65
@@ -1,6 +1,30 @@
 # The LearningOnline Network
 # Feedback
 #
+# $Id: lonfeedback.pm,v 1.65 2003/11/03 20:34:54 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Internal Server Error Handler
 #
 # (Login Screen
@@ -14,6 +38,11 @@
 # 2/10 Gerd Kortemeyer
 # 2/13 Guy Albertelli
 # 7/25 Gerd Kortemeyer
+# 7/26 Guy Albertelli
+# 7/26,8/10,10/1,11/5,11/6,12/27,12/29 Gerd Kortemeyer
+# YEAR=2002
+# 1/1,1/16 Gerd Kortemeyer
+#
 
 package Apache::lonfeedback;
 
@@ -21,42 +50,175 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
 use Apache::loncommon();
+use Apache::lontexconvert();
+use Apache::lonlocal;
+
+sub list_discussion {
+    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();
+    }
+    unless ($symb) { return ''; }
+    my $seeid=&Apache::lonnet::allowed('rin',$crs);
+    my $viewgrades=&Apache::lonnet::allowed('vgr',$crs);
+    my %discussionitems=();
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+			  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    if ($contrib{'version'}) {
+	for (my $id=1;$id<=$contrib{'version'};$id++) {
+	    my $idx=$id;
+	    my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+	    my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+	    unless ((($hidden) && (!$seeid)) || ($deleted)) {
+		my $message=$contrib{$idx.':message'};
+		$message=~s/\n/\<br \/\>/g;
+		$message=&Apache::lontexconvert::msgtexconverted($message);
+		if ($contrib{$idx.':attachmenturl'}) {
+		    my ($fname,$ft)
+                        =($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/);
+		    $message.='<p>'.&mt('Attachment').': <a href="'.
+			&Apache::lonnet::tokenwrapper(
+                                             $contrib{$idx.':attachmenturl'}).
+			'"><tt>'.$fname.'.'.$ft.'</tt></a></p>';
+		}
+		if ($message) {
+		    if ($hidden) {
+			$message='<font color="#888888">'.$message.'</font>';
+		    }
+		    my $screenname=&Apache::loncommon::screenname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    my $plainname=&Apache::loncommon::nickname(
+					    $contrib{$idx.':sendername'},
+					    $contrib{$idx.':senderdomain'});
+		    
+		    my $sender=&mt('Anonymous');
+		    if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+			$sender=&Apache::loncommon::aboutmewrapper(
+					 $plainname,
+					 $contrib{$idx.':sendername'},
+					 $contrib{$idx.':senderdomain'}).' ('.
+					 $contrib{$idx.':sendername'}.' at '.
+					 $contrib{$idx.':senderdomain'}.')';
+			if ($contrib{$idx.':anonymous'}) {
+			    $sender.=' ['.&mt('anonymous').'] '.
+				$screenname;
+			}
+			if ($seeid) {
+			    if ($hidden) {
+				$sender.=' <a href="/adm/feedback?unhide='.
+				    $symb.':::'.$idx.'">'.&mt('Make Visible').'</a>';
+			    } else {
+				$sender.=' <a href="/adm/feedback?hide='.
+				    $symb.':::'.$idx.'">'.&mt('Hide').'</a>';
+			    }                     
+			    $sender.=' <a href="/adm/feedback?deldisc='.
+				$symb.':::'.$idx.'">'.&mt('Delete').'</a>';
+			}
+			if (&Apache::lonnet::allowed('pch',
+				   $ENV{'request.course.id'}.
+	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+			    $sender.=' <a href="/adm/feedback?replydisc='.
+				$symb.':::'.$idx.'">'.&mt('Reply').'</a>';
+			}
+		    } else {
+			if ($screenname) {
+			    $sender='<i>'.$screenname.'</i>';
+			}
+		    }
+		    my $vgrlink;
+		    if ($viewgrades) {
+			$vgrlink=&Apache::loncommon::submlink('Submissions',
+            $contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'},$symb);
+		    }
+		    $discussionitems{$idx}='<p><b>'.$sender.'</b> '.$vgrlink.' ('.
+			localtime($contrib{$idx.':timestamp'}).
+			'):<blockquote>'.$message.
+			'</blockquote></p>';
+	        }
+	    } 
+	}
+    }
+    my $discussion='<hr />';
+    foreach (sort { $a <=> $b } keys %discussionitems) {
+	$discussion.=$discussionitems{$_};
+    }
+    if ($discussiononly) {
+	$discussion.=(<<ENDDISCUSS);
+<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
+<input type="submit" name="discuss" value="Post Discussion" />
+<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="sendit" value="true" />
+<br />
+<font size="1">Note: in anonymous discussion, your name is visible only to
+course faculty</font><br />
+<textarea name="comment" cols="60" rows="10" wrap="hard"></textarea>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+</form>
+ENDDISCUSS
+      $discussion.=&generate_preview_button();
+   }
+   return $discussion;
+}
 
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
+  my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
+                                          '','onLoad="window.focus();"');
+  my $title=&Apache::lonnet::gettitle($feedurl);
+  if (!$title) { $title = $feedurl; }
+  my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
   $r->print(<<ENDDOCUMENT);
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <meta http-equiv="pragma" content="no-cache"></meta>
-<script>
+<script type="text/javascript">
+//<!--
     function gosubmit() {
         var rec=0;
-        if (typeof(document.mailform.elements.author!=undefined)) {
+        if (typeof(document.mailform.elements.author)!="undefined") {
           if (document.mailform.elements.author.checked) {
              rec=1;
           } 
         }
-        if (typeof(document.mailform.elements.question!=undefined)) {
+        if (typeof(document.mailform.elements.question)!="undefined") {
           if (document.mailform.elements.question.checked) {
              rec=1;
           } 
         }
-        if (typeof(document.mailform.elements.course!=undefined)) {
+        if (typeof(document.mailform.elements.course)!="undefined") {
           if (document.mailform.elements.course.checked) {
              rec=1;
           } 
         }
-        if (typeof(document.mailform.elements.policy!=undefined)) {
+        if (typeof(document.mailform.elements.policy)!="undefined") {
           if (document.mailform.elements.policy.checked) {
              rec=1;
           } 
         }
-        if (typeof(document.mailform.elements.discuss!=undefined)) {
+        if (typeof(document.mailform.elements.discuss)!="undefined") {
           if (document.mailform.elements.discuss.checked) {
              rec=1;
           } 
         }
+        if (typeof(document.mailform.elements.anondiscuss)!="undefined") {
+          if (document.mailform.elements.anondiscuss.checked) {
+             rec=1;
+          } 
+        }
 
         if (rec) {
 	    document.mailform.submit();
@@ -64,37 +226,43 @@ sub mail_screen {
             alert('Please check a feedback type.');
 	}
     }
+//-->
 </script>
 </head>
-<body bgcolor="#FFFFFF" onLoad="window.focus();">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Feedback</h1>
-<h2><tt>$feedurl</tt></h2>
-<form action="/adm/feedback" method=post name=mailform>
-<input type=hidden name=postdata value="$feedurl">
+$bodytag
+<h2><tt>$title</tt></h2>
+<form action="/adm/feedback" method="post" name="mailform"
+enctype="multipart/form-data">
+<input type="hidden" name="postdata" value="$feedurl" />
 Please check at least one of the following feedback types:
-$options<hr>
-My question/comment/feedback:<p>
-<textarea name=comment cols=60 rows=10>
-</textarea><p>
-<input type=hidden name=sendit value=1>
-<input type=button value="Send Feedback" onClick='gosubmit();'></input>
+$options<hr />
+<p>My question/comment/feedback:</p>
+<p>
+$latexHelp
+<textarea name="comment" cols="60" rows="10" wrap="hard">
+</textarea></p>
+<p>
+Attachment (128 KB max size): <input type="file" name="attachment" />
+</p>
+<p>
+<input type="hidden" name="sendit" value="1" />
+<input type="button" value="Send Feedback" onClick='gosubmit();' />
+</p>
 </form>
-</body>
-</html>
 ENDDOCUMENT
+$r->print(&generate_preview_button().'</body></html>');
 }
 
 sub fail_redirect {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDFAILREDIR);
 <head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no recipients  ...</b>
 </body>
 </html>
@@ -102,19 +270,21 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$status) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
   $r->print (<<ENDREDIR);
 <head>
 <title>Feedback sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>
 <html>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 $typestyle
-<b>Sent $sendsomething message(s).</b>
-<font color=red>$status</font>
+<b>Sent $sendsomething message(s), and $sendposts post(s).</b>
+<font color="red">$status</font>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
 </body>
 </html>
 ENDREDIR
@@ -124,7 +294,7 @@ sub no_redirect_back {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);
 <head><title>Feedback not sent</title>
-<meta http-equiv="pragma" content="no-cache"></meta>
+<meta http-equiv="pragma" content="no-cache" />
 ENDNOREDIR
 
   if ($feedurl!~/^\/adm\/feedback/) { 
@@ -134,8 +304,8 @@ ENDNOREDIR
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <html>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no feedback possible on this resource  ...</b>
 </body>
 </html>
@@ -143,36 +313,51 @@ ENDNOREDIRTWO
 }
 
 sub screen_header {
-  my ($feedurl) = @_;
-  my $options='';
-  if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) {
-    $options= 
-      '<p><input type=checkbox name=author> Feedback to resource author';
-  }
-  if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {
-    $options.=
-    '<br><input type=checkbox name=question> Question about resource content';
-  }
-  if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
-    $options.=
-      '<br><input type=checkbox name=course> '.
-	'Question/Comment/Feedback about course content';
-  }
-  if ($ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) {
-    $options.=
-      '<br><input type=checkbox name=policy> '.
-	'Question/Comment/Feedback about course policy';
-  }
-  if ($ENV{'request.course.id'}) {
-    $options.='<br><input type=checkbox name=discuss> '.
-	'<b>Contribution to course discussion of resource</b>';
-  }
-  return $options;
+    my ($feedurl) = @_;
+    my $msgoptions='';
+    my $discussoptions='';
+    unless ($ENV{'form.replydisc'}) {
+	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
+	    $msgoptions= 
+		'<p><input type="checkbox" name="author" /> '.
+		&mt('Feedback to resource author').'</p>';
+	}
+	if (&feedback_available(1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="question" /> '.
+		&mt('Question about resource content');
+	}
+	if (&feedback_available(0,1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="course" /> '.
+		&mt('Question/Comment/Feedback about course content');
+	}
+	if (&feedback_available(0,0,1)) {
+	    $msgoptions.=
+		'<br /><input type="checkbox" name="policy" /> '.
+		&mt('Question/Comment/Feedback about course policy');
+	}
+    }
+    if ($ENV{'request.course.id'}) {
+	if (&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;" /> '.
+		&mt('Contribution to course discussion of resource');
+	    $discussoptions.='<br /><input type="checkbox" name="anondiscuss" onClick="this.form.discuss.checked=false;" /> '.
+		&mt('Anonymous contribution to course discussion of resource').
+		' <i>('.&mt('name only visible to course faculty').')</i>';
+      }
+    }
+    if ($msgoptions) { $msgoptions='<h2>'.&mt('Sending Messages').'</h2>'.$msgoptions; }
+    if ($discussoptions) { 
+	$discussoptions='<h2>'.&mt('Discussion Contributions').'</h2>'.$discussoptions; }
+    return $msgoptions.$discussoptions;
 }
 
 sub resource_output {
   my ($feedurl) = @_;
-  my $usersaw=&Apache::lonnet::ssi($feedurl);
+  my $usersaw=&Apache::lonnet::ssi_body($feedurl);
   $usersaw=~s/\<body[^\>]*\>//gi;
   $usersaw=~s/\<\/body\>//gi;
   $usersaw=~s/\<html\>//gi;
@@ -184,14 +369,29 @@ sub resource_output {
 }
 
 sub clear_out_html {
-  my $message=$ENV{'form.comment'};
-  $message=~s/\</\&lt\;/g;
-  $message=~s/\>/\&gt\;/g;
+  my ($message,$override)=@_;
+  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>
+      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);
+
+      $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/\</\&lt\;/g;
+      $message=~s/\>/\&gt\;/g;
+  }
   return $message;
 }
 
 sub assemble_email {
-  my ($feedurl,$message,$prevattempts,$usersaw)=@_;
+  my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
   my $email=<<"ENDEMAIL";
 Refers to <a href="$feedurl">$feedurl</a>
 
@@ -200,64 +400,182 @@ ENDEMAIL
     my $citations=<<"ENDCITE";
 <h2>Previous attempts of student (if applicable)</h2>
 $prevattempts
-<p><hr>
+<br /><hr />
 <h2>Original screen output (if applicable)</h2>
 $usersaw
+<h2>Correct Answer(s) (if applicable)</h2>
+$useranswer
 ENDCITE
   return ($email,$citations);
 }
 
+sub secapply {
+    my $rec=shift;
+    my $defaultflag=shift;
+    $rec=~s/\s+//g;
+    $rec=~s/\@/\:/g;
+    my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
+    if ($sections) {
+	foreach (split(/\;/,$sections)) {
+            if (($_ eq $ENV{'request.course.sec'}) ||
+                ($defaultflag && ($_ eq '*'))) {
+                return $adr; 
+            }
+        }
+    } else {
+       return $rec;
+    }
+    return '';
+}
+
 sub decide_receiver {
-  my ($feedurl) = @_;
+  my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
   my $typestyle='';
   my %to=();
-  if ($ENV{'form.author'}) {
+  if ($ENV{'form.author'}||$author) {
     $typestyle.='Submitting as Author Feedback<br>';
     $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
     $to{$2.':'.$1}=1;
   }
-  if ($ENV{'form.question'}) {
+  if ($ENV{'form.question'}||$question) {
     $typestyle.='Submitting as Question<br>';
-    map {
-      $to{$_}=1;
-    } split(/\,/,
-	    $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'});
-  }
-  if ($ENV{'form.course'}) {
-    $typestyle.='Submitting as Comment<br>';
-    map {
-      $to{$_}=1;
-    } split(/\,/,
-	    $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'});
-  }
-  if ($ENV{'form.policy'}) {
-    $typestyle.='Submitting as Policy Feedback<br>';
-    map {
-      $to{$_}=1;
-    } split(/\,/,
-	    $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'});
+    foreach (split(/\,/,
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'})
+	     ) {
+	my $rec=&secapply($_,$defaultflag);
+        if ($rec) { $to{$rec}=1; }
+    } 
+  }
+  if ($ENV{'form.course'}||$course) {
+    $typestyle.='Submitting as Comment<br />';
+    foreach (split(/\,/,
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
+	     ) {
+	my $rec=&secapply($_,$defaultflag);
+        if ($rec) { $to{$rec}=1; }
+    } 
+  }
+  if ($ENV{'form.policy'}||$policy) {
+    $typestyle.='Submitting as Policy Feedback<br />';
+    foreach (split(/\,/,
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
+	     ) {
+	my $rec=&secapply($_,$defaultflag);
+        if ($rec) { $to{$rec}=1; }
+    } 
+  }
+  if ((scalar(%to) eq '0') && (!$defaultflag)) {
+     ($typestyle,%to)=
+	 &decide_receiver($feedurl,$author,$question,$course,$policy,1);
   }
   return ($typestyle,%to);
 }
 
+sub feedback_available {
+    my ($question,$course,$policy)=@_;
+    my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy);
+    return scalar(%to);
+}
+
 sub send_msg {
-  my ($feedurl,$email,$citations,%to)=@_;
+  my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
   my $status='';
   my $sendsomething=0;
-  map {
+  foreach (keys %to) {
     if ($_) {
+      my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback '.$feedurl,$email,$citations) eq 'ok') {
-	$status.='<br>Error sending message to '.$_.'<br>';
+               'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+                $attachmenturl)=~/ok/) {
+	$status.='<br />'.&mt('Error sending message to').' '.$_.'<br />';
       } else {
-	#$status.='<br>Message sent to '.$_.'<br>';
 	$sendsomething++;
       }
     }
-  } keys %to;       
+  }
+
+    my %record=&Apache::lonnet::restore('_feedback');
+    my ($temp)=keys %record;
+    unless ($temp=~/^error\:/) {
+       my %newrecord=();
+       $newrecord{'resource'}=$feedurl;
+       $newrecord{'subnumber'}=$record{'subnumber'}+1;
+       unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+	   $status.='<br />'.&mt('Not registered').'<br />';
+       }
+    }
+       
   return ($status,$sendsomething);
 }
 
+sub adddiscuss {
+    my ($symb,$email,$anon,$attachmenturl)=@_;
+    my $status='';
+    if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
+        ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
+
+    my %contrib=('message'      => $email,
+                 'sendername'   => $ENV{'user.name'},
+                 'senderdomain' => $ENV{'user.domain'},
+                 'screenname'   => $ENV{'environment.screenname'},
+                 'plainname'    => $ENV{'environment.firstname'}.' '.
+		                   $ENV{'environment.middlename'}.' '.
+                                   $ENV{'environment.lastname'}.' '.
+                                   $ENV{'enrironment.generation'},
+                 'attachmenturl'=> $attachmenturl);
+    if ($ENV{'form.replydisc'}) {
+	$contrib{'replyto'}=$ENV{'form.replydisc'};
+    }
+    if ($anon) {
+	$contrib{'anonymous'}='true';
+    }
+    if (($symb) && ($email)) {
+       $status='Adding to class discussion'.($anon?' (anonymous)':'').': '.
+        &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+        my %storenewentry=($symb => time);
+        $status.='<br />'.&mt('Updating discussion time').': '.
+        &Apache::lonnet::put('discussiontimes',\%storenewentry,
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+    }
+    my %record=&Apache::lonnet::restore('_discussion');
+    my ($temp)=keys %record;
+    unless ($temp=~/^error\:/) {
+       my %newrecord=();
+       $newrecord{'resource'}=$symb;
+       $newrecord{'subnumber'}=$record{'subnumber'}+1;
+       $status.='<br />'.&mt('Registering').': '.
+               &Apache::lonnet::cstore(\%newrecord,'_discussion');
+    }
+    } else {
+	$status.='Failed.';
+    }
+    return $status.'<br />';   
+}
+
+# ----------------------------------------------------------- Preview function
+
+sub show_preview {
+    my $r=shift;
+    my $message=&clear_out_html($ENV{'form.comment'});
+    $message=~s/\n/\<br \/\>/g;
+    $message=&Apache::lontexconvert::msgtexconverted($message);
+    $r->print('<table border="2"><tr><td>'.
+       $message.'</td></tr></table>');
+}
+
+sub generate_preview_button {
+    my $pre=&mt("Show Preview");
+    return(<<ENDPREVIEW);
+<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
+<input type="hidden" name="comment" />
+<input type="button" value="$pre"
+onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
+</form>
+ENDPREVIEW
+}
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -265,13 +583,88 @@ sub handler {
      $r->send_http_header;
      return OK;
   }
-  
+
+# --------------------------- Get query string for limited number of parameters
+
+   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+         ['hide','unhide','deldisc','postdata','preview','replydisc']);
+
+  if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
+# ----------------------------------------------------------------- Hide/unhide
+    $r->content_type('text/html');
+    $r->send_http_header;
+
+    my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
+
+    my ($symb,$idx)=split(/\:\:\:/,$entry);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+        
+    my $currenthidden=$contrib{'hidden'};
+    
+    if ($ENV{'form.hide'}) {
+	$currenthidden.='.'.$idx.'.';
+    } else {
+        $currenthidden=~s/\.$idx\.//g;
+    }
+    my %newhash=('hidden' => $currenthidden);
+
+    &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    &redirect_back($r,&Apache::lonnet::clutter($url),
+       &mt('Changed discussion status').'<br />','0','0');
+  } elsif ($ENV{'form.deldisc'}) {
+# --------------------------------------------------------------- Hide for good
+    $r->content_type('text/html');
+    $r->send_http_header;
+
+    my $entry=$ENV{'form.deldisc'};
+
+    my ($symb,$idx)=split(/\:\:\:/,$entry);
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+
+    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+        
+    my $currentdeleted=$contrib{'deleted'};
+    
+    $currentdeleted.='.'.$idx.'.';
+
+    my %newhash=('deleted' => $currentdeleted);
+
+    &Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+    &redirect_back($r,&Apache::lonnet::clutter($url),
+       &mt('Changed discussion status').'<br />','0','0');
+  } elsif ($ENV{'form.preview'}) {
+# -------------------------------------------------------- User wants a preview
+      &show_preview($r);
+  } else {
+# ------------------------------------------------------------- Normal feedback
   my $feedurl=$ENV{'form.postdata'};
   $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+  $feedurl=~s/\?.+$//;
 
   my $symb=&Apache::lonnet::symbread($feedurl);
+  unless ($symb) {
+      $symb=$ENV{'form.symb'};
+      if ($symb) {
+	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
+          $feedurl=&Apache::lonnet::clutter($url);
+      }
+  }
   my $goahead=1;
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
@@ -288,6 +681,8 @@ sub handler {
       ) 
       || 
       ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+      ||
+      ($ENV{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
      ) {
 # --------------------------------------------------- Print login screen header
     unless ($ENV{'form.sendit'}) {
@@ -307,21 +702,49 @@ sub handler {
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
 
+# Get resource answer (need to allow student to view grades for this to work)
+      &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
+      my $useranswer=&Apache::loncommon::get_student_answers(
+                       $symb,$ENV{'user.name'},$ENV{'user.domain'},
+		       $ENV{'request.course.id'});
+      &Apache::lonnet::delenv('allowed.vgr');
+# Get attachments, if any, and not too large
+      my $attachmenturl='';
+      if ($ENV{'form.attachment.filename'}) {
+	  unless (length($ENV{'form.attachment'})>131072) {
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment');
+	  }
+      }
 # Filter HTML out of message (could be nasty)
-      my $message=&clear_out_html;
+      my $message=&clear_out_html($ENV{'form.comment'});
 
 # Assemble email
       my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
-          $usersaw);
-
+          $usersaw,$useranswer);
+ 
 # Who gets this?
       my ($typestyle,%to) = &decide_receiver($feedurl);
 
 # Actually send mail
-      my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
+      my ($status,$numsent)=&send_msg($feedurl,$email,$citations,
+          $attachmenturl,%to);
+
+# Discussion? Store that.
+
+      my $numpost=0;
+      if ($ENV{'form.discuss'}) {
+	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
+	  $numpost++;
+      }
+
+      if ($ENV{'form.anondiscuss'}) {
+	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
+	  $numpost++;
+      }
+
 
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$status);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status);
 
     }
    } else {
@@ -330,13 +753,14 @@ sub handler {
    }
   } else {
 # Ambiguous Problem Resource
-    $r->internal_redirect('/adm/ambiguous');
+      if ( &Apache::lonnet::mod_perl_version() == 2 ) {
+	  &Apache::lonnet::cleanenv();
+      }
+      $r->internal_redirect('/adm/ambiguous');
   }
+}
   return OK;
 } 
 
 1;
 __END__
-
-
-