--- loncom/lonnet/perl/lonnet.pm 2008/12/09 11:32:03 1.977 +++ loncom/lonnet/perl/lonnet.pm 2008/12/18 16:58:31 1.978 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.977 2008/12/09 11:32:03 amueller Exp $ +# $Id: lonnet.pm,v 1.978 2008/12/18 16:58:31 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4406,7 +4406,7 @@ sub is_portfolio_file { } sub usertools_access { - my ($uname,$udom,$tool) = @_; + my ($uname,$udom,$tool,$action) = @_; my $access; my %tools = ( aboutme => 1, @@ -4420,10 +4420,10 @@ sub usertools_access { $uname = $env{'user.name'}; } - my $hashid=$uname.':'.$udom; - my ($result,$cached) = &is_cached_new('usertools.'.$tool,$hashid); - if (defined($cached)) { - return $result; + if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { + if ($action ne 'reload') { + return $env{'environment.availabletools.'.$tool}; + } } my ($toolstatus,$inststatus); @@ -4443,7 +4443,6 @@ sub usertools_access { } else { $access = 0; } - &do_cache_new('usertools.'.$tool,$hashid,$access,600); return $access; } @@ -4457,7 +4456,6 @@ sub usertools_access { } else { $access = 0; } - &do_cache_new('usertools.'.$tool,$hashid,$access,600); return $access; } } @@ -4478,7 +4476,6 @@ sub usertools_access { } elsif ($hasnoaccess) { $access = 0; } - &do_cache_new('usertools.'.$tool,$hashid,$access,600); return $access; } } else { @@ -4488,13 +4485,11 @@ sub usertools_access { } elsif ($domdef{$tool}{'default'} == 0) { $access = 0; } - &do_cache_new('usertools.'.$tool,$hashid,$access,600); return $access; } } } else { $access = 1; - &do_cache_new('usertools.'.$tool,$hashid,$access,600); return $access; } }