--- loncom/interface/lonprintout.pm	2014/09/21 16:26:20	1.643
+++ loncom/interface/lonprintout.pm	2016/01/28 19:37:42	1.648
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.643 2014/09/21 16:26:20 raeburn Exp $
+# $Id: lonprintout.pm,v 1.648 2016/01/28 19:37:42 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -700,12 +700,12 @@ sub incomplete {
     }
 }
 #
-#  When printing for students, the resoures and order of the
+#  When printing for students, the resources and order of the
 #  resources may need to be altered if there are folders with
 #  random selectiopn or random ordering (or both) enabled.
 #  This sub computes the set of resources to print for a student
 #  modified both by random ordering and selection and filtered
-#  to only those that are in the original set selcted to be printed.
+#  to only those that are in the original set selected to be printed.
 #
 # Parameters:
 #   $map - The URL of the folder being printed.
@@ -716,6 +716,9 @@ sub incomplete {
 #   $who   - Student/domain for whome the sequence will be generated.
 #   $code  - CODE being printed when printing Problems/Resources
 #            from folder for CODEd assignments
+#   $nohidemap - If true, parameter in map for hiddenresource will be
+#                ignored.  The user calling the routine should have
+#                both the pav and vgr privileges if this is set to true).
 #
 # Implicit inputs:
 #   $
@@ -737,7 +740,7 @@ sub master_seq_to_person_seq {
     my @output_seq;
 
     my $unhidden;
-    if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {
+    if ($nohidemap) {
         $unhidden = &Apache::lonnet::clutter($map);
     }
     
@@ -2928,7 +2931,6 @@ ENDPART
 
 	&Apache::lonxml::clear_problem_counter();
 
-	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
 
 	    &Apache::lonenc::reset_enc();
@@ -3179,6 +3181,10 @@ ENDPART
 	 my $student_counter=-1;
 	 my $i = 0;
 	 my $last_section = (split(/:/,$students[0]))[2];
+         my $nohidemap;
+         if ($perm{'pav'} && $perm{'vgr'}) {
+             $nohidemap = 1;
+         }
 	 foreach my $person (@students) {
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	     if (-e $duefile) {
@@ -3196,7 +3202,7 @@ ENDPART
 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
 	     }
 	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
-                                                       $person, undef, 1);
+                                                       $person, undef, $nohidemap);
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,  $actual_seq,
@@ -3284,6 +3290,8 @@ ENDPART
 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
 					    $code_type);
 	     }
+             $code_name =~ s/^\s+//;
+             $code_name =~ s/\s+$//;
 	     if ($code_name) {
 		 &Apache::lonnet::put('CODEs',
 				      {
@@ -3305,6 +3313,10 @@ ENDPART
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
 	 my $count=0;
+         my $nohidemap;
+         if ($perm{'pav'} && $perm{'vgr'}) {
+             $nohidemap = 1;
+         }
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
 	     if ($code_type eq 'number') { 
@@ -3317,7 +3329,7 @@ ENDPART
                  $env{'form.CODE'} = $moreenv{'CODE'};
                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,
                                                         undef,
-                                                        $moreenv{'CODE'}, 1);
+                                                        $moreenv{'CODE'}, $nohidemap);
                  delete($env{'form.CODE'});
              }
 	     my ($output,$fullname, $printed)=
@@ -3426,13 +3438,16 @@ ENDPART
 	#}
     }
 
-    # Set URLback if this is a construction space print so we can provide
-    # a link to the resource being edited.
-    #
+    # Set URLback so we can provide a link back to the resource and to change options.
+    # (Since the browser back button does not currently work with https,
+    # the back link is useful even when there is an easy-to-miss LON-CAPA back button.)
 
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} eq '1') {
 	$URLback=$helper->{'VARS'}->{'filename'};
+    } elsif ($helper->{VARS}{'symb'}) {
+        my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+        $URLback = &Apache::lonnet::clutter($url);
     }
     #
     # Final adjustment of the font size: