--- loncom/auth/lonuploadedacc.pm	2002/09/30 21:01:41	1.3
+++ loncom/auth/lonuploadedacc.pm	2002/11/12 22:37:18	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User Files
 #
-# $Id: lonuploadedacc.pm,v 1.3 2002/09/30 21:01:41 albertel Exp $
+# $Id: lonuploadedacc.pm,v 1.6 2002/11/12 22:37:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,20 +34,22 @@ use Apache::lonnet();
 
 sub handler {
     my $r = shift;
+    my $c = $r->connection;
     my $args=$r->args;
     &Apache::loncommon::get_unprocessed_cgi($args,['token']); 
     my (undef,undef,$udom,$uname,$ufile)=split(/\//,$r->uri);
     $ufile=~s/^[\~\.]+//;
-    my ($server)=($ENV{'form.token'}=~/\_([a-zA-Z0-9]+)$/);
-
+    my ($homeserver)=($ENV{'form.token'}=~/\_([a-zA-Z0-9]+)$/);
+    my $remoteip=$c->remote_ip;
+    my $remoteserver=$Apache::lonnet::iphost{$remoteip};
     my $reply=&Apache::lonnet::reply('tokenauthuserfile:'.
                  $udom.'/'.$uname.'/'.$ufile.':'.$ENV{'form.token'},
-				     $server);
+				     $remoteserver);
     if ($reply eq 'ok') {
        return OK;
    } else {
        &Apache::lonnet::logthis(
-"Refused userfile access $uname at $udom for $ufile from $server with $ENV{'form.token'}: $reply");
+"Refused userfile access $uname at $udom for $ufile from $remoteip -> $remoteserver home $homeserver with $ENV{'form.token'}: $reply");
        return FORBIDDEN;
    }
 }