--- loncom/interface/lonfeedback.pm	2002/09/16 19:54:01	1.32
+++ loncom/interface/lonfeedback.pm	2002/10/25 13:57:28	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.32 2002/09/16 19:54:01 albertel Exp $
+# $Id: lonfeedback.pm,v 1.35 2002/10/25 13:57:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,7 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
 use Apache::loncommon();
+use Apache::lontexconvert();
 
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
@@ -114,9 +115,8 @@ My question/comment/feedback:<p>
 <input type=hidden name=sendit value=1>
 <input type=button value="Send Feedback" onClick='gosubmit();'></input>
 </form>
-</body>
-</html>
 ENDDOCUMENT
+$r->print(&generate_preview_button().'</body></html>');
 }
 
 sub fail_redirect {
@@ -179,7 +179,7 @@ ENDNOREDIRTWO
 sub screen_header {
   my ($feedurl) = @_;
   my $options='';
-  if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) {
+  if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) {
     $options= 
       '<p><input type=checkbox name=author> Feedback to resource author';
   }
@@ -227,6 +227,7 @@ sub resource_output {
 
 sub clear_out_html {
   my $message=$ENV{'form.comment'};
+  $message=~s/\<\/*m\s*\>//g;
   $message=~s/\</\&lt\;/g;
   $message=~s/\>/\&gt\;/g;
   return $message;
@@ -249,6 +250,11 @@ ENDCITE
   return ($email,$citations);
 }
 
+sub secapply {
+    my $rec=shift;
+    return $rec;
+}
+
 sub decide_receiver {
   my ($feedurl) = @_;
   my $typestyle='';
@@ -263,7 +269,7 @@ sub decide_receiver {
     foreach (split(/\,/,
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'})
 	     ) {
-      $to{$_}=1;
+	if (my $rec=&secapply($_)) { $to{$rec}=1; }
     } 
   }
   if ($ENV{'form.course'}) {
@@ -271,7 +277,7 @@ sub decide_receiver {
     foreach (split(/\,/,
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'})
 	     ) {
-      $to{$_}=1;
+	if (my $rec=&secapply($_)) { $to{$rec}=1; }
     } 
   }
   if ($ENV{'form.policy'}) {
@@ -279,7 +285,7 @@ sub decide_receiver {
     foreach (split(/\,/,
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'})
 	     ) {
-      $to{$_}=1;
+	if (my $rec=&secapply($_)) { $to{$rec}=1; }
     } 
   }
   return ($typestyle,%to);
@@ -293,7 +299,7 @@ sub send_msg {
     if ($_) {
       my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback ['.$declutter.']',$email,$citations) eq 'ok') {
+               'Feedback ['.$declutter.']',$email,$citations)=~/ok/) {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	$sendsomething++;
@@ -358,6 +364,26 @@ sub adddiscuss {
     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 {
+    return(<<ENDPREVIEW);
+<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
+<input type="hidden" name="comment" />
+<input type="button" value="Show Preview"
+onClick="this.form.comment.value=document.mailform.comment.value;this.form.submit();" />
+</form>
+ENDPREVIEW
+}
 sub handler {
   my $r = shift;
   if ($r->header_only) {
@@ -369,7 +395,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                           ['hide','unhide','postdata']);
+                                       ['hide','unhide','postdata','preview']);
 
   if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
@@ -401,6 +427,9 @@ sub handler {
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
        'Changed discussion status<p>','0','0');
+  } elsif ($ENV{'form.preview'}) {
+# -------------------------------------------------------- User wants a preview
+      &show_preview($r);
   } else {
 # ------------------------------------------------------------- Normal feedback
   my $feedurl=$ENV{'form.postdata'};