--- loncom/interface/lonfeedback.pm	2003/03/29 22:50:22	1.42
+++ loncom/interface/lonfeedback.pm	2003/03/30 21:58:17	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.42 2003/03/29 22:50:22 www Exp $
+# $Id: lonfeedback.pm,v 1.43 2003/03/30 21:58:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,7 +105,8 @@ sub mail_screen {
 </head>
 $bodytag
 <h2><tt>$feedurl</tt></h2>
-<form action="/adm/feedback" method=post name=mailform>
+<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>
@@ -339,14 +340,15 @@ sub feedback_available {
 }
 
 sub send_msg {
-  my ($feedurl,$email,$citations,%to)=@_;
+  my ($feedurl,$email,$citations,$attachmenturl,%to)=@_;
   my $status='';
   my $sendsomething=0;
   foreach (keys %to) {
     if ($_) {
       my $declutter=&Apache::lonnet::declutter($feedurl);
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
-               'Feedback ['.$declutter.']',$email,$citations,$feedurl)=~/ok/) {
+               'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+                $attachmenturl)=~/ok/) {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	$sendsomething++;
@@ -382,7 +384,7 @@ sub adddiscuss {
 		                   $ENV{'environment.middlename'}.' '.
                                    $ENV{'environment.lastname'}.' '.
                                    $ENV{'enrironment.generation'},
-                 'attachment'   => $attachmenturl);
+                 'attachmenturl'=> $attachmenturl);
     if ($anon) {
 	$contrib{'anonymous'}='true';
     }
@@ -565,7 +567,7 @@ sub handler {
       my $attachmenturl='';
       if ($ENV{'form.attachment.filename'}) {
 	  unless (length($ENV{'form.attachment'})>131072) {
-	      $attachmenturl=&Apache::lonnet::userfileupload('attachment',1);
+	      $attachmenturl=&Apache::lonnet::userfileupload('attachment');
 	  }
       }
 # Filter HTML out of message (could be nasty)
@@ -579,7 +581,8 @@ sub handler {
       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.