--- loncom/interface/lonfeedback.pm	2002/10/28 23:28:52	1.37
+++ loncom/interface/lonfeedback.pm	2003/06/06 02:24:49	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.37 2002/10/28 23:28:52 albertel Exp $
+# $Id: lonfeedback.pm,v 1.45 2003/06/06 02:24:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,15 +105,20 @@ 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>
 My question/comment/feedback:<p>
 <textarea name=comment cols=60 rows=10 wrap=hard>
 </textarea><p>
-<input type=hidden name=sendit value=1>
-<input type=button value="Send Feedback" onClick='gosubmit();'></input>
+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>
 ENDDOCUMENT
 $r->print(&generate_preview_button().'</body></html>');
@@ -226,9 +231,10 @@ sub resource_output {
 }
 
 sub clear_out_html {
-  my $message=$ENV{'form.comment'};
+  my ($message,$override)=@_;
   my $cid=$ENV{'request.course.id'};
-  if ($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) {
+  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,
@@ -247,7 +253,7 @@ sub clear_out_html {
 }
 
 sub assemble_email {
-  my ($feedurl,$message,$prevattempts,$usersaw)=@_;
+  my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
   my $email=<<"ENDEMAIL";
 Refers to <a href="$feedurl">$feedurl</a>
 
@@ -259,6 +265,8 @@ $prevattempts
 <p><hr>
 <h2>Original screen output (if applicable)</h2>
 $usersaw
+<h2>Correct Answer(s) (if applicable)</h2>
+$useranswer
 ENDCITE
   return ($email,$citations);
 }
@@ -332,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)=~/ok/) {
+               'Feedback ['.$declutter.']',$email,$citations,$feedurl,
+                $attachmenturl)=~/ok/) {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	$sendsomething++;
@@ -362,7 +371,7 @@ sub send_msg {
 }
 
 sub adddiscuss {
-    my ($symb,$email,$anon)=@_;
+    my ($symb,$email,$anon,$attachmenturl)=@_;
     my $status='';
     if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
@@ -374,7 +383,8 @@ sub adddiscuss {
                  'plainname'    => $ENV{'environment.firstname'}.' '.
 		                   $ENV{'environment.middlename'}.' '.
                                    $ENV{'environment.lastname'}.' '.
-                                   $ENV{'enrironment.generation'});
+                                   $ENV{'enrironment.generation'},
+                 'attachmenturl'=> $attachmenturl);
     if ($anon) {
 	$contrib{'anonymous'}='true';
     }
@@ -435,7 +445,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                       ['hide','unhide','postdata','preview']);
+                             ['hide','unhide','deldisc','postdata','preview']);
 
   if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
@@ -467,6 +477,33 @@ sub handler {
 
     &redirect_back($r,&Apache::lonnet::clutter($url),
        'Changed discussion status<p>','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)=split(/\_\_\_/,$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),
+       'Changed discussion status<p>','0','0');
   } elsif ($ENV{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
       &show_preview($r);
@@ -522,29 +559,41 @@ sub handler {
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
 
+# Get resource answer
+      my $useranswer=&Apache::loncommon::get_student_answers(
+                       $symb,$ENV{'user.name'},$ENV{'user.domain'},
+		       $ENV{'request.course.id'});
+# 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);
+	  $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl);
 	  $numpost++;
       }
 
       if ($ENV{'form.anondiscuss'}) {
-	  $typestyle.=&adddiscuss($symb,$message,1);
+	  $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl);
 	  $numpost++;
       }