--- loncom/interface/lonsyllabus.pm 2020/01/14 01:04:39 1.138.2.5.2.1 +++ loncom/interface/lonsyllabus.pm 2018/12/27 18:14:25 1.144 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.138.2.5.2.1 2020/01/14 01:04:39 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.144 2018/12/27 18:14:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -177,8 +177,8 @@ sub handler { $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } - $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'}, - undef,$is_pdf,undef,'','',&mt('Syllabus'))); + $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'}, + undef,$is_pdf,undef,&mt('Syllabus'))); } } return OK; @@ -204,8 +204,8 @@ sub handler { $brcrum = &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,undef,'','',&mt('Syllabus'))); + $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'}, + $is_ext,$is_pdf,undef,&mt('Syllabus'))); } return OK; } @@ -311,10 +311,8 @@ sub handler { $protocol = 'http' if ($protocol ne 'https'); my $link = $r->uri; if (($protocol eq 'https') && ($external =~ m{^http://})) { - unless (&Apache::lonnet::uses_sts()) { - $link .= '?usehttp=1'; - $protocol = 'http'; - } + $link .= '?usehttp=1'; + $protocol = 'http'; } $link = $protocol.'://'.$hostname.$link; $r->print('
' @@ -1315,8 +1313,8 @@ sub save_changes { &mt('An error occurred storing the external URL: [_1]',$putres). '
'; } - $is_ext = $external; } + $is_ext = $external; } else { $output = '
'. &mt('External URL not saved -- invalid URL.').