--- loncom/lonnet/perl/lonnet.pm 2001/08/17 19:50:28 1.151 +++ loncom/lonnet/perl/lonnet.pm 2001/08/18 14:17:50 1.152 @@ -122,7 +122,7 @@ # 5/30 H. K. Ng # 6/1 Gerd Kortemeyer # July Guy Albertelli -# 8/4,8/7,8/8,8/9,8/11,8/16,8/17 Gerd Kortemeyer +# 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18 Gerd Kortemeyer package Apache::lonnet; @@ -1111,6 +1111,8 @@ sub eget { sub allowed { my ($priv,$uri)=@_; + + my $orguri=$uri; $uri=&declutter($uri); # Free bre access to adm and meta resources @@ -1185,7 +1187,7 @@ sub allowed { } if ($checkreferer) { - my $refuri=$ENV{'httpref.'.$uri}; + my $refuri=$ENV{'httpref.'.$orguri}; unless ($refuri) { map { @@ -1193,19 +1195,18 @@ sub allowed { my $pattern=$_; $pattern=~s/\*/\[\^\/\]\+/g; $pattern=~s/\//\\\//g; - if ($uri=~/$pattern/) { + if ($orguri=~/$pattern/) { $refuri=$ENV{$_}; } } } keys %ENV; } if ($refuri) { + $refuri=&declutter($refuri); my @uriparts=split(/\//,$refuri); my $filename=$uriparts[$#uriparts]; my $pathname=$refuri; $pathname=~s/\/$filename$//; - my @filenameparts=split(/\./,$uri); - if (&fileembstyle($filenameparts[$#filenameparts]) ne 'ssi') { if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~ /\&$filename\:([\d\|]+)\&/) { my $refstatecond=$1; @@ -1215,7 +1216,6 @@ sub allowed { $uri=$refuri; $statecond=$refstatecond; } - } } } }