--- loncom/lontrans.pm 2006/05/30 12:45:12 1.11 +++ loncom/lontrans.pm 2011/10/21 16:03:06 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.11 2006/05/30 12:45:12 www Exp $ +# $Id: lontrans.pm,v 1.14 2011/10/21 16:03:06 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,12 +32,13 @@ use strict; use Apache::Constants qw(:common :remotehost); use Apache::lonnet(); use Apache::File(); -use lib '/home/httpd/lib/perl'; use LONCAPA; sub handler { my $r = shift; + # FIXME line remove when mod_perl fixes BUG#4948 + $r->notes->set('error-notes' => ''); if ($r->uri=~m|^(/raw)?/uploaded/|) { my $fn = $r->uri(); $fn=~s/^\/raw//; @@ -48,15 +49,9 @@ sub handler { 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))); + $r->filename(&propath($udom,$uname). + '/userfiles/'.(join('/',@ufile))); } - } elsif ($r->uri=~m|^/~|) { - #internal authentication, needs fixup. - my $fn = $r->uri(); # non users do not get the full path request - # through SCRIPT_FILENAME - $fn=~s|^/~(\w+)|/home/$1/public_html|; - $r->filename($fn); } else { return DECLINED; } return OK; }