loncom/auth/lonroles.pm - diff

Return to lonroles.pm CVS log

Up to [LON-CAPA] / loncom / auth

version 1.197, 2008/07/04 19:26:35	version 1.199, 2008/07/05 23:27:34
Line 1073 sub adhoc_course_role {	Line 1073 sub adhoc_course_role {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if (&check_forcc($cdom,$cnum,$then)) {	if (&check_forcc($cdom,$cnum,$then)) {
my $setprivs;	my $setprivs;
if (!defined($env{'user.role.'.$env{'form.selectrole'}})) {	if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
$setprivs = 1;	$setprivs = 1;
} else {	} else {
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}});	my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
if (($start && ($start>$then \|\| $start == -1)) \|\|	if (($start && ($start>$then \|\| $start == -1)) \|\|
($end && $end<$then)) {	($end && $end<$then)) {
$setprivs = 1;	$setprivs = 1;
}	}
}	}
if ($setprivs) {	if ($setprivs) {
if ($env{'form.switchrole'} =~ m-^(in\|ta\|ep\|ad\|st\|cr)([\w/])\./\Q$cdom\E/\Q$cnum\E(/?\w)$-) {	if ($env{'form.switchrole'} =~ m-^(in\|ta\|ep\|ad\|st\|cr)([\w/])\./\Q$cdom\E/\Q$cnum\E/?(\w)$-) {
my $role = $1;	my $role = $1;
my $custom_role = $2;	my $custom_role = $2;
my $usec = $3;	my $usec = $3;
if ($role eq 'cr') {	if ($role eq 'cr') {
if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) {	if ($custom_role =~ m-^/$match_domain/$match_username/\w+$-) {
$role .= $custom_role;	$role .= $custom_role;
} else {	} else {
return;	return;