--- loncom/auth/lonracc.pm	2002/10/29 18:34:33	1.7
+++ loncom/auth/lonracc.pm	2004/04/26 00:07:29	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for File Transfers
 #
-# $Id: lonracc.pm,v 1.7 2002/10/29 18:34:33 matthew Exp $
+# $Id: lonracc.pm,v 1.12 2004/04/26 00:07:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,10 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (lonacc: Cookie Based Access Handler
-# 5/21/99,5/22,5/29,5/31,6/15 Gerd Kortemeyer)
-# 6/16,6/18,7/3,
-# 6/30/00 Gerd Kortemeyer
 
 package Apache::lonracc;
 
@@ -60,6 +56,9 @@ sub handler {
        $r->log_reason("Spoof request from ".$ENV{'REMOTE_ADDR'});
        return FORBIDDEN;
     }
+    if ($reqhost eq 'localhost.localdomain') {
+       return OK;
+    }
     my $readline;
     my $lontabdir=$r->dir_config('lonTabDir');
     {
@@ -68,21 +67,28 @@ sub handler {
           $r->log_reason("Could not find host tab file");
           return FORBIDDEN;
        }
+       my $return;
+       my @ids=();
        while ($readline=<$fh>) {
           my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
           if ($name =~ /$reqhost/i) {
               my $filename=$r->filename;
+              my $uri =$r->uri;
               if ((-e "$filename.$id") ||
 		  &subscribed($filename,$id) ||
-		  ($filename=~/\.meta$/)) {
+		  ($filename=~/\.meta$/) ||
+                  ($uri=~m|^/raw/uploaded|)) {
 	         return OK;
               } else {
-                 $r->log_reason("$id not subscribed", $r->filename);
-                 return FORBIDDEN;
+                 $return=FORBIDDEN;
+		 push(@ids,$id);
               }
           }
        }
-
+       if ($return == FORBIDDEN) {
+	   $r->log_reason(join(':',@ids)." not subscribed", $r->filename);
+	   return FORBIDDEN;
+       }
     }
     $r->log_reason("Invalid request for file transfer from $reqhost", 
                    $r->filename);