--- loncom/lonnet/perl/lonnet.pm 2005/03/17 19:40:50 1.609 +++ loncom/lonnet/perl/lonnet.pm 2005/03/17 21:02:00 1.611 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.609 2005/03/17 19:40:50 banghart Exp $ +# $Id: lonnet.pm,v 1.611 2005/03/17 21:02:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2707,7 +2707,7 @@ sub allowed { # Free bre access to user's own portfolio contents my ($space,$domain,$name,$dir)=split('/',$uri); - if (('uploaded' eq $space) && ($ENV{'user.name'} eq $name) && + if (($space=~/^(uploaded|ediupload)$/) && ($ENV{'user.name'} eq $name) && ($ENV{'user.domain'} eq $domain) && ('portfolio' eq $dir)) { return 'F'; } @@ -2776,9 +2776,9 @@ sub allowed { } # URI is an uploaded document for this course - +# not allowing 'edit' access (editupload) to uploaded course docs if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) { - my $refuri=$ENV{'httpref.'.$orguri}; + my $refuri=$ENV{'httpref.'.$origuri}; if ($refuri) { if ($refuri =~ m|^/adm/|) { $thisallowed='F'; @@ -5259,7 +5259,7 @@ sub getfile { sub repcopy_userfile { my ($file)=@_; if ($file =~ m -^/*(uploaded|editupload)/-) { $file=&filelocation("",$file); } - if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'OK'; } + if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; } my ($cdom,$cnum,$filename) = ($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+([^/]+)/+([^/]+)/+(.*)|); my ($info,$rtncode);