[BACK]Return to lonfeedback.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

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

version 1.7, 2001/02/09 21:53:08 version 1.8, 2001/02/10 14:10:13
Line 11 Line 11
 #  #
 # 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  # 2/9 Guy Albertelli
   # 2/10 Gerd Kortemeyer
   
 package Apache::lonfeedback;  package Apache::lonfeedback;
   
Line 85  sub fail_redirect { Line 86  sub fail_redirect {
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 Sorry, no recipients  ...  <img align=right src=/adm/lonIcons/lonlogos.gif>
   <b>Sorry, no recipients  ...</b>
 </body>  </body>
 </html>  </html>
 ENDFAILREDIR  ENDFAILREDIR
Line 101  sub redirect_back { Line 103  sub redirect_back {
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
   <img align=right src=/adm/lonIcons/lonlogos.gif>
 $typestyle  $typestyle
 <b>Sent $sendsomething message(s).</b>  <b>Sent $sendsomething message(s).</b>
 <font color=red>$status</font>  <font color=red>$status</font>
Line 116  sub no_redirect_back { Line 119  sub no_redirect_back {
 <meta http-equiv="pragma" content="no-cache"></meta>  <meta http-equiv="pragma" content="no-cache"></meta>
 ENDNOREDIR  ENDNOREDIR
   
   if ($feedurl ne '/adm/feedback') {     if ($feedurl!~/^\/adm\/feedback/) { 
     $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');      $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
   }    }
       
   $r->print (<<ENDNOREDIR);    $r->print (<<ENDNOREDIRTWO);
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  <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>  </body>
 </html>  </html>
 ENDNOREDIR  ENDNOREDIRTWO
 }  }
   
 sub screen_header {  sub screen_header {
Line 139  sub screen_header { Line 143  sub screen_header {
   }    }
   if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {    if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {
     $options.=      $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'}) {    if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
     $options.=      $options.=
Line 155  sub screen_header { Line 159  sub screen_header {
 }  }
   
 sub get_previous_attempt {  sub get_previous_attempt {
   my ($feedurl)=@_;    my ($symb)=@_;
   my $symb=&Apache::lonnet::symbread($feedurl);  
   my $prevattempts='';    my $prevattempts='';
   if ($symb) {    if ($symb) {
     my $answer=&Apache::lonnet::reply(      my $answer=&Apache::lonnet::reply(
       "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.                "restore:".$ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.
       $ENV{'request.course.id'}.':'.        $ENV{'request.course.id'}.':'.
       &Apache::lonnet::escape($symb),        &Apache::lonnet::escape($symb),
       $ENV{'user.home'});        $ENV{'user.home'});
Line 170  sub get_previous_attempt { Line 173  sub get_previous_attempt {
       $returnhash{&Apache::lonnet::unescape($name)}=        $returnhash{&Apache::lonnet::unescape($name)}=
  &Apache::lonnet::unescape($value);   &Apache::lonnet::unescape($value);
     } split(/\&/,$answer);      } split(/\&/,$answer);
     my %lasthash=();      if ($returnhash{'version'}) {
     my $version;        my %lasthash=();
     for ($version=1;$version<=$returnhash{'version'};$version++) {        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 {        map {
  $lasthash{$_}=$returnhash{$version.':'.$_};          $prevattempts.='<th>'.$_.'</th>';
       } split(/\:/,$returnhash{$version.':keys'});        } keys %lasthash;
     }        for ($version=1;$version<=$returnhash{'version'};$version++) {
     $prevattempts='<table border=2></tr><th>History</th>';          $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';
     map {          map {
       $prevattempts.='<th>'.$_.'</th>';    $prevattempts.='<td>'.$returnhash{$version.':'.$_}.'</td>';   
     } keys %lasthash;          } keys %lasthash;
     for ($version=1;$version<=$returnhash{'version'};$version++) {        }
       $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';        $prevattempts.='</tr><tr><th>Current</th>';
       map {        map {
  $prevattempts.='<td>'.$returnhash{$version.':'.$_}.'</td>';             $prevattempts.='<td>'.$lasthash{$_}.'</td>';
       } keys %lasthash;        } keys %lasthash;
         $prevattempts.='</tr></table>';
       } else {
         $prevattempts='Nothing submitted - no attempts.';
     }      }
     $prevattempts.='</tr><tr><th>Current</th>';    } else {
     map {      $prevattempts='No data.';
       $prevattempts.='<td>'.$lasthash{$_}.'</td>';  
     } keys %lasthash;  
     $prevattempts.='</tr></table>';  
   }    }
 }  }
   
Line 237  sub decide_receiver { Line 246  sub decide_receiver {
   my $typestyle='';    my $typestyle='';
   my %to=();    my %to=();
   if ($ENV{'form.author'}) {    if ($ENV{'form.author'}) {
     $typestyle.='Author Feedback<br>';      $typestyle.='Submitting as Author Feedback<br>';
     $feedurl=~/^\/res\/(\w+)\/(\w+)\//;      $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
     $to{$2.':'.$1}=1;      $to{$2.':'.$1}=1;
   }    }
   if ($ENV{'form.question'}) {    if ($ENV{'form.question'}) {
     $typestyle.='Question<br>';      $typestyle.='Submitting as Question<br>';
     map {      map {
       $to{$_}=1;        $to{$_}=1;
     } split(/\,/,      } split(/\,/,
     $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'});      $ENV{'course.'.$ENV{'request.course.id'}.'.question.email'});
   }    }
   if ($ENV{'form.course'}) {    if ($ENV{'form.course'}) {
     $typestyle.='Comment<br>';      $typestyle.='Submitting as Comment<br>';
     map {      map {
       $to{$_}=1;        $to{$_}=1;
     } split(/\,/,      } split(/\,/,
     $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'});      $ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'});
   }    }
   if ($ENV{'form.policy'}) {    if ($ENV{'form.policy'}) {
     $typestyle.='Policy<br>';      $typestyle.='Submitting as Policy Feedback<br>';
     map {      map {
       $to{$_}=1;        $to{$_}=1;
     } split(/\,/,      } split(/\,/,
Line 271  sub send_msg { Line 280  sub send_msg {
   my $sendsomething=0;    my $sendsomething=0;
   map {    map {
     if ($_) {      if ($_) {
       unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),'Feedback '.$feedurl,        unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_),
        $email,$citations) eq 'ok') {                 'Feedback '.$feedurl,$email,$citations) eq 'ok') {
  $status.='<br>Error sending message to '.$_.'<br>';   $status.='<br>Error sending message to '.$_.'<br>';
       } else {        } else {
  #$status.='<br>Message sent to '.$_.'<br>';   #$status.='<br>Message sent to '.$_.'<br>';
Line 285  sub send_msg { Line 294  sub send_msg {
   
 sub handler {  sub handler {
   my $r = shift;    my $r = shift;
   $r->content_type('text/html');    if ($r->header_only) {
   $r->send_http_header;       $r->content_type('text/html');
   return OK if $r->header_only;       $r->send_http_header;
        return OK;
     }
       
   my $feedurl=$ENV{'form.postdata'};    my $feedurl=$ENV{'form.postdata'};
   $feedurl=~s/^http\:\/\///;    $feedurl=~s/^http\:\/\///;
   $feedurl=~s/^$ENV{'SERVER_NAME'}//;    $feedurl=~s/^$ENV{'SERVER_NAME'}//;
   $feedurl=~s/^$ENV{'HTTP_HOST'}//;    $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:)         ($feedurl=~m:^/res:) && ($feedurl!~m:^/res/adm:)
       )         ) 
Line 312  sub handler { Line 334  sub handler {
     } else {      } else {
               
 # Get previous user input  # Get previous user input
       my $prevattempts=&get_previous_attempt($feedurl);        my $prevattempts=&get_previous_attempt($symb);
   
 # Get output from resource  # Get output from resource
       my $usersaw=&resource_output($feedurl);        my $usersaw=&resource_output($feedurl);
Line 321  sub handler { Line 343  sub handler {
       my $message=&clear_out_html;        my $message=&clear_out_html;
   
 # Assemble email  # Assemble email
       my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,$usersaw);        my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
             $usersaw);
   
 # Who gets this?  # Who gets this?
       my ($typestyle,%to) = &decide_receiver($feedurl);        my ($typestyle,%to) = &decide_receiver($feedurl);
Line 330  sub handler { Line 353  sub handler {
       my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);        my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to);
   
 # Receipt screen and redirect back to where came from  # 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  # Unable to give feedback
     &no_redirect_back($r,$feedurl);      &no_redirect_back($r,$feedurl);
      }
     } else {
   # Ambiguous Problem Resource
       $r->internal_redirect('/adm/ambiguous');
   }    }
   return OK;    return OK;
 }   } 
Removed from v.1.7  
changed lines
  Added in v.1.8

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