loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.485, 2006/12/04 22:03:15	version 1.488, 2006/12/06 11:36:52
Line 2936 sub blockcheck {	Line 2936 sub blockcheck {
$tdom,$spec,$trest,$area);	$tdom,$spec,$trest,$area);
}	}
my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);	my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
$no_userblock = &Apache::lonnet::allowed('evb',undef,undef,	if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
$checkrole);	if ($1) {
last if $no_userblock;	$no_userblock = 1;
	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;
Line 6286 sub construct_course {	Line 6289 sub construct_course {
# if specified, key authority is not course, but user	# if specified, key authority is not course, but user
# only active if keyaccess is yes	# only active if keyaccess is yes
if ($args->{'keyauth'}) {	if ($args->{'keyauth'}) {
$args->{'keyauth'}=~s/[^\w\@]//g;	my ($user,$domain) = split(':',$args->{'keyauth'});
if ($args->{'keyauth'}) {	$user = &LONCAPA::clean_username($user);
$cenv{'keyauth'}=$args->{'keyauth'};	$domain = &LONCAPA::clean_username($domain);
	if ($user ne '' && $domain ne '') {
	$cenv{'keyauth'}=$user.':'.$domain;
}	}
}	}