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.109 and 1.142

version 1.109, 2001/08/10 15:49:46	version 1.142, 2001/12/21 22:44:06
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# XML Parser Module	# XML Parser Module
#	#
	# $Id$
	#
	# Copyright Michigan State University Board of Trustees
	#
	# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
	#
	# LON-CAPA is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 2 of the License, or
	# (at your option) any later version.
	#
	# LON-CAPA is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with LON-CAPA; if not, write to the Free Software
	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	#
	# /home/httpd/html/adm/gpl.txt
	#
	# http://www.lon-capa.org/
	#
	# Copyright for TtHfunc and TtMfunc by Ian Hutchinson.
	# TtHfunc and TtMfunc (the "Code") may be compiled and linked into
	# binary executable programs or libraries distributed by the
	# Michigan State University (the "Licensee"), but any binaries so
	# distributed are hereby licensed only for use in the context
	# of a program or computational system for which the Licensee is the
	# primary author or distributor, and which performs substantial
	# additional tasks beyond the translation of (La)TeX into HTML.
	# The C source of the Code may not be distributed by the Licensee
	# to any other parties under any circumstances.
	#
# last modified 06/26/00 by Alexander Sakharuk	# last modified 06/26/00 by Alexander Sakharuk
# 11/6 Gerd Kortemeyer	# 11/6 Gerd Kortemeyer
# 6/1/1 Gerd Kortemeyer	# 6/1/1 Gerd Kortemeyer
Line 13	Line 48
# 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 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 28 use Math::Random qw(:all);	Line 66 use Math::Random qw(:all);
use Opcode;	use Opcode;

sub register {	sub register {
my $space;	my ($space,@taglist) = @_;
my @taglist;	foreach my $temptag (@taglist) {
my $temptag;	push(@{ $Apache::lonxml::alltags{$temptag} },$space);
($space,@taglist) = @_;
foreach $temptag (@taglist) {
$Apache::lonxml::alltags{$temptag}=$space;
}	}
}	}

	sub deregister {
	my ($space,@taglist) = @_;
	foreach my $temptag (@taglist) {
	my $tempspace = $Apache::lonxml::alltags{$temptag}[-1];
	if ($tempspace eq $space) {
	pop(@{ $Apache::lonxml::alltags{$temptag} });
	}
	}
	#&printalltags();
	}

use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lontexconvert;	use Apache::lontexconvert;
use Apache::style;	use Apache::style;
Line 46 use Apache::scripttag;	Line 92 use Apache::scripttag;
use Apache::edit;	use Apache::edit;
use Apache::lonnet;	use Apache::lonnet;
use Apache::File;	use Apache::File;
	use Apache::loncommon;

