--- loncom/interface/lonfeedback.pm	2001/02/05 17:38:17	1.2
+++ loncom/interface/lonfeedback.pm	2001/02/06 14:22:30	1.3
@@ -9,12 +9,13 @@
 #
 # 3/1/1 Gerd Kortemeyer)
 #
-# 3/1,2/3,2/5 Gerd Kortemeyer
+# 3/1,2/3,2/5,2/6 Gerd Kortemeyer
 #
 package Apache::lonfeedback;
 
 use strict;
 use Apache::Constants qw(:common);
+use Apache::lonmsg();
 
 sub handler {
     my $r = shift;
@@ -41,12 +42,12 @@ sub handler {
         }
 	if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
            $options.=
- '<br><input type=checkbox name=question> '.
+ '<br><input type=checkbox name=comment> '.
  'Question/Comment/Feedback about course content';
         }
 	if ($ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) {
            $options.=
- '<br><input type=checkbox name=question> '.
+ '<br><input type=checkbox name=policy> '.
  'Question/Comment/Feedback about course policy';
         }
        $r->print(<<ENDDOCUMENT);
@@ -71,6 +72,9 @@ My question/comment/feedback:<p>
 </html>
 ENDDOCUMENT
 } else {
+#
+# Get previous user input
+#
     my $symb=&Apache::lonnet::symbread($feedurl);
     my $prevattempts='';
     if ($symb) {
@@ -108,6 +112,9 @@ ENDDOCUMENT
        } keys %lasthash;
        $prevattempts.='</tr></table>';
     }
+#
+# Get output from resource
+#
     my $usersaw=&Apache::lonnet::ssi($feedurl);
     $usersaw=~s/\<body[^\>]*\>//gi;
     $usersaw=~s/\<\/body\>//gi;
@@ -116,17 +123,81 @@ ENDDOCUMENT
     $usersaw=~s/\<head\>//gi;
     $usersaw=~s/\<\/head\>//gi;
     $usersaw=~s/action\s*\=/would_be_action\=/gi;
-# <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$feedurl">
-    
+#
+# Filter HTML out of message (could be nasty)
+#
+    my $message=$ENV{'form.comment'};
+    $message=~s/\</\&lt\;/g;
+    $message=~s/\>/\&gt\;/g;
+
+#
+# Assemble email
+#
+    my $email=<<"ENDEMAIL";
+Refers to <a href="$feedurl">$feedurl</a>
+<hr>
+<h2>Message</h2>
+<pre>
+$message
+</pre>
+<hr>
+<h2>Previous attempts of student (if applicable)</h2>
+$prevattempts
+<p><hr>
+<h2>Original screen output (if applicable)</h2>
+$usersaw
+ENDEMAIL
+#
+# Who gets this?
+#
+    my %to=();
+    if ($ENV{'form.author'}) {
+	$feedurl=~/^\/res\/(\w+)\/(\w+)\//;
+        $to{$2.':'.$1}=1;
+    }
+    if ($ENV{'form.question'}) {
+	map {
+            $to{$_}=1;
+        } split(/\,/,
+          $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'});
+    }
+    if ($ENV{'form.comment'}) {
+	map {
+            $to{$_}=1;
+        } split(/\,/,
+          $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'});
+    }
+    if ($ENV{'form.policy'}) {
+	map {
+            $to{$_}=1;
+        } split(/\,/,
+          $ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'});
+    }
+#
+# Actually send mail
+#
+    my $status='';
+    map {
+       if ($_) {
+          unless (
+          &Apache::lonmsg::user_normal_msg(split(/\:/,$_),'Feedback '.$feedurl,
+                                           $email) eq 'ok') {
+            $status.='<br>Error sending message to '.$_.'<br>';
+	  }
+       }
+    } keys %to;
+#
+# Receipt screen and redirect back to where came from
+#
     print (<<ENDREDIR);
-<head><title>Feedback sent</title>
+<head>
+<title>Feedback sent</title>
+<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$feedurl">
 </head>
 <html>
 <body bgcolor="#FFFFFF">
 <b>Feedback sent ...</b>
-$prevattempts
-<hr>
-$usersaw
+<font color=red>$status</font>
 </body>
 </html>
 ENDREDIR
