--- loncom/lontrans.pm	2002/09/30 20:32:45	1.3
+++ loncom/lontrans.pm	2006/12/06 22:22:36	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.3 2002/09/30 20:32:45 albertel Exp $
+# $Id: lontrans.pm,v 1.13 2006/12/06 22:22:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,31 +32,34 @@ use strict;
 use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet();
 use Apache::File();
-
-sub propath {
-    my ($udom,$uname)=@_;
-    $udom=~s/\W//g;
-    $uname=~s/\W//g;
-    my $subdir=$uname.'__';
-    $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
-    my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
-    return $proname;
-}
+use LONCAPA;
 
 
 sub handler {
     my $r = shift;
-    if ($r->uri=~m|^/uploaded/|) {
-	my ($dum1,$dum2,$udom,$uname,$ufile)=split(/\//,$r->uri);
-	$ufile=~s/^[\~\.]+//;
-	$r->filename(&propath($udom,$uname).'/userfiles/'.$ufile);
+    # 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//;
+        my (undef,undef,$udom,$uname,@ufile)=split(/\//,$fn);
+	if (@ufile) { $ufile[-1]=~s/^[\~\.]+//; }
+        my $chome=&Apache::lonnet::homeserver($uname,$udom);
+	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|^/~|) {	
 	#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|;
+	$fn=~s|^/~($LONCAPA::username_re)|/home/$1/public_html|;
 	$r->filename($fn);
     } else { return DECLINED; }
+    return OK;
 }
 
 1;