--- loncom/interface/lonsearchcat.pm 2023/12/22 20:11:55 1.358 +++ loncom/interface/lonsearchcat.pm 2023/12/30 03:52:33 1.360 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.358 2023/12/22 20:11:55 raeburn Exp $ +# $Id: lonsearchcat.pm,v 1.360 2023/12/30 03:52:33 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -308,7 +308,7 @@ END } # if ($env{'form.searchmode'} eq 'advanced') { - my $srchtype = 'Catalog'; + my $srchtype = 'Content Library'; if ($env{'form.area'} eq 'portfolio') { $srchtype = 'Portfolio'; } @@ -599,7 +599,7 @@ sub print_advanced_search_form{ $closebutton

END - my $srchtype = 'Catalog'; + my $srchtype = 'Content Library'; my $jscript; if ($env{'form.area'} eq 'portfolio') { $srchtype = 'Portfolio'; @@ -2564,8 +2564,8 @@ END if ($area eq 'portfolio') { next if (defined($matches{$Fields{'url'}})); - # Skip if inaccessible - next if (!&Apache::lonnet::portfolio_access($Fields{'url'})); + # Skip unless access control set to public or passphrase-protected + next unless (($Fields{'scope'} eq 'public') || ($Fields{'scope'} eq 'guest')); $matches{$Fields{'url'}} = 1; } #