--- loncom/xml/londefdef.pm 2003/02/18 22:19:30 1.117 +++ loncom/xml/londefdef.pm 2003/03/18 07:26:49 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.117 2003/02/18 22:19:30 www Exp $ +# $Id: londefdef.pm,v 1.121 2003/03/18 07:26:49 www Exp $ # # # Copyright Michigan State University Board of Trustees @@ -44,17 +44,17 @@ package Apache::londefdef; -use Apache::lonnet; +use Apache::lonnet(); use strict; -use Apache::lonxml; +use Apache::lonxml(); use Apache::File(); use Image::Magick; -use Apache::lonmenu; -#use Apache::lonmeta; +use Apache::lonmenu(); +use Apache::lonmeta(); BEGIN { - &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr')); + &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr')); } @@ -123,6 +123,7 @@ sub start_tthoption { &tth::tthoptions($inside); } } + return $result; } sub end_tthoption { @@ -324,7 +325,7 @@ sub start_html { } #-- tag sub start_meta { - my ($target,$token,$tagstack,$parstack,$parser) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; @@ -336,13 +337,16 @@ sub start_html { } } if ($target eq 'meta') { - unless ($token->[2]->{'http-equiv'}) { + unless (&Apache::lonxml::get_param + ('http-equiv',$parstack,$safeeval,undef,1)) { my $name=$token->[2]->{'name'}; $name=~tr/A-Z/a-z/; - $name=~s/\s/\_/g; + $name=~s/\s/\_/gs; + $name=~s/\W//gs; if ($name) { $currentstring='<'.$name.'>'. - $token->[2]->{'content'}. + &Apache::lonxml::get_param + ('content',$parstack,$safeeval,undef,1). ''; } } @@ -361,6 +365,46 @@ sub start_html { } return $currentstring; } +# accessrule + sub start_accessrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + my $eff=&Apache::lonxml::get_param + ('effect',$parstack,$safeeval,undef,1); + my $realm=&Apache::lonxml::get_param + ('realm',$parstack,$safeeval,undef,1); + my $cont=&Apache::lonxml::get_param + ('content',$parstack,$safeeval,undef,1); + $cont=~s/\s+//g; + $cont=~s/\W/\;/g; + if ($target eq 'web') { + my $args=''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + if ($args eq '') { + &Apache::lonxml::get_all_text("/accessrule",$parser); + } else { + $currentstring = $token->[4]; + } + } + if ($target eq 'meta') { + $currentstring=''. + $eff.':'.$realm.':'.$cont. + ''; + } + return $currentstring; + } + sub end_accessrule { + my ($target,$token,$tagstack,$parstack,$parser) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $args=''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + if ($args ne '') { + $currentstring = $token->[4]; + } + } + return $currentstring; + } #-- tag sub start_body { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; @@ -1673,7 +1717,13 @@ sub start_table { } } else { #original image file doesn't exist so check the alt attribute - my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); + my $alt = + &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); + unless ($alt) { + $alt=&Apache::lonmeta::alttag + ($Apache::lonxml::pwd[-1],$src); + } + if ($alt) { $currentstring .= ' '.$alt.' '; } else { @@ -1683,6 +1733,7 @@ sub start_table { } return $currentstring; } + sub end_img { my ($target,$token) = @_; my $currentstring = ''; @@ -1696,20 +1747,26 @@ sub start_table { #-- tag sub start_applet { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'code'}; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'archive'}; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + + my $code=&Apache::lonxml::get_param + ('code',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$code; + + my $archive=&Apache::lonxml::get_param + ('archive',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive; + my $currentstring = ''; if ($target eq 'web') { if ($ENV{'browser.appletsuppress'} ne 'on') { $currentstring = $token->[4]; } else { - my $alttag=$token->[2]->{'alt'}; + my $alttag= &Apache::lonxml::get_param + ('alt',$parstack,$safeeval,undef,1); unless ($alttag) { - $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'}, - $token->[2]->{'code'}); + $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], + $code); } $currentstring='[APPLET: '.$alttag.']'; } @@ -1718,6 +1775,7 @@ sub start_table { } return $currentstring; } + sub end_applet { my ($target,$token) = @_; my $currentstring = ''; @@ -1732,18 +1790,18 @@ sub end_applet { #-- tag sub start_embed { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; my $currentstring = ''; if ($target eq 'web') { if ($ENV{'browser.embedsuppress'} ne 'on') { $currentstring = $token->[4]; } else { - my $alttag=$token->[2]->{'alt'}; + my $alttag=&Apache::lonxml::get_param + ('alt',$parstack,$safeeval,undef,1); unless ($alttag) { - $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'}, - $token->[2]->{'src'}); + $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); } $currentstring='[EMBED: '.$alttag.']'; } @@ -1752,6 +1810,7 @@ sub start_embed { } return $currentstring; } + sub end_embed { my ($target,$token) = @_; my $currentstring = ''; @@ -1766,13 +1825,16 @@ sub start_embed { #-- tag sub start_param { - my ($target,$token) = @_; - if ($token->[2]->{'name'} eq 'cabbase') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + if (&Apache::lonxml::get_param + ('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'value'}; + &Apache::lonxml::get_param + ('value',$parstack,$safeeval,undef,1); } $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; + &Apache::lonxml::get_param + ('src',$parstack,$safeeval,undef,1); my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; @@ -1794,9 +1856,9 @@ sub start_embed { #-- tag sub start_allow { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; &image_replication($src); my $result; if ($target eq 'edit') { @@ -2612,15 +2674,17 @@ sub end_allow { sub image_replication { my $src = shift; - if (not -e '/home/httpd/html'.$src) { + if (not -e $src) { #replicates image itself - &Apache::lonnet::repcopy('/home/httpd/html'.$src); + &Apache::lonnet::repcopy($src); #replicates eps or ps my $newsrc = $src; - $newsrc =~ s/\.(gif|jpg|png)$/.eps/; - if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') { - $newsrc =~ s/\.eps$/\.ps/; - &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc); + $newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i; + if (not -e $newsrc) { + if (&Apache::lonnet::repcopy($newsrc) ne 'OK') { + $newsrc =~ s/\.eps$/\.ps/; + &Apache::lonnet::repcopy($newsrc); + } } } return '';