--- loncom/lontrans.pm	2003/11/12 21:37:07	1.6
+++ 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.6 2003/11/12 21:37:07 albertel Exp $
+# $Id: lontrans.pm,v 1.11 2006/05/30 12:45:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,15 +32,25 @@ 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;
-    if ($r->uri=~m|^/uploaded/|) {
-	my (undef,undef,$udom,$uname,$ufile)=split(/\//,$r->uri);
-	$ufile=~s/^[\~\.]+//;
-	$r->filename(&Apache::loncommon::propath($udom,$uname).
-		     '/userfiles/'.$ufile);
+    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