--- loncom/xml/scripttag.pm 2011/12/19 18:18:32 1.162 +++ loncom/xml/scripttag.pm 2024/02/28 15:52:39 1.172.2.2.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; + } + } elsif ($target eq 'meta') { my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); } @@ -126,6 +164,114 @@ sub start_script { if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { $result = $token->[4]; $result.=$bodytext; + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + if ($src ne '') { + if ($src !~ m{^(/|https?://)}) { + my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } + } elsif (($type eq 'text/javascript') && ($bodytext ne '')) { + if ($url =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) { + if ($bodytext =~ m{\.addMediaSrc\((["'])((?!\1).)+\1\);}) { + my $quote = $1; + if ($bodytext =~ m{\Q.addMediaSrc($quote\E([^$quote]+)\Q$quote)\E}) { + my $fname = $1; + my $cleanhref = + &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } + } + if ($bodytext =~ m{\.set\w+(Src|Swf)\(["']}i) { + my @srcs = split(/\.set/,$bodytext); + if (scalar(@srcs) > 1) { + foreach my $item (@srcs) { + if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) { + my $srctype = $1; + my $quote = $2; + my ($fname) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); + my $cleanhref = + &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + if ($srctype eq 'ConfigurationSrc') { + if ($cleanhref =~ m{^(.+/)configuration_express\.xml$}) { +# +# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive. +# Not referenced directly in
.html or
_player.html files, +# so call lonxml::extlink() here to include httpref for the uploaded file. +# (where
is name user gave to file/archive). +# + + my $spritesheet = $1.'express_show/spritesheet.png'; + if (&Apache::lonnet::repcopy_userfile($spritesheet) eq 'ok') { + &Apache::lonxml::extlink($spritesheet); + } + } +# +# Camtasia 8.4: express_show/spritesheet.min.css needed, and included in zip archive. +# Not referenced directly in
.html or
_player.html files, +# so call lonxml::extlink() here to include httpref for the uploaded file. +# (where
is name user gave to file/archive). +# + my $spritesheet_css = $1.'express_show/spritesheet.min.css'; + if (&Apache::lonnet::repcopy_userfile($spritesheet_css) eq 'ok') { + &Apache::lonxml::extlink($spritesheet_css); + } + } elsif ($srctype eq 'PosterImageSrc') { + if ($fname =~ m{^(.+)_First_Frame\.png$}) { + my $prefix = $1; + my ($path) = ($cleanhref =~ m{^(.+/)\Q$fname\E}); +# +# Camtasia 8.1:
_Thumbnails.png needed, and included in zip archive. +# Not referenced directly in
.html or
_player.html files, +# so call lonxml::extlink() here to include httpref for the uploaded file +# (where
is name user gave to file/archive). +# + my $thumbnail = $path.$prefix.'_Thumbnails.png'; + if (&Apache::lonnet::repcopy_userfile($thumbnail) eq 'ok') { + &Apache::lonxml::extlink($thumbnail); + } + } + } + } + } + } + } + } + if ($bodytext =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) { + my $scriptslist = $2; + my @srcs = split(/\s*,\s*/,$scriptslist); + foreach my $src (@srcs) { + if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) { + my $quote = $1; + my ($fname) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/); + my $cleanhref = + &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } + } + } + if ($bodytext =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) { + my $fname = $2; + if ($fname) { + my $cleanhref = + &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } + } + } + } } } return $result; @@ -287,12 +433,19 @@ sub start_window { if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection; } elsif ($target eq 'tex') { - $result = '\unskip\footnote{'; + my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval); + if ($printtext=~/\w/) { +# If printtext is given, do not output any intervening information + &Apache::lonxml::startredirection; + } else { + $result = '\unskip\footnote{'; + } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); $result.=&Apache::edit::text_arg('Height:','height',$token,5); $result.=&Apache::edit::text_arg('Width:','width',$token,5); + $result.=&Apache::edit::text_arg('Printed text (optional):','printtext',$token,20); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, @@ -314,12 +467,18 @@ sub end_window { if (!$width) { $width='500'; } my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); if (!$height) { $height='200'; } - - my ($start_page,$end_page); $result=&Apache::loncommon::modal_adhoc_window ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext); } elsif ($target eq 'tex') { - $result = '}'; + my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval); + if ($printtext=~/\w/) { +# If a "printtext" is given, proceed to retrieve all intervening information and trash it + my $output=&Apache::lonxml::endredirection; +# Use printtext instead + $result=$printtext; + } else { + $result='}'; + } } else { $result = ''; } @@ -327,6 +486,45 @@ sub end_window { } +sub start_windowlink { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result = ''; + if ($target eq 'web' || $target eq 'webgrade') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Link:','href',$token,70); + $result.=&Apache::edit::text_arg('Height:','height',$token,5); + $result.=&Apache::edit::text_arg('Width:','width',$token,5); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'href', + 'width','height'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_windowlink { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'web' || $target eq 'webgrade') { + my $output=&Apache::lonxml::endredirection; + my $href= &Apache::lonxml::get_param('href',$parstack,$safeeval); + if (!$href) { $href='/adm/rat/empty.html'; } + my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); + if (!$width) { $width='500'; } + my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); + if (!$height) { $height='200'; } + $result=&Apache::loncommon::modal_link($href,$output,$width,$height); + } else { + $result = ''; + } + return $result; +} + + sub start_togglebox { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; @@ -482,12 +680,14 @@ sub end_storetc { sub start_physnet { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $bodytext = '/adm/includes/physnet.sty'; + my $bodytext = '/res/adm/includes/physnet.sty'; my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); my $cbistyletext=&Apache::lonnet::getfile($location); %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext)); - $$parser['-1']->unget_token($token); + if (keys(%$style) && (($target eq 'web') || ($target eq 'tex'))) { + $$parser['-1']->unget_token($token); + } # if ( defined($$style{'physnet'}) ) { # &Apache::lonxml::newparser($parser,\$$style{'physnet'}); # }