version 1.322, 2016/11/08 23:15:34
|
version 1.323, 2017/01/02 19:44:11
|
Line 311 sub handler {
|
Line 311 sub handler {
|
my $cnum = $3; |
my $cnum = $3; |
my $sec = $4; |
my $sec = $4; |
if ($custom_adhoc) { |
if ($custom_adhoc) { |
my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'}, |
my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum); |
'adhocroles.'.$cdom); |
if (ref($possroles) eq 'ARRAY') { |
if (keys(%adhocroles)) { |
if (grep(/^\Q$rolename\E$/,@{$possroles})) { |
my @adhoc = split(',',$adhocroles{'adhocroles.'.$cdom}); |
|
if (grep(/^\Q$rolename\E$/,@adhoc)) { |
|
if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now, |
if (&Apache::lonnet::check_adhoc_privs($cdom,$cnum,$update,$refresh,$now, |
"cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) { |
"cr/$cdom/$cdom".'-domainconfig/'.$rolename,undef,$sec)) { |
&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time}); |
&Apache::lonnet::appenv({"environment.internal.$cdom.$cnum.cr/$cdom/$cdom".'-domainconfig/'."$rolename.adhoc" => time}); |
Line 399 sub handler {
|
Line 397 sub handler {
|
# Is this an ad hoc custom role in a course/community? |
# Is this an ad hoc custom role in a course/community? |
if (my ($domain,$rolename,$coursenum,$sec) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)})) { |
if (my ($domain,$rolename,$coursenum,$sec) = ($envkey =~ m{^form\.cr/($match_domain)/\1\-domainconfig/(\w+)\./\1/($match_courseid)(?:/(\w+)|$)})) { |
if ($dhroles{$domain}) { |
if ($dhroles{$domain}) { |
my @adhoc; |
my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($domain.'_'.$coursenum); |
if ($env{'environment.adhocroles.'.$domain}) { |
if (ref($possroles) eq 'ARRAY') { |
@adhoc = split(',',$env{'environment.adhocroles.'.$domain}); |
if (grep(/^\Q$rolename\E$/,@{$possroles})) { |
} 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, |
if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,$update,$refresh,$now, |
"cr/$domain/$domain".'-domainconfig/'.$rolename, |
"cr/$domain/$domain".'-domainconfig/'.$rolename, |
undef,$sec)) { |
undef,$sec)) { |
Line 566 ENDENTERKEY
|
Line 555 ENDENTERKEY
|
$env{'user.name'}, |
$env{'user.name'}, |
$env{'user.home'}, |
$env{'user.home'}, |
"Role ".$trolecode); |
"Role ".$trolecode); |
|
|
&Apache::lonnet::appenv( |
&Apache::lonnet::appenv( |
{'request.role' => $trolecode, |
{'request.role' => $trolecode, |
'request.role.domain' => $cdom, |
'request.role.domain' => $cdom, |
Line 575 ENDENTERKEY
|
Line 564 ENDENTERKEY
|
my $tadv=0; |
my $tadv=0; |
|
|
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { |
if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) { |
|
if ($role =~ m{^\Qcr/$cdom/$cdom\E\-domainconfig/(\w+)$}) { |
|
my $rolename = $1; |
|
my %domdef = &Apache::lonnet::get_domain_defaults($cdom); |
|
if (ref($domdef{'adhocroles'}) eq 'HASH') { |
|
if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') { |
|
&Apache::lonnet::appenv({'request.role.desc' => $domdef{'adhocroles'}{$rolename}{'desc'}}); |
|
} |
|
} |
|
} |
my $msg; |
my $msg; |
my ($furl,$ferr)= |
my ($furl,$ferr)= |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
&Apache::lonuserstate::readmap($cdom.'/'.$cnum); |
Line 1047 ENDHEADER
|
Line 1045 ENDHEADER
|
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole, |
my $doheaders = &roletable_headers($r,\%roleclass,\%sortrole, |
$nochoose); |
$nochoose); |
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles, |
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles, |
\%roletext); |
\%roletext,$update,$then); |
my $tremark=''; |
my $tremark=''; |
my $tbg; |
my $tbg; |
if ($env{'request.role'} eq 'cm') { |
if ($env{'request.role'} eq 'cm') { |
Line 1118 ENDHEADER
|
Line 1116 ENDHEADER
|
if ($role =~ m{^dc\./($match_domain)/$} |
if ($role =~ m{^dc\./($match_domain)/$} |
&& $dcroles{$1}) { |
&& $dcroles{$1}) { |
$output .= &adhoc_roles_row($1,'recent'); |
$output .= &adhoc_roles_row($1,'recent'); |
} elsif ($role =~ m{^dh\./($match_domain)/$} |
} elsif ($role =~ m{^(dh)\./($match_domain)/$}) { |
&& ($env{'environment.adhocroles.'.$1} ne '')) { |
$output .= &adhoc_customroles_row($1,$2,'recent',$update,$then); |
$output .= &adhoc_customroles_row($1,'recent'); |
|
} |
} |
} elsif ($numdc > 0) { |
} elsif ($numdc > 0) { |
unless ($role =~/^error\:/) { |
unless ($role =~/^error\:/) { |
Line 1149 ENDHEADER
|
Line 1146 ENDHEADER
|
$doheaders ++; |
$doheaders ++; |
} |
} |
} |
} |
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext); |
&print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext,$update,$then); |
if ($countactive > 1) { |
if ($countactive > 1) { |
my $tremark=''; |
my $tremark=''; |
my $tbg; |
my $tbg; |
Line 1226 sub gather_roles {
|
Line 1223 sub gather_roles {
|
my $tryagain = $env{'form.tryagain'}; |
my $tryagain = $env{'form.tryagain'}; |
my @ids = &Apache::lonnet::current_machine_ids(); |
my @ids = &Apache::lonnet::current_machine_ids(); |
if (ref($roles_in_env) eq 'HASH') { |
if (ref($roles_in_env) eq 'HASH') { |
|
my %adhocdesc; |
foreach my $envkey (sort(keys(%{$roles_in_env}))) { |
foreach my $envkey (sort(keys(%{$roles_in_env}))) { |
my $button = 1; |
my $button = 1; |
my $switchserver=''; |
my $switchserver=''; |
Line 1329 sub gather_roles {
|
Line 1327 sub gather_roles {
|
$ttype = &Apache::loncommon::course_type($tcourseid); |
$ttype = &Apache::loncommon::course_type($tcourseid); |
if ($role !~ /^cr/) { |
if ($role !~ /^cr/) { |
$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); |
$trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid); |
} elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) { |
} elsif ($role =~ m{^\Qcr/$tdom/$tdom\E\-domainconfig/(\w+)$}) { |
$trole = &mt('Helpdesk[_1]',' '.$2); |
my $rolename = $1; |
|
my $desc; |
|
if (ref($adhocdesc{$tdom}) eq 'HASH') { |
|
$desc = $adhocdesc{$tdom}{$rolename}; |
|
} else { |
|
my %domdef = &Apache::lonnet::get_domain_defaults($tdom); |
|
if (ref($domdef{'adhocroles'}) eq 'HASH') { |
|
foreach my $rolename (sort(keys(%{$domdef{'adhocroles'}}))) { |
|
if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') { |
|
$adhocdesc{$tdom}{$rolename} = $domdef{'adhocroles'}{$rolename}{'desc'}; |
|
$desc = $adhocdesc{$tdom}{$rolename}; |
|
} |
|
} |
|
} |
|
} |
|
if ($desc ne '') { |
|
$trole = $desc; |
|
} else { |
|
$trole = &mt('Helpdesk[_1]',' '.$rolename); |
|
} |
} else { |
} else { |
$trole = (split(/\//,$role,4))[-1]; |
$trole = (split(/\//,$role,4))[-1]; |
} |
} |
Line 1507 sub roletypes {
|
Line 1524 sub roletypes {
|
} |
} |
|
|
sub print_rolerows { |
sub print_rolerows { |
my ($r,$doheaders,$roleclass,$sortrole,$dcroles,$roletext) = @_; |
my ($r,$doheaders,$roleclass,$sortrole,$dcroles,$roletext,$update,$then) = @_; |
if ((ref($roleclass) eq 'HASH') && (ref($sortrole) eq 'HASH')) { |
if ((ref($roleclass) eq 'HASH') && (ref($sortrole) eq 'HASH')) { |
my @types = &roletypes(); |
my @types = &roletypes(); |
foreach my $type (@types) { |
foreach my $type (@types) { |
Line 1531 sub print_rolerows {
|
Line 1548 sub print_rolerows {
|
$output .= &adhoc_roles_row($1,''); |
$output .= &adhoc_roles_row($1,''); |
} |
} |
} |
} |
} elsif (($sortrole->{$which} =~ m{^user\.role\.dh\./($match_domain)/}) && |
} elsif ($sortrole->{$which} =~ m{^user\.role\.(dh)\./($match_domain)/}) { |
($env{'environment.adhocroles.'.$1} ne '')) { |
$output .= &adhoc_customroles_row($1,$2,'',$update,$then); |
$output .= &adhoc_customroles_row($1,''); |
|
} |
} |
} |
} |
} |
} |
Line 1817 sub check_for_adhoc {
|
Line 1833 sub check_for_adhoc {
|
$numdc++; |
$numdc++; |
} else { |
} else { |
$dhroles->{$roledom} = $envkey; |
$dhroles->{$roledom} = $envkey; |
if ($env{'environment.adhocroles.'.$roledom} ne '') { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($roledom); |
$numadhoc ++; |
if (ref($domdefaults{'adhocroles'}) eq 'HASH') { |
|
if (keys(%{$domdefaults{'adhocroles'}})) { |
|
$numadhoc ++; |
|
} |
} |
} |
$numdh++; |
$numdh++; |
} |
} |
Line 2042 sub adhoc_roles_row {
|
Line 2061 sub adhoc_roles_row {
|
} |
} |
|
|
sub adhoc_customroles_row { |
sub adhoc_customroles_row { |
my ($dhdom,$rowtype) = @_; |
my ($role,$dhdom,$rowtype,$update,$then) = @_; |
my $output = &Apache::loncommon::continue_data_table_row() |
my $liverole = 1; |
.' <td colspan="5" class="LC_textsize_mobile">' |
my ($tstart,$tend)=split(/\./,$env{"user.role.$role./$dhdom/"}); |
.&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --', |
my $limit = $update; |
'<span class="LC_cusr_emph">','</span>',$dhdom); |
if (($role eq 'dh') && ($env{'request.role'} eq 'dh./'.$dhdom.'/')) { |
my @customroles = split(/,/,$env{'environment.adhocroles.'.$dhdom}); |
$limit = $then; |
my $count = 0; |
} |
foreach my $role (@customroles) { |
if ($tstart && $tstart>$limit) { $liverole = 0; } |
next if (($role eq '') || ($role =~ /\W/)); |
if ($tend && $tend <$limit) { $liverole = 0; } |
$output .= ' '.$role.': '.&courselink($dhdom,$rowtype,$role).' |'; |
return unless ($liverole); |
$count ++; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dhdom); |
} |
if (ref($domdefaults{'adhocroles'}) eq 'HASH') { |
if ($count) { |
if (scalar(keys(%{$domdefaults{'adhocroles'}})) > 0) { |
return $output; |
return &Apache::loncommon::continue_data_table_row() |
|
.' <td colspan="5" class="LC_textsize_mobile">' |
|
.&mt('[_1]Ad hoc[_2] course/community roles in domain [_3] --', |
|
'<span class="LC_cusr_emph">','</span>',$dhdom) |
|
.' '.&courselink($dhdom,$rowtype,$role); |
|
} |
} |
} |
return; |
return; |
} |
} |