--- loncom/interface/lonsyllabus.pm	2022/01/01 20:45:09	1.138.2.7
+++ loncom/interface/lonsyllabus.pm	2020/01/14 00:57:54	1.147
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.138.2.7 2022/01/01 20:45:09 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.147 2020/01/14 00:57:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,21 +178,13 @@ sub handler {
                             &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                     }
                     $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'},
-                                                           undef,$is_pdf,&mt('Syllabus')));
+                                                           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'})) {
-                my $hostname = $r->hostname();
-                unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                    &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.' '.
@@ -213,7 +205,7 @@ sub handler {
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 }
                 $r->print(&Apache::lonwrapper::wrapper($r,$external,$brcrum,$env{'request.use_absolute'},
-                                                       $is_ext,$is_pdf,&mt('Syllabus')));
+                                                       $is_ext,$is_pdf,undef,'','',&mt('Syllabus')));
             }
             return OK;
         }
@@ -317,9 +309,14 @@ sub handler {
             my $hostname = &Apache::lonnet::hostname($homeserver);
             my $protocol = $Apache::lonnet::protocol{$homeserver};
             $protocol = 'http' if ($protocol ne 'https');
-            my $alias = &Apache::lonnet::use_proxy_alias($r,$homeserver);
-            $hostname = $alias if ($alias ne '');
-            my $link = $protocol.'://'.$hostname.$r->uri;
+            my $link = $r->uri;
+            if (($protocol eq 'https') && ($external =~ m{^http://})) {
+                unless (&Apache::lonnet::uses_sts()) {
+                    $link .= '?usehttp=1';
+                    $protocol = 'http';
+                }
+            }
+            $link = $protocol.'://'.$hostname.$link;
             $r->print('<div class="LC_left_float">'
                      .'<span class="LC_help_open_topic LC_info">'
                      .'<span class="LC_info">'
@@ -328,7 +325,7 @@ sub handler {
                      .'</span>'
                      .'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n");
             my $lonhost = $r->dir_config('lonHostID');
-            $r->print(&chooser($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+            $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
                                \%syllabusfields,\%syllabus));
         }
     } else {
@@ -791,7 +788,7 @@ sub get_breadcrumbs{
 }
 
 sub chooser {
-    my ($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+    my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  'type'          => 'Syllabus Type',
                  'url'           => 'External URL',
@@ -856,7 +853,7 @@ sub chooser {
                '<div id="minimal" class="LC_left_float" style="display: '.$display{'minimal'}.'">'."\n".
                '<fieldset><legend>'.$lt{'minimal'}.'</legend>';
     if ($minimal) {
-        my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$minimal,$cnum,$cdom,$lonhost,'minimal');
+        my ($absurl,$filename,$depbutton) = &syllabus_file_info($minimal,$cnum,$cdom,$lonhost,'minimal');
         $output .= '<a href="javascript:extUrlPreview('."'currminimal'".');">'.$lt{'pr'}.'</a>'.
                    '<input type="hidden" name="minimalfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currminimal" />'.
                    $depbutton;
@@ -869,7 +866,7 @@ sub chooser {
                '<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'">'."\n".
                '<fieldset><legend>'.$lt{'file'}.'</legend>';
     if ($uploaded) {
-        my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$uploaded,$cnum,$cdom,$lonhost,'file');
+        my ($absurl,$filename,$depbutton) = &syllabus_file_info($uploaded,$cnum,$cdom,$lonhost,'file');
         $output .= '<span class="LC_nobreak">'.$lt{'curr'}.'&nbsp;'.
                    '<input type="hidden" name="uploadedfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currfile" />'.
                    '<a href="javascript:extUrlPreview('."'currfile'".');">'.$filename.'</a></span>'.$depbutton.
@@ -904,12 +901,10 @@ sub chooser {
 }
 
 sub syllabus_file_info {
-    my ($r,$item,$cnum,$cdom,$lonhost,$context) = @_;
+    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 $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
-    $hostname = $alias if ($alias ne '');
     my $absurl = $protocol.'://'.$hostname.$item;
     my ($filename) = ($item =~ m{([^/]+)$});
     my $file=&Apache::lonnet::filelocation("",$item);
@@ -1320,8 +1315,8 @@ sub save_changes {
                               &mt('An error occurred storing the external URL: [_1]',$putres).
                               '</div>';
                 }
-                $is_ext = $external;
             }
+            $is_ext = $external;
         } else {
             $output = '<div class="LC_error">'.
                       &mt('External URL not saved -- invalid URL.').
@@ -1726,17 +1721,5 @@ 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__