version 1.231.4.14, 2010/06/02 16:27:43
|
version 1.231.4.15, 2010/08/20 03:40:01
|
Line 225 sub handler {
|
Line 225 sub handler {
|
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
# Check if user is CC trying to select a course role |
# Check if user is CC trying to select a course role |
if ($env{'form.switchrole'}) { |
if ($env{'form.switchrole'}) { |
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) { |
my $switch_is_active; |
|
if (defined($env{'user.role.'.$env{'form.switchrole'}})) { |
|
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}}); |
|
if (!$end || $end > $now) { |
|
if (!$start || $start < $refresh) { |
|
$switch_is_active = 1; |
|
} |
|
} |
|
} |
|
unless ($switch_is_active) { |
&adhoc_course_role($refresh,$then); |
&adhoc_course_role($refresh,$then); |
} |
} |
} |
} |
Line 924 sub gather_roles {
|
Line 933 sub gather_roles {
|
if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role); |
if ($tremark) { $tremark.='<br />'; } |
if ($tremark) { $tremark.='<br />'; } |
$tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain); |
$tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain); |
} |
} |
$trole=Apache::lonnet::plaintext($role); |
$trole=Apache::lonnet::plaintext($role); |
my $ttype; |
my $ttype; |