Diff for /loncom/interface/lonfeedback.pm between versions 1.6 and 1.7

version 1.6, 2001/02/09 21:17:48 version 1.7, 2001/02/09 21:53:08
Line 10 Line 10
 # 3/1/1 Gerd Kortemeyer)  # 3/1/1 Gerd Kortemeyer)
 #  #
 # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer  # 3/1,2/3,2/5,2/6,2/8 Gerd Kortemeyer
 #  # 2/9 Guy Albertelli
   
 package Apache::lonfeedback;  package Apache::lonfeedback;
   
 use strict;  use strict;
Line 23  sub mail_screen { Line 24  sub mail_screen {
 <html>  <html>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
   <meta http-equiv="pragma" content="no-cache"></meta>
 <script>  <script>
     function gosubmit() {      function gosubmit() {
         var rec=0;          var rec=0;
Line 78  sub fail_redirect { Line 80  sub fail_redirect {
   my ($r,$feedurl) = @_;    my ($r,$feedurl) = @_;
   $r->print (<<ENDFAILREDIR);    $r->print (<<ENDFAILREDIR);
 <head><title>Feedback not sent</title>  <head><title>Feedback not sent</title>
   <meta http-equiv="pragma" content="no-cache"></meta>
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">  <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>  </head>
 <html>  <html>
Line 93  sub redirect_back { Line 96  sub redirect_back {
   $r->print (<<ENDREDIR);    $r->print (<<ENDREDIR);
 <head>  <head>
 <title>Feedback sent</title>  <title>Feedback sent</title>
   <meta http-equiv="pragma" content="no-cache"></meta>
 <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">  <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl">
 </head>  </head>
 <html>  <html>
Line 109  sub no_redirect_back { Line 113  sub no_redirect_back {
   my ($r,$feedurl) = @_;    my ($r,$feedurl) = @_;
   $r->print (<<ENDNOREDIR);    $r->print (<<ENDNOREDIR);
 <head><title>Feedback not sent</title>  <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>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
Line 283  sub handler { Line 294  sub handler {
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;    $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;    $feedurl=~s/^$ENV{'HTTP_HOST'}//;
       
   if ((($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/))     if (
       || ($ENV{'request.course.id'})) {        (
          ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
         ) 
         || 
         ($ENV{'request.course.id'} && ($feedurl!~m:^/adm:))
        ) {
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
     unless ($ENV{'form.sendit'}) {      unless ($ENV{'form.sendit'}) {
       my $options=&screen_header($feedurl);        my $options=&screen_header($feedurl);
Line 318  sub handler { Line 334  sub handler {
   
     }      }
   } else {    } else {
   # Unable to give feedback
     &no_redirect_back($r,$feedurl);      &no_redirect_back($r,$feedurl);
   }    }
   return OK;    return OK;

Removed from v.1.6  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>