--- loncom/auth/lonacc.pm	2000/11/06 16:30:21	1.13
+++ loncom/auth/lonacc.pm	2001/05/28 22:47:18	1.18
@@ -1,7 +1,9 @@
 # The LearningOnline Network
 # 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 Gerd Kortemeyer
+# 01/06,01/13,05/31,06/01,09/06,09/25,09/28,10/30,11/6,
+# 12/25,12/26,
+# 01/06/01,05/28 Gerd Kortemeyer
 
 package Apache::lonacc;
 
@@ -10,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;
@@ -28,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++) {
@@ -37,7 +42,11 @@ sub handler {
                 $ENV{$envname} = $envvalue;
             }
             $ENV{'user.environment'} = "$lonidsdir/$handle.id";
-            $ENV{'request.state'}    = "published";
+            if ($requrl=~/^\/res\//) {
+               $ENV{'request.state'} = "published";
+	    } else {
+	       $ENV{'request.state'} = 'unknown';
+            }
             $ENV{'request.filename'} = $r->filename;
 
 # --------------------- Figure out referer, first from HTTP_REFERER, then cache
@@ -53,9 +62,11 @@ sub handler {
 
 
            
-            my $buffer;
+        my $buffer;
+
+        $r->read($buffer,$r->header_in('Content-length'));
 
-            $r->read($buffer,$r->header_in('Content-length'));
+	unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
             my @pairs=split(/&/,$buffer);
             my $pair;
             foreach $pair (@pairs) {
@@ -66,7 +77,52 @@ sub handler {
                $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
                $ENV{"form.$name"}=$value;
             }
-
+        } else {
+	    my $contentsep=$1;
+            my @lines = split (/\n/,$buffer);
+            my $name='';
+            my $value='';
+            my $fname='';
+            my $fmime='';
+            my $i;
+            for ($i=0;$i<=$#lines;$i++) {
+		if ($lines[$i]=~/^$contentsep/) {
+		    if ($name) {
+                        chomp($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++;
+                        $lines[$i]=~
+		 /Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
+                        $name=$1;
+                        $value='';
+                        if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
+			   $fname=$1;
+                           if 
+                            ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
+			      $fmime=$1;
+                              $i++;
+			   } else {
+                              $fmime='';
+                           }
+                        } else {
+			    $fname='';
+                            $fmime='';
+                        }
+                        $i++;
+                    }
+                } else {
+		    $value.=$lines[$i]."\n";
+                }
+            }
+	}
             $r->method_number(M_GET);
 	    $r->method('GET');
             $r->headers_in->unset('Content-length');