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.124 and 1.135

version 1.124, 2001/08/23 19:41:52	version 1.135, 2001/10/05 16:55:12
Line 13	Line 13
# 6/12,6/13 H. K. Ng	# 6/12,6/13 H. K. Ng
# 6/16 Gerd Kortemeyer	# 6/16 Gerd Kortemeyer
# 7/27 H. K. Ng	# 7/27 H. K. Ng
# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20 Gerd Kortemeyer	# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23,8/24 Gerd Kortemeyer
	# Guy Albertelli
	# 9/26 Gerd Kortemeyer


package Apache::lonxml;	package Apache::lonxml;
use vars	use vars
Line 216 sub maketoken {	Line 219 sub maketoken {
}	}

sub printtokenheader {	sub printtokenheader {
my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;	my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
unless ($token) { return ''; }	unless ($token) { return ''; }

unless ($symb) {	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
$symb=&Apache::lonnet::symbread();	unless ($tsymb) {
	$tsymb=$symb;
}	}
unless ($tuname) {	unless ($tuname) {
$tuname=$ENV{'user.name'};	$tuname=$name;
$tudom=$ENV{'user.domain'};	$tudom=$domain;
$tcrsid=$ENV{'request.course.id'};	$tcrsid=$courseid;
}	}

my %reply=&Apache::lonnet::get('environment',	my %reply=&Apache::lonnet::get('environment',
Line 260 sub fontsettings() {	Line 264 sub fontsettings() {

sub registerurl {	sub registerurl {
my $forcereg=shift;	my $forcereg=shift;
if ($Apache::lonxml::registered) { return ''; }	if ($ENV{'request.publicaccess'}) {
	return
	'<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
	}
	if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$Apache::lonxml::registered=1;	$Apache::lonxml::registered=1;
if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) \|\| ($forcereg)) {	if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) \|\| ($forcereg)) {
my $hwkadd='';	my $hwkadd='';
Line 322 ENDPARM	Line 330 ENDPARM
function LONCAPAstale() {	function LONCAPAstale() {
menu=window.open("","LONCAPAmenu");	menu=window.open("","LONCAPAmenu");
menu.currentStale=1;	menu.currentStale=1;
//menu.clearbut(7,1);	menu.switchbutton
//menu.clearbut(7,2);	(3,1,'reload.gif','return','location','go(currentURL)');
//menu.clearbut(7,3);	menu.clearbut(7,1);
	menu.clearbut(7,2);
	menu.clearbut(7,3);
menu.menucltim=menu.setTimeout(	menu.menucltim=menu.setTimeout(
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+	'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',	'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
Line 406 sub xmlparse {	Line 416 sub xmlparse {

my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,	my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
$safeeval,\%style_for_target);	$safeeval,\%style_for_target);
	if ($ENV{'request.uri'}) {
	&writeallows($ENV{'request.uri'});
	}
return $finaloutput;	return $finaloutput;
}	}

Line 660 sub setup_globals {	Line 672 sub setup_globals {
$Apache::lonxml::metamode = 1;	$Apache::lonxml::metamode = 1;
$Apache::lonxml::evaluate = 1;	$Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 0;	$Apache::lonxml::import = 0;
	} elsif ($target eq 'answer') {
	$Apache::lonxml::redirection = 0;
	$Apache::lonxml::metamode = 1;
	$Apache::lonxml::evaluate = 1;
	$Apache::lonxml::import = 1;
} elsif ($target eq 'grade') {	} elsif ($target eq 'grade') {
&startredirection;	&startredirection;
$Apache::lonxml::metamode = 0;	$Apache::lonxml::metamode = 0;
Line 874 sub parstring {	Line 891 sub parstring {
}	}

sub writeallows {	sub writeallows {
	unless ($#extlinks>=0) { return; }
my $thisurl='/res/'.&Apache::lonnet::declutter(shift);	my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
if ($ENV{'httpref.'.$thisurl}) {	if ($ENV{'httpref.'.$thisurl}) {
$thisurl=$ENV{'httpref.'.$thisurl};	$thisurl=$ENV{'httpref.'.$thisurl};
Line 883 sub writeallows {	Line 901 sub writeallows {
my %httpref=();	my %httpref=();
map {	map {
$httpref{'httpref.'.	$httpref{'httpref.'.
&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; } @extlinks;	&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
	} @extlinks;
	@extlinks=();
&Apache::lonnet::appenv(%httpref);	&Apache::lonnet::appenv(%httpref);
}	}

Line 1032 ENDNOTFOUND	Line 1052 ENDNOTFOUND
unless ($ENV{'request.state'} eq 'published') {	unless ($ENV{'request.state'} eq 'published') {
$result=&inserteditinfo($result,$filecontents);	$result=&inserteditinfo($result,$filecontents);
}	}

	writeallows($request->uri);

$request->print($result);	$request->print($result);

writeallows($request->uri);
return OK;	return OK;
}	}

Line 1078 sub get_param {	Line 1099 sub get_param {
if ( ! $context ) { $context = -1; }	if ( ! $context ) { $context = -1; }
my $args ='';	my $args ='';
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }	if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'	if ( $args =~ /my \$$param=\"/ ) {
	return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
	} else {
	return undef;
	}
	}

	sub get_param_var {
	my ($param,$parstack,$safeeval,$context) = @_;
	if ( ! $context ) { $context = -1; }
	my $args ='';
	if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
	if ( $args !~ /my \$$param=\"/ ) { return undef; }
	my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
	if ($value =~ /^[\$\@\%]/) {
	return &Apache::run::run("return $value",$safeeval,1);
	} else {
	return $value;
	}
}	}

sub register_insert {	sub register_insert {
Line 1091 sub register_insert {	Line 1130 sub register_insert {
if ( $line =~ /^\#/ \|\| $line =~ /^\s*\n/) { next; }	if ( $line =~ /^\#/ \|\| $line =~ /^\s*\n/) { next; }
if ( $line =~ /TABLE/ ) { last; }	if ( $line =~ /TABLE/ ) { last; }
my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);	my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
$insertlist{"$tagnum.tag"} = $tag;	if ($tag) {
$insertlist{"$tagnum.description"} = $descrip;	$insertlist{"$tagnum.tag"} = $tag;
$insertlist{"$tagnum.color"} = $color;	$insertlist{"$tagnum.description"} = $descrip;
$insertlist{"$tagnum.function"} = $function;	$insertlist{"$tagnum.color"} = $color;
$insertlist{"$tagnum.show"}= $show;	$insertlist{"$tagnum.function"} = $function;
$insertlist{"$tag.num"}=$tagnum;	if (!defined($show)) { $show='yes'; }
$tagnum++;	$insertlist{"$tagnum.show"}= $show;
	$insertlist{"$tag.num"}=$tagnum;
	$tagnum++;
	}
}	}
$i++; #skipping TABLE line	$i++; #skipping TABLE line
$tagnum = 0;	$tagnum = 0;
Line 1126 sub description {	Line 1168 sub description {
# calls to lonnet functions for this setup.	# calls to lonnet functions for this setup.
# - looks for form.grade_ parameters	# - looks for form.grade_ parameters
sub whichuser {	sub whichuser {
my $symb=&Apache::lonnet::symbread();	my ($symb,$courseid,$domain,$name);
my $courseid=$ENV{'request.course.id'};
my $domain=$ENV{'user.domain'};
my $name=$ENV{'user.name'};
if (defined($ENV{'form.grade_symb'})) {	if (defined($ENV{'form.grade_symb'})) {
my $tmp_courseid=$ENV{'form.grade_courseid'};	my $tmp_courseid=$ENV{'form.grade_courseid'};
my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);	my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
Line 1139 sub whichuser {	Line 1178 sub whichuser {
$domain=$ENV{'form.grade_domain'};	$domain=$ENV{'form.grade_domain'};
$name=$ENV{'form.grade_username'};	$name=$ENV{'form.grade_username'};
}	}
	} else {
	$symb=&Apache::lonnet::symbread();
	$courseid=$ENV{'request.course.id'};
	$domain=$ENV{'user.domain'};
	$name=$ENV{'user.name'};
}	}
return ($symb,$courseid,$domain,$name);	return ($symb,$courseid,$domain,$name);
}	}

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

Removed from v.1.124
changed lines
	Added in v.1.135