version 1.250, 2003/05/02 19:57:01
|
version 1.256, 2003/05/22 20:19:18
|
Line 421 sub xmlparse {
|
Line 421 sub xmlparse {
|
} |
} |
} |
} |
} |
} |
|
#&printalltags(); |
#&printalltags(); |
|
my @pars = (); |
my @pars = (); |
my $pwd=$ENV{'request.filename'}; |
my $pwd=$ENV{'request.filename'}; |
$pwd =~ s:/[^/]*$::; |
$pwd =~ s:/[^/]*$::; |
Line 441 sub xmlparse {
|
Line 440 sub xmlparse {
|
|
|
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars, |
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars, |
$safeeval,\%style_for_target); |
$safeeval,\%style_for_target); |
|
|
if ($ENV{'request.uri'}) { |
if ($ENV{'request.uri'}) { |
&writeallows($ENV{'request.uri'}); |
&writeallows($ENV{'request.uri'}); |
} |
} |
Line 722 sub init_safespace {
|
Line 722 sub init_safespace {
|
$safeeval->permit("sort"); |
$safeeval->permit("sort"); |
$safeeval->deny(":base_io"); |
$safeeval->deny(":base_io"); |
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse'); |
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse'); |
|
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
|
|
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
Line 1128 sub inserteditinfo {
|
Line 1129 sub inserteditinfo {
|
&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', |
&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', |
undef,undef,600) |
undef,undef,600) |
.'</td></tr></table>'; |
.'</td></tr></table>'; |
|
my $titledisplay=&display_title(); |
my $buttons=(<<BUTTONS); |
my $buttons=(<<BUTTONS); |
<input type="submit" name="attemptclean" |
<input type="submit" name="attemptclean" |
value="Save and then attempt to clean HTML" /> |
value="Save and then attempt to clean HTML" /> |
Line 1145 $buttons<br />
|
Line 1147 $buttons<br />
|
<br />$buttons |
<br />$buttons |
<br /> |
<br /> |
</form> |
</form> |
|
$titledisplay |
ENDFOOTER |
ENDFOOTER |
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
Line 1179 sub get_target {
|
Line 1182 sub get_target {
|
} |
} |
|
|
sub handler { |
sub handler { |
my $request=shift; |
my $request=shift; |
|
|
my $target=&get_target(); |
my $target=&get_target(); |
|
|
$Apache::lonxml::debug=0; |
$Apache::lonxml::debug=0; |
|
|
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$request->content_type('text/xml'); |
$request->content_type('text/xml'); |
} else { |
} else { |
$request->content_type('text/html'); |
$request->content_type('text/html'); |
} |
} |
&Apache::loncommon::no_cache($request); |
&Apache::loncommon::no_cache($request); |
$request->send_http_header; |
$request->send_http_header; |
|
|
return OK if $request->header_only; |
return OK if $request->header_only; |
|
|
|
|
my $file=&Apache::lonnet::filelocation("",$request->uri); |
my $file=&Apache::lonnet::filelocation("",$request->uri); |
# |
# |
# Edit action? Save file. |
# Edit action? Save file. |
# |
# |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) { |
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) { |
&storefile($file,$ENV{'form.filecont'}); |
&storefile($file,$ENV{'form.filecont'}); |
} |
} |
} |
} |
my %mystyle; |
my %mystyle; |
my $result = ''; |
my $result = ''; |
my $filecontents=&Apache::lonnet::getfile($file); |
my $filecontents=&Apache::lonnet::getfile($file); |
if ($filecontents eq -1) { |
if ($filecontents eq -1) { |
$result=(<<ENDNOTFOUND); |
$result=(<<ENDNOTFOUND); |
<html> |
<html> |
<head> |
<head> |
<title>File not found</title> |
<title>File not found</title> |
Line 1220 sub handler {
|
Line 1223 sub handler {
|
</html> |
</html> |
ENDNOTFOUND |
ENDNOTFOUND |
$filecontents=''; |
$filecontents=''; |
if ($ENV{'request.state'} ne 'published') { |
if ($ENV{'request.state'} ne 'published') { |
$filecontents=&createnewhtml(); |
$filecontents=&createnewhtml(); |
$ENV{'form.editmode'}='Edit'; #force edit mode |
$ENV{'form.editmode'}='Edit'; #force edit mode |
} |
} |
} else { |
} else { |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if ($ENV{'form.attemptclean'}) { |
if ($ENV{'form.attemptclean'}) { |
$filecontents=&htmlclean($filecontents,1); |
$filecontents=&htmlclean($filecontents,1); |
} |
} |
} |
} |
if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) { |
if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) { |
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents, |
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents, |
'',%mystyle); |
'',%mystyle); |
|
} |
} |
} |
} |
|
|
|
# |
# |
# Edit action? Insert editing commands |
# Edit action? Insert editing commands |
# |
# |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
my $displayfile=$request->uri; |
my $displayfile=$request->uri; |
$displayfile=~s/^\/[^\/]*//; |
$displayfile=~s/^\/[^\/]*//; |
$result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile. |
$result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile. |
'</h3></body></html>'; |
'</h3></body></html>'; |
$result=&inserteditinfo($result,$filecontents); |
$result=&inserteditinfo($result,$filecontents); |
|
} |
} |
} |
} |
|
|
writeallows($request->uri); |
writeallows($request->uri); |
|
|
|
$request->print($result); |
$request->print($result); |
|
|
return OK; |
return OK; |
|
} |
|
|
|
sub display_title { |
|
my $result; |
|
if ($ENV{'request.state'} eq 'construct') { |
|
my $title=&Apache::lonnet::gettitle(); |
|
if (!defined($title) || $title eq '') { |
|
$title = $ENV{'request.filename'}; |
|
$title = substr($title, rindex($title, '/') + 1); |
|
} |
|
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>"; |
|
} |
|
return $result; |
} |
} |
|
|
sub debug { |
sub debug { |