Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.29 and 1.30

version 1.29, 2000/09/05 13:32:31 version 1.30, 2000/09/06 14:25:17
Line 626  sub allowed { Line 626  sub allowed {
  return 'F';   return 'F';
     }      }
   
   # The user does not have full access at system or domain level
 # Course level access control  # Course level access control
   
 # uri itself refering to a course?  # uri itself refering to a course?
Line 634  sub allowed { Line 635  sub allowed {
        if ($ENV{'user.priv./'.$uri}=~/$priv\&([^\:]*)/) {         if ($ENV{'user.priv./'.$uri}=~/$priv\&([^\:]*)/) {
           $thisallowed.=$1;            $thisallowed.=$1;
        }         }
   # Full access on course level? Exit.
        if ($thisallowed=~/F/) {         if ($thisallowed=~/F/) {
   return 'F';    return 'F';
        }         }
Line 665  sub allowed { Line 667  sub allowed {
    /\&$urifile\:(\d+)\&/) {     /\&$urifile\:(\d+)\&/) {
    $uricond=$1;     $uricond=$1;
        } elsif (($fe{$uritype} eq 'emb') || ($fe{$uritype} eq 'img')) {         } elsif (($fe{$uritype} eq 'emb') || ($fe{$uritype} eq 'img')) {
     my $refuri=$ENV{'HTTP_REFERER'};
             $refuri=~s/^\/res//;
             $refuri=~s/^\///;
             @uriparts=split(/\//,$refuri);
             $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             $uripath=join('/',@uriparts);
             if ($ENV{'acc.res.'.$ENV{'request.course'}.'.'.$uripath}=~
        /\&$urifile\:(\d+)\&/) {
        $uricond=$1;
     }
        }         }
   
          if ($uricond>=0) {
   
   # The resource is part of the course
   # If user had full access on course level, go ahead
   
              if ($thisallowed=~/F/) {
          return 'F';
              }
   
   # Restricted by state?
   
              if ($thisallowed=~/X/) {
         if (&condval($uricond)>1) {
            return '2';
                 } else {
                    return '';
                 }
      }
          }
     }      }
     return $thisallowed;      return $thisallowed;
 }  }

Removed from v.1.29  
changed lines
  Added in v.1.30


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