--- loncom/interface/lonprintout.pm	2016/12/06 03:46:09	1.627.2.19
+++ loncom/interface/lonprintout.pm	2020/02/29 16:05:30	1.671
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627.2.19 2016/12/06 03:46:09 raeburn Exp $
+# $Id: lonprintout.pm,v 1.671 2020/02/29 16:05:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,7 +157,7 @@ sub create_incomplete_folder_selstud_hel
 
     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
 						      'Select problem(s) to print',
-						      'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+						      'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
 						      'RESOURCES',
 						      'CHOOSE_STUDENTS_INCOMPLETE',
 						      $map,
@@ -206,7 +206,7 @@ sub create_incomplete_course_helper {
     
     my $resource_chooser = &generate_resource_chooser('INCOMPLETE_PROBLEMS_COURSE_RESOURCES',
 						      'Select problem(s) to print',
-						      'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1"',
+						      'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1" modallink="1"',
 						      'RESOURCES',
 						      'INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
 						      '',
@@ -252,7 +252,7 @@ sub create_incomplete_folder_helper {
 
     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
 						      'Select problem(s) to print',
-						      'multichoice="1", toponly ="1", addstatus="1", closeallpages="1"',
+						      'multichoice="1", toponly ="1", addstatus="1", closeallpages="1" modallink="1"',
 						      'RESOURCES',
 						      'PAGESIZE',
 						      $map,
@@ -306,7 +306,8 @@ CHOOSE_STUDENTS
 #     this_state    - State name of the chooser.
 #     prompt_text   - Text to use to prompt user.
 #     resource_options - Resource tag options e.g.
-#                        "multichoice='1', toponly='1', addstatus='1'"
+#                        "multichoice='1', toponly='1', addstatus='1',
+#                         modallink='1'" 
 #                     that control the selection and appearance of the
 #                     resource selector.
 #     variable      - Name of the variable to hold the choice
@@ -578,7 +579,6 @@ sub printable {
 #       date for printing checks printstartdate param first, then, if not set,
 #       opendate param, then, if not set, contentopen param.
 
-
 sub get_print_dates {
     my $res = shift;
     my $partsref = $res->parts();
@@ -746,7 +746,7 @@ sub master_seq_to_person_seq {
     }
     
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
-                                                           $code,$unhidden);
+                                                           $code, $unhidden);
     my ($start,$finish);
 
     if ($map) {
@@ -766,13 +766,13 @@ sub master_seq_to_person_seq {
     #  Iterate on the resource..select the items that are randomly selected
     #  and that are in the seq_has.  Presumably the iterator will take care
     # of the random ordering part of the deal.
+    #
     my $curres;
     while ($curres = $iterator->next()) {
 	#
 	#  Only process resources..that are not removed by randomout...
 	#  and are selected for printint as well.
 	#
-
         if (ref($curres) && ! $curres->randomout()) {
             my $currsymb = $curres->symb();
             if (exists($seq_hash{$currsymb})) {
@@ -847,8 +847,9 @@ sub set_font_size {
     if ($font_size ne '') {
 
 	$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
+        $text =~ s/\\end\{document}/}\\end{document}/;
+
     }
-    $text =~ s/\\end\{document}/}\\end{document}/;
     return $text;
 
 
@@ -890,7 +891,7 @@ sub include_pdf {
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     $file =~ s{(.*)/res/}{$londocroot/res/};
 
-    open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+    open(FILE,">>","$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
     print FILE ("$file\n");
     close (FILE);
 
@@ -1059,12 +1060,12 @@ sub printf_style_subst {
 #     %s    - The section if it is supplied.
 #
 sub format_page_header {
-    my ($width, $format, $assignment, $course, $student) = @_;
+    my ($width, $format, $assignment, $course, $student, $section) = @_;
 
 
 
     $width = &recalcto_mm($width); # Get width in mm.
-    my $chars_per_line = int($width/2);   # Character/textline.
+    my $chars_per_line = int($width/1.6);   # Character/textline.
 
     #  Default format?
 
@@ -1080,38 +1081,34 @@ sub format_page_header {
 	# - Allow the assignment to be 2 lines (wrapped).
 	#
 
-        my $firstline = "$student $course";
-        if (length($firstline) > $chars_per_line) {
-            my $lastchar = $chars_per_line - length($student) - 1;
-            if ($lastchar > 0) {
-                $course = substr($course, 0, $lastchar);
-            } else {            # Nothing left of course:
-                $course = '';
-            }
-        }
-        if (length($assignment) > $chars_per_line) {
-            $assignment = substr($assignment, 0, $chars_per_line);
-        }
+	
 
-        $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+	my $name_length    = int($chars_per_line *3 /4);
+	my $sec_length     = int($chars_per_line / 5);
 
-    } else {
-        # An open question is how to handle long user formatted page headers...
-        # A possible future is to support e.g. %na so that the user can control
-        # the truncation of the elements that can appear in the header.
-        #
-        $format =  &printf_style_subst("a", $format, $assignment);
-        $format =  &printf_style_subst("c", $format, $course);
-        $format =  &printf_style_subst("n", $format, $student);
-
-        # If the user put %'s in the format string, they must be escaped
-        # to \% else LaTeX will think they are comments and terminate
-        # the line.. which is bad!!!
+	$format  = "%$name_length".'n';
 
-    }
+	if ($section) {
+	    $format .=  ' - Sec: '."%$sec_length".'s';
+	}
 
-    return $format;
+	$format .= '\\\\%c \\\\ %a';
+        
 
+    }
+    # An open question is how to handle long user formatted page headers...
+    # A possible future is to support e.g. %na so that the user can control
+    # the truncation of the elements that can appear in the header.
+    #
+    $format =  &printf_style_subst("a", $format, $assignment);
+    $format =  &printf_style_subst("c", $format, $course);
+    $format =  &printf_style_subst("n", $format, $student);
+    $format =  &printf_style_subst("s", $format, $section);
+    
+    
+    # If the user put %'s in the format string, they  must be escaped
+    # to \% else LaTeX will think they are comments and terminate
+    # the line.. which is bad!!!
     
     # If the user has role author, $course and $assignment are empty so
     # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
@@ -1237,9 +1234,8 @@ sub is_valid_alpha_code {
 sub is_code_valid {
     my ($code_value, $code_option) = @_;
     my ($code_type, $code_length) = ('letter', 6);	# defaults.
-    my @lines = &Apache::grades::get_scantronformat_file();
+    my @lines = &Apache::lonnet::get_scantronformat_file();
     foreach my $line (@lines) {
-        next if (($line =~ /^\#/) || ($line eq ''));
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -1848,6 +1844,8 @@ sub get_course {
     my $courseidinfo;
     if (defined($env{'request.course.id'})) {
 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+	my $sec = $env{'request.course.sec'};
+	    
     }
     return $courseidinfo;
 }
@@ -1870,7 +1868,6 @@ sub page_format_transformation {
 
     my $name = &get_name();
     my $courseidinfo = &get_course();
-    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($textwidth, $header_text, $assignment,
 					   $courseidinfo, $name);
@@ -1961,7 +1958,7 @@ sub latex_corrections {
 	$result =~ s/(\\end\{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
     }
     $result =~ s/\$number_of_columns/$number_of_columns/g;
-    $result =~ s/(\\end\{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
+    $result =~ s/(\\end\{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]\{\\hrulefill})/$2$1/g;
     $result =~ s/(\\end\{longtable}\s*)\\strut\\newline/$1/g;
 #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);
@@ -2082,9 +2079,10 @@ sub unsupported {
         $currentURL=~s|^http://https://|https://|;
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
-	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
+        my $url =  &Apache::lonxml::latex_special_symbols($currentURL);
+	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$url.' ';
     } else {
-	$result.=$currentURL;
+	$result.= &Apache::lonxml::latex_special_symbols($currentURL);
     }
     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
     return $result;
@@ -2177,7 +2175,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFields'} = 'no'; # 
+	    $form{'pdfFormFields'} = $pdfFormFields; # 
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -2713,7 +2711,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    $form{'pdfFormFields'} = 'no';
+    $form{'pdfFormFields'} = $pdfFormFields;
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -2852,9 +2850,10 @@ ENDPART
 		$result = &print_latex_header() . $result;
 	    }
 	    # End construction space sequence.
-	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+                if ($currentURL=~/\/ext\.tool$/) {$currentURL=~s/^\/adm\/wrapper//;}
 		$resources_printed .= $currentURL.':';
 		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -3037,7 +3036,6 @@ ENDPART
 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
 		    my $name = &get_name();
 		    my $courseidinfo = &get_course();
-                    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
 		    my $header_text = $parmhash{'print_header_format'};
 		    $header_text    = &format_page_header($textwidth, $header_text,
@@ -3052,9 +3050,10 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+                if ($urlp=~/\/ext\.tool$/) {$urlp=~s/^\/adm\/wrapper//;}
 		$resources_printed .= $urlp.':';
 		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -3227,7 +3226,7 @@ ENDPART
 	 $result .= $print_array[0].'  \end{document}';
      } elsif (($print_type eq 'problems_for_anon')      ||
 	      ($print_type eq 'problems_for_anon_page') ||
-	      ($print_type eq 'resources_for_anon')  ) { 
+	      ($print_type eq 'resources_for_anon')  ) {
 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
@@ -3236,7 +3235,7 @@ ENDPART
 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-         my @lines = &Apache::grades::get_scantronformat_file();
+         my @lines = &Apache::lonnet::get_scantronformat_file();
 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
 	 foreach my $line (@lines) {
              chomp($line);
@@ -3322,7 +3321,7 @@ ENDPART
 	 my $count=0;
          my $nohidemap;
          if ($perm{'pav'} && $perm{'vgr'}) {
-             $nohidemap = 1; 
+             $nohidemap = 1;
          }
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
@@ -3353,7 +3352,7 @@ ENDPART
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
-     } elsif ($print_type eq 'problems_from_directory') {      
+     } elsif ($print_type eq 'problems_from_directory') {
     #prints selected problems from the subdirectory 
 	$selectionmade = 6;
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
@@ -3454,7 +3453,36 @@ ENDPART
 	$URLback=$helper->{'VARS'}->{'filename'};
     } elsif ($helper->{VARS}{'symb'}) {
         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-        $URLback = &Apache::lonnet::clutter($url);
+        my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
+        my ($anchor,$usehttp);
+        $url = &Apache::lonnet::clutter($url);
+        if (($ENV{'SERVER_PORT'} == 443) && ($env{'request.course.id'}) &&
+            (($url =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) ||
+             ($url =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}))) {
+            unless (&Apache::lonnet::uses_sts()) {
+                $usehttp = 1;
+            }
+        }
+        if ($env{'request.enc'}) {
+            $url = &Apache::lonenc::encrypted($url); 
+        }
+        if ($url ne '') {
+            my $symb = $helper->{VARS}{'symb'};
+            if ($url =~ m{^\Q/adm/wrapper/ext/\E}) {
+                my $link = $url;
+                ($link,$anchor) = ($url =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
+                if ($anchor) {
+                    ($symb) = ($helper->{VARS}{'symb'} =~ /^([^\#]+)/);
+                }
+                $url = $link;
+            }
+            $URLback = $url;
+            if ($usehttp) {
+                $URLback .= (($URLback =~ /\?/) ? '&amp;':'?').'usehttp=1';
+            }
+            $URLback .= (($URLback =~ /\?/) ? '&amp;':'?').'symb='.&escape($symb.$anchor);
+        }
     }
     #
     # Final adjustment of the font size:
@@ -3538,7 +3566,7 @@ ENDPART
 				'cgi.'.$identifier.'.role' => $perm{'pav'},
 				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
 				'cgi.'.$identifier.'.studentnames' => $student_names,
-				'cgi.'.$identifier.'.backref' => $URLback,});
+				'cgi.'.$identifier.'.backref' => &escape($URLback),});
     &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
 				"cgi.$identifier.domain"  => $env{'user.domain'},
 				"cgi.$identifier.courseid" => $cnum, 
@@ -3638,8 +3666,6 @@ sub print_resources {
     my $assignment;
     my $courseidinfo = &get_course();
     my $possprint = scalar(@{$master_seq});
-    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-    if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
 
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
@@ -3723,7 +3749,7 @@ sub print_resources {
 			$rendered =~ s/\\end\{document}//;
 		    }
 		    $current_output .= $rendered;		    
-		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) {
 		    if ($i == 1) {
 			$syllabus_first = 1;
 		    }
@@ -3764,7 +3790,7 @@ sub print_resources {
 	if (($assignment ne $current_assignment) && ($assignment ne "")) {
 	    my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
 						  $assignment, $courseidinfo, 
-						  $fullname);
+						  $fullname, $usersection);
 	    my $header_start = ($columns_in_format == 1) ? '\lhead'
 		: '\fancyhead[LO]';
 	    $header_line = $header_start.'{'.$header_line.'}';
@@ -3796,8 +3822,8 @@ sub print_resources {
         } elsif ($print_incomplete) {
             $message = &mt('No incomplete resources');
         }
-        if ($message) {
-            $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
+        if ($message) { 
+	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
         }
 	if ($remove_latex_header eq "NO") {
 	    $current_output = &print_latex_header() . $current_output;
@@ -3811,13 +3837,13 @@ sub print_resources {
     }
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =
-        &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
-                            $currentassignment, $courseidinfo, $fullname);
+    &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+                        $currentassignment, $courseidinfo, $fullname, $usersection);
     my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
     my $newheader = $header_start.'{'.$header_line.'}';
-
     if ($current_output=~/\\documentclass/) {
 	$current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
+
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -3826,6 +3852,7 @@ sub print_resources {
 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
 	    $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+
     }
     #
     #  Close the student bracketing.
@@ -4056,10 +4083,11 @@ sub printHelper {
     }
     if ($env{'form.url'}) {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
-
     }
-    $helper->{VARS}->{'symb'}=
-	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
+    if ($helper->{VARS}->{'symb'} ne '') {
+        $helper->{VARS}->{'symb'}=
+	    &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
+    }
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
 
@@ -4070,6 +4098,7 @@ sub printHelper {
     my $subdir;
     my $is_published=0;		# True when printing from resource space.
     my $res_printable = 1;	# By default the current resource is printable.    
+    my $res_error;
     my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
     my $res_printstartdate;
     my $res_printenddate;
@@ -4091,13 +4120,22 @@ sub printHelper {
 	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
 	    $helper->{VARS}->{'postdata'} = 
 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
-	    my $navmap = Apache::lonnavmaps::navmap->new();
-	    my $res   = $navmap->getBySymb($symb);
-	    $res_printable  = $res->resprintable() || $userCanPrint; #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);
-
+            if (!$userCanPrint) {
+	        my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+	            my $res = $navmap->getBySymb($symb);
+                    if (ref($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 {
 	    # Resource space.
 
@@ -4213,7 +4251,7 @@ sub printHelper {
 		}
         my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS_PAGE',
 							'Select Problem(s) to print',
-							"multichoice='1' toponly='1' addstatus='1' closeallpages='1'",
+							"multichoice='1' toponly='1' addstatus='1' closeallpages='1' modallink='1'",
 							'RESOURCES',
 							'PAGESIZE',
 							$url,
@@ -4223,7 +4261,7 @@ sub printHelper {
 
       $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
 						    'Select Resource(s) to print',
-						    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+						    'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
 						    'RESOURCES',
 						    'PAGESIZE',
 						    $url,
@@ -4288,7 +4326,7 @@ sub printHelper {
 				    'CHOOSE_PROBLEMS_HTML'];
 	    my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
 							    'Select Problem(s) to print',
-							    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							    'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
 							    'RESOURCES',
 							    'PAGESIZE',
 							    $map,
@@ -4297,7 +4335,7 @@ sub printHelper {
 							    $start_new_option);
 	    $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
 							  'Select Resource(s) to print',
-							  'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							  'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
 							  'RESOURCES',
 							  'PAGESIZE',
 							  $map,
@@ -4345,7 +4383,7 @@ ALL_PROBLEMS
          &Apache::lonxml::xmlparse($r, 'helper', 
 				   &generate_resource_chooser('ALL_PROBLEMS',
 							      'Select Problem(s) to print',
-							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
 							      'RESOURCES',
 							      'PAGESIZE',
 							      '',
@@ -4354,7 +4392,7 @@ ALL_PROBLEMS
 							      $start_new_option) .
 				   &generate_resource_chooser('ALL_RESOURCES',
 							      'Select Resource(s) to print',
-							      " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
+							      " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1' modallink='1'",
 							      'RESOURCES',
 							      'PAGESIZE',
 							      '',
@@ -4362,7 +4400,7 @@ ALL_PROBLEMS
 							      $start_new_option) .
 				   &generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
 							      'Select Problem(s) to print',
-							      'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+							      'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
 							      'RESOURCES',
 							      'STUDENTS1',
 							      '',
@@ -4406,7 +4444,7 @@ ALL_PROBLEMS
 	#
 	my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
 							  'Select resources to print',
-							  'multichoice="1" addstatus="1" closeallpages="1"',
+							  'multichoice="1" addstatus="1" closeallpages="1" modallink="1"',
 							  'RESOURCES', 
 							  'PRINT_FORMATTING',
 							  $map,
@@ -4417,7 +4455,7 @@ ALL_PROBLEMS
                                                          'PRINT_FORMATTING').
                                &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
 							'Select Problem(s) to print',
-							"multichoice='1' addstatus='1' closeallpages ='1'",
+							"multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
 							'RESOURCES',
 							'PRINT_FORMATTING',
 							$url,
@@ -4484,9 +4522,10 @@ ALL_PROBLEMS
 
 	}
 
-        my @lines = &Apache::grades::get_scantronformat_file();
+        my @lines = &Apache::lonnet::get_scantronformat_file();
 	my $codechoice='';
 	foreach my $line (@lines) {
+            next if (($line =~ /^\#/) || ($line eq ''));
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -4515,7 +4554,7 @@ ALL_PROBLEMS
 						$namechoice) .
 			&generate_resource_chooser('SELECT_PROBLEMS_PAGE',
 						   'Select Problem(s) to print',
-						   "multichoice='1' addstatus='1' closeallpages ='1'",
+						   "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
 						   'RESOURCES',
 						   'PRINT_FORMATTING',
 						   $url,
@@ -4539,7 +4578,7 @@ ALL_PROBLEMS
     <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1" 
-              closeallpages="1">
+              closeallpages="1" modallink="1">
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
@@ -4684,7 +4723,7 @@ CHOOSE_FROM_SUBDIR
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-              closeallpages="1">
+              closeallpages="1" modallink="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
@@ -4695,35 +4734,54 @@ CHOOSE_FROM_SUBDIR
 CHOOSE_FROM_ANY_SEQUENCE
 }
 
+    my $numchoices = 0;
+    if (ref($printChoices) eq 'ARRAY') {
+        $numchoices = @{$printChoices};
+    }
+    # Early out if nothing to print
+    if (!$numchoices) {
+        $r->print(&Apache::loncommon::start_page('Printing Helper').
+                  '<h2>'.&mt('Unable to determine print context').'</h2>'.
+                  '<p>'.&mt('Please display a resource, and then click the "Print" button/icon').'</p>');
+        my $prtspool=$r->dir_config('lonPrtDir');
+        my $footer = &recently_generated($prtspool);
+        $r->print($footer.&Apache::loncommon::end_page());
+        return OK;
+    }
+
     # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");
     if (!$res_printable) {
-        my $now = time;
-        my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
-        my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
         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])',
                                   $shownprintend);
-        } else {
-            if (($res_printstartdate) && ($res_printstartdate > $now)) {
-                if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
-                    $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
-                                  $shownprintstart,$shownprintend);
-                } elsif (!$res_printenddate) {
-                    $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
-                                      $shownprintstart);
-                } else {
-                    $noprintmsg = &mt('Printing for current resource is unavailable');
+            } else {
+                if (($res_printstartdate) && ($res_printstartdate > $now)) {
+                    if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
+                        $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
+                                          $shownprintstart,$shownprintend);
+                    } elsif (!$res_printenddate) {
+                        $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
+                                          $shownprintstart);
+                    } else {
+                        $noprintmsg = &mt('Printing for current resource is unavailable');
+                    }
                 }
             }
         }
 
         if ($noprintmsg) {
             $paramHash = Apache::lonhelper::getParamHash();
-            $paramHash->{MESSAGE_TEXT} =
+	    $paramHash->{MESSAGE_TEXT} = 
                 '<p class="LC_info">'.$noprintmsg.'</p>';
-            Apache::lonhelper::message->new();
+	    Apache::lonhelper::message->new();
         }
     }
     $paramHash = Apache::lonhelper::getParamHash();
@@ -4770,7 +4828,7 @@ CHOOSE_FROM_ANY_SEQUENCE
             my $xmlfrag = << "FONT_SELECTION";
 
           
-            <dropdown variable='fontsize' multichoice='0', allowempty='0'>
+            <dropdown variable='fontsize' multichoice='0' allowempty='0'>
             <defaultvalue>
 		  return 'normalsize';
             </defaultvalue>
@@ -4948,7 +5006,7 @@ FONT_SELECTION
 		      return "$helper->{VARS}->{'probstatus'}";
                    </defaultvalue>
 		   <choice computer="problem">Homework Problem</choice>
-		   <choice computer="exam">Exam Problem</choice>
+		   <choice computer="exam">Bubblesheet Exam Problem</choice>
 		   <choice computer="survey">Survey question</choice>
                    ,choice computer="anonsurvey"Anonymous survey question</choice>
 		</dropdown>
@@ -5066,6 +5124,9 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
+    my $pdfFormLabel=&mt('PDF Form Fields');
+    my $with=&mt('with Form Fields');
+    my $without=&mt('without Form Fields');
     
 
     $result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -5074,6 +5135,7 @@ sub render {
             .'<th>'.$PageLayout.'</th>'
             .'<th>'.$NumberOfColumns.'</th>'
             .'<th>'.$PaperType.'</th>'
+            .'<th>'.$pdfFormLabel.'</th>'
             .&Apache::loncommon::end_data_table_header_row()
             .&Apache::loncommon::start_data_table_row()
     .'<td>'
@@ -5114,6 +5176,12 @@ sub render {
     $result .= <<HTML;
         </select>
     </td>
+    <td align='center'>
+        <select name='${var}.pdfFormFields'>
+            <option selected="selected" value="no">$without</option>
+            <option value="yes">$with</option>
+        </select>
+    </td>
 HTML
     $result.=&Apache::loncommon::end_data_table_row()
             .&Apache::loncommon::end_data_table();