rat/lonpage.pm - diff

Return to lonpage.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonpage.pm between versions 1.105 and 1.110

version 1.105, 2014/09/14 15:21:47	version 1.110, 2015/07/17 19:00:47
Line 216 sub handler {	Line 216 sub handler {
my $contents=0;	my $contents=0;
my $nforms=0;	my $nforms=0;
my $nuploads=0;	my $nuploads=0;
	my $ntimers=0;
my %turninpaths;	my %turninpaths;
my %multiresps;	my %multiresps;
my $turninparent;	my $turninparent;
Line 307 ENDEXT	Line 308 ENDEXT
#some additional cleanup necessary for LateX (due to limitations of table environment	#some additional cleanup necessary for LateX (due to limitations of table environment
$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;	$output =~ s/(\\vskip\s\d+mm)\s(\\\\)+/$1/g;
}	}
	my $matheditor;
	if ($output =~ /\Qjavascript:LC_mathedit_HWVAL_\E/) {
	$matheditor = 'dragmath';
	} elsif ($output =~ /LCmathField/) {
	$matheditor = 'lcmath';
	}
my $parser=HTML::TokeParser->new(\$output);	my $parser=HTML::TokeParser->new(\$output);
my $token;	my $token;
my $thisdir=$src;	my $thisdir=$src;
Line 363 ENDEXT	Line 370 ENDEXT
}	}
$output=~s/\<\/body\>.*//si;	$output=~s/\<\/body\>.*//si;
if ($output=~/\<form/si) {	if ($output=~/\<form/si) {
	my $hastimer;
$nforms++;	$nforms++;
$output=~s/\<form[^\>]*\>//gsi;	$output=~s/\<form[^\>]*\>//gsi;
$output=~s/\<\/form[^\>]*\>//gsi;	$output=~s/\<\/form[^\>]*\>//gsi;
if ($output=~/\<input[^\>]+name\s=\s[\'\"]*HWFILE/) {	if ($output=~/\<input[^\>]+name\s=\s[\'\"]*HWFILE/) {
$nuploads++;	$nuploads++;
}	}
	if ($output=~/\<input[^\>]+name\s=\s[\'\"]*accessbutton/) {
	$ntimers++;
	$hastimer = 1;
	}
$output=~	$output=~
s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)name\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi;
$output=~	$output=~
s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;	s/\<((?:input\|select\|button\|textarea)[^\>]+)id\s\=\s[\'\"]([^\'\"]+)[\'\"]([^\>]*)\>/\<$1 id="$idprefix$2" $3\>/gsi;
	if ($hastimer) {
	$output=~
	s/\<(input[^\>]+name=\Q"$prefix\Eaccessbutton"[^\>]+)(?:\Qdocument.markaccess.submit();\E)([^\>]*)\>/\<$1pageTimer(this.form,'$prefix')$2\>/gsi;
	$output=~ s/\<(input[^\>]+name=\Q"$prefix\Emarkaccess"[^\>]+value=["'])(?:yes)(['"][^\>]*)\>/\<$1$2\>/gsi;
	}
	if ($matheditor eq 'dragmath') {
	$output=~
	s/(\Qjavascript:LC_mathedit_\E)(HWVAL_)([^'"]+?)($['"]*)(\QHWVAL_\E\3['"]$\;void$0$\;)/$1$idprefix$2$3$4$idprefix$5/g;
	$output=~
	s/(function\s+LC_mathedit_)(HWVAL_)([^'"]+?)(\s+$LCtextline$)/$1$idprefix$2$3$4/g;
	} elsif ($matheditor eq 'lcmath') {
	$output=~
	s/(var\s+LCmathField\s+=\s+document\.getElementById$['"])([^'"]+?)(['"]$\;)/$1$idprefix$2$3/g;
	}
$output=~	$output=~
s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;	s/(\Q<div id="msg_\E)(\Qsubmit_\E)([^"]*)(\Q" style="display:none">\E)/<input type="hidden" name="$prefix$2$3_pressed" id="$idprefix$2$3_pressed" value="" \/>$1$idprefix$2$3$4/g;
$output=~	$output=~
Line 389 ENDEXT	Line 415 ENDEXT
}	}
$output=~	$output=~
s/\<((?:input\|select)[^\>]+\Qjavascript:setSubmittedPart\E)$\s[\'\"]([^\'\"]+)[\'\"]\s*$/\<$1('$2','$prefix')/gsi;	s/\<((?:input\|select)[^\>]+\Qjavascript:setSubmittedPart\E)$\s[\'\"]([^\'\"]+)[\'\"]\s*$/\<$1('$2','$prefix')/gsi;
	$output=~
	s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)$\'([^\']+)\'$(;\")/\<$1('$idprefix$2')$3/gsi;
}	}
$thisdir=~s/\/[^\/]*$//;	$thisdir=~s/\/[^\/]*$//;
foreach (@rlinks) {	foreach (@rlinks) {
Line 445 ENDEXT	Line 473 ENDEXT
);	);
$allscript .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);	$allscript .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
}	}
	if ($ntimers) {
	$allscript .= '<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	'function pageTimer(form,prefix) {'."\n".
	" form.elements[prefix+'markaccess'].value = 'yes';\n".
	" form.submit();\n".
	'}'."\n".
	'// ]]>'.
	"\n</script>\n";
	}
# ------------------------------------------------------------------ Start body	# ------------------------------------------------------------------ Start body
$r->print(&Apache::loncommon::start_page(undef,$allscript,	$r->print(&Apache::loncommon::start_page(undef,$allscript,
{'force_register' => 1,	{'force_register' => 1,
Line 573 ENDEXT	Line 611 ENDEXT
}	}
# ---------------------------------------------------------------- Submit, etc.	# ---------------------------------------------------------------- Submit, etc.
if ($nforms) {	if ($nforms) {
	my $class;
	if ($nforms > 1) {
	$class = ' class="LC_hwk_submit"';
	if ($ntimers) {
	$nforms = 1;
	$class = '';
	}
	}
$r->print(	$r->print(
'<input name="all_submit" value="'.&mt('Submit All').'" type="'.	'<input name="all_submit" value="'.&mt('Submit All').'" type="'.
(($nforms>1)?'submit':'hidden').'"></input></form>');	(($nforms>1)?'submit':'hidden').'"'.$class.' id="all_submit" />'.
	'<div id="msg_all_submit" style="display:none">'.
	&mt('Processing your submission ...').'</div></form>');
}	}
unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
$r->print(&Apache::loncommon::end_page({'discussion'	$r->print(&Apache::loncommon::end_page({'discussion'
Line 620 sub get_buttons {	Line 668 sub get_buttons {
my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},	my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
$resid,	$resid,
$hash->{'src_'.$rid});	$hash->{'src_'.$rid});
	unless ($env{'request.role.adv'}) {
	if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {
	return;
	}
	}
if ($hash->{'encrypted_'.$rid}) {	if ($hash->{'encrypted_'.$rid}) {
$symb=&Apache::lonenc::encrypted($symb);	$symb=&Apache::lonenc::encrypted($symb);
$esrc=&Apache::lonenc::encrypted($esrc);	$esrc=&Apache::lonenc::encrypted($esrc);

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

Removed from v.1.105
changed lines
	Added in v.1.110