--- loncom/interface/lonprintout.pm	2020/02/17 13:40:16	1.670
+++ loncom/interface/lonprintout.pm	2022/04/02 19:14:31	1.676
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.670 2020/02/17 13:40:16 raeburn Exp $
+# $Id: lonprintout.pm,v 1.676 2022/04/02 19:14:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1339,8 +1339,8 @@ sub latex_header_footer_remove {
 #  necessity is determined by the problem_split param.
 #
 sub encapsulate_minipage {
-    my ($text) = @_;
-    if (!($env{'form.problem.split'} =~ /yes/i)) {
+    my ($text,$problem_split) = @_;
+    if (!($problem_split =~ /yes/i)) {
 	$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
     }
     return $text;
@@ -2072,17 +2072,28 @@ sub get_textwidth {
 
 sub unsupported {
     my ($currentURL,$mode,$symb)=@_;
+    my $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
+    my $shown = $currentURL;
+    if (($cleanURL ne $currentURL) || ($symb =~ m{/^enc/})) {
+        $shown = &mt('URL not shown (encrypted)');
+    }
     if ($mode ne '') {$mode='\\'.$mode}
-    my $result.= &print_latex_header($mode);
-    if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
-	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
-        $currentURL=~s|^http://https://?|https://|;
-	my $title=&Apache::lonnet::gettitle($symb);
-	$title = &Apache::lonxml::latex_special_symbols($title);
-        my $url =  &Apache::lonxml::latex_special_symbols($currentURL);
-	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$url.' ';
+    my $result = &print_latex_header($mode);
+    if ($cleanURL=~m|^(/adm/wrapper)?/ext/|) {
+        $cleanURL=~s|^(/adm/wrapper)?/ext/|http://|;
+        $cleanURL=~s|^http://https://|https://|;
+        if ($shown eq $currentURL) {
+            $shown = &Apache::lonxml::latex_special_symbols($cleanURL);
+        }
+        my $title=&Apache::lonnet::gettitle($symb);
+        $title = &Apache::lonxml::latex_special_symbols($title);
+        $result.=' \strut \\\\ \textit{'.$title.'} \strut \\\\ '.$shown.' ';
     } else {
-	$result.= &Apache::lonxml::latex_special_symbols($currentURL);
+        if ($shown eq $currentURL) {
+	    $result.=&Apache::lonxml::latex_special_symbols($currentURL);
+        } else {
+            $result.=$shown;
+        }
     }
     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
     return $result;
@@ -2120,19 +2131,12 @@ sub print_page_in_course {
 								      $numberofcolumns);
     my $LaTeXwidth=&recalcto_mm($textwidth); 
 
-
     if ($mode ne '') {$mode='\\'.$mode}
     my $result   =    &print_latex_header($mode);
-    if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
-	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
-	my $title=&Apache::lonnet::gettitle($symb);
-	$title = &Apache::lonxml::latex_special_symbols($title);
-    } else {
-        my $esc_currentURL= $currentURL;
-        $esc_currentURL =~ s/_/\\_/g;
-	$result.=$esc_currentURL;
-    }
-    $result .= '\\\\';
+
+    my $title=&Apache::lonnet::gettitle($currentURL);
+    $title = &Apache::lonxml::latex_special_symbols($title);
+    $result .= '\noindent\textit{'.$title.'}\\\\';
 
     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
 	&Apache::lonnet::appenv({'construct.style' =>
@@ -2148,7 +2152,7 @@ sub print_page_in_course {
 
     foreach my $resource (@page_resources) {
 	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
-	$result           .= $resource->title() . '\\\\';
+        my $current_url = $resource->link();
 
 	# Recurse if a .page:
 
@@ -2158,11 +2162,10 @@ sub print_page_in_course {
 	    $result           .= &print_page_in_course($helper, $rparmhash, 
 						       $resource_src, \@page_resources);
         } elsif ($resource->ext()) {
-            $result .= &unsupported($currentURL,$mode,$symb);
-	}
-	# these resources go through the XML transformer:
-
-	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
+            $result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));
+	} elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
+            # these resources go through the XML transformer:
+            $result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';
 
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
 
@@ -2546,7 +2549,7 @@ sub print_construction_sequence {
 		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 		    $body.=&path_to_problem($urlp,$LaTeXwidth);
 		    $body.='\vskip 1 mm '.$answer.'\end{document}';
-		    $body = &encapsulate_minipage($body);
+		    $body = &encapsulate_minipage($body,$answerform{'problem_split'});
 		    $texversion.=$body;
 		}
 	    }
@@ -2939,7 +2942,6 @@ ENDPART
 
 	    &Apache::lonenc::reset_enc();
 
-
 	    # Note due to document structure, not allowed to put \newpage
 	    # prior to the first resource
 
@@ -3012,7 +3014,7 @@ ENDPART
 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
 			    $body   .='\vskip 1 mm '.$answer;
-			    $body    = &encapsulate_minipage($body);
+			    $body    = &encapsulate_minipage($body,$answerform{'problem_split'});
 			    $texversion .= $body;
 			} else {
 			    $texversion='';
@@ -3250,18 +3252,10 @@ ENDPART
                  }
 	     }
 	 }
