--- loncom/interface/lonnavmaps.pm	2004/11/02 21:02:01	1.302
+++ loncom/interface/lonnavmaps.pm	2004/11/10 22:20:50	1.303
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.302 2004/11/02 21:02:01 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.303 2004/11/10 22:20:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -442,7 +442,7 @@ sub getLinkForResource {
     foreach $res (@$stack) {
         if (defined($res)) {
 	    if ($res->is_page()) {
-		return $res->src();
+		return $res->link();
 	    }
             # in case folder was skipped over as "only sequence"
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
@@ -461,7 +461,7 @@ sub getLinkForResource {
         if (defined($_)) { $res = $_; }
     }
 
-    return $res->src();
+    return $res->link();
 }
 
 # Convenience function: This separates the logic of how to create
@@ -1854,7 +1854,7 @@ END
             my $srcHasQuestion = $src =~ /\?/;
             $args->{"resourceLink"} = $src.
                 ($srcHasQuestion?'&':'?') .
-                'symb=' . &Apache::lonnet::escape($curRes->symb()).
+                'symb=' . &Apache::lonnet::escape($curRes->shown_symb()).
 		$anchor;
 
             # Now, display each column.
@@ -3446,6 +3446,7 @@ Returns the title of the resource.
 # These info functions can be used directly, as they don't return
 # resource information.
 sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }
+sub encrypted { my $self=shift; return $self->navHash("encrypted_", 1); }
 sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
 sub from { my $self=shift; return $self->navHash("from_", 1); }
 # considered private and undocumented
@@ -3457,10 +3458,20 @@ sub randompick {
     return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
                                                '.0.parameter_randompick'};
 }
+sub link {
+    my $self=shift;
+    if ($self->encrypted()) { return &Apache::lonenc::encrypted($self->src); }
+    return $self->src;
+}
 sub src { 
     my $self=shift;
     return $self->navHash("src_", 1);
 }
+sub shown_symb {
+    my $self=shift;
+    if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
+    return $self->symb();
+}
 sub symb {
     my $self=shift;
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;