--- loncom/interface/lonsyllabus.pm 2018/12/27 18:14:25 1.144 +++ loncom/interface/lonsyllabus.pm 2022/09/18 22:33:45 1.151 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.144 2018/12/27 18:14:25 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.151 2022/09/18 22:33:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -177,14 +177,22 @@ 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'})) { + 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.' '. @@ -204,8 +212,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,15 +314,8 @@ 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 = $r->uri; - if (($protocol eq 'https') && ($external =~ m{^http://})) { - $link .= '?usehttp=1'; - $protocol = 'http'; - } - $link = $protocol.'://'.$hostname.$link; + my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web'). + $r->uri; $r->print('