--- loncom/auth/loncacc.pm 2003/05/06 21:45:25 1.27 +++ loncom/auth/loncacc.pm 2003/05/13 00:52:46 1.28 @@ -2,7 +2,7 @@ # Cookie Based Access Handler for Construction Area # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer) # -# $Id: loncacc.pm,v 1.27 2003/05/06 21:45:25 albertel Exp $ +# $Id: loncacc.pm,v 1.28 2003/05/13 00:52:46 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,20 +78,13 @@ sub handler { $handle=~s/\W//g; my $lonidsdir=$r->dir_config('lonIDsDir'); if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { - 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]); - $ENV{$envname} = $envvalue; - } - $ENV{'user.environment'} = "$lonidsdir/$handle.id"; + +# ------------------------------------------------------ Initialize Environment + + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + +# -------------------------------------------------------------- Resource State + $ENV{'request.state'} = "construct"; $ENV{'request.filename'} = $r->filename; @@ -111,72 +104,7 @@ sub handler { # -------------------------------------------------------- Load POST parameters - - my $buffer; - - $r->read($buffer,$r->header_in('Content-length'),0); - - unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) { - my @pairs=split(/&/,$buffer); - my $pair; - foreach $pair (@pairs) { - my ($name,$value) = split(/=/,$pair); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - $name =~ tr/+/ /; - $name =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - &Apache::loncommon::add_to_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; - } - &Apache::loncommon::add_to_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"; - } - } - } - $ENV{'request.method'}=$ENV{'REQUEST_METHOD'}; - $r->method_number(M_GET); - $r->method('GET'); - $r->headers_in->unset('Content-length'); + &Apache::loncommon::get_posted_cgi($r); return OK; } else {