--- loncom/auth/loncacc.pm	2000/06/05 20:28:17	1.6
+++ loncom/auth/loncacc.pm	2001/01/06 16:12:24	1.14
@@ -2,13 +2,15 @@
 # Cookie Based Access Handler for Construction Area
 # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
 # 6/15,16/11,22/11,
-# 01/06,01/11,6/1 Gerd Kortemeyer
+# 01/06,01/11,6/1,9/25,9/28,11/22,12/25,12/26,06/01 Gerd Kortemeyer
 
 package Apache::loncacc;
 
 use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http :methods);
+use Apache::File;
 use CGI::Cookie();
+use Fcntl qw(:flock);
 
 sub handler {
     my $r = shift;
@@ -22,7 +24,7 @@ sub handler {
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
             my $ownername=$requrl;
-            $ownername=~s/\/\~(\w+).*/\1/;
+            $ownername=~s/\/(?:\~|priv\/)(\w+).*/\1/;
             my $ownerdomain=$r->dir_config('lonDefDomain');
             my @handleparts=split(/\_/,$handle);
             my $username=$handleparts[0];
@@ -35,27 +37,88 @@ 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++) {
 		chomp($profile[$envi]);
 		my ($envname,$envvalue)=split(/=/,$profile[$envi]);
-                $r->subprocess_env("$envname" => "$envvalue");
+                $ENV{$envname} = $envvalue;
             }
-            $r->subprocess_env("user.environment" => "$lonidsdir/$handle.id",
-                               "request.state"    => "construct",
-                               "request.filename" => $r->filename);
-            my $buffer;
-            $r->read($buffer,$r->header_in('Content-length'));
+            $ENV{'user.environment'} = "$lonidsdir/$handle.id";
+            $ENV{'request.state'}    = "construct";
+            $ENV{'request.filename'} = $r->filename;
+
+# -------------------------------------------------------- Load POST parameters
+
+
+        my $buffer;
+
+        $r->read($buffer,$r->header_in('Content-length'));
+
+	unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
             my @pairs=split(/&/,$buffer);
-            my $pair; my $name; my $value;
+            my $pair;
             foreach $pair (@pairs) {
-               ($name,$value) = split(/=/,$pair);
+               my ($name,$value) = split(/=/,$pair);
                $value =~ tr/+/ /;
                $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-               $r->subprocess_env("form.$name" => $value);
+               $name  =~ tr/+/ /;
+               $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');
+
             return OK; 
         } else { 
             $r->log_reason("Cookie $handle not valid", $r->filename)