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

[raeburn]

raeburn		Sun Jan 29 16:02:29 2017 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Don't bleed unencrypted URL in links to return to resource and change
    printing options in course context (added in rev. 1.648).
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.652 loncom/interface/lonprintout.pm:1.653
--- loncom/interface/lonprintout.pm:1.652	Tue Dec  6 03:43:46 2016
+++ loncom/interface/lonprintout.pm	Sun Jan 29 16:02:29 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.652 2016/12/06 03:43:46 raeburn Exp $
+# $Id: lonprintout.pm,v 1.653 2017/01/29 16:02:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3448,7 +3448,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: