version 1.105, 2001/08/06 19:44:54
|
version 1.107, 2001/08/07 22:57:50
|
Line 13
|
Line 13
|
# 6/12,6/13 H. K. Ng |
# 6/12,6/13 H. K. Ng |
# 6/16 Gerd Kortemeyer |
# 6/16 Gerd Kortemeyer |
# 7/27 H. K. Ng |
# 7/27 H. K. Ng |
|
# 8/7 Gerd Kortemeyer |
|
|
package Apache::lonxml; |
package Apache::lonxml; |
use vars |
use vars |
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace); |
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace); |
use strict; |
use strict; |
use HTML::TokeParser; |
use HTML::TokeParser; |
|
use HTML::TreeBuilder; |
use Safe; |
use Safe; |
use Safe::Hole; |
use Safe::Hole; |
use Math::Cephes qw(:trigs :hypers :bessels erf erfc); |
use Math::Cephes qw(:trigs :hypers :bessels erf erfc); |
Line 281 sub xmlparse {
|
Line 283 sub xmlparse {
|
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
|
sub htmlclean { |
|
my ($raw,$full)=@_; |
|
|
|
my $tree = HTML::TreeBuilder->new; |
|
$tree->ignore_unknown(0); |
|
|
|
$tree->parse($raw); |
|
|
|
my $output= $tree->as_HTML(undef,' '); |
|
|
|
$output=~s/\<(br|hr|img)([^\>\/]*)\>/\<$1$2 \/\>/gis; |
|
$output=~s/\<\/(br|hr|img)\>//gis; |
|
unless ($full) { |
|
$output=~s/\<[\/]*(body|head|html)\>//gis; |
|
} |
|
|
|
$tree = $tree->delete; |
|
|
|
return $output; |
|
} |
|
|
sub inner_xmlparse { |
sub inner_xmlparse { |
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_; |
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_; |
&Apache::lonxml::debug('Reentrant parser starting, again?'); |
&Apache::lonxml::debug('Reentrant parser starting, again?'); |
Line 809 SIMPLECONTENT
|
Line 832 SIMPLECONTENT
|
<form method="post"> |
<form method="post"> |
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea> |
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea> |
<br /> |
<br /> |
<input type="submit" name="savethisfile" value="Save this file" /> |
<input type="submit" name="attemptclean" |
|
value="Save and then attempt to clean HTML" /> |
|
<input type="submit" name="savethisfile" value="Save this" /> |
</form> |
</form> |
ENDFOOTER |
ENDFOOTER |
$result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
$result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
Line 840 sub handler {
|
Line 865 sub handler {
|
# Edit action? Save file. |
# Edit action? Save file. |
# |
# |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if ($ENV{'form.savethisfile'}) { |
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) { |
&storefile($file,$ENV{'form.filecont'}); |
&storefile($file,$ENV{'form.filecont'}); |
} |
} |
} |
} |
Line 860 sub handler {
|
Line 885 sub handler {
|
ENDNOTFOUND |
ENDNOTFOUND |
$filecontents=''; |
$filecontents=''; |
} else { |
} else { |
|
unless ($ENV{'request.state'} eq 'published') { |
|
if ($ENV{'form.attemptclean'}) { |
|
$filecontents=&htmlclean($filecontents,1); |
|
} |
|
} |
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); |
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); |
} |
} |
|
|