--- loncom/xml/lonxml.pm 2005/01/30 12:56:45 1.354 +++ loncom/xml/lonxml.pm 2005/03/10 02:34:59 1.361 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.354 2005/01/30 12:56:45 www Exp $ +# $Id: lonxml.pm,v 1.361 2005/03/10 02:34:59 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -149,20 +149,25 @@ $Apache::lonxml::post_evaluate=1; $Apache::lonxml::warnings_error_header=''; sub xmlbegin { - my $output=''; - @htmlareafields=(); - if ($ENV{'browser.mathml'}) { - $output='' - .'' - .']>' + my ($style)=@_; + my $output=''; + @htmlareafields=(); + if ($ENV{'browser.mathml'}) { + $output='' + #.''."\n" +# .'] >' + .'' .''; - } else { - $output=' -'; - } - return $output; + .'xmlns="http://www.w3.org/1999/xhtml">'; + } else { + $output=''; + } + if ($style eq 'encode') { + $output=&HTML::Entities::encode($output,'<>&"'); + } + return $output; } sub xmlend { @@ -179,7 +184,7 @@ sub xmlend { &Apache::lonxml::newparser($parser,\$discussion,''); return ''; } else { - return $discussion.''; + return $discussion.&Apache::loncommon::endbodytag(); } } @@ -284,7 +289,7 @@ sub printtokenheader { } } -sub fontsettings() { +sub fontsettings { my $headerstring=''; if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { $headerstring.= @@ -353,8 +358,8 @@ sub xmlparse { my @stack = (); my @parstack = (); - &initdepth; - + &initdepth(); + &init_alarm(); my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars, $safeeval,\%style_for_target); @@ -363,6 +368,9 @@ sub xmlparse { } &do_registered_ssi(); if ($Apache::lonxml::counter_changed) { &store_counter() } + if ($ENV{'form.return_only_error_and_warning_counts'}) { + return "$errorcount:$warningcount"; + } return $finaloutput; } @@ -384,7 +392,8 @@ sub htmlclean { # Make standard tags lowercase foreach ('html','body','head','meta','h1','h2','h3','h4','b','i','m', 'table','tr','td','th','p','br','hr','img','embed','font', - 'a','strong','center','title','basefont') { + 'a','strong','center','title','basefont','li','ol','ul', + 'input','select','form','option','script','pre') { $raw=~s/\<$_\s*\>/\<$_\>/gis; $raw=~s/\<\/$_\s*\>/<\/$_\>/gis; $raw=~s/\<$_\s([^\>]*)\>/<$_ $1\>/gis; @@ -786,6 +795,28 @@ sub default_homework_load { } } +{ + my $alarm_depth; + sub init_alarm { + alarm(0); + $alarm_depth=0; + } + + sub start_alarm { + if ($alarm_depth<1) { + my $old=alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); + if ($old) { + &Apache::lonxml::error("Cancelled an alarm of $old, this shouldn't occur."); + } + } + $alarm_depth++; + } + + sub end_alarm { + $alarm_depth--; + if ($alarm_depth<1) { alarm(0); } + } +} my $metamode_was; sub startredirection { if (!$Apache::lonxml::redirection) {