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.318 and 1.377

version 1.318, 2004/05/21 21:07:54	version 1.377, 2005/06/17 17:51:15
Line 40	Line 40

package Apache::lonxml;	package Apache::lonxml;
use vars	use vars
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);	qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount @htmlareafields);
use strict;	use strict;
use HTML::LCParser();	use HTML::LCParser();
use HTML::TreeBuilder();	use HTML::TreeBuilder();
Line 51 use Math::Cephes();	Line 51 use Math::Cephes();
use Math::Random();	use Math::Random();
use Opcode();	use Opcode();
use POSIX qw(strftime);	use POSIX qw(strftime);
	use Time::HiRes qw( gettimeofday tv_interval );

sub register {	sub register {
my ($space,@taglist) = @_;	my ($space,@taglist) = @_;
Line 81 use Apache::languagetags();	Line 81 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 149 $Apache::lonxml::post_evaluate=1;	Line 149 $Apache::lonxml::post_evaluate=1;
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';

sub xmlbegin {	sub xmlbegin {
my $output='';	my ($style)=@_;
if ($ENV{'browser.mathml'}) {	my $output='';
$output='<?xml version="1.0"?>'	@htmlareafields=();
.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'	if ($env{'browser.mathml'}) {
.'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '	$output='<?xml version="1.0"?>'
.'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'	#.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
	# .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '

	# .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">] >'
	.'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'
.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '	.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
.'xmlns="http://www.w3.org/TR/REC-html40">';	.'xmlns="http://www.w3.org/1999/xhtml">';
} else {	} else {
$output='<html>';	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
}	}
return $output;	if ($style eq 'encode') {
	$output=&HTML::Entities::encode($output,'<>&"');
	}
	return $output;
}	}

sub xmlend {	sub xmlend {
	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];
}	}
return &Apache::lonfeedback::list_discussion($mode,$status).'</html>';	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') {
	$discussion=&Apache::lonfeedback::list_discussion($mode,$status);
	}
	if ($target eq 'tex') {
	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
	&Apache::lonxml::newparser($parser,\$discussion,'');
	return '';
	} else {
	return $discussion.&Apache::loncommon::endbodytag();
	}
}	}

