--- loncom/interface/lonfeedback.pm	2001/02/09 21:53:08	1.7
+++ loncom/interface/lonfeedback.pm	2001/07/26 23:26:56	1.13
@@ -11,12 +11,19 @@
 #
 # 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
+# 7/26 Guy Albertelli
+# 7/26 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) = @_;
@@ -28,26 +35,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();
@@ -85,7 +97,8 @@ sub fail_redirect {
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-Sorry, no recipients  ...
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<b>Sorry, no recipients  ...</b>
 </body>
 </html>
 ENDFAILREDIR
@@ -101,6 +114,7 @@ sub redirect_back {
 </head>
 <html>
 <body bgcolor="#FFFFFF">
+<img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle
 <b>Sent $sendsomething message(s).</b>
 <font color=red>$status</font>
@@ -116,18 +130,19 @@ sub no_redirect_back {
 <meta http-equiv="pragma" content="no-cache"></meta>
 ENDNOREDIR
 
-  if ($feedurl ne '/adm/feedback') { 
+  if ($feedurl!~/^\/adm\/feedback/) { 
     $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
   }
   
-  $r->print (<<ENDNOREDIR);
+  $r->print (<<ENDNOREDIRTWO);
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-Sorry, no feedback possible on this resource  ...
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<b>Sorry, no feedback possible on this resource  ...</b>
 </body>
 </html>
-ENDNOREDIR
+ENDNOREDIRTWO
 }
 
 sub screen_header {
@@ -139,7 +154,7 @@ sub screen_header {
   }
   if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {
     $options.=
-      '<br><input type=checkbox name=question> Question about resource content';
+    '<br><input type=checkbox name=question> Question about resource content';
   }
   if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
     $options.=
@@ -151,48 +166,11 @@ sub screen_header {
       '<br><input type=checkbox name=policy> '.
 	'Question/Comment/Feedback about course policy';
   }
-  return $options;
-}
-
-sub get_previous_attempt {
-  my ($feedurl)=@_;
-  my $symb=&Apache::lonnet::symbread($feedurl);
-  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);
-    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>';
+  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 {
@@ -237,26 +215,26 @@ sub decide_receiver {
   my $typestyle='';
   my %to=();
   if ($ENV{'form.author'}) {
-    $typestyle.='Author Feedback<br>';
+    $typestyle.='Submitting as Author Feedback<br>';
     $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
     $to{$2.':'.$1}=1;
   }
   if ($ENV{'form.question'}) {
-    $typestyle.='Question<br>';
+    $typestyle.='Submitting as Question<br>';
     map {
       $to{$_}=1;
     } split(/\,/,
 	    $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'});
   }
   if ($ENV{'form.course'}) {
-    $typestyle.='Comment<br>';
+    $typestyle.='Submitting as Comment<br>';
     map {
       $to{$_}=1;
     } split(/\,/,
 	    $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'});
   }
   if ($ENV{'form.policy'}) {
-    $typestyle.='Policy<br>';
+    $typestyle.='Submitting as Policy Feedback<br>';
     map {
       $to{$_}=1;
     } split(/\,/,
@@ -271,8 +249,8 @@ sub send_msg {
   my $sendsomething=0;
   map {
     if ($_) {
-      unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),'Feedback '.$feedurl,
-					       $email,$citations) eq 'ok') {
+      unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
+               'Feedback '.$feedurl,$email,$citations) eq 'ok') {
 	$status.='<br>Error sending message to '.$_.'<br>';
       } else {
 	#$status.='<br>Message sent to '.$_.'<br>';
@@ -283,18 +261,47 @@ sub send_msg {
   return ($status,$sendsomething);
 }
 
+sub adddiscuss {
+    my ($symb,$email)=@_;
+    my $status='';
+    my %contrib=('message'      => $email,
+                 'sendername'   => $ENV{'user.name'},
+                 'senderdomain' => $ENV{'user.domain'});
+    if (($symb) && ($email)) {
+       $status='Adding to class discussion: '.
+        &Apache::lonnet::store(\%contrib,$symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}).
+        '<br>';
+    }
+    return $status;   
+}
+
 sub handler {
   my $r = shift;
-  $r->content_type('text/html');
-  $r->send_http_header;
-  return OK if $r->header_only;
+  if ($r->header_only) {
+     $r->content_type('text/html');
+     $r->send_http_header;
+     return OK;
+  }
   
   my $feedurl=$ENV{'form.postdata'};
   $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+
+  my $symb=&Apache::lonnet::symbread($feedurl);
+  my $goahead=1;
+  if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+      unless ($symb) { $goahead=0; }
+  }
+
+  if ($goahead) {
+# Go ahead with feedback, no ambiguous reference
+    $r->content_type('text/html');
+    $r->send_http_header;
   
-  if (
+    if (
       (
        ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
       ) 
@@ -312,7 +319,9 @@ sub handler {
     } else {
       
 # Get previous user input
-      my $prevattempts=&get_previous_attempt($feedurl);
+      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);
@@ -321,7 +330,8 @@ sub handler {
       my $message=&clear_out_html;
 
 # Assemble email
-      my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,$usersaw);
+      my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+          $usersaw);
 
 # Who gets this?
       my ($typestyle,%to) = &decide_receiver($feedurl);
@@ -329,13 +339,23 @@ sub handler {
 # Actually send mail
       my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
 
+# Discussion? Store that.
+
+      if ($ENV{'form.discuss'}) {
+	  $typestyle.=&adddiscuss($symb,$message);
+      }
+
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$status,$numsent);
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$status);
 
     }
-  } else {
+   } else {
 # Unable to give feedback
     &no_redirect_back($r,$feedurl);
+   }
+  } else {
+# Ambiguous Problem Resource
+    $r->internal_redirect('/adm/ambiguous');
   }
   return OK;
 } 
