Diff for /loncom/auth/lonacc.pm between versions 1.14 and 1.22

version 1.14, 2000/12/25 12:44:43 version 1.22, 2001/11/29 19:12:44
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # Cookie Based Access Handler  # Cookie Based Access Handler
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,  # 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,  # 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;  package Apache::lonacc;
   
Line 11  use Apache::Constants qw(:common :http : Line 37  use Apache::Constants qw(:common :http :
 use Apache::File;  use Apache::File;
 use Apache::lonnet;  use Apache::lonnet;
 use CGI::Cookie();  use CGI::Cookie();
   use Fcntl qw(:flock);
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 29  sub handler { Line 56  sub handler {
             my @profile;              my @profile;
     {      {
              my $idf=Apache::File->new("$lonidsdir/$handle.id");               my $idf=Apache::File->new("$lonidsdir/$handle.id");
                flock($idf,LOCK_SH);
              @profile=<$idf>;               @profile=<$idf>;
                $idf->close();
     }      }
             my $envi;              my $envi;
             for ($envi=0;$envi<=$#profile;$envi++) {              for ($envi=0;$envi<=$#profile;$envi++) {
Line 38  sub handler { Line 67  sub handler {
                 $ENV{$envname} = $envvalue;                  $ENV{$envname} = $envvalue;
             }              }
             $ENV{'user.environment'} = "$lonidsdir/$handle.id";              $ENV{'user.environment'} = "$lonidsdir/$handle.id";
             $ENV{'request.state'}    = "published";              if ($requrl=~/^\/res\//) {
             $ENV{'request.filename'} = $r->filename;                 $ENV{'request.state'} = "published";
   
 # --------------------- Figure out referer, first from HTTP_REFERER, then cache  
   
             my $referer='';  
             if ($referer=$r->header_in('Referer')) {  
                $ENV{'HTTP_REFERER'}=$referer;  
     } else {      } else {
        $ENV{'HTTP_REFERER'}=$ENV{'httpref.'.$requrl};         $ENV{'request.state'} = 'unknown';
     }              }
               $ENV{'request.filename'} = $r->filename;
   
 # -------------------------------------------------------- Load POST parameters  # -------------------------------------------------------- Load POST parameters
   
Line 81  sub handler { Line 105  sub handler {
  if ($lines[$i]=~/^$contentsep/) {   if ($lines[$i]=~/^$contentsep/) {
     if ($name) {      if ($name) {
                         chomp($value);                          chomp($value);
                         $ENV{"form.$name"}=$value;  
  if ($fname) {   if ($fname) {
     $ENV{"form.$name.filename"}=$fname;      $ENV{"form.$name.filename"}=$fname;
                             $ENV{"form.$name.mimetype"}=$fmime;                              $ENV{"form.$name.mimetype"}=$fmime;
                           } else {
                               $value=~s/\s+$//s;
                         }                          }
                           $ENV{"form.$name"}=$value;
                     }                      }
                     if ($i<$#lines) {                      if ($i<$#lines) {
  $i++;   $i++;
Line 136  sub handler { Line 162  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  # ----------------------------------------------- Store where they wanted to go
       
     $ENV{'request.firsturl'}=$requrl;      $ENV{'request.firsturl'}=$requrl;
     return FORBIDDEN;      return FORBIDDEN;
 }  }

Removed from v.1.14  
changed lines
  Added in v.1.22


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