--- loncom/lonnet/perl/lonnet.pm 2006/01/13 19:22:29 1.683.2.12 +++ loncom/lonnet/perl/lonnet.pm 2006/01/31 22:02:03 1.683.2.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.683.2.12 2006/01/13 19:22:29 albertel Exp $ +# $Id: lonnet.pm,v 1.683.2.14 2006/01/31 22:02:03 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3066,6 +3066,7 @@ sub customaccess { sub allowed { my ($priv,$uri,$symb)=@_; + my $ver_orguri=$uri; $uri=&deversion($uri); my $orguri=$uri; $uri=&declutter($uri); @@ -3166,7 +3167,7 @@ sub allowed { $thisallowed.=$1; } } else { - my $refuri=$env{'httpref.'.$orguri}; + my $refuri = $env{'httpref.'.$orguri} || $env{'httpref.'.$ver_orguri}; if ($refuri) { if ($refuri =~ m|^/adm/|) { $thisallowed='F'; @@ -5262,10 +5263,17 @@ sub get_slot { $cdom=$env{'course.'.$courseid.'.domain'}; $cnum=$env{'course.'.$courseid.'.num'}; } - my %slotinfo=&get('slots',[$which],$cdom,$cnum); - &Apache::lonhomework::showhash(%slotinfo); - my ($tmp)=keys(%slotinfo); - if ($tmp=~/^error:/) { return (); } + my $key=join("\0",'slots',$cdom,$cnum,$which); + my %slotinfo; + if (exists($remembered{$key})) { + $slotinfo{$which} = $remembered{$key}; + } else { + %slotinfo=&get('slots',[$which],$cdom,$cnum); + &Apache::lonhomework::showhash(%slotinfo); + my ($tmp)=keys(%slotinfo); + if ($tmp=~/^error:/) { return (); } + $remembered{$key} = $slotinfo{$which}; + } if (ref($slotinfo{$which}) eq 'HASH') { return %{$slotinfo{$which}}; }