#================================================== Main subroutine: xmlparse	#================================================== Main subroutine: xmlparse
#debugging control, to turn on debugging modify the correct handler	#debugging control, to turn on debugging modify the correct handler
Line 113 sub xmlend {	Line 160 sub xmlend {
'<address><hr /><h2>Course Discussion of Resource</h2>';	'<address><hr /><h2>Course Discussion of Resource</h2>';
my $idx;	my $idx;
for ($idx=1;$idx<=$contrib{'version'};$idx++) {	for ($idx=1;$idx<=$contrib{'version'};$idx++) {
my $message=$contrib{$idx.':message'};	my $hidden=($contrib{'hidden'}=~/\.$idx\./);
$message=~s/\n/\<br \/\>/g;	unless (($hidden) && (!$seeid)) {
	my $message=$contrib{$idx.':message'};
	$message=~s/\n/\<br \/\>/g;
	if ($message) {
	if ($hidden) {
	$message='<font color="#888888">'.$message.'</font>';
	}
my $sender='Anonymous';	my $sender='Anonymous';
if ((!$contrib{$idx.':anonymous'}) \|\| ($seeid)) {	if ((!$contrib{$idx.':anonymous'}) \|\| ($seeid)) {
$sender=$contrib{$idx.':sendername'}.' at '.	$sender=$contrib{$idx.':sendername'}.' at '.
$contrib{$idx.':senderdomain'};	$contrib{$idx.':senderdomain'};
if ($contrib{$idx.':anonymous'}) {	if ($contrib{$idx.':anonymous'}) {
$sender.=' (anonymous)';	$sender.=' (anonymous)';
	}
	if ($seeid) {
	if ($hidden) {
	$sender.=' <a href="/adm/feedback?unhide='.
	$symb.':::'.$idx.'">Make Visible</a>';
	} else {
	$sender.=' <a href="/adm/feedback?hide='.
	$symb.':::'.$idx.'">Hide</a>';
	}
}	}
}	}
$discussion.='<p><b>'.$sender.'</b> ('.	$discussion.='<p><b>'.$sender.'</b> ('.
localtime($contrib{$idx.':timestamp'}).	localtime($contrib{$idx.':timestamp'}).
'):<blockquote>'.$message.	'):<blockquote>'.$message.
'</blockquote></p>';	'</blockquote></p>';
	}
	}
}	}
$discussion.='</address>';	$discussion.='</address>';
}	}
Line 135 sub xmlend {	Line 199 sub xmlend {
return $discussion.'</html>';	return $discussion.'</html>';
}	}

	sub tokeninputfield {
	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) {
	$symb=&Apache::lonnet::symbread();
	}
	unless ($tuname) {
	$tuname=$ENV{'user.name'};
	$tudom=$ENV{'user.domain'};
	$tcrsid=$ENV{'request.course.id'};
	}

	return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
	}

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

	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
	unless ($tsymb) {
	$tsymb=$symb;
	}
	unless ($tuname) {
	$tuname=$name;
	$tudom=$domain;
	$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') {
	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 {
	return $token;
	}
	}

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'})) {
Line 146 sub fontsettings() {	Line 308 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 209 ENDPARM	Line 375 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 267 sub unloadevents() {	Line 433 sub unloadevents() {
sub printalltags {	sub printalltags {
my $temp;	my $temp;
foreach $temp (sort keys %Apache::lonxml::alltags) {	foreach $temp (sort keys %Apache::lonxml::alltags) {
&Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");	&Apache::lonxml::debug("$temp -- ".
	join(',',@{ $Apache::lonxml::alltags{$temp} }));
}	}
}	}

Line 294 sub xmlparse {	Line 461 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 303 sub htmlclean {	Line 472 sub htmlclean {

my $tree = HTML::TreeBuilder->new;	my $tree = HTML::TreeBuilder->new;
$tree->ignore_unknown(0);	$tree->ignore_unknown(0);

$tree->parse($raw);	$tree->parse($raw);

my $output= $tree->as_HTML(undef,' ');	my $output= $tree->as_HTML(undef,' ');

$output=~s/\<(br\|hr\|img)([^\>\/]*)\>/\<$1$2 \/\>/gis;	$output=~s/\<(br\|hr\|img\|meta\|allow)([^\>\/]*)\>/\<$1$2 \/\>/gis;
$output=~s/\<\/(br\|hr\|img)\>//gis;	$output=~s/\<\/(br\|hr\|img\|meta\|allow)\>//gis;
unless ($full) {	unless ($full) {
$output=~s/\<[\/]*(body\|head\|html)\>//gis;	$output=~s/\<[\/]*(body\|head\|html)\>//gis;
}	}
Line 321 sub htmlclean {	Line 490 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 336 sub inner_xmlparse {	Line 504 sub inner_xmlparse {
$result=$token->[2];	$result=$token->[2];
}	}
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
# add tag to stack	# add tag to stack
push (@$stack,$token->[1]);	push (@$stack,$token->[1]);
# add parameters list to another stack	# add parameters list to another stack
push (@$parstack,&parstring($token));	push (@$parstack,&parstring($token));
&increasedepth($token);	&increasedepth($token);
if (exists $$style_for_target{$token->[1]}) {	if (exists $$style_for_target{$token->[1]}) {
if ($Apache::lonxml::redirection) {	if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=	$Apache::lonxml::outputstack['-1'] .=
&recurse($$style_for_target{$token->[1]},$target,$safeeval,	&recurse($$style_for_target{$token->[1]},$target,$safeeval,
$style_for_target,@$parstack);	$style_for_target,@$parstack);
} else {	} else {
Line 353 sub inner_xmlparse {	Line 521 sub inner_xmlparse {
} else {	} else {
$result = &callsub("start_$token->[1]", $target, $token, $stack,	$result = &callsub("start_$token->[1]", $target, $token, $stack,
$parstack, $pars, $safeeval, $style_for_target);	$parstack, $pars, $safeeval, $style_for_target);
}	}
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
#clear out any tags that didn't end	#clear out any tags that didn't end
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
&Apache::lonxml::warning("Unbalanced tags in resource $$stack['-1']");	&Apache::lonxml::warning('Missing tag </'.$$stack['-1'].'> in file');
&end_tag($stack,$parstack,$token);	&end_tag($stack,$parstack,$token);
}	}

if (exists $$style_for_target{'/'."$token->[1]"}) {	if (exists($$style_for_target{'/'."$token->[1]"})) {
if ($Apache::lonxml::redirection) {	if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=	$Apache::lonxml::outputstack['-1'] .=
&recurse($$style_for_target{'/'."$token->[1]"},	&recurse($$style_for_target{'/'."$token->[1]"},
Line 371 sub inner_xmlparse {	Line 539 sub inner_xmlparse {
$target,$safeeval,$style_for_target,	$target,$safeeval,$style_for_target,
@$parstack);	@$parstack);
}	}

} else {	} else {
$result = &callsub("end_$token->[1]", $target, $token, $stack,	$result = &callsub("end_$token->[1]", $target, $token, $stack,
$parstack, $pars,$safeeval, $style_for_target);	$parstack, $pars,$safeeval, $style_for_target);
Line 422 sub recurse {	Line 589 sub recurse {
my $partstring = '';	my $partstring = '';
my $output='';	my $output='';
my $decls='';	my $decls='';
	&Apache::lonxml::debug("Recursing");
while ( $#pat > -1 ) {	while ( $#pat > -1 ) {
while ($tokenpat = $pat[$#pat]->get_token) {	while ($tokenpat = $pat[$#pat]->get_token) {
if (($tokenpat->[0] eq 'T') \|\| ($tokenpat->[0] eq 'C') \|\| ($tokenpat->[0] eq 'D') ) {	if (($tokenpat->[0] eq 'T') \|\| ($tokenpat->[0] eq 'C') \|\| ($tokenpat->[0] eq 'D') ) {
Line 439 sub recurse {	Line 607 sub recurse {
#clear out any tags that didn't end	#clear out any tags that didn't end
while ($tokenpat->[1] ne $innerstack[$#innerstack]	while ($tokenpat->[1] ne $innerstack[$#innerstack]
&& ($#innerstack > -1)) {	&& ($#innerstack > -1)) {
&Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");	&Apache::lonxml::warning('Missing tag </'.$innerstack['-1'].'> in style');
&end_tag(\@innerstack,\@innerparstack,$tokenpat);	&end_tag(\@innerstack,\@innerparstack,$tokenpat);
}	}
$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
Line 473 sub recurse {	Line 641 sub recurse {
pop @pat;	pop @pat;
pop @Apache::lonxml::pwd;	pop @Apache::lonxml::pwd;
}	}
	&Apache::lonxml::debug("Exiting Recursing");
return $output;	return $output;
}	}

Line 484 sub callsub {	Line 653 sub callsub {
my $sub1;	my $sub1;
no strict 'refs';	no strict 'refs';
my $tag=$token->[1];	my $tag=$token->[1];
my $space=$Apache::lonxml::alltags{$tag};	my $space=$Apache::lonxml::alltags{$tag}[-1];
if (!$space) {	if (!$space) {
$tag=~tr/A-Z/a-z/;	$tag=~tr/A-Z/a-z/;
$sub=~tr/A-Z/a-z/;	$sub=~tr/A-Z/a-z/;
$space=$Apache::lonxml::alltags{$tag}	$space=$Apache::lonxml::alltags{$tag}[-1]
}	}

my $deleted=0;	my $deleted=0;
Line 543 sub setup_globals {	Line 712 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 624 sub init_safespace {	Line 799 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 675 sub decreasedepth {	Line 853 sub decreasedepth {
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1;	$Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
}	}
if ( $Apache::lonxml::depth < -1) {	if ( $Apache::lonxml::depth < -1) {
&Apache::lonxml::warning("Unbalanced tags in resource");	&Apache::lonxml::warning("Missing tags, unable to properly run file.");
$Apache::lonxml::depth='-1';	$Apache::lonxml::depth='-1';
}	}
my $curdepth=join('_',@Apache::lonxml::depthcounter);	my $curdepth=join('_',@Apache::lonxml::depthcounter);
Line 747 sub newparser {	Line 925 sub newparser {
sub parstring {	sub parstring {
my ($token) = @_;	my ($token) = @_;
my $temp='';	my $temp='';
map {	foreach (@{$token->[3]}) {
unless ($_=~/\W/) {	unless ($_=~/\W/) {
my $val=$token->[2]->{$_};	my $val=$token->[2]->{$_};
$val =~ s/([\%\@\\])/\\$1/g;	$val =~ s/([\%\@\\])/\\$1/g;
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }	#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
$temp .= "my \$$_=\"$val\";"	$temp .= "my \$$_=\"$val\";"
}	}
} @{$token->[3]};	}
return $temp;	return $temp;
}	}

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}) {
	$thisurl=$ENV{'httpref.'.$thisurl};
	}
my $thisdir=$thisurl;	my $thisdir=$thisurl;
$thisdir=~s/\/[^\/]+$//;	$thisdir=~s/\/[^\/]+$//;
my %httpref=();	my %httpref=();
map {	foreach (@extlinks) {
$httpref{'httpref.'.	$httpref{'httpref.'.
&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl; } @extlinks;	&Apache::lonnet::hreflocation($thisdir,$_)}=$thisurl;
	}
	@extlinks=();
&Apache::lonnet::appenv(%httpref);	&Apache::lonnet::appenv(%httpref);
}	}

Line 774 sub writeallows {	Line 958 sub writeallows {
#	#
sub afterburn {	sub afterburn {
my $result=shift;	my $result=shift;
map {	foreach (split(/&/,$ENV{'QUERY_STRING'})) {
my ($name, $value) = split(/=/,$_);	my ($name, $value) = split(/=/,$_);
$value =~ tr/+/ /;	$value =~ tr/+/ /;
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;	$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
Line 783 sub afterburn {	Line 967 sub afterburn {
$ENV{'form.'.$name}=$value;	$ENV{'form.'.$name}=$value;
}	}
}	}
} (split(/&/,$ENV{'QUERY_STRING'}));	}
if ($ENV{'form.highlight'}) {	if ($ENV{'form.highlight'}) {
map {	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/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;	$result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;
} split(/\,/,$ENV{'form.highlight'});	}
}	}
if ($ENV{'form.link'}) {	if ($ENV{'form.link'}) {
map {	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/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;	$result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
} split(/\,/,$ENV{'form.link'});	}
}	}
if ($ENV{'form.anchor'}) {	if ($ENV{'form.anchor'}) {
my $anchorname=$ENV{'form.anchor'};	my $anchorname=$ENV{'form.anchor'};
Line 869 sub handler {	Line 1053 sub handler {
} else {	} else {
$request->content_type('text/html');	$request->content_type('text/html');
}	}
	&Apache::loncommon::no_cache($request);
$request->send_http_header;	$request->send_http_header;

return OK if $request->header_only;	return OK if $request->header_only;


Line 914 ENDNOTFOUND	Line 1098 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 960 sub get_param {	Line 1145 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 973 sub register_insert {	Line 1176 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 1000 sub register_insert {	Line 1206 sub register_insert {

sub description {	sub description {
my ($token)=@_;	my ($token)=@_;
return $insertlist{$insertlist{"$token->[1].num"}.'.description'};	my $tagnum;
	my $tag=$token->[1];
	foreach my $namespace (reverse @Apache::lonxml::namespace) {
	my $testtag=$namespace.'::'.$tag;
	$tagnum=$insertlist{"$testtag.num"};
	if (defined($tagnum)) { last; }
	}
	if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
	return $insertlist{$tagnum.'.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.109
changed lines
	Added in v.1.142