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

Diff for /loncom/interface/lonprintout.pm between versions 1.650 and 1.654

version 1.650, 2016/08/10 16:06:03 version 1.654, 2017/01/29 23:34:58
Line 2743  ENDPART Line 2743  ENDPART
     $cleanURL=$currentURL;      $cleanURL=$currentURL;
  }   }
  $selectionmade = 1;   $selectionmade = 1;
         
  if ($cleanURL!~m|^/adm/|   if ($cleanURL!~m|^/adm/|
     && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {      && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
     my $rndseed=time;      my $rndseed=time;
Line 2956  ENDPART Line 2956  ENDPART
     my $texversion='';      my $texversion='';
     if ($urlp!~m|^/adm/|      if ($urlp!~m|^/adm/|
  && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
                   my $extension = $1;
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  &Apache::lonxml::remember_problem_counter();   &Apache::lonxml::remember_problem_counter();
  if ($flag_latex_header_remove eq 'NO') {   if ($flag_latex_header_remove eq 'NO') {
Line 2964  ENDPART Line 2965  ENDPART
                             (($i==0) &&                              (($i==0) &&
                              (($urlp=~/\.page$/) ||                               (($urlp=~/\.page$/) ||
                               ($print_type eq 'map_problems_in_page') ||                                ($print_type eq 'map_problems_in_page') ||
                               ($print_type eq 'map_resources_in_page')))) {                                (($print_type eq 'map_resources_in_page') && ($extension !~ /^x?html?$/))))) {
                         $flag_latex_header_remove = 'YES';                          $flag_latex_header_remove = 'YES';
                     }                      }
  }   }
Line 3447  ENDPART Line 3448  ENDPART
  $URLback=$helper->{'VARS'}->{'filename'};   $URLback=$helper->{'VARS'}->{'filename'};
     } elsif ($helper->{VARS}{'symb'}) {      } elsif ($helper->{VARS}{'symb'}) {
         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});          my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
         $URLback = &Apache::lonnet::clutter($url);          $url = &Apache::lonnet::clutter($url);
           if ($env{'request.enc'}) {
               $url = &Apache::lonenc::encrypted($url); 
           }
           $URLback = $url.($url =~ /\?/) ? '&':'?'.'?symb='.$helper->{VARS}{'symb'};
     }      }
     #      #
     # Final adjustment of the font size:      # Final adjustment of the font size:
Removed from v.1.650  
changed lines
  Added in v.1.654

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