loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.482, 2006/12/01 20:17:47	version 1.486, 2006/12/05 01:51:48
Line 2855 sub findallcourses {	Line 2855 sub findallcourses {
}	}
} else {	} else {
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} \|\|	if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} \|\|
$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$}) {	$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) {
my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);	my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
next if ($role eq 'ca' \|\| $role eq 'aa');	next if ($role eq 'ca' \|\| $role eq 'aa');
next if (%roles && !exists($roles{$role}));	next if (%roles && !exists($roles{$role}));
Line 2942 sub blockcheck {	Line 2942 sub blockcheck {
last;	last;
}	}
}	}
} else {	} else {
if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {	if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
$no_ownblock = 1;	$no_ownblock = 1;
last;	last;
Line 5225 sub record_sep {	Line 5225 sub record_sep {
}	}
} else {	} else {
my @allfields;	my @allfields;
&Apache::lonnet::logthis("file type is ".$env{'form.upfiletype'});
if ($env{'form.upfiletype'} eq 'semisv') {	if ($env{'form.upfiletype'} eq 'semisv') {
@allfields=split(/;/,$record);	@allfields=split(/;/,$record);
} else {	} else {