--- loncom/interface/lonsyllabus.pm 2018/12/27 18:14:25 1.144 +++ loncom/interface/lonsyllabus.pm 2019/05/02 02:12:19 1.146 @@ -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.146 2019/05/02 02:12:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -177,7 +177,7 @@ sub handler { $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } - $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'}, + $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'}, undef,$is_pdf,undef,&mt('Syllabus'))); } } @@ -204,7 +204,7 @@ sub handler { $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } - $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'}, + $r->print(&Apache::lonwrapper::wrapper($r,$external,$brcrum,$env{'request.use_absolute'}, $is_ext,$is_pdf,undef,&mt('Syllabus'))); } return OK; @@ -311,8 +311,10 @@ sub handler { $protocol = 'http' if ($protocol ne 'https'); my $link = $r->uri; if (($protocol eq 'https') && ($external =~ m{^http://})) { - $link .= '?usehttp=1'; - $protocol = 'http'; + unless (&Apache::lonnet::uses_sts()) { + $link .= '?usehttp=1'; + $protocol = 'http'; + } } $link = $protocol.'://'.$hostname.$link; $r->print('
'