version 1.431, 2017/01/28 02:56:41
|
version 1.436, 2017/03/26 22:11:54
|
Line 755 sub print_username_entry_form {
|
Line 755 sub print_username_entry_form {
|
} |
} |
} else { |
} else { |
my $actiontext = $lt{'srad'}; |
my $actiontext = $lt{'srad'}; |
|
my $fixeddom; |
if ($env{'form.action'} eq 'singlestudent') { |
if ($env{'form.action'} eq 'singlestudent') { |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$actiontext = $lt{'srme'}; |
$actiontext = $lt{'srme'}; |
Line 763 sub print_username_entry_form {
|
Line 764 sub print_username_entry_form {
|
} |
} |
} elsif ($env{'form.action'} eq 'accesslogs') { |
} elsif ($env{'form.action'} eq 'accesslogs') { |
$actiontext = $lt{'srva'}; |
$actiontext = $lt{'srva'}; |
|
$fixeddom = 1; |
} elsif (($env{'form.action'} eq 'singleuser') && |
} elsif (($env{'form.action'} eq 'singleuser') && |
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { |
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { |
$actiontext = $lt{'srvu'}; |
$actiontext = $lt{'srvu'}; |
Line 774 sub print_username_entry_form {
|
Line 776 sub print_username_entry_form {
|
'<br clear="all" />'); |
'<br clear="all" />'); |
} |
} |
} |
} |
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1)); |
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); |
} |
} |
} |
} |
|
|
Line 7207 sub print_helpdeskaccess_display {
|
Line 7209 sub print_helpdeskaccess_display {
|
my $confname = $cdom.'-domainconfig'; |
my $confname = $cdom.'-domainconfig'; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
|
|
my @accesstypes = ('all','none'); |
my @accesstypes = ('all','dh','da','none'); |
my ($numstatustypes,@jsarray); |
my ($numstatustypes,@jsarray); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
Line 7218 sub print_helpdeskaccess_display {
|
Line 7220 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 7416 ENDJS
|
Line 7418 ENDJS
|
'rou' => 'Role usage', |
'rou' => 'Role usage', |
'whi' => 'Which helpdesk personnel may use this role?', |
'whi' => 'Which helpdesk personnel may use this role?', |
'udd' => 'Use domain default', |
'udd' => 'Use domain default', |
'all' => 'All', |
'all' => 'All with domain helpdesk or helpdesk assistant role', |
|
'dh' => 'All with domain helpdesk role', |
|
'da' => 'All with domain helpdesk assistant role', |
'none' => 'None', |
'none' => 'None', |
'status' => 'Determined based on institutional status', |
'status' => 'Determined based on institutional status', |
'inc' => 'Include all, but exclude specific personnel', |
'inc' => 'Include all, but exclude specific personnel', |
Line 7603 sub domain_adhoc_access {
|
Line 7607 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 7624 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 7639 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 7656 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 'dh') { |
$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] role',&Apache::lonnet::plaintext('dh')); |
|
} elsif ($access eq 'da') { |
|
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da')); |
|
} elsif ($access eq 'all') { |
|
$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 7842 sub update_helpdeskaccess {
|
Line 7854 sub update_helpdeskaccess {
|
$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>'); |
$r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>'); |
return; |
return; |
} |
} |
my @accesstypes = ('all','none','status','inc','exc'); |
my @accesstypes = ('all','dh','da','none','status','inc','exc'); |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $confname = $cdom.'-domainconfig'; |
my $confname = $cdom.'-domainconfig'; |
Line 7852 sub update_helpdeskaccess {
|
Line 7864 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)) { |
Line 8093 sub update_helpdeskaccess {
|
Line 8105 sub update_helpdeskaccess {
|
if ($env{'form.'.$role.'_incrs'}) { |
if ($env{'form.'.$role.'_incrs'}) { |
if ($newsettings{$role}{'access'} eq 'all') { |
if ($newsettings{$role}{'access'} eq 'all') { |
$r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); |
$r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); |
|
} elsif ($newsettings{$role}{'access'} eq 'dh') { |
|
$r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', |
|
&Apache::lonnet::plaintext('dh'))); |
|
} elsif ($newsettings{$role}{'access'} eq 'da') { |
|
$r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', |
|
&Apache::lonnet::plaintext('da'))); |
} elsif ($newsettings{$role}{'access'} eq 'none') { |
} elsif ($newsettings{$role}{'access'} eq 'none') { |
$r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); |
$r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); |
} elsif ($newsettings{$role}{'access'} eq 'status') { |
} elsif ($newsettings{$role}{'access'} eq 'status') { |
Line 8208 sub user_search_result {
|
Line 8226 sub user_search_result {
|
my $domd_chk = &domdirectorysrch_check($srch); |
my $domd_chk = &domdirectorysrch_check($srch); |
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />'; |
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />'; |
if ($domd_chk eq 'ok') { |
if ($domd_chk eq 'ok') { |
$response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'); |
$response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'); |
} |
} |
$response .= '<br />'; |
$response .= '<br />'; |
} |
} |
Line 8219 sub user_search_result {
|
Line 8237 sub user_search_result {
|
my $instd_chk = &instdirectorysrch_check($srch); |
my $instd_chk = &instdirectorysrch_check($srch); |
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />'; |
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />'; |
if ($instd_chk eq 'ok') { |
if ($instd_chk eq 'ok') { |
$response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.'); |
$response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.'); |
} |
} |
$response .= '<br />'; |
$response .= '<br />'; |
} |
} |
Line 8320 sub user_search_result {
|
Line 8338 sub user_search_result {
|
$response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
'</span><br />'. |
'</span><br />'. |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
&mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). |
'<br />'; |
'<br />'; |
} |
} |
} |
} |
Line 8393 sub user_search_result {
|
Line 8411 sub user_search_result {
|
$response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
'</span><br />'. |
'</span><br />'. |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
&mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). |
'<br />'; |
'<br />'; |
} |
} |
} |
} |