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

Diff for /loncom/auth/publiccheck.pm between versions 1.26 and 1.29

version 1.26, 2017/02/25 19:56:09 version 1.29, 2023/12/28 18:14:08
Line 105  sub process_portfolio { Line 105  sub process_portfolio {
     my ($r,$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);
       return unless (ref($access_controls{$file_name}) eq 'HASH');
     my $access = '';      my $access = '';
     my $now = time;      my $now = time;
     my $clientip = $r->get_remote_host();      my $clientip = &Apache::lonnet::get_requestor_ip($r);
       my $portaccess = &Apache::lonnet::usertools_access($unum,$udom,'portaccess',undef,'tools');
     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 (!$portaccess) {
               next unless ($scope eq 'ip');
           }
         if ($start > $now) {          if ($start > $now) {
             next;              next;
         }          }
Line 120  sub process_portfolio { Line 125  sub process_portfolio {
             $access = 'public';              $access = 'public';
             last;              last;
         }          }
         if ($scope eq 'ip') {          if (($scope eq 'ip') || ($scope eq 'userip')) {
             if (ref($access_controls{$file_name}{$key}) eq 'HASH') {              if (ref($access_controls{$file_name}{$key}) eq 'HASH') {
                 if (ref($access_controls{$file_name}{$key}{'ip'}) eq 'ARRAY') {                  if (ref($access_controls{$file_name}{$key}{'ip'}) eq 'ARRAY') {
                     if (&Apache::loncommon::check_ip_acc(join(',',@{$access_controls{$file_name}{$key}{'ip'}}),$clientip)) {                      if (&Apache::loncommon::check_ip_acc(join(',',@{$access_controls{$file_name}{$key}{'ip'}}),$clientip)) {
Removed from v.1.26  
changed lines
  Added in v.1.29

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