--- loncom/interface/lonsyllabus.pm 2013/08/27 03:00:38 1.130 +++ loncom/interface/lonsyllabus.pm 2016/08/05 20:56:42 1.138.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.130 2013/08/27 03:00:38 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.138.2.1 2016/08/05 20:56:42 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') { @@ -97,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); @@ -109,6 +110,9 @@ sub handler { undef($external); } $item = $uploaded; + if ($item =~ /\.pdf$/i) { + $is_pdf = 1; + } } unless ($allowed && $forceedit) { my $file=&Apache::lonnet::filelocation("",$item); @@ -121,10 +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()); @@ -153,7 +168,8 @@ sub handler { &mt('Print the syllabus directly from your web browser'). '\end{document}'); } else { - $r->print(&Apache::lonwrapper::wrapper($item)); + $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'}, + undef,$is_pdf,&mt('Syllabus'))); } } return OK; @@ -166,7 +182,13 @@ 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; + if ($external =~ /\.pdf$/i) { + $is_pdf = 1; + } + $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'}, + $is_ext,$is_pdf,&mt('Syllabus'))); } return OK; } @@ -406,7 +428,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'; @@ -563,6 +585,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 @@ -691,6 +714,13 @@ 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; } my $start_page = &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args); @@ -1081,13 +1111,18 @@ 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); } 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'} = ''; @@ -1097,6 +1132,17 @@ sub save_changes { 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'} = ''; @@ -1152,10 +1198,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/\$//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 @@ -1250,34 +1294,16 @@ sub save_changes { ($url,$needlink) = &process_upload(\$output,$cnum,$cdom, \%allfiles,\%codebase); } else { - $output = '
'; + $output = '
'. &mt('No file uploaded'). '
'; } } 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 = < - -$title - - -

$title

-$initialtext - - -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); @@ -1366,19 +1392,48 @@ END 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 = < + +$title + + +

$title

+$initialtext + + +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; @@ -1389,26 +1444,26 @@ sub update_syllabus_env { 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'); } } @@ -1417,7 +1472,17 @@ sub update_syllabus_env { my $key = $item.'syllabus'; 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); @@ -1436,13 +1501,32 @@ 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 $protocol = $Apache::lonnet::protocol{$home}; $protocol = 'http' if ($protocol ne 'https'); - return $protocol.'://'.$home; + return $protocol.'://'.&Apache::lonnet::hostname($home); } return; } @@ -1549,11 +1633,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 < //