--- loncom/interface/lonsyllabus.pm 2022/01/01 21:32:06 1.138.2.8.2.1
+++ loncom/interface/lonsyllabus.pm 2020/01/20 16:27:54 1.148
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.138.2.8.2.1 2022/01/01 21:32:06 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.148 2020/01/20 16:27:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -187,8 +187,7 @@ sub handler {
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))) {
+ unless (&Apache::lonnet::uses_sts()) {
&redirect_to_http($r);
return OK;
}
@@ -317,8 +316,6 @@ sub handler {
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;
$r->print('
'
.''
@@ -328,7 +325,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 {
@@ -791,7 +788,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',
@@ -856,7 +853,7 @@ sub chooser {
''."\n".
'