--- loncom/interface/lonfeedback.pm	2001/02/09 21:17:48	1.6
+++ loncom/interface/lonfeedback.pm	2001/02/09 21:53:08	1.7
@@ -10,7 +10,8 @@
 # 3/1/1 Gerd Kortemeyer)
 #
 # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
-#
+# 2/9 Guy Albertelli
+
 package Apache::lonfeedback;
 
 use strict;
@@ -23,6 +24,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,6 +80,7 @@ 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>
@@ -93,6 +96,7 @@ 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>
@@ -109,7 +113,14 @@ 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 ne '/adm/feedback') { 
+    $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
+  }
+  
+  $r->print (<<ENDNOREDIR);
 </head>
 <html>
 <body bgcolor="#FFFFFF">
@@ -283,8 +294,13 @@ sub handler {
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;
   
-  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);
@@ -318,6 +334,7 @@ sub handler {
 
     }
   } else {
+# Unable to give feedback
     &no_redirect_back($r,$feedurl);
   }
   return OK;
