--- loncom/auth/lonroles.pm 2016/10/27 21:06:00 1.319
+++ loncom/auth/lonroles.pm 2016/11/08 23:15:34 1.322
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.319 2016/10/27 21:06:00 raeburn Exp $
+# $Id: lonroles.pm,v 1.322 2016/11/08 23:15:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -305,10 +305,11 @@ sub handler {
"request.role.adv" => $env{'user.adv'},
"request.role.domain" => $env{'user.domain'}});
# Check if Domain Helpdesk role trying to enter a course needs privs to be created
- if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$}) {
+ if ($env{'form.newrole'} =~ m{^cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)}) {
my $cdom = $1;
my $rolename = $2;
my $cnum = $3;
+ my $sec = $4;
if ($custom_adhoc) {
my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
'adhocroles.'.$cdom);
@@ -316,7 +317,7 @@ sub handler {
my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom});
if (grep(/^\Q$rolename\E$/,@adhoc)) {
if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now,
- "cr/$cdom/$cdom".'-domainconfig/'.$rolename)) {
+ "cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) {
&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time});
}
}
@@ -396,38 +397,39 @@ sub handler {
}
if ($numdh) {
# Is this an ad hoc custom role in a course/community?
- if (my ($domain,$rolename,$coursenum) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)$})) {
- if ($dhroles{$domain}) {
- my @adhoc;
- if ($env{'environment.adhocroles.'.$domain}) {
- @adhoc = split(',',$env{'environment.adhocroles.'.$domain});
- } else {
- my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
- 'adhocroles.'.$domain);
- if (keys(%adhocroles)) {
- @adhoc = split(',',$adhocroles{'adhocroles.'.$domain});
- };
- }
- if ((@adhoc > 0) && ($rolename ne '')) {
- if (grep(/^\Q$rolename\E$/,@adhoc)) {
- if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now,
- "cr/$domain/$domain".'-domainconfig/'.$rolename)) {
- &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain".
- '-domainconfig/'."$rolename.adhoc" => time});
- }
- } else {
- delete($env{$envkey});
- }
- } else {
- delete($env{$envkey});
- }
- } else {
- delete($env{$envkey});
- }
- last;
- }
- }
- }
+ if (my ($domain,$rolename,$coursenum,$sec) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)})) {
+ if ($dhroles{$domain}) {
+ my @adhoc;
+ if ($env{'environment.adhocroles.'.$domain}) {
+ @adhoc = split(',',$env{'environment.adhocroles.'.$domain});
+ } else {
+ my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+ 'adhocroles.'.$domain);
+ if (keys(%adhocroles)) {
+ @adhoc = split(',',$adhocroles{'adhocroles.'.$domain});
+ }
+ }
+ if ((@adhoc > 0) && ($rolename ne '')) {
+ if (grep(/^\Q$rolename\E$/,@adhoc)) {
+ if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now,
+ "cr/$domain/$domain".'-domainconfig/'.$rolename,
+ undef,$sec)) {
+ &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.cr/$domain/$domain".
+ '-domainconfig/'."$rolename.adhoc" => time});
+ }
+ } else {
+ delete($env{$envkey});
+ }
+ } else {
+ delete($env{$envkey});
+ }
+ } else {
+ delete($env{$envkey});
+ }
+ last;
+ }
+ }
+ }
}
foreach $envkey (keys(%env)) {
next if ($envkey!~/^user\.role\./);
@@ -1275,8 +1277,10 @@ sub gather_roles {
my $trole;
if ($role =~ /^cr\//) {
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
- if ($tremark) { $tremark.='
'; }
- $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
+ unless ($rauthor eq $rdomain.'-domainconfig') {
+ if ($tremark) { $tremark.='
'; }
+ $tremark.=&mt('Custom role defined by [_1].',$rauthor.':'.$rdomain);
+ }
}
$trole=Apache::lonnet::plaintext($role);
my $ttype;
@@ -1323,7 +1327,13 @@ sub gather_roles {
} elsif ($trest) {
my $tcourseid=$tdom.'_'.$trest;
$ttype = &Apache::loncommon::course_type($tcourseid);
- $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+ if ($role !~ /^cr/) {
+ $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+ } elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) {
+ $trole = &mt('Helpdesk[_1]',' '.$2);
+ } else {
+ $trole = (split(/\//,$role,4))[-1];
+ }
if ($env{'course.'.$tcourseid.'.description'}) {
my $home=$env{'course.'.$tcourseid.'.home'};
$twhere=$env{'course.'.$tcourseid.'.description'};
@@ -1857,9 +1867,15 @@ sub adhoc_course_role {
my %cgroups =
&Apache::lonnet::get_active_groups($env{'user.domain'},
$env{'user.name'},$cdom,$cnum);
+ my $ccrole;
+ if ($crstype eq 'Community') {
+ $ccrole = 'co';
+ } else {
+ $ccrole = 'cc';
+ }
foreach my $group (keys(%cgroups)) {
$group_privs{$group} =
- $env{'user.priv.cc./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group};
+ $env{'user.priv.'.$ccrole.'./'.$cdom.'/'.$cnum.'./'.$cdom.'/'.$cnum.'/'.$group};
}
$newgroups{'/'.$cdom.'/'.$cnum} = \%group_privs;
my $area = '/'.$cdom.'/'.$cnum;