--- loncom/interface/lonsyllabus.pm 2013/05/19 15:48:51 1.128
+++ loncom/interface/lonsyllabus.pm 2023/09/27 14:52:26 1.154
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.128 2013/05/19 15:48:51 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.154 2023/09/27 14:52:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ use Apache::loncommon;
use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
use Apache::lonannounce;
use Apache::lonlocal;
use Apache::lonhtmlcommon;
@@ -53,7 +54,7 @@ sub handler {
# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['register','forceedit','todocs',
- 'folderpath','title']);
+ 'folderpath','title','only_body']);
# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {
@@ -73,12 +74,6 @@ sub handler {
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
my $crstype = &Apache::loncommon::course_type();
-# ------------------------------------------------------------ Print the screen
-
- if ($target eq 'tex') {
- $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
- }
-
# --------------------------------------------------------------- Force Student
my ($forceedit,$forcestudent);
if ($env{'form.forceedit'}) { $forceedit=1; }
@@ -103,8 +98,8 @@ sub handler {
my $uploaded=$courseenv{'uploadedsyllabus'};
my $minimal=$courseenv{'minimalsyllabus'};
- if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
- my $item;
+ if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
+ my ($item,$is_pdf);
if ($minimal =~/\w/) {
if ($external =~ m{\Q$minimal\E$}) {
undef($external);
@@ -115,29 +110,62 @@ 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) {
$r->print(&mt('Syllabus file unavailable'));
} elsif ($filetype eq 'tex') {
- my $result = &Apache::lontexconvert::converted(\$filecontents,
- $env{'form.texengine'});
- my %args;
- &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
- $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
- $result.
- &Apache::loncommon::end_page());
+ if ($target eq 'tex') {
+ $r->print($filecontents);
+ } else {
+ 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());
+ }
} else {
my %mystyle;
+ unless ($target eq 'tex') {
+ $target = 'web';
+ }
&Apache::structuretags::reset_problem_globals();
my $oldfile = $env{'request.filename'};
$env{'request.filename'} = $item;
- my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
+ my $oldinhibit;
+ if ($env{'form.only_body'}) {
+ $oldinhibit = $env{'form.inhibitmenu'};
+ $env{'form.inhibitmenu'} = 'yes';
+ }
+ my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
'',%mystyle);
+ if ($env{'form.only_body'}) {
+ if ($oldinhibit ne '') {
+ $env{'form.inhibitmenu'} = $oldinhibit;
+ } else {
+ delete($env{'form.inhibitmenu'});
+ }
+ }
&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();
$env{'request.filename'} = $oldfile;
@@ -145,17 +173,72 @@ sub handler {
$r->print($result);
}
} else {
- $r->print(&Apache::lonwrapper::wrapper($item));
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+ ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.
+ &mt('Unsupported file type.').' \strut \\\\ '.
+ &mt('Print the syllabus directly from your web browser').
+ '\end{document}');
+ } 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');
+ }
+ $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;
}
} elsif ($external=~/\w/) {
unless ($allowed && $forceedit) {
- $r->print(&Apache::lonwrapper::wrapper($external));
+ 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.' '.
+ ' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
+ '\end{document}');
+ } else {
+ my $is_ext = 1;
+ my ($is_pdf,$brcrum);
+ if ($external =~ /\.pdf$/i) {
+ $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');
+ }
+ $title = &HTML::Entities::encode($title,'\'"<>&');
+ $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;
}
}
+# ------------------------------------------------------------ Print the screen
+
+ if ($target eq 'tex') {
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ }
# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields
@@ -246,9 +329,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;
+ my $link = &Apache::lonnet::url_prefix($r,$cdom,$homeserver,'web').
+ $r->uri;
$r->print('<div class="LC_left_float">'
.'<span class="LC_help_open_topic LC_info">'
.'<span class="LC_info">'
@@ -257,7 +339,7 @@ sub handler {
.'</span>'
.'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\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 {
@@ -385,7 +467,7 @@ sub handler {
}
$rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
if ($crstype eq 'Community') {
- $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');
+ $rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
}
}
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
@@ -406,10 +488,6 @@ sub handler {
}
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- if ($allowed) {
- $r->print('<form method="post" action="">');
- }
-
my $url_include_handler = sub {
my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display) = @_;
my %data = %{$data_ref};
@@ -456,7 +534,7 @@ sub handler {
$target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash,
undef,\%displayfields,\%noshow);
if ($allowed) {
- $r->print('</form>'.
+ $r->print('</div></form>'.
&Apache::lonhtmlcommon::htmlareaselectactive());
}
} else {
@@ -546,6 +624,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
@@ -570,11 +649,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");
}
@@ -674,7 +758,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) {
@@ -686,6 +778,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');
@@ -694,6 +787,7 @@ sub get_breadcrumbs{
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
if (ref($brcrum) eq 'ARRAY') {
$args->{'bread_crumbs'} = $brcrum;
+ $args->{'bread_crumbs_nomenu'} = 1;
}
} else {
if ((&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus"))
@@ -710,7 +804,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',
@@ -755,6 +849,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".
@@ -767,14 +862,14 @@ 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".
'<div id="minimal" class="LC_left_float" style="display: '.$display{'minimal'}.'">'."\n".
'<fieldset><legend>'.$lt{'minimal'}.'</legend>';
if ($minimal) {
- my ($absurl,$filename,$depbutton) = &syllabus_file_info($minimal,$cnum,$cdom,$lonhost,'minimal');
+ my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$minimal,$cnum,$cdom,$lonhost,'minimal');
$output .= '<a href="javascript:extUrlPreview('."'currminimal'".');">'.$lt{'pr'}.'</a>'.
'<input type="hidden" name="minimalfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currminimal" />'.
$depbutton;
@@ -787,7 +882,7 @@ sub chooser {
'<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'">'."\n".
'<fieldset><legend>'.$lt{'file'}.'</legend>';
if ($uploaded) {
- my ($absurl,$filename,$depbutton) = &syllabus_file_info($uploaded,$cnum,$cdom,$lonhost,'file');
+ my ($absurl,$filename,$depbutton) = &syllabus_file_info($r,$uploaded,$cnum,$cdom,$lonhost,'file');
$output .= '<span class="LC_nobreak">'.$lt{'curr'}.' '.
'<input type="hidden" name="uploadedfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currfile" />'.
'<a href="javascript:extUrlPreview('."'currfile'".');">'.$filename.'</a></span>'.$depbutton.
@@ -822,10 +917,13 @@ sub chooser {
}
sub syllabus_file_info {
- my ($item,$cnum,$cdom,$lonhost,$context) = @_;
+ my ($r,$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 $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost);
+ $hostname = $alias if ($alias ne '');
+ my $absurl = $protocol.'://'.$hostname.$item;
my ($filename) = ($item =~ m{([^/]+)$});
my $file=&Apache::lonnet::filelocation("",$item);
my ($depbutton,$filetype,$editable);
@@ -1011,7 +1109,7 @@ sub get_personnel {
}
if ($allowed) {
my $item = '<span class="LC_nobreak"><label>'.
- '<input type="checkbox" name="hideuser" value="'.$element.'&'.$puname.':'.$pudom.'"'.$checked.' />'.
+ '<input type="checkbox" name="hideuser" value="'.$element.'&'.$puname.':'.$pudom.'"'.$checked.' />'.
&Apache::loncommon::aboutmewrapper($courseperson
,
$puname,$pudom).
@@ -1040,7 +1138,7 @@ sub get_personnel {
}
if ($target ne 'tex') {
if ($allowed) {
- $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print('</td>'.&Apache::loncommon::end_data_table_row());
} else {
my $lastclose=$element eq $lastpers?1:0;
$r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
@@ -1064,27 +1162,47 @@ sub get_personnel {
sub save_changes {
my ($cnum,$cdom,$uploaded,$external,$minimal,$syllabus,$syllabusfields,$courseenv) = @_;
my ($earlyout,$output);
- unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {
+ unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH') ||
+ (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') &&
($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {
+ if ($courseenv->{'uploadedsyllabus'} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+ my $filename = $1;
+ &update_access_permissions($cdom,$cnum,$filename);
+ }
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
&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') &&
($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {
+ my $minimalurl = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+ if ($courseenv->{'minimalsyllabus'} eq "$minimalurl") {
+ my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$minimalurl));
+ unless ($filecontents eq -1) {
+ $env{'form.output'} = $filecontents;
+ &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+ 'portfolio/syllabus/loncapa.html.bak');
+ $minimalurl = &default_minimal_syllabus($cnum,$cdom);
+ }
+ }
+ &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
&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);
}
@@ -1135,10 +1253,8 @@ sub save_changes {
foreach my $syl_field (keys(%{$syllabusfields})) {
my $field=$env{'form.'.$syl_field};
chomp($field);
- $field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\<br\s*\/*\>$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
+ my $gateway = Apache::lonhtmlgateway->new();
+ $field = $gateway->process_incoming_html($field,1);
#here it will be stored
$syllabus->{$syl_field}=$field;
if ($syl_field eq 'lll_includeurl') { # clean up included URLs
@@ -1176,7 +1292,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,
@@ -1201,7 +1317,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') {
@@ -1218,6 +1334,7 @@ sub save_changes {
'</div>';
}
}
+ $is_ext = $external;
} else {
$output = '<div class="LC_error">'.
&mt('External URL not saved -- invalid URL.').
@@ -1233,34 +1350,16 @@ sub save_changes {
($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
\%allfiles,\%codebase);
} else {
- $output = '<div class="LC_info">';
+ $output = '<div class="LC_info">'.
&mt('No file uploaded').
'</div>';
}
} elsif ($env{'form.choice'} eq 'minimal') {
- my $title = $env{'form.syllabustitle'};
- $title =~ s{`}{}g;
- $title=~s/^\s+//;
- $title=~s/\s+$//;
- if ($title eq '') {
- $title = &mt('Syllabus');
+ $url = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+ my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$url));
+ if ($filecontents eq -1) {
+ $url = &default_minimal_syllabus($cnum,$cdom);
}
- my $initialtext = &mt('Replace with your own content.');
- my $newhtml = <<END;
-<html>
-<head>
-<title>$title</title>
-</head>
-<body bgcolor="#ffffff">
-<h2>$title</h2>
-$initialtext
-</body>
-</html>
-END
- $env{'form.output'}=$newhtml;
- $url =
- &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
- 'portfolio/syllabus/loncapa.html');
}
if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
my $exturl = &home_http_host($cdom,$cnum);
@@ -1281,7 +1380,7 @@ END
} else {
$storehash{'externalsyllabus'} = '',
}
- my $putres =
+ $putres =
&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
if ($putres eq 'ok') {
&Apache::lonnet::make_public_indefinitely($url);
@@ -1346,62 +1445,116 @@ END
$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);
}
+sub default_minimal_syllabus {
+ my ($cnum,$cdom) = @_;
+ my $title;
+ if ($env{'form.syllabustitle'}) {
+ $title = $env{'form.syllabustitle'};
+ $title =~ s{`}{}g;
+ $title=~s/^\s+//;
+ $title=~s/\s+$//;
+ }
+ if ($title eq '') {
+ $title = &mt('Syllabus');
+ }
+ my $initialtext = &mt('Replace with your own content.');
+ my $newhtml = <<END;
+<html>
+<head>
+<title>$title</title>
+</head>
+<body bgcolor="#ffffff">
+<h2>$title</h2>
+$initialtext
+</body>
+</html>
+END
+ $env{'form.output'}=$newhtml;
+ return &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+ 'portfolio/syllabus/loncapa.html');
+}
+
sub update_syllabus_env {
my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_;
return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH');
my $now = time;
my (@envkeys,%storehash);
if ($saved eq 'template') {
- if ($uploaded) {
+ if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');
}
- if ($minimal) {
+ if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');
}
- if ($external) {
+ if ($external || $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) {
push(@envkeys,'external');
}
$storehash{'updatedsyllabus'} = $now;
&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now
});
-
} elsif ($saved eq 'url') {
my $prefix = &home_http_host($cdom,$cnum);
if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
my $file = $1;
if ($file eq 'loncapa.html') {
- if ($uploaded) {
+ if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');
}
- } elsif ($minimal) {
+ } elsif ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');
}
} else {
- if ($uploaded) {
+ if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');
}
- if ($minimal) {
+ if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');
}
}
} elsif ($saved eq 'file') {
- if ($minimal) {
+ if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');
}
} elsif ($saved eq 'minimal') {
- if ($uploaded) {
+ if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');
}
}
if (@envkeys > 0) {
foreach my $item (@envkeys) {
my $key = $item.'syllabus';
- if ($courseenv->{$key}) {
+ if ($courseenv->{$key} ne '') {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
+ if ($item eq 'minimal') {
+ &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
+ } elsif ($item eq 'uploaded') {
+ if ($courseenv->{$key} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+ my $filename = $1;
+ &update_access_permissions($cdom,$cnum,$filename);
+ }
+ }
$storehash{$key} = '';
+ } elsif ($env{'course.'.$env{'request.course.id'}.'.'.$key} ne '') {
+ &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
}
if ($item eq 'uploaded') {
undef($uploaded);
@@ -1420,13 +1573,33 @@ sub update_syllabus_env {
return ($uploaded,$minimal,$external);
}
+sub update_access_permissions {
+ my ($cdom,$cnum,$file_name) = @_;
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,'',$file_name);
+ if (keys(%access_controls) > 0) {
+ my %changes;
+ foreach my $key (keys(%{$access_controls{$file_name}})) {
+ $changes{'delete'}{$key} = 1;
+ }
+ if (keys(%changes) > 0) {
+ my ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($file_name,\%changes,
+ $cdom,$cnum);
+ }
+ }
+ return;
+}
+
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.'://'.$home;
+ return $protocol.'://'.$hostname;
}
return;
}
@@ -1533,11 +1706,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[
@@ -1548,12 +1722,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();
}
}
@@ -1565,5 +1739,17 @@ sub editbutton_js {
ENDJS
}
+sub redirect_to_http {
+ my ($r) = @_;
+ &Apache::loncommon::content_type($r,'text/html');
+ &Apache::loncommon::no_cache($r);
+ $r->send_http_header;
+ my $url = 'http://'.$r->hostname().$r->uri().'?usehttp=1';
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'redirect' => [0,$url],}).
+ &Apache::loncommon::end_page());
+ return;
+}
+
1;
__END__