--- loncom/interface/lonsearchcat.pm	2020/08/26 01:29:48	1.331.4.16
+++ loncom/interface/lonsearchcat.pm	2022/05/29 03:19:00	1.355
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.16 2020/08/26 01:29:48 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.355 2022/05/29 03:19:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,6 +178,15 @@ sub handler {
     if (@allowed_searches ==2) {
        $crumb_text = 'Portfolio and Catalog 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 = '';
+        }
+    }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
 	       &Apache::loncommon::inhibit_menu_check().
@@ -185,7 +194,7 @@ sub handler {
                '&launch='.$env{'form.launch'}.
                '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
-              target=>'_top',
+              target=>$target,
               bug=>'Searching',});
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
@@ -433,7 +442,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.
@@ -495,7 +504,7 @@ sub setup_basic_search {
     } else {
        $singledom = $env{'user.domain'};
        $disabled = ' disabled="disabled"';
-       $checked = 1;
+       $checked = 1; 
     }
     $onlysearchdomain = '<label>'
                        .&Apache::lonhtmlcommon::checkbox(
@@ -681,14 +690,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);
@@ -2085,21 +2096,14 @@ 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;
+    my $target = '_top';
+    my $args;
+    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
+        $target = '_parent';
+        $args = {'links_target' => $target};
     }
-// ]]>
-</script>
-END
-
-    my $start_page = &Apache::loncommon::start_page('Results');
+    my $start_page = &Apache::loncommon::start_page('Results',undef,$args);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2107,7 +2111,7 @@ END
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post" target="_top">
+<form name="statusform" action="" method="post" target="$target">
 <input type="hidden" name="catalogmode" value="import" />
 <input type="hidden" name="acts" value="" />
 END
@@ -2418,8 +2422,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})));
         }
@@ -2506,7 +2508,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
@@ -2693,11 +2695,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
@@ -3250,7 +3252,6 @@ sub print_frames_interface {
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
-// <![CDATA[
 var targetwin = opener;
 var queue = '';
 
@@ -3273,7 +3274,6 @@ function done_loading_results() {
         update_results(new_location);
     }
 }
-// ]]>
 </script>
 JS
 
@@ -3584,7 +3584,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',