loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.286 and 1.288

version 1.286, 2007/11/20 17:53:22	version 1.288, 2008/01/14 14:32:14
Line 292 sub check_slot_access {	Line 292 sub check_slot_access {
}	}
}	}

my @slots=	my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent");
(split(':',&Apache::lonnet::EXT("resource.0.availablestudent")),	my $available = &Apache::lonnet::EXT("resource.0.available");
split(':',&Apache::lonnet::EXT("resource.0.available")));	my @slots= (split(':',$availablestudent),split(':',$available));

# if (!@slots) {	# if (!@slots) {
# return ($status,$datemsg);	# return ($status,$datemsg);
Line 421 sub check_access {	Line 421 sub check_access {
&Apache::lonxml::debug("symb:".$symb);	&Apache::lonxml::debug("symb:".$symb);
#if ($env{'request.state'} ne "construct" && $symb ne '') {	#if ($env{'request.state'} ne "construct" && $symb ne '') {
if ($env{'request.state'} ne "construct") {	if ($env{'request.state'} ne "construct") {
my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));	my $idacc = &Apache::lonnet::EXT("resource.$id.acc");
	my $allowed=&check_ip_acc($idacc);
if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
$status='INVALID_ACCESS';	$status='INVALID_ACCESS';
$date=&mt("can not be accessed from your location.");	$date=&mt("can not be accessed from your location.");
Line 1082 sub get_template_list {	Line 1083 sub get_template_list {
'/templates/*.'.$glob_extension);	'/templates/*.'.$glob_extension);
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);	@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);
@files = sort {$a->[1] cmp $b->[1]} (@files);	@files = sort {$a->[1] cmp $b->[1]} (@files);
	my ($midpoint,$seconddiv,$numfiles);
	$numfiles = 0;
	foreach my $file (@files) {
	next if ($file->[1] !~ /\S/);
	$numfiles ++;
	}
	if ($numfiles > 0) {
	$result = '<div class="LC_left_float">';
	$midpoint = int($numfiles/2);
	if ($numfiles%2) {
	$midpoint ++;
	}
	}
	my $count = 0;
foreach my $file (@files) {	foreach my $file (@files) {
next if ($file->[1] !~ /\S/);	next if ($file->[1] !~ /\S/);
$result .=	$result .=
'<label><input type="radio" name="template" value="'.$file->[0].'" />'.	'<label><input type="radio" name="template" value="'.$file->[0].'" />'.
$file->[1].'</label><br />';	$file->[1].'</label><br />'."\n";
	$count ++;
	if ((!$seconddiv) && ($count >= $midpoint)) {
	$result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
	$seconddiv = 1;
	}
	}
	if ($numfiles > 0) {
	$result .= '</div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n";
}	}
return $result;	return $result;
}	}

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

Removed from v.1.286
changed lines
	Added in v.1.288