--- loncom/interface/lonsyllabus.pm 2017/02/18 23:39:16 1.142
+++ loncom/interface/lonsyllabus.pm 2022/10/27 20:33:31 1.152
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.142 2017/02/18 23:39:16 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.152 2022/10/27 20:33:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -170,6 +170,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');
@@ -177,14 +178,22 @@ sub handler {
$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
}
- $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'},
- undef,$is_pdf,undef,&mt('Syllabus')));
+ $r->print(&Apache::lonwrapper::wrapper($r,$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.' '.
@@ -197,6 +206,7 @@ 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');
@@ -204,8 +214,8 @@ sub handler {
$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
}
- $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'},
- $is_ext,$is_pdf,undef,&mt('Syllabus')));
+ $r->print(&Apache::lonwrapper::wrapper($r,$external,$brcrum,$env{'request.use_absolute'},
+ $is_ext,$is_pdf,undef,'','',&mt('Syllabus')));
}
return OK;
}
@@ -306,12 +316,8 @@ sub handler {
if ($allowed) {
#---------------------------------- Print External URL Syllabus Info if editing
if ($target ne 'tex') {
- my $protocol = $Apache::lonnet::protocol{$homeserver};
- $protocol = 'http' if ($protocol ne 'https');
- my $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
- if (($protocol eq 'https') && ($external =~ m{^http://})) {
- $link .= '?usehttp=1';
- }
+ my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web').
+ $r->uri;
$r->print('
'
.''
.''
@@ -320,7 +326,7 @@ sub handler {
.''
.'
'."\n");
my $lonhost = $r->dir_config('lonHostID');
- $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+ $r->print(&chooser($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
\%syllabusfields,\%syllabus));
}
} else {
@@ -747,6 +753,7 @@ ENDSCRIPT
if ($env{'form.only_body'}) {
$args->{'only_body'} = 1;
}
+ $args->{'hostname'} = $r->hostname();
my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
if ($start_page) {
@@ -758,6 +765,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');
@@ -782,7 +790,7 @@ sub get_breadcrumbs{
}
sub chooser {
- my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+ my ($r,$external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
my %lt = &Apache::lonlocal::texthash(
'type' => 'Syllabus Type',
'url' => 'External URL',
@@ -847,7 +855,7 @@ sub chooser {
''."\n".
'