--- loncom/publisher/loncleanup.pm 2005/05/31 17:41:38 1.5
+++ loncom/publisher/loncleanup.pm 2006/04/06 22:15:18 1.7
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to cleanup XML files
#
-# $Id: loncleanup.pm,v 1.5 2005/05/31 17:41:38 albertel Exp $
+# $Id: loncleanup.pm,v 1.7 2006/04/06 22:15:18 albertel 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,10 +364,7 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');
-
- $r->print(&Apache::loncommon::bodytag('Cleanup XML Document'));
+ $r->print(&Apache::loncommon::start_page('Cleanup XML Document'));
$r->print('<h2>'.$fn.'</h2>'.
'<form action="/adm/cleanup" method="post">'.
'<input type="hidden" name="filename" value="'.$env{'form.filename'}.'" />');
@@ -386,7 +384,7 @@ sub handler {
$r->print('</form>'.
'<br /><a href="/priv/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>'.
'<br /><a href="/priv/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>'.
- '</body></html>');
+ &Apache::loncommon::end_page());
return OK;
}