--- loncom/auth/lonacc.pm	2000/12/25 12:44:43	1.14
+++ loncom/auth/lonacc.pm	2001/09/26 14:07:45	1.21
@@ -2,7 +2,8 @@
 # Cookie Based Access Handler
 # 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,
 # 01/06,01/13,05/31,06/01,09/06,09/25,09/28,10/30,11/6,
-# 12/25 Gerd Kortemeyer
+# 12/25,12/26,
+# 01/06/01,05/28,8/11,9/26 Gerd Kortemeyer
 
 package Apache::lonacc;
 
@@ -11,6 +12,7 @@ use Apache::Constants qw(:common :http :
 use Apache::File;
 use Apache::lonnet;
 use CGI::Cookie();
+use Fcntl qw(:flock);
 
 sub handler {
     my $r = shift;
@@ -29,7 +31,9 @@ sub handler {
             my @profile;
 	    {
              my $idf=Apache::File->new("$lonidsdir/$handle.id");
+             flock($idf,LOCK_SH);
              @profile=<$idf>;
+             $idf->close();
 	    }
             my $envi;
             for ($envi=0;$envi<=$#profile;$envi++) {
@@ -38,17 +42,12 @@ sub handler {
                 $ENV{$envname} = $envvalue;
             }
             $ENV{'user.environment'} = "$lonidsdir/$handle.id";
-            $ENV{'request.state'}    = "published";
-            $ENV{'request.filename'} = $r->filename;
-
-# --------------------- Figure out referer, first from HTTP_REFERER, then cache
-
-            my $referer='';
-            if ($referer=$r->header_in('Referer')) {
-               $ENV{'HTTP_REFERER'}=$referer;
+            if ($requrl=~/^\/res\//) {
+               $ENV{'request.state'} = "published";
 	    } else {
-	       $ENV{'HTTP_REFERER'}=$ENV{'httpref.'.$requrl};
-	    }
+	       $ENV{'request.state'} = 'unknown';
+            }
+            $ENV{'request.filename'} = $r->filename;
 
 # -------------------------------------------------------- Load POST parameters
 
@@ -81,11 +80,13 @@ sub handler {
 		if ($lines[$i]=~/^$contentsep/) {
 		    if ($name) {
                         chomp($value);
-                        $ENV{"form.$name"}=$value;
 			if ($fname) {
 			    $ENV{"form.$name.filename"}=$fname;
                             $ENV{"form.$name.mimetype"}=$fmime;
+                        } else {
+                            $value=~s/\s+$//s;
                         }
+                        $ENV{"form.$name"}=$value;
                     }
                     if ($i<$#lines) {
 			$i++;
@@ -136,8 +137,18 @@ sub handler {
         };
     }
 
+# -------------------------------------------- See if this is a public resource
+    if (&Apache::lonnet::metadata($requrl,'copyright') eq 'public') {
+        &Apache::lonnet::logthis('Granting public access: '.$requrl);
+	$ENV{'user.name'}='public';
+        $ENV{'user.domain'}='public';
+        $ENV{'request.state'} = "published";
+        $ENV{'request.publicaccess'} = 1;
+        $ENV{'request.filename'} = $r->filename;
+        return OK;
+    }
 # ----------------------------------------------- Store where they wanted to go
-
+    
     $ENV{'request.firsturl'}=$requrl;
     return FORBIDDEN;
 }