version 1.431, 2017/01/28 02:56:41
|
version 1.432, 2017/01/28 03:48:44
|
Line 7218 sub print_helpdeskaccess_display {
|
Line 7218 sub print_helpdeskaccess_display {
|
} |
} |
} |
} |
my %customroles = &get_domain_customroles($cdom,$confname); |
my %customroles = &get_domain_customroles($cdom,$confname); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); |
if (keys(%domhelpdesk)) { |
if (keys(%domhelpdesk)) { |
push(@accesstypes,('inc','exc')); |
push(@accesstypes,('inc','exc')); |
push(@jsarray,('notinc','notexc')); |
push(@jsarray,('notinc','notexc')); |
Line 7603 sub domain_adhoc_access {
|
Line 7603 sub domain_adhoc_access {
|
my $access = $domcurrent->{$role}{'access'}; |
my $access = $domcurrent->{$role}{'access'}; |
if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { |
if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { |
$access = 'all'; |
$access = 'all'; |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'), |
|
&Apache::lonnet::plaintext('da')); |
} elsif ($access eq 'status') { |
} elsif ($access eq 'status') { |
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { |
if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { |
my @shown; |
my @shown; |
Line 7619 sub domain_adhoc_access {
|
Line 7620 sub domain_adhoc_access {
|
} |
} |
if (@shown) { |
if (@shown) { |
my $shownstatus = join(' '.&mt('or').' ',@shown); |
my $shownstatus = join(' '.&mt('or').' ',@shown); |
$domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]', |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]', |
&Apache::lonnet::plaintext('dh'),$shownstatus); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus); |
} else { |
} else { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} |
} |
Line 7634 sub domain_adhoc_access {
|
Line 7635 sub domain_adhoc_access {
|
} |
} |
my $showninc = join(', ',@dominc); |
my $showninc = join(', ',@dominc); |
if ($showninc ne '') { |
if ($showninc ne '') { |
$domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]', |
$domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]', |
&Apache::lonnet::plaintext('dh'),$showninc); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc); |
} else { |
} else { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', |
|
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); |
} |
} |
} |
} |
} elsif ($access eq 'exc') { |
} elsif ($access eq 'exc') { |
Line 7650 sub domain_adhoc_access {
|
Line 7652 sub domain_adhoc_access {
|
} |
} |
my $shownexc = join(', ',@domexc); |
my $shownexc = join(', ',@domexc); |
if ($shownexc ne '') { |
if ($shownexc ne '') { |
$domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]', |
$domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]', |
&Apache::lonnet::plaintext('dh'),$shownexc); |
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc); |
} else { |
} else { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} |
} |
} elsif ($access eq 'none') { |
} elsif ($access eq 'none') { |
$domusage{$role} = &mt('No one in the domain'); |
$domusage{$role} = &mt('No one in the domain'); |
} elsif ($access eq 'all') { |
} elsif ($access eq 'all') { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', |
|
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); |
} |
} |
} else { |
} else { |
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); |
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', |
|
&Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); |
} |
} |
} |
} |
return %domusage; |
return %domusage; |
Line 7852 sub update_helpdeskaccess {
|
Line 7856 sub update_helpdeskaccess {
|
my (%settings,%overridden); |
my (%settings,%overridden); |
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes, |
&get_adhocrole_settings($env{'request.course.id'},\@accesstypes, |
$types,\%customroles,\%settings,\%overridden); |
$types,\%customroles,\%settings,\%overridden); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); |
my (%changed,%storehash,@todelete); |
my (%changed,%storehash,@todelete); |
|
|
if (keys(%customroles)) { |
if (keys(%customroles)) { |