Diff for /loncom/auth/lonacc.pm between versions 1.73 and 1.76

version 1.73, 2006/01/27 22:28:37 version 1.76, 2006/04/13 19:07:33
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use CGI::Cookie();  use CGI::Cookie();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
   
   sub cleanup {
       my ($r)=@_;
       if (! $r->is_initial_req()) { return DECLINED; }
       &Apache::lonnet::save_cache();
       return OK;
   }
   
   sub goodbye {
       my ($r)=@_;
       &Apache::lonnet::goodbye();
       return DONE;
   }
   
   ###############################################
   
   sub get_posted_cgi {
       my ($r) = @_;
   
       my $buffer;
       if ($r->header_in('Content-length')) {
    $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;
       &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;
       }
       &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";
       }
    }
       }
   #
   # Digested POSTed values
   #
   # Remember the way this was originally done (GET or POST)
   #
       $env{'request.method'}=$ENV{'REQUEST_METHOD'};
   #
   # There may also be stuff in the query string
   # Tell subsequent handlers that this was GET, not POST, so they can access query string.
   # Also, unset POSTed content length to cover all tracks.
   #
   
       $r->method_number(M_GET);
   
       $r->method('GET');
       $r->headers_in->unset('Content-length');
   }
   
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     my $requrl=$r->uri;      my $requrl=$r->uri;
Line 90  sub handler { Line 188  sub handler {
             $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);              $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
 # -------------------------------------------------------- Load POST parameters  # -------------------------------------------------------- Load POST parameters
   
     &Apache::loncommon::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
   
 # ---------------------------------------------------------------- Check access  # ---------------------------------------------------------------- Check access
   
Line 148  sub handler { Line 246  sub handler {
      (($requrl=~m|(.*)/smpedit$|) &&       (($requrl=~m|(.*)/smpedit$|) &&
       &Apache::lonnet::symbverify($symb,$1))) {        &Apache::lonnet::symbverify($symb,$1))) {
                       my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);                        my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
                       &Apache::lonnet::symblist($map,$murl => [$murl,$mid],        &Apache::lonnet::symblist($map,$murl => [$murl,$mid],
  'last_known' =>[$murl,$mid]);   'last_known' =>[$murl,$mid]);
     } else {      } else {
  $r->log_reason('Invalid symb for '.$requrl.': '.   $r->log_reason('Invalid symb for '.$requrl.': '.
Line 195  sub handler { Line 293  sub handler {
     &Apache::lonauth::success($r,'public','public','public');      &Apache::lonauth::success($r,'public','public','public');
         my $lonidsdir=$r->dir_config('lonIDsDir');          my $lonidsdir=$r->dir_config('lonIDsDir');
  &Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);   &Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);
  &Apache::loncommon::get_posted_cgi($r);   &Apache::lonacc::get_posted_cgi($r);
         $env{'request.state'} = "published";          $env{'request.state'} = "published";
         $env{'request.publicaccess'} = 1;          $env{'request.publicaccess'} = 1;
         $env{'request.filename'} = $r->filename;          $env{'request.filename'} = $r->filename;

Removed from v.1.73  
changed lines
  Added in v.1.76


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>