--- loncom/interface/coursecatalog.pm	2019/07/23 13:58:53	1.102
+++ loncom/interface/coursecatalog.pm	2021/04/30 18:19:41	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.102 2019/07/23 13:58:53 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.104 2021/04/30 18:19:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,7 @@ sub handler {
 
     my $serverdefdom = &Apache::lonnet::default_login_domain();
     my $codedom = $serverdefdom;
+    my $hostname = $r->hostname();
 
     if (($env{'user.domain'} ne '') && ($env{'user.domain'} ne 'public')) { 
         $codedom = $env{'user.domain'};
@@ -138,7 +139,7 @@ sub handler {
         }
         my $js = '<script type="text/javascript">'."\n".
                  '// <![CDATA['."\n".
-                 &courselink_javascript($r)."\n".
+                 &courselink_javascript($hostname)."\n".
                  '// ]]>'."\n".
                  '</script>'."\n";
         $r->print(&Apache::loncommon::start_page('Search for a Course/Community',$js));
@@ -191,7 +192,8 @@ sub handler {
                                 if ($courseinfo{$codedom.'_'.$cnum}{'showsyllabus'}) {
                                     my $usehttp = 0;
                                     if (($ENV{'SERVER_PORT'} == 443) && ($courseinfo{$codedom.'_'.$cnum}{'extsyllplain'})) {
-                                        unless (&Apache::lonnet::uses_sts()) {
+                                        unless ((&Apache::lonnet::uses_sts()) ||
+                                                (&Apache::lonnet::waf_allssl($hostname))) {
                                             $usehttp = 1;
                                         }
                                     }
@@ -253,7 +255,8 @@ sub handler {
     &validate_input($codedom,\@cats,\%maxd,$cathash);
     my ($numtitles,@codetitles);
     if (($env{'form.coursenum'} ne '') && ($knownuser)) {
-        &course_details($r,$codedom,$formname,$domdesc,\@trails,\%allitems,\@codetitles);
+        &course_details($r,$codedom,$formname,$domdesc,$hostname,\@trails,
+                        \%allitems,\@codetitles);
     } else {
         my ($catlinks,$has_subcats,$selitem) = &category_breadcrumbs($codedom,@cats);
         my $wasacctext = &get_wasactive_text();
@@ -299,7 +302,7 @@ function setCourseId(caller) {
 }
 
 ENDSCRIPT
-        $catjs .= &courselink_javascript($r);
+        $catjs .= &courselink_javascript($hostname);
         if (&user_is_dc($codedom) || $canviewall) {
             $catjs .= <<ENDTOGGJS
 
@@ -334,7 +337,7 @@ ENDTOGGJS
                                                    $catlinks,$catjs,\@codetitles,$cattype,$canviewall);
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,$numtitles,undef,undef,undef,
-                                                \@codetitles,$canviewall));
+                                                \@codetitles,$canviewall,$hostname));
             }
         } else {
             my (%add_entries);
@@ -383,7 +386,7 @@ ENDJS
             }
             if ($env{'form.state'} eq 'listing') {
                 $r->print(&print_course_listing($codedom,undef,\@trails,\%allitems,$subcats,\@codetitles,
-                                                $canviewall));
+                                                $canviewall,$hostname));
             }
         }
     }
@@ -659,12 +662,12 @@ sub get_instcode_allowable {
 }
 
 sub course_details {
-    my ($r,$codedom,$formname,$domdesc,$trails,$allitems,$codetitles) = @_;
+    my ($r,$codedom,$formname,$domdesc,$hostname,$trails,$allitems,$codetitles) = @_;
     my $output;
     my %add_entries = (topmargin    => "0",
                        marginheight => "0",);
     my $js = '<script type="text/javascript">'."\n".
-             &courselink_javascript($r).'</script>'."\n";
+             &courselink_javascript($hostname).'</script>'."\n";
     my $start_page =
         &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                        {'add_entries' => \%add_entries, });
@@ -696,7 +699,7 @@ sub course_details {
     $r->print(
         &Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog').
         '<h2>'.$textthree.'</h2>'.
-        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles).
+        &print_course_listing($codedom,undef,$trails,$allitems,undef,$codetitles,undef,$hostname).
         '<br />'.
         '<form name="'.$formname.'" method="post" action="/adm/coursecatalog">'.
         &Apache::lonhtmlcommon::actionbox([
@@ -728,8 +731,7 @@ END
 }
 
 sub courselink_javascript {
-    my ($r) = @_;
-    my $hostname = $r->hostname();
+    my ($hostname) = @_;
     return <<"END";
 
 function ToSyllabus(cdom,cnum,usehttp) {
@@ -1320,7 +1322,7 @@ sub search_courselist {
 }
 
 sub print_course_listing {
-    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall) = @_;
+    my ($domain,$numtitles,$trails,$allitems,$subcats,$codetitles,$canviewall,$hostname) = @_;
     my $output;
     my %courses;
     my $knownuser = &user_is_known();
@@ -1373,7 +1375,7 @@ sub print_course_listing {
     }
     my $now = time;
     $output .= &construct_data_table($knownuser,$domain,\%courses,$details,undef,
-                                     $now,$trails,$allitems,$canviewall);
+                                     $now,$trails,$allitems,$canviewall,$hostname);
     $output .= "\n".'<form name="linklaunch" method="post" action="">'.
                '<input type="hidden" name="backto" value="coursecatalog" />'.
                '<input type="hidden" name="courseid" value="" />'.
@@ -1382,7 +1384,8 @@ sub print_course_listing {
 }
 
 sub construct_data_table {
-    my ($knownuser,$domain,$courses,$details,$usersections,$now,$trails,$allitems,$canviewall) = @_;
+    my ($knownuser,$domain,$courses,$details,$usersections,$now,
+        $trails,$allitems,$canviewall,$hostname) = @_;
     my %sortname;
     if (($details eq '') || ($env{'form.showdetails'})) {
         $sortname{'Code'} = 'code';
@@ -1512,7 +1515,8 @@ sub construct_data_table {
         foreach my $course (@{$Sortby{$item}}) {
             $output.=&Apache::loncommon::start_data_table_row(); 
             $output.=&courseinfo_row($courseinfo{$course},$knownuser,$details,
-                                     \$count,$now,$course,$trails,$allitems,\%numbers,$canviewall);
+                                     \$count,$now,$course,$trails,$allitems,
+                                     \%numbers,$canviewall,$hostname);
             $output.=&Apache::loncommon::end_data_table_row();
         }
     }
@@ -1834,7 +1838,8 @@ sub count_students {
 }
 
 sub courseinfo_row {
-    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,$numbers,$canviewall) = @_;
+    my ($info,$knownuser,$details,$countref,$now,$course,$trails,$allitems,
+        $numbers,$canviewall,$hostname) = @_;
     my ($cdom,$cnum,$title,$ownerlast,$code,$owner,$seclist,$xlist_items,
         $accessdates,$showsyllabus,$counts,$autoenrollment,$output,$categories,
         $extsyllplain);
@@ -1881,7 +1886,8 @@ sub courseinfo_row {
     if ($showsyllabus) {
         my $usehttp = 0;
         if (($ENV{'SERVER_PORT'} == 443) && ($extsyllplain)) {
-            unless (&Apache::lonnet::uses_sts()) {
+            unless ((&Apache::lonnet::uses_sts()) ||
+                    (&Apache::lonnet::waf_allssl($hostname))) {
                 $usehttp = 1;
             }
         }