--- loncom/interface/loncreateuser.pm 2017/01/28 21:35:49 1.433 +++ loncom/interface/loncreateuser.pm 2017/01/28 23:26:46 1.434 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.433 2017/01/28 21:35:49 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.434 2017/01/28 23:26:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -7207,7 +7207,7 @@ sub print_helpdeskaccess_display { my $confname = $cdom.'-domainconfig'; my $crstype = &Apache::loncommon::course_type(); - my @accesstypes = ('all','anydh','anyda','none'); + my @accesstypes = ('all','dh','da','none'); my ($numstatustypes,@jsarray); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); if (ref($types) eq 'ARRAY') { @@ -7417,8 +7417,8 @@ ENDJS 'whi' => 'Which helpdesk personnel may use this role?', 'udd' => 'Use domain default', 'all' => 'All with domain helpdesk or helpdesk assistant role', - 'anydh' => 'All with domain helpdesk role', - 'anyda' => 'All with domain helpdesk assistant role', + 'dh' => 'All with domain helpdesk role', + 'da' => 'All with domain helpdesk assistant role', 'none' => 'None', 'status' => 'Determined based on institutional status', 'inc' => 'Include all, but exclude specific personnel', @@ -7661,9 +7661,9 @@ sub domain_adhoc_access { } } elsif ($access eq 'none') { $domusage{$role} = &mt('No one in the domain'); - } elsif ($access eq 'anydh') { + } elsif ($access eq 'dh') { $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); - } elsif ($access eq 'anyda') { + } 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', @@ -7852,7 +7852,7 @@ sub update_helpdeskaccess { $r->print('

'.&mt('You do not have permission to change helpdesk access.').'

'); return; } - my @accesstypes = ('all','anydh','anyda','none','status','inc','exc'); + my @accesstypes = ('all','dh','da','none','status','inc','exc'); my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $confname = $cdom.'-domainconfig'; @@ -8103,10 +8103,10 @@ sub update_helpdeskaccess { if ($env{'form.'.$role.'_incrs'}) { if ($newsettings{$role}{'access'} eq 'all') { $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); - } elsif ($newsettings{$role}{'access'} eq 'anydh') { + } 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 'anyda') { + } 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') {