--- loncom/interface/lonsyllabus.pm	2017/02/18 23:39:16	1.142
+++ loncom/interface/lonsyllabus.pm	2020/01/20 16:27:54	1.148
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.142 2017/02/18 23:39:16 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.148 2020/01/20 16:27:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,14 +177,21 @@ sub handler {
                         $brcrum =
                             &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                     }
-                    $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'},
-                                                           undef,$is_pdf,undef,&mt('Syllabus')));
+                    $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'},
+                                                           undef,$is_pdf,undef,'','',&mt('Syllabus')));
                 }
             }
             return OK;
         }
     } elsif ($external=~/\w/) {
         unless ($allowed && $forceedit) {
+            if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public') &&
+                ($ENV{'SERVER_PORT'} == 443) && ($external =~ m{^http://}) && !($env{'form.usehttp'})) {
+                unless (&Apache::lonnet::uses_sts()) {
+                    &redirect_to_http($r);
+                    return OK;
+                }
+            }
             if ($target eq 'tex') {
                 $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
                          ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
@@ -204,8 +211,8 @@ sub handler {
                     $brcrum =
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 }
-                $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'},
-                                                       $is_ext,$is_pdf,undef,&mt('Syllabus')));
+                $r->print(&Apache::lonwrapper::wrapper($r,$external,$brcrum,$env{'request.use_absolute'},
+                                                       $is_ext,$is_pdf,undef,'','',&mt('Syllabus')));
             }
             return OK;
         }
@@ -306,12 +313,10 @@ sub handler {
     if ($allowed) {
 #---------------------------------- Print External URL Syllabus Info if editing
         if ($target ne 'tex') {
+            my $hostname = &Apache::lonnet::hostname($homeserver);
             my $protocol = $Apache::lonnet::protocol{$homeserver};
             $protocol = 'http' if ($protocol ne 'https');
-            my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
-            if (($protocol eq 'https') && ($external =~ m{^http://})) {
-                $link .= '?usehttp=1';
-            }
+            my $link = $protocol.'://'.$hostname.$r->uri;
             $r->print('<div class="LC_left_float">'
                      .'<span class="LC_help_open_topic LC_info">'
                      .'<span class="LC_info">'
@@ -747,6 +752,7 @@ ENDSCRIPT
     if ($env{'form.only_body'}) {
         $args->{'only_body'} = 1;
     }
+    $args->{'hostname'} = $r->hostname();
     my $start_page =
         &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
     if ($start_page) {
@@ -896,9 +902,10 @@ sub chooser {
 
 sub syllabus_file_info {
     my ($item,$cnum,$cdom,$lonhost,$context) = @_;
+    my $hostname = &Apache::lonnet::hostname($lonhost);
     my $protocol = $Apache::lonnet::protocol{$lonhost};
     $protocol = 'http' if ($protocol ne 'https');
-    my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item;
+    my $absurl = $protocol.'://'.$hostname.$item;
     my ($filename) = ($item =~ m{([^/]+)$});
     my $file=&Apache::lonnet::filelocation("",$item);
     my ($depbutton,$filetype,$editable);
@@ -1571,9 +1578,10 @@ sub home_http_host {
     my ($cdom,$cnum) = @_;
     my $home=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($home ne 'no_host') {
+        my $hostname = &Apache::lonnet::hostname($home);
         my $protocol = $Apache::lonnet::protocol{$home};
         $protocol = 'http' if ($protocol ne 'https');
-        return $protocol.'://'.&Apache::lonnet::hostname($home);
+        return $protocol.'://'.$hostname;
     }
     return;
 }
@@ -1713,5 +1721,17 @@ sub editbutton_js {
 ENDJS
 }
 
+sub redirect_to_http {
+    my ($r) = @_;
+    &Apache::loncommon::content_type($r,'text/html');
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+    my $url = 'http://'.$r->hostname().$r->uri().'?usehttp=1';
+    $r->print(&Apache::loncommon::start_page(undef,undef,
+                                             {'redirect' => [0,$url],}).
+              &Apache::loncommon::end_page());
+    return;
+}
+
 1;
 __END__