[LON-CAPA-cvs] cvs: loncom /interface lonnavmaps.pm /lonnet/perl lonnet.pm

[albertel]

albertel		Thu Nov 11 17:39:05 2004 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Nav properly curlocs encrypturl resource
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.568 loncom/lonnet/perl/lonnet.pm:1.569
--- loncom/lonnet/perl/lonnet.pm:1.568	Wed Nov 10 17:20:50 2004
+++ loncom/lonnet/perl/lonnet.pm	Thu Nov 11 17:39:05 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.568 2004/11/10 22:20:50 albertel Exp $
+# $Id: lonnet.pm,v 1.569 2004/11/11 22:39:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4782,6 +4782,7 @@
 	}
 	$thisfn=$ENV{'request.filename'};
     }
+    if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
 # is that filename actually a symb? Verify, clean, and return
     if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) {
 	if (&symbverify($thisfn,$1)) {
@@ -5332,6 +5333,7 @@
 
 sub declutter {
     my $thisfn=shift;
+    if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
     $thisfn=~s/^\///;
     $thisfn=~s/^res\///;
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.303 loncom/interface/lonnavmaps.pm:1.304
--- loncom/interface/lonnavmaps.pm:1.303	Wed Nov 10 17:20:50 2004
+++ loncom/interface/lonnavmaps.pm	Thu Nov 11 17:39:05 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.303 2004/11/10 22:20:50 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.304 2004/11/11 22:39:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1400,7 +1400,7 @@
         # Determine where the "here" marker is and where the screen jumps to.
 
         if ($ENV{'form.postsymb'}) {
-            $here = $jump = $ENV{'form.postsymb'};
+            $here = $jump = &Apache::lonnet::symbclean($ENV{'form.postsymb'});
         } elsif ($ENV{'form.postdata'}) {
             # couldn't find a symb, is there a URL?
             my $currenturl = $ENV{'form.postdata'};