--- loncom/interface/lonsyllabus.pm 2014/01/09 15:18:40 1.136
+++ loncom/interface/lonsyllabus.pm 2020/01/14 01:04:39 1.138.2.5.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.136 2014/01/09 15:18:40 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.138.2.5.2.1 2020/01/14 01:04:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -99,7 +99,7 @@ sub handler {
my $minimal=$courseenv{'minimalsyllabus'};
if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
- my $item;
+ my ($item,$is_pdf);
if ($minimal =~/\w/) {
if ($external =~ m{\Q$minimal\E$}) {
undef($external);
@@ -110,10 +110,13 @@ sub handler {
undef($external);
}
$item = $uploaded;
+ if ($item =~ /\.pdf$/i) {
+ $is_pdf = 1;
+ }
}
unless ($allowed && $forceedit) {
my $file=&Apache::lonnet::filelocation("",$item);
- if ($file =~ /\.(tex|x?html?)$/) {
+ if ($file =~ /\.(tex|x?html?)$/) {
my $filetype = $1;
my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {
@@ -122,13 +125,21 @@ sub handler {
if ($target eq 'tex') {
$r->print($filecontents);
} else {
- my $result = &Apache::lontexconvert::converted(\$filecontents,
- $env{'form.texengine'});
+ my $texengine = $env{'form.texengine'};
+ if ($texengine eq '') {
+ $texengine = 'tth';
+ } elsif (lc($texengine) eq 'jsmath') {
+ $texengine = 'MathJax';
+ }
+ my $result = &Apache::lontexconvert::converted(\$filecontents,$texengine);
my %args;
&get_breadcrumbs($cdom,$cnum,$crstype,\%args);
if ($env{'form.only_body'}) {
$args{'only_body'} = 1;
}
+ if ($env{'request.use_absolute'}) {
+ $args{'use_absolute'} = $env{'request.use_absolute'};
+ }
$r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
$result.
&Apache::loncommon::end_page());
@@ -157,7 +168,17 @@ sub handler {
&mt('Print the syllabus directly from your web browser').
'\end{document}');
} else {
- $r->print(&Apache::lonwrapper::wrapper($item));
+ my $brcrum;
+ if ($env{'form.folderpath'} =~ /^supplemental/) {
+ my $title = $env{'form.title'};
+ if ($title eq '') {
+ $title = &mt('Syllabus');
+ }
+ $brcrum =
+ &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+ }
+ $r->print(&Apache::lonwrapper::wrapper($r,$item,$brcrum,$env{'request.use_absolute'},
+ undef,$is_pdf,undef,'','',&mt('Syllabus')));
}
}
return OK;
@@ -170,7 +191,21 @@ sub handler {
' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
'\end{document}');
} else {
- $r->print(&Apache::lonwrapper::wrapper($external));
+ my $is_ext = 1;
+ my ($is_pdf,$brcrum);
+ if ($external =~ /\.pdf$/i) {
+ $is_pdf = 1;
+ }
+ if ($env{'form.folderpath'} =~ /^supplemental/) {
+ my $title = $env{'form.title'};
+ if ($title eq '') {
+ $title = &mt('Syllabus');
+ }
+ $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,undef,'','',&mt('Syllabus')));
}
return OK;
}
@@ -271,9 +306,17 @@ 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 $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">'
@@ -567,6 +610,7 @@ ENDSCRIPT
my $checkedstr = "var include = new Array('".join("','",@checked)."');";
my $uncheckedstr = "var exclude = new Array('".join("','",@unchecked)."');";
my $invurl = &mt('Invalid URL');
+ &js_escape(\$invurl);
my $urlregexp = <<'ENDREGEXP';
/^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
ENDREGEXP
@@ -591,11 +635,16 @@ function toggleEditor(pick) {
var regexp = $urlregexp;
-function extUrlPreview(caller) {
+function extUrlPreview(caller,protocol) {
if (document.getElementById(caller)) {
var url = document.getElementById(caller).value;
if (regexp.test(url)) {
- openMyModal(url,500,400,'yes');
+ var http_regex = /^http\:\/\//gi;
+ if ((protocol == 'https') && (http_regex.test(url))) {
+ window.open(url,"syllabuspreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
+ } else {
+ openMyModal(url,500,400,'yes');
+ }
} else {
alert("$invurl");
}
@@ -695,10 +744,15 @@ ENDSCRIPT
onload => 'setTemplateBoxes();',
);
$args->{'add_entries'} = \%loaditem;
+ } else {
+ if ($env{'request.use_absolute'}) {
+ $args->{'use_absolute'} = $env{'request.use_absolute'};
+ }
}
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) {
@@ -779,6 +833,7 @@ sub chooser {
$checked{'templatebox'} = $check;
$display{'templatebox'} = 'block';
}
+ my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
my $output =
'<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n".
@@ -791,7 +846,7 @@ sub chooser {
$output .= '</fieldset></div>'."\n".
'<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n".
'<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n".
- '<a href="javascript:extUrlPreview('."'syllabusurl'".');">'.$lt{'pr'}.'</a></span> '."\n".
+ '<a href="javascript:extUrlPreview('."'syllabusurl','$protocol'".');">'.$lt{'pr'}.'</a></span> '."\n".
'<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n".
' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n".
'</fieldset></div>'."\n".
@@ -847,9 +902,10 @@ sub chooser {
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);
@@ -1092,6 +1148,10 @@ sub save_changes {
(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') &&
@@ -1104,7 +1164,7 @@ sub save_changes {
&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') &&
@@ -1124,7 +1184,7 @@ sub save_changes {
&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);
}
@@ -1214,7 +1274,7 @@ sub save_changes {
$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,
@@ -1239,7 +1299,7 @@ sub save_changes {
} else {
$external=$env{'form.externalsyllabus'};
$external =~ s/(`)//g;
- my $putres =
+ $putres =
&Apache::lonnet::put('environment',{externalsyllabus=>$external},
$cdom,$cnum);
if ($putres eq 'ok') {
@@ -1255,6 +1315,7 @@ sub save_changes {
&mt('An error occurred storing the external URL: [_1]',$putres).
'</div>';
}
+ $is_ext = $external;
}
} else {
$output = '<div class="LC_error">'.
@@ -1301,7 +1362,7 @@ sub save_changes {
} else {
$storehash{'externalsyllabus'} = '',
}
- my $putres =
+ $putres =
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
if ($putres eq 'ok') {
&Apache::lonnet::make_public_indefinitely($url);
@@ -1366,6 +1427,22 @@ sub save_changes {
$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);
}
@@ -1501,9 +1578,10 @@ sub home_http_host {
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;
}
@@ -1610,11 +1688,12 @@ sub editfile_button {
}
sub editbutton_js {
- my %lt = &Apache::lonlocal::texthash(
+ my %js_lt = &Apache::lonlocal::texthash(
min => 'Are you sure you want to delete the contents of the syllabus template?',
file => 'Are you sure you want to delete the uploaded syllabus file?',
noundo => 'This action cannot be reversed.'
);
+ &js_escape(\%js_lt);
return <<ENDJS;
<script type="text/javascript">
// <![CDATA[
@@ -1625,12 +1704,12 @@ sub editbutton_js {
if (document.getElementById('deleteuploaded_'+caller)) {
document.getElementById('deleteuploaded_'+caller).value=1;
if (caller == 'minimal') {
- if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
+ if (confirm("$js_lt{'min'}"+"\\n"+"$js_lt{'noundo'}")) {
document.syllabus.submit();
}
}
if (caller == 'file') {
- if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
+ if (confirm("$js_lt{'file'}"+"\\n"+"$js_lt{'noundo'}")) {
document.syllabus.submit();
}
}