loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.365 and 1.405

version 1.365, 2005/03/16 19:09:44	version 1.405, 2006/04/13 18:35:17
Line 52 use Math::Random();	Line 52 use Math::Random();
use Opcode();	use Opcode();
use POSIX qw(strftime);	use POSIX qw(strftime);
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
	use Symbol();

sub register {	sub register {
my ($space,@taglist) = @_;	my ($space,@taglist) = @_;
Line 81 use Apache::languagetags();	Line 82 use Apache::languagetags();
use Apache::edit();	use Apache::edit();
use Apache::inputtags();	use Apache::inputtags();
use Apache::outputtags();	use Apache::outputtags();
use Apache::lonnet();	use Apache::lonnet;
use Apache::File();	use Apache::File();
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonfeedback();	use Apache::lonfeedback();
Line 148 $Apache::lonxml::post_evaluate=1;	Line 149 $Apache::lonxml::post_evaluate=1;
#a header message to emit in the case of any generated warning or errors	#a header message to emit in the case of any generated warning or errors
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';

	# Control whether or not LaTeX symbols should be substituted for their
	# \ style equivalents...this may be turned off e.g. in an verbatim
	# environment.

	$Apache::lonxml::substitute_LaTeX_symbols = 1; # Starts out on.

	sub enable_LaTeX_substitutions {
	$Apache::lonxml::substitute_LaTeX_symbols = 1;
	}
	sub disable_LaTeX_substitutions {
	$Apache::lonxml::substitute_LaTeX_symbols = 0;
	}

sub xmlbegin {	sub xmlbegin {
my ($style)=@_;	my ($style)=@_;
my $output='';	my $output='';
@htmlareafields=();	@htmlareafields=();
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
$output='<?xml version="1.0"?>'	$output='<?xml version="1.0"?>'
#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"	#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
# .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '	# .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
Line 174 sub xmlend {	Line 188 sub xmlend {
my ($target,$parser)=@_;	my ($target,$parser)=@_;
my $mode='xml';	my $mode='xml';
my $status='OPEN';	my $status='OPEN';
if ($Apache::lonhomework::parsing_a_problem) {	if ($Apache::lonhomework::parsing_a_problem \|\|
	$Apache::lonhomework::parsing_a_task ) {
$mode='problem';	$mode='problem';
$status=$Apache::inputtags::status[-1];	$status=$Apache::inputtags::status[-1];
}	}
my $discussion;	my $discussion;
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
($ENV{'query_string'},['LONCAPA_INTERNAL_no_discussion']);	['LONCAPA_INTERNAL_no_discussion']);
if (! exists($ENV{'form.LONCAPA_INTERNAL_no_discussion'}) \|\|	if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) \|\|
$ENV{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {	$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
$discussion=&Apache::lonfeedback::list_discussion($mode,$status);	$discussion=&Apache::lonfeedback::list_discussion($mode,$status);
}	}
if ($target eq 'tex') {	if ($target eq 'tex') {
$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
&Apache::lonxml::newparser($parser,\$discussion,'');	&Apache::lonxml::newparser($parser,\$discussion,'');
return '';	return '';
} else {
return $discussion.&Apache::loncommon::endbodytag();
}	}

	return $discussion.&Apache::loncommon::end_page();
}	}

sub tokeninputfield {	sub tokeninputfield {
Line 249 sub maketoken {	Line 264 sub maketoken {
$symb=&Apache::lonnet::symbread();	$symb=&Apache::lonnet::symbread();
}	}
unless ($tuname) {	unless ($tuname) {
$tuname=$ENV{'user.name'};	$tuname=$env{'user.name'};
$tudom=$ENV{'user.domain'};	$tudom=$env{'user.domain'};
$tcrsid=$ENV{'request.course.id'};	$tcrsid=$env{'request.course.id'};
}	}

return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);	return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
Line 271 sub printtokenheader {	Line 286 sub printtokenheader {
$tcrsid=$courseid;	$tcrsid=$courseid;
}	}

my %reply=&Apache::lonnet::get('environment',	my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
['firstname','middlename','lastname','generation'],
$tudom,$tuname);
my $plainname=$reply{'firstname'}.' '.
$reply{'middlename'}.' '.
$reply{'lastname'}.' '.
$reply{'generation'};

if ($target eq 'web') {	if ($target eq 'web') {
my %idhash=&Apache::lonnet::idrget($tudom,($tuname));	my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
Line 287 sub printtokenheader {	Line 296 sub printtokenheader {
'<br />'.&mt('User').': '.$tuname.' at '.$tudom.	'<br />'.&mt('User').': '.$tuname.' at '.$tudom.
'<br />'.&mt('ID').': '.$idhash{$tuname}.	'<br />'.&mt('ID').': '.$idhash{$tuname}.
'<br />'.&mt('CourseID').': '.$tcrsid.	'<br />'.&mt('CourseID').': '.$tcrsid.
'<br />'.&mt('Course').': '.$ENV{'course.'.$tcrsid.'.description'}.	'<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
'<br />'.&mt('DocID').': '.$token.	'<br />'.&mt('DocID').': '.$token.
'<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';	'<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
} else {	} else {
Line 297 sub printtokenheader {	Line 306 sub printtokenheader {

sub fontsettings {	sub fontsettings {
my $headerstring='';	my $headerstring='';
if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) {	if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
$headerstring.=	$headerstring.=
'<meta Content-Type="text/html; charset=x-mac-roman" />';	'<meta Content-Type="text/html; charset=x-mac-roman" />';
} elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) {	} elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
$headerstring.=	$headerstring.=
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';	'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
}	}
Line 320 sub xmlparse {	Line 329 sub xmlparse {

&setup_globals($request,$target);	&setup_globals($request,$target);
&Apache::inputtags::initialize_inputtags();	&Apache::inputtags::initialize_inputtags();
	&Apache::bridgetask::initialize_bridgetask();
&Apache::outputtags::initialize_outputtags();	&Apache::outputtags::initialize_outputtags();
&Apache::edit::initialize_edit();	&Apache::edit::initialize_edit();
&Apache::londefdef::initialize_londefdef();	&Apache::londefdef::initialize_londefdef();
Line 328 sub xmlparse {	Line 338 sub xmlparse {
# do we have a course style file?	# 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=	my $bodytext=
$ENV{'course.'.$ENV{'request.course.id'}.'.default_xml_style'};	$env{'course.'.$env{'request.course.id'}.'.default_xml_style'};
if ($bodytext) {	if ($bodytext) {
foreach my $file (split(',',$bodytext)) {	foreach my $file (split(',',$bodytext)) {
my $location=&Apache::lonnet::filelocation('',$file);	my $location=&Apache::lonnet::filelocation('',$file);
Line 341 sub xmlparse {	Line 351 sub xmlparse {
}	}
}	}
}	}
} elsif ($ENV{'construct.style'} && ($ENV{'request.state'} eq 'construct')) {	} elsif ($env{'construct.style'} && ($env{'request.state'} eq 'construct')) {
my $location=&Apache::lonnet::filelocation('',$ENV{'construct.style'});	my $location=&Apache::lonnet::filelocation('',$env{'construct.style'});
my $styletext=&Apache::lonnet::getfile($location);	my $styletext=&Apache::lonnet::getfile($location);
if ($styletext ne '-1') {	if ($styletext ne '-1') {
%style_for_target = (%style_for_target,	%style_for_target = (%style_for_target,
Line 351 sub xmlparse {	Line 361 sub xmlparse {
}	}
#&printalltags();	#&printalltags();
my @pars = ();	my @pars = ();
my $pwd=$ENV{'request.filename'};	my $pwd=$env{'request.filename'};
$pwd =~ s:/[^/]*$::;	$pwd =~ s:/[^/]*$::;
&newparser(\@pars,\$content_file_string,$pwd);	&newparser(\@pars,\$content_file_string,$pwd);

Line 367 sub xmlparse {	Line 377 sub xmlparse {
&initdepth();	&initdepth();
&init_alarm();	&init_alarm();
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,	my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
$safeeval,\%style_for_target);	$safeeval,\%style_for_target,1);

if ($ENV{'request.uri'}) {	if ($env{'request.uri'}) {
&writeallows($ENV{'request.uri'});	&writeallows($env{'request.uri'});
}	}
&do_registered_ssi();	&do_registered_ssi();
if ($Apache::lonxml::counter_changed) { &store_counter() }	if ($Apache::lonxml::counter_changed) { &store_counter() }
if ($ENV{'form.return_only_error_and_warning_counts'}) {
	&clean_safespace($safeeval);

	if ($env{'form.return_only_error_and_warning_counts'}) {
return "$errorcount:$warningcount";	return "$errorcount:$warningcount";
}	}
return $finaloutput;	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 {	sub latex_special_symbols {
my ($string,$where)=@_;	my ($string,$where)=@_;
	#
	# If e.g. in verbatim mode, then don't substitute.
	# but return original string.
	#
	if (!($Apache::lonxml::substitute_LaTeX_symbols)) {
	return $string;
	}
if ($where eq 'header') {	if ($where eq 'header') {
$string =~ s/(\\\|_\|\^)/ /g;	$string =~ s/(\\\|_\|\^)/ /g;
$string =~ s/(\$\|%\|\{\|\})/\\$1/g;	$string =~ s/(\$\|%\|\{\|\})/\\$1/g;
Line 419 sub latex_special_symbols {	Line 412 sub latex_special_symbols {
$string=~s/([^\\])\#/$1\\\#/g;	$string=~s/([^\\])\#/$1\\\#/g;
} else {	} else {
$string=~s/\\/\\ensuremath{\\backslash}/g;	$string=~s/\\/\\ensuremath{\\backslash}/g;
$string=~s/([^\\]\|^)\%/$1\\\%/g;	$string=~s/\\\%\|\%/\\\%/g;
$string=~s/([^\\]\|^)\$/$1\\\$/g;	$string=~s/\\{\|{/\\{/g;
$string=~s/([^\\])\_/$1\\_/g;	$string=~s/\\}\|}/\\}/g;
$string=~s/\$\$/\$\\\$/g;	$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
$string=~s/\_\_/\_\\\_/g;	$string=~s/\\\$\|\$/\\\$/g;
$string=~s/\#\#/\#\\\#/g;	$string=~s/\\\_\|\_/\\\_/g;
$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;	$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;
$string=~s/(>\|<)/\\ensuremath\{$1\}/g; #more or less	$string=~s/(>\|<)/\\ensuremath\{$1\}/g; #more or less
$string=&Apache::lonprintout::character_chart($string);	$string=&Apache::lonprintout::character_chart($string);
# any & or # leftover should be safe to just escape	# any & or # leftover should be safe to just escape
$string=~s/([^\\]\|^)\&/$1\\\&/g;	$string=~s/\\\&\|\&/\\\&/g;
$string=~s/([^\\]\|^)\#/$1\\\#/g;	$string=~s/\\\#\|\#/\\\#/g;
$string=~s/\\|/\$\\mid\$/g;	$string=~s/\\|/\$\\mid\$/g;
#single { or } How to escape?	#single { or } How to escape?
}	}
Line 438 sub latex_special_symbols {	Line 431 sub latex_special_symbols {
}	}

sub inner_xmlparse {	sub inner_xmlparse {
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;	my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target,$start)=@_;
my $finaloutput = '';	my $finaloutput = '';
my $result;	my $result;
my $token;	my $token;
my $dontpop=0;	my $dontpop=0;
	my $startredirection = $Apache::lonxml::redirection;
while ( $#$pars > -1 ) {	while ( $#$pars > -1 ) {
while ($token = $$pars['-1']->get_token) {	while ($token = $$pars['-1']->get_token) {
if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') ) {	if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') ) {
Line 552 sub inner_xmlparse {	Line 546 sub inner_xmlparse {
# $finaloutput.=&endredirection;	# $finaloutput.=&endredirection;
# }	# }

	if ( $start && $target eq 'grade') { &endredirection(); }
	if ( $Apache::lonxml::redirection > $startredirection) {
	while ($Apache::lonxml::redirection > $startredirection) {
	$finaloutput .= &endredirection();
	}
	}
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {	if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
$finaloutput=&afterburn($finaloutput);	$finaloutput=&afterburn($finaloutput);
}	}
Line 650 sub setup_globals {	Line 649 sub setup_globals {
@Apache::lonxml::ssi_info=();	@Apache::lonxml::ssi_info=();
$Apache::lonxml::post_evaluate=1;	$Apache::lonxml::post_evaluate=1;
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';
	$Apache::lonxml::substitute_LaTeX_symbols = 1;
if ($target eq 'meta') {	if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;	$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;	$Apache::lonxml::metamode = 1;
Line 661 sub setup_globals {	Line 661 sub setup_globals {
$Apache::lonxml::evaluate = 1;	$Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;	$Apache::lonxml::import = 1;
} elsif ($target eq 'grade') {	} elsif ($target eq 'grade') {
&startredirection;	&startredirection(); #ended in inner_xmlparse on exit
$Apache::lonxml::metamode = 0;	$Apache::lonxml::metamode = 0;
$Apache::lonxml::evaluate = 1;	$Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;	$Apache::lonxml::import = 1;
Line 690 sub setup_globals {	Line 690 sub setup_globals {

sub init_safespace {	sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;	my ($target,$safeeval,$safehole,$safeinit) = @_;
	$safeeval->deny_only(':dangerous');
	$safeeval->reval('use Math::Complex;');
	$safeeval->permit_only(":default");
$safeeval->permit("entereval");	$safeeval->permit("entereval");
$safeeval->permit(":base_math");	$safeeval->permit(":base_math");
$safeeval->permit("sort");	$safeeval->permit("sort");
$safeeval->permit("time");	$safeeval->permit("time");
	$safeeval->deny("rand");
	$safeeval->deny("srand");
$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::outputtags::multipart,$safeeval,'&multipart');
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');	$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,	$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
'&chem_standard_order');	'&chem_standard_order');
	$safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status');

$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');	$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');	$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
Line 744 sub init_safespace {	Line 750 sub init_safespace {
$safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );	$safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );
$safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');	$safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');

	$safehole->wrap(\&Math::Cephes::Matrix::mat,$safeeval,'&mat');
	$safehole->wrap(\&Math::Cephes::Matrix::new,$safeeval,
	'&Math::Cephes::Matrix::new');
	$safehole->wrap(\&Math::Cephes::Matrix::coef,$safeeval,
	'&Math::Cephes::Matrix::coef');
	$safehole->wrap(\&Math::Cephes::Matrix::clr,$safeeval,
	'&Math::Cephes::Matrix::clr');
	$safehole->wrap(\&Math::Cephes::Matrix::add,$safeeval,
	'&Math::Cephes::Matrix::add');
	$safehole->wrap(\&Math::Cephes::Matrix::sub,$safeeval,
	'&Math::Cephes::Matrix::sub');
	$safehole->wrap(\&Math::Cephes::Matrix::mul,$safeeval,
	'&Math::Cephes::Matrix::mul');
	$safehole->wrap(\&Math::Cephes::Matrix::div,$safeeval,
	'&Math::Cephes::Matrix::div');
	$safehole->wrap(\&Math::Cephes::Matrix::inv,$safeeval,
	'&Math::Cephes::Matrix::inv');
	$safehole->wrap(\&Math::Cephes::Matrix::transp,$safeeval,
	'&Math::Cephes::Matrix::transp');
	$safehole->wrap(\&Math::Cephes::Matrix::simq,$safeeval,
	'&Math::Cephes::Matrix::simq');
	$safehole->wrap(\&Math::Cephes::Matrix::mat_to_vec,$safeeval,
	'&Math::Cephes::Matrix::mat_to_vec');
	$safehole->wrap(\&Math::Cephes::Matrix::vec_to_mat,$safeeval,
	'&Math::Cephes::Matrix::vec_to_mat');
	$safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
	'&Math::Cephes::Matrix::check');
	$safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
	'&Math::Cephes::Matrix::check');

# $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');	# $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');
# $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');	# $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');
# $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');	# $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');
Line 780 sub init_safespace {	Line 816 sub init_safespace {
# $safeeval->deny(":base_orig");	# $safeeval->deny(":base_orig");
$safeeval->permit("require");	$safeeval->permit("require");
$safeinit .= ';$external::target="'.$target.'";';	$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);	&Apache::run::run($safeinit,$safeeval);
	&initialize_rndseed($safeeval);
	}

	sub clean_safespace {
	my ($safeeval) = @_;
	delete_package_recurse($safeeval->{Root});
	}

	sub delete_package_recurse {
	my ($package) = @_;
	my @subp;
	{
	no strict 'refs';
	while (my ($key,$val) = each(%{*{"$package\::"}})) {
	if (!defined($val)) { next; }
	local (*ENTRY) = $val;
	if (defined *ENTRY{HASH} && $key =~ /::$/ &&
	$key ne "main::" && $key ne "<none>::")
	{
	my ($p) = $package ne "main" ? "$package\::" : "";
	($p .= $key) =~ s/::$//;
	push(@subp,$p);
	}
	}
	}
	foreach my $p (@subp) {
	delete_package_recurse($p);
	}
	Symbol::delete_package($package);
	}

	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 {	sub default_homework_load {
Line 835 sub startredirection {	Line 904 sub startredirection {

sub endredirection {	sub endredirection {
if (!$Apache::lonxml::redirection) {	if (!$Apache::lonxml::redirection) {
&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);	&Apache::lonxml::error("Endredirection was called before a startredirection, perhaps you have unbalanced tags. Some debugging information:".join ":",caller);
return '';	return '';
}	}
$Apache::lonxml::redirection--;	$Apache::lonxml::redirection--;
Line 902 sub decreasedepth {	Line 971 sub decreasedepth {
#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";	#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
}	}

	sub get_id {
	my ($parstack,$safeeval)=@_;
	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
	if ($env{'request.state'} eq 'construct' && $id =~ /(\.\|_)/) {
	&error(&mt("IDs are not allowed to contain "<tt>_</tt>" or "<tt>.</tt>""));
	}
	if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
	return $id;
	}

sub get_all_text_unbalanced {	sub get_all_text_unbalanced {
#there is a copy of this in lonpublisher.pm	#there is a copy of this in lonpublisher.pm
my($tag,$pars)= @_;	my($tag,$pars)= @_;
Line 910 sub get_all_text_unbalanced {	Line 989 sub get_all_text_unbalanced {
$tag='<'.$tag.'>';	$tag='<'.$tag.'>';
while ($token = $$pars[-1]->get_token) {	while ($token = $$pars[-1]->get_token) {
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[0] eq 'T' && $token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 941 sub increment_counter {	Line 1024 sub increment_counter {
}	}

sub init_counter {	sub init_counter {
if (defined($ENV{'form.counter'})) {	if ($env{'request.state'} eq 'construct') {
$Apache::lonxml::counter=$ENV{'form.counter'};	$Apache::lonxml::counter=1;
	$Apache::lonxml::counter_changed=1;
	} elsif (defined($env{'form.counter'})) {
	$Apache::lonxml::counter=$env{'form.counter'};
$Apache::lonxml::counter_changed=0;	$Apache::lonxml::counter_changed=0;
} else {	} else {
$Apache::lonxml::counter=1;	$Apache::lonxml::counter=1;
Line 952 sub init_counter {	Line 1038 sub init_counter {

sub store_counter {	sub store_counter {
&Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));	&Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
	$Apache::lonxml::counter_changed=0;
return '';	return '';
}	}

	{
	my $state;
	sub clear_problem_counter {
	undef($state);
	&Apache::lonnet::delenv('form.counter');
	&Apache::lonxml::init_counter();
	&Apache::lonxml::store_counter();
	}

	sub remember_problem_counter {
	&Apache::lonnet::transfer_profile_to_env();
	$state = $env{'form.counter'};
	}

	sub restore_problem_counter {
	if (defined($state)) {
	&Apache::lonnet::appenv(('form.counter' => $state));
	}
	}
	sub get_problem_counter {
	if ($Apache::lonxml::counter_changed) { &store_counter() }
	&Apache::lonnet::transfer_profile_to_env();
	return $env{'form.counter'};
	}
	}

sub get_all_text {	sub get_all_text {
my($tag,$pars,$style)= @_;	my($tag,$pars,$style)= @_;
my $gotfullstack=1;	my $gotfullstack=1;
Line 976 sub get_all_text {	Line 1089 sub get_all_text {
while (($depth >=0) && ($token = $$pars[-1]->get_token)) {	while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);	#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 1028 sub get_all_text {	Line 1145 sub get_all_text {
#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");	#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|
($token->[0] eq 'D')) {	($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 1081 sub parstring {	Line 1202 sub parstring {
return $temp;	return $temp;
}	}

	sub extlink {
	my ($res,$exact)=@_;
	if (!$exact) {
	$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res);
	}
	push(@Apache::lonxml::extlinks,$res)
	}

sub writeallows {	sub writeallows {
unless ($#extlinks>=0) { return; }	unless ($#extlinks>=0) { return; }
my $thisurl='/res/'.&Apache::lonnet::declutter(shift);	my $thisurl = &Apache::lonnet::clutter(shift);
if ($ENV{'httpref.'.$thisurl}) {	if ($env{'httpref.'.$thisurl}) {
$thisurl=$ENV{'httpref.'.$thisurl};	$thisurl=$env{'httpref.'.$thisurl};
}	}
my $thisdir=$thisurl;	my $thisdir=$thisurl;
$thisdir=~s/\/[^\/]+$//;	$thisdir=~s/\/[^\/]+$//;
Line 1118 sub afterburn {	Line 1247 sub afterburn {
my $result=shift;	my $result=shift;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['highlight','anchor','link']);	['highlight','anchor','link']);
if ($ENV{'form.highlight'}) {	if ($env{'form.highlight'}) {
foreach (split(/\,/,$ENV{'form.highlight'})) {	foreach (split(/\,/,$env{'form.highlight'})) {
my $anchorname=$_;	my $anchorname=$_;
my $matchthis=$anchorname;	my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;	$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs;	$result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs;
}	}
}	}
if ($ENV{'form.link'}) {	if ($env{'form.link'}) {
foreach (split(/\,/,$ENV{'form.link'})) {	foreach (split(/\,/,$env{'form.link'})) {
my ($anchorname,$linkurl)=split(/\>/,$_);	my ($anchorname,$linkurl)=split(/\>/,$_);
my $matchthis=$anchorname;	my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;	$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;	$result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
}	}
}	}
if ($ENV{'form.anchor'}) {	if ($env{'form.anchor'}) {
my $anchorname=$ENV{'form.anchor'};	my $anchorname=$env{'form.anchor'};
my $matchthis=$anchorname;	my $matchthis=$anchorname;
$matchthis=~s/\_+/\\s\+/g;	$matchthis=~s/\_+/\\s\+/g;
$result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;	$result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
Line 1165 sub createnewhtml {	Line 1294 sub createnewhtml {
my $title=&mt('Title of document goes here');	my $title=&mt('Title of document goes here');
my $body=&mt('Body of document goes here');	my $body=&mt('Body of document goes here');
my $filecontents=(<<SIMPLECONTENT);	my $filecontents=(<<SIMPLECONTENT);
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd">
<html>	<html>
<head>	<head>
<title>$title</title>	<title>$title</title>
Line 1229 FULLPAGE	Line 1357 FULLPAGE
$xml_help=&Apache::loncommon::helpLatexCheatsheet();	$xml_help=&Apache::loncommon::helpLatexCheatsheet();
}	}
my $cleanbut = '';	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 $titledisplay=&display_title();
my %lt=&Apache::lonlocal::texthash('st' => 'Save this',	my %lt=&Apache::lonlocal::texthash('st' => 'Save this',
'vi' => 'View',	'vi' => 'View',
Line 1252 $initialize	Line 1377 $initialize
$xml_help	$xml_help
<input type="hidden" name="editmode" value="$lt{'ed'}" />	<input type="hidden" name="editmode" value="$lt{'ed'}" />
$buttons<br />	$buttons<br />
<textarea cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>	<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
<br />$buttons	<br />$buttons
<br />	<br />
</form>	</form>
Line 1265 ENDFOOTER	Line 1390 ENDFOOTER
}	}

sub get_target {	sub get_target {
my $viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});	my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
if ( $ENV{'request.state'} eq 'published') {	if ( $env{'request.state'} eq 'published') {
if ( defined($ENV{'form.grade_target'})	if ( defined($env{'form.grade_target'})
&& ($viewgrades == 'F' )) {	&& ($viewgrades == 'F' )) {
return ($ENV{'form.grade_target'});	return ($env{'form.grade_target'});
} elsif (defined($ENV{'form.grade_target'})) {	} elsif (defined($env{'form.grade_target'})) {
if (($ENV{'form.grade_target'} eq 'web') \|\|	if (($env{'form.grade_target'} eq 'web') \|\|
($ENV{'form.grade_target'} eq 'tex') ) {	($env{'form.grade_target'} eq 'tex') ) {
return $ENV{'form.grade_target'}	return $env{'form.grade_target'}
} else {	} else {
return 'web';	return 'web';
}	}
} else {	} else {
return 'web';	return 'web';
}	}
} elsif ($ENV{'request.state'} eq 'construct') {	} elsif ($env{'request.state'} eq 'construct') {
if ( defined($ENV{'form.grade_target'})) {	if ( defined($env{'form.grade_target'})) {
return ($ENV{'form.grade_target'});	return ($env{'form.grade_target'});
} else {	} else {
return 'web';	return 'web';
}	}
Line 1296 sub handler {	Line 1421 sub handler {

my $target=&get_target();	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::content_type($request,'text/html');
&Apache::loncommon::no_cache($request);	&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,	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
'lastrevisiondate'));	'lastrevisiondate'));
}	}
Line 1319 sub handler {	Line 1444 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'}) \|\| ($ENV{'form.attemptclean'})) {	if ($env{'form.savethisfile'}) {
if (&storefile($file,$ENV{'form.filecont'})) {	if (&storefile($file,$env{'form.filecont'})) {
&Apache::lonxml::info("<font COLOR=\"#0000FF\">".	&Apache::lonxml::info("<font COLOR=\"#0000FF\">".
&mt('Updated').": ".	&mt('Updated').": ".
&Apache::lonlocal::locallocaltime(time).	&Apache::lonlocal::locallocaltime(time).
Line 1333 sub handler {	Line 1458 sub handler {
my $result = '';	my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);	my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {	if ($filecontents eq -1) {
my $bodytag=&Apache::loncommon::bodytag('File Error');	my $start_page=&Apache::loncommon::start_page('File Error');
	my $end_page=&Apache::loncommon::end_page('File Error');
my $fnf=&mt('File not found');	my $fnf=&mt('File not found');
$result=(<<ENDNOTFOUND);	$result=(<<ENDNOTFOUND);
<html>	$start_page
<head>
<title>$fnf</title>
</head>
$bodytag
<b>$fnf: $file</b>	<b>$fnf: $file</b>
</body>	$end_page
</html>
ENDNOTFOUND	ENDNOTFOUND
$filecontents='';	$filecontents='';
if ($ENV{'request.state'} ne 'published') {	if ($env{'request.state'} ne 'published') {
if ($filetype eq 'sty') {	if ($filetype eq 'sty') {
$filecontents=&createnewsty();	$filecontents=&createnewsty();
} else {	} else {
$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 ($filecontents=~/BEGIN LON-CAPA Internal/) {	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.'));	&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	# we are in construction space, see if edit mode forced
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
($ENV{'QUERY_STRING'},['editmode']);	['editmode']);
}	}
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);
	undef($Apache::lonhomework::parsing_a_task);
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['rawmode']);
	if ($env{'form.rawmode'}) { $result = $filecontents; }
}	}
}	}

#	#
# 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/^\/[^\/]*//;
my $bodytag='<body bgcolor="#FFFFFF">';	my %options = ();
if ($ENV{'environment.remote'} eq 'off') {	if ($env{'environment.remote'} ne 'off') {
$bodytag=&Apache::loncommon::bodytag();	$options{'bgcolor'} = '#FFFFFF';
	$options{'only_body'} = 1;
}	}
$result='<html>'.$bodytag.	my $start_page = &Apache::loncommon::start_page(undef,undef,
	\%options);
	$result=$start_page.
&Apache::lonxml::message_location().'<h3>'.	&Apache::lonxml::message_location().'<h3>'.
$displayfile.	$displayfile.
'</h3></body></html>';	'</h3>'.&Apache::loncommon::end_page();
$result=&inserteditinfo($result,$filecontents,$filetype);	$result=&inserteditinfo($result,$filecontents,$filetype);
}	}
}	}
if ($filetype eq 'html') { writeallows($request->uri); }	if ($filetype eq 'html') { &writeallows($request->uri); }


&Apache::lonxml::add_messages(\$result);	&Apache::lonxml::add_messages(\$result);
Line 1403 ENDNOTFOUND	Line 1527 ENDNOTFOUND

sub display_title {	sub display_title {
my $result;	my $result;
if ($ENV{'request.state'} eq 'construct') {	if ($env{'request.state'} eq 'construct') {
my $title=&Apache::lonnet::gettitle();	my $title=&Apache::lonnet::gettitle();
if (!defined($title) \|\| $title eq '') {	if (!defined($title) \|\| $title eq '') {
$title = $ENV{'request.filename'};	$title = $env{'request.filename'};
$title = substr($title, rindex($title, '/') + 1);	$title = substr($title, rindex($title, '/') + 1);
}	}
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";	$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";
Line 1418 sub debug {	Line 1542 sub debug {
if ($Apache::lonxml::debug eq "1") {	if ($Apache::lonxml::debug eq "1") {
$\|=1;	$\|=1;
my $request=$Apache::lonxml::request;	my $request=$Apache::lonxml::request;
if (!$request) { $request=Apache->request; }	if (!$request) {
	eval { $request=Apache->request; };
	}
	if (!$request) {
	eval { $request=Apache2::RequestUtil->request; };
	}
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");	$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");
#&Apache::lonnet::logthis($_[0]);	#&Apache::lonnet::logthis($_[0]);
}	}
}	}

sub show_error_warn_msg {	sub show_error_warn_msg {
if ($ENV{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&	if ($env{'request.filename'} eq '/home/httpd/html/res/lib/templates/simpleproblem.problem' &&
&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) {	&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
return 1;	return 1;
}	}
return (($Apache::lonxml::debug eq 1) \|\|	return (($Apache::lonxml::debug eq 1) \|\|
($ENV{'request.state'} eq 'construct') \|\|	($env{'request.state'} eq 'construct') \|\|
($Apache::lonhomework::browse eq 'F'	($Apache::lonhomework::browse eq 'F'
&&	&&
$ENV{'form.show_errors'} eq 'on'));	$env{'form.show_errors'} eq 'on'));
}	}

sub error {	sub error {
Line 1450 sub error {	Line 1579 sub error {
if ( !$symb ) {	if ( !$symb ) {
#public or browsers	#public or browsers
$errormsg=&mt("An error occured while processing this resource. The author has been notified.");	$errormsg=&mt("An error occured while processing this resource. The author has been notified.");
}	}
	my $msg = join('<br />',@_);
#notify author	#notify author
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));	&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
#notify course	#notify course
if ( $symb && $ENV{'request.course.id'} ) {	if ( $symb && $env{'request.course.id'} ) {
	my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);	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;	my @userlist;
foreach (keys %users) {	foreach (keys %users) {
my ($user,$domain) = split(/:/, $_);	my ($user,$domain) = split(/:/, $_);
push(@userlist,"$user\@$domain");	push(@userlist,"$user\@$domain");
&Apache::lonmsg::user_normal_msg($user,$domain,	my $key=$declutter.'_'.$user.'_'.$domain;
"Error [$declutter]",join('<br />',@_));	my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
	[$key],
	$cdom,$cnum);
	my $now=time;
	if ($now-$lastnotified{$key}>86400) {
	&Apache::lonmsg::user_normal_msg($user,$domain,
	"Error [$declutter]",$msg);
	&Apache::lonnet::put('nohist_xmlerrornotifications',
	{$key => $now},
	$cdom,$cnum);
	}
}	}
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));	$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
} else {	} else {
$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");	$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");
Line 1477 sub error {	Line 1619 sub error {
sub warning {	sub warning {
$warningcount++;	$warningcount++;

if ($ENV{'form.grade_target'} ne 'tex') {	if ($env{'form.grade_target'} ne 'tex') {
if ( &show_error_warn_msg() ) {	if ( &show_error_warn_msg() ) {
my $request=$Apache::lonxml::request;
if (!$request) { $request=Apache->request; }
push(@Apache::lonxml::warning_messages,	push(@Apache::lonxml::warning_messages,
$Apache::lonxml::warnings_error_header.	$Apache::lonxml::warnings_error_header.
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");	"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
Line 1490 sub warning {	Line 1630 sub warning {
}	}

sub info {	sub info {
if ($ENV{'form.grade_target'} ne 'tex'	if ($env{'form.grade_target'} ne 'tex'
&& $ENV{'request.state'} eq 'construct') {	&& $env{'request.state'} eq 'construct') {
push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");	push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n");
}	}
}	}
Line 1642 sub helpinfo {	Line 1782 sub helpinfo {
sub whichuser {	sub whichuser {
my ($passedsymb)=@_;	my ($passedsymb)=@_;
my ($symb,$courseid,$domain,$name,$publicuser);	my ($symb,$courseid,$domain,$name,$publicuser);
if (defined($ENV{'form.grade_symb'})) {	if (defined($env{'form.grade_symb'})) {
my ($tmp_courseid)=	my ($tmp_courseid)=
&Apache::loncommon::get_env_multiple('form.grade_courseid');	&Apache::loncommon::get_env_multiple('form.grade_courseid');
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);	my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);
if (!$allowed &&	if (!$allowed &&
exists($ENV{'request.course.sec'}) &&	exists($env{'request.course.sec'}) &&
$ENV{'request.course.sec'} !~ /^\s*$/) {	$env{'request.course.sec'} !~ /^\s*$/) {
$allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid.	$allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid.
'/'.$ENV{'request.course.sec'});	'/'.$env{'request.course.sec'});
}	}
if ($allowed) {	if ($allowed) {
($symb)=&Apache::loncommon::get_env_multiple('form.grade_symb');	($symb)=&Apache::loncommon::get_env_multiple('form.grade_symb');
Line 1665 sub whichuser {	Line 1805 sub whichuser {
} else {	} else {
$symb=$passedsymb;	$symb=$passedsymb;
}	}
$courseid=$ENV{'request.course.id'};	$courseid=$env{'request.course.id'};
$domain=$ENV{'user.domain'};	$domain=$env{'user.domain'};
$name=$ENV{'user.name'};	$name=$env{'user.name'};
if ($name eq 'public' && $domain eq 'public') {	if ($name eq 'public' && $domain eq 'public') {
if (!defined($ENV{'form.username'})) {	if (!defined($env{'form.username'})) {
$ENV{'form.username'}.=time.rand(10000000);	$env{'form.username'}.=time.rand(10000000);
}	}
$name.=$ENV{'form.username'};	$name.=$env{'form.username'};
}	}
return ($symb,$courseid,$domain,$name,$publicuser);	return ($symb,$courseid,$domain,$name,$publicuser);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.365
changed lines
	Added in v.1.405