--- loncom/interface/lonsearchcat.pm	2022/05/29 21:59:55	1.331.4.16.2.1
+++ loncom/interface/lonsearchcat.pm	2023/12/30 03:56:48	1.331.4.16.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.16.2.1 2022/05/29 21:59:55 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.331.4.16.2.2 2023/12/30 03:56:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,7 @@ sub handler {
     } 
     my $crumb_text = 'Portfolio Search';
     if (@allowed_searches ==2) {
-       $crumb_text = 'Portfolio and Catalog Search'; 
+       $crumb_text = 'Portfolio and Content Library Search'; 
     }
     my $target = '_top';
     if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
@@ -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';
         }
@@ -474,7 +474,7 @@ sub setup_basic_search {
     my ($r,$area,$hidden_fields,$closebutton) = @_;
     # Define interface components
     my %lt = &Apache::lonlocal::texthash (
-                              res => 'LON-CAPA Catalog Search',
+                              res => 'Content Library Search',
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
@@ -599,7 +599,7 @@ sub print_advanced_search_form{
 $closebutton
 </p>
 END
-    my $srchtype = 'Catalog';
+    my $srchtype = 'Content Library';
     my $jscript;
     if ($env{'form.area'} eq 'portfolio') {
         $srchtype = 'Portfolio';
@@ -2578,8 +2578,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; 
                     }
                     #