[LON-CAPA-cvs] cvs: loncom(version_2_1_X) /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 31 Jan 2006 22:02:03 -0000
albertel Tue Jan 31 17:02:03 2006 EDT
Modified files: (Branch: version_2_1_X)
/loncom/lonnet/perl lonnet.pm
Log:
- backport 1.705
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.683.2.13 loncom/lonnet/perl/lonnet.pm:1.683.2.14
--- loncom/lonnet/perl/lonnet.pm:1.683.2.13 Thu Jan 26 01:34:33 2006
+++ loncom/lonnet/perl/lonnet.pm Tue Jan 31 17:02:03 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.683.2.13 2006/01/26 06:34:33 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 allowed {
my ($priv,$uri,$symb)=@_;
+ my $ver_orguri=$uri;
$uri=&deversion($uri);
my $orguri=$uri;
$uri=&declutter($uri);
@@ -3166,7 +3167,7 @@
$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';