[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonsyllabus.pm
raeburn
raeburn at source.lon-capa.org
Sat Jul 27 15:05:10 EDT 2019
raeburn Sat Jul 27 19:05:10 2019 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonsyllabus.pm
Log:
- For 2.11
Backport 1.142, 1.143, 1.144, 1.145
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.138.2.3 loncom/interface/lonsyllabus.pm:1.138.2.4
--- loncom/interface/lonsyllabus.pm:1.138.2.3 Wed Mar 15 03:31:48 2017
+++ loncom/interface/lonsyllabus.pm Sat Jul 27 19:05:10 2019
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.138.2.3 2017/03/15 03:31:48 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.138.2.4 2019/07/27 19:05:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -306,9 +306,17 @@
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 $link = $protocol.'://'.&Apache::lonnet::hostname($homeserver).$r->uri;
+ my $link = $r->uri;
+ if (($protocol eq 'https') && ($external =~ m{^http://})) {
+ unless (&Apache::lonnet::uses_sts()) {
+ $link .= '?usehttp=1';
+ $protocol = 'http';
+ }
+ }
+ $link = $protocol.'://'.$hostname.$link;
$r->print('<div class="LC_left_float">'
.'<span class="LC_help_open_topic LC_info">'
.'<span class="LC_info">'
@@ -744,6 +752,7 @@
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) {
@@ -893,9 +902,10 @@
sub syllabus_file_info {
my ($item,$cnum,$cdom,$lonhost,$context) = @_;
+ my $hostname = &Apache::lonnet::hostname($lonhost);
my $protocol = $Apache::lonnet::protocol{$lonhost};
$protocol = 'http' if ($protocol ne 'https');
- my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item;
+ my $absurl = $protocol.'://'.$hostname.$item;
my ($filename) = ($item =~ m{([^/]+)$});
my $file=&Apache::lonnet::filelocation("",$item);
my ($depbutton,$filetype,$editable);
@@ -1138,6 +1148,10 @@
(ref($courseenv) eq 'HASH')) {
return ($earlyout,$uploaded,$external,$minimal,$output);
}
+ my ($was_ext,$is_ext,$putres);
+ if ($external) {
+ $was_ext = $external;
+ }
if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) {
my %storehash;
if (($env{'form.choice'} eq 'file') &&
@@ -1150,7 +1164,7 @@
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
$storehash{'uploadedsyllabus'} = '';
$storehash{'externalsyllabus'} = '';
- my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
undef($uploaded);
undef($external);
} elsif (($env{'form.choice'} eq 'minimal') &&
@@ -1170,7 +1184,7 @@
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
$storehash{'externalsyllabus'} = '';
$storehash{'minimalsyllabus'} = '';
- my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+ $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
undef($external);
undef($minimal);
}
@@ -1260,7 +1274,7 @@
$syllabus->{'uploaded.domain'}=$env{'user.domain'};
$syllabus->{'uploaded.name'}=$env{'user.name'};
$syllabus->{'uploaded.lastmodified'} = $now;
- my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
+ $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
if ($putres eq 'ok') {
($uploaded,$minimal,$external) =
&update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
@@ -1285,7 +1299,7 @@
} else {
$external=$env{'form.externalsyllabus'};
$external =~ s/(`)//g;
- my $putres =
+ $putres =
&Apache::lonnet::put('environment',{externalsyllabus=>$external},
$cdom,$cnum);
if ($putres eq 'ok') {
@@ -1301,6 +1315,7 @@
&mt('An error occurred storing the external URL: [_1]',$putres).
'</div>';
}
+ $is_ext = $external;
}
} else {
$output = '<div class="LC_error">'.
@@ -1347,7 +1362,7 @@
} else {
$storehash{'externalsyllabus'} = '',
}
- my $putres =
+ $putres =
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
if ($putres eq 'ok') {
&Apache::lonnet::make_public_indefinitely($url);
@@ -1412,6 +1427,22 @@
$output = $result.&return_to_editor($cdom,$cnum);
$earlyout = 1;
}
+ if ($putres eq 'ok') {
+ if ((($is_ext) && ($is_ext ne $was_ext)) || ($was_ext)) {
+ my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
+ unless ($chome eq 'no_host') {
+ my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
+ if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') {
+ if ($external =~ m{^http://}) {
+ $crsinfo{$cdom.'_'.$cnum}{'extsyllplain'} = 1;
+ } elsif ($crsinfo{$cdom.'_'.$cnum}{'extsyllplain'}) {
+ delete($crsinfo{$cdom.'_'.$cnum}{'extsyllplain'});
+ }
+ &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
+ }
+ }
+ }
+ }
return ($earlyout,$uploaded,$external,$minimal,$output);
}
@@ -1547,9 +1578,10 @@
my ($cdom,$cnum) = @_;
my $home=&Apache::lonnet::homeserver($cnum,$cdom);
if ($home ne 'no_host') {
+ my $hostname = &Apache::lonnet::hostname($home);
my $protocol = $Apache::lonnet::protocol{$home};
$protocol = 'http' if ($protocol ne 'https');
- return $protocol.'://'.&Apache::lonnet::hostname($home);
+ return $protocol.'://'.$hostname;
}
return;
}
More information about the LON-CAPA-cvs
mailing list