--- loncom/interface/lonprintout.pm	2018/12/29 21:21:56	1.665
+++ 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.665 2018/12/29 21:21:56 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) {
@@ -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);
@@ -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 =~ /\?/) ? '&':'?').'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 =~ /\?/) ? '&':'?').'usehttp=1';
+            }
+            $URLback .= (($URLback =~ /\?/) ? '&':'?').'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;}
 
@@ -4496,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 ''));
@@ -4802,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>