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

Diff for /loncom/interface/lonprintout.pm between versions 1.627.2.24 and 1.627.2.25

version 1.627.2.24, 2018/09/04 14:35:21 version 1.627.2.25, 2018/10/02 19:25:30
Line 4077  sub printHelper { Line 4077  sub printHelper {
     my $subdir;      my $subdir;
     my $is_published=0; # True when printing from resource space.      my $is_published=0; # True when printing from resource space.
     my $res_printable = 1; # By default the current resource is printable.          my $res_printable = 1; # By default the current resource is printable.    
       my $res_error;
     my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});      my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
     my $res_printstartdate;      my $res_printstartdate;
     my $res_printenddate;      my $res_printenddate;
Line 4098  sub printHelper { Line 4099  sub printHelper {
     ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);      ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
     $helper->{VARS}->{'postdata'} =       $helper->{VARS}->{'postdata'} = 
  &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));   &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
     my $navmap = Apache::lonnavmaps::navmap->new();              if (!$userCanPrint) {
     my $res   = $navmap->getBySymb($symb);          my $navmap = Apache::lonnavmaps::navmap->new();
     $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context                  if (ref($navmap)) {
     ($res_printstartdate, $res_printenddate) = &get_print_dates($res);              my $res = $navmap->getBySymb($symb);
     ($course_open, $course_close) = &course_print_dates($res);                      if (ref($res)) {
     ($map_open, $map_close)       = &map_print_dates($res);                  $res_printable = $res->resprintable(); #printability in course context
                   ($res_printstartdate, $res_printenddate) = &get_print_dates($res);
                   ($course_open, $course_close) = &course_print_dates($res);
                   ($map_open, $map_close) = &map_print_dates($res);
                       } else {
                           $res_error = 1;
                       }
                   } else {
                       $res_error = 1;
                   }
               }
  } else {   } else {
     # Resource space.      # Resource space.
   
Line 4705  CHOOSE_FROM_ANY_SEQUENCE Line 4715  CHOOSE_FROM_ANY_SEQUENCE
     # Generate the first state, to select which resources get printed.      # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");      Apache::lonhelper::state->new("START", "Select Printing Options:");
     if (!$res_printable) {      if (!$res_printable) {
         my $now = time;  
         my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);  
         my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);  
         my $noprintmsg;          my $noprintmsg;
         if (($res_printenddate) && ($res_printenddate < $now)) {          if ($res_error) {
               $noprintmsg = &mt('Print availability for current resource could not be determined');
           } else {
               my $now = time;
               my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
               my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
               if (($res_printenddate) && ($res_printenddate < $now)) {
                 $noprintmsg = &mt('Printing for current resource no longer available (ended: [_1])',                  $noprintmsg = &mt('Printing for current resource no longer available (ended: [_1])',
                                   $shownprintend);                                    $shownprintend);
         } else {              } else {
             if (($res_printstartdate) && ($res_printstartdate > $now)) {                  if (($res_printstartdate) && ($res_printstartdate > $now)) {
                 if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {                      if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
                     $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',                          $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
                                   $shownprintstart,$shownprintend);                                            $shownprintstart,$shownprintend);
                 } elsif (!$res_printenddate) {                      } elsif (!$res_printenddate) {
                     $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',                          $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
                                       $shownprintstart);                                            $shownprintstart);
                 } else {                      } else {
                     $noprintmsg = &mt('Printing for current resource is unavailable');                          $noprintmsg = &mt('Printing for current resource is unavailable');
                       }
                 }                  }
             }              }
         }          }
Removed from v.1.627.2.24  
changed lines
  Added in v.1.627.2.25

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