--- loncom/interface/lonsyllabus.pm 2013/09/17 15:04:30 1.133 +++ loncom/interface/lonsyllabus.pm 2025/03/16 21:04:09 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.133 2013/09/17 15:04:30 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.157 2025/03/16 21:04:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,7 @@ use Apache::lonannounce; use Apache::lonlocal; use Apache::lonhtmlcommon; use Apache::lonspeller(); +use Apache::lonwrapper(); use HTML::Entities(); sub handler { @@ -99,7 +100,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 +111,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 +126,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()); @@ -141,8 +153,20 @@ sub handler { &Apache::structuretags::reset_problem_globals(); my $oldfile = $env{'request.filename'}; $env{'request.filename'} = $item; + 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; @@ -157,20 +181,55 @@ 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/) { + &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) { + 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 { - $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/) { + &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; } @@ -271,9 +330,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('
' .'' .'' @@ -282,7 +340,7 @@ sub handler { .'' .'
'."\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 { @@ -390,7 +448,7 @@ sub handler { 'box_111_showrssfeeds',$display); my ($numfeeds,$hiddenfeeds,$rsslinktext); my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds, - \$hiddenfeeds); + \$hiddenfeeds,1); if ($numfeeds) { $r->print($feeds); $rsslinktext = &mt('New RSS Feed or Blog'); @@ -410,7 +468,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'; @@ -418,7 +476,7 @@ sub handler { &Apache::lontemplate::print_end_template($r); } else { unless ($hidefeeds) { - my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit); + my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,'','',1); if ($feeds ne '') { &Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box'); $r->print($feeds); @@ -463,7 +521,7 @@ sub handler { $r->print($urls); $r->print("
"); &Apache::lontemplate::print_textarea_template($r, $data{$field}, - $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); + $field, $fields{$field}, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF); &Apache::lontemplate::print_saveall_template($r); $r->print("
"); &Apache::lontemplate::print_end_template($r); @@ -567,6 +625,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 +650,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 +759,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) { @@ -710,6 +779,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'); @@ -718,6 +788,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")) @@ -734,7 +805,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', @@ -779,6 +850,7 @@ sub chooser { $checked{'templatebox'} = $check; $display{'templatebox'} = 'block'; } + my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http'); my $output = '
'."\n". @@ -788,30 +860,31 @@ sub chooser { $output .= '
'; } + my $urllabeltext = &HTML::Entities::encode(&mt('Enter URL'),'"&<>'); $output .= ''."\n". '
'."\n". '
'.$lt{'chourl'}.''."\n". - ''.$lt{'pr'}.' '."\n". - ''."\n". + ''.$lt{'pr'}.' '."\n". + ''."\n". ' '."\n". '
'."\n". '
'."\n". '
'.$lt{'minimal'}.''; 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 .= ''.$lt{'pr'}.''. ''. $depbutton; } else { - $output .= &mt('Title of Syllabus Page:').' '. - ''."\n". + $output .= ''."\n". ' '."\n"; } $output .= '
'."\n". '
'."\n". '
'.$lt{'file'}.''; 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 .= ''.$lt{'curr'}.' '. ''. ''.$filename.''.$depbutton. @@ -819,9 +892,10 @@ sub chooser { } else { $output .= $lt{'upl'}; } + my $labeltext = &HTML::Entities::encode(&mt('Choose syllabus file'),'"&<>'); $output .= '
'."\n". ''. - ''."\n". + ''."\n". ' '. '
'. '
'; } } + $is_ext = $external; } else { $output = '
'. &mt('External URL not saved -- invalid URL.'). @@ -1271,7 +1352,7 @@ sub save_changes { ($url,$needlink) = &process_upload(\$output,$cnum,$cdom, \%allfiles,\%codebase); } else { - $output = '
'; + $output = '
'. &mt('No file uploaded'). '
'; } @@ -1301,7 +1382,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 +1447,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 +1598,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.'://'.$home; + return $protocol.'://'.$hostname; } return; } @@ -1610,11 +1708,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 < // 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__