-         my ($randomorder,$randompick,$map);
+         my $map;
          if ($helper->{VARS}{'symb'}) {
              ($map, my $id, my $resource) =
                  &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-             my $navmap = Apache::lonnavmaps::navmap->new();
-             if (defined($navmap)) {
-                 if ($map) {
-                     my $mapres = $navmap->getResourceByUrl($map);
-                     $randomorder = $mapres->randomorder();
-                     $randompick = $mapres->randompick();
-                 }
-             }
          }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
@@ -3330,14 +3324,11 @@ ENDPART
 	     } else {
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
-             my $actual_seq = \@master_seq;
-             if ($randomorder || $randompick) {
-                 $env{'form.CODE'} = $moreenv{'CODE'};
-                 $actual_seq = master_seq_to_person_seq($map, \@master_seq,
-                                                        undef,
-                                                        $moreenv{'CODE'}, $nohidemap);
-                 delete($env{'form.CODE'});
-             }
+             $env{'form.CODE'} = $moreenv{'CODE'};
+             my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                       undef,
+                                                       $moreenv{'CODE'}, $nohidemap);
+             delete($env{'form.CODE'});
 	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
 				  $actual_seq,$flag_latex_header_remove,
@@ -3455,12 +3446,13 @@ ENDPART
         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);
+        my ($anchor,$usehttp,$plainurl);
         $url = &Apache::lonnet::clutter($url);
+        $plainurl = $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()) {
+            unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl())) {
                 $usehttp = 1;
             }
         }
@@ -3481,7 +3473,9 @@ ENDPART
             if ($usehttp) {
                 $URLback .= (($URLback =~ /\?/) ? '&':'?').'usehttp=1';
             }
-            $URLback .= (($URLback =~ /\?/) ? '&':'?').'symb='.&escape($symb.$anchor);
+            unless ($plainurl =~ /\.page$/) {
+                $URLback .= (($URLback =~ /\?/) ? '&':'?').'symb='.&escape($symb.$anchor);
+            }
         }
     }
     #
@@ -3733,7 +3727,7 @@ sub print_resources {
 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			    $body     .=&path_to_problem($res_url,$LaTeXwidth);
 			    $body     .='\vskip 1 mm '.$ansrendered;
-			    $body     = &encapsulate_minipage($body);
+			    $body     = &encapsulate_minipage($body,$answerenv{'problem_split'});
 			    $rendered = $header.$body;
 			}
 		    }
@@ -3823,7 +3817,7 @@ sub print_resources {
             $message = &mt('No incomplete resources');
         }
         if ($message) { 
-	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n");
+	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
         }
 	if ($remove_latex_header eq "NO") {
 	    $current_output = &print_latex_header() . $current_output;
@@ -3885,8 +3879,9 @@ sub handler {
     if ($env{'request.course.id'}) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $clientip = &Apache::lonnet::get_requestor_ip($r);
         my ($blocked,$blocktext) = 
-            &Apache::loncommon::blocking_status('printout',$cnum,$cdom);
+            &Apache::loncommon::blocking_status('printout',$clientip,$cnum,$cdom);
         if ($blocked) {
             my $checkrole = "cm./$cdom/$cnum";
             if ($env{'request.course.sec'} ne '') {