[BACK]Return to lonacc.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonacc.pm between versions 1.36 and 1.40

version 1.36, 2002/10/25 13:59:40 version 1.40, 2003/04/02 14:57:32
Line 32 Line 32
 # 12/25,12/26,  # 12/25,12/26,
 # YEAR=2001  # YEAR=2001
 # 01/06/01,05/28,8/11,9/26,11/29 Gerd Kortemeyer  # 01/06/01,05/28,8/11,9/26,11/29 Gerd Kortemeyer
 # 12/15 Scott Harrison  
 # YEAR=2002  # YEAR=2002
 # 1/4,2/25 Gerd Kortemeyer  # 1/4,2/25 Gerd Kortemeyer
 #  #
Line 90  sub handler { Line 89  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) {   unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
             my @pairs=split(/&/,$buffer);              my @pairs=split(/&/,$buffer);
             my $pair;              my $pair;
Line 155  sub handler { Line 153  sub handler {
   
 # ---------------------------------------------------------------- Check access  # ---------------------------------------------------------------- Check access
   
             if ($requrl!~/^\/adm|public\//) {              if ($requrl!~/^\/adm|public|prtspool\//) {
  my $access=&Apache::lonnet::allowed('bre',$requrl);   my $access=&Apache::lonnet::allowed('bre',$requrl);
                 if ($access eq '1') {                  if ($access eq '1') {
    $ENV{'user.error.msg'}="$requrl:bre:0:0:Choose Course";     $ENV{'user.error.msg'}="$requrl:bre:0:0:Choose Course";
Line 166  sub handler { Line 164  sub handler {
            return HTTP_NOT_ACCEPTABLE;              return HTTP_NOT_ACCEPTABLE; 
                 }                  }
             }              }
       if ($requrl =~ m|^/prtspool/|) {
    my $start='/prtspool/'.$ENV{'user.name'}.'_'.
       $ENV{'user.domain'};
    if ($requrl !~ /^\Q$start\E/) {
       $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
       return HTTP_NOT_ACCEPTABLE;
    }
       }
 # ------------------------------------------------------------- This is allowed  # ------------------------------------------------------------- This is allowed
           if ($ENV{'request.course.id'}) {            if ($ENV{'request.course.id'}) {
     &Apache::lonnet::countacc($requrl);      &Apache::lonnet::countacc($requrl);
             $requrl=~/\.(\w+)$/;              $requrl=~/\.(\w+)$/;
             if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {              if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
    ($requrl=~/^\/adm\/(aboutme|navmaps|smppg|bulletinboard|wrapper)/) ||
    ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log  # ------------------------------------- This is serious stuff, get symb and log
  my $query=$r->args;   my $query=$r->args;
                 my $symb;                  my $symb;
Line 207  sub handler { Line 215  sub handler {
     }      }
   
 # -------------------------------------------- See if this is a public resource  # -------------------------------------------- See if this is a public resource
     if (($requrl=~/^\/public\//) ||       if ($requrl=~m|^/public/|
         (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {   || (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);          &Apache::lonnet::logthis('Granting public access: '.$requrl);
  $ENV{'user.name'}='public';   $ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';          $ENV{'user.domain'}='public';
Line 220  sub handler { Line 228  sub handler {
 # -------------------------------------------------------------- Not authorized  # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;      $requrl=~/\.(\w+)$/;
     if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||      if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
         ($requrl=~/^\/adm\/(roles|logout)/)) {          ($requrl=~/^\/adm\/(roles|logout|email)/) ||
           ($requrl=~m|^/prtspool/|)) {
 # -------------------------- Store where they wanted to go and get login screen  # -------------------------- Store where they wanted to go and get login screen
        $ENV{'request.firsturl'}=$requrl;   $ENV{'request.querystring'}=$r->args;
    $ENV{'request.firsturl'}=$requrl;
        return FORBIDDEN;         return FORBIDDEN;
    } else {     } else {
 # --------------------------------------------------------------------- Goodbye  # --------------------------------------------------------------------- Goodbye
Removed from v.1.36  
changed lines
  Added in v.1.40

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