--- loncom/interface/lonprintout.pm	2018/01/15 00:51:42	1.661
+++ loncom/interface/lonprintout.pm	2019/02/17 03:42:24	1.669
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.661 2018/01/15 00:51:42 raeburn Exp $
+# $Id: lonprintout.pm,v 1.669 2019/02/17 03:42:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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;
 
 
@@ -1233,7 +1234,7 @@ 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) {
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
@@ -1957,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);
@@ -3224,7 +3225,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'};
@@ -3233,7 +3234,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);
@@ -3350,7 +3351,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'};
@@ -3451,12 +3452,35 @@ ENDPART
 	$URLback=$helper->{'VARS'}->{'filename'};
     } elsif ($helper->{VARS}{'symb'}) {
         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+        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 '') {
-            $URLback = $url.(($url =~ /\?/) ? '&amp;':'?').'symb='.$helper->{VARS}{'symb'};
+            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);
         }
     }
     #
@@ -4058,10 +4082,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;}
 
@@ -4072,6 +4097,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;
@@ -4093,13 +4119,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.
 
@@ -4486,7 +4521,7 @@ 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 ''));
@@ -4698,26 +4733,45 @@ 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');
+                    }
                 }
             }
         }
@@ -4773,7 +4827,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>