--- rat/lonuserstate.pm 2005/05/05 20:43:28 1.90 +++ rat/lonuserstate.pm 2005/06/08 18:49:38 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construct and maintain state and binary representation of course for user # -# $Id: lonuserstate.pm,v 1.90 2005/05/05 20:43:28 albertel Exp $ +# $Id: lonuserstate.pm,v 1.92 2005/06/08 18:49:38 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -138,7 +138,7 @@ sub loadmap { if ($token->[0] eq 'S') { if ($token->[1] eq 'resource') { # -------------------------------------------------------------------- Resource - + if ($token->[2]->{'type'} eq 'zombie') { next; } my $rid=$lpc.'.'.$token->[2]->{'id'}; $hash{'kind_'.$rid}='res'; @@ -338,13 +338,14 @@ sub traceroute { my ($mapid,$resid)=split(/\./,$rid); my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); + if ($hdnflag || lc($hidden) eq 'yes') { $hiddenurl{$rid}=1; - } else { - # shouldn't be hidden, but might have had a parm set on it - # saying to + } + if (!$hdnflag && lc($hidden) eq 'no') { delete($hiddenurl{$rid}); } + my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } if (($retfurl eq '') && ($hash{'src_'.$rid})