--- loncom/publisher/loncleanup.pm 2005/05/29 01:46:16 1.4 +++ loncom/publisher/loncleanup.pm 2005/07/13 21:43:02 1.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to cleanup XML files # -# $Id: loncleanup.pm,v 1.4 2005/05/29 01:46:16 www Exp $ +# $Id: loncleanup.pm,v 1.6 2005/07/13 21:43:02 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -218,8 +218,9 @@ sub htmlclean { } # Generate empty tags, remove wrong end tags unless ($blockemptytags) { - $raw=~s/\<(br|hr|img|meta|allow|basefont)([^\>\/]*?)\>/\<$1$2 \/\>/gis; - $raw=~s/\<\/(br|hr|img|meta|allow|basefont)\>//gis; + $raw=~s/\<(br|hr|img|meta|embed|allow|basefont)([^\>]*?)\>/\<$1$2 \/\>/gis; + $raw=~s/\<\/(br|hr|img|meta|embed|allow|basefont)\>//gis; + $raw=~s/\/ \/\>/\/\>/gs; unless ($full) { $raw=~s/\<[\/]*(body|head|html)\>//gis; } @@ -363,7 +364,8 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('LON-CAPA Construction Space'); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'LON-CAPA Construction Space'); $r->print(&Apache::loncommon::bodytag('Cleanup XML Document')); $r->print('

'.$fn.'

'.