Return to lonpage.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonpage.pm between versions 1.118 and 1.119

version 1.118, 2016/08/09 23:43:51	version 1.119, 2016/10/29 05:29:39
Line 184 sub handler {	Line 184 sub handler {
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {	if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
my $fn=$env{'request.course.fn'};	my $fn=$env{'request.course.fn'};
if (-e "$fn.db") {	if (-e "$fn.db") {
	my %buttonshide;
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {	if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
# ------------------------------------------------------------------- Hash tied	# ------------------------------------------------------------------- Hash tied
my $firstres=$hash{'map_start_'.$requrl};	my $firstres=$hash{'map_start_'.$requrl};
Line 305 sub handler {	Line 306 sub handler {
if ($hash{'encrypted_'.$_}) {	if ($hash{'encrypted_'.$_}) {
$src=&Apache::lonenc::encrypted($src);	$src=&Apache::lonenc::encrypted($src);
}	}
	my ($mapid,$resid)=split(/\./,$_);
	my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);
	unless ($env{'request.role.adv'}) {
	$buttonshide{$symb} = &Apache::lonnet::EXT("resource.0.buttonshide",$symb);
	}
$cellemb{$_}=	$cellemb{$_}=
&Apache::loncommon::fileembstyle($extension);	&Apache::loncommon::fileembstyle($extension);
if ($cellexternal{$_}) {	if ($cellexternal{$_}) {
Line 315 ENDEXT	Line 321 ENDEXT
}	}
} elsif ($cellemb{$_} eq 'ssi') {	} elsif ($cellemb{$_} eq 'ssi') {
# --------------------------------------------------------- This is an SSI cell	# --------------------------------------------------------- This is an SSI cell
my ($mapid,$resid)=split(/\./,$_);
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src);

my $prefix=$_.'_';	my $prefix=$_.'_';
my $idprefix= join('_',($mapid,$resid,''));	my $idprefix= join('_',($mapid,$resid,''));
my %posthash=('request.prefix' => $prefix,	my %posthash=('request.prefix' => $prefix,
Line 676 ENDEXT	Line 679 ENDEXT
&add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);	&add_countdown_timer($currdisp,$donebuttontime,$donebuttonextras);
}	}
}	}
	my $pagebuttonshide;
	if (keys(%buttonshide)) {
	my %uniquebuttonhide;
	foreach my $item (values(%buttonshide)) {
	if (exists($uniquebuttonhide{$item})) {
	$uniquebuttonhide{$item} ++;
	} else {
	$uniquebuttonhide{$item} = 1;
	}
	}
	if (keys(%uniquebuttonhide) == 1) {
	if (lc((keys(%uniquebuttonhide))[0]) eq 'yes') {
	$pagebuttonshide = 'yes';
	}
	}
	}
# ------------------------------------------------------------------ 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,
'bgcolor' => '#ffffff',}));	'bgcolor' => '#ffffff',
	'hide_buttons' => $pagebuttonshide}));
# ------------------------------------------------------------------ Start form	# ------------------------------------------------------------------ Start form
if ($nforms) {	if ($nforms) {
my $fmtag = '<form name="lonhomework" method="post" enctype="multipart/form-data"';	my $fmtag = '<form name="lonhomework" method="post" enctype="multipart/form-data"';
Line 725 ENDEXT	Line 745 ENDEXT
my $avespan=$lcm/($#colcont+1);	my $avespan=$lcm/($#colcont+1);
for ($j=0;$j<=$#colcont;$j++) {	for ($j=0;$j<=$#colcont;$j++) {
my $rid=$colcont[$j];	my $rid=$colcont[$j];
my $metainfo =&get_buttons(\%hash,$rid).'<br />';	my $metainfo =&get_buttons(\%hash,$rid,\%buttonshide).'<br />';
unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {	unless (($target eq 'tex') \|\| ($target eq 'tex_answer')) {
$r->print('<td colspan="'.$avespan.'"');	$r->print('<td colspan="'.$avespan.'"');
}	}
Line 853 ENDEXT	Line 873 ENDEXT
}	}

sub get_buttons {	sub get_buttons {
my ($hash,$rid) = @_;	my ($hash,$rid,$buttonshide) = @_;

my $metainfo = '';	my $metainfo = '';
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});	my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
Line 862 sub get_buttons {	Line 882 sub get_buttons {
$resid,	$resid,
$hash->{'src_'.$rid});	$hash->{'src_'.$rid});
unless ($env{'request.role.adv'}) {	unless ($env{'request.role.adv'}) {
if (&Apache::lonnet::EXT('resource.0.buttonshide',$symb)) {	if ($buttonshide->{$symb} eq 'yes') {
return;	return;
}	}
}	}

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

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.118
changed lines
	Added in v.1.119