--- loncom/interface/portfolio.pm 2023/12/28 15:57:27 1.267 +++ loncom/interface/portfolio.pm 2023/12/28 18:14:07 1.268 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.267 2023/12/28 15:57:27 raeburn Exp $ +# $Id: portfolio.pm,v 1.268 2023/12/28 18:14:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -490,6 +490,7 @@ sub display_directory { my $cond_access = 0; foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) { my ($num,$scope,$end,$start) = &unpack_acc_key($key); + next if ($scope eq 'ip'); if (($now > $start) && (!$end || $end > $now)) { if ($scope eq 'public') { $pub_access = 1; @@ -1005,9 +1006,9 @@ sub build_access_summary { domains => 'Conditional: domain-based', users => 'Conditional: user-based', course => 'Conditional: course/community-based', - ip => 'Conditional: IP-based', + userip => 'Conditional: IP-based', ); - my @allscopes = ('public','guest','domains','users','course','ip'); + my @allscopes = ('public','guest','domains','users','course','userip'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -1084,8 +1085,8 @@ sub build_access_summary { } elsif ($scope eq 'users') { my $curr_user_list = &sort_users($content->{'users'}); $r->print(&mt('Users: ').$curr_user_list); - } elsif ($scope eq 'ip') { - my $curr_ips_list = &sort_ips($content->{'ip'}); + } elsif ($scope eq 'userip') { + my $curr_ips_list = &sort_ips($content->{'userip'}); $r->print(&mt('IP(s):').' '.$curr_ips_list); } else { $r->print(' '); @@ -1195,7 +1196,7 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - my @types = ('course','domains','users','ip'); + my @types = ('course','domains','users','userip'); foreach my $newitem (@types) { $allnew += $env{'form.new'.$newitem}; } @@ -1207,7 +1208,7 @@ sub update_access { course => 'course/community', domains => 'domain', users => 'user', - ip => 'IP', + userip => 'IP', ); foreach my $newitem (@types) { next if ($env{'form.new'.$newitem} <= 0); @@ -1311,7 +1312,7 @@ sub build_access_record { 'udom' => $udom }); } - } elsif ($scope eq 'ip') { + } elsif ($scope eq 'userip') { my $ipslist = $env{'form.ips_'.$num}; $ipslist =~ s/\s+//sg; my %ipshash = map { ($_,1) } (split(/,/,$ipslist)); @@ -1382,7 +1383,7 @@ sub access_setting_table { push(@domains,$key); } elsif ($scope eq 'users') { push(@users,$key); - } elsif ($scope eq 'ip') { + } elsif ($scope eq 'userip') { push(@ips,$key); } } @@ -1444,7 +1445,7 @@ sub standard_settings { my $numconditionals = 0; my $conditionstext; my %cond_status; - foreach my $scope ('domains','users','course','ip') { + foreach my $scope ('domains','users','course','userip') { $numconditionals += $acl_count->{$scope}; if ($acl_count->{$scope} > 0) { if ($conditionstext ne 'Active') { @@ -1491,7 +1492,7 @@ sub condition_setting { $r->print('