--- loncom/interface/lonsearchcat.pm	2023/12/30 03:56:48	1.331.4.16.2.2
+++ loncom/interface/lonsearchcat.pm	2017/08/11 00:32:07	1.353
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.16.2.2 2023/12/30 03:56:48 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.353 2017/08/11 00:32:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,16 +176,7 @@ sub handler {
     } 
     my $crumb_text = 'Portfolio Search';
     if (@allowed_searches ==2) {
-       $crumb_text = 'Portfolio and Content Library Search'; 
-    }
-    my $target = '_top';
-    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
-        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
-        if ($env{'form.phase'} =~ /^(sort|run_search)$/) {
-            $target = '_parent';
-        } else {
-            $target = '_self';
-        }
+       $crumb_text = 'Portfolio and Catalog Search'; 
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
@@ -194,7 +185,7 @@ sub handler {
                '&launch='.$env{'form.launch'}.
                '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
-              target=>$target,
+              target=>'_top',
               bug=>'Searching',});
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
@@ -308,7 +299,7 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
-        my $srchtype = 'Content Library';
+        my $srchtype = 'Catalog';
         if ($env{'form.area'} eq 'portfolio') {
             $srchtype = 'Portfolio';
         }
@@ -337,10 +328,10 @@ END
                  ['query','customquery','customshow',
                   'libraries','pretty_string','domains']);
         if ($env{'form.phase'} eq 'sort') {
-            &print_sort_form($r,$pretty_string,$target);
+            &print_sort_form($r,$pretty_string);
         } elsif ($env{'form.phase'} eq 'run_search') {
             &run_search($r,$query,$customquery,$customshow,
-                        $libraries,$pretty_string,$env{'form.area'},$domainsref,$target);
+                        $libraries,$pretty_string,$env{'form.area'},$domainsref);
         }
     } elsif(($env{'form.phase'} eq 'basic_search') ||
             ($env{'form.phase'} eq 'adv_search')) {
@@ -442,7 +433,7 @@ sub hidden_field {
 =pod
 
 =over 4
-
+ 
 =item &print_basic_search_form() 
 
 Prints the form for the basic search.  Sorry the name is so cryptic.
@@ -474,7 +465,7 @@ sub setup_basic_search {
     my ($r,$area,$hidden_fields,$closebutton) = @_;
     # Define interface components
     my %lt = &Apache::lonlocal::texthash (
-                              res => 'Content Library Search',
+                              res => 'LON-CAPA Catalog Search',
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
@@ -504,7 +495,7 @@ sub setup_basic_search {
     } else {
        $singledom = $env{'user.domain'};
        $disabled = ' disabled="disabled"';
-       $checked = 1;
+       $checked = 1; 
     }
     $onlysearchdomain = '<label>'
                        .&Apache::lonhtmlcommon::checkbox(
@@ -599,7 +590,7 @@ sub print_advanced_search_form{
 $closebutton
 </p>
 END
-    my $srchtype = 'Content Library';
+    my $srchtype = 'Catalog';
     my $jscript;
     if ($env{'form.area'} eq 'portfolio') {
         $srchtype = 'Portfolio';
@@ -690,14 +681,16 @@ function additional_metadata() {
     my $anydomain = 1;
     if ($env{'form.area'} ne 'portfolio') {
         unless (&Apache::lonnet::allowed('bre','/res/')) {
-            $anydomain = 0;
+            $anydomain = 0; 
         }
     }
 
     $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')));
     if ($anydomain) {
+        my $defdom = &Apache::lonnet::default_login_domain();
+        my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom);
         $scrout .= &Apache::loncommon::domain_select('domains',
-                   $env{'form.domains'},1);
+                   $env{'form.domains'},1,$trusted,$untrusted);
     } else {
         $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
                                                        'domains','','','',[$env{'user.domain'}],'',1);
@@ -1890,8 +1883,6 @@ sub build_date_queries {
             my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore);
             # Correct for year being relative to 1900
             $cayear+=1900; $cbyear+=1900;
-            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
-            $camon++; $cbmon++;
             my $cquery=
                 '(creationdate BETWEEN '.
                 "'".$cayear.'-'.$camon.'-'.$caday."'".
@@ -1910,8 +1901,6 @@ sub build_date_queries {
             my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore);
             # Correct for year being relative to 1900
             $mayear+=1900; $mbyear+=1900;
-            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
-            $mamon++; $mbmon++;
             my $mquery=
                 '(lastrevisiondate BETWEEN '.
                 "'".$mayear.'-'.$mamon.'-'.$maday."'".
@@ -2061,7 +2050,7 @@ a link to change the search query.
 ######################################################################
 ######################################################################
 sub print_sort_form {
-    my ($r,$pretty_query_string,$target) = @_;
+    my ($r,$pretty_query_string) = @_;
 
     ##
     my %SortableFields=&Apache::lonlocal::texthash( 
@@ -2094,34 +2083,15 @@ sub print_sort_form {
         &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
         return;
     }
-    my $js =<<END;
-<script type="text/javascript">
-// <![CDATA[
-    function change_sort() {
-        var newloc = "/adm/searchcat?phase=results";
-        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&sortby=";
-        newloc += document.forms.statusform.elements.sortby.value;
-        parent.resultsframe.location= newloc;
-    }
-// ]]>
-</script>
-END
-
-    my $args;
-    if ($target eq '_parent') {
-        $args = {'links_target' => $target};
-    }
-    my $start_page = &Apache::loncommon::start_page('Results',undef,$args);
+    my $start_page = &Apache::loncommon::start_page('Results',undef);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import',
-                                            '','','','','','',$target);
+					    $env{'form.catalogmode'} ne 'import');
 
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post" target="$target">
+<form name="statusform" action="" method="post" target="_top">
 <input type="hidden" name="catalogmode" value="import" />
 <input type="hidden" name="acts" value="" />
 END
@@ -2372,7 +2342,7 @@ results into MySQL.
 ######################################################################
 sub run_search {
     my ($r,$query,$customquery,$customshow,$serverlist,
-        $pretty_string,$area,$domainsref,$target) = @_;
+        $pretty_string,$area,$domainsref) = @_;
     my $tabletype = 'metadata';
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
@@ -2381,15 +2351,10 @@ sub run_search {
     #
     # Print run_search header
     #
-    my $args;
-    if ($target eq '_parent') {
-        $args = {'links_target' => $target};
-    }
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef,$args);
+    my $start_page = &Apache::loncommon::start_page('Search Status',undef);
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import',
-                                            '','','','','','',$target);
+					    $env{'form.catalogmode'} ne 'import');
     $r->print(<<END);
 $start_page
 $breadcrumbs
@@ -2437,8 +2402,6 @@ END
         %all_library_servers = (%library_servers,%older_library_servers);
         @Servers_to_contact = sort(keys(%all_library_servers));
         foreach my $server (@Servers_to_contact) {
-            my %possdoms;
-            map { $possdoms{$_}=1;  } &Apache::lonnet::machine_domains($all_library_servers{$server});
             $domains_by_server{$server} =
                 join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
         }
@@ -2525,7 +2488,7 @@ END
                 &update_status($r,
                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));
             }
-            sleep(0.1); 
+            sleep(0.1);
         }
         #
         # Loop through the servers we have contacted but do not
@@ -2578,8 +2541,8 @@ END
 
                     if ($area eq 'portfolio') {
                         next if (defined($matches{$Fields{'url'}}));
-                        # Skip unless access control set to public or passphrase-protected
-                        next unless (($Fields{'scope'} eq 'public') || ($Fields{'scope'} eq 'guest'));
+                        # Skip if inaccessible
+                        next if (!&Apache::lonnet::portfolio_access($Fields{'url'}));
                         $matches{$Fields{'url'}} = 1; 
                     }
                     #
@@ -2712,11 +2675,11 @@ sub display_results {
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
-        }
+        } 
         # untie %groupsearch_db if the connection gets aborted before the end
         $r->register_cleanup(sub {
             untie %groupsearch_db if (tied(%groupsearch_db));
-        }); 
+        });
     }
     ##
     ## Prepare the table for querying
@@ -3269,7 +3232,6 @@ sub print_frames_interface {
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
-// <![CDATA[
 var targetwin = opener;
 var queue = '';
 
@@ -3292,7 +3254,6 @@ function done_loading_results() {
         update_results(new_location);
     }
 }
-// ]]>
 </script>
 JS
 
@@ -3603,7 +3564,7 @@ sub display_url {
         # (because the search opens in a new window, it gets
         # confusing when the links open a tab in the
         # parent window; ideally we should not force windows)
-        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\"";
+        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\""; 
         $link=&Apache::lonhtmlcommon::crumbs(
                   $url,
                   'preview',