sub tokeninputfield {	sub tokeninputfield {
Line 228 sub maketoken {	Line 250 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 266 sub printtokenheader {	Line 288 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 274 sub printtokenheader {	Line 296 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 299 sub xmlparse {	Line 321 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 307 sub xmlparse {	Line 330 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) {
my $location=&Apache::lonnet::filelocation('',$bodytext);	foreach my $file (split(',',$bodytext)) {
my $styletext=&Apache::lonnet::getfile($location);	my $location=&Apache::lonnet::filelocation('',$file);
if ($styletext ne '-1') {	my $styletext=&Apache::lonnet::getfile($location);
%style_for_target = (%style_for_target,	if ($styletext ne '-1') {
&Apache::style::styleparser($target,$styletext));	%style_for_target = (%style_for_target,
}	&Apache::style::styleparser($target,$styletext));
}	}
} 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);	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 328 sub xmlparse {	Line 353 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 341 sub xmlparse {	Line 366 sub xmlparse {

my @stack = ();	my @stack = ();
my @parstack = ();	my @parstack = ();
&initdepth;	&initdepth();
	&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);

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'}) {
	return "$errorcount:$warningcount";
	}
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\|meta\|allow)(.*?)\>/\<$1$2 \/\>/gis;
$output=~s/\<\/(br\|hr\|img\|meta\|allow)\>//gis;
unless ($full) {
$output=~s/\<[\/]*(body\|head\|html)\>//gis;
}

$tree = $tree->delete;

return $output;
}

sub latex_special_symbols {	sub latex_special_symbols {
my ($string,$where)=@_;	my ($string,$where)=@_;
if ($where eq 'header') {	if ($where eq 'header') {
Line 387 sub latex_special_symbols {	Line 394 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\\$2/g;	$string=~s/\\{\|{/\\{/g;
$string=~s/\$\$/\$\\\$/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;
#single { or } How to escape?	#single { or } How to escape?
}	}
return $string;	return $string;
Line 604 sub setup_globals {	Line 613 sub setup_globals {
my ($request,$target)=@_;	my ($request,$target)=@_;
$Apache::lonxml::request=$request;	$Apache::lonxml::request=$request;
$Apache::lonxml::registered = 0;	$Apache::lonxml::registered = 0;
	@Apache::lonxml::htmlareafields=();
$errorcount=0;	$errorcount=0;
$warningcount=0;	$warningcount=0;
$Apache::lonxml::default_homework_loaded=0;	$Apache::lonxml::default_homework_loaded=0;
Line 658 sub init_safespace {	Line 668 sub init_safespace {
$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,
	'&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');
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');	$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
Line 736 sub init_safespace {	Line 751 sub init_safespace {
$safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');	$safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed');
$safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');	$safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
$safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');	$safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
	$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');

#need to inspect this class of ops	#need to inspect this class of ops
# $safeeval->deny(":base_orig");	# $safeeval->deny(":base_orig");
	$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);
my $subroutine=<<'EVALUATESUB';
sub __LC_INTERNAL_EVALUATE__ {
my ($__LC__a,$__LC__b,$__LC__c)=@_;
my $__LC__prefix;
while(1){
{
use strict;
no strict "vars";
if (eval(defined(eval($__LC__a.$__LC__b)))) {
return $__LC__prefix.eval($__LC__a.$__LC__b.$__LC__c);
}
}
$__LC__prefix.=substr($__LC__a,0,1,"");
if ($__LC__a!~/^(\$\|&\|\#)/) { last; }
}
return $__LC__prefix.$__LC__a.$__LC__b.$__LC__c;
}	}
EVALUATESUB
$safeeval->permit("require");	sub initialize_rndseed {
$safeeval->reval($subroutine);	my ($safeeval)=@_;
$safeeval->deny("require");	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 782 sub default_homework_load {	Line 783 sub default_homework_load {
}	}
}	}

	{
	my $alarm_depth;
	sub init_alarm {
	alarm(0);
	$alarm_depth=0;
	}

	sub start_alarm {
	if ($alarm_depth<1) {
	my $old=alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
	if ($old) {
	&Apache::lonxml::error("Cancelled an alarm of $old, this shouldn't occur.");
	}
	}
	$alarm_depth++;
	}

	sub end_alarm {
	$alarm_depth--;
	if ($alarm_depth<1) { alarm(0); }
	}
	}
	my $metamode_was;
sub startredirection {	sub startredirection {
$Apache::lonxml::redirection++;	if (!$Apache::lonxml::redirection) {
push (@Apache::lonxml::outputstack, '');	$metamode_was=$Apache::lonxml::metamode;
	}
	$Apache::lonxml::metamode=0;
	$Apache::lonxml::redirection++;
	push (@Apache::lonxml::outputstack, '');
}	}

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 debuging information:".join ":",caller);
return '';	return '';
}	}
$Apache::lonxml::redirection--;	$Apache::lonxml::redirection--;
pop @Apache::lonxml::outputstack;	if (!$Apache::lonxml::redirection) {
	$Apache::lonxml::metamode=$metamode_was;
	}
	pop @Apache::lonxml::outputstack;
}	}

sub end_tag {	sub end_tag {
Line 809 sub initdepth {	Line 840 sub initdepth {
$Apache::lonxml::olddepth=-1;	$Apache::lonxml::olddepth=-1;
}	}

	my @timers;
	my $lasttime;
sub increasedepth {	sub increasedepth {
my ($token) = @_;	my ($token) = @_;
$Apache::lonxml::depth++;	$Apache::lonxml::depth++;
Line 816 sub increasedepth {	Line 849 sub increasedepth {
if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {	if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
$Apache::lonxml::olddepth=$Apache::lonxml::depth;	$Apache::lonxml::olddepth=$Apache::lonxml::depth;
}	}
	my $time;
	if ($Apache::lonxml::debug eq "1") {
	push(@timers,[&gettimeofday()]);
	$time=&tv_interval($lasttime);
	$lasttime=[&gettimeofday()];
	}
	my $spacing=' 'x($Apache::lonxml::depth-1);
my $curdepth=join('_',@Apache::lonxml::depthcounter);	my $curdepth=join('_',@Apache::lonxml::depthcounter);
&Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");	&Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n");
#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";	#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
}	}

Line 832 sub decreasedepth {	Line 872 sub decreasedepth {
&Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));	&Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
$Apache::lonxml::depth='-1';	$Apache::lonxml::depth='-1';
}	}
	my ($timer,$time);
	if ($Apache::lonxml::debug eq "1") {
	$timer=pop(@timers);
	$time=&tv_interval($lasttime);
	$lasttime=[&gettimeofday()];
	}
	my $spacing=' 'x$Apache::lonxml::depth;
my $curdepth=join('_',@Apache::lonxml::depthcounter);	my $curdepth=join('_',@Apache::lonxml::depthcounter);
&Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");	&Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n");
#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_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)= @_;
my $token;	my $token;
my $result='';	my $result='';
$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];	$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') {
$result.=$token->[4];	$result.=$token->[4];
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
$result.=$token->[2];	$result.=$token->[2];
}	}
if ($result =~ /(.)\Q$tag\E(.)/is) {	if ($result =~ /\Q$tag\E/is) {
&Apache::lonxml::debug('Got a winner with leftovers ::'.$2);	($result,my $redo)=$result =~ /(.)\Q$tag\E(.)/is;
&Apache::lonxml::debug('Result is :'.$1);	#&Apache::lonxml::debug('Got a winner with leftovers ::'.$2);
$result=$1;	#&Apache::lonxml::debug('Result is :'.$1);
my $redo=$tag.$2;	$redo=$tag.$redo;
&Apache::lonxml::newparser($pars,\$redo);	&Apache::lonxml::newparser($pars,\$redo);
last;	last;
}	}
}	}
return $result	return $result
}	}

sub increment_counter {	sub increment_counter {
Line 876 sub increment_counter {	Line 923 sub increment_counter {
}	}

sub init_counter {	sub init_counter {
if (defined($ENV{'form.counter'})) {	if (defined($env{'form.counter'})) {
$Apache::lonxml::counter=$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 991 sub get_all_text {	Line 1038 sub get_all_text {
sub newparser {	sub newparser {
my ($parser,$contentref,$dir) = @_;	my ($parser,$contentref,$dir) = @_;
push (@$parser,HTML::LCParser->new($contentref));	push (@$parser,HTML::LCParser->new($contentref));
$$parser['-1']->xml_mode('1');	$$parser[-1]->xml_mode(1);
	$$parser[-1]->marked_sections(1);
if ( $dir eq '' ) {	if ( $dir eq '' ) {
push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);	push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
} else {	} else {
Line 1006 sub parstring {	Line 1054 sub parstring {
unless ($_=~/\W/) {	unless ($_=~/\W/) {
my $val=$token->[2]->{$_};	my $val=$token->[2]->{$_};
$val =~ s/([\%\@\\\"\'])/\\$1/g;	$val =~ s/([\%\@\\\"\'])/\\$1/g;
	$val =~ s/(\$[^{a-zA-Z_])/\\$1/g;
	$val =~ s/(\$)$/\\$1/;
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }	#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
$temp .= "my \$$_=\"$val\";";	$temp .= "my \$$_=\"$val\";";
}	}
Line 1015 sub parstring {	Line 1065 sub parstring {

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 1050 sub afterburn {	Line 1100 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 1094 sub storefile {	Line 1144 sub storefile {
}	}

sub createnewhtml {	sub createnewhtml {
my $filecontents=(<<SIMPLECONTENT);	my $title=&mt('Title of document goes here');
	my $body=&mt('Body of document goes here');
	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 of Document Goes Here
</title>
</head>	</head>
<body bgcolor="#FFFFFF">	<body bgcolor="#FFFFFF">
	$body
Body of Document Goes Here

</body>	</body>
</html>	</html>
SIMPLECONTENT	SIMPLECONTENT
return $filecontents;	return $filecontents;
}	}

sub createnewsty {	sub createnewsty {
Line 1129 sub inserteditinfo {	Line 1178 sub inserteditinfo {
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');	$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
# my $editheader='<a href="#editsection">Edit below</a><hr />';	# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $xml_help = '';	my $xml_help = '';
	my $initialize='';
if ($filetype eq 'html') {	if ($filetype eq 'html') {
$xml_help=Apache::loncommon::helpLatexCheatsheet();	my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
	$initialize=&Apache::lonhtmlcommon::htmlareaheaders().
	&Apache::lonhtmlcommon::spellheader();
	if (!&Apache::lonhtmlcommon::htmlareablocked() &&
	&Apache::lonhtmlcommon::htmlareabrowser()) {
	$initialize.=(<<FULLPAGE);
	<script type="text/javascript">
	$addbuttons

	HTMLArea.loadPlugin("FullPage");

	function initDocument() {
	var editor=new HTMLArea("filecont",config);
	editor.registerPlugin(FullPage);
	editor.generate();
	}
	</script>
	FULLPAGE
	} else {
	$initialize.=(<<FULLPAGE);
	<script type="text/javascript">
	$addbuttons
	function initDocument() {
	}
	</script>
	FULLPAGE
	}
	$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
	$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 1146 $cleanbut	Line 1221 $cleanbut
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />	<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />	<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
BUTTONS	BUTTONS
	$buttons.=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
	$buttons.=&Apache::lonhtmlcommon::htmlareaselectactive('filecont');
my $editfooter=(<<ENDFOOTER);	my $editfooter=(<<ENDFOOTER);
	$initialize
<hr />	<hr />
<a name="editsection" />	<a name="editsection" />
<form method="post">	<form method="post" name="xmledit">
$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="40" name="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>
$titledisplay	$titledisplay
	</body>
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 1165 ENDFOOTER	Line 1244 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 1196 sub handler {	Line 1275 sub handler {

my $target=&get_target();	my $target=&get_target();

$Apache::lonxml::debug=$ENV{'user.debug'};	$Apache::lonxml::debug=$env{'user.debug'};

if ($ENV{'browser.mathml'}) {	&Apache::loncommon::content_type($request,'text/html');
&Apache::loncommon::content_type($request,'text/xml');
} else {
&Apache::loncommon::content_type($request,'text/html');
}
&Apache::loncommon::no_cache($request);	&Apache::loncommon::no_cache($request);
	if ($env{'request.state'} eq 'published') {
	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
	'lastrevisiondate'));
	}
$request->send_http_header;	$request->send_http_header;

return OK if $request->header_only;	return OK if $request->header_only;
Line 1219 sub handler {	Line 1298 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 1245 $bodytag	Line 1324 $bodytag
</body>	</body>
</html>	</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 ($ENV{'form.attemptclean'}) {	if ($filecontents=~/BEGIN LON-CAPA Internal/) {
$filecontents=&htmlclean($filecontents,1);	&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.'));
}	}
#	#
# 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'},['editmode']);	($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,	$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
'',%mystyle);	'',%mystyle);
	undef($Apache::lonhomework::parsing_a_task);
}	}
}	}

#	#
# 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">'.	my $bodytag='<body bgcolor="#FFFFFF">';
	if ($env{'environment.remote'} eq 'off') {
	$bodytag=&Apache::loncommon::bodytag();
	}
	$result='<html>'.$bodytag.
&Apache::lonxml::message_location().'<h3>'.	&Apache::lonxml::message_location().'<h3>'.
$displayfile.	$displayfile.
'</h3></body></html>';	'</h3></body></html>';
Line 1295 ENDNOTFOUND	Line 1379 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 1312 sub debug {	Line 1396 sub debug {
my $request=$Apache::lonxml::request;	my $request=$Apache::lonxml::request;
if (!$request) { $request=Apache->request; }	if (!$request) { $request=Apache->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]);
	}
	}

	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'})) {
	return 1;
}	}
	return (($Apache::lonxml::debug eq 1) \|\|
	($env{'request.state'} eq 'construct') \|\|
	($Apache::lonhomework::browse eq 'F'
	&&
	$env{'form.show_errors'} eq 'on'));
}	}

sub error {	sub error {
$errorcount++;	$errorcount++;
my $request=$Apache::lonxml::request;	if ( &show_error_warn_msg() ) {
if (!$request) { $request=Apache->request; }	# If printing in construction space, put the error inside <pre></pre>
if (($Apache::lonxml::debug eq 1) \|\| ($ENV{'request.state'} eq 'construct') ) {	push(@Apache::lonxml::error_messages,
# If printing in construction space, put the error inside <pre></pre>	$Apache::lonxml::warnings_error_header.
push(@Apache::lonxml::error_messages,	"<b>ERROR:</b>".join("<br />\n",@_)."<br />\n");
$Apache::lonxml::warnings_error_header.	$Apache::lonxml::warnings_error_header='';
"<b>ERROR:</b>".join("<br />\n",@_)."<br />\n");	} else {
$Apache::lonxml::warnings_error_header='';	my $errormsg;
} else {	my ($symb)=&Apache::lonnet::symbread();
push(@Apache::lonxml::error_messages,	if ( !$symb ) {
"<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />");	#public or browsers
#notify author	$errormsg=&mt("An error occured while processing this resource. The author has been notified.");
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));	}
#notify course	#notify author
if ( $ENV{'request.course.id'} ) {	&Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_));
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);	#notify course
my $declutter=&Apache::lonnet::declutter($ENV{'request.filename'});	if ( $symb && $env{'request.course.id'} ) {
foreach (keys %users) {	my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
my ($user,$domain) = split(/:/, $_);	my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
&Apache::lonmsg::user_normal_msg($user,$domain,	my @userlist;
"Error [$declutter]",join('<br />',@_));	foreach (keys %users) {
}	my ($user,$domain) = split(/:/, $_);
	push(@userlist,"$user\@$domain");
	&Apache::lonmsg::user_normal_msg($user,$domain,
	"Error [$declutter]",join('<br />',@_));
	}
	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.");
	}
	}
	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
}	}
}
}	}

sub warning {	sub warning {
$warningcount++;	$warningcount++;

if ($ENV{'form.grade_target'} ne 'tex') {	if ($env{'form.grade_target'} ne 'tex') {
if ($ENV{'request.state'} eq 'construct' \|\| $Apache::lonxml::debug) {	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 1359 sub warning {	Line 1464 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 1424 sub get_param_var {	Line 1529 sub get_param_var {
} elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }	} elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'	my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
&Apache::lonxml::debug("first run is $value");	&Apache::lonxml::debug("first run is $value");
if ($value =~ /^[\$\@\%]\w+$/) {	if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) {
&Apache::lonxml::debug("doing second");	&Apache::lonxml::debug("doing second");
my @result=&Apache::run::run("return $value",$safeeval,1);	my @result=&Apache::run::run("return $value",$safeeval,1);
if (!defined($result[0])) {	if (!defined($result[0])) {
Line 1511 sub helpinfo {	Line 1616 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=$ENV{'form.grade_courseid'};	my ($tmp_courseid)=
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);	&Apache::loncommon::get_env_multiple('form.grade_courseid');
if ($allowed) {	my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid);
$symb=$ENV{'form.grade_symb'};	if (!$allowed &&
$courseid=$ENV{'form.grade_courseid'};	exists($env{'request.course.sec'}) &&
$domain=$ENV{'form.grade_domain'};	$env{'request.course.sec'} !~ /^\s*$/) {
$name=$ENV{'form.grade_username'};	$allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid.
}	'/'.$env{'request.course.sec'});
} else {
if (!$passedsymb) {
$symb=&Apache::lonnet::symbread();
} else {
$symb=$passedsymb;
}	}
$courseid=$ENV{'request.course.id'};	if ($allowed) {
$domain=$ENV{'user.domain'};	($symb)=&Apache::loncommon::get_env_multiple('form.grade_symb');
$name=$ENV{'user.name'};	$courseid=$tmp_courseid;
if ($name eq 'public' && $domain eq 'public') {	($domain)=&Apache::loncommon::get_env_multiple('form.grade_domain');
if (!defined($ENV{'form.username'})) {	($name)=&Apache::loncommon::get_env_multiple('form.grade_username');
$ENV{'form.username'}.=time.rand(10000000);	return ($symb,$courseid,$domain,$name,$publicuser);
}	}
$name.=$ENV{'form.username'};	}
	if (!$passedsymb) {
	$symb=&Apache::lonnet::symbread();
	} else {
	$symb=$passedsymb;
	}
	$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);
}	}
	$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.318
changed lines
	Added in v.1.377