--- rat/lonuserstate.pm	2005/03/18 21:55:49	1.88
+++ 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.88 2005/03/18 21:55:49 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.92 2005/06/08 18:49:38 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ package Apache::lonuserstate;
 use strict;
 use Apache::Constants qw(:common :http);
 use HTML::TokeParser;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use GDBM_File;
 use Apache::lonmsg;
@@ -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,7 +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; }
+
+	if ($hdnflag || lc($hidden) eq 'yes') {
+	    $hiddenurl{$rid}=1;
+	}
+	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})
@@ -624,11 +631,11 @@ sub readmap {
 	    untie(%parmhash);
 	}
     }
-    &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
+    &Apache::lonmsg::author_res_msg($env{'request.course.uri'},$errtext);
 # ------------------------------------------------- Check for critical messages
 
-    my @what=&Apache::lonnet::dump('critical',$ENV{'user.domain'},
-				   $ENV{'user.name'});
+    my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},
+				   $env{'user.name'});
     if ($what[0]) {
 	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
 	    $retfurl='/adm/email?critical=display';
@@ -640,7 +647,7 @@ sub readmap {
 # ------------------------------------------------------- Evaluate state string
 
 sub evalstate {
-    my $fn=$ENV{'request.course.fn'}.'.state';
+    my $fn=$env{'request.course.fn'}.'.state';
     my $state='';
     if (-e $fn) {
 	my @conditions=();
@@ -672,7 +679,7 @@ sub evalstate {
 	    }
 	}
     }
-    &Apache::lonnet::appenv('user.state.'.$ENV{'request.course.id'} => $state);
+    &Apache::lonnet::appenv('user.state.'.$env{'request.course.id'} => $state);
     return $state;
 }