--- loncom/xml/lonxml.pm 2005/03/31 15:55:47 1.368
+++ loncom/xml/lonxml.pm 2005/06/15 13:06:41 1.376
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.368 2005/03/31 15:55:47 albertel Exp $
+# $Id: lonxml.pm,v 1.376 2005/06/15 13:06:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -81,7 +81,7 @@ use Apache::languagetags();
use Apache::edit();
use Apache::inputtags();
use Apache::outputtags();
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::File();
use Apache::loncommon();
use Apache::lonfeedback();
@@ -152,7 +152,7 @@ sub xmlbegin {
my ($style)=@_;
my $output='';
@htmlareafields=();
- if ($ENV{'browser.mathml'}) {
+ if ($env{'browser.mathml'}) {
$output='<?xml version="1.0"?>'
#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
# .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
@@ -181,9 +181,9 @@ sub xmlend {
}
my $discussion;
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'query_string'},['LONCAPA_INTERNAL_no_discussion']);
- if (! exists($ENV{'form.LONCAPA_INTERNAL_no_discussion'}) ||
- $ENV{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
+ ($env{'query_string'},['LONCAPA_INTERNAL_no_discussion']);
+ if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) ||
+ $env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
$discussion=&Apache::lonfeedback::list_discussion($mode,$status);
}
if ($target eq 'tex') {
@@ -250,9 +250,9 @@ sub maketoken {
$symb=&Apache::lonnet::symbread();
}
unless ($tuname) {
- $tuname=$ENV{'user.name'};
- $tudom=$ENV{'user.domain'};
- $tcrsid=$ENV{'request.course.id'};
+ $tuname=$env{'user.name'};
+ $tudom=$env{'user.domain'};
+ $tcrsid=$env{'request.course.id'};
}
return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
@@ -288,7 +288,7 @@ sub printtokenheader {
'<br />'.&mt('User').': '.$tuname.' at '.$tudom.
'<br />'.&mt('ID').': '.$idhash{$tuname}.
'<br />'.&mt('CourseID').': '.$tcrsid.
- '<br />'.&mt('Course').': '.$ENV{'course.'.$tcrsid.'.description'}.
+ '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
'<br />'.&mt('DocID').': '.$token.
'<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
} else {
@@ -298,10 +298,10 @@ sub printtokenheader {
sub fontsettings {
my $headerstring='';
- if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {
+ if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
$headerstring.=
'<meta Content-Type="text/html; charset=x-mac-roman" />';
- } elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) {
+ } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
$headerstring.=
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
}
@@ -321,6 +321,7 @@ sub xmlparse {
&setup_globals($request,$target);
&Apache::inputtags::initialize_inputtags();
+ &Apache::bridgetask::initialize_bridgetask();
&Apache::outputtags::initialize_outputtags();
&Apache::edit::initialize_edit();
&Apache::londefdef::initialize_londefdef();
@@ -329,9 +330,9 @@ sub xmlparse {
# do we have a course style file?
#
- if ($ENV{'request.course.id'} && $ENV{'request.state'} ne 'construct') {
+ if ($env{'request.course.id'} && $env{'request.state'} ne 'construct') {
my $bodytext=
- $ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};
+ $env{'course.'.$env{'request.course.id'}.'.default_xml_style'};
if ($bodytext) {
foreach my $file (split(',',$bodytext)) {
my $location=&Apache::lonnet::filelocation('',$file);
@@ -342,8 +343,8 @@ sub xmlparse {
}
}
}
- } elsif ($ENV{'construct.style'} && ($ENV{'request.state'} eq 'construct')) {
- my $location=&Apache::lonnet::filelocation('',$ENV{'construct.style'});
+ } elsif ($env{'construct.style'} && ($env{'request.state'} eq 'construct')) {
+ my $location=&Apache::lonnet::filelocation('',$env{'construct.style'});
my $styletext=&Apache::lonnet::getfile($location);
if ($styletext ne '-1') {
%style_for_target = (%style_for_target,
@@ -352,7 +353,7 @@ sub xmlparse {
}
#&printalltags();
my @pars = ();
- my $pwd=$ENV{'request.filename'};
+ my $pwd=$env{'request.filename'};
$pwd =~ s:/[^/]*$::;
&newparser(\@pars,\$content_file_string,$pwd);
@@ -370,44 +371,17 @@ sub xmlparse {
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
$safeeval,\%style_for_target);
- if ($ENV{'request.uri'}) {
- &writeallows($ENV{'request.uri'});
+ if ($env{'request.uri'}) {
+ &writeallows($env{'request.uri'});
}
&do_registered_ssi();
if ($Apache::lonxml::counter_changed) { &store_counter() }
- if ($ENV{'form.return_only_error_and_warning_counts'}) {
+ if ($env{'form.return_only_error_and_warning_counts'}) {
return "$errorcount:$warningcount";
}
return $finaloutput;
}
-sub htmlclean {
- my ($raw,$full)=@_;
-# Take care of CRLF etc
-
- $raw=~s/\r\f/\n/gs; $raw=~s/\f\r/\n/gs;
- $raw=~s/\r\n/\n/gs; $raw=~s/\n\r/\n/gs;
- $raw=~s/\f/\n/gs; $raw=~s/\r/\n/gs;
- $raw=~s/\&\#10\;/\n/gs; $raw=~s/\&\#13\;/\n/gs;
-
-# Generate empty tags, remove wrong end tags
- $raw=~s/\<(br|hr|img|meta|allow|basefont)([^\>\/]*?)\>/\<$1$2 \/\>/gis;
- $raw=~s/\<\/(br|hr|img|meta|allow|basefont)\>//gis;
- unless ($full) {
- $raw=~s/\<[\/]*(body|head|html)\>//gis;
- }
-# 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','li','ol','ul',
- 'input','select','form','option','script','pre') {
- $raw=~s/\<$_\s*\>/\<$_\>/gis;
- $raw=~s/\<\/$_\s*\>/<\/$_\>/gis;
- $raw=~s/\<$_\s([^\>]*)\>/<$_ $1\>/gis;
- }
- return $raw;
-}
-
sub latex_special_symbols {
my ($string,$where)=@_;
if ($where eq 'header') {
@@ -694,12 +668,15 @@ sub init_safespace {
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->permit("time");
+ $safeeval->deny("rand");
+ $safeeval->deny("srand");
$safeeval->deny(":base_io");
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart');
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
'&chem_standard_order');
+ $safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status');
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
@@ -780,13 +757,18 @@ sub init_safespace {
# $safeeval->deny(":base_orig");
$safeeval->permit("require");
$safeinit .= ';$external::target="'.$target.'";';
- my $rndseed;
- my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
- $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
- $safeinit .= ';$external::randomseed="'.$rndseed.'";';
- &Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run($safeinit,$safeeval);
+ &initialize_rndseed($safeeval);
+}
+sub initialize_rndseed {
+ my ($safeeval)=@_;
+ my $rndseed;
+ my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+ my $safeinit = '$external::randomseed="'.$rndseed.'";';
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
+ &Apache::run::run($safeinit,$safeeval);
}
sub default_homework_load {
@@ -941,8 +923,8 @@ sub increment_counter {
}
sub init_counter {
- if (defined($ENV{'form.counter'})) {
- $Apache::lonxml::counter=$ENV{'form.counter'};
+ if (defined($env{'form.counter'})) {
+ $Apache::lonxml::counter=$env{'form.counter'};
$Apache::lonxml::counter_changed=0;
} else {
$Apache::lonxml::counter=1;
@@ -1083,9 +1065,14 @@ sub parstring {
sub writeallows {
unless ($#extlinks>=0) { return; }
- my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
- if ($ENV{'httpref.'.$thisurl}) {
- $thisurl=$ENV{'httpref.'.$thisurl};
+ my $thisurl = &Apache::lonnet::declutter(shift);
+ if ($thisurl =~ /^uploaded/) {
+ $thisurl = '/'.$thisurl;
+ } else {
+ $thisurl='/res/'.$thisurl;
+ }
+ if ($env{'httpref.'.$thisurl}) {
+ $thisurl=$env{'httpref.'.$thisurl};
}
my $thisdir=$thisurl;
$thisdir=~s/\/[^\/]+$//;
@@ -1118,24 +1105,24 @@ sub afterburn {
my $result=shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['highlight','anchor','link']);
- if ($ENV{'form.highlight'}) {
- foreach (split(/\,/,$ENV{'form.highlight'})) {
+ if ($env{'form.highlight'}) {
+ foreach (split(/\,/,$env{'form.highlight'})) {
my $anchorname=$_;
my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs;
}
}
- if ($ENV{'form.link'}) {
- foreach (split(/\,/,$ENV{'form.link'})) {
+ if ($env{'form.link'}) {
+ foreach (split(/\,/,$env{'form.link'})) {
my ($anchorname,$linkurl)=split(/\>/,$_);
my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
}
}
- if ($ENV{'form.anchor'}) {
- my $anchorname=$ENV{'form.anchor'};
+ if ($env{'form.anchor'}) {
+ my $anchorname=$env{'form.anchor'};
my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
@@ -1229,10 +1216,7 @@ FULLPAGE
$xml_help=&Apache::loncommon::helpLatexCheatsheet();
}
my $cleanbut = '';
- if ($filetype eq 'html') {
- $cleanbut='<input type="submit" name="attemptclean" value="'.
- &mt('Save and then attempt to clean HTML').'" />';
- }
+
my $titledisplay=&display_title();
my %lt=&Apache::lonlocal::texthash('st' => 'Save this',
'vi' => 'View',
@@ -1265,24 +1249,24 @@ ENDFOOTER
}
sub get_target {
- my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
- if ( $ENV{'request.state'} eq 'published') {
- if ( defined($ENV{'form.grade_target'})
+ my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+ if ( $env{'request.state'} eq 'published') {
+ if ( defined($env{'form.grade_target'})
&& ($viewgrades == 'F' )) {
- return ($ENV{'form.grade_target'});
- } elsif (defined($ENV{'form.grade_target'})) {
- if (($ENV{'form.grade_target'} eq 'web') ||
- ($ENV{'form.grade_target'} eq 'tex') ) {
- return $ENV{'form.grade_target'}
+ return ($env{'form.grade_target'});
+ } elsif (defined($env{'form.grade_target'})) {
+ if (($env{'form.grade_target'} eq 'web') ||
+ ($env{'form.grade_target'} eq 'tex') ) {
+ return $env{'form.grade_target'}
} else {
return 'web';
}
} else {
return 'web';
}
- } elsif ($ENV{'request.state'} eq 'construct') {
- if ( defined($ENV{'form.grade_target'})) {
- return ($ENV{'form.grade_target'});
+ } elsif ($env{'request.state'} eq 'construct') {
+ if ( defined($env{'form.grade_target'})) {
+ return ($env{'form.grade_target'});
} else {
return 'web';
}
@@ -1296,11 +1280,11 @@ sub handler {
my $target=&get_target();
- $Apache::lonxml::debug=$ENV{'user.debug'};
+ $Apache::lonxml::debug=$env{'user.debug'};
&Apache::loncommon::content_type($request,'text/html');
&Apache::loncommon::no_cache($request);
- if ($ENV{'request.state'} eq 'published') {
+ if ($env{'request.state'} eq 'published') {
$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
'lastrevisiondate'));
}
@@ -1319,9 +1303,9 @@ sub handler {
#
# Edit action? Save file.
#
- unless ($ENV{'request.state'} eq 'published') {
- if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
- if (&storefile($file,$ENV{'form.filecont'})) {
+ unless ($env{'request.state'} eq 'published') {
+ if ($env{'form.savethisfile'}) {
+ if (&storefile($file,$env{'form.filecont'})) {
&Apache::lonxml::info("<font COLOR=\"#0000FF\">".
&mt('Updated').": ".
&Apache::lonlocal::locallocaltime(time).
@@ -1346,29 +1330,25 @@ $bodytag
</html>
ENDNOTFOUND
$filecontents='';
- if ($ENV{'request.state'} ne 'published') {
+ if ($env{'request.state'} ne 'published') {
if ($filetype eq 'sty') {
$filecontents=&createnewsty();
} else {
$filecontents=&createnewhtml();
}
- $ENV{'form.editmode'}='Edit'; #force edit mode
+ $env{'form.editmode'}='Edit'; #force edit mode
}
} else {
- unless ($ENV{'request.state'} eq 'published') {
+ unless ($env{'request.state'} eq 'published') {
if ($filecontents=~/BEGIN LON-CAPA Internal/) {
&Apache::lonxml::error(&mt('This file appears to be a rendering of a Lon-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));
}
-
- if ($ENV{'form.attemptclean'}) {
- $filecontents=&htmlclean($filecontents,1);
- }
#
# we are in construction space, see if edit mode forced
&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['editmode']);
}
- if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
+ if (!$env{'form.editmode'} || $env{'form.viewmode'}) {
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
'',%mystyle);
undef($Apache::lonhomework::parsing_a_task);
@@ -1378,12 +1358,12 @@ ENDNOTFOUND
#
# Edit action? Insert editing commands
#
- unless ($ENV{'request.state'} eq 'published') {
- if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
+ unless ($env{'request.state'} eq 'published') {
+ if ($env{'form.editmode'} && (!($env{'form.viewmode'}))) {
my $displayfile=$request->uri;
$displayfile=~s/^\/[^\/]*//;
my $bodytag='<body bgcolor="#FFFFFF">';
- if ($ENV{'environment.remote'} eq 'off') {
+ if ($env{'environment.remote'} eq 'off') {
$bodytag=&Apache::loncommon::bodytag();
}
$result='<html>'.$bodytag.
@@ -1404,10 +1384,10 @@ ENDNOTFOUND
sub display_title {
my $result;
- if ($ENV{'request.state'} eq 'construct') {
+ if ($env{'request.state'} eq 'construct') {
my $title=&Apache::lonnet::gettitle();
if (!defined($title) || $title eq '') {
- $title = $ENV{'request.filename'};
+ $title = $env{'request.filename'};
$title = substr($title, rindex($title, '/') + 1);
}
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";
@@ -1426,15 +1406,15 @@ sub debug {
}
sub show_error_warn_msg {
- if ($ENV{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&
- &Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) {
+ if ($env{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&
+ &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
return 1;
}
return (($Apache::lonxml::debug eq 1) ||
- ($ENV{'request.state'} eq 'construct') ||
+ ($env{'request.state'} eq 'construct') ||
($Apache::lonhomework::browse eq 'F'
&&
- $ENV{'form.show_errors'} eq 'on'));
+ $env{'form.show_errors'} eq 'on'));
}
sub error {
@@ -1453,11 +1433,11 @@ sub error {
$errormsg=&mt("An error occured while processing this resource. The author has been notified.");
}
#notify author
- &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
+ &Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_));
#notify course
- if ( $symb && $ENV{'request.course.id'} ) {
+ if ( $symb && $env{'request.course.id'} ) {
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
- my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});
+ my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
my @userlist;
foreach (keys %users) {
my ($user,$domain) = split(/:/, $_);
@@ -1465,7 +1445,7 @@ sub error {
&Apache::lonmsg::user_normal_msg($user,$domain,
"Error [$declutter]",join('<br />',@_));
}
- if ($ENV{'request.role.adv'}) {
+ if ($env{'request.role.adv'}) {
$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
} else {
$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");
@@ -1478,10 +1458,8 @@ sub error {
sub warning {
$warningcount++;
- if ($ENV{'form.grade_target'} ne 'tex') {
+ if ($env{'form.grade_target'} ne 'tex') {
if ( &show_error_warn_msg() ) {
- my $request=$Apache::lonxml::request;
- if (!$request) { $request=Apache->request; }
push(@Apache::lonxml::warning_messages,
$Apache::lonxml::warnings_error_header.
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
@@ -1491,8 +1469,8 @@ sub warning {
}
sub info {
- if ($ENV{'form.grade_target'} ne 'tex'
- && $ENV{'request.state'} eq 'construct') {
+ if ($env{'form.grade_target'} ne 'tex'
+ && $env{'request.state'} eq 'construct') {
push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");
}
}
@@ -1643,15 +1621,15 @@ sub helpinfo {
sub whichuser {
my ($passedsymb)=@_;
my ($symb,$courseid,$domain,$name,$publicuser);
- if (defined($ENV{'form.grade_symb'})) {
+ if (defined($env{'form.grade_symb'})) {
my ($tmp_courseid)=
&Apache::loncommon::get_env_multiple('form.grade_courseid');
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);
if (!$allowed &&
- exists($ENV{'request.course.sec'}) &&
- $ENV{'request.course.sec'} !~ /^\s*$/) {
+ exists($env{'request.course.sec'}) &&
+ $env{'request.course.sec'} !~ /^\s*$/) {
$allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid.
- '/'.$ENV{'request.course.sec'});
+ '/'.$env{'request.course.sec'});
}
if ($allowed) {
($symb)=&Apache::loncommon::get_env_multiple('form.grade_symb');
@@ -1666,14 +1644,14 @@ sub whichuser {
} else {
$symb=$passedsymb;
}
- $courseid=$ENV{'request.course.id'};
- $domain=$ENV{'user.domain'};
- $name=$ENV{'user.name'};
+ $courseid=$env{'request.course.id'};
+ $domain=$env{'user.domain'};
+ $name=$env{'user.name'};
if ($name eq 'public' && $domain eq 'public') {
- if (!defined($ENV{'form.username'})) {
- $ENV{'form.username'}.=time.rand(10000000);
+ if (!defined($env{'form.username'})) {
+ $env{'form.username'}.=time.rand(10000000);
}
- $name.=$ENV{'form.username'};
+ $name.=$env{'form.username'};
}
return ($symb,$courseid,$domain,$name,$publicuser);
}