--- loncom/interface/lonsyllabus.pm 2023/10/06 16:44:42 1.138.2.8.2.4 +++ 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.8.2.4 2023/10/06 16:44:42 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.144 2018/12/27 18:14:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -152,20 +152,8 @@ sub handler { &Apache::structuretags::reset_problem_globals(); my $oldfile = $env{'request.filename'}; $env{'request.filename'} = $item; - my $oldinhibit; - if ($env{'form.only_body'}) { - $oldinhibit = $env{'form.inhibitmenu'}; - $env{'form.inhibitmenu'} = 'yes'; - } my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents, '',%mystyle); - if ($env{'form.only_body'}) { - if ($oldinhibit ne '') { - $env{'form.inhibitmenu'} = $oldinhibit; - } else { - delete($env{'form.inhibitmenu'}); - } - } &Apache::structuretags::reset_problem_globals(); &Apache::lonhomework::finished_parsing(); $env{'request.filename'} = $oldfile; @@ -182,7 +170,6 @@ sub handler { } else { my $brcrum; if ($env{'form.folderpath'} =~ /^supplemental/) { - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Syllabus'); @@ -190,22 +177,14 @@ 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; } } 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.' '. @@ -218,17 +197,15 @@ sub handler { $is_pdf = 1; } if ($env{'form.folderpath'} =~ /^supplemental/) { - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Syllabus'); } - $title = &HTML::Entities::encode($title,'\'"<>&'); $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; } @@ -329,8 +306,15 @@ sub handler { if ($allowed) { #---------------------------------- Print External URL Syllabus Info if editing if ($target ne 'tex') { - my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web'). - $r->uri; + 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; $r->print('