--- loncom/lontrans.pm	2002/08/08 13:45:21	1.2
+++ loncom/lontrans.pm	2003/11/12 21:37:07	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.2 2002/08/08 13:45:21 www Exp $
+# $Id: lontrans.pm,v 1.6 2003/11/12 21:37:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,24 +32,23 @@ 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 Apache::loncommon;
 
 sub handler {
     my $r = shift;
-    unless ($r->uri=~/^\/uploaded\//) { return DECLINED; }
-    my ($dum1,$dum2,$udom,$uname,$ufile)=split(/\//,$r->uri);
-    $ufile=~s/^[\~\.]+//;
-    $r->filename(&propath($udom,$uname).'/userfiles/'.$ufile);
+    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);
+    } 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;
 }
 
 1;