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

version 1.113, 2001/08/15 14:22:07	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 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 152 sub xmlend {	Line 155 sub xmlend {
return $discussion.'</html>';	return $discussion.'</html>';
}	}

sub checkout {	sub tokeninputfield {
my ($target,$symb,$tuname,$tudom,$tcrsid)=@_;	my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
	$defhost=~tr/a-z/A-Z/;
	return (<<ENDINPUTFIELD)
	<script>
	function updatetoken() {
	var comp=new Array;
	var barcode=unescape(document.tokeninput.barcode.value);
	comp=barcode.split('*');
	if (typeof(comp[0])!="undefined") {
	document.tokeninput.codeone.value=comp[0];
	}
	if (typeof(comp[1])!="undefined") {
	document.tokeninput.codetwo.value=comp[1];
	}
	if (typeof(comp[2])!="undefined") {
	comp[2]=comp[2].toUpperCase();
	document.tokeninput.codethree.value=comp[2];
	}
	document.tokeninput.barcode.value='';
	}
	</script>
	<form method="post" name="tokeninput">
	<table border="2" bgcolor="#FFFFBB">
	<tr><th>DocID Checkin</th></tr>
	<tr><td>
	<table>
	<tr>
	<td>Scan in Barcode</td>
	<td><input type="text" size="22" name="barcode"
	onChange="updatetoken()"/></td>
	</tr>
	<tr><td><i>or</i> Type in DocID</td>
	<td>
	<input type="text" size="5" name="codeone" />
	<b><font size="+2">*</font></b>
	<input type="text" size="5" name="codetwo" />
	<b><font size="+2">*</font></b>
	<input type="text" size="10" name="codethree" value="$defhost"
	onChange="this.value=this.value.toUpperCase()" />
	</td></tr>
	</table>
	</td></tr>
	<tr><td><input type="submit" value="Check in DocID" /></td></tr>
	</table>
	</form>
	ENDINPUTFIELD
	}

	sub maketoken {
	my ($symb,$tuname,$tudom,$tcrsid)=@_;
unless ($symb) {	unless ($symb) {
$symb=&Apache::lonnet::symbread();	$symb=&Apache::lonnet::symbread();
}	}
Line 162 sub checkout {	Line 214 sub checkout {
$tudom=$ENV{'user.domain'};	$tudom=$ENV{'user.domain'};
$tcrsid=$ENV{'request.course.id'};	$tcrsid=$ENV{'request.course.id'};
}	}
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
my $infostr=&Apache::lonnet::escape(	return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
$tuname.'&'.	}
$tudom.'&'.
$tcrsid.'&'.	sub printtokenheader {
$symb.'&'.	my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
time.'&'.$ENV{'REMOTE_ADDR'});	unless ($token) { return ''; }
my $token=Apache::lonnet::reply('tmpput:'.$infostr,$lonhost);
if ($token=~/^error\:/) { return ''; }	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
$token=~s/^(\d+)\_.\_(\d+)$/$1\$2\*$lonhost/;	unless ($tsymb) {
$token=~tr/a-z/A-Z/;	$tsymb=$symb;
if (&Apache::lonnet::log($tudom,$tuname,	}
&Apache::lonnet::homeserver($tuname,$tudom),	unless ($tuname) {
&Apache::lonnet::escape('Checkout '.$infostr.' - '.	$tuname=$name;
$token)) ne 'ok') {	$tudom=$domain;
return '';	$tcrsid=$courseid;
}	}

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

if ($target eq 'web') {	if ($target eq 'web') {
return '<img src="/cgi-bin/barcode.gif?encode='.$token.'" />';	return
	'<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
	'Checked out for '.$plainname.
	'<br />User: '.$tuname.' at '.$tudom.
	'<br />CourseID: '.$tcrsid.
	'<br />DocID: '.$token.
	'<br />Time: '.localtime().'<hr />';
} else {	} else {
return $token;	return $token;
}	}
}	}

Line 197 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 260 ENDPARM	Line 331 ENDPARM
menu=window.open("","LONCAPAmenu");	menu=window.open("","LONCAPAmenu");
menu.currentStale=1;	menu.currentStale=1;
menu.switchbutton	menu.switchbutton
(3,1,'reload.gif','return','location','go(currentURL)');	(3,1,'reload.gif','return','location','go(currentURL)');
menu.clearbut(7,1);	menu.clearbut(7,1);
menu.clearbut(7,2);	menu.clearbut(7,2);
menu.clearbut(7,3);	menu.clearbut(7,3);
Line 345 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 372 sub htmlclean {	Line 445 sub htmlclean {

sub inner_xmlparse {	sub inner_xmlparse {
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;	my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
&Apache::lonxml::debug('Reentrant parser starting, again?');
my $finaloutput = '';	my $finaloutput = '';
my $result;	my $result;
my $token;	my $token;
Line 594 sub setup_globals {	Line 666 sub setup_globals {
my ($target)=@_;	my ($target)=@_;
$Apache::lonxml::registered = 0;	$Apache::lonxml::registered = 0;
@Apache::lonxml::pwd=();	@Apache::lonxml::pwd=();
	@Apache::lonxml::extlinks=();
if ($target eq 'meta') {	if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;	$Apache::lonxml::redirection = 0;
$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 675 sub init_safespace {	Line 753 sub init_safespace {
#need to inspect this class of ops	#need to inspect this class of ops
# $safeeval->deny(":base_orig");	# $safeeval->deny(":base_orig");
$safeinit .= ';$external::target="'.$target.'";';	$safeinit .= ';$external::target="'.$target.'";';
$safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';	my $rndseed;
	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
	$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
	$safeinit .= ';$external::randomseed='.$rndseed.';';
&Apache::run::run($safeinit,$safeeval);	&Apache::run::run($safeinit,$safeeval);
}	}

Line 810 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 819 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 968 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 1014 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 1027 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 1056 sub description {	Line 1162 sub description {
my ($token)=@_;	my ($token)=@_;
return $insertlist{$insertlist{"$token->[1].num"}.'.description'};	return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
}	}

	# ----------------------------------------------------------------- whichuser
	# returns a list of $symb, $courseid, $domain, $name that is correct for
	# calls to lonnet functions for this setup.
	# - looks for form.grade_ parameters
	sub whichuser {
	my ($symb,$courseid,$domain,$name);
	if (defined($ENV{'form.grade_symb'})) {
	my $tmp_courseid=$ENV{'form.grade_courseid'};
	my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
	if ($allowed) {
	$symb=$ENV{'form.grade_symb'};
	$courseid=$ENV{'form.grade_courseid'};
	$domain=$ENV{'form.grade_domain'};
	$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);
	}

1;	1;
__END__	__END__

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

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