Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.498 and 1.505

version 1.498, 2006/12/28 02:50:20	version 1.505, 2007/01/29 20:17:55
Line 1335 sub multiple_select_form {	Line 1335 sub multiple_select_form {
}	}
}	}
$output.="\n<select name='$name' size='$size' multiple='1'>";	$output.="\n<select name='$name' size='$size' multiple='1'>";
my @order = ref($order) ? @$order	my @order;
: sort(keys(%$hash));	if ($order) {
	@order = ref($order) ? @$order
	: sort(keys(%$hash));
	}
	if (exists($$hash{'select_form_order'})) {
	@order = @{$$hash{'select_form_order'}};
	}

foreach my $key (@order) {	foreach my $key (@order) {
$output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';	$output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
$output.='selected="selected" ' if ($selected{$key});	$output.='selected="selected" ' if ($selected{$key});
Line 2896 sub blockcheck {	Line 2903 sub blockcheck {
$uname = $env{'user.name'};	$uname = $env{'user.name'};
}	}

my ($startblock,$endblock);

# If uname and udom are for a course, check for blocks in the course.	# If uname and udom are for a course, check for blocks in the course.

if (&Apache::lonnet::is_course($udom,$uname)) {	if (&Apache::lonnet::is_course($udom,$uname)) {
my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);	my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);	my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
return ($startblock,$endblock);	return ($startblock,$endblock);
}	}

	my $startblock = 0;
	my $endblock = 0;
my %live_courses = &findallcourses(undef,$uname,$udom);	my %live_courses = &findallcourses(undef,$uname,$udom);

# If uname is for a user, and activity is course-specific, i.e.,	# If uname is for a user, and activity is course-specific, i.e.,
Line 2966 sub blockcheck {	Line 2973 sub blockcheck {
if ($sec ne 'none') {	if ($sec ne 'none') {
$checkrole .= '/'.$sec;	$checkrole .= '/'.$sec;
}	}
# Resource belongs to user other than current user.
# Assemble privs for that user, and check for 'evb' priv.
if ($otheruser) {	if ($otheruser) {
# Resource belongs to user other than current user.	# Resource belongs to user other than current user.
# Assemble privs for that user, and check for 'evb' priv.	# Assemble privs for that user, and check for 'evb' priv.
Line 3017 sub blockcheck {	Line 3022 sub blockcheck {

# Retrieve blocking times and identity of blocker for course	# Retrieve blocking times and identity of blocker for course
# of specified user, unless user has 'evb' privilege.	# of specified user, unless user has 'evb' privilege.

($startblock,$endblock)=&get_blocks($setters,$activity,$cdom,$cnum);	my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
	if (($start != 0) &&
	(($startblock == 0) \|\| ($startblock > $start))) {
	$startblock = $start;
	}
	if (($end != 0) &&
	(($endblock == 0) \|\| ($endblock < $end))) {
	$endblock = $end;
	}
}	}
return ($startblock,$endblock);	return ($startblock,$endblock);
}	}
Line 3344 sub bodytag {	Line 3357 sub bodytag {
my ($role,$realm) = split(/\./,$env{'request.role'},2);	my ($role,$realm) = split(/\./,$env{'request.role'},2);
if ($role eq 'ca') {	if ($role eq 'ca') {
my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});	my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
$realm = &plainname($rname,$rdom).':'.$rdom;	$realm = &plainname($rname,$rdom);
}	}
# realm	# realm
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
Line 4939 sub get_course_users {	Line 4952 sub get_course_users {
$usec = 'none';	$usec = 'none';
}	}
if ($uname ne '' && $udom ne '') {	if ($uname ne '' && $udom ne '') {
if ($end < $now) {	if ($end > 0 && $end < $now) {
$status = 'previous';	$status = 'previous';
} elsif ($start > $now) {	} elsif ($start > $now) {
$status = 'future';	$status = 'future';
Line 5381 sub record_sep {	Line 5394 sub record_sep {
} else {	} else {
my @allfields;	my @allfields;
if ($env{'form.upfiletype'} eq 'semisv') {	if ($env{'form.upfiletype'} eq 'semisv') {
@allfields=split(/;/,$record);	@allfields=split(/;/,$record,-1);
} else {	} else {
@allfields=split(/\,/,$record);	@allfields=split(/\,/,$record,-1);
}	}
my $i=0;	my $i=0;
my $j;	my $j;
Line 6129 sub store_settings {	Line 6142 sub store_settings {
}	}

sub restore_course_settings {	sub restore_course_settings {
return &return_settings($env{'request.course.id'},@_);	return &restore_settings($env{'request.course.id'},@_);
}	}

sub restore_settings {	sub restore_settings {
Line 6551 sub group_term {	Line 6564 sub group_term {

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;
my $curfext = (split(/\./,$file))[-1];	my $curfext = lc((split(/\./,$file))[-1]);
my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';	my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
my $embstyle = &Apache::loncommon::fileembstyle($curfext);	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
if (!(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn')) {	if (!(!defined($embstyle) \|\| $embstyle eq 'unk' \|\| $embstyle eq 'hdn')) {

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.498
changed lines
	Added in v.1.505