--- loncom/interface/lonfeedback.pm	2001/02/09 21:17:48	1.6
+++ loncom/interface/lonfeedback.pm	2001/02/10 14:10:13	1.8
@@ -10,7 +10,9 @@
 # 3/1/1 Gerd Kortemeyer)
 #
 # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
-#
+# 2/9 Guy Albertelli
+# 2/10 Gerd Kortemeyer
+
 package Apache::lonfeedback;
 
 use strict;
@@ -23,6 +25,7 @@ sub mail_screen {
 <html>
 <head>
 <title>The LearningOnline Network with CAPA</title>
+<meta http-equiv="pragma" content="no-cache"></meta>
 <script>
     function gosubmit() {
         var rec=0;
@@ -78,11 +81,13 @@ sub fail_redirect {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDFAILREDIR);
 <head><title>Feedback not sent</title>
+<meta http-equiv="pragma" content="no-cache"></meta>
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-Sorry, no recipients  ...
+<img align=right src=/adm/lonIcons/lonlogos.gif>
+<b>Sorry, no recipients  ...</b>
 </body>
 </html>
 ENDFAILREDIR
@@ -93,10 +98,12 @@ sub redirect_back {
   $r->print (<<ENDREDIR);
 <head>
 <title>Feedback sent</title>
+<meta http-equiv="pragma" content="no-cache"></meta>
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </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>
@@ -109,14 +116,22 @@ sub no_redirect_back {
   my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);
 <head><title>Feedback not sent</title>
-<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
+<meta http-equiv="pragma" content="no-cache"></meta>
+ENDNOREDIR
+
+  if ($feedurl!~/^\/adm\/feedback/) { 
+    $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
+  }
+  
+  $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 {
@@ -128,7 +143,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.=
@@ -144,12 +159,11 @@ sub screen_header {
 }
 
 sub get_previous_attempt {
-  my ($feedurl)=@_;
-  my $symb=&Apache::lonnet::symbread($feedurl);
+  my ($symb)=@_;
   my $prevattempts='';
   if ($symb) {
     my $answer=&Apache::lonnet::reply(
-				      "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.
+	              "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.
 				      $ENV{'request.course.id'}.':'.
 				      &Apache::lonnet::escape($symb),
 				      $ENV{'user.home'});
@@ -159,28 +173,34 @@ sub get_previous_attempt {
       $returnhash{&Apache::lonnet::unescape($name)}=
 	&Apache::lonnet::unescape($value);
     } split(/\&/,$answer);
-    my %lasthash=();
-    my $version;
-    for ($version=1;$version<=$returnhash{'version'};$version++) {
+    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 {
-	$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>';
+        $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>'.$returnhash{$version.':'.$_}.'</td>';   
+        $prevattempts.='<td>'.$lasthash{$_}.'</td>';
       } keys %lasthash;
+      $prevattempts.='</tr></table>';
+    } else {
+      $prevattempts='Nothing submitted - no attempts.';
     }
-    $prevattempts.='</tr><tr><th>Current</th>';
-    map {
-      $prevattempts.='<td>'.$lasthash{$_}.'</td>';
-    } keys %lasthash;
-    $prevattempts.='</tr></table>';
+  } else {
+    $prevattempts='No data.';
   }
 }
 
@@ -226,26 +246,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(/\,/,
@@ -260,8 +280,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>';
@@ -274,17 +294,35 @@ sub send_msg {
 
 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 ((($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) 
-      || ($ENV{'request.course.id'})) {
+    if (
+      (
+       ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
+      ) 
+      || 
+      ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
+     ) {
 # --------------------------------------------------- Print login screen header
     unless ($ENV{'form.sendit'}) {
       my $options=&screen_header($feedurl);
@@ -296,7 +334,7 @@ sub handler {
     } else {
       
 # Get previous user input
-      my $prevattempts=&get_previous_attempt($feedurl);
+      my $prevattempts=&get_previous_attempt($symb);
 
 # Get output from resource
       my $usersaw=&resource_output($feedurl);
@@ -305,7 +343,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);
@@ -314,11 +353,16 @@ sub handler {
       my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
 
 # 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;
 } 
