--- loncom/interface/lonsyllabus.pm 2022/01/01 21:06:33 1.138.2.8 +++ loncom/interface/lonsyllabus.pm 2023/10/06 16:44:42 1.138.2.8.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.138.2.8 2022/01/01 21:06:33 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.138.2.8.2.4 2023/10/06 16:44:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -152,8 +152,20 @@ 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; @@ -170,6 +182,7 @@ 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'); @@ -178,7 +191,7 @@ 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; @@ -205,15 +218,17 @@ 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,&mt('Syllabus'))); + $is_ext,$is_pdf,undef,'','',&mt('Syllabus'))); } return OK; } @@ -314,12 +329,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 $alias = &Apache::lonnet::use_proxy_alias($r,$homeserver); - $hostname = $alias if ($alias ne ''); - my $link = $protocol.'://'.$hostname.$r->uri; + my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web'). + $r->uri; $r->print('
' .'' .'' @@ -767,6 +778,7 @@ sub get_breadcrumbs{ my ($cdom,$cnum,$crstype,$args) = @_; return unless (ref($args) eq 'HASH'); if ($env{'form.folderpath'} =~ /^supplemental/) { + &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); my $title = $env{'form.title'}; if ($title eq '') { $title = &mt('Syllabus'); @@ -775,6 +787,7 @@ sub get_breadcrumbs{ &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); if (ref($brcrum) eq 'ARRAY') { $args->{'bread_crumbs'} = $brcrum; + $args->{'bread_crumbs_nomenu'} = 1; } } else { if ((&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus"))