--- loncom/interface/lonsyllabus.pm 2016/01/26 14:30:25 1.139
+++ loncom/interface/lonsyllabus.pm 2017/02/18 23:39:16 1.142
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.139 2016/01/26 14:30:25 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.142 2017/02/18 23:39:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -116,7 +116,7 @@ sub handler {
}
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) {
@@ -125,8 +125,13 @@ 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'}) {
@@ -163,7 +168,16 @@ sub handler {
&mt('Print the syllabus directly from your web browser').
'\end{document}');
} else {
- $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'},
+ 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($item,$brcrum,$env{'request.use_absolute'},
undef,$is_pdf,undef,&mt('Syllabus')));
}
}
@@ -178,11 +192,19 @@ sub handler {
'\end{document}');
} else {
my $is_ext = 1;
- my $is_pdf;
+ my ($is_pdf,$brcrum);
if ($external =~ /\.pdf$/i) {
$is_pdf = 1;
}
- $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'},
+ 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($external,$brcrum,$env{'request.use_absolute'},
$is_ext,$is_pdf,undef,&mt('Syllabus')));
}
return OK;
@@ -287,6 +309,9 @@ sub handler {
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';
+ }
$r->print('<div class="LC_left_float">'
.'<span class="LC_help_open_topic LC_info">'
.'<span class="LC_info">'
@@ -605,11 +630,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");
}
@@ -797,6 +827,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".
@@ -809,7 +840,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".
@@ -1110,6 +1141,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') &&
@@ -1122,7 +1157,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') &&
@@ -1142,7 +1177,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);
}
@@ -1232,7 +1267,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,
@@ -1257,7 +1292,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') {
@@ -1274,6 +1309,7 @@ sub save_changes {
'</div>';
}
}
+ $is_ext = $external;
} else {
$output = '<div class="LC_error">'.
&mt('External URL not saved -- invalid URL.').
@@ -1319,7 +1355,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);
@@ -1384,6 +1420,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);
}