version 1.184, 2008/03/04 22:44:21
|
version 1.185, 2008/03/10 23:47:24
|
Line 110 sub handler {
|
Line 110 sub handler {
|
$env{'form.'.$env{'form.newrole'}}=1; |
$env{'form.'.$env{'form.newrole'}}=1; |
} |
} |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
|
# Check if user is CC trying to select a course role |
|
if ($env{'form.switchrole'}) { |
|
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) { |
|
&adhoc_course_role($then); |
|
} |
|
} |
my %temp=('logout_'.$env{'request.course.id'} => time); |
my %temp=('logout_'.$env{'request.course.id'} => time); |
&Apache::lonnet::put('email_status',\%temp); |
&Apache::lonnet::put('email_status',\%temp); |
&Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); |
&Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); |
Line 121 sub handler {
|
Line 127 sub handler {
|
"request.role" => 'cm', |
"request.role" => 'cm', |
"request.role.adv" => $env{'user.adv'}, |
"request.role.adv" => $env{'user.adv'}, |
"request.role.domain" => $env{'user.domain'}); |
"request.role.domain" => $env{'user.domain'}); |
|
|
# Check if user is a DC trying to enter a course or author space and needs privs to be created |
# Check if user is a DC trying to enter a course or author space and needs privs to be created |
if ($numdc > 0) { |
if ($numdc > 0) { |
foreach my $envkey (keys %env) { |
foreach my $envkey (keys %env) { |
Line 319 ENDENTERKEY
|
Line 324 ENDENTERKEY
|
$furl = "/adm/helper/course.initialization.helper"; |
$furl = "/adm/helper/course.initialization.helper"; |
# Send the user to the course they selected |
# Send the user to the course they selected |
} elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
|
if ($env{'form.destinationurl'}) { |
|
my $dest = $env{'form.destinationurl'}; |
|
&redirect_user($r,&mt('Entering [_1]', |
|
$env{'course.'.$courseid.'.description'}), |
|
$dest,$msg, |
|
$env{'environment.remotenavmap'}); |
|
return OK; |
|
} |
if (&Apache::lonnet::allowed('whn', |
if (&Apache::lonnet::allowed('whn', |
$env{'request.course.id'}) |
$env{'request.course.id'}) |
|| &Apache::lonnet::allowed('whn', |
|| &Apache::lonnet::allowed('whn', |
Line 956 sub check_fordc {
|
Line 969 sub check_fordc {
|
return $numdc; |
return $numdc; |
} |
} |
|
|
|
sub adhoc_course_role { |
|
my ($then) = @_; |
|
my ($cdom,$cnum); |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if (&check_forcc($cdom,$cnum,$then)) { |
|
my $setprivs; |
|
if (!defined($env{'user.role.'.$env{'form.selectrole'}})) { |
|
$setprivs = 1; |
|
} else { |
|
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.selectrole'}}); |
|
if (($start && ($start>$then || $start == -1)) || |
|
($end && $end<$then)) { |
|
$setprivs = 1; |
|
} |
|
} |
|
if ($setprivs) { |
|
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E(/?\w*)$-) { |
|
my $role = $1; |
|
my $custom_role = $2; |
|
my $usec = $3; |
|
if ($role eq 'cr') { |
|
if ($custom_role =~ m-^$match_domain/$match_courseid/\w+$-) { |
|
$role .= $custom_role; |
|
} else { |
|
return; |
|
} |
|
} |
|
my (%userroles,%newrole,%newgroups); |
|
my $area = '/'.$cdom.'/'.$cnum; |
|
my $spec = $role.'.'.$area; |
|
if ($usec ne '') { |
|
$spec .= '/'.$usec; |
|
$area .= '/'.$usec; |
|
} |
|
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area); |
|
&Apache::lonnet::set_userprivs(\%userroles,\%newrole,%newgroups); |
|
my $adhocstart = $then-1; |
|
$userroles{'user.role.'.$spec} = $adhocstart.'.'; |
|
&Apache::lonnet::appenv(%userroles); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub check_forcc { |
|
my ($cdom,$cnum,$then) = @_; |
|
my $is_cc; |
|
if ($cdom ne '' && $cnum ne '') { |
|
if (&Apache::lonnet::is_course($cdom,$cnum)) { |
|
my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum; |
|
if (defined($env{$envkey})) { |
|
$is_cc = 1; |
|
my ($tstart,$tend)=split(/\./,$env{$envkey}); |
|
if ($tstart && $tstart>$then) { $is_cc = 0; } |
|
if ($tend && $tend <$then) { $is_cc = 0; } |
|
} |
|
} |
|
} |
|
return $is_cc; |
|
} |
|
|
sub courselink { |
sub courselink { |
my ($dcdom,$rowtype,$selecttype) = @_; |
my ($dcdom,$rowtype,$selecttype) = @_; |
my $courseform=&Apache::loncommon::selectcourse_link |
my $courseform=&Apache::loncommon::selectcourse_link |