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.156 and 1.160

version 1.156, 2002/03/08 18:32:55	version 1.160, 2002/03/21 22:10:31
Line 64 qw(@pwd @outputstack $redirection $impor	Line 64 qw(@pwd @outputstack $redirection $impor
use strict;	use strict;
use HTML::TokeParser;	use HTML::TokeParser;
use HTML::TreeBuilder;	use HTML::TreeBuilder;
	use HTML::Entities;
use Safe;	use Safe;
use Safe::Hole;	use Safe::Hole;
use Math::Cephes qw(:trigs :hypers :bessels erf erfc);	use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
Line 318 sub registerurl {	Line 319 sub registerurl {
my $forcereg=shift;	my $forcereg=shift;
my $target = shift;	my $target = shift;
my $result = '';	my $result = '';
if ($ENV{'request.publicaccess'}) {	if (($ENV{'request.publicaccess'}) \|\|
	($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html')) {
return	return
'<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';	'<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
}	}
if ($Apache::lonxml::registered && !$forcereg) { return ''; }	if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$Apache::lonxml::registered=1;	$Apache::lonxml::registered=1;
	my $nothing='';
	if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) \|\| ($forcereg)) {	if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) \|\| ($forcereg)) {
my $hwkadd='';	my $hwkadd='';
if ($ENV{'REQUEST_URI'}=~/\.(problem\|exam\|quiz\|assess\|survey\|form)$/) {	if ($ENV{'REQUEST_URI'}=~/\.(problem\|exam\|quiz\|assess\|survey\|form)$/) {
Line 355 ENDPARM	Line 359 ENDPARM
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal

function LONCAPAreg() {	function LONCAPAreg() {
menu=window.open("","LONCAPAmenu");	menu=window.open("$nothing","LONCAPAmenu","",false);
menu.clearTimeout(menu.menucltim);	menu.clearTimeout(menu.menucltim);
menu.currentURL=window.location.pathname;	menu.currentURL=window.location.pathname;
menu.currentStale=0;	menu.currentStale=0;
Line 382 ENDPARM	Line 386 ENDPARM
}	}

function LONCAPAstale() {	function LONCAPAstale() {
menu=window.open("","LONCAPAmenu");	menu=window.open("$nothing","LONCAPAmenu","",false);
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)');
Line 407 ENDREGTHIS	Line 411 ENDREGTHIS
// BEGIN LON-CAPA Internal	// BEGIN LON-CAPA Internal

function LONCAPAreg() {	function LONCAPAreg() {
menu=window.open("","LONCAPAmenu");	menu=window.open("$nothing","LONCAPAmenu","",false);
menu.currentStale=1;	menu.currentStale=1;
menu.clearbut(2,1);	menu.clearbut(2,1);
menu.clearbut(2,3);	menu.clearbut(2,3);
Line 1087 SIMPLECONTENT	Line 1091 SIMPLECONTENT

sub inserteditinfo {	sub inserteditinfo {
my ($result,$filecontents)=@_;	my ($result,$filecontents)=@_;
$filecontents =~ s:</textarea>:</textarea>:ig;	$filecontents = &HTML::Entities::encode($filecontents);
# my $editheader='<a href="#editsection">Edit below</a><hr />';	# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $editfooter=(<<ENDFOOTER);	my $editfooter=(<<ENDFOOTER);
<hr />	<hr />
Line 1250 sub get_param {	Line 1254 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]; }
	if ( ! $args ) { return undef; }
if ( $args =~ /my \$$param=\"/ ) {	if ( $args =~ /my \$$param=\"/ ) {
return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'	return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
} else {	} else {

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

Removed from v.1.156
changed lines
	Added in v.1.160