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

Diff for /loncom/auth/publiccheck.pm between versions 1.23 and 1.24

version 1.23, 2013/12/13 02:10:27 version 1.24, 2014/12/01 22:52:54
Line 70  sub handler { Line 70  sub handler {
     } elsif (&Apache::lonnet::is_portfolio_url($requrl)) {      } elsif (&Apache::lonnet::is_portfolio_url($requrl)) {
  my (undef,$udom,$unum,$file_name,$group) =    my (undef,$udom,$unum,$file_name,$group) = 
     &Apache::lonnet::parse_portfolio_url($requrl);      &Apache::lonnet::parse_portfolio_url($requrl);
         my $access = &process_portfolio($udom,$unum,$file_name,$group);          my $access = &process_portfolio($r,$udom,$unum,$file_name,$group);
         if ($access) {          if ($access) {
             &process_public($r,$requrl,$access);              &process_public($r,$requrl,$access);
             return OK;              return OK;
Line 102  sub process_public { Line 102  sub process_public {
 }  }
   
 sub process_portfolio {  sub process_portfolio {
     my ($udom,$unum,$file_name,$group) = @_;      my ($r,$udom,$unum,$file_name,$group) = @_;
     my $current_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);      my $current_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);
     my %access_controls = &Apache::lonnet::get_access_controls($current_perms,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_perms,$group,$file_name);
     my $access = '';      my $access = '';
     my $now = time;      my $now = time;
       my $clientip = $r->get_remote_host();
     foreach my $key (keys(%{$access_controls{$file_name}})) {      foreach my $key (keys(%{$access_controls{$file_name}})) {
         my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);          my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
         if ($start > $now) {          if ($start > $now) {
Line 119  sub process_portfolio { Line 120  sub process_portfolio {
             $access = 'public';              $access = 'public';
             last;              last;
         }          }
           if ($scope eq 'ip') {
               if (ref($access_controls{$file_name}{$key}) eq 'HASH') {
                   if (ref($access_controls{$file_name}{$key}{'ip'}) eq 'ARRAY') {
                       if (&Apache::loncommon::check_ip_acc(join(',',@{$access_controls{$file_name}{$key}{'ip'}}),$clientip)) {
                           $access = 'ip';
                           last;
                       }
                   }
               }
           }
         if ($scope eq 'guest') {          if ($scope eq 'guest') {
             $access = 'guest';              $access = 'guest';
         }          }
Removed from v.1.23  
changed lines
  Added in v.1.24

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