--- loncom/interface/lonsyllabus.pm 2023/10/06 16:44:42 1.138.2.8.2.4
+++ loncom/interface/lonsyllabus.pm 2021/04/29 17:45:22 1.149
@@ -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.149 2021/04/29 17:45:22 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');
@@ -218,12 +205,10 @@ 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);
}
@@ -329,8 +314,10 @@ 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 = $protocol.'://'.$hostname.$r->uri;
$r->print('
'
.''
.''
@@ -339,7 +326,7 @@ sub handler {
.''
.'
'."\n");
my $lonhost = $r->dir_config('lonHostID');
- $r->print(&chooser($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+ $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
\%syllabusfields,\%syllabus));
}
} else {
@@ -778,7 +765,6 @@ 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');
@@ -787,7 +773,6 @@ 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"))
@@ -804,7 +789,7 @@ sub get_breadcrumbs{
}
sub chooser {
- my ($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+ my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
my %lt = &Apache::lonlocal::texthash(
'type' => 'Syllabus Type',
'url' => 'External URL',
@@ -869,7 +854,7 @@ sub chooser {
''."\n".
'