--- loncom/interface/lonsearchcat.pm	2022/05/29 20:45:41	1.356
+++ 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.356 2022/05/29 20:45:41 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.360 2023/12/30 03:52:33 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';
@@ -658,7 +658,7 @@ function additional_metadata() {
                        'standards','mime') {
         $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
                   .&Apache::lonmeta::prettyinput($field,
-                                          $env{'form.'.$field},
+                                          $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           $related_word_search{$field},
@@ -675,7 +675,7 @@ function additional_metadata() {
     foreach my $field ('lowestgradelevel','highestgradelevel') {
         $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
                   .&Apache::lonmeta::prettyinput($field,
-                                          $env{'form.'.$field},
+                                          $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           0)
@@ -710,7 +710,7 @@ function additional_metadata() {
     if ($env{'form.area'} ne 'portfolio') {
         $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
                   .&Apache::lonmeta::selectbox('copyright',
-                                             $env{'form.copyright'},
+                                             $env{'form.copyright'},'',
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
@@ -720,7 +720,7 @@ function additional_metadata() {
 
     $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
               .&Apache::lonmeta::selectbox('language',
-                                    $env{'form.language'},
+                                    $env{'form.language'},'',
                                     \&Apache::loncommon::languagedescription,
                                     ('any',&Apache::loncommon::languageids)
                                     )
@@ -956,12 +956,12 @@ sub viewoptions {
     $scrout .= '<span class="LC_nobreak">'
               .&mt('Type:').' '
               .&Apache::lonmeta::selectbox('viewselect',
-                   $env{'form.viewselect'},
+                   $env{'form.viewselect'},'',
                    \&viewoptiontext,
                    sort(keys(%Views)))
               .'</span>';
     my $countselect = &Apache::lonmeta::selectbox('show',
-                                                  $env{'form.show'},
+                                                  $env{'form.show'},'',
                                                   undef,
                                                   (10,20,50,100,1000,10000));
     $scrout .= ' <span class="LC_nobreak">'
@@ -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; 
                     }
                     #