--- loncom/interface/lonfeedback.pm	2001/02/10 14:10:13	1.8
+++ loncom/interface/lonfeedback.pm	2001/07/26 15:50:25	1.11
@@ -12,12 +12,15 @@
 # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
 # 2/9 Guy Albertelli
 # 2/10 Gerd Kortemeyer
+# 2/13 Guy Albertelli
+# 7/25 Gerd Kortemeyer
 
 package Apache::lonfeedback;
 
 use strict;
 use Apache::Constants qw(:common);
 use Apache::lonmsg();
+use Apache::loncommon();
 
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
@@ -29,26 +32,31 @@ sub mail_screen {
 <script>
     function gosubmit() {
         var rec=0;
-        if (document.mailform.elements.author!=undefined) {
+        if (typeof(document.mailform.elements.author!=undefined)) {
           if (document.mailform.elements.author.checked) {
              rec=1;
           } 
         }
-        if (document.mailform.elements.question!=undefined) {
+        if (typeof(document.mailform.elements.question!=undefined)) {
           if (document.mailform.elements.question.checked) {
              rec=1;
           } 
         }
-        if (document.mailform.elements.course!=undefined) {
+        if (typeof(document.mailform.elements.course!=undefined)) {
           if (document.mailform.elements.course.checked) {
              rec=1;
           } 
         }
-        if (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 (document.mailform.elements.discuss.checked) {
+             rec=1;
+          } 
+        }
 
         if (rec) {
 	    document.mailform.submit();
@@ -155,53 +163,11 @@ sub screen_header {
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
-  return $options;
-}
-
-sub get_previous_attempt {
-  my ($symb)=@_;
-  my $prevattempts='';
-  if ($symb) {
-    my $answer=&Apache::lonnet::reply(
-	              "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.
-				      $ENV{'request.course.id'}.':'.
-				      &Apache::lonnet::escape($symb),
-				      $ENV{'user.home'});
-    my %returnhash=();
-    map {
-      my ($name,$value)=split(/\=/,$_);
-      $returnhash{&Apache::lonnet::unescape($name)}=
-	&Apache::lonnet::unescape($value);
-    } split(/\&/,$answer);
-    if ($returnhash{'version'}) {
-      my %lasthash=();
-      my $version;
-      for ($version=1;$version<=$returnhash{'version'};$version++) {
-        map {
-	  $lasthash{$_}=$returnhash{$version.':'.$_};
-        } split(/\:/,$returnhash{$version.':keys'});
-      }
-      $prevattempts='<table border=2></tr><th>History</th>';
-      map {
-        $prevattempts.='<th>'.$_.'</th>';
-      } keys %lasthash;
-      for ($version=1;$version<=$returnhash{'version'};$version++) {
-        $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';
-        map {
-	  $prevattempts.='<td>'.$returnhash{$version.':'.$_}.'</td>';   
-        } keys %lasthash;
-      }
-      $prevattempts.='</tr><tr><th>Current</th>';
-      map {
-        $prevattempts.='<td>'.$lasthash{$_}.'</td>';
-      } keys %lasthash;
-      $prevattempts.='</tr></table>';
-    } else {
-      $prevattempts='Nothing submitted - no attempts.';
-    }
-  } else {
-    $prevattempts='No data.';
+  if ($ENV{'request.course.id'}) {
+    $options.='<br><input type=checkbox name=discuss> '.
+	'<b>Contribution to course discussion of resource</b>';
   }
+  return $options;
 }
 
 sub resource_output {
@@ -334,7 +300,9 @@ sub handler {
     } else {
       
 # Get previous user input
-      my $prevattempts=&get_previous_attempt($symb);
+      my $prevattempts=&Apache::loncommon::get_previous_attempt(
+            $symb,$ENV{'user.name'},$ENV{'user.domain'},
+            $ENV{'request.course.id'});
 
 # Get output from resource
       my $usersaw=&resource_output($feedurl);