[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonprintout.pm

[raeburn]

raeburn		Mon Jan 30 19:47:55 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - For 2.11
    - Backport 1.653, 1.654, 1.655, 1.656, 1.657.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.627.2.19 loncom/interface/lonprintout.pm:1.627.2.20
--- loncom/interface/lonprintout.pm:1.627.2.19	Tue Dec  6 03:46:09 2016
+++ loncom/interface/lonprintout.pm	Mon Jan 30 19:47:54 2017
@@ -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.627.2.20 2017/01/30 19:47:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3454,7 +3454,11 @@
 	$URLback=$helper->{'VARS'}->{'filename'};
     } elsif ($helper->{VARS}{'symb'}) {
         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-        $URLback = &Apache::lonnet::clutter($url);
+        $url = &Apache::lonnet::clutter($url);
+        if ($env{'request.enc'}) {
+            $url = &Apache::lonenc::encrypted($url);
+        }
+        $URLback = $url.($url =~ /\?/) ? '&':'?'.'symb='.$helper->{VARS}{'symb'};
     }
     #
     # Final adjustment of the font size:
@@ -3538,7 +3542,7 @@
 				'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,