--- loncom/lontrans.pm 2004/04/01 20:18:29 1.8 +++ loncom/lontrans.pm 2006/05/30 12:45:12 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.8 2004/04/01 20:18:29 raeburn Exp $ +# $Id: lontrans.pm,v 1.11 2006/05/30 12:45:12 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,7 +32,9 @@ use strict; use Apache::Constants qw(:common :remotehost); use Apache::lonnet(); use Apache::File(); -use Apache::loncommon; +use lib '/home/httpd/lib/perl'; +use LONCAPA; + sub handler { my $r = shift; @@ -40,10 +42,13 @@ sub handler { my $fn = $r->uri(); $fn=~s/^\/raw//; my (undef,undef,$udom,$uname,@ufile)=split(/\//,$fn); - $ufile[-1]=~s/^[\~\.]+//; + if (@ufile) { $ufile[-1]=~s/^[\~\.]+//; } my $chome=&Apache::lonnet::homeserver($uname,$udom); - if ($chome eq $Apache::lonnet::perlvar{'lonHostID'}) { - $r->filename(&Apache::loncommon::propath($udom,$uname). + my $allowed=0; + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $chome) { $allowed=1; } } + if ($allowed) { + $r->filename(&propath($udom,$uname). '/userfiles/'.(join('/',@ufile))); } } elsif ($r->uri=~m|^/~|) {