version 1.250, 2010/06/02 15:41:50
|
version 1.253, 2010/06/18 08:41:37
|
Line 223 sub handler {
|
Line 223 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 920 sub gather_roles {
|
Line 929 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; |
Line 1120 sub print_rolerows {
|
Line 1129 sub print_rolerows {
|
if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') { |
if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') { |
$output.= &Apache::loncommon::start_data_table_row(). |
$output.= &Apache::loncommon::start_data_table_row(). |
$roletext->{$sortrole->{$which}}->[0]. |
$roletext->{$sortrole->{$which}}->[0]. |
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::continue_data_table_row(). |
|
$roletext->{$sortrole->{$which}}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
|
if ($roletext->{$sortrole->{$which}}->[1] ne '') { |
|
$output .= &Apache::loncommon::continue_data_table_row(). |
|
$roletext->{$sortrole->{$which}}->[1]. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { |
if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) { |
if (ref($dcroles) eq 'HASH') { |
if (ref($dcroles) eq 'HASH') { |